[ros-diffs] [janderwald] 44201: - Various bugfixes found by Amine48rz

[janderwald at svn.reactos.org]

Author: janderwald
Date: Mon Nov 16 19:13:56 2009
New Revision: 44201

URL: http://svn.reactos.org/svn/reactos?rev=44201&view=rev
Log:
- Various bugfixes found by Amine48rz

Modified:
    trunk/reactos/dll/directx/directx.rbuild
    trunk/reactos/dll/directx/dsound_new/devicelist.c
    trunk/reactos/dll/directx/dsound_new/enum.c
    trunk/reactos/dll/directx/dsound_new/notify.c

Modified: trunk/reactos/dll/directx/directx.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild?rev=44201&r1=44200&r2=44201&view=diff
==============================================================================
--- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Mon Nov 16 19:13:56 2009
@@ -25,8 +25,8 @@
 	<directory name="dplayx">
 		<xi:include href="dplayx/dplayx.rbuild" />
 	</directory>
-	<directory name="dsound">
-		<xi:include href="dsound/dsound.rbuild" />
+	<directory name="dsound_new">
+		<xi:include href="dsound_new/dsound_new.rbuild" />
 	</directory>
 	<directory name="dxdiagn">
 		<xi:include href="dxdiagn/dxdiagn.rbuild" />

Modified: trunk/reactos/dll/directx/dsound_new/devicelist.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/devicelist.c?rev=44201&r1=44200&r2=44201&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/devicelist.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/devicelist.c [iso-8859-1] Mon Nov 16 19:13:56 2009
@@ -408,7 +408,7 @@
     }
 
     /* sanity check */
-    ASSERT(OutRootInfo);
+    ASSERT(*OutRootInfo);
 
     CurInfo = *OutRootInfo;
 

Modified: trunk/reactos/dll/directx/dsound_new/enum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/enum.c?rev=44201&r1=44200&r2=44201&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/enum.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/enum.c [iso-8859-1] Mon Nov 16 19:13:56 2009
@@ -91,7 +91,11 @@
         }
 
         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);
     }

Modified: trunk/reactos/dll/directx/dsound_new/notify.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/notify.c?rev=44201&r1=44200&r2=44201&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dsound_new/notify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dsound_new/notify.c [iso-8859-1] Mon Nov 16 19:13:56 2009
@@ -157,7 +157,6 @@
             if (Result != ERROR_SUCCESS)
             {
                 DPRINT1("Failed to enable event %p Position %u\n", pcPositionNotifies[Index].hEventNotify, pcPositionNotifies[Index].dwOffset);
-                return DSERR_GENERIC;
             }
         }
     }