marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the DDE PFNCALLBACK prototype.

oldstable
Dmitry Timoshkov 2004-04-26 23:29:44 +00:00 committed by Alexandre Julliard
parent 3795a08149
commit 85ef456512
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shell32/shlexec.c
View File

@ -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;
}

2
dlls/user/dde/dde_private.h
View File

@ -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);

2
dlls/user/dde/misc.c
View File

@ -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;

8
dlls/user/dde/server.c
View File

@ -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);

2
include/ddeml.h
View File

@ -287,7 +287,7 @@ DECLARE_HANDLE(HDDEDATA);
*******************************************************/
typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ,
HDDEDATA, DWORD, DWORD);
HDDEDATA, ULONG_PTR, ULONG_PTR);
/***************************************************