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@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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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