ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases 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
reactos/media/doc/README.WINE
+1 -1
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/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/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/ddeclient.c
+3 -3
View File
@@ -88,7 +88,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic,
{
HWND hwndClient;
WDML_INSTANCE* pInstance;
WDML_CONV* pConv = NULL;
WDML_CONV* pConv;
ATOM aSrv = 0, aTpc = 0;
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_XACT* pXAct;
HDDEDATA hDdeData = 0;
HDDEDATA hDdeData;
TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n",
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)
{
WDML_CONV* pConv = NULL;
WDML_CONV* pConv;
WDML_XACT* pXAct;
BOOL ret = FALSE;