[MCIQTZ32] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Mar 2018 12:19:04 +0000 (13:19 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Mar 2018 12:19:04 +0000 (13:19 +0100)
dll/win32/mciqtz32/mciavi_res.rc
dll/win32/mciqtz32/mciqtz.c
dll/win32/mciqtz32/mciqtz_private.h
dll/win32/mciqtz32/version.rc
media/doc/README.WINE

index 8db52cf..5743604 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-#include <mmddk.h>
-#include <digitalv.h>
+#include "windef.h"
+#include "winbase.h"
+#include "mmddk.h"
+#include "digitalv.h"
 
 #ifdef MCI_INTEGER64
 #define MCI_DWORD_PTR MCI_INTEGER64
index 0e0aa63..1aec326 100644 (file)
  * 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 <math.h>
-
-#include <windef.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);
 
index fcdfdb8..aa6fad9 100644 (file)
@@ -23,7 +23,7 @@
 
 #define COBJMACROS
 
-#include <dshow.h>
+#include "dshow.h"
 
 typedef struct {
     MCIDEVICEID    wDevID;
index a0de28b..b27e76b 100644 (file)
@@ -24,4 +24,4 @@
 #define WINE_PRODUCTVERSION_STR "6.5"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
index e2b6d60..bc9f80f 100644 (file)
@@ -92,7 +92,7 @@ reactos/dll/win32/lz32                # Synced to WineStaging-3.3
 reactos/dll/win32/mapi32              # Synced to WineStaging-3.3
 reactos/dll/win32/mciavi32            # Synced to WineStaging-3.3
 reactos/dll/win32/mcicda              # Synced to WineStaging-3.3
-reactos/dll/win32/mciqtz32            # Synced to WineStaging-2.9
+reactos/dll/win32/mciqtz32            # Synced to WineStaging-3.3
 reactos/dll/win32/mciseq              # Synced to WineStaging-2.9
 reactos/dll/win32/mciwave             # Synced to WineStaging-2.9
 reactos/dll/win32/mgmtapi             # Synced to WineStaging-2.9