From 99429545d9fd97410ece05903ba4acfd610bfb2a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 27 Nov 2015 22:51:40 +0000 Subject: [PATCH] [USER32] Sync ddeserver.c with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=70171 --- reactos/media/doc/README.WINE | 2 +- reactos/win32ss/user/user32/misc/ddeserver.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 60d666160e7..6e4a91464c3 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -305,7 +305,7 @@ User32 - 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.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.55 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/winhelp.c # Last sync date unknown diff --git a/reactos/win32ss/user/user32/misc/ddeserver.c b/reactos/win32ss/user/user32/misc/ddeserver.c index f8ab9b06194..b6bde97a13c 100644 --- a/reactos/win32ss/user/user32/misc/ddeserver.c +++ b/reactos/win32ss/user/user32/misc/ddeserver.c @@ -50,12 +50,12 @@ static LRESULT CALLBACK WDML_ServerConvProc(HWND, UINT, WPARAM, LPARAM); */ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) { - WDML_INSTANCE* pInstance = NULL; - WDML_LINK* pLink = NULL; - HDDEDATA hDdeData = 0; - HGLOBAL hItemData = 0; - WDML_CONV* pConv = NULL; - ATOM atom = 0; + WDML_INSTANCE* pInstance; + WDML_LINK* pLink; + HDDEDATA hDdeData; + HGLOBAL hItemData; + WDML_CONV* pConv; + ATOM atom; UINT count; TRACE("(%d,%p,%p)\n", idInst, hszTopic, hszItem); @@ -368,7 +368,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w { HWND hwndClient; HSZ hszApp, hszTop; - HDDEDATA hDdeData = 0; + HDDEDATA hDdeData; WDML_INSTANCE* pInstance; UINT_PTR uiLo, uiHi;