From ccd5377851f2faa3e8d899c6d928a113cec67a1d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 8 Dec 2017 00:06:13 +0100 Subject: [PATCH] [COMCTL32][FLTLIB][NETAPI32][SNDVOL32][STOBJECT][WBEMPROX] Remove unused debug channels and comment out unused variables. Silences some clang-cl warnings. --- base/applications/sndvol32/misc.c | 4 ++-- dll/shellext/stobject/stobject.cpp | 2 -- dll/win32/comctl32/theming.c | 2 ++ dll/win32/fltlib/fltlib.c | 9 ++------- dll/win32/fltlib/message.c | 15 ++++----------- dll/win32/fltlib/stubs.c | 10 ++-------- dll/win32/netapi32/obsolete.c | 3 +-- dll/win32/wbemprox/builtin.c | 27 +++++++++++++++++++++++++++ 8 files changed, 40 insertions(+), 32 deletions(-) diff --git a/base/applications/sndvol32/misc.c b/base/applications/sndvol32/misc.c index dce0c2e6bd5..1f0ff8496d3 100644 --- a/base/applications/sndvol32/misc.c +++ b/base/applications/sndvol32/misc.c @@ -128,9 +128,9 @@ LoadAndFormatString(IN HINSTANCE hInstance, } static const TCHAR AppRegSettings[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Volume Control"); -static const TCHAR AppOptionsKey[] = TEXT("Options"); +//static const TCHAR AppOptionsKey[] = TEXT("Options"); static const TCHAR LineStatesValue[] = TEXT("LineStates"); -static const TCHAR StyleValue[] = TEXT("Style"); +//static const TCHAR StyleValue[] = TEXT("Style"); HKEY hAppSettingsKey = NULL; diff --git a/dll/shellext/stobject/stobject.cpp b/dll/shellext/stobject/stobject.cpp index f5b31e249e6..3b0683bbe1f 100644 --- a/dll/shellext/stobject/stobject.cpp +++ b/dll/shellext/stobject/stobject.cpp @@ -12,8 +12,6 @@ #include #include -WINE_DEFAULT_DEBUG_CHANNEL(stobject); - BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_SysTray, CSysTray) END_OBJECT_MAP() diff --git a/dll/win32/comctl32/theming.c b/dll/win32/comctl32/theming.c index c80b4e46d88..9cfd8e92929 100644 --- a/dll/win32/comctl32/theming.c +++ b/dll/win32/comctl32/theming.c @@ -43,7 +43,9 @@ extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; +#ifndef __REACTOS__ static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; +#endif static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; static const struct ThemingSubclass diff --git a/dll/win32/fltlib/fltlib.c b/dll/win32/fltlib/fltlib.c index 5818ca49286..ce99378e15f 100644 --- a/dll/win32/fltlib/fltlib.c +++ b/dll/win32/fltlib/fltlib.c @@ -10,8 +10,8 @@ #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" +#include +#include #define NTOS_MODE_USER #include @@ -19,13 +19,8 @@ #include #include -#include "wine/debug.h" - - /* DATA ****************************************************************************/ -WINE_DEFAULT_DEBUG_CHANNEL(fltlib); - static HRESULT FilterLoadUnload(_In_z_ LPCWSTR lpFilterName, diff --git a/dll/win32/fltlib/message.c b/dll/win32/fltlib/message.c index 6c8aaf3a6c5..bdbfcb35417 100644 --- a/dll/win32/fltlib/message.c +++ b/dll/win32/fltlib/message.c @@ -6,25 +6,18 @@ * PROGRAMMERS: Ged Murphy (ged.murphy@reactos.org) */ -//#include - #define WIN32_NO_STATUS - -#include "windef.h" -#include "winbase.h" +#include +#include #define NTOS_MODE_USER #include #include #include - -#include "fltuser.h" -#include "fltlib.h" +#include #include -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(fltlib); - +#include "fltlib.h" _Must_inspect_result_ HRESULT diff --git a/dll/win32/fltlib/stubs.c b/dll/win32/fltlib/stubs.c index 859aeb302e9..569c9ed74c1 100644 --- a/dll/win32/fltlib/stubs.c +++ b/dll/win32/fltlib/stubs.c @@ -7,16 +7,10 @@ */ #include -#include "windef.h" -#include "winbase.h" - +#include +#include #include -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(fltlib); - - _Must_inspect_result_ HRESULT WINAPI diff --git a/dll/win32/netapi32/obsolete.c b/dll/win32/netapi32/obsolete.c index 4bc9e2a8365..42b4440ca1d 100644 --- a/dll/win32/netapi32/obsolete.c +++ b/dll/win32/netapi32/obsolete.c @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include "netapi32.h" + #include #include #include @@ -17,8 +18,6 @@ #include #include -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - /* FUNCTIONS *****************************************************************/ NET_API_STATUS diff --git a/dll/win32/wbemprox/builtin.c b/dll/win32/wbemprox/builtin.c index 595dcc6c31f..bf92d3c35e4 100644 --- a/dll/win32/wbemprox/builtin.c +++ b/dll/win32/wbemprox/builtin.c @@ -87,8 +87,10 @@ static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_systemenclosureW[] = {'W','i','n','3','2','_','S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; +#ifndef __REACTOS__ static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +#endif static const WCHAR prop_accountnameW[] = {'A','c','c','o','u','n','t','N','a','m','e',0}; @@ -98,18 +100,22 @@ static const WCHAR prop_acceptstopW[] = {'A','c','c','e','p','t','S','t','o','p',0}; static const WCHAR prop_accessmaskW[] = {'A','c','c','e','s','s','M','a','s','k',0}; +#ifndef __REACTOS__ static const WCHAR prop_adapterdactypeW[] = {'A','d','a','p','t','e','r','D','A','C','T','y','p','e',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; +#endif static const WCHAR prop_adaptertypeW[] = {'A','d','a','p','t','e','r','T','y','p','e',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; +#ifndef __REACTOS__ static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; +#endif static const WCHAR prop_binaryrepresentationW[] = {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR prop_bootableW[] = @@ -130,18 +136,23 @@ static const WCHAR prop_codesetW[] = {'C','o','d','e','S','e','t',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; +#ifndef __REACTOS__ static const WCHAR prop_configmanagererrorcodeW[] = {'C','o','n','f','i','g','M','a','n','a','g','e','r','E','r','r','o','r','C','o','d','e',0}; +#endif static const WCHAR prop_countrycodeW[] = {'C','o','u','n','t','r','y','C','o','d','e',0}; static const WCHAR prop_cpustatusW[] = {'C','p','u','S','t','a','t','u','s',0}; static const WCHAR prop_csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; +#ifndef __REACTOS__ static const WCHAR prop_currentbitsperpixelW[] = {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; +#endif static const WCHAR prop_currentclockspeedW[] = {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; +#ifndef __REACTOS__ static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_currentrefreshrateW[] = @@ -150,6 +161,7 @@ static const WCHAR prop_currentscanmodeW[] = {'C','u','r','r','e','n','t','S','c','a','n','M','o','d','e',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; +#endif static const WCHAR prop_datawidthW[] = {'D','a','t','a','W','i','d','t','h',0}; static const WCHAR prop_defaultipgatewayW[] = @@ -180,12 +192,16 @@ static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +#ifndef __REACTOS__ static const WCHAR prop_driverdateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; +#endif static const WCHAR prop_drivernameW[] = {'D','r','i','v','e','r','N','a','m','e',0}; +#ifndef __REACTOS__ static const WCHAR prop_driverversionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; +#endif static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_familyW[] = @@ -212,8 +228,10 @@ static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_installdateW[] = {'I','n','s','t','a','l','l','D','a','t','e',0}; +#ifndef __REACTOS__ static const WCHAR prop_installeddisplaydriversW[]= {'I','n','s','t','a','l','l','e','d','D','i','s','p','l','a','y','D','r','i','v','e','r','s',0}; +#endif static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_interfacetypeW[] = @@ -326,8 +344,10 @@ static const WCHAR prop_startingoffsetW[] = {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; +#ifndef __REACTOS__ static const WCHAR prop_statusW[] = {'S','t','a','t','u','s',0}; +#endif static const WCHAR prop_statusinfoW[] = {'S','t','a','t','u','s','I','n','f','o',0}; static const WCHAR prop_strvalueW[] = @@ -362,6 +382,7 @@ static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; static const WCHAR prop_vendorW[] = {'V','e','n','d','o','r',0}; +#ifndef __REACTOS__ static const WCHAR prop_videoarchitectureW[] = {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_videomemorytypeW[] = @@ -370,6 +391,7 @@ static const WCHAR prop_videomodedescriptionW[] = {'V','i','d','e','o','M','o','d','e','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_videoprocessorW[] = {'V','i','d','e','o','P','r','o','c','e','s','s','o','r',0}; +#endif /* !__REACTOS__ */ static const WCHAR prop_volumenameW[] = {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = @@ -663,6 +685,8 @@ static const struct column col_systemsecurity[] = { method_getsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_setsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; + +#ifndef __REACTOS__ static const struct column col_videocontroller[] = { { prop_adapterdactypeW, CIM_STRING }, @@ -688,6 +712,7 @@ static const struct column col_videocontroller[] = { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC }, }; +#endif static const WCHAR baseboard_manufacturerW[] = {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; @@ -771,6 +796,7 @@ static const WCHAR systemenclosure_tagW[] = {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',' ','0',0}; static const WCHAR systemenclosure_manufacturerW[] = {'W','i','n','e',0}; +#ifndef __REACTOS__ static const WCHAR videocontroller_dactypeW[] = {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = @@ -781,6 +807,7 @@ static const WCHAR videocontroller_driverversionW[] = {'1','.','0',0}; static const WCHAR videocontroller_statusW[] = {'O','K',0}; +#endif #include "pshpack1.h" struct record_baseboard