Split out OS2EXPORT from OS2API.

Otherwise, "SomeObj * OS2API FunctionName()" won't work.
icculus · Dec 20, 2017 · 20d2bfa · 20d2bfa
1 parent 9344897
commit 20d2bfa
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 98 deletions.
diff --git a/native/doscalls.c b/native/doscalls.c
@@ -28,13 +28,14 @@ enum
     QHINF_STE,
     QHINF_MAPSEL
 };
-APIRET OS2API DosQueryHeaderInfo(HMODULE hmod, ULONG ulIndex, PVOID pvBuffer, ULONG cbBuffer, ULONG ulSubFunction);
+
+OS2EXPORT APIRET OS2API DosQueryHeaderInfo(HMODULE hmod, ULONG ulIndex, PVOID pvBuffer, ULONG cbBuffer, ULONG ulSubFunction);
 
 // This is also undocumented (thanks, EDM/2!). Of course, Java uses it.
-APIRET OS2API DosQuerySysState(ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz);
+OS2EXPORT APIRET OS2API DosQuerySysState(ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz);
 
 // This is also undocumented (no idea about this at all, including function params). Of course, Java uses it.
-APIRET DosR3ExitAddr(void);
+OS2EXPORT APIRET DosR3ExitAddr(void);
 
 // These are 16-bit APIs that aren't in the 4.5 toolkit headers. Yeah, Java uses them! Winging it.
 typedef int HSEM16, *PHSEM16;
@@ -1940,7 +1941,7 @@ APIRET DosWaitChild(ULONG action, ULONG option, PRESULTCODES pres, PPID ppid, PI
     return NO_ERROR;
 } // DosWaitChild
 
-APIRET OS2API DosWaitThread(PTID ptid, ULONG option)
+APIRET DosWaitThread(PTID ptid, ULONG option)
 {
     TRACE_NATIVE("DosWaitThread(%p, %u)", ptid, (uint) option);
 
@@ -2006,7 +2007,7 @@ APIRET OS2API DosWaitThread(PTID ptid, ULONG option)
     return NO_ERROR;
 } // DosWaitThread
 
-APIRET OS2API DosSleep(ULONG msec)
+APIRET DosSleep(ULONG msec)
 {
     TRACE_NATIVE("DosSleep(%u)", (uint) msec);
 
@@ -2552,7 +2553,7 @@ static APIRET resetOneBuffer(const int fd)
 } // resetOneBuffer
 
 
