[WBEMDISP]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61473

diff --git a/reactos/dll/win32/wbemdisp/CMakeLists.txt b/reactos/dll/win32/wbemdisp/CMakeLists.txt
index da13cb4..c1ea827 100644 (file)
--- a/reactos/dll/win32/wbemdisp/CMakeLists.txt
+++ b/reactos/dll/win32/wbemdisp/CMakeLists.txt
@@ -6,6 +6,7 @@ spec2def(wbemdisp.dll wbemdisp.spec)
 list(APPEND SOURCE
     locator.c
     main.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
 
 add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl)
@@ -20,7 +21,7 @@ set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc
 
 add_library(wbemdisp SHARED ${SOURCE} wbemdisp.rc)
 set_module_type(wbemdisp win32dll)
-target_link_libraries(wbemdisp wine)
+target_link_libraries(wbemdisp uuid wine)
 add_dependencies(wbemdisp wbemdisp_idlheader)
 add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)

diff --git a/reactos/dll/win32/wbemdisp/guid.c b/reactos/dll/win32/wbemdisp/guid.c
new file mode 100644 (file)
index 0000000..56285ed
--- /dev/null
+++ b/reactos/dll/win32/wbemdisp/guid.c
@@ -0,0 +1,16 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <wbemdisp_classes.h>
+#include <wbemdisp.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/dll/win32/wbemdisp/locator.c b/reactos/dll/win32/wbemdisp/locator.c
index 68c24f7..2c49430 100644 (file)
--- a/reactos/dll/win32/wbemdisp/locator.c
+++ b/reactos/dll/win32/wbemdisp/locator.c
@@ -16,21 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "wbemdisp.h"
-
-#include "wine/debug.h"
-#include "wine/unicode.h"
 #include "wbemdisp_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
+#include <winnls.h>
+#include <oleauto.h>
 
 struct locator
 {

diff --git a/reactos/dll/win32/wbemdisp/main.c b/reactos/dll/win32/wbemdisp/main.c
index 8582cf1..aef7ecf 100644 (file)
--- a/reactos/dll/win32/wbemdisp/main.c
+++ b/reactos/dll/win32/wbemdisp/main.c
@@ -16,23 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "initguid.h"
-#include "objbase.h"
-#include "wbemdisp.h"
-#include "rpcproxy.h"
-
-#include "wine/debug.h"
 #include "wbemdisp_private.h"
-#include "wbemdisp_classes.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
+#include <rpcproxy.h>
+#include <wbemdisp_classes.h>
 
 static HINSTANCE instance;
 

diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_private.h b/reactos/dll/win32/wbemdisp/wbemdisp_private.h
index 549cb28..4d30189 100644 (file)
--- a/reactos/dll/win32/wbemdisp/wbemdisp_private.h
+++ b/reactos/dll/win32/wbemdisp/wbemdisp_private.h
@@ -16,6 +16,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <wbemdisp.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp);
+
 HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;
 
 static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);