Commit in reactos/lib/winmm on MAIN
joystick.c+11.2 -> 1.3
winehq2ros.patch+301.10 -> 1.11
winemm.h+11.6 -> 1.7
+32
3 modified files
- Fix calling convention of OpenDriverA.

reactos/lib/winmm
joystick.c 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- joystick.c	25 Feb 2004 20:00:41 -0000	1.2
+++ joystick.c	20 Dec 2004 02:16:19 -0000	1.3
@@ -41,6 +41,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "winemm.h"
 
 #include "mmddk.h"
 

reactos/lib/winmm
winehq2ros.patch 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- winehq2ros.patch	7 Dec 2004 21:41:02 -0000	1.10
+++ winehq2ros.patch	20 Dec 2004 02:16:19 -0000	1.11
@@ -108,3 +108,33 @@
  #include "winmm_Nl.rc"
  #include "winmm_Pt.rc"
  #include "winmm_Ru.rc"
+Index: lib/winmm/joystick.c
+===================================================================
+RCS file: /CVS/ReactOS/reactos/lib/winmm/joystick.c,v
+retrieving revision 1.2
+diff -u -r1.2 joystick.c
+--- lib/winmm/joystick.c	25 Feb 2004 20:00:41 -0000	1.2
++++ lib/winmm/joystick.c	20 Dec 2004 02:00:40 -0000
+@@ -41,6 +41,7 @@
+ #include "wingdi.h"
+ #include "winuser.h"
+ #include "winnls.h"
++#include "winemm.h"
+ 
+ #include "mmddk.h"
+ 
+Index: lib/winmm/winemm.h
+===================================================================
+RCS file: /CVS/ReactOS/reactos/lib/winmm/winemm.h,v
+retrieving revision 1.6
+diff -u -r1.6 winemm.h
+--- lib/winmm/winemm.h	20 Oct 2004 17:42:11 -0000	1.6
++++ lib/winmm/winemm.h	20 Dec 2004 01:59:44 -0000
+@@ -222,6 +222,7 @@
+ typedef	WINMM_MapType	        (*MMDRV_MAPFUNC)(UINT wMsg, LPDWORD lpdwUser, LPDWORD lpParam1, LPDWORD lpParam2);
+ typedef	WINMM_MapType	        (*MMDRV_UNMAPFUNC)(UINT wMsg, LPDWORD lpdwUser, LPDWORD lpParam1, LPDWORD lpParam2, MMRESULT ret);
+ 
++HDRVR WINAPI	OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2);
+ LPWINE_DRIVER	DRIVER_FindFromHDrvr(HDRVR hDrvr);
+ BOOL		DRIVER_GetLibName(LPCSTR keyName, LPCSTR sectName, LPSTR buf, int sz);
+ LPWINE_DRIVER	DRIVER_TryOpenDriver32(LPCSTR fn, LPARAM lParam2);

reactos/lib/winmm
winemm.h 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- winemm.h	20 Oct 2004 17:42:11 -0000	1.6
+++ winemm.h	20 Dec 2004 02:16:19 -0000	1.7
@@ -222,6 +222,7 @@
 typedef	WINMM_MapType	        (*MMDRV_MAPFUNC)(UINT wMsg, LPDWORD lpdwUser, LPDWORD lpParam1, LPDWORD lpParam2);
 typedef	WINMM_MapType	        (*MMDRV_UNMAPFUNC)(UINT wMsg, LPDWORD lpdwUser, LPDWORD lpParam1, LPDWORD lpParam2, MMRESULT ret);
 
+HDRVR WINAPI	OpenDriverA(LPCSTR lpDriverName, LPCSTR lpSectionName, LPARAM lParam2);
 LPWINE_DRIVER	DRIVER_FindFromHDrvr(HDRVR hDrvr);
 BOOL		DRIVER_GetLibName(LPCSTR keyName, LPCSTR sectName, LPSTR buf, int sz);
 LPWINE_DRIVER	DRIVER_TryOpenDriver32(LPCSTR fn, LPARAM lParam2);
CVSspam 0.2.8