Module: wine Branch: master Commit: 9387810dabbb7f430d8d77ab11da5c0456f5a3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9387810dabbb7f430d8d77ab11...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Sep 29 20:16:58 2010 +0200
winmm: Make MCI_STATUS return type a 64-bit integer on 64-bit platforms.
Based on a patch by Octavian Voicu.
---
dlls/mciavi32/mciavi_res.rc | 8 +++++++- dlls/mciqtz32/mciavi_res.rc | 8 +++++++- dlls/winmm/winmm_res.rc | 20 +++++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc index 6482e9e..beffdd5 100644 --- a/dlls/mciavi32/mciavi_res.rc +++ b/dlls/mciavi32/mciavi_res.rc @@ -22,6 +22,12 @@ #include "mmddk.h" #include "digitalv.h"
+#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + MCIAVI RCDATA BEGIN L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD, @@ -415,7 +421,7 @@ L"cancel\0", 0x00080000L, MCI_FLAG, L"return position\0", 0x00100000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc index 6482e9e..beffdd5 100644 --- a/dlls/mciqtz32/mciavi_res.rc +++ b/dlls/mciqtz32/mciavi_res.rc @@ -22,6 +22,12 @@ #include "mmddk.h" #include "digitalv.h"
+#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + MCIAVI RCDATA BEGIN L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD, @@ -415,7 +421,7 @@ L"cancel\0", 0x00080000L, MCI_FLAG, L"return position\0", 0x00100000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index c73ec6e..949d55c 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -25,6 +25,12 @@ #include "windef.h" #include "mmddk.h"
+#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
CORE RCDATA @@ -72,7 +78,7 @@ L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -218,7 +224,7 @@ L"on\0", 0x00002000L, MCI_FLAG, L"off\0", 0x00004000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -289,7 +295,7 @@ L"shareable\0", 0x00000100L, MCI_FLAG, L"buffer\0", 0x00010000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -391,7 +397,7 @@ END CDAUDIO RCDATA BEGIN L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -442,7 +448,7 @@ END SEQUENCER RCDATA BEGIN L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -571,7 +577,7 @@ L"door open\0", 0x00000100L, MCI_FLAG, L"door closed\0", 0x00000200L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT, @@ -691,7 +697,7 @@ L"\0", 0x00000000L, MCI_END_CONSTANT, L"parent\0", 0x00020000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, -L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"\0", 0x00000100L, MCI_CONSTANT,