[ros-diffs] [khornicek] 64880: [USER32] - fix CID 514402 (by Christoph) [MMIXER] - fix CID 503774, 715945, 511119 [WS2_32_NEW] - fix a debug print

Author: khornicek
Date: Tue Oct 21 21:08:51 2014
New Revision: 64880

URL: http://svn.reactos.org/svn/reactos?rev=64880&view=rev
Log:
[USER32]
- fix CID 514402 (by Christoph)
[MMIXER]
- fix CID 503774, 715945, 511119
[WS2_32_NEW]
- fix a debug print

Modified:
    trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c
    trunk/reactos/lib/drivers/sound/mmixer/controls.c
    trunk/reactos/lib/drivers/sound/mmixer/midi.c
    trunk/reactos/lib/drivers/sound/mmixer/mixer.c
    trunk/reactos/win32ss/user/user32/misc/desktop.c

Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c	[iso-8859-1] Tue Oct 21 21:08:51
2014
@@ -918,7 +918,7 @@
     WCHAR ServiceBuffer[17];
     DWORD HostLength = 0, ServLength = 0;
     PWCHAR ServiceString = NULL, HostString = NULL;
-    DPRINT("getaddrinfo: %p, %p, %p, %lx\n", host, serv, sa, salen);
+    DPRINT("getnameinfo: %p, %p, %p, %lx\n", host, serv, sa, salen);
 
     /* Check for WSAStartup */
     if ((ErrorCode = WsQuickProlog()) != ERROR_SUCCESS) return ErrorCode;

Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/controls.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/controls.c	[iso-8859-1] Tue Oct 21 21:08:51
2014
@@ -1644,7 +1644,7 @@
     IN LPMIXER_DATA MixerData,
     IN PULONG DeviceCount)
 {
-    MIXER_STATUS Status;
+    MIXER_STATUS Status = MM_STATUS_SUCCESS;
     PTOPOLOGY Topology;
     ULONG NodeIndex;
     LPMIXER_INFO MixerInfo = NULL;

Modified: trunk/reactos/lib/drivers/sound/mmixer/midi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/midi.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/midi.c	[iso-8859-1] Tue Oct 21 21:08:51 2014
@@ -72,7 +72,7 @@
     MidiInfo->PinId = PinId;
 
     /* sanity check */
-    ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN);
+    ASSERT(!DeviceName || (wcslen(DeviceName) + 1 < MAXPNAMELEN));
 
     /* copy device name */
     if (bInput && DeviceName)

Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/mixer.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c	[iso-8859-1] Tue Oct 21 21:08:51 2014
@@ -328,7 +328,7 @@
 
     if (MixerLineControls->cbmxctrl != sizeof(MIXERCONTROLW))
     {
-        DPRINT1("Invalid MixerLineControls cbmxctrl passed %lu expected %lu\n",
MixerLineControls->cbStruct, sizeof(MIXERLINECONTROLSW));
+        DPRINT1("Invalid MixerLineControls cbmxctrl passed %lu expected %lu\n",
MixerLineControls->cbmxctrl, sizeof(MIXERCONTROLW));
         /* invalid parameter */
         return MM_STATUS_INVALID_PARAMETER;
     }

Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/desktop.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/desktop.c	[iso-8859-1] Tue Oct 21 21:08:51
2014
@@ -330,7 +330,10 @@
           }
 
           Ret = NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, pvParam,
fWinIni);
-          RtlFreeUnicodeString(&ustrWallpaper);
+
+          if (pvParam)
+            RtlFreeUnicodeString(&ustrWallpaper);
+
           return Ret;
       }
     }