sync digitalv.h with wine (packing and x64 fixes)

svn path=/trunk/; revision=68796
This commit is contained in:
Christoph von Wittich 2015-08-23 06:37:05 +00:00
parent 01fca10b83
commit c652a5f2c9

View file

@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_DIGITALV_H
@ -23,6 +23,8 @@
* Wine Digital Video extensions
*/
#include <pshpack1.h>
#ifdef __cplusplus
extern "C" {
#endif
@ -199,7 +201,7 @@ extern "C" {
#define MCI_DGV_MONITOR_METHOD 0x00010000L
#define MCI_DGV_MONITOR_SOURCE 0x00020000L
/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS struture */
/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS structure */
#define MCI_DGV_MONITOR_INPUT 0x00004000L
#define MCI_DGV_MONITOR_FILE 0x00004001L
@ -459,20 +461,20 @@ extern "C" {
/* parameter block for MCI_WHERE, MCI_PUT, MCI_FREEZE, MCI_UNFREEZE cmds */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
RECT rc;
} MCI_DGV_RECT_PARMS, *LPMCI_DGV_RECT_PARMS;
/* parameter block for MCI_CAPTURE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrFileName;
RECT rc;
} MCI_DGV_CAPTURE_PARMSA, *LPMCI_DGV_CAPTURE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrFileName;
RECT rc;
} MCI_DGV_CAPTURE_PARMSW, *LPMCI_DGV_CAPTURE_PARMSW;
@ -487,7 +489,7 @@ typedef MCI_GENERIC_PARMS MCI_CLOSE_PARMS, *LPMCI_CLOSE_PARMS;
/* parameter block for MCI_COPY command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
@ -498,14 +500,14 @@ typedef struct {
/* parameter block for MCI_CUE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwTo;
} MCI_DGV_CUE_PARMS, *LPMCI_DGV_CUE_PARMS;
/* parameter block for MCI_CUT command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
@ -516,7 +518,7 @@ typedef struct {
/* parameter block for MCI_DELETE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
@ -531,14 +533,14 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_FREEZE_PARMS, * LPMCI_DGV_FREEZE_PARMS;
/* parameter block for MCI_INFO command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrReturn;
DWORD dwRetSize;
DWORD dwItem;
} MCI_DGV_INFO_PARMSA, * LPMCI_DGV_INFO_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrReturn;
DWORD dwRetSize;
DWORD dwItem;
@ -550,7 +552,7 @@ typedef struct {
/* parameter block for MCI_LIST command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrReturn;
DWORD dwLength;
DWORD dwNumber;
@ -559,7 +561,7 @@ typedef struct {
} MCI_DGV_LIST_PARMSA, *LPMCI_DGV_LIST_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrReturn;
DWORD dwLength;
DWORD dwNumber;
@ -581,7 +583,7 @@ typedef MCI_LOAD_PARMSW MCI_DGV_LOAD_PARMSW, * LPMCI_DGV_LOAD_PARMSW;
/* parameter block for MCI_MONITOR command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwSource;
DWORD dwMethod;
} MCI_DGV_MONITOR_PARMS, * LPMCI_DGV_MONITOR_PARMS;
@ -589,7 +591,7 @@ typedef struct {
/* parameter block for MCI_OPEN command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
UINT wDeviceID;
LPSTR lpstrDeviceType;
LPSTR lpstrElementName;
@ -599,7 +601,7 @@ typedef struct {
} MCI_DGV_OPEN_PARMSA, *LPMCI_DGV_OPEN_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
UINT wDeviceID;
LPWSTR lpstrDeviceType;
LPWSTR lpstrElementName;
@ -618,7 +620,7 @@ typedef MCI_GENERIC_PARMS MCI_DGV_PAUSE_PARMS, * LPMCI_DGV_PAUSE_PARMS;
/* parameter block for MCI_PASTE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwTo;
RECT rc;
DWORD dwAudioStream;
@ -636,7 +638,7 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_PUT_PARMS, * LPMCI_DGV_PUT_PARMS;
/* parameter block for MCI_QUALITY command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
LPSTR lpstrName;
DWORD lpstrAlgorithm;
@ -644,7 +646,7 @@ typedef struct {
} MCI_DGV_QUALITY_PARMSA, *LPMCI_DGV_QUALITY_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
LPWSTR lpstrName;
DWORD lpstrAlgorithm;
@ -661,7 +663,7 @@ typedef MCI_GENERIC_PARMS MCI_REALIZE_PARMS, * LPMCI_REALIZE_PARMS;
/* parameter block for MCI_RECORD command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrom;
DWORD dwTo;
RECT rc;
@ -672,13 +674,13 @@ typedef struct {
/* parameter block for MCI_RESERVE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrPath;
DWORD dwSize;
} MCI_DGV_RESERVE_PARMSA, *LPMCI_DGV_RESERVE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrPath;
DWORD dwSize;
} MCI_DGV_RESERVE_PARMSW, *LPMCI_DGV_RESERVE_PARMSW;
@ -689,13 +691,13 @@ typedef struct {
/* parameter block for MCI_RESTORE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrFileName;
RECT rc;
} MCI_DGV_RESTORE_PARMSA, *LPMCI_DGV_RESTORE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrFileName;
RECT rc;
} MCI_DGV_RESTORE_PARMSW, *LPMCI_DGV_RESTORE_PARMSW;
@ -710,13 +712,13 @@ typedef MCI_GENERIC_PARMS MCI_DGV_RESUME_PARMS, * LPMCI_DGV_RESUME_PARMS;
/* parameter block for MCI_SAVE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPSTR lpstrFileName;
RECT rc;
} MCI_DGV_SAVE_PARMSA, *LPMCI_DGV_SAVE_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
LPWSTR lpstrFileName;
RECT rc;
} MCI_DGV_SAVE_PARMSW, *LPMCI_DGV_SAVE_PARMSW;
@ -727,7 +729,7 @@ typedef struct {
/* parameter block for MCI_SET command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwTimeFormat;
DWORD dwAudio;
DWORD dwFileFormat;
@ -737,7 +739,7 @@ typedef struct {
/* parameter block for MCI_SETAUDIO command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
@ -746,7 +748,7 @@ typedef struct {
} MCI_DGV_SETAUDIO_PARMSA, *LPMCI_DGV_SETAUDIO_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
@ -760,7 +762,7 @@ typedef struct {
/* parameter block for MCI_SIGNAL command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwPosition;
DWORD dwPeriod;
DWORD dwUserParm;
@ -769,7 +771,7 @@ typedef struct {
/* parameter block for MCI_SETVIDEO command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
@ -779,7 +781,7 @@ typedef struct {
} MCI_DGV_SETVIDEO_PARMSA, *LPMCI_DGV_SETVIDEO_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwItem;
DWORD dwValue;
DWORD dwOver;
@ -794,8 +796,8 @@ typedef struct {
/* parameter block for MCI_STATUS command message */
typedef struct {
DWORD dwCallback;
DWORD dwReturn;
DWORD_PTR dwCallback;
DWORD_PTR dwReturn;
DWORD dwItem;
DWORD dwTrack;
LPSTR lpstrDrive;
@ -803,8 +805,8 @@ typedef struct {
} MCI_DGV_STATUS_PARMSA, *LPMCI_DGV_STATUS_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD dwReturn;
DWORD_PTR dwCallback;
DWORD_PTR dwReturn;
DWORD dwItem;
DWORD dwTrack;
LPWSTR lpstrDrive;
@ -817,7 +819,7 @@ typedef struct {
/* parameter block for MCI_STEP command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
DWORD dwFrames;
} MCI_DGV_STEP_PARMS, *LPMCI_DGV_STEP_PARMS;
@ -832,7 +834,7 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_UNFREEZE_PARMS, * LPMCI_DGV_UNFREEZE_PARMS;
/* parameter block for MCI_UPDATE command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
RECT rc;
HDC hDC;
} MCI_DGV_UPDATE_PARMS, * LPMCI_DGV_UPDATE_PARMS;
@ -844,14 +846,14 @@ typedef MCI_DGV_RECT_PARMS MCI_DGV_WHERE_PARMS, * LPMCI_DGV_WHERE_PARMS;
/* parameter block for MCI_WINDOW command message */
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
HWND hWnd;
UINT nCmdShow;
LPSTR lpstrText;
} MCI_DGV_WINDOW_PARMSA, *LPMCI_DGV_WINDOW_PARMSA;
typedef struct {
DWORD dwCallback;
DWORD_PTR dwCallback;
HWND hWnd;
UINT nCmdShow;
LPWSTR lpstrText;
@ -861,4 +863,6 @@ typedef struct {
}
#endif
#include <poppack.h>
#endif /* __WINE_DIGITALV_H */