December 2014 - Wine-commits

Martin Storsjo : api-ms-win-core-winrt-l1-1-0: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 77e061f7f139f5a447e62c4df7647065cb72c22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e061f7f139f5a447e62c4df… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:06 2014 +0200 api-ms-win-core-winrt-l1-1-0: Add stub dll. --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in | 5 +++ .../api-ms-win-core-winrt-l1-1-0.spec | 9 ++++ dlls/api-ms-win-core-winrt-l1-1-0/main.c | 51 ++++++++++++++++++++++ 5 files changed, 68 insertions(+) diff --git a/configure b/configure index 3ddeb77..be06b95 100755 --- a/configure +++ b/configure @@ -889,6 +889,7 @@ enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 +enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 enable_api_ms_win_downlevel_advapi32_l2_1_0 @@ -16806,6 +16807,7 @@ wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezo wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 +wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 diff --git a/configure.ac b/configure.ac index 61bc2ad..c33869e 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,6 +2681,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in new file mode 100644 index 0000000..7ce8241 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in @@ -0,0 +1,5 @@ +MODULE = api-ms-win-core-winrt-l1-1-0.dll +IMPORTS = ole32 + +C_SRCS = \ + main.c diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec new file mode 100644 index 0000000..344265a --- /dev/null +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stub RoActivateInstance +@ stub RoGetActivationFactory +@ stub RoGetApartmentIdentifier +@ stdcall RoInitialize(long) +@ stub RoRegisterActivationFactories +@ stub RoRegisterForApartmentShutdown +@ stub RoRevokeActivationFactories +@ stdcall RoUninitialize() +@ stub RoUnregisterForApartmentShutdown diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/api-ms-win-core-winrt-l1-1-0/main.c new file mode 100644 index 0000000..4cf1105 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-l1-1-0/main.c @@ -0,0 +1,51 @@ +/* + * Copyright 2014 Martin Storsjo + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "objbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winrt); + +typedef enum +{ + RO_INIT_SINGLETHREADED = 0, + RO_INIT_MULTITHREADED = 1, +} RO_INIT_TYPE; + +/*********************************************************************** + * RoInitialize (api-ms-win-core-winrt-l1-1-0.@) + */ +HRESULT WINAPI RoInitialize(RO_INIT_TYPE type) +{ + switch (type) { + case RO_INIT_SINGLETHREADED: + return CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + default: + FIXME("type %d\n", type); + case RO_INIT_MULTITHREADED: + return CoInitializeEx(NULL, COINIT_MULTITHREADED); + } +} + +/*********************************************************************** + * RoUninitialize (api-ms-win-core-winrt-l1-1-0.@) + */ +void WINAPI RoUninitialize(void) +{ + CoUninitialize(); +}

1 0

