From 6645e904c749e508cdcd7d436fd279af54c3c1d0 Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Wed, 25 Feb 2004 23:50:28 +0000
Subject: [PATCH] Added Winehq2ros.patch for winmm

svn path=/trunk/; revision=8391
---
 reactos/lib/winmm/winehq2ros.patch | 68 ++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 reactos/lib/winmm/winehq2ros.patch

diff --git a/reactos/lib/winmm/winehq2ros.patch b/reactos/lib/winmm/winehq2ros.patch
new file mode 100644
index 00000000000..44c2764e0eb
--- /dev/null
+++ b/reactos/lib/winmm/winehq2ros.patch
@@ -0,0 +1,68 @@
+diff -u /c/source/wine/dlls/winmm/lolvldrv.c winmm/lolvldrv.c
+--- /c/source/wine/dlls/winmm/lolvldrv.c	Wed Feb 25 18:47:36 2004
++++ winmm/lolvldrv.c	Tue Feb 17 01:15:52 2004
+@@ -497,10 +497,12 @@
+     case DRV_QUERYDEVICEINTERFACESIZE:
+         return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
+ 
++#ifdef __WINESRC__
+     case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */
+     case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/
+     case DRV_QUERYDSOUNDGUID: /* Wine-specific: Retrieve DirectSound driver GUID */
+ 	return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
++#endif
+ 
+     default:
+ 	WARN("Unknown call %04x\n", uMsg);
+@@ -741,8 +743,9 @@
+ static BOOL	MMDRV_InitHardcoded(void)
+ {
+     /* first load hardware drivers */
++#ifndef __REACTOS__
+     MMDRV_Install("wineoss.drv",   	"wineoss.drv",	FALSE);
+-
++#endif /* __REACTOS__ */
+     /* finish with mappers */
+     MMDRV_Install("wavemapper",	   	"msacm.drv",	TRUE);
+     MMDRV_Install("midimapper",   	"midimap.drv",	TRUE);
+
+diff -u /c/source/wine/dlls/winmm/time.c winmm/time.c
+--- /c/source/wine/dlls/winmm/time.c	Mon Jan 12 16:03:10 2004
++++ winmm/time.c	Sun Feb 15 16:55:10 2004
+@@ -175,14 +175,19 @@
+     volatile HANDLE *pActive = (volatile HANDLE *)&TIME_hMMTimer;
+     DWORD last_time, cur_time;
+ 
++#ifndef __REACTOS__
+     usleep(MMSYSTIME_STDINTERVAL * 1000);
++#endif /* __REACTOS__ */
++
+     last_time = GetTickCount();
+     while (*pActive) {
+ 	TIME_MMSysTimeCallback(iData);
+ 	cur_time = GetTickCount();
+ 	while (last_time < cur_time)
+ 	    last_time += MMSYSTIME_STDINTERVAL;
++#ifndef __REACTOS__
+ 	usleep((last_time - cur_time) * 1000);
++#endif /* __REACTOS__ */
+     }
+     return 0;
+ }
+
+diff -u /c/source/wine/dlls/winmm/winmm.c winmm/winmm.c
+--- /c/source/wine/dlls/winmm/winmm.c	Wed Feb 25 14:28:52 2004
++++ winmm/winmm.c	Sun Feb 15 22:58:58 2004
+@@ -125,10 +125,12 @@
+         loaded = -1;
+         if (h)
+         {
++#ifndef __REACTOS__
+             pGetModuleHandle16 = (void*)GetProcAddress(h, "GetModuleHandle16");
+             pLoadLibrary16 = (void*)GetProcAddress(h, "LoadLibrary16");
+             if (pGetModuleHandle16 && pLoadLibrary16 &&
+                 (pGetModuleHandle16("MMSYSTEM.DLL") || pLoadLibrary16("MMSYSTEM.DLL")))
++#endif /* __REACTOS__ */
+                 loaded = 1;
+         }
+     }