Moved 16 bit digital structs to include/wine/mmsystem16.h.

This commit is contained in:
Eric Pouech 2002-10-23 18:43:00 +00:00 committed by Alexandre Julliard
parent ea335dd036
commit 56d80b4c65
2 changed files with 164 additions and 158 deletions

View File

@ -461,11 +461,6 @@ extern "C" {
/* parameter block for MCI_WHERE, MCI_PUT, MCI_FREEZE, MCI_UNFREEZE cmds */ /* parameter block for MCI_WHERE, MCI_PUT, MCI_FREEZE, MCI_UNFREEZE cmds */
typedef struct {
DWORD dwCallback;
RECT16 rc;
} MCI_DGV_RECT_PARMS16, *LPMCI_DGV_RECT_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
RECT rc; RECT rc;
@ -473,12 +468,6 @@ typedef struct {
/* parameter block for MCI_CAPTURE command message */ /* parameter block for MCI_CAPTURE command message */
typedef struct {
DWORD dwCallback;
LPSTR lpstrFileName;
RECT16 rc;
} MCI_DGV_CAPTURE_PARMS16, *LPMCI_DGV_CAPTURE_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
LPSTR lpstrFileName; LPSTR lpstrFileName;
@ -500,15 +489,6 @@ typedef MCI_GENERIC_PARMS MCI_CLOSE_PARMS, *LPMCI_CLOSE_PARMS;
/* parameter block for MCI_COPY command message */ /* parameter block for MCI_COPY command message */
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_COPY_PARMS16, *LPMCI_DGV_COPY_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwFrom; DWORD dwFrom;
@ -527,15 +507,6 @@ typedef struct {
/* parameter block for MCI_CUT command message */ /* parameter block for MCI_CUT command message */
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_CUT_PARMS16, * LPMCI_DGV_CUT_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwFrom; DWORD dwFrom;
@ -547,15 +518,6 @@ typedef struct {
/* parameter block for MCI_DELETE command message */ /* parameter block for MCI_DELETE command message */
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_DELETE_PARMS16, * LPMCI_DGV_DELETE_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwFrom; DWORD dwFrom;
@ -567,18 +529,10 @@ typedef struct {
/* parameter block for MCI_FREEZE command message */ /* parameter block for MCI_FREEZE command message */
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_FREEZE_PARMS16, * LPMCI_DGV_FREEZE_PARMS16;
typedef MCI_DGV_RECT_PARMS MCI_DGV_FREEZE_PARMS, * LPMCI_DGV_FREEZE_PARMS; typedef MCI_DGV_RECT_PARMS MCI_DGV_FREEZE_PARMS, * LPMCI_DGV_FREEZE_PARMS;
/* parameter block for MCI_INFO command message */ /* parameter block for MCI_INFO command message */
typedef struct {
DWORD dwCallback;
LPSTR lpstrReturn;
DWORD dwRetSize;
DWORD dwItem;
} MCI_DGV_INFO_PARMS16, * LPMCI_DGV_INFO_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
LPSTR lpstrReturn; LPSTR lpstrReturn;
@ -598,15 +552,6 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_INFO_PARMS)
/* parameter block for MCI_LIST command message */ /* parameter block for MCI_LIST command message */
typedef struct {
DWORD dwCallback;
LPSTR lpstrReturn;
DWORD dwLength;
DWORD dwNumber;
DWORD dwItem;
LPSTR lpstrAlgorithm;
} MCI_DGV_LIST_PARMS16, *LPMCI_DGV_LIST_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
LPSTR lpstrReturn; LPSTR lpstrReturn;
@ -630,7 +575,6 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_LIST_PARMS)
/* parameter block for MCI_LOAD command message */ /* parameter block for MCI_LOAD command message */
typedef MCI_LOAD_PARMS16 MCI_DGV_LOAD_PARMS16 , * LPMCI_DGV_LOAD_PARMS16;
typedef MCI_LOAD_PARMSA MCI_DGV_LOAD_PARMSA, * LPMCI_DGV_LOAD_PARMSA; typedef MCI_LOAD_PARMSA MCI_DGV_LOAD_PARMSA, * LPMCI_DGV_LOAD_PARMSA;
typedef MCI_LOAD_PARMSW MCI_DGV_LOAD_PARMSW, * LPMCI_DGV_LOAD_PARMSW; typedef MCI_LOAD_PARMSW MCI_DGV_LOAD_PARMSW, * LPMCI_DGV_LOAD_PARMSW;
@ -647,18 +591,6 @@ typedef struct {
/* parameter block for MCI_OPEN command message */ /* parameter block for MCI_OPEN command message */
typedef struct {
DWORD dwCallback;
UINT16 wDeviceID;
UINT16 wReserved0;
LPSTR lpstrDeviceType;
LPSTR lpstrElementName;
LPSTR lpstrAlias;
DWORD dwStyle;
HWND16 hWndParent;
UINT16 wReserved1;
} MCI_DGV_OPEN_PARMS16, *LPMCI_DGV_OPEN_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
UINT wDeviceID; UINT wDeviceID;
@ -688,14 +620,6 @@ typedef MCI_GENERIC_PARMS MCI_DGV_PAUSE_PARMS, * LPMCI_DGV_PAUSE_PARMS;
/* parameter block for MCI_PASTE command message */ /* parameter block for MCI_PASTE command message */
typedef struct {
DWORD dwCallback;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_PASTE_PARMS16, * LPMCI_DGV_PASTE_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwTo; DWORD dwTo;
@ -710,19 +634,10 @@ typedef MCI_PLAY_PARMS MCI_DGV_PLAY_PARMS, * LPMCI_DGV_PLAY_PARMS;
/* parameter block for MCI_PUT command message */ /* parameter block for MCI_PUT command message */
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_PUT_PARMS16, * LPMCI_DGV_PUT_PARMS16;
typedef MCI_DGV_RECT_PARMS MCI_DGV_PUT_PARMS, * LPMCI_DGV_PUT_PARMS; typedef MCI_DGV_RECT_PARMS MCI_DGV_PUT_PARMS, * LPMCI_DGV_PUT_PARMS;
/* parameter block for MCI_QUALITY command message */ /* parameter block for MCI_QUALITY command message */
typedef struct {
DWORD dwCallback;
DWORD dwItem;
LPSTR lpstrName;
DWORD lpstrAlgorithm;
DWORD dwHandle;
} MCI_DGV_QUALITY_PARMS16, *LPMCI_DGV_QUALITY_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwItem; DWORD dwItem;
@ -748,15 +663,6 @@ typedef MCI_GENERIC_PARMS MCI_REALIZE_PARMS, * LPMCI_REALIZE_PARMS;
/* parameter block for MCI_RECORD command message */ /* parameter block for MCI_RECORD command message */
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_RECORD_PARMS16, * LPMCI_DGV_RECORD_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwFrom; DWORD dwFrom;
@ -768,12 +674,6 @@ typedef struct {
/* parameter block for MCI_RESERVE command message */ /* parameter block for MCI_RESERVE command message */
typedef struct {
DWORD dwCallback;
LPSTR lpstrPath;
DWORD dwSize;
} MCI_DGV_RESERVE_PARMS16, *LPMCI_DGV_RESERVE_PARMS16A;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
LPSTR lpstrPath; LPSTR lpstrPath;
@ -791,12 +691,6 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_RESERVE_PARMS)
/* parameter block for MCI_RESTORE command message */ /* parameter block for MCI_RESTORE command message */
typedef struct {
DWORD dwCallback;
LPSTR lpstrFileName;
RECT16 rc;
} MCI_DGV_RESTORE_PARMS16, *LPMCI_DGV_RESTORE_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
LPSTR lpstrFileName; LPSTR lpstrFileName;
@ -818,12 +712,6 @@ typedef MCI_GENERIC_PARMS MCI_DGV_RESUME_PARMS, * LPMCI_DGV_RESUME_PARMS;
/* parameter block for MCI_SAVE command message */ /* parameter block for MCI_SAVE command message */
typedef struct {
DWORD dwCallback;
LPSTR lpstrFileName;
RECT16 rc;
} MCI_DGV_SAVE_PARMS16, *LPMCI_DGV_SAVE_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
LPSTR lpstrFileName; LPSTR lpstrFileName;
@ -851,15 +739,6 @@ typedef struct {
/* parameter block for MCI_SETAUDIO command message */ /* parameter block for MCI_SETAUDIO command message */
typedef struct {
DWORD dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
LPSTR lpstrAlgorithm;
LPSTR lpstrQuality;
} MCI_DGV_SETAUDIO_PARMS16, *LPMCI_DGV_SETAUDIO_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwItem; DWORD dwItem;
@ -892,16 +771,6 @@ typedef struct {
/* parameter block for MCI_SETVIDEO command message */ /* parameter block for MCI_SETVIDEO command message */
typedef struct {
DWORD dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
LPSTR lpstrAlgorithm;
LPSTR lpstrQuality;
DWORD dwSourceNumber;
} MCI_DGV_SETVIDEO_PARMS16, *LPMCI_DGV_SETVIDEO_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwItem; DWORD dwItem;
@ -927,15 +796,6 @@ DECL_WINELIB_TYPE_AW(LPMCI_DGV_SETVIDEO_PARMS)
/* parameter block for MCI_STATUS command message */ /* parameter block for MCI_STATUS command message */
typedef struct {
DWORD dwCallback;
DWORD dwReturn;
DWORD dwItem;
DWORD dwTrack;
SEGPTR lpstrDrive;
DWORD dwReference;
} MCI_DGV_STATUS_PARMS16, *LPMCI_DGV_STATUS_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
DWORD dwReturn; DWORD dwReturn;
@ -970,18 +830,10 @@ typedef MCI_GENERIC_PARMS MCI_DGV_STOP_PARMS, * LPMCI_DGV_STOP_PARMS;
/* parameter block for MCI_UNFREEZE command message */ /* parameter block for MCI_UNFREEZE command message */
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_UNFREEZE_PARMS16, * LPMCI_DGV_UNFREEZE_PARMS16;
typedef MCI_DGV_RECT_PARMS MCI_DGV_UNFREEZE_PARMS, * LPMCI_DGV_UNFREEZE_PARMS; typedef MCI_DGV_RECT_PARMS MCI_DGV_UNFREEZE_PARMS, * LPMCI_DGV_UNFREEZE_PARMS;
/* parameter block for MCI_UPDATE command message */ /* parameter block for MCI_UPDATE command message */
typedef struct {
DWORD dwCallback;
RECT16 rc;
HDC16 hDC;
UINT16 wReserved0;
} MCI_DGV_UPDATE_PARMS16, * LPMCI_DGV_UPDATE_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
RECT rc; RECT rc;
@ -990,20 +842,10 @@ typedef struct {
/* parameter block for MCI_WHERE command message */ /* parameter block for MCI_WHERE command message */
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_WHERE_PARMS16, * LPMCI_DGV_WHERE_PARMS16;
typedef MCI_DGV_RECT_PARMS MCI_DGV_WHERE_PARMS, * LPMCI_DGV_WHERE_PARMS; typedef MCI_DGV_RECT_PARMS MCI_DGV_WHERE_PARMS, * LPMCI_DGV_WHERE_PARMS;
/* parameter block for MCI_WINDOW command message */ /* parameter block for MCI_WINDOW command message */
typedef struct {
DWORD dwCallback;
HWND16 hWnd;
UINT16 wReserved1;
UINT16 nCmdShow;
UINT16 wReserved2;
LPSTR lpstrText;
} MCI_DGV_WINDOW_PARMS16, *LPMCI_DGV_WINDOW_PARMS16;
typedef struct { typedef struct {
DWORD dwCallback; DWORD dwCallback;
HWND hWnd; HWND hWnd;

View File

@ -580,6 +580,170 @@ typedef struct {
RECT16 rc; RECT16 rc;
} MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16; } MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16;
/* from digitalv / 16 bit */
typedef struct {
DWORD dwCallback;
RECT16 rc;
} MCI_DGV_RECT_PARMS16, *LPMCI_DGV_RECT_PARMS16;
typedef struct {
DWORD dwCallback;
LPSTR lpstrFileName;
RECT16 rc;
} MCI_DGV_CAPTURE_PARMS16, *LPMCI_DGV_CAPTURE_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_COPY_PARMS16, *LPMCI_DGV_COPY_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_CUT_PARMS16, * LPMCI_DGV_CUT_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_DELETE_PARMS16, * LPMCI_DGV_DELETE_PARMS16;
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_FREEZE_PARMS16, * LPMCI_DGV_FREEZE_PARMS16;
typedef struct {
DWORD dwCallback;
LPSTR lpstrReturn;
DWORD dwRetSize;
DWORD dwItem;
} MCI_DGV_INFO_PARMS16, * LPMCI_DGV_INFO_PARMS16;
typedef struct {
DWORD dwCallback;
LPSTR lpstrReturn;
DWORD dwLength;
DWORD dwNumber;
DWORD dwItem;
LPSTR lpstrAlgorithm;
} MCI_DGV_LIST_PARMS16, *LPMCI_DGV_LIST_PARMS16;
typedef MCI_LOAD_PARMS16 MCI_DGV_LOAD_PARMS16 , * LPMCI_DGV_LOAD_PARMS16;
typedef struct {
DWORD dwCallback;
UINT16 wDeviceID;
UINT16 wReserved0;
LPSTR lpstrDeviceType;
LPSTR lpstrElementName;
LPSTR lpstrAlias;
DWORD dwStyle;
HWND16 hWndParent;
UINT16 wReserved1;
} MCI_DGV_OPEN_PARMS16, *LPMCI_DGV_OPEN_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_PASTE_PARMS16, * LPMCI_DGV_PASTE_PARMS16;
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_PUT_PARMS16, * LPMCI_DGV_PUT_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwItem;
LPSTR lpstrName;
DWORD lpstrAlgorithm;
DWORD dwHandle;
} MCI_DGV_QUALITY_PARMS16, *LPMCI_DGV_QUALITY_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT16 rc;
DWORD dwAudioStream;
DWORD dwVideoStream;
} MCI_DGV_RECORD_PARMS16, * LPMCI_DGV_RECORD_PARMS16;
typedef struct {
DWORD dwCallback;
LPSTR lpstrPath;
DWORD dwSize;
} MCI_DGV_RESERVE_PARMS16, *LPMCI_DGV_RESERVE_PARMS16A;
typedef struct {
DWORD dwCallback;
LPSTR lpstrFileName;
RECT16 rc;
} MCI_DGV_RESTORE_PARMS16, *LPMCI_DGV_RESTORE_PARMS16;
typedef struct {
DWORD dwCallback;
LPSTR lpstrFileName;
RECT16 rc;
} MCI_DGV_SAVE_PARMS16, *LPMCI_DGV_SAVE_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
LPSTR lpstrAlgorithm;
LPSTR lpstrQuality;
} MCI_DGV_SETAUDIO_PARMS16, *LPMCI_DGV_SETAUDIO_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
LPSTR lpstrAlgorithm;
LPSTR lpstrQuality;
DWORD dwSourceNumber;
} MCI_DGV_SETVIDEO_PARMS16, *LPMCI_DGV_SETVIDEO_PARMS16;
typedef struct {
DWORD dwCallback;
DWORD dwReturn;
DWORD dwItem;
DWORD dwTrack;
SEGPTR lpstrDrive;
DWORD dwReference;
} MCI_DGV_STATUS_PARMS16, *LPMCI_DGV_STATUS_PARMS16;
typedef struct {
DWORD dwCallback;
RECT16 rc;
HDC16 hDC;
UINT16 wReserved0;
} MCI_DGV_UPDATE_PARMS16, * LPMCI_DGV_UPDATE_PARMS16;
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_UNFREEZE_PARMS16, * LPMCI_DGV_UNFREEZE_PARMS16;
typedef MCI_DGV_RECT_PARMS16 MCI_DGV_WHERE_PARMS16, * LPMCI_DGV_WHERE_PARMS16;
typedef struct {
DWORD dwCallback;
HWND16 hWnd;
UINT16 wReserved1;
UINT16 nCmdShow;
UINT16 wReserved2;
LPSTR lpstrText;
} MCI_DGV_WINDOW_PARMS16, *LPMCI_DGV_WINDOW_PARMS16;
#include "poppack.h" #include "poppack.h"
#endif /* __WINE_WINE_MMSYSTEM16_H */ #endif /* __WINE_WINE_MMSYSTEM16_H */