Sync with trunk r63831.

[reactos.git] / dll / win32 / mciqtz32 / mciqtz.c

diff --git a/dll/win32/mciqtz32/mciqtz.c b/dll/win32/mciqtz32/mciqtz.c
index b05e681..312aaf2 100644 (file)
--- a/dll/win32/mciqtz32/mciqtz.c
+++ b/dll/win32/mciqtz32/mciqtz.c
@@ -18,15 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define WIN32_LEAN_AND_MEAN
+
 #include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "mmddk.h"
-#include "wine/debug.h"
+#include <windef.h>
+//#include "winbase.h"
+//#include "winuser.h"
+#include <mmddk.h>
+#include <wine/debug.h>
 #include "mciqtz_private.h"
-#include "digitalv.h"
-#include "wownt32.h"
+#include <digitalv.h>
+#include <wownt32.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(mciqtz);
 
@@ -241,13 +244,13 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags,
 
 err:
     if (wma->vidbasic)
-        IUnknown_Release(wma->vidbasic);
+        IBasicVideo_Release(wma->vidbasic);
     wma->vidbasic = NULL;
     if (wma->seek)
-        IUnknown_Release(wma->seek);
+        IMediaSeeking_Release(wma->seek);
     wma->seek = NULL;
     if (wma->vidwin)
-        IUnknown_Release(wma->vidwin);
+        IVideoWindow_Release(wma->vidwin);
     wma->vidwin = NULL;
     if (wma->pgraph)
         IGraphBuilder_Release(wma->pgraph);
@@ -261,7 +264,7 @@ err:
 
     if (wma->uninit)
         CoUninitialize();
-    wma->uninit = 0;
+    wma->uninit = FALSE;
 
     return MCIERR_INTERNAL;
 }
@@ -282,9 +285,9 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP
     MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL);
 
     if (wma->opened) {
-        IUnknown_Release(wma->vidwin);
-        IUnknown_Release(wma->vidbasic);
-        IUnknown_Release(wma->seek);
+        IVideoWindow_Release(wma->vidwin);
+        IBasicVideo_Release(wma->vidbasic);
+        IMediaSeeking_Release(wma->seek);
         IMediaEvent_Release(wma->mevent);
         IGraphBuilder_Release(wma->pgraph);
         IMediaControl_Release(wma->pmctrl);
@@ -733,13 +736,13 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp
 
     if (dwFlags & MCI_DGV_WHERE_SOURCE) {
         if (dwFlags & MCI_DGV_WHERE_MAX)
-            FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc));
+            FIXME("MCI_DGV_WHERE_SOURCE_MAX stub\n");
         IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom);
         TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc));
     }
     if (dwFlags & MCI_DGV_WHERE_DESTINATION) {
         if (dwFlags & MCI_DGV_WHERE_MAX)
-            FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc));
+            FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub\n");
         IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom);
         TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc));
     }