diff --git a/reactos/lib/winmm/winehq2ros.patch b/reactos/lib/winmm/winehq2ros.patch index 1cf578670d9..c72a82a0e19 100644 --- a/reactos/lib/winmm/winehq2ros.patch +++ b/reactos/lib/winmm/winehq2ros.patch @@ -4,7 +4,7 @@ RCS file: /home/wine/wine/dlls/winmm/lolvldrv.c,v retrieving revision 1.59 diff -u -r1.59 lolvldrv.c --- lolvldrv.c 20 Aug 2004 20:01:31 -0000 1.59 -+++ lolvldrv.c 19 Sep 2004 11:16:24 -0000 ++++ lolvldrv.c 19 Sep 2004 11:38:37 -0000 @@ -758,11 +758,18 @@ { TRACE("()\n"); @@ -32,7 +32,7 @@ RCS file: /home/wine/wine/dlls/winmm/time.c,v retrieving revision 1.26 diff -u -r1.26 time.c --- time.c 12 Jan 2004 21:03:10 -0000 1.26 -+++ time.c 19 Sep 2004 11:16:24 -0000 ++++ time.c 19 Sep 2004 11:38:41 -0000 @@ -175,14 +175,19 @@ volatile HANDLE *pActive = (volatile HANDLE *)&TIME_hMMTimer; DWORD last_time, cur_time; @@ -59,8 +59,18 @@ RCS file: /home/wine/wine/dlls/winmm/winmm.c,v retrieving revision 1.42 diff -u -r1.42 winmm.c --- winmm.c 16 Aug 2004 23:19:17 -0000 1.42 -+++ winmm.c 19 Sep 2004 11:16:25 -0000 -@@ -126,10 +126,12 @@ ++++ winmm.c 19 Sep 2004 11:38:42 -0000 +@@ -83,7 +83,9 @@ + return FALSE; + WINMM_IData->hWinMM32Instance = hInstDLL; + InitializeCriticalSection(&WINMM_IData->cs); ++/* FIXME crashes in ReactOS + WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; ++*/ + WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + TRACE("Created IData (%p)\n", WINMM_IData); +@@ -126,10 +128,12 @@ loaded = -1; if (h) { @@ -79,7 +89,7 @@ RCS file: /home/wine/wine/dlls/winmm/winmm_res.rc,v retrieving revision 1.17 diff -u -r1.17 winmm_res.rc --- winmm_res.rc 16 Aug 2004 20:02:09 -0000 1.17 -+++ winmm_res.rc 19 Sep 2004 11:16:26 -0000 ++++ winmm_res.rc 19 Sep 2004 11:38:45 -0000 @@ -34,7 +34,7 @@ #include "winmm_Es.rc" #include "winmm_Fr.rc" diff --git a/reactos/lib/winmm/winmm.c b/reactos/lib/winmm/winmm.c index 08c5344899e..44ca9625841 100644 --- a/reactos/lib/winmm/winmm.c +++ b/reactos/lib/winmm/winmm.c @@ -83,7 +83,9 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) return FALSE; WINMM_IData->hWinMM32Instance = hInstDLL; InitializeCriticalSection(&WINMM_IData->cs); +/* FIXME crashes in ReactOS WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; +*/ WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL); WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL); TRACE("Created IData (%p)\n", WINMM_IData);