-APIRET OS2API DosResetBuffer(HFILE hFile)
+APIRET DosResetBuffer(HFILE hFile)
 {
     TRACE_NATIVE("DosResetBuffer(%u)", (uint) hFile);
 
@@ -2807,7 +2808,7 @@ APIRET DosQueryHeaderInfo(HMODULE hmod, ULONG ulIndex, PVOID pvBuffer, ULONG cbB
     return ERROR_INVALID_PARAMETER;
 } // DosQueryHeaderInfo
 
-APIRET OS2API DosQueryExtLIBPATH(PSZ pszExtLIBPATH, ULONG flags)
+APIRET DosQueryExtLIBPATH(PSZ pszExtLIBPATH, ULONG flags)
 {
     TRACE_NATIVE("DosQueryExtLIBPATH('%s', %u)", pszExtLIBPATH, (uint) flags);
 

diff --git a/native/doscalls.h b/native/doscalls.h
@@ -383,70 +383,70 @@ typedef void *PCONTEXTRECORD;  // !!! FIXME
 // !!! FIXME:  into areas of functionality, but for now, I'm just listing them
 // !!! FIXME:  in the order I implemented them to get things running.
 
-APIRET OS2API DosGetInfoBlocks(PTIB *pptib, PPIB *pppib);
-APIRET OS2API DosQuerySysInfo(ULONG iStart, ULONG iLast, PVOID pBuf, ULONG cbBuf);
-APIRET OS2API DosQueryModuleName(HMODULE hmod, ULONG cbName, PCHAR pch);
-APIRET OS2API DosScanEnv(PSZ pszName, PSZ *ppszValue);
-APIRET OS2API DosWrite(HFILE hFile, PVOID pBuffer, ULONG cbWrite, PULONG pcbActual);
-VOID OS2API DosExit(ULONG action, ULONG result);
-APIRET OS2API DosExitList(ULONG ordercode, PFNEXITLIST pfn);
-APIRET OS2API DosCreateEventSem(PSZ pszName, PHEV phev, ULONG flAttr, BOOL32 fState);
-APIRET OS2API DosCreateMutexSem(PSZ pszName, PHMTX phmtx, ULONG flAttr, BOOL32 fState);
-APIRET OS2API DosSetExceptionHandler(PEXCEPTIONREGISTRATIONRECORD pERegRec);
-ULONG OS2API DosFlatToSel(VOID);
-APIRET OS2API DosSetSignalExceptionFocus(BOOL32 flag, PULONG pulTimes);
-APIRET OS2API DosSetRelMaxFH(PLONG pcbReqCount, PULONG pcbCurMaxFH);
-APIRET OS2API DosAllocMem(PPVOID ppb, ULONG cb, ULONG flag);
-APIRET OS2API DosSubSetMem(PVOID pbBase, ULONG flag, ULONG cb);
-APIRET OS2API DosSubAllocMem(PVOID pbBase, PPVOID ppb, ULONG cb);
-APIRET OS2API DosQueryHType(HFILE hFile, PULONG pType, PULONG pAttr);
-APIRET OS2API DosSetMem(PVOID pb, ULONG cb, ULONG flag);
-APIRET OS2API DosGetDateTime(PDATETIME pdt);
-APIRET OS2API DosOpen(PSZ pszFileName, PHFILE pHf, PULONG pulAction, ULONG cbFile, ULONG ulAttribute, ULONG fsOpenFlags, ULONG fsOpenMode, PEAOP2 peaop2);
-APIRET OS2API DosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
-APIRET OS2API DosReleaseMutexSem(HMTX hmtx);
-APIRET OS2API DosSetFilePtr(HFILE hFile, LONG ib, ULONG method, PULONG ibActual);
-APIRET OS2API DosRead(HFILE hFile, PVOID pBuffer, ULONG cbRead, PULONG pcbActual);
-APIRET OS2API DosClose(HFILE hFile);
-APIRET OS2API DosEnterMustComplete(PULONG pulNesting);
-APIRET OS2API DosExitMustComplete(PULONG pulNesting);
-APIRET OS2API DosQueryPathInfo(PSZ pszPathName, ULONG ulInfoLevel, PVOID pInfoBuf, ULONG cbInfoBuf);
-APIRET OS2API DosQueryFileInfo(HFILE hf, ULONG ulInfoLevel, PVOID pInfo, ULONG cbInfoBuf);
-APIRET OS2API DosCreateThread(PTID ptid, PFNTHREAD pfn, ULONG param, ULONG flag, ULONG cbStack);
-APIRET OS2API DosExecPgm(PCHAR pObjname, LONG cbObjname, ULONG execFlag, PSZ pArg, PSZ pEnv, PRESULTCODES pRes, PSZ pName);
-APIRET OS2API DosResetEventSem(HEV hev, PULONG pulPostCt);
-APIRET OS2API DosPostEventSem(HEV hev);
-APIRET OS2API DosCloseEventSem(HEV hev);
-APIRET OS2API DosWaitEventSem(HEV hev, ULONG ulTimeout);
-APIRET OS2API DosQueryEventSem(HEV hev, PULONG pulPostCt);
-APIRET OS2API DosFreeMem(PVOID pb);
-APIRET OS2API DosWaitChild(ULONG action, ULONG option, PRESULTCODES pres, PPID ppid, PID pid);
-APIRET OS2API DosWaitThread(PTID ptid, ULONG option);
-APIRET OS2API DosSleep(ULONG msec);
-APIRET OS2API DosSubFreeMem(PVOID pbBase, PVOID pb, ULONG cb);
-APIRET OS2API DosDelete(PSZ pszFile);
-APIRET OS2API DosQueryCurrentDir(ULONG disknum, PBYTE pBuf, PULONG pcbBuf);
-APIRET OS2API DosSetPathInfo(PSZ pszPathName, ULONG ulInfoLevel, PVOID pInfoBuf, ULONG cbInfoBuf, ULONG flOptions);
-APIRET OS2API DosQueryModuleHandle(PSZ pszModname, PHMODULE phmod);
-APIRET OS2API DosQueryProcAddr(HMODULE hmod, ULONG ordinal, PSZ pszName, PFN* ppfn);
-APIRET OS2API DosQueryCp(ULONG cb, PULONG arCP, PULONG pcCP);
-APIRET OS2API DosOpenL(PSZ pszFileName, PHFILE pHf, PULONG pulAction, LONGLONG cbFile, ULONG ulAttribute, ULONG fsOpenFlags, ULONG fsOpenMode, PEAOP2 peaop2);
-APIRET OS2API DosFindFirst(PSZ pszFileSpec, PHDIR phdir, ULONG flAttribute, PVOID pfindbuf, ULONG cbBuf, PULONG pcFileNames, ULONG ulInfoLevel);
-APIRET OS2API DosFindNext(HDIR hDir, PVOID pfindbuf, ULONG cbfindbuf, PULONG pcFilenames);
-APIRET OS2API DosFindClose(HDIR hDir);
-APIRET OS2API DosQueryCurrentDisk(PULONG pdisknum, PULONG plogical);
-APIRET OS2API DosDevConfig(PVOID pdevinfo, ULONG item);
-APIRET OS2API DosLoadModule(PSZ pszName, ULONG cbName, PSZ pszModname, PHMODULE phmod);
-APIRET OS2API DosResetBuffer(HFILE hFile);
-APIRET OS2API DosQueryAppType(PSZ pszName, PULONG pFlags);
-APIRET OS2API DosAllocThreadLocalMemory(ULONG cb, PULONG *p);
-APIRET OS2API DosFreeThreadLocalMemory(ULONG *p);
-APIRET OS2API DosQueryFHState(HFILE hFile, PULONG pMode);
-APIRET OS2API DosQueryExtLIBPATH(PSZ pszExtLIBPATH, ULONG flags);
-APIRET OS2API DosSetMaxFH(ULONG cFH);
-APIRET OS2API DosQueryThreadContext(TID tid, ULONG level, PCONTEXTRECORD pcxt);
-ULONG OS2API DosSelToFlat(VOID);
-APIRET OS2API DosCloseMutexSem(HMTX hmtx);
+OS2EXPORT APIRET OS2API DosGetInfoBlocks(PTIB *pptib, PPIB *pppib);
+OS2EXPORT APIRET OS2API DosQuerySysInfo(ULONG iStart, ULONG iLast, PVOID pBuf, ULONG cbBuf);
+OS2EXPORT APIRET OS2API DosQueryModuleName(HMODULE hmod, ULONG cbName, PCHAR pch);
+OS2EXPORT APIRET OS2API DosScanEnv(PSZ pszName, PSZ *ppszValue);
+OS2EXPORT APIRET OS2API DosWrite(HFILE hFile, PVOID pBuffer, ULONG cbWrite, PULONG pcbActual);
+OS2EXPORT VOID OS2API DosExit(ULONG action, ULONG result);
+OS2EXPORT APIRET OS2API DosExitList(ULONG ordercode, PFNEXITLIST pfn);
+OS2EXPORT APIRET OS2API DosCreateEventSem(PSZ pszName, PHEV phev, ULONG flAttr, BOOL32 fState);
+OS2EXPORT APIRET OS2API DosCreateMutexSem(PSZ pszName, PHMTX phmtx, ULONG flAttr, BOOL32 fState);
+OS2EXPORT APIRET OS2API DosSetExceptionHandler(PEXCEPTIONREGISTRATIONRECORD pERegRec);
+OS2EXPORT ULONG OS2API DosFlatToSel(VOID);
+OS2EXPORT APIRET OS2API DosSetSignalExceptionFocus(BOOL32 flag, PULONG pulTimes);
+OS2EXPORT APIRET OS2API DosSetRelMaxFH(PLONG pcbReqCount, PULONG pcbCurMaxFH);
+OS2EXPORT APIRET OS2API DosAllocMem(PPVOID ppb, ULONG cb, ULONG flag);
+OS2EXPORT APIRET OS2API DosSubSetMem(PVOID pbBase, ULONG flag, ULONG cb);
+OS2EXPORT APIRET OS2API DosSubAllocMem(PVOID pbBase, PPVOID ppb, ULONG cb);
+OS2EXPORT APIRET OS2API DosQueryHType(HFILE hFile, PULONG pType, PULONG pAttr);
+OS2EXPORT APIRET OS2API DosSetMem(PVOID pb, ULONG cb, ULONG flag);
+OS2EXPORT APIRET OS2API DosGetDateTime(PDATETIME pdt);
+OS2EXPORT APIRET OS2API DosOpen(PSZ pszFileName, PHFILE pHf, PULONG pulAction, ULONG cbFile, ULONG ulAttribute, ULONG fsOpenFlags, ULONG fsOpenMode, PEAOP2 peaop2);
+OS2EXPORT APIRET OS2API DosRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
+OS2EXPORT APIRET OS2API DosReleaseMutexSem(HMTX hmtx);
+OS2EXPORT APIRET OS2API DosSetFilePtr(HFILE hFile, LONG ib, ULONG method, PULONG ibActual);
+OS2EXPORT APIRET OS2API DosRead(HFILE hFile, PVOID pBuffer, ULONG cbRead, PULONG pcbActual);
+OS2EXPORT APIRET OS2API DosClose(HFILE hFile);
+OS2EXPORT APIRET OS2API DosEnterMustComplete(PULONG pulNesting);
+OS2EXPORT APIRET OS2API DosExitMustComplete(PULONG pulNesting);
+OS2EXPORT APIRET OS2API DosQueryPathInfo(PSZ pszPathName, ULONG ulInfoLevel, PVOID pInfoBuf, ULONG cbInfoBuf);
+OS2EXPORT APIRET OS2API DosQueryFileInfo(HFILE hf, ULONG ulInfoLevel, PVOID pInfo, ULONG cbInfoBuf);
+OS2EXPORT APIRET OS2API DosCreateThread(PTID ptid, PFNTHREAD pfn, ULONG param, ULONG flag, ULONG cbStack);
+OS2EXPORT APIRET OS2API DosExecPgm(PCHAR pObjname, LONG cbObjname, ULONG execFlag, PSZ pArg, PSZ pEnv, PRESULTCODES pRes, PSZ pName);
+OS2EXPORT APIRET OS2API DosResetEventSem(HEV hev, PULONG pulPostCt);
+OS2EXPORT APIRET OS2API DosPostEventSem(HEV hev);
+OS2EXPORT APIRET OS2API DosCloseEventSem(HEV hev);
+OS2EXPORT APIRET OS2API DosWaitEventSem(HEV hev, ULONG ulTimeout);
+OS2EXPORT APIRET OS2API DosQueryEventSem(HEV hev, PULONG pulPostCt);
+OS2EXPORT APIRET OS2API DosFreeMem(PVOID pb);
+OS2EXPORT APIRET OS2API DosWaitChild(ULONG action, ULONG option, PRESULTCODES pres, PPID ppid, PID pid);
+OS2EXPORT APIRET OS2API DosWaitThread(PTID ptid, ULONG option);
+OS2EXPORT APIRET OS2API DosSleep(ULONG msec);
+OS2EXPORT APIRET OS2API DosSubFreeMem(PVOID pbBase, PVOID pb, ULONG cb);
+OS2EXPORT APIRET OS2API DosDelete(PSZ pszFile);
+OS2EXPORT APIRET OS2API DosQueryCurrentDir(ULONG disknum, PBYTE pBuf, PULONG pcbBuf);
+OS2EXPORT APIRET OS2API DosSetPathInfo(PSZ pszPathName, ULONG ulInfoLevel, PVOID pInfoBuf, ULONG cbInfoBuf, ULONG flOptions);
+OS2EXPORT APIRET OS2API DosQueryModuleHandle(PSZ pszModname, PHMODULE phmod);
+OS2EXPORT APIRET OS2API DosQueryProcAddr(HMODULE hmod, ULONG ordinal, PSZ pszName, PFN* ppfn);
+OS2EXPORT APIRET OS2API DosQueryCp(ULONG cb, PULONG arCP, PULONG pcCP);
+OS2EXPORT APIRET OS2API DosOpenL(PSZ pszFileName, PHFILE pHf, PULONG pulAction, LONGLONG cbFile, ULONG ulAttribute, ULONG fsOpenFlags, ULONG fsOpenMode, PEAOP2 peaop2);
+OS2EXPORT APIRET OS2API DosFindFirst(PSZ pszFileSpec, PHDIR phdir, ULONG flAttribute, PVOID pfindbuf, ULONG cbBuf, PULONG pcFileNames, ULONG ulInfoLevel);
+OS2EXPORT APIRET OS2API DosFindNext(HDIR hDir, PVOID pfindbuf, ULONG cbfindbuf, PULONG pcFilenames);
+OS2EXPORT APIRET OS2API DosFindClose(HDIR hDir);
+OS2EXPORT APIRET OS2API DosQueryCurrentDisk(PULONG pdisknum, PULONG plogical);
+OS2EXPORT APIRET OS2API DosDevConfig(PVOID pdevinfo, ULONG item);
+OS2EXPORT APIRET OS2API DosLoadModule(PSZ pszName, ULONG cbName, PSZ pszModname, PHMODULE phmod);
+OS2EXPORT APIRET OS2API DosResetBuffer(HFILE hFile);
+OS2EXPORT APIRET OS2API DosQueryAppType(PSZ pszName, PULONG pFlags);
+OS2EXPORT APIRET OS2API DosAllocThreadLocalMemory(ULONG cb, PULONG *p);
+OS2EXPORT APIRET OS2API DosFreeThreadLocalMemory(ULONG *p);
+OS2EXPORT APIRET OS2API DosQueryFHState(HFILE hFile, PULONG pMode);
+OS2EXPORT APIRET OS2API DosQueryExtLIBPATH(PSZ pszExtLIBPATH, ULONG flags);
+OS2EXPORT APIRET OS2API DosSetMaxFH(ULONG cFH);
+OS2EXPORT APIRET OS2API DosQueryThreadContext(TID tid, ULONG level, PCONTEXTRECORD pcxt);
+OS2EXPORT ULONG OS2API DosSelToFlat(VOID);
+OS2EXPORT APIRET OS2API DosCloseMutexSem(HMTX hmtx);
 
 #ifdef __cplusplus
 }

diff --git a/native/kbdcalls.h b/native/kbdcalls.h
@@ -19,7 +19,7 @@ typedef struct
 } KBDKEYINFO, *PKBDKEYINFO;
 #pragma pack(pop)
 
