winmm: Make MCI_STATUS return type a 64-bit integer on 64-bit platforms.
Based on a patch by Octavian Voicu.
This commit is contained in:
parent
88be48ebeb
commit
9387810dab
|
@ -22,6 +22,12 @@
|
||||||
#include "mmddk.h"
|
#include "mmddk.h"
|
||||||
#include "digitalv.h"
|
#include "digitalv.h"
|
||||||
|
|
||||||
|
#ifdef MCI_INTEGER64
|
||||||
|
#define MCI_DWORD_PTR MCI_INTEGER64
|
||||||
|
#else
|
||||||
|
#define MCI_DWORD_PTR MCI_INTEGER
|
||||||
|
#endif
|
||||||
|
|
||||||
MCIAVI RCDATA
|
MCIAVI RCDATA
|
||||||
BEGIN
|
BEGIN
|
||||||
L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD,
|
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"return position\0", 0x00100000L, MCI_FLAG,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"test\0", 0x00000020L, MCI_FLAG,
|
L"test\0", 0x00000020L, MCI_FLAG,
|
||||||
|
|
|
@ -22,6 +22,12 @@
|
||||||
#include "mmddk.h"
|
#include "mmddk.h"
|
||||||
#include "digitalv.h"
|
#include "digitalv.h"
|
||||||
|
|
||||||
|
#ifdef MCI_INTEGER64
|
||||||
|
#define MCI_DWORD_PTR MCI_INTEGER64
|
||||||
|
#else
|
||||||
|
#define MCI_DWORD_PTR MCI_INTEGER
|
||||||
|
#endif
|
||||||
|
|
||||||
MCIAVI RCDATA
|
MCIAVI RCDATA
|
||||||
BEGIN
|
BEGIN
|
||||||
L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD,
|
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"return position\0", 0x00100000L, MCI_FLAG,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"test\0", 0x00000020L, MCI_FLAG,
|
L"test\0", 0x00000020L, MCI_FLAG,
|
||||||
|
|
|
@ -25,6 +25,12 @@
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "mmddk.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
|
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||||
|
|
||||||
CORE RCDATA
|
CORE RCDATA
|
||||||
|
@ -72,7 +78,7 @@ L"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
@ -218,7 +224,7 @@ L"on\0", 0x00002000L, MCI_FLAG,
|
||||||
L"off\0", 0x00004000L, MCI_FLAG,
|
L"off\0", 0x00004000L, MCI_FLAG,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
@ -289,7 +295,7 @@ L"shareable\0", 0x00000100L, MCI_FLAG,
|
||||||
L"buffer\0", 0x00010000L, MCI_INTEGER,
|
L"buffer\0", 0x00010000L, MCI_INTEGER,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
@ -391,7 +397,7 @@ END
|
||||||
CDAUDIO RCDATA
|
CDAUDIO RCDATA
|
||||||
BEGIN
|
BEGIN
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
@ -442,7 +448,7 @@ END
|
||||||
SEQUENCER RCDATA
|
SEQUENCER RCDATA
|
||||||
BEGIN
|
BEGIN
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
@ -571,7 +577,7 @@ L"door open\0", 0x00000100L, MCI_FLAG,
|
||||||
L"door closed\0", 0x00000200L, MCI_FLAG,
|
L"door closed\0", 0x00000200L, MCI_FLAG,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
@ -691,7 +697,7 @@ L"\0", 0x00000000L, MCI_END_CONSTANT,
|
||||||
L"parent\0", 0x00020000L, MCI_INTEGER,
|
L"parent\0", 0x00020000L, MCI_INTEGER,
|
||||||
L"\0", 0x00000000L, MCI_END_COMMAND,
|
L"\0", 0x00000000L, MCI_END_COMMAND,
|
||||||
L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD,
|
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"notify\0", 0x00000001L, MCI_FLAG,
|
||||||
L"wait\0", 0x00000002L, MCI_FLAG,
|
L"wait\0", 0x00000002L, MCI_FLAG,
|
||||||
L"\0", 0x00000100L, MCI_CONSTANT,
|
L"\0", 0x00000100L, MCI_CONSTANT,
|
||||||
|
|
Loading…
Reference in New Issue