From 28196d0b546bd942216d66b545e90d84b768d84a Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 20 Dec 2004 02:16:19 +0000
Subject: [PATCH] - Fix calling convention of OpenDriverA.

svn path=/trunk/; revision=12247
---
 reactos/lib/winmm/joystick.c       |  1 +
 reactos/lib/winmm/winehq2ros.patch | 30 ++++++++++++++++++++++++++++++
 reactos/lib/winmm/winemm.h         |  1 +
 3 files changed, 32 insertions(+)

diff --git a/reactos/lib/winmm/joystick.c b/reactos/lib/winmm/joystick.c
index b95a91bc61f..7a79857eaaa 100644
--- a/reactos/lib/winmm/joystick.c
+++ b/reactos/lib/winmm/joystick.c
@@ -41,6 +41,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "winemm.h"
 
 #include "mmddk.h"
 
diff --git a/reactos/lib/winmm/winehq2ros.patch b/reactos/lib/winmm/winehq2ros.patch
index 12d9a1ac8c8..868e1f3b2b5 100644
--- a/reactos/lib/winmm/winehq2ros.patch
+++ b/reactos/lib/winmm/winehq2ros.patch
@@ -108,3 +108,33 @@ diff -u -r1.17 winmm_res.rc
  #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);
diff --git a/reactos/lib/winmm/winemm.h b/reactos/lib/winmm/winemm.h
index ff13bf9afd0..91bdff5f0f0 100644
--- a/reactos/lib/winmm/winemm.h
+++ b/reactos/lib/winmm/winemm.h
@@ -222,6 +222,7 @@ typedef LONG			(*MCIPROC)(DWORD, HDRVR, DWORD, DWORD, DWORD);
 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);