Fix the DDE PFNCALLBACK prototype

Dmitry Timoshkov dmitry at baikal.ru
Sat Apr 24 01:41:47 CDT 2004


Hello,

I've fixed PFNCALLBACK definition while I was at it.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Fix the DDE PFNCALLBACK prototype.

diff -u cvs/hq/wine/dlls/shell32/shlexec.c wine/dlls/shell32/shlexec.c
--- cvs/hq/wine/dlls/shell32/shlexec.c	2004-04-24 14:29:47.000000000 +0900
+++ wine/dlls/shell32/shlexec.c	2004-04-24 14:37:48.000000000 +0900
@@ -713,8 +713,8 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath
  * 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 -u cvs/hq/wine/dlls/user/dde/dde_private.h wine/dlls/user/dde/dde_private.h
--- cvs/hq/wine/dlls/user/dde/dde_private.h	2003-05-20 14:07:31.000000000 +0900
+++ wine/dlls/user/dde/dde_private.h	2004-04-24 14:37:48.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/user/dde/misc.c wine/dlls/user/dde/misc.c
--- cvs/hq/wine/dlls/user/dde/misc.c	2004-04-24 14:29:48.000000000 +0900
+++ wine/dlls/user/dde/misc.c	2004-04-24 14:37:48.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/user/dde/server.c wine/dlls/user/dde/server.c
--- cvs/hq/wine/dlls/user/dde/server.c	2003-09-09 15:36:27.000000000 +0900
+++ wine/dlls/user/dde/server.c	2004-04-24 15:29:36.000000000 +0900
@@ -458,7 +458,7 @@ static LRESULT CALLBACK WDML_ServerNameP
 		{
 		    /* 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_ServerNameP
                         {
                             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_ServerNameP
 	    {
 		/* 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_ServerNameP
                             {
                                 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 -u cvs/hq/wine/include/ddeml.h wine/include/ddeml.h
--- cvs/hq/wine/include/ddeml.h	2003-09-09 15:36:34.000000000 +0900
+++ wine/include/ddeml.h	2004-04-24 14:37:48.000000000 +0900
@@ -287,7 +287,7 @@ DECLARE_HANDLE(HDDEDATA);
 *******************************************************/
 
 typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ,
-					 HDDEDATA, DWORD, DWORD);
+					 HDDEDATA, ULONG_PTR, ULONG_PTR);
 
 /***************************************************
 






More information about the wine-patches mailing list