From 85ef456512c12b2dd684139ce6a6496dd329ccc3 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 26 Apr 2004 23:29:44 +0000 Subject: [PATCH] Fix the DDE PFNCALLBACK prototype. --- dlls/shell32/shlexec.c | 4 ++-- dlls/user/dde/dde_private.h | 2 +- dlls/user/dde/misc.c | 2 +- dlls/user/dde/server.c | 8 ++++---- include/ddeml.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 52a1200f90..a0e6dc5ad4 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -713,8 +713,8 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, * callback for the DDE connection. not really usefull */ static HDDEDATA CALLBACK dde_cb(UINT uType, UINT uFmt, HCONV hConv, - HSZ hsz1, HSZ hsz2, - HDDEDATA hData, DWORD dwData1, DWORD dwData2) + HSZ hsz1, HSZ hsz2, HDDEDATA hData, + ULONG_PTR dwData1, ULONG_PTR dwData2) { return NULL; } diff --git a/dlls/user/dde/dde_private.h b/dlls/user/dde/dde_private.h index 802e8ced72..ca8d27f32e 100644 --- a/dlls/user/dde/dde_private.h +++ b/dlls/user/dde/dde_private.h @@ -188,7 +188,7 @@ typedef enum { extern HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInst, UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - DWORD dwData1, DWORD dwData2); + ULONG_PTR dwData1, ULONG_PTR dwData2); extern HDDEDATA WDML_InvokeCallback16(PFNCALLBACK pfn, UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2); diff --git a/dlls/user/dde/misc.c b/dlls/user/dde/misc.c index f78f106956..727d6f4533 100644 --- a/dlls/user/dde/misc.c +++ b/dlls/user/dde/misc.c @@ -717,7 +717,7 @@ void WDML_NotifyThreadDetach(void) */ HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInstance, UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - DWORD dwData1, DWORD dwData2) + ULONG_PTR dwData1, ULONG_PTR dwData2) { HDDEDATA ret; diff --git a/dlls/user/dde/server.c b/dlls/user/dde/server.c index 8aa596db32..ada9349dca 100644 --- a/dlls/user/dde/server.c +++ b/dlls/user/dde/server.c @@ -458,7 +458,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w { /* pass on to the callback */ hDdeData = WDML_InvokeCallback(pInstance, XTYP_CONNECT, - 0, 0, hszTop, hszApp, 0, (DWORD)pcc, self); + 0, 0, hszTop, hszApp, 0, (ULONG_PTR)pcc, self); if ((UINT)hDdeData) { pConv = WDML_CreateServerConv(pInstance, hwndClient, hwndServer, @@ -467,7 +467,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w { if (pcc) pConv->wStatus |= ST_ISLOCAL; WDML_InvokeCallback(pInstance, XTYP_CONNECT_CONFIRM, 0, (HCONV)pConv, - hszTop, hszApp, 0, (DWORD)pcc, self); + hszTop, hszApp, 0, (ULONG_PTR)pcc, self); } } } @@ -476,7 +476,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w { /* pass on to the callback */ hDdeData = WDML_InvokeCallback(pInstance, XTYP_WILDCONNECT, - 0, 0, hszTop, hszApp, 0, (DWORD)pcc, self); + 0, 0, hszTop, hszApp, 0, (ULONG_PTR)pcc, self); if (hDdeData == (HDDEDATA)CBR_BLOCK) { @@ -499,7 +499,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w { if (pcc) pConv->wStatus |= ST_ISLOCAL; WDML_InvokeCallback(pInstance, XTYP_CONNECT_CONFIRM, 0, (HCONV)pConv, - hszp[i].hszTopic, hszp[i].hszSvc, 0, (DWORD)pcc, self); + hszp[i].hszTopic, hszp[i].hszSvc, 0, (ULONG_PTR)pcc, self); } } DdeUnaccessData(hDdeData); diff --git a/include/ddeml.h b/include/ddeml.h index b198f31a17..5d64732ebc 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -287,7 +287,7 @@ DECLARE_HANDLE(HDDEDATA); *******************************************************/ typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ, - HDDEDATA, DWORD, DWORD); + HDDEDATA, ULONG_PTR, ULONG_PTR); /*************************************************** -- 2.32.0.93.g670b81a890