Alexandre Julliard : winmm: Command resources should not depend on pointer size.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: acecec4a2e4b77cc05b0355a799af20fbdc6ec49
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=acecec4a2e4b77cc05b0355a7...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Nov 22 16:09:42 2021 +0100

winmm: Command resources should not depend on pointer size.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52072
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/mciavi32/mciavi_res.rc | 6 +-----
 dlls/mciqtz32/mciavi_res.rc | 6 +-----
 dlls/winmm/mci.c            | 8 ++------
 dlls/winmm/winmm_res.rc     | 6 +-----
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc
index e2e4caa805c..0aae615d13a 100644
--- a/dlls/mciavi32/mciavi_res.rc
+++ b/dlls/mciavi32/mciavi_res.rc
@@ -22,11 +22,7 @@
 #include "mmddk.h"
 #include "digitalv.h"
 
-#ifdef MCI_INTEGER64
-#define MCI_DWORD_PTR MCI_INTEGER64
-#else
-#define MCI_DWORD_PTR MCI_INTEGER
-#endif
+#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */
 
 MCIAVI RCDATA
 BEGIN
diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc
index e2e4caa805c..0aae615d13a 100644
--- a/dlls/mciqtz32/mciavi_res.rc
+++ b/dlls/mciqtz32/mciavi_res.rc
@@ -22,11 +22,7 @@
 #include "mmddk.h"
 #include "digitalv.h"
 
-#ifdef MCI_INTEGER64
-#define MCI_DWORD_PTR MCI_INTEGER64
-#else
-#define MCI_DWORD_PTR MCI_INTEGER
-#endif
+#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */
 
 MCIAVI RCDATA
 BEGIN
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index c19ab453290..8e43dcc0f62 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -1228,8 +1228,7 @@ static	DWORD	MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret
 	    }
 	    break;
         }
-#ifdef MCI_INTEGER64
-	case MCI_INTEGER64:
+	case 13: /* MCI_INTEGER64 */
         {
 	    DWORD_PTR data = *(DWORD_PTR *)(params + 1);
 	    switch (dwRet & 0xFFFF0000ul) {
@@ -1263,7 +1262,6 @@ static	DWORD	MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret
 	    }
 	    break;
         }
-#endif
 	case MCI_STRING:
 	    switch (dwRet & 0xFFFF0000ul) {
 	    case 0:
@@ -1484,11 +1482,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet,
     case MCI_RECT:
         offset += 4 * sizeof(DWORD);
         break;
-#ifdef MCI_INTEGER64
-    case MCI_INTEGER64:
+    case 13: /* MCI_INTEGER64 */
 	offset += sizeof(DWORD_PTR);
         break;
-#endif
     default:
 	FIXME("Unknown MCI return type %d\n", retType);
 	dwRet = MCIERR_PARSER_INTERNAL;
diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc
index 64c42b42ea0..a365446a46f 100644
--- a/dlls/winmm/winmm_res.rc
+++ b/dlls/winmm/winmm_res.rc
@@ -25,11 +25,7 @@
 #include "windef.h"
 #include "mmddk.h"
 
-#ifdef MCI_INTEGER64
-#define MCI_DWORD_PTR MCI_INTEGER64
-#else
-#define MCI_DWORD_PTR MCI_INTEGER
-#endif
+#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL