https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c851a1bf2e171833c17a18...
commit c851a1bf2e171833c17a181b4963c6518275909a Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Wed Mar 21 13:12:52 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Wed Mar 21 13:12:52 2018 +0100
[QMGR_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/qmgr/enum_files.c | 17 ++++------------- modules/rostests/winetests/qmgr/enum_jobs.c | 11 +++-------- modules/rostests/winetests/qmgr/file.c | 16 +++------------- modules/rostests/winetests/qmgr/job.c | 17 ++++++----------- modules/rostests/winetests/qmgr/qmgr.c | 14 +++----------- 5 files changed, 19 insertions(+), 56 deletions(-)
diff --git a/modules/rostests/winetests/qmgr/enum_files.c b/modules/rostests/winetests/qmgr/enum_files.c index 1a8998359c..9564d7c1ad 100644 --- a/modules/rostests/winetests/qmgr/enum_files.c +++ b/modules/rostests/winetests/qmgr/enum_files.c @@ -18,23 +18,14 @@ * 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 <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> - #include <shlwapi.h> -//#include <stdio.h> +#include <stdio.h>
#define COBJMACROS
-#include <wine/test.h> -#include <bits.h> +#include "wine/test.h" +#include "initguid.h" +#include "bits.h"
/* Globals used by many tests */ #define NUM_FILES 2 /* At least two. */ diff --git a/modules/rostests/winetests/qmgr/enum_jobs.c b/modules/rostests/winetests/qmgr/enum_jobs.c index 518a7d2faf..6a1a968838 100644 --- a/modules/rostests/winetests/qmgr/enum_jobs.c +++ b/modules/rostests/winetests/qmgr/enum_jobs.c @@ -18,17 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include <stdio.h>
#define COBJMACROS
-#include <wine/test.h> -#include <objbase.h> -#include <bits.h> +#include "wine/test.h" +#include "bits.h"
/* Globals used by many tests */ static const WCHAR test_displayNameA[] = {'T','e','s','t','A', 0}; diff --git a/modules/rostests/winetests/qmgr/file.c b/modules/rostests/winetests/qmgr/file.c index 3cee4bdc8c..9fdf08c98a 100644 --- a/modules/rostests/winetests/qmgr/file.c +++ b/modules/rostests/winetests/qmgr/file.c @@ -18,24 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdio.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <stdio.h>
#include <shlwapi.h>
#define COBJMACROS
-#include <wine/test.h> -#include <bits.h> +#include "wine/test.h" +#include "bits.h"
/* Globals used by many tests */ static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; diff --git a/modules/rostests/winetests/qmgr/job.c b/modules/rostests/winetests/qmgr/job.c index 3ed3425a5d..6d8185a078 100644 --- a/modules/rostests/winetests/qmgr/job.c +++ b/modules/rostests/winetests/qmgr/job.c @@ -18,20 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include <stdio.h>
#define COBJMACROS
-#include <wine/test.h> -#include <objbase.h> -#include <bits.h> -#include <initguid.h> -#include <bits2_0.h> -#include <bits2_5.h> +#include "wine/test.h" +#include "bits.h" +#include "initguid.h" +#include "bits2_0.h" +#include "bits2_5.h"
/* Globals used by many tests */ static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; diff --git a/modules/rostests/winetests/qmgr/qmgr.c b/modules/rostests/winetests/qmgr/qmgr.c index 67e7d46481..4ab12d3360 100644 --- a/modules/rostests/winetests/qmgr/qmgr.c +++ b/modules/rostests/winetests/qmgr/qmgr.c @@ -18,20 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdio.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include <stdio.h>
#define COBJMACROS
-#include <wine/test.h> - -#include <winnls.h> -#include <initguid.h> -#include <objbase.h> -#include <bits.h> +#include "wine/test.h" +#include "bits.h"
static WCHAR progname[MAX_PATH];