From 1bb40cffc07a165e0b35db48aa252bfe04a8cae9 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 8 Mar 2018 13:28:23 +0100
Subject: [PATCH] [D3DXOF] Sync with Wine Staging 3.3. CORE-14434

---
 dll/directx/wine/d3dxof/CMakeLists.txt   |  4 ++--
 dll/directx/wine/d3dxof/d3dxof.c         | 11 +++++++++++
 dll/directx/wine/d3dxof/d3dxof_private.h | 21 +++++++--------------
 dll/directx/wine/d3dxof/main.c           | 20 ++++++++++++++++++--
 dll/directx/wine/d3dxof/mszip.c          |  8 ++++----
 dll/directx/wine/d3dxof/parsing.c        | 12 ++++++++++++
 dll/directx/wine/d3dxof/precomp.h        | 19 +++++++++++++++++++
 media/doc/README.WINE                    |  2 +-
 8 files changed, 74 insertions(+), 23 deletions(-)
 create mode 100644 dll/directx/wine/d3dxof/precomp.h

diff --git a/dll/directx/wine/d3dxof/CMakeLists.txt b/dll/directx/wine/d3dxof/CMakeLists.txt
index eb95b11cc35..a4fff47f23b 100644
--- a/dll/directx/wine/d3dxof/CMakeLists.txt
+++ b/dll/directx/wine/d3dxof/CMakeLists.txt
@@ -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)
diff --git a/dll/directx/wine/d3dxof/d3dxof.c b/dll/directx/wine/d3dxof/d3dxof.c
index 9388fe8bc57..549955193a5 100644
--- a/dll/directx/wine/d3dxof/d3dxof.c
+++ b/dll/directx/wine/d3dxof/d3dxof.c
@@ -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);
diff --git a/dll/directx/wine/d3dxof/d3dxof_private.h b/dll/directx/wine/d3dxof/d3dxof_private.h
index efe990ab2ad..cf33ed21cea 100644
--- a/dll/directx/wine/d3dxof/d3dxof_private.h
+++ b/dll/directx/wine/d3dxof/d3dxof_private.h
@@ -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
diff --git a/dll/directx/wine/d3dxof/main.c b/dll/directx/wine/d3dxof/main.c
index 5da77f992a4..572f38831f8 100644
--- a/dll/directx/wine/d3dxof/main.c
+++ b/dll/directx/wine/d3dxof/main.c
@@ -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);
 
diff --git a/dll/directx/wine/d3dxof/mszip.c b/dll/directx/wine/d3dxof/mszip.c
index a16e6af468c..179661634f7 100644
--- a/dll/directx/wine/d3dxof/mszip.c
+++ b/dll/directx/wine/d3dxof/mszip.c
@@ -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;
diff --git a/dll/directx/wine/d3dxof/parsing.c b/dll/directx/wine/d3dxof/parsing.c
index 6c56914953f..f7724ec1913 100644
--- a/dll/directx/wine/d3dxof/parsing.c
+++ b/dll/directx/wine/d3dxof/parsing.c
@@ -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);
 
diff --git a/dll/directx/wine/d3dxof/precomp.h b/dll/directx/wine/d3dxof/precomp.h
new file mode 100644
index 00000000000..a7878468b98
--- /dev/null
+++ b/dll/directx/wine/d3dxof/precomp.h
@@ -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_ */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 1f00297ce1b..fd64d09a2e7 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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