Merge trunk head (r43756)

[reactos.git] / reactos / include / psdk / mmddk.h

diff --git a/reactos/include/psdk/mmddk.h b/reactos/include/psdk/mmddk.h
index 25f85da..47134dc 100644 (file)
--- a/reactos/include/psdk/mmddk.h
+++ b/reactos/include/psdk/mmddk.h
@@ -384,8 +384,8 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC;
 #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
 
 typedef struct {
 #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
 
 typedef struct {

-       DWORD                   dwCallback;
-       DWORD                   dwInstance;
+       DWORD_PTR               dwCallback;
+       DWORD_PTR               dwInstance;

        HMIDIOUT                hMidi;
        DWORD                   dwFlags;
 } PORTALLOC, *LPPORTALLOC;
        HMIDIOUT                hMidi;
        DWORD                   dwFlags;
 } PORTALLOC, *LPPORTALLOC;


@@ -396,7 +396,7 @@ typedef struct {
        DWORD_PTR               dwCallback;
        DWORD_PTR               dwInstance;
        UINT                    uMappedDeviceID;
        DWORD_PTR               dwCallback;
        DWORD_PTR               dwInstance;
        UINT                    uMappedDeviceID;

-       DWORD                   dnDevNode;
+       DWORD_PTR               dnDevNode;

 } WAVEOPENDESC, *LPWAVEOPENDESC;
 
 typedef struct {
 } WAVEOPENDESC, *LPWAVEOPENDESC;
 
 typedef struct {


@@ -406,9 +406,9 @@ typedef struct {
 
 typedef struct {
        HMIDI                   hMidi;
 
 typedef struct {
        HMIDI                   hMidi;

-       DWORD                   dwCallback;
-       DWORD                   dwInstance;
-        DWORD                          dnDevNode;
+       DWORD_PTR               dwCallback;
+       DWORD_PTR               dwInstance;
+       DWORD_PTR               dnDevNode;

         DWORD                          cIds;
         MIDIOPENSTRMID                 rgIds;
 } MIDIOPENDESC, *LPMIDIOPENDESC;
         DWORD                          cIds;
         MIDIOPENSTRMID                 rgIds;
 } MIDIOPENDESC, *LPMIDIOPENDESC;


@@ -416,9 +416,9 @@ typedef struct {
 typedef struct tMIXEROPENDESC
 {
        HMIXEROBJ               hmx;
 typedef struct tMIXEROPENDESC
 {
        HMIXEROBJ               hmx;

-        LPVOID                 pReserved0;
-       DWORD                   dwCallback;
-       DWORD                   dwInstance;
+       LPVOID                  pReserved0;
+       DWORD_PTR               dwCallback;
+       DWORD_PTR               dwInstance;

 } MIXEROPENDESC, *LPMIXEROPENDESC;
 
 typedef struct {
 } MIXEROPENDESC, *LPMIXEROPENDESC;
 
 typedef struct {


@@ -436,7 +436,7 @@ typedef struct {
 } MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW;
 
 DWORD                  WINAPI  mciGetDriverData(UINT uDeviceID);
 } MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW;
 
 DWORD                  WINAPI  mciGetDriverData(UINT uDeviceID);

-BOOL                   WINAPI  mciSetDriverData(UINT uDeviceID, DWORD dwData);
+BOOL                   WINAPI  mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData);

 UINT                   WINAPI  mciDriverYield(UINT uDeviceID);
 BOOL                   WINAPI  mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
                                                UINT uStatus);
 UINT                   WINAPI  mciDriverYield(UINT uDeviceID);
 BOOL                   WINAPI  mciDriverNotify(HWND hwndCallback, UINT uDeviceID,
                                                UINT uStatus);