01/01: [BROWSEUI_WINETEST] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5b576b271da77175449eb...

commit d5b576b271da77175449ebc2139b7b51e8419e65
Author:     Amine Khaldi [e-mail]
AuthorDate: Sun Apr 1 13:20:15 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Sun Apr 1 13:20:15 2018 +0100

[BROWSEUI_WINETEST] Sync with Wine Staging 3.3. CORE-14434
---
 modules/rostests/winetests/browseui/autocomplete.c | 18 +++++++-----------
 modules/rostests/winetests/browseui/progressdlg.c  | 11 ++++-------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/rostests/winetests/browseui/autocomplete.c b/modules/rostests/winetests/browseui/autocomplete.c
index e50e9c2f2e..0b04ab2d96 100644
--- a/modules/rostests/winetests/browseui/autocomplete.c
+++ b/modules/rostests/winetests/browseui/autocomplete.c
@@ -17,22 +17,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
 #define COBJMACROS

-#include <wine/test.h>
+#include <stdarg.h>

-//#include <stdarg.h>
-#include <winnls.h>
-//#include <initguid.h>
+#include <initguid.h>
+#include <windows.h>
 #include <shlobj.h>
-//#include <shldisp.h>
-//#include <shlwapi.h>
-//#include <shlguid.h>
-
+#include <shldisp.h>
+#include <shlwapi.h>
+#include <shlguid.h>

+#include "wine/test.h"

#define ole_ok(exp) \
 { \
diff --git a/modules/rostests/winetests/browseui/progressdlg.c b/modules/rostests/winetests/browseui/progressdlg.c
index ccb5cdbbcf..22037141d6 100644
--- a/modules/rostests/winetests/browseui/progressdlg.c
+++ b/modules/rostests/winetests/browseui/progressdlg.c
@@ -17,17 +17,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
-
 #define COBJMACROS

-#include <wine/test.h>
-
-//#include <stdarg.h>
+#include <stdarg.h>
 #include <shlobj.h>

+#include "wine/test.h"
+
+
 static void test_IProgressDialog_QueryInterface(void)
 {
     IProgressDialog *dlg;