diff --git a/reactos/dll/win32/ws2_32_new/src/addrinfo.c b/reactos/dll/win32/ws2_32_new/src/addrinfo.c index 1ee48fbd849..3d550cc4349 100644 --- a/reactos/dll/win32/ws2_32_new/src/addrinfo.c +++ b/reactos/dll/win32/ws2_32_new/src/addrinfo.c @@ -918,7 +918,7 @@ getnameinfo(const struct sockaddr FAR *sa, 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; diff --git a/reactos/lib/drivers/sound/mmixer/controls.c b/reactos/lib/drivers/sound/mmixer/controls.c index 886d6a2c73d..e00fca399cd 100644 --- a/reactos/lib/drivers/sound/mmixer/controls.c +++ b/reactos/lib/drivers/sound/mmixer/controls.c @@ -1644,7 +1644,7 @@ MMixerSetupFilter( IN LPMIXER_DATA MixerData, IN PULONG DeviceCount) { - MIXER_STATUS Status; + MIXER_STATUS Status = MM_STATUS_SUCCESS; PTOPOLOGY Topology; ULONG NodeIndex; LPMIXER_INFO MixerInfo = NULL; diff --git a/reactos/lib/drivers/sound/mmixer/midi.c b/reactos/lib/drivers/sound/mmixer/midi.c index f922970263a..afe1a22bfd8 100644 --- a/reactos/lib/drivers/sound/mmixer/midi.c +++ b/reactos/lib/drivers/sound/mmixer/midi.c @@ -72,7 +72,7 @@ MMixerAddMidiPin( MidiInfo->PinId = PinId; /* sanity check */ - ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN); + ASSERT(!DeviceName || (wcslen(DeviceName) + 1 < MAXPNAMELEN)); /* copy device name */ if (bInput && DeviceName) diff --git a/reactos/lib/drivers/sound/mmixer/mixer.c b/reactos/lib/drivers/sound/mmixer/mixer.c index bc9cf071c9a..a9e2944926a 100644 --- a/reactos/lib/drivers/sound/mmixer/mixer.c +++ b/reactos/lib/drivers/sound/mmixer/mixer.c @@ -328,7 +328,7 @@ MMixerGetLineControls( 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; } diff --git a/reactos/win32ss/user/user32/misc/desktop.c b/reactos/win32ss/user/user32/misc/desktop.c index b32c9d5039c..ae10e8c8a8c 100644 --- a/reactos/win32ss/user/user32/misc/desktop.c +++ b/reactos/win32ss/user/user32/misc/desktop.c @@ -330,7 +330,10 @@ RealSystemParametersInfoA(UINT uiAction, } Ret = NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, pvParam, fWinIni); - RtlFreeUnicodeString(&ustrWallpaper); + + if (pvParam) + RtlFreeUnicodeString(&ustrWallpaper); + return Ret; } }