https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59eab41aba3ebe4fcbd668...
commit 59eab41aba3ebe4fcbd6689da0bfaf7f7902e8fa Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 9 12:42:18 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 9 12:42:18 2018 +0100
[ADVPACK_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/advpack/advpack.c | 12 +++--------- modules/rostests/winetests/advpack/files.c | 11 ++--------- modules/rostests/winetests/advpack/install.c | 11 ++--------- 3 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/modules/rostests/winetests/advpack/advpack.c b/modules/rostests/winetests/advpack/advpack.c index 9f4e4fc3e6..d5958769ab 100644 --- a/modules/rostests/winetests/advpack/advpack.c +++ b/modules/rostests/winetests/advpack/advpack.c @@ -19,18 +19,12 @@ * 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 <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> +#include <stdarg.h> +#include <windows.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/modules/rostests/winetests/advpack/files.c b/modules/rostests/winetests/advpack/files.c index 101e907321..1851dc16f0 100644 --- a/modules/rostests/winetests/advpack/files.c +++ b/modules/rostests/winetests/advpack/files.c @@ -18,18 +18,11 @@ * 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 <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> +#include <windows.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/modules/rostests/winetests/advpack/install.c b/modules/rostests/winetests/advpack/install.c index ad7eb8dbf4..16593d1c5e 100644 --- a/modules/rostests/winetests/advpack/install.c +++ b/modules/rostests/winetests/advpack/install.c @@ -18,17 +18,10 @@ * 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 <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <objbase.h> +#include <windows.h> #include <advpub.h> -#include <wine/test.h> +#include "wine/test.h"
static HMODULE hAdvPack; /* function pointers */
-
Amine Khaldi