winmm: Command resources should not depend on pointer size.

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

winmm: Command resources should not depend on pointer size.
acecec4a · Alexandre Julliard · 53e207fd · acecec4a · acecec4a · acecec4a
Commit acecec4a authored Nov 22, 2021 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 21 deletions

mciavi_res.rc dlls/mciavi32/mciavi_res.rc +1 -5

mciavi_res.rc dlls/mciqtz32/mciavi_res.rc +1 -5

mci.c dlls/winmm/mci.c +2 -6

winmm_res.rc dlls/winmm/winmm_res.rc +1 -5

No files found.
--- 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 13 /* MCI_INTEGER64 */
-#define MCI_DWORD_PTR MCI_INTEGER64
-#else
-#define MCI_DWORD_PTR MCI_INTEGER
-#endif
 MCIAVI RCDATA
 BEGIN

--- 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 13 /* MCI_INTEGER64 */
-#define MCI_DWORD_PTR MCI_INTEGER64
-#else
-#define MCI_DWORD_PTR MCI_INTEGER
-#endif
 MCIAVI RCDATA
 BEGIN

--- 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 13: /* MCI_INTEGER64 */
-	case 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 13: /* MCI_INTEGER64 */
-    case MCI_INTEGER64:
 	offset += sizeof(DWORD_PTR);
        break;
-#endif
    default:
 	FIXME("Unknown MCI return type %d\n", retType);
 	dwRet = MCIERR_PARSER_INTERNAL;

--- 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 13 /* MCI_INTEGER64 */
-#define MCI_DWORD_PTR MCI_INTEGER64
-#else
-#define MCI_DWORD_PTR MCI_INTEGER
-#endif
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL