01/01: [SXS] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=640271bc371f156db3e19…

commit 640271bc371f156db3e1920d8a2af671b35172ab
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Mar 23 12:30:21 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Mar 23 12:30:21 2018 +0100

    [SXS] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/sxs/CMakeLists.txt |  4 ++--
 dll/win32/sxs/cache.c        | 19 +++++++++++++++----
 dll/win32/sxs/name.c         | 13 +++++++++++++
 dll/win32/sxs/precomp.h      | 23 +++++++++++++++++++++++
 dll/win32/sxs/sxs.c          |  6 +++++-
 dll/win32/sxs/sxs_private.h  | 23 +----------------------
 media/doc/README.WINE        |  2 +-
 7 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt
index 9e44e72413..79d166e036 100644
--- a/dll/win32/sxs/CMakeLists.txt
+++ b/dll/win32/sxs/CMakeLists.txt
@@ -7,7 +7,7 @@ list(APPEND SOURCE
     cache.c
     name.c
     sxs.c
-    sxs_private.h
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c)
 
 add_library(sxs SHARED
@@ -18,5 +18,5 @@ add_library(sxs SHARED
 set_module_type(sxs win32dll)
 target_link_libraries(sxs wine)
 add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll)
-add_pch(sxs sxs_private.h SOURCE)
+add_pch(sxs precomp.h SOURCE)
 add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/sxs/cache.c b/dll/win32/sxs/cache.c
index 7896e27573..791a6ed049 100644
--- a/dll/win32/sxs/cache.c
+++ b/dll/win32/sxs/cache.c
@@ -18,12 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "sxs_private.h"
+#include <stdarg.h>
+
+#define COBJMACROS
+#define INITGUID
 
-#include <oleauto.h>
-#include <msxml2.h>
+#include "windef.h"
+#include "winbase.h"
+#include "ole2.h"
+#include "winsxs.h"
+#include "msxml2.h"
+
+#include "wine/debug.h"
+#include "wine/list.h"
+#include "wine/unicode.h"
+#include "sxs_private.h"
 
-#include <wine/list.h>
+WINE_DEFAULT_DEBUG_CHANNEL(sxs);
 
 static const WCHAR cache_mutex_nameW[] =
    
{'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0};
diff --git a/dll/win32/sxs/name.c b/dll/win32/sxs/name.c
index 5e50821736..74aece2bc3 100644
--- a/dll/win32/sxs/name.c
+++ b/dll/win32/sxs/name.c
@@ -18,8 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "ole2.h"
+#include "winsxs.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
 #include "sxs_private.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(sxs);
+
 struct name
 {
     IAssemblyName IAssemblyName_iface;
diff --git a/dll/win32/sxs/precomp.h b/dll/win32/sxs/precomp.h
new file mode 100644
index 0000000000..52a823b3d2
--- /dev/null
+++ b/dll/win32/sxs/precomp.h
@@ -0,0 +1,23 @@
+
+#ifndef _SXS_PRECOMP_H_
+#define _SXS_PRECOMP_H_
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <winsxs.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#include "sxs_private.h"
+
+#endif /* !_SXS_PRECOMP_H_ */
diff --git a/dll/win32/sxs/sxs.c b/dll/win32/sxs/sxs.c
index f5aab4c9d0..06e6672dbf 100644
--- a/dll/win32/sxs/sxs.c
+++ b/dll/win32/sxs/sxs.c
@@ -18,7 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "sxs_private.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+
 
 /***********************************************************************
  *             DllMain   (SXS.@)
diff --git a/dll/win32/sxs/sxs_private.h b/dll/win32/sxs/sxs_private.h
index de462512f3..1ceab265e3 100644
--- a/dll/win32/sxs/sxs_private.h
+++ b/dll/win32/sxs/sxs_private.h
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef _SXS_PRIVATE_H_
-#define _SXS_PRIVATE_H_
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <winsxs.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(sxs);
+#pragma once
 
 enum name_attr_id
 {
@@ -57,5 +38,3 @@ static inline WCHAR *strdupW( const WCHAR *src )
     if (dst) strcpyW( dst, src );
     return dst;
 }
-
-#endif /* _SXS_PRIVATE_H_ */
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index d0c2a4297e..f0786bd2b1 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -181,7 +181,7 @@ reactos/dll/win32/softpub             # Synced to WineStaging-2.9
 reactos/dll/win32/stdole2.tlb         # Synced to WineStaging-3.3
 reactos/dll/win32/stdole32.tlb        # Synced to WineStaging-3.3
 reactos/dll/win32/sti                 # Synced to WineStaging-3.3
-reactos/dll/win32/sxs                 # Synced to WineStaging-2.16
+reactos/dll/win32/sxs                 # Synced to WineStaging-3.3
 reactos/dll/win32/t2embed             # Synced to WineStaging-2.9
 reactos/dll/win32/tapi32              # Synced to WineStaging-2.9
 reactos/dll/win32/traffic             # Synced to WineStaging-2.9