-APIRET16 OS2API16 KbdCharIn(PKBDKEYINFO pkbci, USHORT fWait, HKBD hkbd);
+OS2EXPORT APIRET16 OS2API16 KbdCharIn(PKBDKEYINFO pkbci, USHORT fWait, HKBD hkbd);
 
 #ifdef __cplusplus
 }

diff --git a/native/msg.h b/native/msg.h
@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-APIRET OS2API DosPutMessage(HFILE hfile, ULONG cbMsg, PCHAR pBuf);
+OS2EXPORT APIRET OS2API DosPutMessage(HFILE hfile, ULONG cbMsg, PCHAR pBuf);
 
 #ifdef __cplusplus
 }

diff --git a/native/nls.h b/native/nls.h
@@ -31,9 +31,9 @@ typedef struct
     USHORT abReserved2[5];
 } COUNTRYINFO, *PCOUNTRYINFO;
 
-APIRET OS2API DosQueryDBCSEnv(ULONG cb, PCOUNTRYCODE pcc, PCHAR pBuf);
-APIRET OS2API DosMapCase(ULONG cb, PCOUNTRYCODE pcc, PCHAR pch);
-APIRET OS2API DosQueryCtryInfo(ULONG cb, PCOUNTRYCODE pcc, PCOUNTRYINFO pci, PULONG pcbActual);
+OS2EXPORT APIRET OS2API DosQueryDBCSEnv(ULONG cb, PCOUNTRYCODE pcc, PCHAR pBuf);
+OS2EXPORT APIRET OS2API DosMapCase(ULONG cb, PCOUNTRYCODE pcc, PCHAR pch);
+OS2EXPORT APIRET OS2API DosQueryCtryInfo(ULONG cb, PCOUNTRYCODE pcc, PCOUNTRYINFO pci, PULONG pcbActual);
 
 #ifdef __cplusplus
 }

