opencode.energia.arti.ee/2ine-tms34010
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix last few export names

Browse Source
This commit is contained in:
cracyc committed 2018-06-19 12:05:24 -04:00
1 parent c7f212d035
commit 35d2162ba4
8 files changed
+37 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

native/doscalls.c
+1 -1
View File
@@ -3169,7 +3169,7 @@ APIRET16 Dos16SetSigHandler(PFN routine, PVOID prevaddress, PUSHORT prevaction,
return NO_ERROR;
}
APIRET16 OS2API16 Dos16GetInfoSeg(PSEL globalseg, PSEL localseg)
APIRET16 Dos16GetInfoSeg(PSEL globalseg, PSEL localseg)
{
TRACE_NATIVE("Dos16GetInfoSeg(%p, %p)", globalseg, localseg);
if (globalseg) *globalseg = ginfosel << 3 | 7;
native/msg-lx.h
+10 -10
View File
@@ -9,14 +9,14 @@
/* This is glue code for OS/2 binaries. Native binaries don't need this. */
#if LX_LEGACY
static APIRET16 bridge16to32_DOSPUTMESSAGE(uint8 *args) {
static APIRET16 bridge16to32_Dos16PutMessage(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCHAR, pBuf);
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(USHORT, cbMsg);
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(USHORT, hfile);
return DOSPUTMESSAGE(hfile, cbMsg, pBuf);
return Dos16PutMessage(hfile, cbMsg, pBuf);
}
static APIRET16 bridge16to32_DOSTRUEGETMESSAGE(uint8 *args) {
static APIRET16 bridge16to32_Dos16TrueGetMessage(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PVOID, msgseg);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PUSHORT, pcbMsg);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCHAR, pFilename);
@@ -25,12 +25,12 @@ static APIRET16 bridge16to32_DOSTRUEGETMESSAGE(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCHAR, pData);
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(USHORT, cTable);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PVOID, pTable);
return DOSTRUEGETMESSAGE(pTable, cTable, pData, cbBuf, msgnum, pFilename, pcbMsg, msgseg);
return Dos16TrueGetMessage(pTable, cTable, pData, cbBuf, msgnum, pFilename, pcbMsg, msgseg);
}
LX_NATIVE_MODULE_16BIT_SUPPORT()
LX_NATIVE_MODULE_16BIT_API(DOSPUTMESSAGE)
LX_NATIVE_MODULE_16BIT_API(DOSTRUEGETMESSAGE)
LX_NATIVE_MODULE_16BIT_API(Dos16PutMessage)
LX_NATIVE_MODULE_16BIT_API(Dos16TrueGetMessage)
LX_NATIVE_MODULE_16BIT_SUPPORT_END()
LX_NATIVE_MODULE_DEINIT({
@@ -39,15 +39,15 @@ LX_NATIVE_MODULE_DEINIT({
static int init16_msg(void) {
LX_NATIVE_MODULE_INIT_16BIT_SUPPORT()
LX_NATIVE_INIT_16BIT_BRIDGE(DOSPUTMESSAGE, 8)
LX_NATIVE_INIT_16BIT_BRIDGE(DOSTRUEGETMESSAGE, 26)
LX_NATIVE_INIT_16BIT_BRIDGE(Dos16PutMessage, 8)
LX_NATIVE_INIT_16BIT_BRIDGE(Dos16TrueGetMessage, 26)
LX_NATIVE_MODULE_INIT_16BIT_SUPPORT_END()
return 1;
}
LX_NATIVE_MODULE_INIT({ if (!init16_msg()) return 0; })
LX_NATIVE_EXPORT16(DOSPUTMESSAGE, 1),
LX_NATIVE_EXPORT16(DOSTRUEGETMESSAGE, 2),
LX_NATIVE_EXPORT16_DIFFERENT_NAME(Dos16PutMessage, "DOSPUTMESSAGE", 1),
LX_NATIVE_EXPORT16_DIFFERENT_NAME(Dos16TrueGetMessage, "DOSTRUEGETMESSAGE", 2),
LX_NATIVE_EXPORT(DosPutMessage, 5)
LX_NATIVE_MODULE_INIT_END()
native/msg.c
+2 -2
View File
@@ -21,7 +21,7 @@ APIRET DosPutMessage(HFILE handle, ULONG msglen, PCHAR msg)
return NO_ERROR;
} // DosPutMessage
APIRET16 DOSPUTMESSAGE(USHORT handle, USHORT msglen, PCHAR msg)
APIRET16 Dos16PutMessage(USHORT handle, USHORT msglen, PCHAR msg)
{
TRACE_NATIVE("Dos16PutMessage(%u, %u, %p)", (uint) handle, (uint) msglen, msg);
FIXME("really implement this");
@@ -29,7 +29,7 @@ APIRET16 DOSPUTMESSAGE(USHORT handle, USHORT msglen, PCHAR msg)
return NO_ERROR;
} // Dos16PutMessage
APIRET16 DOSTRUEGETMESSAGE(PVOID pTable, USHORT cTable, PCHAR pData, USHORT cbBuf, USHORT msgnum, PCHAR pFilename, PUSHORT pcbMsg, PVOID msgseg)
APIRET16 Dos16TrueGetMessage(PVOID pTable, USHORT cTable, PCHAR pData, USHORT cbBuf, USHORT msgnum, PCHAR pFilename, PUSHORT pcbMsg, PVOID msgseg)
{
TRACE_NATIVE("Dos16TrueGetMessage(%p, %u, %p, %u, %u, %p, %p, %p)", pTable, cTable, pData, cbBuf, msgnum, pFilename, pcbMsg, msgseg);
void *msgdat = msgseg;
native/msg.h
+2 -2
View File
@@ -15,8 +15,8 @@
extern "C" {
#endif
OS2EXPORT APIRET16 OS2API16 DOSPUTMESSAGE(USHORT hfile, USHORT cbMsg, PCHAR pBuf) OS2APIINFO(1);
OS2EXPORT APIRET16 OS2API16 DOSTRUEGETMESSAGE(PVOID pTable, USHORT cTable, PCHAR pData, USHORT cbBuf, USHORT msgnum, PCHAR pFilename, PUSHORT pcbMsg, PVOID msgseg) OS2APIINFO(2);
OS2EXPORT APIRET16 OS2API16 Dos16PutMessage(USHORT hfile, USHORT cbMsg, PCHAR pBuf) OS2APIINFO(ord=1,name=DOSPUTMESSAGE);
OS2EXPORT APIRET16 OS2API16 Dos16TrueGetMessage(PVOID pTable, USHORT cTable, PCHAR pData, USHORT cbBuf, USHORT msgnum, PCHAR pFilename, PUSHORT pcbMsg, PVOID msgseg) OS2APIINFO(ord=2,name=DOSTRUEGETMESSAGE);
OS2EXPORT APIRET OS2API DosPutMessage(HFILE hfile, ULONG cbMsg, PCHAR pBuf) OS2APIINFO(5);
#ifdef __cplusplus
native/nls-lx.h
+15 -15
View File
@@ -9,32 +9,32 @@
/* This is glue code for OS/2 binaries. Native binaries don't need this. */
#if LX_LEGACY
static APIRET16 bridge16to32_DOSGETDBCSEV(uint8 *args) {
static APIRET16 bridge16to32_Dos16GetDBCSEv(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCHAR, buf);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCOUNTRYCODE16, pcc);
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(USHORT, buflen);
return DOSGETDBCSEV(buflen, pcc, buf);
return Dos16GetDBCSEv(buflen, pcc, buf);
}
static APIRET16 bridge16to32_DOSCASEMAP(uint8 *args) {
static APIRET16 bridge16to32_Dos16CaseMap(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCHAR, pch);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCOUNTRYCODE16, pcc);
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(USHORT, len);
return DOSCASEMAP(len, pcc, pch);
return Dos16CaseMap(len, pcc, pch);
}
static APIRET16 bridge16to32_DOSGETCTRYINFO(uint8 *args) {
static APIRET16 bridge16to32_Dos16GetCtryInfo(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PUSHORT, dlen);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCOUNTRYINFO16, pch);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PCOUNTRYCODE16, pcc);
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(USHORT, len);
return DOSGETCTRYINFO(len, pcc, pch, dlen);
return Dos16GetCtryInfo(len, pcc, pch, dlen);
}
LX_NATIVE_MODULE_16BIT_SUPPORT()
LX_NATIVE_MODULE_16BIT_API(DOSGETDBCSEV)
LX_NATIVE_MODULE_16BIT_API(DOSCASEMAP)
LX_NATIVE_MODULE_16BIT_API(DOSGETCTRYINFO)
LX_NATIVE_MODULE_16BIT_API(Dos16GetDBCSEv)
LX_NATIVE_MODULE_16BIT_API(Dos16CaseMap)
LX_NATIVE_MODULE_16BIT_API(Dos16GetCtryInfo)
LX_NATIVE_MODULE_16BIT_SUPPORT_END()
LX_NATIVE_MODULE_DEINIT({
@@ -43,20 +43,20 @@ LX_NATIVE_MODULE_DEINIT({
static int init16_nls(void) {
LX_NATIVE_MODULE_INIT_16BIT_SUPPORT()
LX_NATIVE_INIT_16BIT_BRIDGE(DOSGETDBCSEV, 10)
LX_NATIVE_INIT_16BIT_BRIDGE(DOSCASEMAP, 10)
LX_NATIVE_INIT_16BIT_BRIDGE(DOSGETCTRYINFO, 14)
LX_NATIVE_INIT_16BIT_BRIDGE(Dos16GetDBCSEv, 10)
LX_NATIVE_INIT_16BIT_BRIDGE(Dos16CaseMap, 10)
LX_NATIVE_INIT_16BIT_BRIDGE(Dos16GetCtryInfo, 14)
LX_NATIVE_MODULE_INIT_16BIT_SUPPORT_END()
return 1;
}
LX_NATIVE_MODULE_INIT({ if (!init16_nls()) return 0; })
LX_NATIVE_EXPORT16(DOSGETDBCSEV, 4),
LX_NATIVE_EXPORT16_DIFFERENT_NAME(Dos16GetDBCSEv, "DOSGETDBCSEV", 4),
LX_NATIVE_EXPORT(DosQueryCtryInfo, 5),
LX_NATIVE_EXPORT(DosQueryDBCSEnv, 6),
LX_NATIVE_EXPORT(DosMapCase, 7),
LX_NATIVE_EXPORT16(DOSCASEMAP, 391),
LX_NATIVE_EXPORT16(DOSGETCTRYINFO, 393)
LX_NATIVE_EXPORT16_DIFFERENT_NAME(Dos16CaseMap, "DOSCASEMAP", 391),
LX_NATIVE_EXPORT16_DIFFERENT_NAME(Dos16GetCtryInfo, "DOSGETCTRYINFO", 393)
LX_NATIVE_MODULE_INIT_END()
#endif /* LX_LEGACY */
native/nls.c
+3 -3
View File
@@ -11,7 +11,7 @@
#include "nls-lx.h"
APIRET16 DOSGETDBCSEV(USHORT buflen, PCOUNTRYCODE16 pcc, PCHAR buf)
APIRET16 Dos16GetDBCSEv(USHORT buflen, PCOUNTRYCODE16 pcc, PCHAR buf)
{
// !!! FIXME: implement this for real.
TRACE_NATIVE("Dos16GetDBCSEv(%u, %p, %p)", (uint) buflen, pcc, buf);
@@ -21,7 +21,7 @@ APIRET16 DOSGETDBCSEV(USHORT buflen, PCOUNTRYCODE16 pcc, PCHAR buf)
return NO_ERROR;
} // Dos16GetDBCSEv
APIRET16 DOSCASEMAP(USHORT len, PCOUNTRYCODE16 pcc, PCHAR pch)
APIRET16 Dos16CaseMap(USHORT len, PCOUNTRYCODE16 pcc, PCHAR pch)
{
TRACE_NATIVE("Dos16CaseMap(%u, %p, %p)", (uint) len, pcc, pch);
if (!pcc) return ERROR_INVALID_PARAMETER;
@@ -32,7 +32,7 @@ APIRET16 DOSCASEMAP(USHORT len, PCOUNTRYCODE16 pcc, PCHAR pch)
return ret;
}
APIRET16 DOSGETCTRYINFO(USHORT len, PCOUNTRYCODE16 pcc, PCOUNTRYINFO16 pch, PUSHORT dlen)
APIRET16 Dos16GetCtryInfo(USHORT len, PCOUNTRYCODE16 pcc, PCOUNTRYINFO16 pch, PUSHORT dlen)
{
TRACE_NATIVE("Dos16GetCtryInfo(%u, %p, %p)",len, pcc, pch);
if (!pcc || !pch || (len < 6)) return ERROR_INVALID_PARAMETER;
native/nls.h
+3 -3
View File
@@ -68,9 +68,9 @@ typedef struct
USHORT abReserved2[5];
} COUNTRYINFO16, *PCOUNTRYINFO16;
OS2EXPORT APIRET16 OS2API16 DOSGETDBCSEV(USHORT buflen, PCOUNTRYCODE16 pcc, PCHAR buf) OS2APIINFO(4);
OS2EXPORT APIRET16 OS2API16 DOSCASEMAP(USHORT len, PCOUNTRYCODE16 pcc, PCHAR pch) OS2APIINFO(391);
OS2EXPORT APIRET16 OS2API16 DOSGETCTRYINFO(USHORT len, PCOUNTRYCODE16 pcc, PCOUNTRYINFO16 pch, PUSHORT dlen) OS2APIINFO(393);
OS2EXPORT APIRET16 OS2API16 Dos16GetDBCSEv(USHORT buflen, PCOUNTRYCODE16 pcc, PCHAR buf) OS2APIINFO(ord=4,name=DOSGETDBCSEV);
OS2EXPORT APIRET16 OS2API16 Dos16CaseMap(USHORT len, PCOUNTRYCODE16 pcc, PCHAR pch) OS2APIINFO(ord=391,name=DOSCASEMAP);
OS2EXPORT APIRET16 OS2API16 Dos16GetCtryInfo(USHORT len, PCOUNTRYCODE16 pcc, PCOUNTRYINFO16 pch, PUSHORT dlen) OS2APIINFO(ord=393,name=DOSGETCTRYINFO);
#ifdef __cplusplus
}
native/sesmgr.c
+1 -1
View File
@@ -18,7 +18,7 @@ printf("'%s', '%s', '%s'\n", psd->PgmTitle, psd->PgmName, psd->IconFile);
return ERROR_NOT_ENOUGH_MEMORY;
} // DosStartSession
OS2EXPORT APIRET16 OS2API16 Dos16SMSetTitle(PCHAR title)
APIRET16 Dos16SMSetTitle(PCHAR title)
{
TRACE_NATIVE("Dos16SMSetTitle(%p)", title);
return NO_ERROR;