From c992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jun 2012 16:50:14 +0000 Subject: - microkernel addded; - version bumped to 0.92.2 git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/skin/hotkey_opts.cpp | 2 +- src/modules/skin/hotkeys.cpp | 4 ++-- src/modules/skin/skin.h | 4 ++-- src/modules/skin/skinicons.cpp | 8 ++++---- src/modules/skin/sounds.cpp | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/modules/skin') diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp index 929bb8be74..6bebcdc273 100644 --- a/src/modules/skin/hotkey_opts.cpp +++ b/src/modules/skin/hotkey_opts.cpp @@ -1005,7 +1005,7 @@ int HotkeyOptionsInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = {0}; odp.cbSize = sizeof(odp); - odp.hInstance = hMirandaInst; + odp.hInstance = hInst; odp.flags = ODPF_BOLDGROUPS; odp.position = -180000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HOTKEYS); diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp index 76a31b6f2e..a36dd152d1 100644 --- a/src/modules/skin/hotkeys.cpp +++ b/src/modules/skin/hotkeys.cpp @@ -332,7 +332,7 @@ int LoadSkinHotkeys(void) wcl.style = 0; wcl.cbClsExtra = 0; wcl.cbWndExtra = 0; - wcl.hInstance = hMirandaInst; + wcl.hInstance = hInst; wcl.hIcon = NULL; wcl.hCursor = LoadCursor(NULL, IDC_ARROW); wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH); @@ -343,7 +343,7 @@ int LoadSkinHotkeys(void) g_pid = GetCurrentProcessId(); - g_hwndHotkeyHost = CreateWindow(_T("MirandaHotkeyHostWnd"), NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, hMirandaInst, NULL); + g_hwndHotkeyHost = CreateWindow(_T("MirandaHotkeyHostWnd"), NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, hInst, NULL); SetWindowPos(g_hwndHotkeyHost, 0, 0, 0, 0, 0, SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_DEFERERASE|SWP_NOSENDCHANGING|SWP_HIDEWINDOW); hhkKeyboard = SetWindowsHookEx(WH_KEYBOARD, sttKeyboardProc, NULL, GetCurrentThreadId()); diff --git a/src/modules/skin/skin.h b/src/modules/skin/skin.h index 274b0d82df..bd8783e17d 100644 --- a/src/modules/skin/skin.h +++ b/src/modules/skin/skin.h @@ -56,8 +56,8 @@ struct THotkeyItem bool UnregisterHotkey; // valid only during WM_APP message in options UI, used to remove unregistered hotkeys from options - __inline TCHAR* getSection() const { return LangPackTranslateStringT(hLangpack, ptszSection); } - __inline TCHAR* getDescr() const { return LangPackTranslateStringT(hLangpack, ptszDescription); } + __inline TCHAR* getSection() const { return TranslateTH(hLangpack, ptszSection); } + __inline TCHAR* getDescr() const { return TranslateTH(hLangpack, ptszDescription); } }; extern LIST hotkeys; diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 24138e0000..509135ae20 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -135,7 +135,7 @@ HICON LoadIconEx(HINSTANCE hInstance, LPCTSTR lpIconName, BOOL bShared) { HICON hResIcon = bShared ? LoadSmallIcon(hInstance, lpIconName) : LoadSmallIconShared(hInstance, lpIconName); if ( !hResIcon) { //Icon not found in hInstance lets try to load it from core - HINSTANCE hCoreInstance=hMirandaInst; + HINSTANCE hCoreInstance=hInst; if (hCoreInstance != hInstance) hResIcon = bShared ? LoadSmallIcon(hCoreInstance, lpIconName) : LoadSmallIconShared(hCoreInstance, lpIconName); } @@ -144,7 +144,7 @@ HICON LoadIconEx(HINSTANCE hInstance, LPCTSTR lpIconName, BOOL bShared) int ImageList_AddIcon_NotShared(HIMAGELIST hIml, LPCTSTR szResource) { - HICON hTempIcon=LoadIconEx(hMirandaInst, szResource, 0); + HICON hTempIcon=LoadIconEx(hInst, szResource, 0); int res = ImageList_AddIcon(hIml, hTempIcon); Safe_DestroyIcon(hTempIcon); return res; @@ -222,7 +222,7 @@ HICON LoadSkinProtoIcon(const char* szProto, int status, bool big) int i, statusIndx = -1; char iconName[MAX_PATH]; HICON hIcon; - DWORD caps2 = (szProto == NULL) ? (DWORD)-1 : CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_2, 0); + DWORD caps2 = (szProto == NULL) ? (DWORD)-1 : CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_2, 0); if (status >= ID_STATUS_CONNECTING && status < ID_STATUS_CONNECTING+MAX_CONNECT_RETRIES) { mir_snprintf(iconName, SIZEOF(iconName), "%s%d", mainIconsFmt, 7); @@ -276,7 +276,7 @@ HICON LoadSkinProtoIcon(const char* szProto, int status, bool big) sid.cbSize = sizeof(sid); sid.flags = SIDF_ALL_TCHAR; - GetModuleFileName(hMirandaInst, szPath, MAX_PATH); + GetModuleFileName(hInst, szPath, MAX_PATH); str = _tcsrchr(szPath, '\\'); if (str != NULL) *str = 0; diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index 94da829145..24b4e44476 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -30,8 +30,8 @@ struct SoundItem TCHAR* ptszTempFile; int hLangpack; - __inline TCHAR* getSection() const { return LangPackTranslateStringT(hLangpack, ptszSection); } - __inline TCHAR* getDescr() const { return LangPackTranslateStringT(hLangpack, ptszDescription); } + __inline TCHAR* getSection() const { return TranslateTH(hLangpack, ptszSection); } + __inline TCHAR* getDescr() const { return TranslateTH(hLangpack, ptszDescription); } __inline void clear(void) { @@ -112,7 +112,7 @@ static INT_PTR ServiceSkinPlaySound(WPARAM, LPARAM lParam) DBVARIANT dbv; if ( DBGetContactSettingTString(NULL, "SkinSounds", pszSoundName, &dbv) == 0) { TCHAR szFull[MAX_PATH]; - pathToAbsoluteT(dbv.ptszVal, szFull, NULL); + PathToAbsoluteT(dbv.ptszVal, szFull, NULL); NotifyEventHooks(hPlayEvent, 0, (LPARAM)szFull); DBFreeVariant(&dbv); } @@ -236,7 +236,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM DBVARIANT dbv; if ( !DBGetContactSettingTString(NULL, "SkinSounds", arSounds[tvi.lParam].name, &dbv)) { TCHAR szPathFull[MAX_PATH]; - pathToAbsoluteT(dbv.ptszVal, szPathFull, NULL); + PathToAbsoluteT(dbv.ptszVal, szPathFull, NULL); NotifyEventHooks(hPlayEvent, 1, (LPARAM)szPathFull); DBFreeVariant(&dbv); } @@ -266,12 +266,12 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (DBGetContactSettingByte(NULL, "SkinSoundsOff", snd.name, 0) == 0) { DBVARIANT dbv; if (DBGetContactSettingTString(NULL, "SkinSounds", snd.name, &dbv) == 0) { - pathToAbsoluteT(dbv.ptszVal, strdir, NULL); + PathToAbsoluteT(dbv.ptszVal, strdir, NULL); DBFreeVariant(&dbv); } } } mir_sntprintf(strFull, SIZEOF(strFull), _T("%s"), snd.ptszTempFile ? snd.ptszTempFile : _T("")); - pathToAbsoluteT(strFull, strdir, NULL); + PathToAbsoluteT(strFull, strdir, NULL); OPENFILENAME ofn; ZeroMemory(&ofn, sizeof(ofn)); @@ -411,7 +411,7 @@ static int SkinOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.cbSize = sizeof(odp); odp.position = -200000000; - odp.hInstance = hMirandaInst; + odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SOUND); odp.pszGroup = LPGEN("Customize"); odp.pszTitle = LPGEN("Sounds"); -- cgit v1.2.3