From 10e6d3b9711ada05cc21a7dc5425510bec9471a2 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 29 May 2013 11:01:18 +0000
Subject: [PATCH] [ADVPACK_WINETEST] * Sync with Wine 1.5.26.

svn path=/trunk/; revision=59103
---
 rostests/winetests/advpack/advpack.c  | 12 +++++++++---
 rostests/winetests/advpack/files.c    | 11 +++++++++--
 rostests/winetests/advpack/install.c  | 11 +++++++++--
 rostests/winetests/advpack/testlist.c |  5 +----
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/rostests/winetests/advpack/advpack.c b/rostests/winetests/advpack/advpack.c
index 1345d72f6a4..96d875ad722 100644
--- a/rostests/winetests/advpack/advpack.c
+++ b/rostests/winetests/advpack/advpack.c
@@ -19,12 +19,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
+
 #include <stdio.h>
-#include <stdarg.h>
-#include <windows.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <objbase.h>
 #include <advpub.h>
 #include <assert.h>
-#include "wine/test.h"
+#include <wine/test.h>
 
 /* defines for the TranslateInfString/Ex tests */
 #define TEST_STRING1 "\\Application Name"
diff --git a/rostests/winetests/advpack/files.c b/rostests/winetests/advpack/files.c
index 4a985bed22e..483fa2f59fd 100644
--- a/rostests/winetests/advpack/files.c
+++ b/rostests/winetests/advpack/files.c
@@ -18,11 +18,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
+
 #include <stdio.h>
-#include <windows.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <objbase.h>
 #include <advpub.h>
 #include <fci.h>
-#include "wine/test.h"
+#include <wine/test.h>
 
 /* make the max size large so there is only one cab file */
 #define MEDIA_SIZE          999999999
diff --git a/rostests/winetests/advpack/install.c b/rostests/winetests/advpack/install.c
index 4876d718817..6303db0f75b 100644
--- a/rostests/winetests/advpack/install.c
+++ b/rostests/winetests/advpack/install.c
@@ -18,10 +18,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
+
 #include <stdio.h>
-#include <windows.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <objbase.h>
 #include <advpub.h>
-#include "wine/test.h"
+#include <wine/test.h>
 
 static HMODULE hAdvPack;
 /* function pointers */
diff --git a/rostests/winetests/advpack/testlist.c b/rostests/winetests/advpack/testlist.c
index 3999a51fceb..807dc2b2e31 100644
--- a/rostests/winetests/advpack/testlist.c
+++ b/rostests/winetests/advpack/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_advpack(void);
 extern void func_files(void);