Commit 8fb6b02d authored by Tristan Schmelcher's avatar Tristan Schmelcher Committed by Alexandre Julliard

ddeml: More calling convention fixes.

parent cab51a05
...@@ -386,6 +386,12 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData, HCONV hConv, ...@@ -386,6 +386,12 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData, HCONV hConv,
HSZ hszItem, UINT16 wFmt, UINT16 wType, HSZ hszItem, UINT16 wFmt, UINT16 wType,
DWORD dwTimeout, LPDWORD pdwResult) DWORD dwTimeout, LPDWORD pdwResult)
{ {
if (cbData != (DWORD)-1)
{
/* pData is not a pointer if cbData is -1, so we linearize the address
* here rather than in the calling code. */
pData = MapSL((SEGPTR)pData);
}
return DdeClientTransaction(pData, cbData, hConv, hszItem, return DdeClientTransaction(pData, cbData, hConv, hszItem,
wFmt, wType, dwTimeout, pdwResult); wFmt, wType, dwTimeout, pdwResult);
} }
......
2 pascal -ret16 DdeInitialize(ptr segptr long long) DdeInitialize16 2 pascal -ret16 DdeInitialize(ptr segptr long long) DdeInitialize16
3 pascal -ret16 DdeUninitialize(long) DdeUninitialize16 3 pascal -ret16 DdeUninitialize(long) DdeUninitialize16
4 pascal DdeConnectList(long long long word ptr) DdeConnectList16 4 pascal DdeConnectList(long long long long ptr) DdeConnectList16
5 pascal DdeQueryNextServer(long long) DdeQueryNextServer16 5 pascal DdeQueryNextServer(long long) DdeQueryNextServer16
6 pascal -ret16 DdeDisconnectList(long) DdeDisconnectList16 6 pascal -ret16 DdeDisconnectList(long) DdeDisconnectList16
7 pascal DdeConnect(long long long ptr) DdeConnect16 7 pascal DdeConnect(long long long ptr) DdeConnect16
8 pascal -ret16 DdeDisconnect(long) DdeDisconnect16 8 pascal -ret16 DdeDisconnect(long) DdeDisconnect16
9 pascal -ret16 DdeQueryConvInfo (long long ptr) DdeQueryConvInfo16 9 pascal -ret16 DdeQueryConvInfo(long long ptr) DdeQueryConvInfo16
10 pascal -ret16 DdeSetUserHandle(long long long) DdeSetUserHandle16 10 pascal -ret16 DdeSetUserHandle(long long long) DdeSetUserHandle16
11 pascal DdeClientTransaction(ptr long long long s_word s_word long ptr) DdeClientTransaction16 11 pascal DdeClientTransaction(long long long long word word long ptr) DdeClientTransaction16
12 pascal -ret16 DdeAbandonTransaction(long long long) DdeAbandonTransaction16 12 pascal -ret16 DdeAbandonTransaction(long long long) DdeAbandonTransaction16
13 pascal -ret16 DdePostAdvise(long long long) DdePostAdvise16 13 pascal -ret16 DdePostAdvise(long long long) DdePostAdvise16
14 pascal DdeCreateDataHandle(long ptr long long long word word) DdeCreateDataHandle16 14 pascal DdeCreateDataHandle(long ptr long long long word word) DdeCreateDataHandle16
15 pascal DdeAddData(word ptr long long) DdeAddData16 15 pascal DdeAddData(long ptr long long) DdeAddData16
16 pascal DdeGetData(word ptr long long) DdeGetData16 16 pascal DdeGetData(long ptr long long) DdeGetData16
17 pascal DdeAccessData(word ptr) DdeAccessData16 17 pascal DdeAccessData(long ptr) DdeAccessData16
18 pascal -ret16 DdeUnaccessData(word) DdeUnaccessData16 18 pascal -ret16 DdeUnaccessData(long) DdeUnaccessData16
19 pascal -ret16 DdeFreeDataHandle(long) DdeFreeDataHandle16 19 pascal -ret16 DdeFreeDataHandle(long) DdeFreeDataHandle16
20 pascal -ret16 DdeGetLastError(long) DdeGetLastError16 20 pascal -ret16 DdeGetLastError(long) DdeGetLastError16
21 pascal DdeCreateStringHandle(long str s_word) DdeCreateStringHandle16 21 pascal DdeCreateStringHandle(long str s_word) DdeCreateStringHandle16
22 pascal -ret16 DdeFreeStringHandle(long long) DdeFreeStringHandle16 22 pascal -ret16 DdeFreeStringHandle(long long) DdeFreeStringHandle16
23 pascal DdeQueryString (long long ptr long word) DdeQueryString16 23 pascal DdeQueryString(long long ptr long s_word) DdeQueryString16
24 pascal -ret16 DdeKeepStringHandle(long long) DdeKeepStringHandle16 24 pascal -ret16 DdeKeepStringHandle(long long) DdeKeepStringHandle16
26 pascal -ret16 DdeEnableCallback(long long word) DdeEnableCallback16 26 pascal -ret16 DdeEnableCallback(long long word) DdeEnableCallback16
27 pascal DdeNameService(long long long s_word) DdeNameService16 27 pascal DdeNameService(long long long word) DdeNameService16
36 pascal -ret16 DdeCmpStringHandles(long long) DdeCmpStringHandles16 36 pascal -ret16 DdeCmpStringHandles(long long) DdeCmpStringHandles16
37 pascal DdeReconnect(long) DdeReconnect 37 pascal DdeReconnect(long) DdeReconnect
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment