Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 08:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Amine Khaldi 2018-03-08 13:42:29 +01:00
parent 4203ed112e
commit 7fdc682155
5 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dll/directx/wine/msdmo/dmoreg.c
View file

@ -17,12 +17,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include <winuser.h>
#include <winreg.h>
#include <wine/unicode.h>
#include <dmo.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

15
dll/directx/wine/msdmo/dmort.c
View file

@ -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.@)

2
dll/directx/wine/msdmo/precomp.h
View file

@ -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_ */

2
dll/directx/wine/msdmo/rsrc.rc
View file

@ -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"

2
media/doc/README.WINE
View file

@ -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