Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid crash

Browse source 
svn path=/trunk/; revision=10916
This commit is contained in:
Gé van Geldorp 2004-09-19 11:25:43 +00:00
parent 510df619d2
commit 06bac7f0b9
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
reactos/lib/winmm/winehq2ros.patch
View file

@ -4,7 +4,7 @@ RCS file: /home/wine/wine/dlls/winmm/lolvldrv.c,v
retrieving revision 1.59 retrieving revision 1.59
diff -u -r1.59 lolvldrv.c diff -u -r1.59 lolvldrv.c
--- lolvldrv.c 20 Aug 2004 20:01:31 -0000 1.59 --- 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 @@ @@ -758,11 +758,18 @@
{ {
TRACE("()\n"); TRACE("()\n");
@ -32,7 +32,7 @@ RCS file: /home/wine/wine/dlls/winmm/time.c,v
retrieving revision 1.26 retrieving revision 1.26
diff -u -r1.26 time.c diff -u -r1.26 time.c
--- time.c 12 Jan 2004 21:03:10 -0000 1.26 --- 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 @@ @@ -175,14 +175,19 @@
volatile HANDLE *pActive = (volatile HANDLE *)&TIME_hMMTimer; volatile HANDLE *pActive = (volatile HANDLE *)&TIME_hMMTimer;
DWORD last_time, cur_time; DWORD last_time, cur_time;
@ -59,8 +59,18 @@ RCS file: /home/wine/wine/dlls/winmm/winmm.c,v
retrieving revision 1.42 retrieving revision 1.42
diff -u -r1.42 winmm.c diff -u -r1.42 winmm.c
--- winmm.c 16 Aug 2004 23:19:17 -0000 1.42 --- winmm.c 16 Aug 2004 23:19:17 -0000 1.42
+++ winmm.c 19 Sep 2004 11:16:25 -0000 +++ winmm.c 19 Sep 2004 11:38:42 -0000
@@ -126,10 +126,12 @@ @@ -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; loaded = -1;
if (h) if (h)
{ {
@ -79,7 +89,7 @@ RCS file: /home/wine/wine/dlls/winmm/winmm_res.rc,v
retrieving revision 1.17 retrieving revision 1.17
diff -u -r1.17 winmm_res.rc diff -u -r1.17 winmm_res.rc
--- winmm_res.rc 16 Aug 2004 20:02:09 -0000 1.17 --- 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 @@ @@ -34,7 +34,7 @@
#include "winmm_Es.rc" #include "winmm_Es.rc"
#include "winmm_Fr.rc" #include "winmm_Fr.rc"

2
reactos/lib/winmm/winmm.c
View file

@ -83,7 +83,9 @@ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL)
return FALSE; return FALSE;
WINMM_IData->hWinMM32Instance = hInstDLL; WINMM_IData->hWinMM32Instance = hInstDLL;
InitializeCriticalSection(&WINMM_IData->cs); InitializeCriticalSection(&WINMM_IData->cs);
/* FIXME crashes in ReactOS
WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData"; WINMM_IData->cs.DebugInfo->Spare[1] = (DWORD)"WINMM_IData";
*/
WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL); WINMM_IData->psStopEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL); WINMM_IData->psLastEvent = CreateEventA(NULL, TRUE, FALSE, NULL);
TRACE("Created IData (%p)\n", WINMM_IData); TRACE("Created IData (%p)\n", WINMM_IData);