[ADVPACK_WINETEST]

* Sync with Wine 1.5.26.

svn path=/trunk/; revision=59103

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"

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

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 */

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);