https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fdc68215576aae789ff65...
commit 7fdc68215576aae789ff655742bdc536cde9a02b Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Thu Mar 8 13:42:29 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Thu Mar 8 13:42:29 2018 +0100
[MSDMO] Sync with Wine Staging 3.3. CORE-14434 --- dll/directx/wine/msdmo/dmoreg.c | 22 ++++++++++++++++------ dll/directx/wine/msdmo/dmort.c | 15 ++++++++++++--- dll/directx/wine/msdmo/precomp.h | 2 +- dll/directx/wine/msdmo/rsrc.rc | 2 +- media/doc/README.WINE | 2 +- 5 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/dll/directx/wine/msdmo/dmoreg.c b/dll/directx/wine/msdmo/dmoreg.c index 556391d137..67ba498bc4 100644 --- a/dll/directx/wine/msdmo/dmoreg.c +++ b/dll/directx/wine/msdmo/dmoreg.c @@ -17,12 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" - -#include <winuser.h> -#include <winreg.h> -#include <wine/unicode.h> -#include <dmo.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" +#include "objbase.h" +#include "wine/unicode.h" +#include "wine/debug.h" +#include "initguid.h" +#include "dmo.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
#define MSDMO_MAJOR_VERSION 6
diff --git a/dll/directx/wine/msdmo/dmort.c b/dll/directx/wine/msdmo/dmort.c index de77f70f50..b586cac611 100644 --- a/dll/directx/wine/msdmo/dmort.c +++ b/dll/directx/wine/msdmo/dmort.c @@ -16,10 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" +#include <stdarg.h>
-#include <mediaobj.h> -#include <dmort.h> +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "mediaobj.h" +#include "dmort.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
/*********************************************************************** * MoCreateMediaType (MSDMO.@) diff --git a/dll/directx/wine/msdmo/precomp.h b/dll/directx/wine/msdmo/precomp.h index ceb8d707d8..a13e185f6f 100644 --- a/dll/directx/wine/msdmo/precomp.h +++ b/dll/directx/wine/msdmo/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MSDMO_PCH_ #define _MSDMO_PCH_
@@ -15,6 +16,5 @@ #include <objbase.h>
#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
#endif /* _MSDMO_PCH_ */ diff --git a/dll/directx/wine/msdmo/rsrc.rc b/dll/directx/wine/msdmo/rsrc.rc index 2c24781dc4..a313b9791f 100644 --- a/dll/directx/wine/msdmo/rsrc.rc +++ b/dll/directx/wine/msdmo/rsrc.rc @@ -23,4 +23,4 @@ #define WINE_PRODUCTVERSION 6,5,1,900 #define WINE_PRODUCTVERSION_STR "6.5"
-#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 111a877b04..44c167c454 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -37,7 +37,7 @@ reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3 reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.3 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.3 reactos/dll/directx/wine/qedit # Synced to Wine-3.0 reactos/dll/directx/wine/quartz # Synced to Wine-3.0 reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.3