- Various bugfixes found by Amine48rz

svn path=/trunk/; revision=44201
This commit is contained in:
Johannes Anderwald 2009-11-16 18:13:56 +00:00
parent a2350b62d8
commit 8e33ff3436
4 changed files with 8 additions and 5 deletions

View file

@ -25,8 +25,8 @@
<directory name="dplayx"> <directory name="dplayx">
<xi:include href="dplayx/dplayx.rbuild" /> <xi:include href="dplayx/dplayx.rbuild" />
</directory> </directory>
<directory name="dsound"> <directory name="dsound_new">
<xi:include href="dsound/dsound.rbuild" /> <xi:include href="dsound_new/dsound_new.rbuild" />
</directory> </directory>
<directory name="dxdiagn"> <directory name="dxdiagn">
<xi:include href="dxdiagn/dxdiagn.rbuild" /> <xi:include href="dxdiagn/dxdiagn.rbuild" />

View file

@ -408,7 +408,7 @@ EnumAudioDeviceInterfaces(
} }
/* sanity check */ /* sanity check */
ASSERT(OutRootInfo); ASSERT(*OutRootInfo);
CurInfo = *OutRootInfo; CurInfo = *OutRootInfo;

View file

@ -91,7 +91,11 @@ DoDSoundCallback(
} }
DriverNameA[0] = 0; DriverNameA[0] = 0;
WideCharToMultiByte(CP_ACP, 0, ProductName, -1, DriverNameA, sizeof(DriverNameA) / sizeof(char), NULL, NULL); if (ProductName)
{
WideCharToMultiByte(CP_ACP, 0, ProductName, -1, DriverNameA, sizeof(DriverNameA) / sizeof(char), NULL, NULL);
DriverNameA[(sizeof(DriverNameA) / sizeof(char))-1] = 0;
}
return lpDSEnumCallbackA(DeviceGuid, (LPSTR)Buffer, DriverNameA, lpContext); return lpDSEnumCallbackA(DeviceGuid, (LPSTR)Buffer, DriverNameA, lpContext);
} }

View file

@ -157,7 +157,6 @@ IDirectSoundNotify_fnSetNotificationPositions(
if (Result != ERROR_SUCCESS) if (Result != ERROR_SUCCESS)
{ {
DPRINT1("Failed to enable event %p Position %u\n", pcPositionNotifies[Index].hEventNotify, pcPositionNotifies[Index].dwOffset); DPRINT1("Failed to enable event %p Position %u\n", pcPositionNotifies[Index].hEventNotify, pcPositionNotifies[Index].dwOffset);
return DSERR_GENERIC;
} }
} }
} }