diff --git a/native/os2types.h b/native/os2types.h
@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 #ifndef OS2API
-#define OS2API APIENTRY OS2EXPORT
+#define OS2API APIENTRY
 #endif
 
 // Note that we never export actual 16-bit APIs from these headers, even if

diff --git a/native/quecalls.h b/native/quecalls.h
@@ -22,14 +22,14 @@ enum
     QUE_CONVERT_ADDRESS = 4
 };
 
-APIRET OS2API DosCreateQueue(PHQUEUE phq, ULONG priority, PSZ pszName);
-APIRET OS2API DosCloseQueue(HQUEUE hq);
-APIRET OS2API DosOpenQueue(PPID ppid, PHQUEUE phq, PSZ pszName);
-APIRET OS2API DosPeekQueue(HQUEUE hq, PREQUESTDATA pRequest, PULONG pcbData, PPVOID ppbuf, PULONG element, BOOL32 nowait, PBYTE ppriority, HEV hsem);
-APIRET OS2API DosPurgeQueue(HQUEUE hq);
-APIRET OS2API DosQueryQueue(HQUEUE hq, PULONG pcbEntries);
-APIRET OS2API DosReadQueue(HQUEUE hq, PREQUESTDATA pRequest, PULONG pcbData, PPVOID ppbuf, ULONG element, BOOL32 wait, PBYTE ppriority, HEV hsem);
-APIRET OS2API DosWriteQueue(HQUEUE hq, ULONG request, ULONG cbData, PVOID pbData, ULONG priority);
+OS2EXPORT APIRET OS2API DosCreateQueue(PHQUEUE phq, ULONG priority, PSZ pszName);
+OS2EXPORT APIRET OS2API DosCloseQueue(HQUEUE hq);
+OS2EXPORT APIRET OS2API DosOpenQueue(PPID ppid, PHQUEUE phq, PSZ pszName);
+OS2EXPORT APIRET OS2API DosPeekQueue(HQUEUE hq, PREQUESTDATA pRequest, PULONG pcbData, PPVOID ppbuf, PULONG element, BOOL32 nowait, PBYTE ppriority, HEV hsem);
+OS2EXPORT APIRET OS2API DosPurgeQueue(HQUEUE hq);
+OS2EXPORT APIRET OS2API DosQueryQueue(HQUEUE hq, PULONG pcbEntries);
+OS2EXPORT APIRET OS2API DosReadQueue(HQUEUE hq, PREQUESTDATA pRequest, PULONG pcbData, PPVOID ppbuf, ULONG element, BOOL32 wait, PBYTE ppriority, HEV hsem);
+OS2EXPORT APIRET OS2API DosWriteQueue(HQUEUE hq, ULONG request, ULONG cbData, PVOID pbData, ULONG priority);
 
 #ifdef __cplusplus
 }

