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

diff --git a/modules/rostests/winetests/browseui/autocomplete.c b/modules/rostests/winetests/browseui/autocomplete.c
index e50e9c2..0b04ab2 100644 (file)
--- 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 ccb5cdb..2203714 100644 (file)
--- 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;