Commit 89b1fc98 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

MCI_ANIM_OPEN_PARMSW should be LPCWSTR, MCI_DefYieldProc should be WINAPI.

parent b1ee0461
...@@ -2361,9 +2361,9 @@ typedef struct { ...@@ -2361,9 +2361,9 @@ typedef struct {
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
MCIDEVICEID wDeviceID; MCIDEVICEID wDeviceID;
LPCSTR lpstrDeviceType; LPCWSTR lpstrDeviceType;
LPCSTR lpstrElementName; LPCWSTR lpstrElementName;
LPCSTR lpstrAlias; LPCWSTR lpstrAlias;
DWORD dwStyle; DWORD dwStyle;
HWND hWndParent; HWND hWndParent;
} MCI_ANIM_OPEN_PARMSW, *LPMCI_ANIM_OPEN_PARMSW; } MCI_ANIM_OPEN_PARMSW, *LPMCI_ANIM_OPEN_PARMSW;
...@@ -2819,6 +2819,8 @@ typedef struct { ...@@ -2819,6 +2819,8 @@ typedef struct {
UINT wCustomCommandTable; /* custom command table (0xFFFF if none) * filled in by the driver */ UINT wCustomCommandTable; /* custom command table (0xFFFF if none) * filled in by the driver */
UINT wType; /* driver type (filled in by the driver) */ UINT wType; /* driver type (filled in by the driver) */
} MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW; } MCI_OPEN_DRIVER_PARMSW, *LPMCI_OPEN_DRIVER_PARMSW;
DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS);
DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS);
DWORD WINAPI mciGetDriverData16(UINT16 uDeviceID); DWORD WINAPI mciGetDriverData16(UINT16 uDeviceID);
DWORD WINAPI mciGetDriverData(UINT uDeviceID); DWORD WINAPI mciGetDriverData(UINT uDeviceID);
......
...@@ -104,7 +104,7 @@ extern int mciInstalledCount; ...@@ -104,7 +104,7 @@ extern int mciInstalledCount;
extern int mciInstalledListLen; extern int mciInstalledListLen;
extern LPSTR lpmciInstallNames; extern LPSTR lpmciInstallNames;
extern UINT16 MCI_DefYieldProc(UINT16 wDevID, DWORD data); extern UINT16 WINAPI MCI_DefYieldProc(UINT16 wDevID, DWORD data);
typedef struct { typedef struct {
WORD uDevType; WORD uDevType;
......
...@@ -1651,7 +1651,7 @@ UINT WINAPI mciGetDeviceIDW(LPCWSTR lpwstrName) ...@@ -1651,7 +1651,7 @@ UINT WINAPI mciGetDeviceIDW(LPCWSTR lpwstrName)
return ret; return ret;
} }
UINT16 MCI_DefYieldProc(UINT16 wDevID, DWORD data) UINT16 WINAPI MCI_DefYieldProc(UINT16 wDevID, DWORD data)
{ {
MSG msg; MSG msg;
INT16 ret; INT16 ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment