system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 20:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winmm: Command resources should not depend on pointer size.

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52072
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-11-22 16:09:42 +01:00
parent 53e207fde0
commit acecec4a2e
4 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/mciavi32/mciavi_res.rc
View file

@ -22,11 +22,7 @@
#include "mmddk.h" #include "mmddk.h"
#include "digitalv.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 MCIAVI RCDATA
BEGIN BEGIN

6
dlls/mciqtz32/mciavi_res.rc
View file

@ -22,11 +22,7 @@
#include "mmddk.h" #include "mmddk.h"
#include "digitalv.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 MCIAVI RCDATA
BEGIN BEGIN

8
dlls/winmm/mci.c
View file

@ -1228,8 +1228,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret
} }
break; break;
} }
#ifdef MCI_INTEGER64 case 13: /* MCI_INTEGER64 */
case MCI_INTEGER64:
{ {
DWORD_PTR data = *(DWORD_PTR *)(params + 1); DWORD_PTR data = *(DWORD_PTR *)(params + 1);
switch (dwRet & 0xFFFF0000ul) { switch (dwRet & 0xFFFF0000ul) {
@ -1263,7 +1262,6 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret
} }
break; break;
} }
#endif
case MCI_STRING: case MCI_STRING:
switch (dwRet & 0xFFFF0000ul) { switch (dwRet & 0xFFFF0000ul) {
case 0: case 0:
@ -1484,11 +1482,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet,
case MCI_RECT: case MCI_RECT:
offset += 4 * sizeof(DWORD); offset += 4 * sizeof(DWORD);
break; break;
#ifdef MCI_INTEGER64 case 13: /* MCI_INTEGER64 */
case MCI_INTEGER64:
offset += sizeof(DWORD_PTR); offset += sizeof(DWORD_PTR);
break; break;
#endif
default: default:
FIXME("Unknown MCI return type %d\n", retType); FIXME("Unknown MCI return type %d\n", retType);
dwRet = MCIERR_PARSER_INTERNAL; dwRet = MCIERR_PARSER_INTERNAL;

6
dlls/winmm/winmm_res.rc
View file

@ -25,11 +25,7 @@
#include "windef.h" #include "windef.h"
#include "mmddk.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 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL