[akhaldi] 61473: [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 i...

Author: akhaldi
Date: Wed Jan  1 18:35:06 2014
New Revision: 61473

URL: http://svn.reactos.org/svn/reactos?rev=61473&view=rev
Log:
[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

Added:
    trunk/reactos/dll/win32/wbemdisp/guid.c   (with props)
Modified:
    trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt
    trunk/reactos/dll/win32/wbemdisp/locator.c
    trunk/reactos/dll/win32/wbemdisp/main.c
    trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h

Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt	[iso-8859-1] Wed Jan  1 18:35:06 2014
@@ -6,6 +6,7 @@
 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 @@
 
 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)

Added: trunk/reactos/dll/win32/wbemdisp/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/guid.c?…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/guid.c	(added)
+++ trunk/reactos/dll/win32/wbemdisp/guid.c	[iso-8859-1] Wed Jan  1 18:35:06 2014
@@ -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 */

Propchange: trunk/reactos/dll/win32/wbemdisp/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/wbemdisp/locator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/locator.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/locator.c	[iso-8859-1] Wed Jan  1 18:35:06 2014
@@ -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
 {

Modified: trunk/reactos/dll/win32/wbemdisp/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/main.c?…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/main.c	[iso-8859-1] Wed Jan  1 18:35:06 2014
@@ -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;
 

Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis…
==============================================================================
--- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h	[iso-8859-1] Wed Jan  1 18:35:06
2014
@@ -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);