André Hentschel : localspl: Remove unused strings ( Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: f1cd8d4ac9ece36bebc0f7ab3e15edc3e425248d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1cd8d4ac9ece36bebc0f7ab3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:56:19 2014 +0100 localspl: Remove unused strings (Clang). --- dlls/localspl/provider.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 6fc2869..8256c5c 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -99,9 +99,7 @@ static const WCHAR bs_ports_bsW[] = {'\\','P','o','r','t','s','\\',0}; static const WCHAR configuration_fileW[] = {'C','o','n','f','i','g','u','r','a','t','i','o','n',' ','F','i','l','e',0}; static const WCHAR datatypeW[] = {'D','a','t','a','t','y','p','e',0}; static const WCHAR data_fileW[] = {'D','a','t','a',' ','F','i','l','e',0}; -static const WCHAR default_devmodeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}; static const WCHAR dependent_filesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; -static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; static const WCHAR emptyW[] = {0}; static const WCHAR fmt_driversW[] = { 'S','y','s','t','e','m','\\', @@ -116,13 +114,10 @@ static const WCHAR fmt_printprocessorsW[] = { 'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'E','n','v','i','r','o','n','m','e','n','t','s','\\','%','s','\\', 'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r','s',0 }; -static const WCHAR hardwareidW[] = {'H','a','r','d','w','a','r','e','I','D',0}; static const WCHAR help_fileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR ia64_envnameW[] = {'W','i','n','d','o','w','s',' ','I','A','6','4',0}; static const WCHAR ia64_subdirW[] = {'i','a','6','4',0}; static const WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; -static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; -static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR monitorW[] = {'M','o','n','i','t','o','r',0}; static const WCHAR monitorsW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -130,10 +125,6 @@ static const WCHAR monitorsW[] = {'S','y','s','t','e','m','\\', 'P','r','i','n','t','\\', 'M','o','n','i','t','o','r','s','\\',0}; static const WCHAR monitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static const WCHAR nameW[] = {'N','a','m','e',0}; -static const WCHAR oem_urlW[] = {'O','E','M',' ','U','r','l',0}; -static const WCHAR parametersW[] = {'P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR portW[] = {'P','o','r','t',0}; static const WCHAR previous_namesW[] = {'P','r','e','v','i','o','u','s',' ','N','a','m','e','s',0}; static const WCHAR printersW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',

1 0

André Hentschel : msi/tests: Remove unused variables (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 1c3179b21b0f2935e6f0803cda95547919ffff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3179b21b0f2935e6f0803cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:30 2014 +0100 msi/tests: Remove unused variables (Clang). --- dlls/msi/tests/install.c | 56 ------------------------------------------------ 1 file changed, 56 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a99a4c4..7c4544a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -563,35 +563,11 @@ static const CHAR cie_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\t "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; -static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; - -static const CHAR ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; - static const CHAR ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; -static const CHAR ci2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\tUILevel=3 AND MYPROP=5\taugustus\n"; - static const CHAR ci2_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" @@ -659,13 +635,6 @@ static const CHAR amp_component_dat[] = "Component\tComponentId\tDirectory_\tAtt "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\tMYPROP=2718 and MyProp=42\taugustus\n"; -static const CHAR rem_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "hydrogen\thydrogen\thydrogen\t0\t\t\t8192\t1\n" - "helium\thelium\thelium\t0\t\t\t8192\t1\n" - "lithium\tlithium\tlithium\t0\t\t\t8192\t1"; - static const CHAR rem_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" @@ -1543,31 +1512,6 @@ static const msi_table cie_tables[] = ADD_TABLE(property), }; -static const msi_table ci_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(ci_install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), - ADD_TABLE(ci_custom_action), -}; - -static const msi_table ci2_tables[] = -{ - ADD_TABLE(ci2_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), - ADD_TABLE(ci2_file), - ADD_TABLE(install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), -}; - static const msi_table tp_tables[] = { ADD_TABLE(tp_component),

1 0

André Hentschel : msi: Remove unused strings (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 481fce766f1abe68fa512f382987695bfe7a8c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481fce766f1abe68fa512f382… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:33 2014 +0100 msi: Remove unused strings (Clang). --- dlls/msi/registry.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bb564d8..4dde285 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -100,12 +100,6 @@ static const WCHAR szInstallProperties_fmt[] = { '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', 'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; -static const WCHAR szInstaller_LocalManaged_fmt[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\','M','a','n','a','g','e','d','\\','%','s','\\', - 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0}; - static const WCHAR szInstaller_LocalManagedProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', @@ -128,11 +122,6 @@ static const WCHAR szInstaller_Patches[] = { 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','n','s','t','a','l','l','e','r','\\','P','a','t','c','h','e','s',0}; -static const WCHAR szInstaller_Components[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s',0}; - static const WCHAR szInstaller_LocalClassesProducts[] = { 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0};

1 0

André Hentschel : ole32: Remove unused string (Clang) .
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: ec8602a8125bd3838948d32747217ed794ae4068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8602a8125bd3838948d3274… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:36 2014 +0100 ole32: Remove unused string (Clang). --- dlls/ole32/clipboard.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0c3be3b..38df750 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -194,8 +194,6 @@ static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd) */ static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D','C','L','A','S','S',0}; -static const WCHAR wine_marshal_dataobject[] = {'W','i','n','e',' ','m','a','r','s','h','a','l',' ','d','a','t','a','o','b','j','e','c','t',0}; - UINT ownerlink_clipboard_format = 0; UINT filename_clipboard_format = 0; UINT filenameW_clipboard_format = 0;

1 0

André Hentschel : oleaut32: Remove unused code (Clang ).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 099514e753a8f25ff2fe19356729f0faadabfd23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099514e753a8f25ff2fe19356… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:41 2014 +0100 oleaut32: Remove unused code (Clang). --- dlls/oleaut32/typelib.c | 16 ---------------- dlls/oleaut32/variant.c | 33 --------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9d0d5d0..c6c539e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1726,18 +1726,6 @@ static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(TLBFuncDesc *funcdescs, return NULL; } -static inline TLBFuncDesc *TLB_get_funcdesc_by_name(TLBFuncDesc *funcdescs, - UINT n, const OLECHAR *name) -{ - while(n){ - if(!lstrcmpiW(TLB_get_bstr(funcdescs->Name), name)) - return funcdescs; - ++funcdescs; - --n; - } - return NULL; -} - static inline TLBVarDesc *TLB_get_vardesc_by_memberid(TLBVarDesc *vardescs, UINT n, MEMBERID memid) { @@ -2063,10 +2051,6 @@ static HRESULT TLB_size_instance(ITypeInfoImpl *info, SYSKIND sys, * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) */ -static inline unsigned int MSFT_Tell(const TLBContext *pcx) -{ - return pcx->pos; -} static inline void MSFT_Seek(TLBContext *pcx, LONG where) { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e391a90..5a28acc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -44,39 +44,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); -static const char * const variant_types[] = -{ - "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", - "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", - "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", - "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", - "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", - "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", - "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", - "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", - "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", - "VT_VERSIONED_STREAM" -}; - -static const char * const variant_flags[16] = -{ - "", - "|VT_VECTOR", - "|VT_ARRAY", - "|VT_VECTOR|VT_ARRAY", - "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", - "|VT_ARRAY|VT_BYREF", - "|VT_VECTOR|VT_ARRAY|VT_BYREF", - "|VT_RESERVED", - "|VT_VECTOR|VT_RESERVED", - "|VT_ARRAY|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", - "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", - "|VT_ARRAY|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", -}; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,

1 0

André Hentschel : msxml3/tests: Remove unused code ( Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 1463325797d50638b27dc95b34c86b4182787839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1463325797d50638b27dc95b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:58:01 2014 +0100 msxml3/tests: Remove unused code (Clang). --- dlls/msxml3/tests/domdoc.c | 7 +------ dlls/msxml3/tests/saxreader.c | 9 +-------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b768260..1a73771 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -410,11 +410,6 @@ static const WCHAR szComplete1[] = { static const WCHAR szComplete2[] = { '<','?','x','m','l',' ', 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','>','<','/','o','>','\n',0 -}; -static const WCHAR szComplete3[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', '<','a','>','<','/','a','>','\n',0 }; static const char complete4A[] = @@ -1368,7 +1363,7 @@ if (0) /* try to load something else simple and valid */ b = VARIANT_FALSE; - str = SysAllocString( szComplete3 ); + str = SysAllocString( szComplete2 ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 882e855..75354c5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -310,13 +310,6 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static const char *get_event_name(CH event) { return event_names[event]; @@ -2895,7 +2888,7 @@ static void test_mxwriter_handlers(void) HRESULT hr; int i; - static const REFIID riids[] = + static REFIID riids[] = { &IID_ISAXContentHandler, &IID_ISAXLexicalHandler,

1 0

André Hentschel : ole32/tests: Remove unused variable (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 065e4770f00ccf387e01284ab7721b968a582c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=065e4770f00ccf387e01284ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:09 2014 +0100 ole32/tests: Remove unused variable (Clang). --- dlls/ole32/tests/moniker.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 695f67a..3dd8bd2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -56,14 +56,6 @@ static char const * const *expected_method_list; static const WCHAR wszFileName1[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','1','.','d','o','c',0}; static const WCHAR wszFileName2[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','2','.','d','o','c',0}; -static const CLSID CLSID_WineTest = -{ /* 9474ba1a-258b-490b-bc13-516e9239ace0 */ - 0x9474ba1a, - 0x258b, - 0x490b, - {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} -}; - static const CLSID CLSID_TestMoniker = { /* b306bfbc-496e-4f53-b93e-2ff9c83223d7 */ 0xb306bfbc,

1 0

André Hentschel : quartz: Remove unused code (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: bf12844bf19ba15a10271cb7f1feec802933eeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf12844bf19ba15a10271cb7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:14 2014 +0100 quartz: Remove unused code (Clang). --- dlls/quartz/acmwrapper.c | 5 ----- dlls/quartz/avidec.c | 5 ----- dlls/quartz/dsoundrender.c | 1 - dlls/quartz/mpegsplit.c | 1 - 4 files changed, 12 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index cd0b0d8..5bc0d8f 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -58,11 +58,6 @@ static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); } -static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); -} - static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { ACMWrapperImpl* This = impl_from_TransformFilter(tf); diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 30da6fa..5047809 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -52,11 +52,6 @@ typedef struct AVIDecImpl static const IBaseFilterVtbl AVIDec_Vtbl; -static inline AVIDecImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter.IBaseFilter_iface); -} - static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2914b15..9f96654 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -46,7 +46,6 @@ static const REFERENCE_TIME DSoundRenderer_Max_Fill = 150 * 10000; static const IBaseFilterVtbl DSoundRender_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; -static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index de03d17..6f09822 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -96,7 +96,6 @@ static int MPEGSplitter_head_check(const BYTE *header) } static const WCHAR wszAudioStream[] = {'A','u','d','i','o',0}; -static const WCHAR wszVideoStream[] = {'V','i','d','e','o',0}; static const DWORD freqs[10] = { 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000, 0 };

1 0

André Hentschel : qmgr/tests: Remove unused code ( Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 84a2a963dda336714b20527b95f29623e48ecb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a2a963dda336714b20527b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:19 2014 +0100 qmgr/tests: Remove unused code (Clang). --- dlls/qmgr/tests/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index afe4b53..c77ff11 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -33,7 +33,6 @@ static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH]; static WCHAR test_remoteUrl[MAX_PATH]; -static const ULONG test_fileCount = NUM_FILES; static const WCHAR test_displayName[] = {'T','e','s','t', 0}; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager;

1 0