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

This commit is contained in:
Amine Khaldi 2018-03-17 13:19:04 +01:00
parent 122f1078cd
commit b96cf0b102
5 changed files with 14 additions and 17 deletions

View file

@ -17,10 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include "windef.h" #include "windef.h"
//#include "winbase.h" #include "winbase.h"
#include <mmddk.h> #include "mmddk.h"
#include <digitalv.h> #include "digitalv.h"
#ifdef MCI_INTEGER64 #ifdef MCI_INTEGER64
#define MCI_DWORD_PTR MCI_INTEGER64 #define MCI_DWORD_PTR MCI_INTEGER64

View file

@ -18,19 +18,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 <stdarg.h>
#include <math.h> #include <math.h>
#include "windef.h"
#include <windef.h> #include "winbase.h"
#include <mmddk.h> #include "winuser.h"
#include <wine/debug.h> #include "mmddk.h"
#include "wine/debug.h"
#include "mciqtz_private.h" #include "mciqtz_private.h"
#include <digitalv.h> #include "digitalv.h"
#include <wownt32.h> #include "wownt32.h"
WINE_DEFAULT_DEBUG_CHANNEL(mciqtz); WINE_DEFAULT_DEBUG_CHANNEL(mciqtz);

View file

@ -23,7 +23,7 @@
#define COBJMACROS #define COBJMACROS
#include <dshow.h> #include "dshow.h"
typedef struct { typedef struct {
MCIDEVICEID wDevID; MCIDEVICEID wDevID;

View file

@ -24,4 +24,4 @@
#define WINE_PRODUCTVERSION_STR "6.5" #define WINE_PRODUCTVERSION_STR "6.5"
#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
#include <wine/wine_common_ver.rc> #include "wine/wine_common_ver.rc"

View 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/mapi32 # Synced to WineStaging-3.3
reactos/dll/win32/mciavi32 # 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/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/mciseq # Synced to WineStaging-2.9
reactos/dll/win32/mciwave # Synced to WineStaging-2.9 reactos/dll/win32/mciwave # Synced to WineStaging-2.9
reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9 reactos/dll/win32/mgmtapi # Synced to WineStaging-2.9