[WBEMPROX]

* 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=61474

diff --git a/reactos/dll/win32/wbemprox/CMakeLists.txt b/reactos/dll/win32/wbemprox/CMakeLists.txt
index aee2221..a9ec2bb 100644 (file)
--- a/reactos/dll/win32/wbemprox/CMakeLists.txt
+++ b/reactos/dll/win32/wbemprox/CMakeLists.txt
@@ -19,12 +19,13 @@ list(APPEND SOURCE
     table.c
     wbemlocator.c
     wql.tab.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def)
 
 add_library(wbemprox SHARED ${SOURCE} wbemprox.rc)
 set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs)
 set_module_type(wbemprox win32dll)
-target_link_libraries(wbemprox wine)
+target_link_libraries(wbemprox uuid wine)
 add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version msvcrt kernel32 ntdll)
 add_dependencies(wbemprox d3d_idl_headers)
 add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all)

diff --git a/reactos/dll/win32/wbemprox/builtin.c b/reactos/dll/win32/wbemprox/builtin.c
index 65b09d3..628b0c2 100644 (file)
--- a/reactos/dll/win32/wbemprox/builtin.c
+++ b/reactos/dll/win32/wbemprox/builtin.c
@@ -16,39 +16,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "initguid.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-#include "wbemprov.h"
-#include "winsock2.h"
-#include "iphlpapi.h"
-#include "tlhelp32.h"
-#include "d3d10.h"
-#include "winternl.h"
-#include "winioctl.h"
-#include "winsvc.h"
-#include "winver.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
+#include <wingdi.h>
+#include <winsock2.h>
+#include <iphlpapi.h>
+#include <tlhelp32.h>
+#include <winternl.h>
+#include <winioctl.h>
+#include <winver.h>
+
+#include <initguid.h>
+#include <d3d10.h>
 
 static const WCHAR class_baseboardW[] =
     {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0};

diff --git a/reactos/dll/win32/wbemprox/class.c b/reactos/dll/win32/wbemprox/class.c
index fc44900..b2970f8 100644 (file)
--- a/reactos/dll/win32/wbemprox/class.c
+++ b/reactos/dll/win32/wbemprox/class.c
@@ -16,25 +16,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "ole2.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 struct enum_class_object
 {
     IEnumWbemClassObject IEnumWbemClassObject_iface;

diff --git a/reactos/dll/win32/wbemprox/guid.c b/reactos/dll/win32/wbemprox/guid.c
new file mode 100644 (file)
index 0000000..1a8235b
--- /dev/null
+++ b/reactos/dll/win32/wbemprox/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 <wbemcli.h>
+#include <wbemprov.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

diff --git a/reactos/dll/win32/wbemprox/main.c b/reactos/dll/win32/wbemprox/main.c
index 9445057..63339d6 100644 (file)
--- a/reactos/dll/win32/wbemprox/main.c
+++ b/reactos/dll/win32/wbemprox/main.c
@@ -17,28 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include "config.h"
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-#include "wbemprov.h"
-#include "rpcproxy.h"
-
 #include "wbemprox_private.h"
-#include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
+#include <wbemprov.h>
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 

diff --git a/reactos/dll/win32/wbemprox/process.c b/reactos/dll/win32/wbemprox/process.c
index ee74ed9..ec723d8 100644 (file)
--- a/reactos/dll/win32/wbemprox/process.c
+++ b/reactos/dll/win32/wbemprox/process.c
@@ -18,26 +18,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 static HRESULT get_owner( VARIANT *user, VARIANT *domain, VARIANT *retval )
 {
     DWORD len;

diff --git a/reactos/dll/win32/wbemprox/qualifier.c b/reactos/dll/win32/wbemprox/qualifier.c
index b2ed44f..9b4d1f5 100644 (file)
--- a/reactos/dll/win32/wbemprox/qualifier.c
+++ b/reactos/dll/win32/wbemprox/qualifier.c
@@ -16,26 +16,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 struct qualifier_set
 {
     IWbemQualifierSet IWbemQualifierSet_iface;

diff --git a/reactos/dll/win32/wbemprox/query.c b/reactos/dll/win32/wbemprox/query.c
index a12c745..2a6e574 100644 (file)
--- a/reactos/dll/win32/wbemprox/query.c
+++ b/reactos/dll/win32/wbemprox/query.c
@@ -16,26 +16,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 HRESULT create_view( const struct property *proplist, const WCHAR *class,
                      const struct expr *cond, struct view **ret )
 {

diff --git a/reactos/dll/win32/wbemprox/reg.c b/reactos/dll/win32/wbemprox/reg.c
index 612519c..f38a64b 100644 (file)
--- a/reactos/dll/win32/wbemprox/reg.c
+++ b/reactos/dll/win32/wbemprox/reg.c
@@ -18,26 +18,9 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
+#include <winreg.h>
 
 static HRESULT to_bstr_array( BSTR *strings, DWORD count, VARIANT *var )
 {

diff --git a/reactos/dll/win32/wbemprox/service.c b/reactos/dll/win32/wbemprox/service.c
index bde669c..182938f 100644 (file)
--- a/reactos/dll/win32/wbemprox/service.c
+++ b/reactos/dll/win32/wbemprox/service.c
@@ -18,27 +18,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-#include "winsvc.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 static UINT map_error( DWORD error )
 {
     switch (error)

diff --git a/reactos/dll/win32/wbemprox/services.c b/reactos/dll/win32/wbemprox/services.c
index 2613b7d..23bd894 100644 (file)
--- a/reactos/dll/win32/wbemprox/services.c
+++ b/reactos/dll/win32/wbemprox/services.c
@@ -16,27 +16,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
-#include "wine/unicode.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 struct client_security
 {
     IClientSecurity IClientSecurity_iface;

diff --git a/reactos/dll/win32/wbemprox/table.c b/reactos/dll/win32/wbemprox/table.c
index 931e908..dc8eacd 100644 (file)
--- a/reactos/dll/win32/wbemprox/table.c
+++ b/reactos/dll/win32/wbemprox/table.c
@@ -16,26 +16,9 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
+#include <winuser.h>
 
 HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column )
 {

diff --git a/reactos/dll/win32/wbemprox/wbemlocator.c b/reactos/dll/win32/wbemprox/wbemlocator.c
index 4389567..1a590a7 100644 (file)
--- a/reactos/dll/win32/wbemprox/wbemlocator.c
+++ b/reactos/dll/win32/wbemprox/wbemlocator.c
@@ -16,27 +16,8 @@
  * 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 "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
-
-#include "wine/debug.h"
-#include "wine/unicode.h"
 #include "wbemprox_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 typedef struct
 {
     IWbemLocator IWbemLocator_iface;

diff --git a/reactos/dll/win32/wbemprox/wbemprox_private.h b/reactos/dll/win32/wbemprox/wbemprox_private.h
index 2aed821..36120c4 100644 (file)
--- a/reactos/dll/win32/wbemprox/wbemprox_private.h
+++ b/reactos/dll/win32/wbemprox/wbemprox_private.h
@@ -16,9 +16,31 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-#include "wine/list.h"
-#include "wine/unicode.h"
+#include <config.h>
+
+#include <stdarg.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#include <winsvc.h>
+#include <objbase.h>
+#include <oleauto.h>
+#include <wbemcli.h>
+
+#include <wine/debug.h>
+#include <wine/list.h>
+#include <wine/unicode.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
 
 IClientSecurity client_security;
 struct list *table_list;

diff --git a/reactos/dll/win32/wbemprox/wql.tab.c b/reactos/dll/win32/wbemprox/wql.tab.c
index 02a362d..f3512bd 100644 (file)
--- a/reactos/dll/win32/wbemprox/wql.tab.c
+++ b/reactos/dll/win32/wbemprox/wql.tab.c
@@ -95,26 +95,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "oleauto.h"
-#include "wbemcli.h"
 #include "wbemprox_private.h"
 
-#include "wine/list.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
-
 struct parser
 {
     const WCHAR *cmd;