bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 11 +- dtrans/source/win32/clipb/MtaOleClipb.cxx | 1 embedserv/source/embed/docholder.cxx | 5 - embedserv/source/inprocserv/dllentry.cxx | 4 setup_native/source/win32/customactions/quickstarter/quickstarter.cxx | 6 - setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 48 ---------- setup_native/source/win32/customactions/regactivex/regactivex.cxx | 4 setup_native/source/win32/customactions/sellang/sellang.cxx | 2 setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx | 18 --- setup_native/source/win32/customactions/tools/checkversion.cxx | 2 shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx | 3 shell/source/win32/shlxthandler/propsheets/document_statistic.cxx | 1 shell/source/win32/shlxthandler/shlxthdl.cxx | 11 -- shell/source/win32/shlxthandler/util/registry.cxx | 7 - 14 files changed, 25 insertions(+), 98 deletions(-)
New commits: commit 8c0d5d494f102d9e3f7938fa3b1eb5a5662185d3 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 18 17:11:23 2015 +0100 -Werror,-Wlogical-op-parentheses Change-Id: I8e22b6399bbdb07c376299d5a23c8061af18578d diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 4850a75..e373986 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -1346,8 +1346,9 @@ DocumentHolder::queryClosing( util::CloseVetoException ) { - if ( !m_bLink - && ( m_xDocument.is() && m_xDocument == aSource.Source || m_xFrame.is() && m_xFrame == aSource.Source ) ) + if (!m_bLink + && ((m_xDocument.is() && m_xDocument == aSource.Source) + || (m_xFrame.is() && m_xFrame == aSource.Source))) throw util::CloseVetoException(); } commit d710266dbf9e6062c29005a5a76269ed36a66922 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 18 14:10:37 2015 +0100 -Werror,-Wunused-const-variable Change-Id: I1d2d3a7867ccea4b7e89a08c0d9e312c676d0188 diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index 263e8e0..e3b45a2 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -78,7 +78,6 @@ namespace /* private */ const sal_uInt32 MAX_CLIPEVENT_PROCESSING_TIME = 5000; // msec const sal_Bool MANUAL_RESET = sal_True; - const sal_Bool AUTO_RESET = sal_False; const sal_Bool INIT_NONSIGNALED = sal_False; /* Cannot use osl conditions because they are blocking commit 3b8e2f2612ca9336935580baffd6577bebd3ee08 Author: Stephan Bergmann <[email protected]> Date: Sun Nov 15 13:10:08 2015 +0100 -Werror,-Wunused-variable Change-Id: I7ac641d052643b205f7e470de77d962dd0499dd8 diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index e9ca1b8..2983b38 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -44,9 +44,6 @@ namespace /* private */ const char* CLSID_ENTRY = "CLSID\\{GUID}\\InProcServer32"; const char* SHELLEX_IID_ENTRY = "{EXT}\\shellex\\{GUID}"; const char* SHELLEX_ENTRY = "{EXT}\\shellex"; - const char* PROPSHEET_ENTRY = "{EXT}\\CLSID\\{GUID}\\InProcServer32"; - const char* EXTENSION_CLSID = "{EXT}\\CLSID"; - const char* EXTENSION_CLSID_GUID = "{EXT}\\CLSID\\{GUID}"; const char* FORWARD_PROPSHEET_MYPROPSHEET_ENTRY = "{FWDKEY}\\shellex\\PropertySheetHandlers\\MyPropSheet1"; const char* FORWARD_PROPSHEET_ENTRY = "{FWDKEY}\\shellex\\PropertySheetHandlers"; const char* FORWARD_SHELLEX_ENTRY = "{FWDKEY}\\shellex"; commit 3b45c0ca62ffe16e6472ab2acf4b6e0816728ac7 Author: Stephan Bergmann <[email protected]> Date: Sun Nov 15 13:04:07 2015 +0100 -Werror,-Wduplicate-decl-specifier (extern "C" already in STDAPI) Change-Id: Ibd633b37e134483b778dcf7bdee1a1a3f377b699 diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index fb6c1f4..e9ca1b8 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -302,7 +302,7 @@ namespace /* private */ // COM exports -extern "C" STDAPI DllRegisterServer() +STDAPI DllRegisterServer() { TCHAR ModuleFileName[MAX_PATH]; @@ -340,7 +340,7 @@ extern "C" STDAPI DllRegisterServer() return hr; } -extern "C" STDAPI DllUnregisterServer() +STDAPI DllUnregisterServer() { HRESULT hr = S_OK; @@ -370,7 +370,7 @@ extern "C" STDAPI DllUnregisterServer() return hr; } -extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) +STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) { *ppv = 0; @@ -397,7 +397,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) return S_OK; } -extern "C" STDAPI DllCanUnloadNow() +STDAPI DllCanUnloadNow() { if (CClassFactory::IsLocked() || g_DllRefCnt > 0) return S_FALSE; commit cc6241ff8c4a72ddeb203ae7fda7539f6f120689 Author: Stephan Bergmann <[email protected]> Date: Sun Nov 15 12:56:03 2015 +0100 -Werror,-Wunused-const-variable Change-Id: Id3885ec6323393d07def1915b95ee02e0c3dc402 diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx index 2b00713..4d4bafa 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx @@ -30,7 +30,6 @@ #include "internal/iso8601_converter.hxx" const bool READONLY = false; -const bool WRITEABLE = true; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor) { commit d8c6b268071d9af33f0fc8708fcb14955dfbd027 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 22:52:22 2015 +0100 -Werror,-Wunused-const-variable Change-Id: I6e4aa7c0a3b420820d8581ce1a4a826fa777525c diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 256ebd1..2e2838c 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -36,13 +36,6 @@ #pragma warning(pop) #endif - - -// Size of a CLSID as a string -const int CLSID_STRING_SIZE = 39; - - - bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, const char* Value) { HKEY hSubKey; commit 69d64cce8847a039a17128e3eaa301917faf6221 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 22:51:45 2015 +0100 -Werror,-Wsizeof-pointer-memaccess Change-Id: I08d4331e5b2c9d17d16b1415d321c4f38322c251 diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index dbb4402..819d5a4 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -418,8 +418,9 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe } // Copy UNICODE characters in chunk buffer to output UNICODE buffer ULONG ulToCopy = min( *pcwcBuffer, m_ulUnicodeBufferLen - m_ulUnicodeCharsRead ); - ZeroMemory(awcBuffer, sizeof(awcBuffer)); wmemcpy( awcBuffer, m_pwsBuffer.c_str() + m_ulUnicodeCharsRead, ulToCopy ); + ZeroMemory( + awcBuffer + ulToCopy, (*pcwcBuffer - ulToCopy) * sizeof (WCHAR)); m_ulUnicodeCharsRead += ulToCopy; *pcwcBuffer = ulToCopy; if ( m_ulUnicodeBufferLen == m_ulUnicodeCharsRead ) commit 6b26ed763f618a5f4c8fd21be0980a46c907bfe6 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 16:34:18 2015 +0100 -Werror,-Wunused-private-field Change-Id: I590f8aa06b193e789de86435038d799cf219ffd6 diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index d01f6cd..120ac49 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -340,6 +340,7 @@ private: __type_info::~__type_info() throw () { + (void)_m_data; } class __type_info_descriptor commit 4cc07334fd9a386cafa414279a62445d7124c06e Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 16:25:35 2015 +0100 -Werror,-Wdynamic-class-memaccess destination for this 'memcpy' call is a pointer to dynamic class '__type_info'; vtable pointer will be overwritten source of this 'memcpy' call is a pointer to dynamic class 'type_info'; vtable pointer will be copied explicitly cast the pointer to silence this warning Change-Id: Ic9a55dfa11643ac2c7ebc02332325a2f58516d04 diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 1fa061c..d01f6cd 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -523,7 +523,7 @@ struct ExceptionType // As _n0 is always initialized to zero, that means the // hasvirtbase flag (see the ONTL catchabletype struct) is // off, and thus the copyctor is of the ctor_ptr kind. - memcpy(&type_info, mscx_getRTTI(pTD->pTypeName), mscx_getRTTI_len(pTD->pTypeName)); + memcpy(static_cast<void *>(&type_info), static_cast<void *>(mscx_getRTTI(pTD->pTypeName)), mscx_getRTTI_len(pTD->pTypeName)); _pTypeInfo = static_cast<sal_uInt32>( reinterpret_cast<sal_uInt64>(&type_info) - pCodeBase); GenerateConstructorTrampoline( pCode, pTD ); commit 6c8a5bcfe92f7b59efae9361bfdba4819f2ca5c2 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 16:19:51 2015 +0100 -Wmicrosoft-cast Change-Id: Idc7b1c8c953634c26aad0923344457eae6fb1583 diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 6432f03..1fa061c 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -469,7 +469,7 @@ void GenerateConstructorTrampoline( // mov r11, copyConstruct *p++ = 0x49; *p++ = 0xBB; - *((void **)p) = ©Construct; p += 8; + *((void **)p) = reinterpret_cast<void *>(©Construct); p += 8; // jmp r11 *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3; @@ -489,7 +489,7 @@ void GenerateDestructorTrampoline( // mov r11, destruct *p++ = 0x49; *p++ = 0xBB; - *((void **)p) = &destruct; p += 8; + *((void **)p) = reinterpret_cast<void *>(&destruct); p += 8; // jmp r11 *p++ = 0x41; *p++ = 0xFF; *p++ = 0xE3; commit 033d1acd169cbb6d6c616cd29410d951e059f294 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 16:13:51 2015 +0100 -Werror,-Wmicrosoft-exception-spec Change-Id: Icd92fe15c3534f440017709bcdbe9aadf1c83c6d diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 9dc7b38..6432f03 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -317,8 +317,8 @@ public: int getRTTI_len(OUString const & rUNOname) throw (); __type_info_descriptor * insert_new_type_info_descriptor(OUString const & rUNOname); - RTTInfos(); - ~RTTInfos(); + RTTInfos() throw (); + ~RTTInfos() throw (); }; class __type_info { commit 94f790a4e6158cf4d6cf74fe75601a7eac0579a1 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 11:44:29 2015 +0100 -Werror,-Wduplicate-decl-specifier (extern "C" already in STDAPI) Change-Id: I634debc05a24e0d519200fc91a77d50f36b9af38 diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index ea5fb53..5f70df9 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -179,7 +179,7 @@ extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwRe } -extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) +STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { for( int nInd = 0; nInd < SUPPORTED_FACTORIES_NUM; nInd++ ) if ( *guidList[nInd] == rclsid ) @@ -196,7 +196,7 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID ri } -extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() +STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() { if ( !g_nObj && !g_nLock ) return S_OK; commit 000af551ed917f6c3cd7fde525050693ac2ad413 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 09:54:23 2015 +0100 -Werror,-Wwritable-strings Change-Id: I18d4d9153009ff132fe07b30ad55025e3875a180 diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx index fc6aee5..dccae73 100644 --- a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx +++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx @@ -31,7 +31,7 @@ std::string GetOfficeInstallationPath(MSIHANDLE handle) { std::string progpath; DWORD sz = 0; - LPTSTR dummy = TEXT(""); + LPTSTR dummy = const_cast<LPTSTR>(TEXT("")); if (MsiGetProperty(handle, TEXT("INSTALLLOCATION"), dummy, &sz) == ERROR_MORE_DATA) { @@ -49,7 +49,7 @@ std::string GetOfficeProductName(MSIHANDLE handle) { std::string productname; DWORD sz = 0; - LPTSTR dummy = TEXT(""); + LPTSTR dummy = const_cast<LPTSTR>(TEXT("")); if (MsiGetProperty(handle, TEXT("ProductName"), dummy, &sz) == ERROR_MORE_DATA) { @@ -67,7 +67,7 @@ std::string GetQuickstarterLinkName(MSIHANDLE handle) { std::string quickstarterlinkname; DWORD sz = 0; - LPTSTR dummy = TEXT(""); + LPTSTR dummy = const_cast<LPTSTR>(TEXT("")); if (MsiGetProperty(handle, TEXT("Quickstarterlinkname"), dummy, &sz) == ERROR_MORE_DATA) { diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index 539fdeb..ebd8d27 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -134,7 +134,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) bool GetMsiProp( MSIHANDLE handle, LPCSTR name, /*out*/std::string& value ) { DWORD sz = 0; - LPSTR dummy = ""; + LPSTR dummy = const_cast<LPSTR>(""); if (MsiGetPropertyA(handle, name, dummy, &sz) == ERROR_MORE_DATA) { sz++; diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index 25b6f2c..627858d 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -113,7 +113,7 @@ void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallF BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) { DWORD sz = 0; - if ( MsiGetProperty( hMSI, pPropName, L"", &sz ) == ERROR_MORE_DATA ) + if ( MsiGetProperty( hMSI, pPropName, const_cast<wchar_t *>(L""), &sz ) == ERROR_MORE_DATA ) { sz++; DWORD nbytes = sz * sizeof( wchar_t ); diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index 9c6ab53..e72fe09 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -40,7 +40,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue ) { DWORD sz = 0; - if ( MsiGetProperty( hMSI, pPropName, "", &sz ) == ERROR_MORE_DATA ) { + if ( MsiGetProperty( hMSI, pPropName, const_cast<char *>(""), &sz ) == ERROR_MORE_DATA ) { sz++; DWORD nbytes = sz * sizeof( char ); char* buff = reinterpret_cast<char*>( malloc( nbytes ) ); diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx index fb6f77d..49ae455 100644 --- a/setup_native/source/win32/customactions/tools/checkversion.cxx +++ b/setup_native/source/win32/customactions/tools/checkversion.cxx @@ -39,7 +39,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) { DWORD sz = 0; - if ( MsiGetProperty( hMSI, pPropName, L"", &sz ) == ERROR_MORE_DATA ) + if ( MsiGetProperty( hMSI, pPropName, const_cast<wchar_t *>(L""), &sz ) == ERROR_MORE_DATA ) { sz++; DWORD nbytes = sz * sizeof( wchar_t ); commit 18e972c2d993994ea2b80f13cf2013397af1c67f Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 09:53:58 2015 +0100 -Werror,-Wwritable-strings Change-Id: I016006135012699b4e14e869c036f4d295e5cde2 diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index c2f690f..25b6f2c 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -41,7 +41,7 @@ typedef int ( __stdcall * DllNativeRegProc ) ( int, BOOL, BOOL, const char* ); typedef int ( __stdcall * DllNativeUnregProc ) ( int, BOOL, BOOL ); -BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 ) +BOOL UnicodeEquals( wchar_t const * pStr1, wchar_t const * pStr2 ) { if ( pStr1 == NULL && pStr2 == NULL ) return TRUE; commit 4c03c36f739bdfebed5d80bd9ec9cb5928007173 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 09:52:47 2015 +0100 -Werror,-Wunused-internal-declaration Change-Id: I4e9b7ee46a4438feff8508d443822c607633e7c1 diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index fcf8d92..539fdeb 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -131,52 +131,6 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey ) return bRet; } -static LONG DeleteSubKeyTree( HKEY RootKey, LPCSTR lpKey ) -{ - HKEY hKey; - LONG rc = RegOpenKeyExA( RootKey, lpKey, 0, KEY_READ | DELETE, &hKey ); - - if (ERROR_SUCCESS == rc) - { - LPCSTR lpSubKey; - DWORD nMaxSubKeyLen; - - rc = RegQueryInfoKeyA( hKey, 0, 0, 0, 0, &nMaxSubKeyLen, 0, 0, 0, 0, 0, 0 ); - nMaxSubKeyLen++; // space for trailing '\0' - lpSubKey = reinterpret_cast<CHAR*>( _alloca( nMaxSubKeyLen*sizeof(CHAR) ) ); - - while (ERROR_SUCCESS == rc) - { - DWORD nLen = nMaxSubKeyLen; - rc = RegEnumKeyExA( hKey, 0, (LPSTR)lpSubKey, &nLen, 0, 0, 0, 0); // always index zero - - if ( ERROR_NO_MORE_ITEMS == rc ) - { - rc = RegDeleteKeyA( RootKey, lpKey ); - if ( rc == ERROR_SUCCESS ) - OutputDebugStringFormat( "deleted key [%s] from registry.\n", lpKey ); - else - OutputDebugStringFormat( "RegDeleteKeyA %s returned %ld.\n", lpKey, rc ); - break; - } - else if ( rc == ERROR_SUCCESS ) - { - rc = DeleteSubKeyTree( hKey, lpSubKey ); - if ( ERROR_SUCCESS != rc ) - OutputDebugStringFormat( "RegDeleteKeyA %s returned %ld.\n", lpSubKey, rc ); - } - - } - RegCloseKey(hKey); - } - else - { - OutputDebugStringFormat( "RegOpenKeyExA %s returned %ld.\n", lpKey, rc ); - } - - return rc; -} - bool GetMsiProp( MSIHANDLE handle, LPCSTR name, /*out*/std::string& value ) { DWORD sz = 0; commit e82ebf09d2de04a83d6bcb97ab606a0be2badf46 Author: Stephan Bergmann <[email protected]> Date: Fri Nov 13 09:51:32 2015 +0100 -Werror,-Wunused-function Change-Id: Idb8d967348b49d467249d2923829f66044e9891e diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx index 162d54d..d5e3ce6 100644 --- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx +++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx @@ -45,24 +45,6 @@ #include <systools/win32/uwinapi.h> #include <../tools/seterror.hxx> - -#ifdef DEBUG -inline void OutputDebugStringFormat( LPCSTR pFormat, ... ) -{ - CHAR buffer[1024]; - va_list args; - - va_start( args, pFormat ); - StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args ); - OutputDebugStringA( buffer ); - va_end(args); -} -#else -static inline void OutputDebugStringFormat( LPCSTR, ... ) -{ -} -#endif - static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty ) { std::_tstring result; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
