[MCIAVI32] Sync with Wine Staging 3.3. CORE-14434

[reactos.git] / dll / win32 / mciavi32 / private_mciavi.h

diff --git a/dll/win32/mciavi32/private_mciavi.h b/dll/win32/mciavi32/private_mciavi.h
index 804702f..1b53ab8 100644 (file)
--- a/dll/win32/mciavi32/private_mciavi.h
+++ b/dll/win32/mciavi32/private_mciavi.h
@@ -21,20 +21,16 @@
 #ifndef __WINE_PRIVATE_MCIAVI_H
 #define __WINE_PRIVATE_MCIAVI_H
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-//#include "winuser.h"
-#include <mmddk.h>
-#include <digitalv.h>
-#include <vfw.h>
-#include <wownt32.h>
-#include <mciavi.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "mmddk.h"
+#include "digitalv.h"
+#include "vfw.h"
+#include "wownt32.h"
+#include "mciavi.h"
 
 struct MMIOPos {
     DWORD      dwOffset;
@@ -80,10 +76,14 @@ typedef struct {
     DWORD               dwToVideoFrame; /* play to */
     DWORD              dwCurrAudioBlock;       /* current audio block being played */
     RECT                source, dest;
+    struct
+    {
+        DWORD flags;
+        MCI_BREAK_PARMS parms;
+    } mci_break;
     /* data for the background mechanism */
     CRITICAL_SECTION   cs;
     HANDLE              hStopEvent;
-    HANDLE              ack_event; /* acknowledge that an async command has started */
 } WINE_MCIAVI;
 
 extern HINSTANCE MCIAVI_hInstance DECLSPEC_HIDDEN;
@@ -100,7 +100,7 @@ BOOL        MCIAVI_GetInfo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN;
 DWORD  MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) DECLSPEC_HIDDEN;
 BOOL   MCIAVI_OpenVideo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN;
 void   MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) DECLSPEC_HIDDEN;
-LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN;
+double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN;
 
 /* mciavi.c */
 WINE_MCIAVI*   MCIAVI_mciGetOpenDev(UINT wDevID) DECLSPEC_HIDDEN;