diff --git a/native/sesmgr.h b/native/sesmgr.h
@@ -32,7 +32,7 @@ typedef struct
     ULONG ObjectBuffLen;
 } STARTDATA, *PSTARTDATA;
 
-APIRET OS2API DosStartSession(PSTARTDATA psd, PULONG pidSession, PPID ppid);
+OS2EXPORT APIRET OS2API DosStartSession(PSTARTDATA psd, PULONG pidSession, PPID ppid);
 
 #ifdef __cplusplus
 }

diff --git a/native/viocalls.c b/native/viocalls.c
@@ -407,7 +407,7 @@ static APIRET16 bridge16to32_VioSetCurPos(uint8 *args)
     return VioSetCurPos(usRow, usColumn, hvio);
 } // bridge16to32_VioSetCurPos
 
-APIRET16 OS2API16 VioSetCurType(PVIOCURSORINFO pvioCursorInfo, HVIO hvio)
+APIRET16 VioSetCurType(PVIOCURSORINFO pvioCursorInfo, HVIO hvio)
 {
     TRACE_NATIVE("VioSetCurType(%p, %u)", pvioCursorInfo, (uint) hvio);
     FIXME("write me");

diff --git a/native/viocalls.h b/native/viocalls.h
@@ -42,17 +42,17 @@ typedef struct
     USHORT attr;
 } VIOCURSORINFO, *PVIOCURSORINFO;
 
