Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32] Sync ddeclient.c with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70170
This commit is contained in:
Amine Khaldi 2015-11-27 22:50:54 +00:00
parent fd71c4cbec
commit 8f1fa5e08f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/media/doc/README.WINE
View file

@ -304,7 +304,7 @@ User32 -
reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24
reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c)
reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55
reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.37 reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.37
reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22
reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55

6
reactos/win32ss/user/user32/misc/ddeclient.c
View file

@ -88,7 +88,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic,
{ {
HWND hwndClient; HWND hwndClient;
WDML_INSTANCE* pInstance; WDML_INSTANCE* pInstance;
WDML_CONV* pConv = NULL; WDML_CONV* pConv;
ATOM aSrv = 0, aTpc = 0; ATOM aSrv = 0, aTpc = 0;
TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC);
@ -1126,7 +1126,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
{ {
WDML_CONV* pConv; WDML_CONV* pConv;
WDML_XACT* pXAct; WDML_XACT* pXAct;
HDDEDATA hDdeData = 0; HDDEDATA hDdeData;
TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n", TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n",
pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult);
@ -1364,7 +1364,7 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA
*/ */
BOOL WINAPI DdeDisconnect(HCONV hConv) BOOL WINAPI DdeDisconnect(HCONV hConv)
{ {
WDML_CONV* pConv = NULL; WDML_CONV* pConv;
WDML_XACT* pXAct; WDML_XACT* pXAct;
BOOL ret = FALSE; BOOL ret = FALSE;