Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32]

Browse source 
- fix CID 514402 (by Christoph)
[MMIXER]
- fix CID 503774, 715945, 511119
[WS2_32_NEW]
- fix a debug print

svn path=/trunk/; revision=64880
This commit is contained in:
Kamil Hornicek 2014-10-21 21:08:51 +00:00
parent 12faa73856
commit a90ae59c2a
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/ws2_32_new/src/addrinfo.c
View file

@ -918,7 +918,7 @@ getnameinfo(const struct sockaddr FAR *sa,
WCHAR ServiceBuffer[17]; WCHAR ServiceBuffer[17];
DWORD HostLength = 0, ServLength = 0; DWORD HostLength = 0, ServLength = 0;
PWCHAR ServiceString = NULL, HostString = NULL; 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 */ /* Check for WSAStartup */
if ((ErrorCode = WsQuickProlog()) != ERROR_SUCCESS) return ErrorCode; if ((ErrorCode = WsQuickProlog()) != ERROR_SUCCESS) return ErrorCode;

2
reactos/lib/drivers/sound/mmixer/controls.c
View file

@ -1644,7 +1644,7 @@ MMixerSetupFilter(
IN LPMIXER_DATA MixerData, IN LPMIXER_DATA MixerData,
IN PULONG DeviceCount) IN PULONG DeviceCount)
{ {
MIXER_STATUS Status; MIXER_STATUS Status = MM_STATUS_SUCCESS;
PTOPOLOGY Topology; PTOPOLOGY Topology;
ULONG NodeIndex; ULONG NodeIndex;
LPMIXER_INFO MixerInfo = NULL; LPMIXER_INFO MixerInfo = NULL;

2
reactos/lib/drivers/sound/mmixer/midi.c
View file

@ -72,7 +72,7 @@ MMixerAddMidiPin(
MidiInfo->PinId = PinId; MidiInfo->PinId = PinId;
/* sanity check */ /* sanity check */
ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN); ASSERT(!DeviceName || (wcslen(DeviceName) + 1 < MAXPNAMELEN));
/* copy device name */ /* copy device name */
if (bInput && DeviceName) if (bInput && DeviceName)

2
reactos/lib/drivers/sound/mmixer/mixer.c
View file

@ -328,7 +328,7 @@ MMixerGetLineControls(
if (MixerLineControls->cbmxctrl != sizeof(MIXERCONTROLW)) 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 */ /* invalid parameter */
return MM_STATUS_INVALID_PARAMETER; return MM_STATUS_INVALID_PARAMETER;
} }

3
reactos/win32ss/user/user32/misc/desktop.c
View file

@ -330,7 +330,10 @@ RealSystemParametersInfoA(UINT uiAction,
} }
Ret = NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, pvParam, fWinIni); Ret = NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, uiParam, pvParam, fWinIni);
if (pvParam)
RtlFreeUnicodeString(&ustrWallpaper); RtlFreeUnicodeString(&ustrWallpaper);
return Ret; return Ret;
} }
} }