[ros-diffs] [akhaldi] 70170: [USER32] Sync ddeclient.c with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Fri Nov 27 22:50:54 2015
New Revision: 70170

URL: http://svn.reactos.org/svn/reactos?rev=70170&view=rev
Log:
[USER32] Sync ddeclient.c with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/media/doc/README.WINE
    trunk/reactos/win32ss/user/user32/misc/ddeclient.c

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Nov 27 22:50:54 2015
@@ -304,7 +304,7 @@
   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

Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/ddeclient.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/ddeclient.c	[iso-8859-1] Fri Nov 27 22:50:54
2015
@@ -88,7 +88,7 @@
 {
     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 @@
 {
     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 @@
  */
 BOOL WINAPI DdeDisconnect(HCONV hConv)
 {
-    WDML_CONV*	pConv = NULL;
+    WDML_CONV*	pConv;
     WDML_XACT*	pXAct;
     BOOL	ret = FALSE;