- 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

View file

@ -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;

View file

@ -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;

View file

@ -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)

View file

@ -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;
}

View file

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