Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Amine Khaldi 2018-03-08 13:28:23 +01:00
parent e5c42da45c
commit 1bb40cffc0
8 changed files with 74 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/directx/wine/d3dxof/CMakeLists.txt
View file

@ -7,7 +7,7 @@ list(APPEND SOURCE
d3dxof.c
main.c
parsing.c
d3dxof_private.h)
precomp.h)
add_library(d3dxof SHARED
${SOURCE}
@ -18,5 +18,5 @@ add_library(d3dxof SHARED
set_module_type(d3dxof win32dll)
target_link_libraries(d3dxof dxguid uuid wine)
add_importlibs(d3dxof msvcrt kernel32 ntdll)
add_pch(d3dxof d3dxof_private.h SOURCE)
add_pch(d3dxof precomp.h SOURCE)
add_cd_file(TARGET d3dxof DESTINATION reactos/system32 FOR all)

11
dll/directx/wine/d3dxof/d3dxof.c
View file

@ -18,7 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/debug.h"
#define COBJMACROS
#include "winbase.h"
#include "wingdi.h"
#include "d3dxof_private.h"
#include "dxfile.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump);

21
dll/directx/wine/d3dxof/d3dxof_private.h
View file

@ -21,21 +21,14 @@
#ifndef __D3DXOF_PRIVATE_INCLUDED__
#define __D3DXOF_PRIVATE_INCLUDED__
#include <config.h>
#include <stdarg.h>
#include <stdio.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
#include <dxfile.h>
#include <wine/debug.h>
#include "windef.h"
#include "winbase.h"
#include "wtypes.h"
#include "wingdi.h"
#include "winuser.h"
#include "dxfile.h"
#define MAX_NAME_LEN 40
#define MAX_ARRAY_DIM 4

20
dll/directx/wine/d3dxof/main.c
View file

@ -18,9 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "d3dxof_private.h"
#include <stdarg.h>
#include <string.h>
#include <rpcproxy.h>
#define COBJMACROS
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
#include "ole2.h"
#include "rpcproxy.h"
#include "uuids.h"
#include "d3dxof_private.h"
#include "dxfile.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);

8
dll/directx/wine/d3dxof/mszip.c
View file

@ -23,13 +23,13 @@
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
#include "mszip.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
THOSE_ZIP_CONSTS;

12
dll/directx/wine/d3dxof/parsing.c
View file

@ -18,7 +18,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "wine/debug.h"
#define COBJMACROS
#include "winbase.h"
#include "wingdi.h"
#include "d3dxof_private.h"
#include "dxfile.h"
#include <stdio.h>
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);

19
dll/directx/wine/d3dxof/precomp.h Normal file
View file

@ -0,0 +1,19 @@
#ifndef _D3DXOF_PRECOMP_H_
#define _D3DXOF_PRECOMP_H_
#include <wine/config.h>
#include <stdio.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include "d3dxof_private.h"
#include <wine/debug.h>
#endif /* _D3DXOF_PRECOMP_H_ */

2
media/doc/README.WINE
View file

@ -27,7 +27,7 @@ reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.3
reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3
reactos/dll/directx/wine/d3drm # Synced to WineStaging-3.3
reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.3
reactos/dll/directx/wine/d3dxof # Synced to WineStaging-2.9
reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3
reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.3
reactos/dll/directx/wine/devenum # Synced to Wine-3.0
reactos/dll/directx/wine/dinput # Synced to Wine-3.0