Merge trunk head (r43756)
[reactos.git] / reactos / dll / win32 / winmm / driver.c
index adad9ff..f82ae3a 100644 (file)
@@ -144,8 +144,8 @@ static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg,
  *                             SendDriverMessage               [WINMM.@]
  *                             DrvSendMessage                  [WINMM.@]
  */
-LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1,
-                                LPARAM lParam2)
+LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LONG lParam1,
+                                LONG lParam2)
 {
     LPWINE_DRIVER      lpDrv;
     LRESULT            retval = 0;
@@ -413,7 +413,7 @@ done:
  *                             OpenDriver                      [WINMM.@]
  *                             DrvOpen                         [WINMM.@]
  */
-HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam)
+HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LONG lParam)
 {
     LPWINE_DRIVER      lpDrv = NULL;
     WCHAR              libName[128];
@@ -467,7 +467,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar
     return 0;
 
  the_end:
-    if (lpDrv) TRACE("=> %08lx\n", (DWORD)lpDrv);
+    if (lpDrv) TRACE("=> %p\n", lpDrv);
     return (HDRVR)lpDrv;
 }
 
@@ -475,7 +475,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar
  *                     CloseDriver                             [WINMM.@]
  *                     DrvClose                                [WINMM.@]
  */
-LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2)
+LRESULT WINAPI CloseDriver(HDRVR hDrvr, LONG lParam1, LONG lParam2)
 {
     BOOL ret;
     LPWINE_DRIVER      lpDrv;
@@ -567,8 +567,8 @@ HMODULE WINAPI GetDriverModuleHandle(HDRVR hDrvr)
  *                             DefDriverProc                     [WINMM.@]
  *                             DrvDefDriverProc                  [WINMM.@]
  */
-LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv,
-                            UINT Msg, LPARAM lParam1, LPARAM lParam2)
+LONG WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hDrv,
+                            UINT Msg, LONG lParam1, LONG lParam2)
 {
     switch (Msg) {
     case DRV_LOAD: