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

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=235892b4a4f85b090035d…

commit 235892b4a4f85b090035de6ce5f42b6d7170476a
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Fri Mar 9 13:08:05 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Fri Mar 9 13:08:05 2018 +0100

    [FUSION_WINETEST] Sync with Wine Staging 3.3. CORE-14434
---
 modules/rostests/winetests/fusion/asmcache.c | 14 +++-----------
 modules/rostests/winetests/fusion/asmenum.c  | 18 +++++-------------
 modules/rostests/winetests/fusion/asmname.c  | 17 ++++-------------
 modules/rostests/winetests/fusion/fusion.c   | 14 ++------------
 4 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/modules/rostests/winetests/fusion/asmcache.c
b/modules/rostests/winetests/fusion/asmcache.c
index 63dcd36753..081023d809 100644
--- a/modules/rostests/winetests/fusion/asmcache.c
+++ b/modules/rostests/winetests/fusion/asmcache.c
@@ -16,25 +16,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 #define INITGUID
 
 #include <stdio.h>
 
-//#include <windows.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winver.h>
-#include <objbase.h>
-//#include <mscoree.h>
+#include <windows.h>
+#include <mscoree.h>
 #include <fusion.h>
 #include <corerror.h>
 
-#include <wine/test.h>
+#include "wine/test.h"
 
 typedef struct _tagASSEMBLY ASSEMBLY;
 
diff --git a/modules/rostests/winetests/fusion/asmenum.c
b/modules/rostests/winetests/fusion/asmenum.c
index 49caca5c8f..5091be464a 100644
--- a/modules/rostests/winetests/fusion/asmenum.c
+++ b/modules/rostests/winetests/fusion/asmenum.c
@@ -16,26 +16,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
 #include <stdio.h>
 
-//#include <windows.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winnls.h>
+#include <windows.h>
 #include <shlwapi.h>
-//#include <mscoree.h>
+#include <mscoree.h>
 #include <fusion.h>
-//#include <corerror.h>
+#include <corerror.h>
 
-#include <wine/test.h>
-#include <wine/list.h>
+#include "wine/test.h"
+#include "wine/list.h"
 
 static HRESULT (WINAPI *pCreateAssemblyEnum)(IAssemblyEnum **pEnum,
                                              IUnknown *pUnkReserved,
diff --git a/modules/rostests/winetests/fusion/asmname.c
b/modules/rostests/winetests/fusion/asmname.c
index 1558f500de..f48fe32d4c 100644
--- a/modules/rostests/winetests/fusion/asmname.c
+++ b/modules/rostests/winetests/fusion/asmname.c
@@ -16,26 +16,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-//#include <stdio.h>
-#include <stdarg.h>
+#include <stdio.h>
 
-//#include <windows.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <objbase.h>
-//#include <mscoree.h>
+#include <windows.h>
+#include <mscoree.h>
 #include <fusion.h>
 #include <corerror.h>
 #include <strsafe.h>
 
-#include <wine/test.h>
+#include "wine/test.h"
 
 /* ok-like statement which takes two unicode strings or one unicode and one ANSI string
as arguments */
 static CHAR string1[MAX_PATH];
diff --git a/modules/rostests/winetests/fusion/fusion.c
b/modules/rostests/winetests/fusion/fusion.c
index 48d90306dd..82829d55b1 100644
--- a/modules/rostests/winetests/fusion/fusion.c
+++ b/modules/rostests/winetests/fusion/fusion.c
@@ -16,20 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <windows.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-#include <objbase.h>
+#include <windows.h>
 #include <fusion.h>
 
-#include <wine/test.h>
+#include "wine/test.h"
 
 static HMODULE hmscoree;