Author: akhaldi
Date: Wed May 29 11:01:18 2013
New Revision: 59103
URL: http://svn.reactos.org/svn/reactos?rev=59103&view=rev
Log:
[ADVPACK_WINETEST]
* Sync with Wine 1.5.26.
Modified:
trunk/rostests/winetests/advpack/advpack.c
trunk/rostests/winetests/advpack/files.c
trunk/rostests/winetests/advpack/install.c
trunk/rostests/winetests/advpack/testlist.c
Modified: trunk/rostests/winetests/advpack/advpack.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack.c?rev=59103&r1=59102&r2=59103&view=diff
==============================================================================
--- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Wed May 29
11:01:18 2013
@@ -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"
Modified: trunk/rostests/winetests/advpack/files.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c?rev=59103&r1=59102&r2=59103&view=diff
==============================================================================
--- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Wed May 29
11:01:18 2013
@@ -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
Modified: trunk/rostests/winetests/advpack/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install.c?rev=59103&r1=59102&r2=59103&view=diff
==============================================================================
--- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Wed May 29
11:01:18 2013
@@ -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 */
Modified: trunk/rostests/winetests/advpack/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/testlist.c?rev=59103&r1=59102&r2=59103&view=diff
==============================================================================
--- trunk/rostests/winetests/advpack/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/advpack/testlist.c [iso-8859-1] Wed May 29
11:01:18 2013
@@ -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);