-APIRET16 OS2API16 VioGetMode(PVIOMODEINFO pvioModeInfo, HVIO hvio);
-APIRET16 OS2API16 VioGetCurPos(PUSHORT pusRow, PUSHORT pusColumn, HVIO hvio);
-APIRET16 OS2API16 VioGetBuf(PULONG pLVB, PUSHORT pcbLVB, HVIO hvio);
-APIRET16 OS2API16 VioGetCurType(PVIOCURSORINFO pvioCursorInfo, HVIO hvio);
-APIRET16 OS2API16 VioScrollUp(USHORT usTopRow, USHORT usLeftCol, USHORT usBotRow, USHORT usRightCol, USHORT cbLines, PBYTE pCell, HVIO hvio);
-APIRET16 OS2API16 VioSetCurPos(USHORT usRow, USHORT usColumn, HVIO hvio);
-APIRET16 OS2API16 VioSetCurType(PVIOCURSORINFO pvioCursorInfo, HVIO hvio);
-APIRET16 OS2API16 VioReadCellStr(PCH pchCellStr, PUSHORT pcb, USHORT usRow, USHORT usColumn, HVIO hvio);
-APIRET16 OS2API16 VioWrtCellStr(PCH pchCellStr, USHORT cb, USHORT usRow, USHORT usColumn, HVIO hvio);
-APIRET16 OS2API16 VioWrtCharStrAtt(PCH pch, USHORT cb, USHORT usRow, USHORT usColumn, PBYTE pAttr, HVIO hvio);
-APIRET16 OS2API16 VioWrtNCell(PBYTE pCell, USHORT cb, USHORT usRow, USHORT usColumn, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioGetMode(PVIOMODEINFO pvioModeInfo, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioGetCurPos(PUSHORT pusRow, PUSHORT pusColumn, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioGetBuf(PULONG pLVB, PUSHORT pcbLVB, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioGetCurType(PVIOCURSORINFO pvioCursorInfo, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioScrollUp(USHORT usTopRow, USHORT usLeftCol, USHORT usBotRow, USHORT usRightCol, USHORT cbLines, PBYTE pCell, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioSetCurPos(USHORT usRow, USHORT usColumn, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioSetCurType(PVIOCURSORINFO pvioCursorInfo, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioReadCellStr(PCH pchCellStr, PUSHORT pcb, USHORT usRow, USHORT usColumn, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioWrtCellStr(PCH pchCellStr, USHORT cb, USHORT usRow, USHORT usColumn, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioWrtCharStrAtt(PCH pch, USHORT cb, USHORT usRow, USHORT usColumn, PBYTE pAttr, HVIO hvio);
+OS2EXPORT APIRET16 OS2API16 VioWrtNCell(PBYTE pCell, USHORT cb, USHORT usRow, USHORT usColumn, HVIO hvio);
 
 #ifdef __cplusplus
 }