From 28d2449a2207fa8c3f959c8037afe6e869300101 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 21 Sep 2013 18:41:21 +0000 Subject: small cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@6167 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/utils/hyperlink.cpp | 3 +-- src/modules/utils/timezones.cpp | 57 ++++------------------------------------- src/modules/utils/utils.cpp | 9 ------- 3 files changed, 6 insertions(+), 63 deletions(-) (limited to 'src/modules/utils') diff --git a/src/modules/utils/hyperlink.cpp b/src/modules/utils/hyperlink.cpp index 1fd17b8130..23f7e151cb 100644 --- a/src/modules/utils/hyperlink.cpp +++ b/src/modules/utils/hyperlink.cpp @@ -260,8 +260,7 @@ int InitHyperlink(void) wcl.cbClsExtra = 0; wcl.cbWndExtra = sizeof(struct HyperlinkWndData*); wcl.hInstance = hInst; - if (IsWinVer2000Plus()) wcl.hCursor = NULL; - else wcl.hCursor = LoadCursor(wcl.hInstance, MAKEINTRESOURCE(IDC_HYPERLINKHAND)); + wcl.hCursor = NULL; wcl.lpszClassName = WNDCLASS_HYPERLINK; wcl.hbrBackground = NULL; wcl.hIcon = NULL; diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index f5f3c15291..6fb8571823 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -30,18 +30,6 @@ TIME_API tmi; typedef DWORD (WINAPI *pfnGetDynamicTimeZoneInformation_t)(DYNAMIC_TIME_ZONE_INFORMATION *pdtzi); static pfnGetDynamicTimeZoneInformation_t pfnGetDynamicTimeZoneInformation; -typedef HRESULT (WINAPI *pfnSHLoadIndirectString_t)(LPCWSTR pszSource, LPWSTR pszOutBuf, UINT cchOutBuf, void **ppvReserved); -static pfnSHLoadIndirectString_t pfnSHLoadIndirectString; - -typedef LANGID (WINAPI *pfnGetUserDefaultUILanguage_t)(void); -static pfnGetUserDefaultUILanguage_t pfnGetUserDefaultUILanguage; - -typedef LANGID (WINAPI *pfnGetSystemDefaultUILanguage_t)(void); -static pfnGetSystemDefaultUILanguage_t pfnGetSystemDefaultUILanguage; - -typedef LPARAM (WINAPI *pfnSendMessageW_t)(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); -static pfnSendMessageW_t pfnSendMessageW; - typedef struct _REG_TZI_FORMAT { LONG Bias; @@ -74,7 +62,6 @@ typedef struct } TZ_INT_INFO; static TZ_INT_INFO myInfo; -bool muiInstalled; static OBJLIST g_timezones(55, NumericKeySortT); static LIST g_timezonesBias(55, MIM_TIMEZONE::compareBias); @@ -411,11 +398,7 @@ static int timeapiPrepareList(HANDLE hContact, HWND hWnd, DWORD dwFlags) { MIM_TIMEZONE *tz = g_timezonesBias[i]; - if (pfnSendMessageW) - pfnSendMessageW(hWnd, lstMsg->addStr, 0, (LPARAM)tz->szDisplay); - else - SendMessage(hWnd, lstMsg->addStr, 0, (LPARAM)StrConvTu(tz->szDisplay)); - + SendMessage(hWnd, lstMsg->addStr, 0, (LPARAM)tz->szDisplay); SendMessage(hWnd, lstMsg->setData, i + 1, (LPARAM)tz); } @@ -496,27 +479,9 @@ static INT_PTR TimestampToStringA(WPARAM wParam, LPARAM lParam) void GetLocalizedString(HKEY hSubKey, const TCHAR *szName, wchar_t *szBuf, DWORD cbLen) { - szBuf[0] = 0; - if (muiInstalled) - { - TCHAR tszTempBuf[MIM_TZ_NAMELEN], tszName[30]; - mir_sntprintf(tszName, SIZEOF(tszName), _T("MUI_%s"), szName); - DWORD dwLength = cbLen * sizeof(TCHAR); - if (ERROR_SUCCESS == RegQueryValueEx(hSubKey, tszName, NULL, NULL, (unsigned char *)tszTempBuf, &dwLength)) - { - tszTempBuf[min(dwLength / sizeof(TCHAR), cbLen - 1)] = 0; - if (pfnSHLoadIndirectString) - pfnSHLoadIndirectString(StrConvU(tszTempBuf), szBuf, cbLen, NULL); - } - } - if (szBuf[0] == 0) - { - DWORD dwLength = cbLen * sizeof(wchar_t); - - - RegQueryValueEx(hSubKey, szName, NULL, NULL, (unsigned char *)szBuf, &dwLength); - szBuf[min(dwLength / sizeof(TCHAR), cbLen - 1)] = 0; - } + DWORD dwLength = cbLen * sizeof(wchar_t); + RegQueryValueEx(hSubKey, szName, NULL, NULL, (unsigned char *)szBuf, &dwLength); + szBuf[min(dwLength / sizeof(TCHAR), cbLen - 1)] = 0; } extern "C" __declspec(dllexport) void RecalculateTime(void) @@ -558,9 +523,7 @@ void InitTimeZones(void) REG_TZI_FORMAT tzi; HKEY hKey; - const TCHAR *tszKey = IsWinVerNT() ? - _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones") : - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Time Zones"); + const TCHAR *tszKey = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"); /* * use GetDynamicTimeZoneInformation() on Vista+ - this will return a structure with @@ -570,16 +533,6 @@ void InitTimeZones(void) if (IsWinVerVistaPlus()) pfnGetDynamicTimeZoneInformation = (pfnGetDynamicTimeZoneInformation_t)GetProcAddress(GetModuleHandle(_T("kernel32")), "GetDynamicTimeZoneInformation"); - if (IsWinVer2000Plus()) - { - pfnSHLoadIndirectString = (pfnSHLoadIndirectString_t)GetProcAddress(GetModuleHandle(_T("shlwapi")), "SHLoadIndirectString"); - pfnGetSystemDefaultUILanguage = (pfnGetSystemDefaultUILanguage_t)GetProcAddress(GetModuleHandle(_T("kernel32")), "GetSystemDefaultUILanguage"); - pfnGetUserDefaultUILanguage = (pfnGetUserDefaultUILanguage_t)GetProcAddress(GetModuleHandle(_T("kernel32")), "GetUserDefaultUILanguage"); - muiInstalled = pfnSHLoadIndirectString && pfnGetSystemDefaultUILanguage() != pfnGetUserDefaultUILanguage(); - } - - pfnSendMessageW = (pfnSendMessageW_t)GetProcAddress(GetModuleHandle(_T("user32")), "SendMessageW"); - if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, tszKey, 0, KEY_ENUMERATE_SUB_KEYS, &hKey)) { DWORD dwIndex = 0; diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp index ddf2038da0..62322a9ec6 100644 --- a/src/modules/utils/utils.cpp +++ b/src/modules/utils/utils.cpp @@ -448,15 +448,6 @@ static INT_PTR GenerateRandom(WPARAM wParam, LPARAM lParam) pfnRtlGenRandom = NULL; } } - if (pfnRtlGenRandom == NULL) - { - srand(GetTickCount()); - unsigned short* buf = (unsigned short*)lParam; - for (; (long)(wParam-=2) >= 0;) - *(buf++) = (unsigned short)rand(); - if (lParam < 0) - *(char*)buf = (char)(rand() & 0xFF); - } return 0; } -- cgit v1.2.3