sync msacm32_winetest with wine 1.1.35

[reactos.git] / rostests / winetests / msacm32 / msacm.c

diff --git a/rostests/winetests/msacm32/msacm.c b/rostests/winetests/msacm32/msacm.c
index cfa6aea..b68ff8c 100644 (file)
--- a/rostests/winetests/msacm32/msacm.c
+++ b/rostests/winetests/msacm32/msacm.c
@@ -29,12 +29,12 @@
 #include "winnls.h"
 #include "mmsystem.h"
 #define NOBITMAP
-#include "wine/mmreg.h"
-#include "wine/msacm.h"
+#include "mmreg.h"
+#include "msacm.h"
 
 static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid,
                                        PACMFORMATTAGDETAILS paftd,
-                                       DWORD dwInstance,
+                                       DWORD_PTR dwInstance,
                                        DWORD fdwSupport)
 {
     if (winetest_interactive)
@@ -45,7 +45,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid,
 
 static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid,
                                     LPACMFORMATDETAILS pafd,
-                                    DWORD dwInstance,
+                                    DWORD_PTR dwInstance,
                                     DWORD fd)
 {
     if (winetest_interactive)
@@ -55,13 +55,13 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid,
 }
 
 static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
-                                    DWORD dwInstance,
+                                    DWORD_PTR dwInstance,
                                     DWORD fdwSupport)
 {
     MMRESULT rc;
-    ACMDRIVERDETAILSA dd;
+    ACMDRIVERDETAILS dd;
     HACMDRIVER had;
-
+    
     DWORD dwDriverPriority;
     DWORD dwDriverSupport;
 
@@ -94,7 +94,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
     /* MSDN says this should fail but it doesn't in practice */
     dd.cbStruct = 4;
     rc = acmDriverDetails(hadid, &dd, 0);
-    ok(rc == MMSYSERR_NOERROR,
+    ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED,
        "acmDriverDetails(): rc = %08x, should be %08x\n",
        rc, MMSYSERR_NOERROR);
 
@@ -119,17 +119,16 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
 
     /* try valid parameters */
     rc = acmDriverDetails(hadid, &dd, 0);
-    ok(rc == MMSYSERR_NOERROR,
+    ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED,
        "acmDriverDetails(): rc = %08x, should be %08x\n",
        rc, MMSYSERR_NOERROR);
 
     /* cbStruct should contain size of returned data (at most sizeof(dd)) 
        TODO: should it be *exactly* sizeof(dd), as tested here?
      */
-    if (rc == MMSYSERR_NOERROR) {    
+    if (rc == MMSYSERR_NOERROR) {
         ok(dd.cbStruct == sizeof(dd),
-            "acmDriverDetails(): cbStruct = %08x, should be %08lx\n",
-            dd.cbStruct, (unsigned long)sizeof(dd));
+            "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct);
     }
 
     if (rc == MMSYSERR_NOERROR && winetest_interactive) {
@@ -210,7 +209,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
 
     /* try valid parameters */
     rc = acmDriverOpen(&had, hadid, 0);
-    ok(rc == MMSYSERR_NOERROR,
+    ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER,
        "acmDriverOpen(): rc = %08x, should be %08x\n",
        rc, MMSYSERR_NOERROR);
 
@@ -275,9 +274,9 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
            "acmMetrics(): rc = %08x, should be %08x\n",
            rc, MMSYSERR_NOERROR);
         if (rc == MMSYSERR_NOERROR) {
-            ACMFORMATDETAILSA fd;
+            ACMFORMATDETAILS fd;
             WAVEFORMATEX * pwfx;
-            ACMFORMATTAGDETAILSA aftd;
+            ACMFORMATTAGDETAILS aftd;
 
             /* try bad pointer */
             rc = acmFormatEnum(had, 0, FormatEnumProc, 0, 0);