diff options
| author | Andras Timar <atimar@suse.com> | 2013-02-17 12:22:01 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-02-17 12:25:44 +0100 |
| commit | c13c500630746ba035e0b48c0cbd276aa436db2b (patch) | |
| tree | f476281b7720357055e3e08edf1f32c71f88fa65 /setup_native/source/win32/customactions | |
| parent | 850b4c7e2d5535dcf76cebea85b4f14c1c7aeaea (diff) | |
CustomActions should be statically linked with MSVCRT
Change-Id: I100b7ff7e3aa505098ce8b3333d1aa8faca50370
Diffstat (limited to 'setup_native/source/win32/customactions')
| -rw-r--r-- | setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx | 4 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/iconcache.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx index d40d378bfadb..22732480bd53 100644 --- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx +++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx @@ -27,7 +27,7 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam ) int nCharsCopied = GetClassName( hWnd, szClassName, sizeof( szClassName ) ); - if ( nCharsCopied && !stricmp( QUICKSTART_CLASSNAMEA, szClassName ) ) + if ( nCharsCopied && !_stricmp( QUICKSTART_CLASSNAMEA, szClassName ) ) { DWORD dwProcessId; @@ -36,7 +36,7 @@ static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam ) std::string sImagePath = GetProcessImagePath( dwProcessId ); std::string sOfficeImageDir = GetOfficeInstallationPath( hMSI ) + "program\\"; - if ( !strnicmp( sImagePath.c_str(), sOfficeImageDir.c_str(), sOfficeImageDir.length() ) ) + if ( !_strnicmp( sImagePath.c_str(), sOfficeImageDir.c_str(), sOfficeImageDir.length() ) ) { UINT uMsgShutdownQuickstart = RegisterWindowMessageA( SHUTDOWN_QUICKSTART_MESSAGEA ); diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx index 6e87a843e39b..e037074b2220 100644 --- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx +++ b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx @@ -69,12 +69,12 @@ extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE) if ( !iSize ) { iSize = GetSystemMetrics( SM_CXICON ); - itoa( iSize, szValue, 10 ); + _itoa_s( iSize, szValue, 256, 10 ); cbValue = strlen( szValue ) + 1; dwType = REG_SZ; } - itoa( iSize + 1, szTempValue, 10 ); + _itoa_s( iSize + 1, szTempValue, 256, 10 ); lError = RegSetValueEx( hKey, TEXT("Shell Icon Size"), 0, dwType, (LPBYTE)szTempValue, strlen( szTempValue ) + 1 ); LRESULT lResult = SendMessageTimeout( |