[tkreuzer] 40753: dsound: Make DSDRIVERDESC.dnDevNode a DWORD_PTR and DSPROPERTY.InstanceId a ULONG_PTR.

Author: tkreuzer
Date: Thu Apr 30 14:57:39 2009
New Revision: 40753
URL: http://svn.reactos.org/svn/reactos?rev=40753&view=rev
Log:
dsound: Make DSDRIVERDESC.dnDevNode a DWORD_PTR and DSPROPERTY.InstanceId a ULONG_PTR.
Modified:
    branches/ros-amd64-bringup/reactos/dll/directx/dsound/primary.c
    branches/ros-amd64-bringup/reactos/dll/directx/dsound/propset.c
    branches/ros-amd64-bringup/reactos/include/psdk/dsdriver.h
Modified: branches/ros-amd64-bringup/reactos/dll/directx/dsound/primary.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/directx/dsound/primary.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/directx/dsound/primary.c [iso-8859-1] Thu Apr
30 14:57:39 2009
@@ -126,7 +126,7 @@
                if (device->driver)
                        flags |= WAVE_DIRECTSOUND;
-               hres = mmErr(waveOutOpen(&(device->hwo),
device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD)device,
flags));
+               hres = mmErr(waveOutOpen(&(device->hwo),
device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback,
(DWORD_PTR)device, flags));
                if (FAILED(hres)) {
                        WARN("waveOutOpen failed\n");
                        if (device->driver)
Modified: branches/ros-amd64-bringup/reactos/dll/directx/dsound/propset.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/directx/dsound/propset.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/directx/dsound/propset.c [iso-8859-1] Thu Apr
30 14:57:39 2009
@@ -109,7 +109,7 @@
            S(prop).Set = *guidPropSet;
            S(prop).Id = dwPropID;
            S(prop).Flags = 0;  /* unused */
-           S(prop).InstanceId = (ULONG)This->dsb->device;
+           S(prop).InstanceId = (ULONG_PTR)This->dsb->device;
            hres = IDsDriverPropertySet_Get(ps, &prop, pInstanceData, cbInstanceData,
pPropData, cbPropData, pcbReturned);
@@ -145,7 +145,7 @@
            S(prop).Set = *guidPropSet;
            S(prop).Id = dwPropID;
            S(prop).Flags = 0;  /* unused */
-           S(prop).InstanceId = (ULONG)This->dsb->device;
+           S(prop).InstanceId = (ULONG_PTR)This->dsb->device;
            hres =
IDsDriverPropertySet_Set(ps,&prop,pInstanceData,cbInstanceData,pPropData,cbPropData);
            IDsDriverPropertySet_Release(ps);
Modified: branches/ros-amd64-bringup/reactos/include/psdk/dsdriver.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/dsdriver.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/dsdriver.h [iso-8859-1] Thu Apr 30
14:57:39 2009
@@ -64,7 +64,7 @@
     DWORD              dwFlags;
     TCHAR      szDesc[256];
     TCHAR      szDrvname[256];
-    DWORD      dnDevNode;
+    DWORD_PTR  dnDevNode;
     WORD       wVxdId;
     WORD       wReserved;
     ULONG      ulDeviceNum;
@@ -120,7 +120,7 @@
        GUID    Set;
        ULONG   Id;
        ULONG   Flags;
-       ULONG   InstanceId;
+       ULONG_PTR       InstanceId;
     } DUMMYSTRUCTNAME;
     ULONGLONG  Alignment;
 } DSPROPERTY,*PDSPROPERTY;