Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSCTFIME][SDK] Implement CtfImeProcessCicHotkey (#6236)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9e8fb9ea4fd919449635… commit b9e8fb9ea4fd919449635b5f2f68652f3cced8b8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 27 15:08:17 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 27 15:08:17 2023 +0900 [MSCTFIME][SDK] Implement CtfImeProcessCicHotkey (#6236) Supporting TIPs... JIRA issue: CORE-19360 - Define ITfSysHookSink and IID_ITfThreadMgr_P interfaces in <cicero/cictf.h>. - Implement CtfImeProcessCicHotkey function. --- dll/ime/msctfime/msctfime.cpp | 41 ++++++++++++++++++++++++++++---------- dll/ime/msctfime/msctfime.h | 1 + sdk/include/ddk/immdev.h | 1 + sdk/include/reactos/cicero/cictf.h | 31 ++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 376416110a5..246f924ecbe 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -765,15 +765,6 @@ Inquire( return S_OK; } -DEFINE_GUID(IID_ITfSysHookSink, 0x495388DA, 0x21A5, 0x4852, 0x8B, 0xB1, 0xED, 0x2F, 0x29, 0xDA, 0x8D, 0x60); - -struct ITfSysHookSink : IUnknown -{ - STDMETHOD(OnPreFocusDIM)(HWND hwnd) = 0; - STDMETHOD(OnSysKeyboardProc)(UINT, LONG) = 0; - STDMETHOD(OnSysShellProc)(INT, UINT, LONG) = 0; -}; - class TLS; typedef INT (CALLBACK *FN_INITDOCMGR)(UINT, ITfDocumentMgr *, ITfDocumentMgr *, LPVOID); @@ -2649,14 +2640,42 @@ CtfImeSetActiveContextAlways( return E_NOTIMPL; } + +/*********************************************************************** + * CtfImeProcessCicHotkey (MSCTFIME.@) + * + * @implemented + */ EXTERN_C HRESULT WINAPI CtfImeProcessCicHotkey( _In_ HIMC hIMC, _In_ UINT vKey, _In_ LPARAM lParam) { - FIXME("stub:(%p, %u, %p)\n", hIMC, vKey, lParam); - return E_NOTIMPL; + TRACE("(%p, %u, %p)\n", hIMC, vKey, lParam); + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS) + return S_OK; + + HRESULT hr = S_OK; + ITfThreadMgr *pThreadMgr = NULL; + ITfThreadMgr_P *pThreadMgr_P = NULL; + if ((TF_GetThreadMgr(&pThreadMgr) == S_OK) && + (pThreadMgr->QueryInterface(IID_ITfThreadMgr_P, (void**)&pThreadMgr_P) == S_OK) && + CtfImmIsCiceroStartedInThread()) + { + HRESULT hr2; + if (SUCCEEDED(pThreadMgr_P->CallImm32HotkeyHandler(vKey, lParam, &hr2))) + hr = hr2; + } + + if (pThreadMgr) + pThreadMgr->Release(); + if (pThreadMgr_P) + pThreadMgr_P->Release(); + + return hr; } /*********************************************************************** diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index a5273e11d2d..8ab6bf3f5ad 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -26,6 +26,7 @@ #include <cicero/cicbase.h> #include <cicero/cicarray.h> #include <cicero/cicimc.h> +#include <cicero/cictf.h> class CicInputContext; diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 2d955dd81c6..3d3b4b5686a 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -18,6 +18,7 @@ extern "C" { #endif BOOL WINAPI ImmDisableTextFrameService(_In_ DWORD dwThreadId); +BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); typedef struct tagSOFTKBDDATA { diff --git a/sdk/include/reactos/cicero/cictf.h b/sdk/include/reactos/cicero/cictf.h new file mode 100644 index 00000000000..33598b1c5b1 --- /dev/null +++ b/sdk/include/reactos/cicero/cictf.h @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Cicero Text Framework + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +DEFINE_GUID(IID_ITfSysHookSink, 0x495388DA, 0x21A5, 0x4852, 0x8B, 0xB1, 0xED, 0x2F, 0x29, 0xDA, 0x8D, 0x60); + +struct ITfSysHookSink : IUnknown +{ + STDMETHOD(OnPreFocusDIM)(HWND hwnd) = 0; + STDMETHOD(OnSysKeyboardProc)(UINT, LONG) = 0; + STDMETHOD(OnSysShellProc)(INT, UINT, LONG) = 0; +}; + +DEFINE_GUID(IID_ITfThreadMgr_P, 0x7C6247A1, 0x2884, 0x4B7C, 0xAF, 0x24, 0xF1, 0x98, 0x04, 0x7A, 0xA7, 0x28); + +struct ITfThreadMgr_P : ITfThreadMgr +{ + STDMETHOD(GetAssociated)(HWND hwnd, ITfDocumentMgr **ppDocMgr) = 0; + STDMETHOD(SetSysHookSink)(ITfSysHookSink *pSysHookSink) = 0; + STDMETHOD(RequestPostponedLock)(ITfContext *pContext) = 0; + STDMETHOD(IsKeystrokeFeedEnabled)(int *) = 0; + STDMETHOD(CallImm32HotkeyHandler)(UINT vKey, LPARAM lParam, HRESULT* phrResult) = 0; + STDMETHOD(ActivateEx)(LPDWORD, DWORD) = 0; +}; + +DEFINE_GUID(IID_ITfKeystrokeMgr_P, 0x53FA1BEC, 0x5BE1, 0x458E, 0xAE, 0x70, 0xA9, 0xF1, 0xDC, 0x84, 0x3E, 0x81);

1 year, 6 months

[reactos] 01/01: [MSCTF] Implement InitCUASFlag (#6235)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfff2dbd12b208175eb56… commit cfff2dbd12b208175eb56faf04e533c4dde82c9e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 27 12:32:01 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 27 12:32:01 2023 +0900 [MSCTF] Implement InitCUASFlag (#6235) Implementing TIPs and Language Bar... JIRA issue: CORE-19361 - Add InitCUASFlag function. - Use it in ProcessAttach function. --- dll/win32/msctf/utils.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index dfad480ea0b..8e798094af7 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -45,6 +45,8 @@ HKL g_hklDefault = NULL; DWORD g_dwTLSIndex = (DWORD)-1; BOOL gfSharedMemory = FALSE; LONG g_cRefDll = -1; +BOOL g_fCUAS = FALSE; +TCHAR g_szCUASImeFile[16] = { 0 }; // Messages UINT g_msgPrivate = 0; @@ -484,6 +486,40 @@ VOID CheckAnchorStores(VOID) //FIXME } +VOID InitCUASFlag(VOID) +{ + CicRegKey regKey1; + LSTATUS error; + + error = regKey1.Open(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\CTF\\SystemShared\\")); + if (error == ERROR_SUCCESS) + { + DWORD dwValue; + error = regKey1.QueryDword(TEXT("CUAS"), &dwValue); + if (error == ERROR_SUCCESS) + g_fCUAS = !!dwValue; + } + + g_szCUASImeFile[0] = TEXT('\0'); + + if (!g_fCUAS) + return; + + TCHAR szImeFile[16]; + CicRegKey regKey2; + error = regKey2.Open(HKEY_LOCAL_MACHINE, + TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\IMM")); + if (error == ERROR_SUCCESS) + { + error = regKey2.QuerySz(TEXT("IME File"), szImeFile, _countof(szImeFile)); + if (error == ERROR_SUCCESS) + { + g_szCUASImeFile[_countof(g_szCUASImeFile) - 1] = TEXT('\0'); // Avoid buffer overrun + StringCchCopy(g_szCUASImeFile, _countof(g_szCUASImeFile), szImeFile); + } + } +} + /** * @unimplemented */ @@ -541,6 +577,10 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) // FIXME: Call me from DllMain //FIXME + InitCUASFlag(); + + //FIXME + GetDesktopUniqueName(TEXT("CTF.AsmListCache.FMP"), g_szAsmListCache, _countof(g_szAsmListCache)); GetDesktopUniqueName(TEXT("CTF.TimListCache.FMP"), g_szTimListCache, _countof(g_szTimListCache)); GetDesktopUniqueName(TEXT("CTF.LayoutsCache.FMP"), g_szLayoutsCache, _countof(g_szLayoutsCache));

1 year, 6 months

[reactos] 01/01: [MSCTF][SDK] Implement InitLangChangeHotKey (#6234)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec0695c26ba520b0fbfb2… commit ec0695c26ba520b0fbfb2e3f0791d3c20376c21b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 27 11:43:01 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 27 11:43:01 2023 +0900 [MSCTF][SDK] Implement InitLangChangeHotKey (#6234) Supporting TIPs and Language Bar... JIRA issue: CORE-19361 - Implement InitLangChangeHotKey function. - Add some global variables about hot-keys. - Fix CicRegKey in <cicero/cicreg.h>. --- dll/win32/msctf/utils.cpp | 131 +++++++++++++++++++++++++++++++++++- sdk/include/reactos/cicero/cicreg.h | 4 +- 2 files changed, 130 insertions(+), 5 deletions(-) diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 4066714f89e..dfad480ea0b 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -78,6 +78,14 @@ CicMutex g_mutexTMD; // File mapping CicFileMappingStatic g_SharedMemory; +// Hot-Keys +UINT g_uLangHotKeyModifiers = 0; +UINT g_uLangHotKeyVKey = 0; +UINT g_uLangHotKeyVKey2 = 0; +UINT g_uKeyTipHotKeyModifiers = 0; +UINT g_uKeyTipHotKeyVKey = 0; +UINT g_uKeyTipHotKeyVKey2 = 0; + /** * @implemented */ @@ -346,11 +354,126 @@ TF_IsCtfmonRunning(VOID) } /** - * @unimplemented + * @implemented */ -VOID InitLangChangeHotKey(VOID) +BOOL InitLangChangeHotKey(VOID) { - //FIXME + CicRegKey regKey; + TCHAR szLanguage[2], szLayout[2]; + LSTATUS error; + + szLanguage[0] = szLayout[0] = TEXT('3'); + szLanguage[1] = szLayout[1] = TEXT('\0'); + + error = regKey.Open(HKEY_CURRENT_USER, "Keyboard Layout\\Toggle"); + if (error == ERROR_SUCCESS) + { + error = regKey.QuerySz(TEXT("Language Hotkey"), szLanguage, _countof(szLanguage)); + if (error != ERROR_SUCCESS) + { + if (g_dwOSInfo & CIC_OSINFO_NT) + { + error = regKey.QuerySz(TEXT("Hotkey"), szLanguage, _countof(szLanguage)); + if (error != ERROR_SUCCESS) + szLanguage[0] = TEXT('1'); + } + else + { + error = regKey.QuerySz(NULL, szLanguage, _countof(szLanguage)); + if (error != ERROR_SUCCESS) + szLanguage[0] = TEXT('1'); + } + + if (PRIMARYLANGID(GetSystemDefaultLCID()) == LANG_CHINESE) + szLanguage[0] = TEXT('1'); + } + + error = regKey.QuerySz(TEXT("Layout Hotkey"), szLayout, _countof(szLayout)); + if (error != ERROR_SUCCESS) + { + szLayout[0] = TEXT('1'); + if (szLanguage[0] != TEXT('2')) + szLayout[0] = TEXT('2'); + if (GetSystemMetrics(SM_MIDEASTENABLED)) + szLayout[0] = TEXT('3'); + } + + szLanguage[1] = TEXT('\0'); + szLayout[1] = TEXT('\0'); + } + + if (szLanguage[0] == szLayout[0]) + { + if (szLanguage[0] == TEXT('1')) + szLayout[0] = TEXT('2'); + else if (szLanguage[0] == TEXT('2')) + szLayout[0] = TEXT('1'); + else + szLayout[0] = TEXT('3'); + } + + ::EnterCriticalSection(&g_csInDllMain); + + switch (szLanguage[0]) + { + case TEXT('2'): + g_uLangHotKeyModifiers = MOD_SHIFT | MOD_CONTROL; + g_uLangHotKeyVKey2 = VK_CONTROL; + g_uLangHotKeyVKey = VK_SHIFT; + break; + + case TEXT('3'): + g_uLangHotKeyVKey = 0; + g_uLangHotKeyModifiers = 0; + g_uLangHotKeyVKey2 = 0; + break; + + case TEXT('4'): + g_uLangHotKeyVKey = VK_NUMPAD0; + g_uLangHotKeyModifiers = 0; + g_uLangHotKeyVKey2 = 0; + break; + + case TEXT('1'): + default: + g_uLangHotKeyModifiers = MOD_SHIFT | MOD_ALT; + g_uLangHotKeyVKey2 = VK_MENU; + g_uLangHotKeyVKey = VK_SHIFT; + break; + } + + switch (szLayout[0]) + { + case TEXT('2'): + g_uKeyTipHotKeyModifiers = MOD_SHIFT | MOD_CONTROL; + g_uKeyTipHotKeyVKey = VK_SHIFT; + g_uKeyTipHotKeyVKey2 = VK_CONTROL; + break; + + case TEXT('3'): + g_uKeyTipHotKeyModifiers = 0; + g_uKeyTipHotKeyVKey = 0; + g_uKeyTipHotKeyVKey2 = 0; + break; + + case TEXT('4'): + g_uKeyTipHotKeyModifiers = 0; + g_uKeyTipHotKeyVKey = VK_OEM_3; + g_uKeyTipHotKeyVKey2 = 0; + break; + + case TEXT('1'): + default: + g_uKeyTipHotKeyModifiers = 0x40 | MOD_SHIFT; + g_uKeyTipHotKeyVKey = VK_SHIFT; + g_uKeyTipHotKeyVKey2 = VK_MENU; + break; + } + + ::LeaveCriticalSection(&g_csInDllMain); + + TRACE("HotKey: %c, %c\n", szLanguage[0], szLayout[0]); + return TRUE; } /** @@ -408,6 +531,8 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) // FIXME: Call me from DllMain } cicGetOSInfo(&g_uACP, &g_dwOSInfo); + TRACE("cicGetOSInfo: %u, 0x%lX\n", g_uACP, g_dwOSInfo); + InitUniqueString(); //FIXME diff --git a/sdk/include/reactos/cicero/cicreg.h b/sdk/include/reactos/cicero/cicreg.h index f6c090bef4e..ec3718da046 100644 --- a/sdk/include/reactos/cicero/cicreg.h +++ b/sdk/include/reactos/cicero/cicreg.h @@ -46,7 +46,7 @@ public: return ::RegSetValueEx(m_hKey, pszValueName, 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(dwValue)); } - LSTATUS QuerySz(LPCTSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); + LSTATUS QuerySz(LPCTSTR pszValueName, LPTSTR pszValue, DWORD cchValueMax); LSTATUS SetSz(LPCTSTR pszValueName, LPCTSTR pszValue) { @@ -124,7 +124,7 @@ CicRegKey::Create( } inline LSTATUS -CicRegKey::QuerySz(LPCTSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) +CicRegKey::QuerySz(LPCTSTR pszValueName, LPTSTR pszValue, DWORD cchValueMax) { DWORD cchSaveMax = cchValueMax;

1 year, 6 months

[reactos] 01/01: [COMDLG32] Color Picker: Limit value by maxval (#6225)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f1df040ed5693fab747c… commit 7f1df040ed5693fab747c3e24740f68384e1d8d6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 21:50:41 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 21:50:41 2023 +0900 [COMDLG32] Color Picker: Limit value by maxval (#6225) Set maximum value to value if value was beyond maximum value. CORE-19402 --- dll/win32/comdlg32/colordlg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/comdlg32/colordlg.c b/dll/win32/comdlg32/colordlg.c index 517cb4ea627..1acf3524666 100644 --- a/dll/win32/comdlg32/colordlg.c +++ b/dll/win32/comdlg32/colordlg.c @@ -421,6 +421,9 @@ static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) value = atoi(buffer); if (value > maxval) /* build a new string */ { +#ifdef __REACTOS__ + value = maxval; +#endif sprintf(buffer, "%d", maxval); result = 2; }

1 year, 6 months

[reactos] 01/01: [COMCTL32] Property Sheet: Use PROPSHEET_IsDialogMessage in message loop (#6226)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e5fde7ebb40532cbe9b8… commit 6e5fde7ebb40532cbe9b81dcd3cee6a738969f65 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 21:49:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 21:49:04 2023 +0900 [COMCTL32] Property Sheet: Use PROPSHEET_IsDialogMessage in message loop (#6226) Fix Ctrl+Tab and Shift+Ctrl+Tab key combination action in property sheet. JIRA issue: CORE-17941 Use PROPSHEET_IsDialogMessage in the message loop of PropertySheetA/W function, instead of IsDialogMessage. --- dll/win32/comctl32/propsheet.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c index e58fd467a3d..fa348c249f5 100644 --- a/dll/win32/comctl32/propsheet.c +++ b/dll/win32/comctl32/propsheet.c @@ -2787,6 +2787,10 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) GlobalFree(psInfo); } +#ifdef __REACTOS__ +static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg); +#endif + static INT do_loop(const PropSheetInfo *psInfo) { MSG msg; @@ -2799,7 +2803,11 @@ static INT do_loop(const PropSheetInfo *psInfo) if(ret == -1) break; +#ifdef __REACTOS__ + if (!PROPSHEET_IsDialogMessage(hwnd, &msg)) +#else if(!IsDialogMessageW(hwnd, &msg)) +#endif { TranslateMessage(&msg); DispatchMessageW(&msg);

1 year, 6 months

[reactos] 01/01: [COMDLG32] Fix IDC_TOOLBARPLACES size (#6228)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=449a08a6a8d5c70527d2c… commit 449a08a6a8d5c70527d2cd7d07db3ae39ee642eb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 21:46:35 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 21:46:35 2023 +0900 [COMDLG32] Fix IDC_TOOLBARPLACES size (#6228) Based on KRosUser's comdlg_resbug.patch. Change IDC_TOOLBARPLACES control extent of NEWFILEOPENV2ORD resource dialog. CORE-16925 --- dll/win32/comdlg32/lang/cdlg_Bg.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ca.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Cs.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Da.rc | 2 +- dll/win32/comdlg32/lang/cdlg_De.rc | 2 +- dll/win32/comdlg32/lang/cdlg_El.rc | 2 +- dll/win32/comdlg32/lang/cdlg_En.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Eo.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Es.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Et.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Fi.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Fr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_He.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Hi.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Hu.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Id.rc | 2 +- dll/win32/comdlg32/lang/cdlg_It.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ja.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ko.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Lt.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Nl.rc | 2 +- dll/win32/comdlg32/lang/cdlg_No.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Pl.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Pt.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ro.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ru.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Si.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sk.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sq.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Sv.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Th.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Tr.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Uk.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Zh.rc | 4 ++-- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Bg.rc b/dll/win32/comdlg32/lang/cdlg_Bg.rc index 963a2e46bc0..16ad5b98878 100644 --- a/dll/win32/comdlg32/lang/cdlg_Bg.rc +++ b/dll/win32/comdlg32/lang/cdlg_Bg.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Ca.rc b/dll/win32/comdlg32/lang/cdlg_Ca.rc index 420996140d4..8a9c9f07595 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ca.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ca.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Cs.rc b/dll/win32/comdlg32/lang/cdlg_Cs.rc index c2f467d0cb5..d2af78bd5de 100644 --- a/dll/win32/comdlg32/lang/cdlg_Cs.rc +++ b/dll/win32/comdlg32/lang/cdlg_Cs.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Da.rc b/dll/win32/comdlg32/lang/cdlg_Da.rc index e99fce29b37..6d25889524b 100644 --- a/dll/win32/comdlg32/lang/cdlg_Da.rc +++ b/dll/win32/comdlg32/lang/cdlg_Da.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_De.rc b/dll/win32/comdlg32/lang/cdlg_De.rc index 6bfe181afc4..25c3ab0fc39 100644 --- a/dll/win32/comdlg32/lang/cdlg_De.rc +++ b/dll/win32/comdlg32/lang/cdlg_De.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_El.rc b/dll/win32/comdlg32/lang/cdlg_El.rc index 04852bc3838..77301d0f946 100644 --- a/dll/win32/comdlg32/lang/cdlg_El.rc +++ b/dll/win32/comdlg32/lang/cdlg_El.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_En.rc b/dll/win32/comdlg32/lang/cdlg_En.rc index 901c227aa0b..e0fbad88c09 100644 --- a/dll/win32/comdlg32/lang/cdlg_En.rc +++ b/dll/win32/comdlg32/lang/cdlg_En.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Eo.rc b/dll/win32/comdlg32/lang/cdlg_Eo.rc index 8442edae49c..10f42bc3def 100644 --- a/dll/win32/comdlg32/lang/cdlg_Eo.rc +++ b/dll/win32/comdlg32/lang/cdlg_Eo.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Es.rc b/dll/win32/comdlg32/lang/cdlg_Es.rc index ed91c2de0ef..e9f4c6dabfd 100644 --- a/dll/win32/comdlg32/lang/cdlg_Es.rc +++ b/dll/win32/comdlg32/lang/cdlg_Es.rc @@ -487,7 +487,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nombre de archivo:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Et.rc b/dll/win32/comdlg32/lang/cdlg_Et.rc index e71c847d100..a937d200232 100644 --- a/dll/win32/comdlg32/lang/cdlg_Et.rc +++ b/dll/win32/comdlg32/lang/cdlg_Et.rc @@ -482,7 +482,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Fi.rc b/dll/win32/comdlg32/lang/cdlg_Fi.rc index 3868df94723..da2e258a7c7 100644 --- a/dll/win32/comdlg32/lang/cdlg_Fi.rc +++ b/dll/win32/comdlg32/lang/cdlg_Fi.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Fr.rc b/dll/win32/comdlg32/lang/cdlg_Fr.rc index 5cdcba5cdd3..27e291cfe8e 100644 --- a/dll/win32/comdlg32/lang/cdlg_Fr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Fr.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nom du fichier :", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_He.rc b/dll/win32/comdlg32/lang/cdlg_He.rc index 1206f386644..a587f7d1302 100644 --- a/dll/win32/comdlg32/lang/cdlg_He.rc +++ b/dll/win32/comdlg32/lang/cdlg_He.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&שם הקובץ:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Hi.rc b/dll/win32/comdlg32/lang/cdlg_Hi.rc index e570bbcec91..891ee7f3f6c 100644 --- a/dll/win32/comdlg32/lang/cdlg_Hi.rc +++ b/dll/win32/comdlg32/lang/cdlg_Hi.rc @@ -467,7 +467,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "फ़ाइल का &नाम:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Hu.rc b/dll/win32/comdlg32/lang/cdlg_Hu.rc index e552e205660..ff2df2f7b4d 100644 --- a/dll/win32/comdlg32/lang/cdlg_Hu.rc +++ b/dll/win32/comdlg32/lang/cdlg_Hu.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "Fájl&név:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Id.rc b/dll/win32/comdlg32/lang/cdlg_Id.rc index e5de21f3aad..9ce8054197d 100644 --- a/dll/win32/comdlg32/lang/cdlg_Id.rc +++ b/dll/win32/comdlg32/lang/cdlg_Id.rc @@ -482,7 +482,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nama berkas:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_It.rc b/dll/win32/comdlg32/lang/cdlg_It.rc index aafde5ce33b..88fde82524e 100644 --- a/dll/win32/comdlg32/lang/cdlg_It.rc +++ b/dll/win32/comdlg32/lang/cdlg_It.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Ja.rc b/dll/win32/comdlg32/lang/cdlg_Ja.rc index e6728054a45..2edd500f428 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ja.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ja.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Ko.rc b/dll/win32/comdlg32/lang/cdlg_Ko.rc index eea8e56194a..2b474f48789 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ko.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ko.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Lt.rc b/dll/win32/comdlg32/lang/cdlg_Lt.rc index db04254f4ef..b713e2fab33 100644 --- a/dll/win32/comdlg32/lang/cdlg_Lt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Lt.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Nl.rc b/dll/win32/comdlg32/lang/cdlg_Nl.rc index d0332fc57d2..8b4809206cf 100644 --- a/dll/win32/comdlg32/lang/cdlg_Nl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Nl.rc @@ -480,7 +480,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_No.rc b/dll/win32/comdlg32/lang/cdlg_No.rc index 4ad155a6cf0..c543f7fc5e3 100644 --- a/dll/win32/comdlg32/lang/cdlg_No.rc +++ b/dll/win32/comdlg32/lang/cdlg_No.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Pl.rc b/dll/win32/comdlg32/lang/cdlg_Pl.rc index 66584d79e97..fb1091b4b32 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pl.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pl.rc @@ -468,7 +468,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&Szukaj w:", IDC_LOOKINSTATIC, 4, 6, 57, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 66, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 248, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 22, 58, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 66, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nazwa pliku:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL diff --git a/dll/win32/comdlg32/lang/cdlg_Pt.rc b/dll/win32/comdlg32/lang/cdlg_Pt.rc index 1dc022f9601..8f5cba17dce 100644 --- a/dll/win32/comdlg32/lang/cdlg_Pt.rc +++ b/dll/win32/comdlg32/lang/cdlg_Pt.rc @@ -455,7 +455,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Ver &em:", IDC_LOOKINSTATIC, 28, 6, 43, 8, SS_NOTIFY COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "&Nome do ficheiro:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY EDITTEXT IDC_FILENAME, 123, 180, 180, 12, ES_AUTOHSCROLL diff --git a/dll/win32/comdlg32/lang/cdlg_Ro.rc b/dll/win32/comdlg32/lang/cdlg_Ro.rc index 3a2b6dbb7c1..e636f3b62d4 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ro.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ro.rc @@ -484,7 +484,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "N&ume fișier:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Ru.rc b/dll/win32/comdlg32/lang/cdlg_Ru.rc index d1dcc1216a5..f5761dfaec7 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ru.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ru.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "Имя &файла:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Si.rc b/dll/win32/comdlg32/lang/cdlg_Si.rc index cae5221c224..0a2d7193c06 100644 --- a/dll/win32/comdlg32/lang/cdlg_Si.rc +++ b/dll/win32/comdlg32/lang/cdlg_Si.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Sk.rc b/dll/win32/comdlg32/lang/cdlg_Sk.rc index 01cc3b96f12..f7f0d13b287 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sk.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Sq.rc b/dll/win32/comdlg32/lang/cdlg_Sq.rc index e319ad191e6..46d2a67924f 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sq.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sq.rc @@ -485,7 +485,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Sr.rc b/dll/win32/comdlg32/lang/cdlg_Sr.rc index cb49ac15851..a1bcf4c6200 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sr.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Sv.rc b/dll/win32/comdlg32/lang/cdlg_Sv.rc index 8cedb2a0e9e..d3f11956a78 100644 --- a/dll/win32/comdlg32/lang/cdlg_Sv.rc +++ b/dll/win32/comdlg32/lang/cdlg_Sv.rc @@ -480,7 +480,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Th.rc b/dll/win32/comdlg32/lang/cdlg_Th.rc index 5e84dd2cb37..a38e73eb5a9 100644 --- a/dll/win32/comdlg32/lang/cdlg_Th.rc +++ b/dll/win32/comdlg32/lang/cdlg_Th.rc @@ -480,7 +480,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "File &name:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Tr.rc b/dll/win32/comdlg32/lang/cdlg_Tr.rc index fe1962bd992..7819d2a1767 100644 --- a/dll/win32/comdlg32/lang/cdlg_Tr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Tr.rc @@ -480,7 +480,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "Dosya &adı:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Uk.rc b/dll/win32/comdlg32/lang/cdlg_Uk.rc index fe4567e3502..f462d7e0185 100644 --- a/dll/win32/comdlg32/lang/cdlg_Uk.rc +++ b/dll/win32/comdlg32/lang/cdlg_Uk.rc @@ -481,7 +481,7 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "Ім'я &файлу:", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY diff --git a/dll/win32/comdlg32/lang/cdlg_Zh.rc b/dll/win32/comdlg32/lang/cdlg_Zh.rc index e9c1f9b597c..b859934b5d6 100644 --- a/dll/win32/comdlg32/lang/cdlg_Zh.rc +++ b/dll/win32/comdlg32/lang/cdlg_Zh.rc @@ -485,7 +485,7 @@ FONT 9, "宋体" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "文件名(&N):", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY @@ -987,7 +987,7 @@ FONT 9, "新細明體" COMBOBOX IDC_LOOKIN, 64, 3, 150, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 209, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 55, 208 + CONTROL "", IDC_TOOLBARPLACES, "ToolbarWindow32", 0x800 | CCS_NORESIZE | CCS_TOP | CCS_NOPARENTALIGN | CCS_NODIVIDER, 4, 20, 56, 192 LISTBOX IDC_SHELLSTATIC, 64, 20, 300, 155, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE LTEXT "檔案名稱(&N)：", IDC_FILENAMESTATIC, 65, 182, 56, 16, SS_NOTIFY

1 year, 6 months

[reactos] 01/01: [MSCTF][SDK] Implement TF_IsCtfmonRunning (#6233)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07a22af58bc1c3a0dd1a0… commit 07a22af58bc1c3a0dd1a01149c179141b6d524d9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 16:17:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 16:17:06 2023 +0900 [MSCTF][SDK] Implement TF_IsCtfmonRunning (#6233) - Add many global variables. - Add GetUserSIDString, InitUserSidString, InitUniqueString, and GetDesktopUniqueName helper functions. - Implement TF_IsCtfmonRunning function. - Fix CicFileMapping class in <cicero/cicfmap.h>. - Modify msctf.spec. - Half-implement ProcessAttach and ProcessDetach functions. CORE-19361 --- dll/win32/msctf/msctf.spec | 2 +- dll/win32/msctf/utils.cpp | 289 +++++++++++++++++++++++++++++++++++ sdk/include/reactos/cicero/cicfmap.h | 16 +- 3 files changed, 298 insertions(+), 9 deletions(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 7f90b05c2b2..569f8701e8b 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -29,7 +29,7 @@ @ stdcall -stub TF_UninitSystem() @ stdcall -stub TF_InvalidAssemblyListCache() @ stdcall TF_InvalidAssemblyListCacheIfExist() -@ stub TF_IsCtfmonRunning +@ stdcall TF_IsCtfmonRunning() @ stub TF_IsInMarshaling @ stub TF_MlngInfoCount @ stdcall TF_RunInputCPL() diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 79371ed1e2f..4066714f89e 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -14,6 +14,7 @@ #define _EXTYPES_H #include <windows.h> +#include <sddl.h> #include <imm.h> #include <ddk/immdev.h> #include <cguid.h> @@ -24,12 +25,143 @@ #include <strsafe.h> #include <cicero/cicreg.h> +#include <cicero/cicmutex.h> +#include <cicero/cicfmap.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msctf); +BOOL gf_CRT_INIT = FALSE; +BOOL g_fDllProcessDetached = FALSE; +CRITICAL_SECTION g_cs; +CRITICAL_SECTION g_csInDllMain; +CRITICAL_SECTION g_csDelayLoad; +HINSTANCE g_hInst = NULL; +BOOL g_bOnWow64 = FALSE; +UINT g_uACP = CP_ACP; // Active Code Page DWORD g_dwOSInfo = 0; // See cicGetOSInfo +HKL g_hklDefault = NULL; +DWORD g_dwTLSIndex = (DWORD)-1; +BOOL gfSharedMemory = FALSE; +LONG g_cRefDll = -1; + +// Messages +UINT g_msgPrivate = 0; +UINT g_msgSetFocus = 0; +UINT g_msgThreadTerminate = 0; +UINT g_msgThreadItemChange = 0; +UINT g_msgLBarModal = 0; +UINT g_msgRpcSendReceive = 0; +UINT g_msgThreadMarshal = 0; +UINT g_msgCheckThreadInputIdel = 0; +UINT g_msgStubCleanUp = 0; +UINT g_msgShowFloating = 0; +UINT g_msgLBUpdate = 0; +UINT g_msgNuiMgrDirtyUpdate = 0; + +// Unique names +BOOL g_fUserSidString = FALSE; +TCHAR g_szUserSidString[MAX_PATH] = { 0 }; +TCHAR g_szUserUnique[MAX_PATH] = { 0 }; +TCHAR g_szAsmListCache[MAX_PATH] = { 0 }; +TCHAR g_szTimListCache[MAX_PATH] = { 0 }; +TCHAR g_szLayoutsCache[MAX_PATH] = { 0 }; + +// Mutexes +CicMutex g_mutexLBES; +CicMutex g_mutexCompart; +CicMutex g_mutexAsm; +CicMutex g_mutexLayouts; +CicMutex g_mutexTMD; + +// File mapping +CicFileMappingStatic g_SharedMemory; + +/** + * @implemented + */ +LPTSTR GetUserSIDString(void) +{ + HANDLE hToken = NULL; + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken); + if (!hToken) + return NULL; + + DWORD dwLengthNeeded = 0; + GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLengthNeeded); + PTOKEN_USER pTokenUser = (PTOKEN_USER)cicMemAllocClear(dwLengthNeeded); + if (!pTokenUser) + { + CloseHandle(hToken); + return NULL; + } + + LPTSTR StringSid = NULL; + if (!GetTokenInformation(hToken, TokenUser, pTokenUser, dwLengthNeeded, &dwLengthNeeded) || + !ConvertSidToStringSid(pTokenUser->User.Sid, &StringSid)) + { + if (StringSid) + { + LocalFree(StringSid); + StringSid = NULL; + } + } + + cicMemFree(pTokenUser); + CloseHandle(hToken); + return StringSid; +} + +/** + * @implemented + */ +BOOL InitUserSidString(void) +{ + if (g_fUserSidString) + return TRUE; + + LPTSTR pszUserSID = GetUserSIDString(); + if (!pszUserSID) + return FALSE; + + StringCchCopy(g_szUserSidString, _countof(g_szUserSidString), pszUserSID); + g_fUserSidString = TRUE; + LocalFree(pszUserSID); + return TRUE; +} + +/** + * @implemented + */ +BOOL InitUniqueString(void) +{ + g_szUserUnique[0] = TEXT('\0'); + + DWORD dwThreadId = GetCurrentThreadId(); + HDESK hDesk = GetThreadDesktop(dwThreadId); + + DWORD nLengthNeeded; + TCHAR szName[MAX_PATH]; + if (hDesk && GetUserObjectInformation(hDesk, UOI_NAME, szName, _countof(szName), &nLengthNeeded)) + StringCchCat(g_szUserUnique, _countof(g_szUserUnique), szName); + + if (!InitUserSidString()) + return FALSE; + + StringCchCat(g_szUserUnique, _countof(g_szUserUnique), g_szUserSidString); + return TRUE; +} + +void +GetDesktopUniqueName( + _In_ LPCTSTR pszName, + _Out_ LPTSTR pszBuff, + _In_ UINT cchBuff) +{ + StringCchCopy(pszBuff, cchBuff, pszName); + StringCchCat(pszBuff, cchBuff, g_szUserUnique); +} BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) { @@ -193,3 +325,160 @@ TF_RunInputCPL(VOID) return S_OK; } + +/*********************************************************************** + * TF_IsCtfmonRunning (MSCTF.@) + * + * @implemented + */ +EXTERN_C BOOL WINAPI +TF_IsCtfmonRunning(VOID) +{ + TCHAR szName[MAX_PATH]; + GetDesktopUniqueName(TEXT("CtfmonInstMutex"), szName, _countof(szName)); + + HANDLE hMutex = ::OpenMutex(MUTEX_ALL_ACCESS, FALSE, szName); + if (!hMutex) + return FALSE; + + ::CloseHandle(hMutex); + return TRUE; +} + +/** + * @unimplemented + */ +VOID InitLangChangeHotKey(VOID) +{ + //FIXME +} + +/** + * @unimplemented + */ +VOID CheckAnchorStores(VOID) +{ + //FIXME +} + +/** + * @unimplemented + */ +BOOL ProcessAttach(HINSTANCE hinstDLL) // FIXME: Call me from DllMain +{ + gf_CRT_INIT = TRUE; + + ::InitializeCriticalSectionAndSpinCount(&g_cs, 0); + ::InitializeCriticalSectionAndSpinCount(&g_csInDllMain, 0); + ::InitializeCriticalSectionAndSpinCount(&g_csDelayLoad, 0); + + g_bOnWow64 = cicIsWow64(); + g_hInst = hinstDLL; + g_hklDefault = ::GetKeyboardLayout(0); + g_dwTLSIndex = ::TlsAlloc(); + if (g_dwTLSIndex == (DWORD)-1) + return FALSE; + + g_msgPrivate = ::RegisterWindowMessageA("MSUIM.Msg.Private"); + g_msgSetFocus = ::RegisterWindowMessageA("MSUIM.Msg.SetFocus"); + g_msgThreadTerminate = ::RegisterWindowMessageA("MSUIM.Msg.ThreadTerminate"); + g_msgThreadItemChange = ::RegisterWindowMessageA("MSUIM.Msg.ThreadItemChange"); + g_msgLBarModal = ::RegisterWindowMessageA("MSUIM.Msg.LangBarModal"); + g_msgRpcSendReceive = ::RegisterWindowMessageA("MSUIM.Msg.RpcSendReceive"); + g_msgThreadMarshal = ::RegisterWindowMessageA("MSUIM.Msg.ThreadMarshal"); + g_msgCheckThreadInputIdel = ::RegisterWindowMessageA("MSUIM.Msg.CheckThreadInputIdel"); + g_msgStubCleanUp = ::RegisterWindowMessageA("MSUIM.Msg.StubCleanUp"); + g_msgShowFloating = ::RegisterWindowMessageA("MSUIM.Msg.ShowFloating"); + g_msgLBUpdate = ::RegisterWindowMessageA("MSUIM.Msg.LBUpdate"); + g_msgNuiMgrDirtyUpdate = ::RegisterWindowMessageA("MSUIM.Msg.MuiMgrDirtyUpdate"); + if (!g_msgPrivate || + !g_msgSetFocus || + !g_msgThreadTerminate || + !g_msgThreadItemChange || + !g_msgLBarModal || + !g_msgRpcSendReceive || + !g_msgThreadMarshal || + !g_msgCheckThreadInputIdel || + !g_msgStubCleanUp || + !g_msgShowFloating || + !g_msgLBUpdate || + !g_msgNuiMgrDirtyUpdate) + { + return FALSE; + } + + cicGetOSInfo(&g_uACP, &g_dwOSInfo); + InitUniqueString(); + + //FIXME + + gfSharedMemory = TRUE; + + //FIXME + + GetDesktopUniqueName(TEXT("CTF.AsmListCache.FMP"), g_szAsmListCache, _countof(g_szAsmListCache)); + GetDesktopUniqueName(TEXT("CTF.TimListCache.FMP"), g_szTimListCache, _countof(g_szTimListCache)); + GetDesktopUniqueName(TEXT("CTF.LayoutsCache.FMP"), g_szLayoutsCache, _countof(g_szLayoutsCache)); + + //FIXME + + InitLangChangeHotKey(); + + //FIXME + + CheckAnchorStores(); + + return TRUE; +} + +/** + * @unimplemented + */ +VOID ProcessDetach(HINSTANCE hinstDLL) // FIXME: Call me from DllMain +{ + if (!gf_CRT_INIT) + { + g_fDllProcessDetached = TRUE; + return; + } + + if (gfSharedMemory) + { + if (g_cRefDll != -1 ) + TFUninitLib(); + //FIXME + } + //FIXME + + //TF_UninitThreadSystem(); + + //FIXME + + if (g_dwTLSIndex != (DWORD)-1) + { + ::TlsFree(g_dwTLSIndex); + g_dwTLSIndex = (DWORD)-1; + } + + //FIXME + + if (gfSharedMemory) + { + g_mutexLBES.Uninit(); + g_mutexCompart.Uninit(); + g_mutexAsm.Uninit(); + //FIXME + g_mutexLayouts.Uninit(); + g_mutexTMD.Uninit(); + //FIXME + g_SharedMemory.Close(); + } + + g_SharedMemory.Finalize(); + + ::DeleteCriticalSection(&g_cs); + ::DeleteCriticalSection(&g_csInDllMain); + ::DeleteCriticalSection(&g_csDelayLoad); + + g_fDllProcessDetached = TRUE; +} diff --git a/sdk/include/reactos/cicero/cicfmap.h b/sdk/include/reactos/cicero/cicfmap.h index 8e06fc77017..3c711fc1e75 100644 --- a/sdk/include/reactos/cicero/cicfmap.h +++ b/sdk/include/reactos/cicero/cicfmap.h @@ -40,7 +40,7 @@ public: void Finalize(); }; -class CicFileMapping : public CCicFileMappingStatic +class CicFileMapping : public CicFileMappingStatic { public: CicFileMapping(LPCTSTR pszName, CicMutex *pMutex); @@ -51,13 +51,13 @@ public: inline CicFileMapping::CicFileMapping(LPCTSTR pszName, CicMutex *pMutex) - : m_pszName(NULL) - , m_pView(NULL) - , m_hMapping(NULL) - , m_bCreated(FALSE) - , m_bHasMutex(FALSE) - , m_pMutex(NULL) { + m_pszName = NULL; + m_pView = NULL; + m_hMapping = NULL; + m_bCreated = FALSE; + m_bHasMutex = FALSE; + m_pMutex = NULL; Init(pszName, pMutex); } @@ -148,7 +148,7 @@ inline void CicFileMappingStatic::Leave() m_pMutex->Leave(); } -inline BOOL CCicFileMappingStatic::Flush(SIZE_T dwNumberOfBytesToFlush) +inline BOOL CicFileMappingStatic::Flush(SIZE_T dwNumberOfBytesToFlush) { if (!m_pView) return FALSE;

1 year, 6 months

[reactos] 01/01: [CTFMON] Unlink RegNotifyChangeKeyValue (#6232)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4293704ecb004a673d591… commit 4293704ecb004a673d5910322d0d132165940251 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 15:21:39 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 15:21:39 2023 +0900 [CTFMON] Unlink RegNotifyChangeKeyValue (#6232) Dynamic load advapi32!RegNotifyChangeKeyValue function. Output log if RegNotifyChangeKeyValue failed. CORE-19362 --- base/applications/ctfmon/CRegWatcher.cpp | 39 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp index 1905956cb91..264d4f22d65 100644 --- a/base/applications/ctfmon/CRegWatcher.cpp +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -83,6 +83,31 @@ CRegWatcher::Uninit() } } +// advapi32!RegNotifyChangeKeyValue +typedef LONG (WINAPI *FN_RegNotifyChangeKeyValue)(HKEY, BOOL, DWORD, HANDLE, BOOL); + +LONG WINAPI +DelayedRegNotifyChangeKeyValue( + HKEY hKey, + BOOL bWatchSubtree, + DWORD dwNotifyFilter, + HANDLE hEvent, + BOOL fAsynchronous) +{ + static FN_RegNotifyChangeKeyValue s_fnRegNotifyChangeKeyValue = NULL; + + if (!s_fnRegNotifyChangeKeyValue) + { + HINSTANCE hAdvApi32 = cicGetSystemModuleHandle(TEXT("advapi32.dll"), FALSE); + s_fnRegNotifyChangeKeyValue = + (FN_RegNotifyChangeKeyValue)GetProcAddress(hAdvApi32, "RegNotifyChangeKeyValue"); + if (!s_fnRegNotifyChangeKeyValue) + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return s_fnRegNotifyChangeKeyValue(hKey, bWatchSubtree, dwNotifyFilter, hEvent, fAsynchronous); +} + BOOL CRegWatcher::InitEvent( _In_ SIZE_T iEvent, @@ -112,11 +137,15 @@ CRegWatcher::InitEvent( } // Start registry watching - error = ::RegNotifyChangeKeyValue(entry.hKey, - TRUE, - REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME, - s_ahWatchEvents[iEvent], - TRUE); + error = DelayedRegNotifyChangeKeyValue(entry.hKey, + TRUE, + REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_NAME, + s_ahWatchEvents[iEvent], + TRUE); +#ifndef NDEBUG + if (error != ERROR_SUCCESS) + OutputDebugStringA("RegNotifyChangeKeyValue failed\n"); +#endif return error == ERROR_SUCCESS; }

1 year, 6 months

[reactos] 01/01: [MSCTF] Implement TF_RunInputCPL (#6231)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69a925cae88e520f03535… commit 69a925cae88e520f03535b25cff47937a647a443 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 13:39:56 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 13:39:56 2023 +0900 [MSCTF] Implement TF_RunInputCPL (#6231) - Add FullPathExec, and RunCPLSetting helper functions. - Implement TF_RunInputCPL function by using them. - Modify msctf.spec. CORE-19361 --- dll/win32/msctf/msctf.spec | 2 +- dll/win32/msctf/utils.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dll/win32/msctf/msctf.spec b/dll/win32/msctf/msctf.spec index 186e1cadac2..7f90b05c2b2 100644 --- a/dll/win32/msctf/msctf.spec +++ b/dll/win32/msctf/msctf.spec @@ -32,7 +32,7 @@ @ stub TF_IsCtfmonRunning @ stub TF_IsInMarshaling @ stub TF_MlngInfoCount -@ stub TF_RunInputCPL +@ stdcall TF_RunInputCPL() @ stdcall -stub TF_PostAllThreadMsg(long long) @ stdcall TF_RegisterLangBarAddIn(ptr wstr long) @ stdcall TF_UnregisterLangBarAddIn(ptr long) diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 944d3d1c063..79371ed1e2f 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); +DWORD g_dwOSInfo = 0; // See cicGetOSInfo + BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) { pszGUID[0] = ANSI_NULL; @@ -42,10 +44,53 @@ BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) #ifdef UNICODE #define StringFromGUID2T StringFromGUID2 + #define debugstr_t debugstr_w #else #define StringFromGUID2T StringFromGUID2A + #define debugstr_t debugstr_a #endif +BOOL FullPathExec(LPCTSTR pszExeFile, LPCTSTR pszCmdLine, UINT nCmdShow, BOOL bSysWinDir) +{ + STARTUPINFO si; + PROCESS_INFORMATION pi; + CicSystemModulePath ModPath; + TCHAR szCommandLine[2 * MAX_PATH]; + + ModPath.Init(pszExeFile, bSysWinDir); + if (!ModPath.m_cchPath) + { + ERR("%s\n", debugstr_t(pszExeFile)); + return FALSE; + } + + StringCchCopy(szCommandLine, _countof(szCommandLine), pszCmdLine); + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.wShowWindow = nCmdShow; + si.dwFlags = STARTF_USESHOWWINDOW; + if (!CreateProcess(ModPath.m_szPath, szCommandLine, NULL, NULL, FALSE, + NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) + { + ERR("%s, %s\n", debugstr_t(ModPath.m_szPath), debugstr_t(szCommandLine)); + return FALSE; + } + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return TRUE; +} + +static inline BOOL +RunCPLSetting(LPCTSTR pszCmdLine) +{ + if (!pszCmdLine) + return FALSE; + + return FullPathExec(TEXT("rundll32.exe"), pszCmdLine, SW_SHOWMINNOACTIVE, FALSE); +} + /*********************************************************************** * TF_RegisterLangBarAddIn (MSCTF.@) * @@ -118,3 +163,33 @@ TF_UnregisterLangBarAddIn( return hr; } + +/*********************************************************************** + * TF_RunInputCPL (MSCTF.@) + * + * @implemented + */ +EXTERN_C HRESULT WINAPI +TF_RunInputCPL(VOID) +{ + CicSystemModulePath ModPath; + TCHAR szCmdLine[2 * MAX_PATH]; + + TRACE("()\n"); + + // NOTE: We don't support Win95/98/Me + if (g_dwOSInfo & CIC_OSINFO_XPPLUS) + ModPath.Init(TEXT("input.dll"), FALSE); + else + ModPath.Init(TEXT("input.cpl"), FALSE); + + if (!ModPath.m_cchPath) + return E_FAIL; + + StringCchPrintf(szCmdLine, _countof(szCmdLine), + TEXT("rundll32.exe shell32.dll,Control_RunDLL %s"), ModPath.m_szPath); + if (!RunCPLSetting(szCmdLine)) + return E_FAIL; + + return S_OK; +}

1 year, 6 months

[reactos] 01/01: [CTFMON][MSCTFIME][MSCTF][MSUTB][SDK] Cicero is ANSI, not Unicode (#6230)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfa3e554d46975a193ff5… commit bfa3e554d46975a193ff5a3ca22f67bfe15e8d54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 26 12:07:01 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 26 12:07:01 2023 +0900 [CTFMON][MSCTFIME][MSCTF][MSUTB][SDK] Cicero is ANSI, not Unicode (#6230) Cicero interface is not Unicode (W) but ANSI (A). - ctfmon.exe is ANSI, not Unicode. - msutb.dll is ANSI, not Unicode. - Apply generic text mapping to the cicero headers. - Include <tchar.h> to use generic text mapping. CORE-19361, CORE-19362, CORE-19363 --- base/applications/ctfmon/CLoaderWnd.cpp | 14 +++---- base/applications/ctfmon/CMakeLists.txt | 2 +- base/applications/ctfmon/CRegWatcher.cpp | 57 +++++++++++++------------- base/applications/ctfmon/CRegWatcher.h | 2 +- base/applications/ctfmon/ctfmon.cpp | 70 +++++++++++++++++++------------- base/applications/ctfmon/precomp.h | 1 + dll/ime/msctfime/msctfime.cpp | 21 +++++----- dll/ime/msctfime/msctfime.h | 1 + dll/win32/msctf/utils.cpp | 38 ++++++++++++----- dll/win32/msutb/CMakeLists.txt | 2 +- sdk/include/reactos/cicero/cicbase.h | 38 ++++++++--------- sdk/include/reactos/cicero/cicevent.h | 10 ++--- sdk/include/reactos/cicero/cicfmap.h | 24 +++++------ sdk/include/reactos/cicero/cicmutex.h | 4 +- sdk/include/reactos/cicero/cicreg.h | 69 ++++++++++++++++--------------- 15 files changed, 197 insertions(+), 156 deletions(-) diff --git a/base/applications/ctfmon/CLoaderWnd.cpp b/base/applications/ctfmon/CLoaderWnd.cpp index 45072bafe1b..b52de13d1b3 100644 --- a/base/applications/ctfmon/CLoaderWnd.cpp +++ b/base/applications/ctfmon/CLoaderWnd.cpp @@ -18,15 +18,15 @@ BOOL CLoaderWnd::Init() return TRUE; // Already registered // Register a window class - WNDCLASSEXW wc; + WNDCLASSEX wc; ZeroMemory(&wc, sizeof(wc)); wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.hInstance = g_hInst; - wc.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.lpfnWndProc = WindowProc; - wc.lpszClassName = L"CiCTipBarClass"; - if (!::RegisterClassExW(&wc)) + wc.lpszClassName = TEXT("CiCTipBarClass"); + if (!::RegisterClassEx(&wc)) return FALSE; s_bWndClassRegistered = TRUE; // Remember @@ -35,8 +35,8 @@ BOOL CLoaderWnd::Init() HWND CLoaderWnd::CreateWnd() { - m_hWnd = ::CreateWindowExW(0, L"CiCTipBarClass", NULL, WS_DISABLED, - 0, 0, 0, 0, NULL, NULL, g_hInst, NULL); + m_hWnd = ::CreateWindowEx(0, TEXT("CiCTipBarClass"), NULL, WS_DISABLED, + 0, 0, 0, 0, NULL, NULL, g_hInst, NULL); return m_hWnd; } @@ -93,7 +93,7 @@ CLoaderWnd::WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) break; default: - return DefWindowProcW(hwnd, uMsg, wParam, lParam); + return DefWindowProc(hwnd, uMsg, wParam, lParam); } return 0; diff --git a/base/applications/ctfmon/CMakeLists.txt b/base/applications/ctfmon/CMakeLists.txt index 2bc6d6a50f2..8ca1d7b5311 100644 --- a/base/applications/ctfmon/CMakeLists.txt +++ b/base/applications/ctfmon/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND SOURCE add_rc_deps(ctfmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/ctfmon.ico) add_executable(ctfmon ${SOURCE} ctfmon.rc) -set_module_type(ctfmon win32gui UNICODE) +set_module_type(ctfmon win32gui) add_dependencies(ctfmon msctf msutb) target_link_libraries(ctfmon uuid) add_importlibs(ctfmon msctf msutb advapi32 shell32 user32 msvcrt kernel32) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp index d7271820f68..1905956cb91 100644 --- a/base/applications/ctfmon/CRegWatcher.cpp +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -14,18 +14,18 @@ HANDLE CRegWatcher::s_ahWatchEvents[WATCHENTRY_MAX] = { NULL }; // The registry entries to watch WATCHENTRY CRegWatcher::s_WatchEntries[WATCHENTRY_MAX] = { - { HKEY_CURRENT_USER, L"Keyboard Layout\\Toggle" }, // WI_TOGGLE - { HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\CTF\\TIP" }, // WI_MACHINE_TIF - { HKEY_CURRENT_USER, L"Keyboard Layout\\Preload" }, // WI_PRELOAD - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run" }, // WI_RUN - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\TIP" }, // WI_USER_TIF - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Speech" }, // WI_USER_SPEECH - { HKEY_CURRENT_USER, L"Control Panel\\Appearance" }, // WI_APPEARANCE - { HKEY_CURRENT_USER, L"Control Panel\\Colors" }, // WI_COLORS - { HKEY_CURRENT_USER, L"Control Panel\\Desktop\\WindowMetrics" }, // WI_WINDOW_METRICS - { HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech" }, // WI_MACHINE_SPEECH - { HKEY_CURRENT_USER, L"Keyboard Layout" }, // WI_KEYBOARD_LAYOUT - { HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\Assemblies" }, // WI_ASSEMBLIES + { HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Toggle") }, // WI_TOGGLE + { HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\CTF\\TIP") }, // WI_MACHINE_TIF + { HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload") }, // WI_PRELOAD + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run") }, // WI_RUN + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\TIP") }, // WI_USER_TIF + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Speech") }, // WI_USER_SPEECH + { HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance") }, // WI_APPEARANCE + { HKEY_CURRENT_USER, TEXT("Control Panel\\Colors") }, // WI_COLORS + { HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics") }, // WI_WINDOW_METRICS + { HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Speech") }, // WI_MACHINE_SPEECH + { HKEY_CURRENT_USER, TEXT("Keyboard Layout") }, // WI_KEYBOARD_LAYOUT + { HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\Assemblies") }, // WI_ASSEMBLIES }; // The timer IDs: For delaying ignitions @@ -48,7 +48,7 @@ CRegWatcher::Init() // Create some nameless events and initialize them for (SIZE_T iEvent = 0; iEvent < _countof(s_ahWatchEvents); ++iEvent) { - s_ahWatchEvents[iEvent] = ::CreateEventW(NULL, TRUE, FALSE, NULL); + s_ahWatchEvents[iEvent] = ::CreateEvent(NULL, TRUE, FALSE, NULL); InitEvent(iEvent, FALSE); } @@ -102,11 +102,11 @@ CRegWatcher::InitEvent( // Open or create a registry key to watch registry key LSTATUS error; - error = ::RegOpenKeyExW(entry.hRootKey, entry.pszSubKey, 0, KEY_READ, &entry.hKey); + error = ::RegOpenKeyEx(entry.hRootKey, entry.pszSubKey, 0, KEY_READ, &entry.hKey); if (error != ERROR_SUCCESS) { - error = ::RegCreateKeyExW(entry.hRootKey, entry.pszSubKey, 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &entry.hKey, NULL); + error = ::RegCreateKeyEx(entry.hRootKey, entry.pszSubKey, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &entry.hKey, NULL); if (error != ERROR_SUCCESS) return FALSE; } @@ -128,17 +128,18 @@ CRegWatcher::UpdateSpTip() // Clear "ProfileInitialized" value HKEY hKey; - LSTATUS error = ::RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF\\Sapilayr", - 0, KEY_WRITE, &hKey); + LSTATUS error = ::RegOpenKeyEx(HKEY_CURRENT_USER, + TEXT("SOFTWARE\\Microsoft\\CTF\\Sapilayr"), + 0, KEY_WRITE, &hKey); if (error == ERROR_SUCCESS) { DWORD dwValue = 0, cbValue = sizeof(dwValue); - ::RegSetValueExW(hKey, L"ProfileInitialized", NULL, REG_DWORD, (LPBYTE)&dwValue, cbValue); + ::RegSetValueEx(hKey, TEXT("ProfileInitialized"), NULL, REG_DWORD, (LPBYTE)&dwValue, cbValue); ::RegCloseKey(hKey); } // Get %WINDIR%/IME/sptip.dll!TF_CreateLangProfileUtil function - HINSTANCE hSPTIP = cicLoadSystemLibrary(L"IME\\sptip.dll", TRUE); + HINSTANCE hSPTIP = cicLoadSystemLibrary(TEXT("IME\\sptip.dll"), TRUE); FN_TF_CreateLangProfileUtil fnTF_CreateLangProfileUtil = (FN_TF_CreateLangProfileUtil)::GetProcAddress(hSPTIP, "TF_CreateLangProfileUtil"); if (fnTF_CreateLangProfileUtil) @@ -168,17 +169,17 @@ CRegWatcher::KillInternat() WATCHENTRY& entry = s_WatchEntries[WI_RUN]; // Delete internat.exe from registry "Run" key - LSTATUS error = ::RegOpenKeyExW(entry.hRootKey, entry.pszSubKey, 0, KEY_ALL_ACCESS, &hKey); + LSTATUS error = ::RegOpenKeyEx(entry.hRootKey, entry.pszSubKey, 0, KEY_ALL_ACCESS, &hKey); if (error == ERROR_SUCCESS) { - ::RegDeleteValueW(hKey, L"internat.exe"); + ::RegDeleteValue(hKey, TEXT("internat.exe")); ::RegCloseKey(hKey); } // Kill the "Indicator" window (that internat.exe creates) - HWND hwndInternat = ::FindWindowW(L"Indicator", NULL); + HWND hwndInternat = ::FindWindow(TEXT("Indicator"), NULL); if (hwndInternat) - ::PostMessageW(hwndInternat, WM_CLOSE, 0, 0); + ::PostMessage(hwndInternat, WM_CLOSE, 0, 0); } // Post message 0x8002 to every "SapiTipWorkerClass" window. @@ -188,14 +189,14 @@ CRegWatcher::EnumWndProc( _In_ HWND hWnd, _In_ LPARAM lParam) { - WCHAR ClassName[MAX_PATH]; + TCHAR ClassName[MAX_PATH]; UNREFERENCED_PARAMETER(lParam); - if (::GetClassNameW(hWnd, ClassName, _countof(ClassName)) && - _wcsicmp(ClassName, L"SapiTipWorkerClass") == 0) + if (::GetClassName(hWnd, ClassName, _countof(ClassName)) && + _tcsicmp(ClassName, TEXT("SapiTipWorkerClass")) == 0) { - PostMessageW(hWnd, 0x8002, 0, 0); // FIXME: Magic number + PostMessage(hWnd, 0x8002, 0, 0); // FIXME: Magic number } return TRUE; diff --git a/base/applications/ctfmon/CRegWatcher.h b/base/applications/ctfmon/CRegWatcher.h index 1f75cb7fb4b..a74222cae8a 100644 --- a/base/applications/ctfmon/CRegWatcher.h +++ b/base/applications/ctfmon/CRegWatcher.h @@ -10,7 +10,7 @@ struct WATCHENTRY { HKEY hRootKey; - LPCWSTR pszSubKey; + LPCTSTR pszSubKey; HKEY hKey; }; diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/applications/ctfmon/ctfmon.cpp index 7756ee75097..5ea37a4eb20 100644 --- a/base/applications/ctfmon/ctfmon.cpp +++ b/base/applications/ctfmon/ctfmon.cpp @@ -13,6 +13,9 @@ typedef BOOL (WINAPI *FN_SetProcessShutdownParameters)(DWORD, DWORD); FN_SetProcessShutdownParameters g_fnSetProcessShutdownParameters = NULL; +// kernel32!GetSystemWow64DirectoryA +typedef UINT (WINAPI *FN_GetSystemWow64DirectoryA)(LPSTR, UINT); +FN_GetSystemWow64DirectoryA g_fnGetSystemWow64DirectoryA = NULL; // kernel32!GetSystemWow64DirectoryW typedef UINT (WINAPI *FN_GetSystemWow64DirectoryW)(LPWSTR, UINT); FN_GetSystemWow64DirectoryW g_fnGetSystemWow64DirectoryW = NULL; @@ -30,29 +33,29 @@ CLoaderWnd* g_pLoaderWnd = NULL; // Tipbar loader window static VOID ParseCommandLine( - _In_ LPCWSTR pszCmdLine) + _In_ LPCTSTR pszCmdLine) { g_fNoRunKey = g_fJustRunKey = FALSE; - for (LPCWSTR pch = pszCmdLine; *pch; ++pch) + for (LPCTSTR pch = pszCmdLine; *pch; ++pch) { // Skip space - while (*pch == L' ') + while (*pch == TEXT(' ')) ++pch; - if (*pch == UNICODE_NULL) + if (*pch == TEXT('\0')) return; - if ((*pch == L'-') || (*pch == L'/')) + if ((*pch == TEXT('-')) || (*pch == TEXT('/'))) { ++pch; switch (*pch) { - case L'N': case L'n': // Found "/N" option + case TEXT('N'): case TEXT('n'): // Found "/N" option g_fNoRunKey = TRUE; break; - case L'R': case L'r': // Found "/R" option + case TEXT('R'): case TEXT('r'): // Found "/R" option g_fJustRunKey = TRUE; break; @@ -74,18 +77,18 @@ WriteRegRun(VOID) // Open "Run" key HKEY hKey; - LSTATUS error = ::RegCreateKeyW(HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", - &hKey); + LSTATUS error = ::RegCreateKey(HKEY_CURRENT_USER, + TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Run"), + &hKey); if (error != ERROR_SUCCESS) return; // Write the module path CicSystemModulePath ModPath; - if (ModPath.Init(L"ctfmon.exe", FALSE)) + if (ModPath.Init(TEXT("ctfmon.exe"), FALSE)) { - DWORD cbData = (ModPath.m_cchPath + 1) * sizeof(WCHAR); - ::RegSetValueExW(hKey, L"ctfmon.exe", 0, REG_SZ, (BYTE*)ModPath.m_szPath, cbData); + DWORD cbData = (ModPath.m_cchPath + 1) * sizeof(TCHAR); + ::RegSetValueEx(hKey, TEXT("ctfmon.exe"), 0, REG_SZ, (BYTE*)ModPath.m_szPath, cbData); } ::RegCloseKey(hKey); @@ -134,7 +137,7 @@ SetGlobalCompartmentDWORD( static BOOL CheckX64System( - _In_ LPWSTR lpCmdLine) + _In_ LPTSTR lpCmdLine) { // Is the system x64? SYSTEM_INFO SystemInfo; @@ -146,23 +149,34 @@ CheckX64System( } // Get GetSystemWow64DirectoryW function - g_hKernel32 = cicGetSystemModuleHandle(L"kernel32.dll", FALSE); + g_hKernel32 = cicGetSystemModuleHandle(TEXT("kernel32.dll"), FALSE); +#ifdef UNICODE g_fnGetSystemWow64DirectoryW = (FN_GetSystemWow64DirectoryW)::GetProcAddress(g_hKernel32, "GetSystemWow64DirectoryW"); if (!g_fnGetSystemWow64DirectoryW) return FALSE; +#else + g_fnGetSystemWow64DirectoryA = + (FN_GetSystemWow64DirectoryA)::GetProcAddress(g_hKernel32, "GetSystemWow64DirectoryA"); + if (!g_fnGetSystemWow64DirectoryA) + return FALSE; +#endif // Build WoW64 ctfmon.exe pathname - WCHAR szPath[MAX_PATH]; + TCHAR szPath[MAX_PATH]; +#ifdef UNICODE UINT cchPath = g_fnGetSystemWow64DirectoryW(szPath, _countof(szPath)); - if (!cchPath && FAILED(StringCchCatW(szPath, _countof(szPath), L"\\ctfmon.exe"))) +#else + UINT cchPath = g_fnGetSystemWow64DirectoryA(szPath, _countof(szPath)); +#endif + if (!cchPath && FAILED(StringCchCat(szPath, _countof(szPath), TEXT("\\ctfmon.exe")))) return FALSE; // Create a WoW64 ctfmon.exe process PROCESS_INFORMATION pi; - STARTUPINFOW si = { sizeof(si) }; + STARTUPINFO si = { sizeof(si) }; si.wShowWindow = SW_SHOWMINNOACTIVE; - if (!::CreateProcessW(szPath, lpCmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + if (!::CreateProcess(szPath, lpCmdLine, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return FALSE; ::CloseHandle(pi.hThread); @@ -173,7 +187,7 @@ CheckX64System( static BOOL InitApp( _In_ HINSTANCE hInstance, - _In_ LPWSTR lpCmdLine) + _In_ LPTSTR lpCmdLine) { g_hInst = hInstance; // Save the instance handle @@ -194,7 +208,7 @@ InitApp( // Call SetProcessShutdownParameters if possible if (g_dwOsInfo & CIC_OSINFO_NT) { - g_hKernel32 = cicGetSystemModuleHandle(L"kernel32.dll", FALSE); + g_hKernel32 = cicGetSystemModuleHandle(TEXT("kernel32.dll"), FALSE); g_fnSetProcessShutdownParameters = (FN_SetProcessShutdownParameters) ::GetProcAddress(g_hKernel32, "SetProcessShutdownParameters"); @@ -257,16 +271,16 @@ DoMainLoop(VOID) if (g_bOnWow64) // Is the current process on WoW64? { // Just a simple message loop - while (::GetMessageW(&msg, NULL, 0, 0)) + while (::GetMessage(&msg, NULL, 0, 0)) { ::TranslateMessage(&msg); - ::DispatchMessageW(&msg); + ::DispatchMessage(&msg); } return (INT)msg.wParam; } // Open the existing event by the name - HANDLE hSwitchEvent = ::OpenEventW(SYNCHRONIZE, FALSE, L"WinSta0_DesktopSwitch"); + HANDLE hSwitchEvent = ::OpenEvent(SYNCHRONIZE, FALSE, TEXT("WinSta0_DesktopSwitch")); // The target events to watch HANDLE ahEvents[WATCHENTRY_MAX + 1]; @@ -285,13 +299,13 @@ DoMainLoop(VOID) if (dwWait == (WAIT_OBJECT_0 + _countof(ahEvents))) // Is input available? { // Do the events - while (::PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + while (::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { if (msg.message == WM_QUIT) goto Quit; ::TranslateMessage(&msg); - ::DispatchMessageW(&msg); + ::DispatchMessage(&msg); } } else if (dwWait == (WAIT_OBJECT_0 + WI_DESKTOP_SWITCH)) // Desktop switch? @@ -313,10 +327,10 @@ Quit: // The main function for Unicode Win32 EXTERN_C INT WINAPI -wWinMain( +_tWinMain( HINSTANCE hInstance, HINSTANCE hPrevInst, - LPWSTR lpCmdLine, + LPTSTR lpCmdLine, INT nCmdShow) { UNREFERENCED_PARAMETER(hPrevInst); diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h index 6e1282e2bfa..b6ca0bdcb4d 100644 --- a/base/applications/ctfmon/precomp.h +++ b/base/applications/ctfmon/precomp.h @@ -12,6 +12,7 @@ #include <shellapi.h> #include <shlwapi.h> #include <stdlib.h> +#include <tchar.h> #include <strsafe.h> #include <msctf.h> #include <ctfutb.h> diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 6aa33c76490..376416110a5 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -56,16 +56,17 @@ BOOL IsMsImeMessage(UINT uMsg) */ BOOL RegisterMSIMEMessage(VOID) { - WM_MSIME_SERVICE = RegisterWindowMessageW(L"MSIMEService"); - WM_MSIME_UIREADY = RegisterWindowMessageW(L"MSIMEUIReady"); - WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageW(L"MSIMEReconvertRequest"); - WM_MSIME_RECONVERT = RegisterWindowMessageW(L"MSIMEReconvert"); - WM_MSIME_DOCUMENTFEED = RegisterWindowMessageW(L"MSIMEDocumentFeed"); - WM_MSIME_QUERYPOSITION = RegisterWindowMessageW(L"MSIMEQueryPosition"); - WM_MSIME_MODEBIAS = RegisterWindowMessageW(L"MSIMEModeBias"); - WM_MSIME_SHOWIMEPAD = RegisterWindowMessageW(L"MSIMEShowImePad"); - WM_MSIME_MOUSE = RegisterWindowMessageW(L"MSIMEMouseOperation"); - WM_MSIME_KEYMAP = RegisterWindowMessageW(L"MSIMEKeyMap"); + // Using ANSI (A) version here can reduce binary size. + WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); + WM_MSIME_UIREADY = RegisterWindowMessageA("MSIMEUIReady"); + WM_MSIME_RECONVERTREQUEST = RegisterWindowMessageA("MSIMEReconvertRequest"); + WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); + WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); + WM_MSIME_MODEBIAS = RegisterWindowMessageA("MSIMEModeBias"); + WM_MSIME_SHOWIMEPAD = RegisterWindowMessageA("MSIMEShowImePad"); + WM_MSIME_MOUSE = RegisterWindowMessageA("MSIMEMouseOperation"); + WM_MSIME_KEYMAP = RegisterWindowMessageA("MSIMEKeyMap"); return (WM_MSIME_SERVICE && WM_MSIME_UIREADY && WM_MSIME_RECONVERTREQUEST && diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 5fce8fb5c42..a5273e11d2d 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -17,6 +17,7 @@ #include <imm.h> #include <ddk/immdev.h> #include <cguid.h> +#include <tchar.h> #include <msctf.h> #include <ctffunc.h> #include <shlwapi.h> diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 9d0d455f8ad..944d3d1c063 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -17,6 +17,7 @@ #include <imm.h> #include <ddk/immdev.h> #include <cguid.h> +#include <tchar.h> #include <msctf.h> #include <ctffunc.h> #include <shlwapi.h> @@ -28,6 +29,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); +BOOL StringFromGUID2A(REFGUID rguid, LPSTR pszGUID, INT cchGUID) +{ + pszGUID[0] = ANSI_NULL; + + WCHAR szWide[40]; + szWide[0] = UNICODE_NULL; + BOOL ret = StringFromGUID2(rguid, szWide, _countof(szWide)); + ::WideCharToMultiByte(CP_ACP, 0, szWide, -1, pszGUID, cchGUID, NULL, NULL); + return ret; +} + +#ifdef UNICODE + #define StringFromGUID2T StringFromGUID2 +#else + #define StringFromGUID2T StringFromGUID2A +#endif + /*********************************************************************** * TF_RegisterLangBarAddIn (MSCTF.@) * @@ -47,19 +65,19 @@ TF_RegisterLangBarAddIn( return E_INVALIDARG; } - WCHAR szBuff[MAX_PATH], szGUID[40]; - StringCchCopyW(szBuff, _countof(szBuff), L"SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\"); - StringFromGUID2(rguid, szGUID, _countof(szGUID)); - StringCchCatW(szBuff, _countof(szBuff), szGUID); + TCHAR szBuff[MAX_PATH], szGUID[40]; + StringCchCopy(szBuff, _countof(szBuff), TEXT("SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\")); + StringFromGUID2T(rguid, szGUID, _countof(szGUID)); + StringCchCat(szBuff, _countof(szBuff), szGUID); CicRegKey regKey; HKEY hBaseKey = ((dwFlags & 1) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER); LSTATUS error = regKey.Create(hBaseKey, szBuff); if (error == ERROR_SUCCESS) { - error = regKey.SetSz(L"FilePath", pszFilePath); + error = regKey.SetSzW(L"FilePath", pszFilePath); if (error == ERROR_SUCCESS) - error = regKey.SetDword(L"Enable", !!(dwFlags & 4)); + error = regKey.SetDword(TEXT("Enable"), !!(dwFlags & 4)); } return ((error == ERROR_SUCCESS) ? S_OK : E_FAIL); @@ -83,8 +101,8 @@ TF_UnregisterLangBarAddIn( return E_INVALIDARG; } - WCHAR szSubKey[MAX_PATH]; - StringCchCopyW(szSubKey, _countof(szSubKey), L"SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\"); + TCHAR szSubKey[MAX_PATH]; + StringCchCopy(szSubKey, _countof(szSubKey), TEXT("SOFTWARE\\Microsoft\\CTF\\LangBarAddIn\\")); CicRegKey regKey; HKEY hBaseKey = ((dwFlags & 1) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER); @@ -92,8 +110,8 @@ TF_UnregisterLangBarAddIn( HRESULT hr = E_FAIL; if (error == ERROR_SUCCESS) { - WCHAR szGUID[40]; - StringFromGUID2(rguid, szGUID, _countof(szGUID)); + TCHAR szGUID[40]; + StringFromGUID2T(rguid, szGUID, _countof(szGUID)); regKey.RecurseDeleteKey(szGUID); hr = S_OK; } diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index 84760f101e8..3e48eb33311 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(msutb MODULE ${SOURCE} msutb.rc ${CMAKE_CURRENT_BINARY_DIR}/msutb.def) -set_module_type(msutb win32dll UNICODE) +set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 28f5f96543f..14958780ba3 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -71,9 +71,9 @@ cicGetOSInfo(LPUINT puACP, LPDWORD pdwOSInfo) *pdwOSInfo = 0; /* Check OS version info */ - OSVERSIONINFOW VerInfo; + OSVERSIONINFO VerInfo; VerInfo.dwOSVersionInfoSize = sizeof(VerInfo); - GetVersionExW(&VerInfo); + GetVersionEx(&VerInfo); if (VerInfo.dwPlatformId == DLLVER_PLATFORM_NT) { *pdwOSInfo |= CIC_OSINFO_NT; @@ -113,7 +113,7 @@ cicGetOSInfo(LPUINT puACP, LPDWORD pdwOSInfo) struct CicSystemModulePath { - WCHAR m_szPath[MAX_PATH + 2]; + TCHAR m_szPath[MAX_PATH + 2]; SIZE_T m_cchPath; CicSystemModulePath() @@ -122,31 +122,31 @@ struct CicSystemModulePath m_cchPath = 0; } - BOOL Init(_In_ LPCWSTR pszFileName, _In_ BOOL bSysWinDir); + BOOL Init(_In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir); }; // Get an instance handle that is already loaded static inline HINSTANCE cicGetSystemModuleHandle( - _In_ LPCWSTR pszFileName, + _In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir) { CicSystemModulePath ModPath; if (!ModPath.Init(pszFileName, bSysWinDir)) return NULL; - return GetModuleHandleW(ModPath.m_szPath); + return GetModuleHandle(ModPath.m_szPath); } // Load a system library static inline HINSTANCE cicLoadSystemLibrary( - _In_ LPCWSTR pszFileName, + _In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir) { CicSystemModulePath ModPath; if (!ModPath.Init(pszFileName, bSysWinDir)) return NULL; - return ::LoadLibraryW(ModPath.m_szPath); + return ::LoadLibrary(ModPath.m_szPath); } #include <ndk/pstypes.h> /* for PROCESSINFOCLASS */ @@ -163,7 +163,7 @@ static inline BOOL cicIsWow64(VOID) if (!s_fnNtQueryInformationProcess) { - HMODULE hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); + HMODULE hNTDLL = cicGetSystemModuleHandle(TEXT("ntdll.dll"), FALSE); if (!hNTDLL) return FALSE; @@ -184,38 +184,38 @@ static inline BOOL cicIsWow64(VOID) inline BOOL CicSystemModulePath::Init( - _In_ LPCWSTR pszFileName, + _In_ LPCTSTR pszFileName, _In_ BOOL bSysWinDir) { SIZE_T cchPath; if (bSysWinDir) { // Usually C:\Windows or C:\ReactOS - cchPath = ::GetSystemWindowsDirectoryW(m_szPath, _countof(m_szPath)); + cchPath = ::GetSystemWindowsDirectory(m_szPath, _countof(m_szPath)); } else { // Usually C:\Windows\system32 or C:\ReactOS\system32 - cchPath = ::GetSystemDirectoryW(m_szPath, _countof(m_szPath)); + cchPath = ::GetSystemDirectory(m_szPath, _countof(m_szPath)); } - m_szPath[_countof(m_szPath) - 1] = UNICODE_NULL; // Avoid buffer overrun + m_szPath[_countof(m_szPath) - 1] = TEXT('\0'); // Avoid buffer overrun if ((cchPath == 0) || (cchPath > _countof(m_szPath) - 2)) goto Failure; // Add backslash if necessary - if ((cchPath > 0) && (m_szPath[cchPath - 1] != L'\\')) + if ((cchPath > 0) && (m_szPath[cchPath - 1] != TEXT('\\'))) { - m_szPath[cchPath + 0] = L'\\'; - m_szPath[cchPath + 1] = UNICODE_NULL; + m_szPath[cchPath + 0] = TEXT('\\'); + m_szPath[cchPath + 1] = TEXT('\0'); } // Append pszFileName - if (FAILED(StringCchCatW(m_szPath, _countof(m_szPath), pszFileName))) + if (FAILED(StringCchCat(m_szPath, _countof(m_szPath), pszFileName))) goto Failure; - m_cchPath = wcslen(m_szPath); + m_cchPath = _tcslen(m_szPath); return TRUE; Failure: @@ -254,7 +254,7 @@ cicRealCoCreateInstance( if (!s_fnCoCreateInstance) { if (!s_hOle32) - s_hOle32 = cicLoadSystemLibrary(L"ole32.dll", FALSE); + s_hOle32 = cicLoadSystemLibrary(TEXT("ole32.dll"), FALSE); s_fnCoCreateInstance = (FN_CoCreateInstance)GetProcAddress(s_hOle32, "CoCreateInstance"); if (!s_fnCoCreateInstance) return E_NOTIMPL; diff --git a/sdk/include/reactos/cicero/cicevent.h b/sdk/include/reactos/cicero/cicevent.h index a783872b2c2..0e679e2238e 100644 --- a/sdk/include/reactos/cicero/cicevent.h +++ b/sdk/include/reactos/cicero/cicevent.h @@ -12,7 +12,7 @@ class CicEvent { HANDLE m_hEvent; - LPCWSTR m_pszName; + LPCTSTR m_pszName; public: CicEvent() : m_hEvent(NULL), m_pszName(NULL) @@ -23,20 +23,20 @@ public: Close(); } - BOOL Create(LPSECURITY_ATTRIBUTES lpSA, LPCWSTR pszName) + BOOL Create(LPSECURITY_ATTRIBUTES lpSA, LPCTSTR pszName) { if (pszName) m_pszName = pszName; if (!m_pszName) return FALSE; - m_hEvent = ::CreateEventW(lpSA, FALSE, FALSE, m_pszName); + m_hEvent = ::CreateEvent(lpSA, FALSE, FALSE, m_pszName); return (m_hEvent != NULL); } - BOOL Open(LPCWSTR pszName) + BOOL Open(LPCTSTR pszName) { if (pszName) m_pszName = pszName; - m_hEvent = ::OpenEventW(EVENT_ALL_ACCESS, FALSE, m_pszName); + m_hEvent = ::OpenEvent(EVENT_ALL_ACCESS, FALSE, m_pszName); return (m_hEvent != NULL); } void Close() diff --git a/sdk/include/reactos/cicero/cicfmap.h b/sdk/include/reactos/cicero/cicfmap.h index 201f3227db8..8e06fc77017 100644 --- a/sdk/include/reactos/cicero/cicfmap.h +++ b/sdk/include/reactos/cicero/cicfmap.h @@ -15,7 +15,7 @@ class CicFileMappingStatic { protected: - LPCWSTR m_pszName; + LPCTSTR m_pszName; LPVOID m_pView; HANDLE m_hMapping; BOOL m_bCreated; @@ -28,7 +28,7 @@ public: CicFileMappingStatic() { } ~CicFileMappingStatic() { } - void Init(LPCWSTR pszName, CicMutex *pMutex); + void Init(LPCTSTR pszName, CicMutex *pMutex); LPVOID Create(LPSECURITY_ATTRIBUTES pSA, DWORD dwMaximumSizeLow, LPBOOL pbAlreadyExists); LPVOID Open(); @@ -43,14 +43,14 @@ public: class CicFileMapping : public CCicFileMappingStatic { public: - CicFileMapping(LPCWSTR pszName, CicMutex *pMutex); + CicFileMapping(LPCTSTR pszName, CicMutex *pMutex); virtual ~CicFileMapping() { Finalize(); } }; /******************************************************************************/ inline -CicFileMapping::CicFileMapping(LPCWSTR pszName, CicMutex *pMutex) +CicFileMapping::CicFileMapping(LPCTSTR pszName, CicMutex *pMutex) : m_pszName(NULL) , m_pView(NULL) , m_hMapping(NULL) @@ -78,7 +78,7 @@ inline void CicFileMappingStatic::Close() m_bCreated = FALSE; } -inline void CicFileMappingStatic::Init(LPCWSTR pszName, CicMutex *pMutex) +inline void CicFileMappingStatic::Init(LPCTSTR pszName, CicMutex *pMutex) { if (pMutex) m_pMutex = pMutex; @@ -97,12 +97,12 @@ CicFileMappingStatic::Create( if (!m_pszName) return NULL; - m_hMapping = ::CreateFileMappingW(INVALID_HANDLE_VALUE, - pSA, - PAGE_READWRITE, - 0, - dwMaximumSizeLow, - m_pszName); + m_hMapping = ::CreateFileMapping(INVALID_HANDLE_VALUE, + pSA, + PAGE_READWRITE, + 0, + dwMaximumSizeLow, + m_pszName); if (pbAlreadyExists) *pbAlreadyExists = (::GetLastError() == ERROR_ALREADY_EXISTS); if (!m_hMapping) @@ -116,7 +116,7 @@ inline LPVOID CicFileMappingStatic::Open() { if (!m_pszName) return NULL; - m_hMapping = ::OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, m_pszName); + m_hMapping = ::OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, m_pszName); if (!m_hMapping) return NULL; diff --git a/sdk/include/reactos/cicero/cicmutex.h b/sdk/include/reactos/cicero/cicmutex.h index 9c98146e8c0..73527edd092 100644 --- a/sdk/include/reactos/cicero/cicmutex.h +++ b/sdk/include/reactos/cicero/cicmutex.h @@ -23,9 +23,9 @@ public: Uninit(); } - void Init(LPSECURITY_ATTRIBUTES lpSA, LPCWSTR pszMutexName) + void Init(LPSECURITY_ATTRIBUTES lpSA, LPCTSTR pszMutexName) { - m_hMutex = ::CreateMutexW(lpSA, FALSE, pszMutexName); + m_hMutex = ::CreateMutex(lpSA, FALSE, pszMutexName); m_bInit = TRUE; } void Uninit() diff --git a/sdk/include/reactos/cicero/cicreg.h b/sdk/include/reactos/cicero/cicreg.h index da18e0bd49e..f6c090bef4e 100644 --- a/sdk/include/reactos/cicero/cicreg.h +++ b/sdk/include/reactos/cicero/cicreg.h @@ -23,43 +23,48 @@ public: LSTATUS Open( HKEY hKey, - LPCWSTR lpSubKey, + LPCTSTR lpSubKey, REGSAM samDesired = KEY_READ); LSTATUS Create( HKEY hKey, - LPCWSTR lpSubKey, - LPWSTR lpClass = NULL, + LPCTSTR lpSubKey, + LPTSTR lpClass = NULL, DWORD dwOptions = REG_OPTION_NON_VOLATILE, REGSAM samDesired = KEY_ALL_ACCESS, LPSECURITY_ATTRIBUTES lpSecurityAttributes = NULL, LPDWORD pdwDisposition = NULL); - LSTATUS QueryDword(LPCWSTR pszValueName, LPDWORD pdwValue) + LSTATUS QueryDword(LPCTSTR pszValueName, LPDWORD pdwValue) { DWORD cbData = sizeof(DWORD); - return ::RegQueryValueExW(m_hKey, pszValueName, 0, NULL, (LPBYTE)pdwValue, &cbData); + return ::RegQueryValueEx(m_hKey, pszValueName, 0, NULL, (LPBYTE)pdwValue, &cbData); } - LSTATUS SetDword(LPCWSTR pszValueName, DWORD dwValue) + LSTATUS SetDword(LPCTSTR pszValueName, DWORD dwValue) { - return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(dwValue)); + return ::RegSetValueEx(m_hKey, pszValueName, 0, REG_DWORD, (LPBYTE)&dwValue, sizeof(dwValue)); } - LSTATUS QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); + LSTATUS QuerySz(LPCTSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax); - LSTATUS SetSz(LPCWSTR pszValueName, LPCWSTR pszValue) + LSTATUS SetSz(LPCTSTR pszValueName, LPCTSTR pszValue) + { + DWORD cbValue = (lstrlen(pszValue) + 1) * sizeof(TCHAR); + return ::RegSetValueEx(m_hKey, pszValueName, 0, REG_SZ, (LPBYTE)pszValue, cbValue); + } + LSTATUS SetSzW(LPCWSTR pszValueName, LPCWSTR pszValue) { DWORD cbValue = (lstrlenW(pszValue) + 1) * sizeof(WCHAR); return ::RegSetValueExW(m_hKey, pszValueName, 0, REG_SZ, (LPBYTE)pszValue, cbValue); } - LSTATUS DeleteSubKey(LPCWSTR lpSubKey) + LSTATUS DeleteSubKey(LPCTSTR lpSubKey) { - return ::RegDeleteKeyW(m_hKey, lpSubKey); + return ::RegDeleteKey(m_hKey, lpSubKey); } - LSTATUS RecurseDeleteKey(LPCWSTR lpSubKey); + LSTATUS RecurseDeleteKey(LPCTSTR lpSubKey); }; /******************************************************************************/ @@ -77,11 +82,11 @@ CicRegKey::Close() inline LSTATUS CicRegKey::Open( HKEY hKey, - LPCWSTR lpSubKey, + LPCTSTR lpSubKey, REGSAM samDesired) { HKEY hNewKey = NULL; - LSTATUS error = ::RegOpenKeyExW(hKey, lpSubKey, 0, samDesired, &hNewKey); + LSTATUS error = ::RegOpenKeyEx(hKey, lpSubKey, 0, samDesired, &hNewKey); if (error != ERROR_SUCCESS) return error; @@ -93,23 +98,23 @@ CicRegKey::Open( inline LSTATUS CicRegKey::Create( HKEY hKey, - LPCWSTR lpSubKey, - LPWSTR lpClass, + LPCTSTR lpSubKey, + LPTSTR lpClass, DWORD dwOptions, REGSAM samDesired, LPSECURITY_ATTRIBUTES lpSecurityAttributes, LPDWORD pdwDisposition) { HKEY hNewKey = NULL; - LSTATUS error = ::RegCreateKeyExW(hKey, - lpSubKey, - 0, - lpClass, - dwOptions, - samDesired, - lpSecurityAttributes, - &hNewKey, - pdwDisposition); + LSTATUS error = ::RegCreateKeyEx(hKey, + lpSubKey, + 0, + lpClass, + dwOptions, + samDesired, + lpSecurityAttributes, + &hNewKey, + pdwDisposition); if (error != ERROR_SUCCESS) return error; @@ -119,13 +124,13 @@ CicRegKey::Create( } inline LSTATUS -CicRegKey::QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) +CicRegKey::QuerySz(LPCTSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) { DWORD cchSaveMax = cchValueMax; - cchValueMax *= sizeof(WCHAR); - LSTATUS error = ::RegQueryValueExW(m_hKey, pszValueName, 0, NULL, - (LPBYTE)pszValue, &cchValueMax); + cchValueMax *= sizeof(TCHAR); + LSTATUS error = ::RegQueryValueEx(m_hKey, pszValueName, 0, NULL, + (LPBYTE)pszValue, &cchValueMax); if (cchSaveMax > 0) pszValue[(error == ERROR_SUCCESS) ? (cchSaveMax - 1) : 0] = UNICODE_NULL; @@ -133,19 +138,19 @@ CicRegKey::QuerySz(LPCWSTR pszValueName, LPWSTR pszValue, DWORD cchValueMax) } inline LSTATUS -CicRegKey::RecurseDeleteKey(LPCWSTR lpSubKey) +CicRegKey::RecurseDeleteKey(LPCTSTR lpSubKey) { CicRegKey regKey; LSTATUS error = regKey.Open(m_hKey, lpSubKey, KEY_READ | KEY_WRITE); if (error != ERROR_SUCCESS) return error; - WCHAR szName[MAX_PATH]; + TCHAR szName[MAX_PATH]; DWORD cchName; do { cchName = _countof(szName); - error = ::RegEnumKeyExW(regKey, 0, szName, &cchName, NULL, NULL, NULL, NULL); + error = ::RegEnumKeyEx(regKey, 0, szName, &cchName, NULL, NULL, NULL, NULL); if (error != ERROR_SUCCESS) break;

1 year, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs