[akhaldi] 61474: [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 i...
Author: akhaldi Date: Wed Jan 1 18:41:23 2014 New Revision: 61474
URL: http://svn.reactos.org/svn/reactos?rev=61474&view=rev Log: [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
Added: trunk/reactos/dll/win32/wbemprox/guid.c (with props) Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/dll/win32/wbemprox/class.c trunk/reactos/dll/win32/wbemprox/main.c trunk/reactos/dll/win32/wbemprox/process.c trunk/reactos/dll/win32/wbemprox/qualifier.c trunk/reactos/dll/win32/wbemprox/query.c trunk/reactos/dll/win32/wbemprox/reg.c trunk/reactos/dll/win32/wbemprox/service.c trunk/reactos/dll/win32/wbemprox/services.c trunk/reactos/dll/win32/wbemprox/table.c trunk/reactos/dll/win32/wbemprox/wbemlocator.c trunk/reactos/dll/win32/wbemprox/wbemprox_private.h trunk/reactos/dll/win32/wbemprox/wql.tab.c
Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -19,12 +19,13 @@ 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)
Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin.... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -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};
Modified: trunk/reactos/dll/win32/wbemprox/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/class.c?... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/class.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,24 +16,7 @@ * 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 {
Added: trunk/reactos/dll/win32/wbemprox/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/guid.c?r... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/guid.c (added) +++ trunk/reactos/dll/win32/wbemprox/guid.c [iso-8859-1] Wed Jan 1 18:41:23 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 <wbemcli.h> +#include <wbemprov.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Propchange: trunk/reactos/dll/win32/wbemprox/guid.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/wbemprox/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/main.c?r... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/main.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -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 "wbemprox_private.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;
Modified: trunk/reactos/dll/win32/wbemprox/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/process.... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/process.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/process.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -18,25 +18,7 @@ * 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 ) {
Modified: trunk/reactos/dll/win32/wbemprox/qualifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/qualifie... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/qualifier.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,25 +16,7 @@ * 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 {
Modified: trunk/reactos/dll/win32/wbemprox/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/query.c?... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/query.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,25 +16,7 @@ * 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 )
Modified: trunk/reactos/dll/win32/wbemprox/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/reg.c?re... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/reg.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -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 ) {
Modified: trunk/reactos/dll/win32/wbemprox/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/service.... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/service.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/service.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -18,26 +18,7 @@ * 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 ) {
Modified: trunk/reactos/dll/win32/wbemprox/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/services... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/services.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,26 +16,7 @@ * 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 {
Modified: trunk/reactos/dll/win32/wbemprox/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/table.c?... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/table.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -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 ) {
Modified: trunk/reactos/dll/win32/wbemprox/wbemlocator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbemloca... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemlocator.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -16,26 +16,7 @@ * 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 {
Modified: trunk/reactos/dll/win32/wbemprox/wbemprox_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbemprox... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -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;
Modified: trunk/reactos/dll/win32/wbemprox/wql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wql.tab.... ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wql.tab.c [iso-8859-1] Wed Jan 1 18:41:23 2014 @@ -95,25 +95,7 @@ * 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 {
-
akhaldi＠svn.reactos.org