MCI_ANIM_OPEN_PARMSW should be LPCWSTR, MCI_DefYieldProc should be WINAPI.

oldstable
Marcus Meissner 1999-05-01 10:39:28 +00:00 committed by Alexandre Julliard
parent b1ee0461d7
commit 89b1fc98ff
3 changed files with 7 additions and 5 deletions

View File

@ -2361,9 +2361,9 @@ typedef struct {
typedef struct {
DWORD dwCallback;
MCIDEVICEID wDeviceID;
LPCSTR lpstrDeviceType;
LPCSTR lpstrElementName;
LPCSTR lpstrAlias;
LPCWSTR lpstrDeviceType;
LPCWSTR lpstrElementName;
LPCWSTR lpstrAlias;
DWORD dwStyle;
HWND hWndParent;
} MCI_ANIM_OPEN_PARMSW, *LPMCI_ANIM_OPEN_PARMSW;
@ -2819,6 +2819,8 @@ typedef struct {
UINT wCustomCommandTable; /* custom command table (0xFFFF if none) * filled in by the driver */
UINT wType; /* driver type (filled in by the driver) */
} 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 mciGetDriverData(UINT uDeviceID);

View File

@ -104,7 +104,7 @@ extern int mciInstalledCount;
extern int mciInstalledListLen;
extern LPSTR lpmciInstallNames;
extern UINT16 MCI_DefYieldProc(UINT16 wDevID, DWORD data);
extern UINT16 WINAPI MCI_DefYieldProc(UINT16 wDevID, DWORD data);
typedef struct {
WORD uDevType;

View File

@ -1651,7 +1651,7 @@ UINT WINAPI mciGetDeviceIDW(LPCWSTR lpwstrName)
return ret;
}
UINT16 MCI_DefYieldProc(UINT16 wDevID, DWORD data)
UINT16 WINAPI MCI_DefYieldProc(UINT16 wDevID, DWORD data)
{
MSG msg;
INT16 ret;