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

[Amine Khaldi]

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

commit 0dbc2d18421ffa0ddae86c9a77689bb78e37e853
Author:     Amine Khaldi [e-mail]
AuthorDate: Fri Mar 9 12:52:03 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Fri Mar 9 12:52:03 2018 +0100

[COMCAT_WINETEST] Sync with Wine Staging 3.3. CORE-14434
---
 modules/rostests/winetests/comcat/comcat.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/rostests/winetests/comcat/comcat.c b/modules/rostests/winetests/comcat/comcat.c
index 1e9202f3db..ff5b51a87b 100644
--- a/modules/rostests/winetests/comcat/comcat.c
+++ b/modules/rostests/winetests/comcat/comcat.c
@@ -18,21 +18,16 @@
  * 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 <stdio.h>
+#include <initguid.h>
+#include <windows.h>
+
+#include "objbase.h"
+#include "comcat.h"

-//#include <stdio.h>
-//#include <initguid.h>
-//#include <windows.h>
-#include <winreg.h>
-//#include "objbase.h"
-#include <ole2.h>
-#include <comcat.h>
+#include "wine/test.h"

#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)