[KERNEL32][BEEP]

Int32x32To64 used with unsigned input values will cause unintentional sign extension. There is a lot of code in ROS that is still not fixed!!
Fixes BEEP sound. See also r64020, CORE-8502 and CORE-8505 for more details.
CORE-8505 #comment CsrCaptureTimeout and BEEP code fixed.

svn path=/trunk/; revision=65325

diff --git a/reactos/dll/ntdll/csr/capture.c b/reactos/dll/ntdll/csr/capture.c
index ad26625..1f1e695 100644 (file)
--- a/reactos/dll/ntdll/csr/capture.c
+++ b/reactos/dll/ntdll/csr/capture.c
@@ -321,7 +321,7 @@ CsrCaptureTimeout(IN ULONG Milliseconds,
     if (Milliseconds == -1) return NULL;
 
     /* Convert to relative ticks */
-    Timeout->QuadPart = Int32x32To64(Milliseconds, -10000);
+    Timeout->QuadPart = Milliseconds * -10000LL;
     return Timeout;
 }
 

diff --git a/reactos/drivers/base/beep/beep.c b/reactos/drivers/base/beep/beep.c
index 9ba8670..7eb64c2 100644 (file)
--- a/reactos/drivers/base/beep/beep.c
+++ b/reactos/drivers/base/beep/beep.c
@@ -339,7 +339,7 @@ BeepStartIo(IN PDEVICE_OBJECT DeviceObject,
         {
             /* Beep successful, queue a DPC to stop it */
             Status = STATUS_SUCCESS;
-            DueTime.QuadPart = Int32x32To64(BeepParam->Duration, -10000);
+            DueTime.QuadPart = BeepParam->Duration * -10000LL;
             InterlockedIncrement(&DeviceExtension->TimerActive);
             KeSetTimer(&DeviceExtension->Timer, DueTime, &DeviceObject->Dpc);
         }