Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [PSDK] ntddvdeo.h: Add missing GUIDs.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5f9e1c2dc5746a204c10… commit b5f9e1c2dc5746a204c10446591c69a7a36397a7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 28 18:49:19 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Dec 28 22:11:05 2023 +0100 [PSDK] ntddvdeo.h: Add missing GUIDs. References: - MS WDK from Windows 2k3, 7, 10. - https://naughter.wordpress.com/2016/08/20/changes-in-the-windows-v10-0-1439… --- sdk/include/psdk/ntddvdeo.h | 75 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/ntddvdeo.h b/sdk/include/psdk/ntddvdeo.h index d8717fd3792..ecf05774a08 100644 --- a/sdk/include/psdk/ntddvdeo.h +++ b/sdk/include/psdk/ntddvdeo.h @@ -20,12 +20,81 @@ * */ -#pragma once +#ifndef _NTDDVDEO_ #define _NTDDVDEO_ +#pragma once + +/* + * Display output interfaces + * {96304d9f-54b5-11d1-8b0f-00a0c9068ff3} + */ +// DEFINE_GUID(GUID_DISPLAY_OUTPUT_INTERFACE_STANDARD, \/ +// 0x96304d9f, 0x54b5, 0x11d1, 0x8b, 0x0f, 0x00, 0xa0, 0xc9, 0x06, 0x8f, 0xf3); + +/* + * Display adapter device interface + * {5b45201d-f2f2-4f3b-85bb-30ff1f953599} + */ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, \ 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); +/* + * Obsolete device interface class GUID names + * (use of above GUID_DEVINTERFACE_* names is recommended) + */ +#define GUID_DISPLAY_ADAPTER_INTERFACE GUID_DEVINTERFACE_DISPLAY_ADAPTER + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +/* + * Monitor device interface + * {e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} + */ +DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, \ + 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); + +/* + * Interface used by anyone listening for arrival of the display device + * {1ca05180-a699-450a-9a0c-de4fbe3ddd89} + */ +DEFINE_GUID(GUID_DISPLAY_DEVICE_ARRIVAL, \ + 0x1ca05180, 0xa699, 0x450a, 0x9a, 0x0c, 0xde, 0x4f, 0xbe, 0x3d, 0xdd, 0x89); + +/* + * Interface used by anyone listening for arrival of display children + * {1ad9e4f0-f88d-4360-bab9-4c2d55e564cd} + */ +DEFINE_GUID(GUID_DEVINTERFACE_VIDEO_OUTPUT_ARRIVAL, \ + 0x1ad9e4f0, 0xf88d, 0x4360, 0xba, 0xb9, 0x4c, 0x2d, 0x55, 0xe5, 0x64, 0xcd); + +#endif // (NTDDI_VERSION >= NTDDI_VISTA) + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) +#ifdef DEFINE_DEVPROPKEY + +/* + * Property on a display class device's DevNode indicating + * that it is a indirect display. + */ +DEFINE_DEVPROPKEY(DEVPKEY_IndirectDisplay, \ + 0xc50a3f10, 0xaa5c, 0x4247, 0xb8, 0x30, 0xd6, 0xa6, 0xf8, 0xea, 0xa3, 0x10, 0x01); + +struct INDIRECT_DISPLAY_INFO +{ + LUID DisplayAdapterLuid; + ULONG Flags; + ULONG NumMonitors; + ULONG DisplayAdapterTargetBase; +}; + +/* This indirect display device created an IddCx adapter */ +#define INDIRECT_DISPLAY_INFO_FLAGS_CREATED_IDDCX_ADAPTER 0x01 + +#endif // DEFINE_DEVPROPKEY +#endif // (NTDDI_VERSION >= NTDDI_WIN10_RS1) + + #ifndef GUID_DEFS_ONLY #ifdef __cplusplus @@ -570,4 +639,6 @@ typedef struct _DISPLAY_BRIGHTNESS { } #endif -#endif /* GUID_DEFS_ONLY */ +#endif /* !GUID_DEFS_ONLY */ + +#endif /* _NTDDVDEO_ */

9 months, 3 weeks

[reactos] 01/01: [MSI_WINETEST][BASEADDRESS] Rename the 'custom' and 'selfreg' build targets.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c93f3ca6b95fa5e1806f… commit 6c93f3ca6b95fa5e1806fc29295d3bc8ada979f9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 27 21:50:24 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 27 21:50:32 2023 +0100 [MSI_WINETEST][BASEADDRESS] Rename the 'custom' and 'selfreg' build targets. They are renamed to 'msi_custom' and 'msi_selfreg', respectively. This is to avoid any future build target name collisions with other tests that would also use similarly-named targets. (For example, a future setupapi wine-synced commit.) --- modules/rostests/winetests/msi/CMakeLists.txt | 22 ++++++++++++---------- sdk/cmake/baseaddress.cmake | 4 ++-- sdk/cmake/baseaddress64.cmake | 4 ++-- sdk/cmake/baseaddress_dwarf.cmake | 2 +- sdk/cmake/baseaddress_msvc.cmake | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 631c09abc15..7d08f5211de 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -1,14 +1,16 @@ spec2def(custom.dll custom.spec) -add_library(custom MODULE custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def) -target_link_libraries(custom uuid) -set_module_type(custom win32dll) -add_importlibs(custom msi ole32 oleaut32 odbccp32 shell32 advapi32 msvcrt kernel32) +add_library(msi_custom MODULE custom.c ${CMAKE_CURRENT_BINARY_DIR}/custom.def) +set_target_properties(msi_custom PROPERTIES OUTPUT_NAME "custom") +target_link_libraries(msi_custom uuid) +set_module_type(msi_custom win32dll) +add_importlibs(msi_custom msi ole32 oleaut32 odbccp32 shell32 advapi32 msvcrt kernel32) spec2def(selfreg.dll selfreg.spec) -add_library(selfreg MODULE selfreg.c ${CMAKE_CURRENT_BINARY_DIR}/selfreg.def) -set_module_type(selfreg win32dll) -add_importlibs(selfreg advapi32 msvcrt kernel32) +add_library(msi_selfreg MODULE selfreg.c ${CMAKE_CURRENT_BINARY_DIR}/selfreg.def) +set_target_properties(msi_selfreg PROPERTIES OUTPUT_NAME "selfreg") +set_module_type(msi_selfreg win32dll) +add_importlibs(msi_selfreg advapi32 msvcrt kernel32) list(APPEND SOURCE action.c @@ -45,12 +47,12 @@ target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS) if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(msi_winetest PRIVATE -Wno-format-overflow -Wno-format) - target_compile_options(custom PRIVATE -Wno-format) + target_compile_options(msi_custom PRIVATE -Wno-format) endif() # msi_winetest.rc: let rc.exe find custom.dll in its subdirectory, i.e. Debug. if (MSVC_IDE) - target_include_directories(msi_winetest PRIVATE $<$<COMPILE_LANGUAGE:RC>:$<TARGET_FILE_DIR:custom>>) + target_include_directories(msi_winetest PRIVATE $<$<COMPILE_LANGUAGE:RC>:$<TARGET_FILE_DIR:msi_custom>>) endif() target_link_libraries(msi_winetest uuid) @@ -58,4 +60,4 @@ set_module_type(msi_winetest win32cui) add_importlibs(msi_winetest secur32 cabinet msi shell32 ole32 oleaut32 odbccp32 user32 advapi32 version msvcrt kernel32) add_pch(msi_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET msi_winetest) -add_dependencies(msi_winetest custom selfreg msi_winetest_idlheader stdole2) +add_dependencies(msi_winetest msi_custom msi_selfreg msi_winetest_idlheader stdole2) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index 3cbeef488a1..ce1861f2115 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -102,7 +102,7 @@ set(baseaddress_cryptdlg 0x78a60000) set(baseaddress_cryptdll 0x78a30000) set(baseaddress_cryptext 0x78a00000) set(baseaddress_cryptnet 0x789d0000) -set(baseaddress_custom 0x78990000) +set(baseaddress_msi_custom 0x78990000) set(baseaddress_d3d8 0x78930000) set(baseaddress_d3d8thk 0x78910000) set(baseaddress_d3d9 0x788a0000) @@ -308,7 +308,7 @@ set(baseaddress_schedsvc 0x72100000) set(baseaddress_scrrun 0x720a0000) set(baseaddress_seclogon 0x72070000) set(baseaddress_security 0x72050000) -set(baseaddress_selfreg 0x72020000) +set(baseaddress_msi_selfreg 0x72020000) set(baseaddress_sendmail 0x71fd0000) set(baseaddress_serialui 0x71fa0000) set(baseaddress_sfc 0x71f70000) diff --git a/sdk/cmake/baseaddress64.cmake b/sdk/cmake/baseaddress64.cmake index 81fe48272ee..ffc1a2381b2 100644 --- a/sdk/cmake/baseaddress64.cmake +++ b/sdk/cmake/baseaddress64.cmake @@ -101,7 +101,7 @@ set(baseaddress_cryptdlg 0x7ff57000000) set(baseaddress_cryptdll 0x7ff56000000) set(baseaddress_cryptext 0x7ff55000000) set(baseaddress_cryptnet 0x7ff54000000) -set(baseaddress_custom 0x7ff53000000) +set(baseaddress_msi_custom 0x7ff53000000) set(baseaddress_d3d8 0x7ff52000000) set(baseaddress_d3d8thk 0x7ff51000000) set(baseaddress_d3d9 0x7ff50000000) @@ -307,7 +307,7 @@ set(baseaddress_schedsvc 0x7fe89000000) set(baseaddress_scrrun 0x7fe88000000) set(baseaddress_seclogon 0x7fe87000000) set(baseaddress_security 0x7fe86000000) -set(baseaddress_selfreg 0x7fe85000000) +set(baseaddress_msi_selfreg 0x7fe85000000) set(baseaddress_sendmail 0x7fe84000000) set(baseaddress_serialui 0x7fe83000000) set(baseaddress_sfc 0x7fe82000000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 3ddc970ad77..97bdde2a3de 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -100,7 +100,7 @@ set(baseaddress_cryptdlg 0x768c0000) set(baseaddress_cryptdll 0x76880000) set(baseaddress_cryptext 0x76840000) set(baseaddress_cryptnet 0x767f0000) -set(baseaddress_custom 0x767b0000) +set(baseaddress_msi_custom 0x767b0000) set(baseaddress_d3d8 0x76710000) set(baseaddress_d3d8thk 0x766f0000) set(baseaddress_d3d9 0x76630000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index d1dced9f17b..64171c892f7 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -102,7 +102,7 @@ set(baseaddress_cryptdlg 0x79c30000) set(baseaddress_cryptdll 0x79c10000) set(baseaddress_cryptext 0x79bf0000) set(baseaddress_cryptnet 0x79bc0000) -set(baseaddress_custom 0x79b90000) +set(baseaddress_msi_custom 0x79b90000) set(baseaddress_d3d8 0x79b50000) set(baseaddress_d3d8thk 0x79b30000) set(baseaddress_d3d9 0x79ae0000) @@ -308,7 +308,7 @@ set(baseaddress_schedsvc 0x75390000) set(baseaddress_scrrun 0x75350000) set(baseaddress_seclogon 0x75330000) set(baseaddress_security 0x75310000) -set(baseaddress_selfreg 0x752f0000) +set(baseaddress_msi_selfreg 0x752f0000) set(baseaddress_sendmail 0x752c0000) set(baseaddress_serialui 0x752a0000) set(baseaddress_sfc 0x75280000)

9 months, 3 weeks

[reactos] 01/01: [MSCTFIME][SDK] Implement CtfImeSelectEx (#6238)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73a1c9d4185cb0f183c2d… commit 73a1c9d4185cb0f183c2df787562d082888ed763 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 27 20:29:02 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 27 20:29:02 2023 +0900 [MSCTFIME][SDK] Implement CtfImeSelectEx (#6238) Supporting TIPs... JIRA issue: CORE-19360 - Add GetCharsetFromLangId and InternalSelectEx helper functions. - Add CicBridge::GetInputContext and CicBridge::SelectEx. - Implement CtfImeSelectEx function. - CTFIMECONTEXT structure moved into <cicero/cicimc.h>. --- dll/ime/msctfime/msctfime.cpp | 193 +++++++++++++++++++++++++++++++++++- dll/ime/msctfime/msctfime.h | 8 -- sdk/include/reactos/cicero/cicimc.h | 59 +++++++++++ 3 files changed, 250 insertions(+), 10 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 726d1b38a96..769b56e6502 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -81,6 +81,9 @@ BOOL RegisterMSIMEMessage(VOID) typedef BOOLEAN (WINAPI *FN_DllShutDownInProgress)(VOID); +/** + * @implemented + */ EXTERN_C BOOLEAN WINAPI DllShutDownInProgress(VOID) { @@ -99,6 +102,9 @@ DllShutDownInProgress(VOID) return s_fnDllShutDownInProgress(); } +/** + * @implemented + */ static BOOL IsInteractiveUserLogon(VOID) { @@ -136,6 +142,9 @@ HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) return E_NOTIMPL; } +/** + * @implemented + */ HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) { if (!pLibThread) @@ -150,6 +159,86 @@ HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) return S_OK; } +/** + * @implemented + */ +BYTE GetCharsetFromLangId(DWORD dwValue) +{ + CHARSETINFO info; + if (!::TranslateCharsetInfo((DWORD*)(DWORD_PTR)dwValue, &info, TCI_SRCLOCALE)) + return 0; + return info.ciCharset; +} + +/** + * @implemented + */ +HRESULT +InternalSelectEx(HIMC hIMC, BOOL fSelect, LANGID LangID) +{ + CicIMCLock imcLock(hIMC); + if (!imcLock) + imcLock.m_hr = E_FAIL; + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + if (PRIMARYLANGID(LangID) == LANG_CHINESE) + { + imcLock.get().cfCandForm[0].dwStyle = 0; + imcLock.get().cfCandForm[0].dwIndex = (DWORD)-1; + } + + if (!fSelect) + { + imcLock.get().fdwInit &= ~INIT_GUIDMAP; + return imcLock.m_hr; + } + + if (!imcLock.ClearCand()) + return imcLock.m_hr; + + // Populate conversion mode + if (!(imcLock.get().fdwInit & INIT_CONVERSION)) + { + DWORD dwConv = (imcLock.get().fdwConversion & IME_CMODE_SOFTKBD); + if (LangID) + { + if (PRIMARYLANGID(LangID) == LANG_JAPANESE) + { + dwConv |= IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE; + } + else if (PRIMARYLANGID(LangID) != LANG_KOREAN) + { + dwConv |= IME_CMODE_NATIVE; + } + } + imcLock.get().fdwConversion |= dwConv; + imcLock.get().fdwInit |= INIT_CONVERSION; + } + + // Populate sentence mode + imcLock.get().fdwSentence |= IME_SMODE_PHRASEPREDICT; + + // Populate LOGFONT + if (!(imcLock.get().fdwInit & INIT_LOGFONT)) + { + // Get logical font + LOGFONTW lf; + HDC hDC = ::GetDC(imcLock.get().hWnd); + HGDIOBJ hFont = GetCurrentObject(hDC, OBJ_FONT); + ::GetObjectW(hFont, sizeof(LOGFONTW), &lf); + ::ReleaseDC(imcLock.get().hWnd, hDC); + + imcLock.get().lfFont.W = lf; + imcLock.get().fdwInit |= INIT_LOGFONT; + } + imcLock.get().lfFont.W.lfCharSet = GetCharsetFromLangId(LangID); + + imcLock.InitContext(); + + return imcLock.m_hr; +} + /*********************************************************************** * Compartment */ @@ -1037,6 +1126,19 @@ public: HRESULT CreateInputContext(TLS *pTLS, HIMC hIMC); HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); + ITfContext *GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext); + + HRESULT SelectEx( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + HIMC hIMC, + BOOL fSelect, + HKL hKL); + HRESULT OnSetOpenStatus( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + CicIMCLock& imcLock, + CicInputContext *pCicIC); void PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs); void GetDocumentManager(CicIMCCLock<CTFIMECONTEXT>& imeContext); @@ -1764,12 +1866,81 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) return hr; } +ITfContext * +CicBridge::GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext) +{ + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + return NULL; + return pCicIC->m_pContext; +} + +/** + * @unimplemented + */ +HRESULT CicBridge::OnSetOpenStatus( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + CicIMCLock& imcLock, + CicInputContext *pCicIC) +{ + return E_NOTIMPL; +} + +/** + * @implemented + */ +HRESULT +CicBridge::SelectEx( + TLS *pTLS, + ITfThreadMgr_P *pThreadMgr, + HIMC hIMC, + BOOL fSelect, + HKL hKL) +{ + CicIMCLock imcLock(hIMC); + if (FAILED(imcLock.m_hr)) + return imcLock.m_hr; + + CicIMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (!imeContext) + imeContext.m_hr = E_FAIL; + if (FAILED(imeContext.m_hr)) + return imeContext.m_hr; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + pCicIC->m_dw2[11] |= 1; + + if (fSelect) + { + if (pCicIC) + pCicIC->m_dw2[1] &= ~1; + if (imcLock.get().fOpen) + OnSetOpenStatus(pTLS, pThreadMgr, imcLock, pCicIC); + } + else + { + ITfContext *pContext = GetInputContext(imeContext); + pThreadMgr->RequestPostponedLock(pContext); + if (pCicIC) + pCicIC->m_dw2[11] &= ~1; + if (pContext) + pContext->Release(); + } + + return imeContext.m_hr; +} + typedef struct ENUM_CREATE_DESTROY_IC { TLS *m_pTLS; CicBridge *m_pBridge; } ENUM_CREATE_DESTROY_IC, *PENUM_CREATE_DESTROY_IC; +/** + * @implemented + */ BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam) { PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; @@ -1777,6 +1948,9 @@ BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam return TRUE; } +/** + * @implemented + */ BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam) { PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; @@ -2454,14 +2628,29 @@ CtfImeInquireExW( return Inquire(lpIMEInfo, lpszWndClass, dwSystemInfoFlags, hKL); } +/*********************************************************************** + * CtfImeSelectEx (MSCTFIME.@) + * + * @implemented + */ EXTERN_C BOOL WINAPI CtfImeSelectEx( _In_ HIMC hIMC, _In_ BOOL fSelect, _In_ HKL hKL) { - FIXME("stub:(%p, %d, %p)\n", hIMC, fSelect, hKL); - return FALSE; + TRACE("(%p, %d, %p)\n", hIMC, fSelect, hKL); + + TLS *pTLS = TLS::PeekTLS(); + if (!pTLS) + return E_OUTOFMEMORY; + + InternalSelectEx(hIMC, fSelect, LOWORD(hKL)); + + if (!pTLS->m_pBridge || !pTLS->m_pThreadMgr) + return E_OUTOFMEMORY; + + return pTLS->m_pBridge->SelectEx(pTLS, pTLS->m_pThreadMgr, hIMC, fSelect, hKL); } EXTERN_C LRESULT WINAPI diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 8ab6bf3f5ad..0fe3b49d5d7 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -28,14 +28,6 @@ #include <cicero/cicimc.h> #include <cicero/cictf.h> -class CicInputContext; - -typedef struct tagCTFIMECONTEXT -{ - CicInputContext *m_pCicIC; - DWORD m_dwCicFlags; -} CTFIMECONTEXT, *PCTFIMECONTEXT; - #include <wine/debug.h> #include "resource.h" diff --git a/sdk/include/reactos/cicero/cicimc.h b/sdk/include/reactos/cicero/cicimc.h index 18b25bdb191..dcef56ef687 100644 --- a/sdk/include/reactos/cicero/cicimc.h +++ b/sdk/include/reactos/cicero/cicimc.h @@ -7,11 +7,20 @@ #pragma once +// struct CTFIMECONTEXT; // class CIC_IMCC_LOCK<T_DATA>; // class CicIMCCLock<T_DATA>; // class CIC_IMC_LOCK; // class CicIMCLock; +class CicInputContext; + +typedef struct tagCTFIMECONTEXT +{ + CicInputContext *m_pCicIC; + DWORD m_dwCicFlags; +} CTFIMECONTEXT, *PCTFIMECONTEXT; + template <typename T_DATA> class CIC_IMCC_LOCK { @@ -143,6 +152,8 @@ public: return imccLock.get().dwCompStrLen > 0; } + BOOL ClearCand(); + BOOL UseVerticalCompWindow() const { return m_pIC->cfCompForm.dwStyle && ((m_pIC->lfFont.A.lfEscapement / 900) % 4 == 3); @@ -172,3 +183,51 @@ protected: return ::ImmUnlockIMC(hIMC) ? S_OK : E_FAIL; } }; + +inline BOOL CicIMCLock::ClearCand() +{ + HIMCC hNewCandInfo, hCandInfo = m_pIC->hCandInfo; + if (hCandInfo) + { + hNewCandInfo = ImmReSizeIMCC(hCandInfo, 1964); + if (!hNewCandInfo) + { + ImmDestroyIMCC(m_pIC->hCandInfo); + m_pIC->hCandInfo = ImmCreateIMCC(1964); + return FALSE; + } + } + else + { + hNewCandInfo = ImmCreateIMCC(1964u); + } + + m_pIC->hCandInfo = hNewCandInfo; + if (!m_pIC->hCandInfo) + return FALSE; + + CicIMCCLock<CANDIDATEINFO> candInfo(m_pIC->hCandInfo); + if (!candInfo) + { + ImmDestroyIMCC(m_pIC->hCandInfo); + m_pIC->hCandInfo = ImmCreateIMCC(1964); + return FALSE; + } + + candInfo.get().dwSize = 1964; + candInfo.get().dwCount = 0; + candInfo.get().dwOffset[0] = sizeof(CANDIDATEINFO); + + LPBYTE pb = (LPBYTE)(&candInfo.get()); + pb += sizeof(CANDIDATEINFO); + + LPDWORD pdwUnknown = (LPDWORD)pb; + pdwUnknown[0] = candInfo.get().dwSize - sizeof(CANDIDATEINFO); // +0x0 + pdwUnknown[2] = 0; // +0x08 + pdwUnknown[3] = 0; // +0x0c + pdwUnknown[4] = 0; // +0x10 + pdwUnknown[1] = 1; // +0x04 + pdwUnknown[5] = 9; // +0x14 + pdwUnknown[6] = 1048; // +0x18 + return TRUE; +}

9 months, 3 weeks

[reactos] 01/01: [MSCTFIME][SDK] Implement CicBridge::ActivateIMMX etc. (#6237)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d528cc401345fb5a2f39c… commit d528cc401345fb5a2f39c9aeaf18c8d4e57fbd4b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 27 16:19:47 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 27 16:19:47 2023 +0900 [MSCTFIME][SDK] Implement CicBridge::ActivateIMMX etc. (#6237) Supporting TIPs... JIRA issue: CORE-19360 - Implement CicBridge::ActivateIMMX and CicBridge::DeactivateIMMX functions. --- dll/ime/msctfime/msctfime.cpp | 58 ++++++++++++++++++++------------------ sdk/include/reactos/cicero/cictf.h | 2 +- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 246f924ecbe..726d1b38a96 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -1003,7 +1003,8 @@ class CicBridge : public ITfSysHookSink protected: LONG m_cRefs; DWORD m_dwImmxInit; - DWORD m_dw[2]; + DWORD m_dw[1]; + BOOL m_bDeactivating; DWORD m_cActivateLocks; ITfKeystrokeMgr *m_pKeystrokeMgr; ITfDocumentMgr *m_pDocMgr; @@ -1031,8 +1032,8 @@ public: HRESULT InitIMMX(TLS *pTLS); BOOL UnInitIMMX(TLS *pTLS); - HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); - HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); + HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr); + HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr); HRESULT CreateInputContext(TLS *pTLS, HIMC hIMC); HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); @@ -1394,7 +1395,7 @@ public: DWORD m_dwSystemInfoFlags; CicBridge *m_pBridge; CicProfile *m_pProfile; - ITfThreadMgr *m_pThreadMgr; + ITfThreadMgr_P *m_pThreadMgr; DWORD m_dwFlags1; DWORD m_dwFlags2; DWORD m_dwUnknown2[2]; @@ -1585,7 +1586,7 @@ CicBridge::CicBridge() { m_dwImmxInit &= ~1; m_dw[0] &= ~1; - m_dw[1] &= ~1; + m_bDeactivating = FALSE; m_dw21 &= ~1; m_pKeystrokeMgr = NULL; m_pDocMgr = NULL; @@ -1784,17 +1785,22 @@ BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lPara } /** - * @unimplemented + * @implemented */ -HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) +HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) { - //FIXME + HRESULT hr = pThreadMgr->ActivateEx(&m_cliendId, 1); + if (hr != S_OK) + { + m_cliendId = 0; + return E_FAIL; + } if (m_cActivateLocks++ != 0) return S_OK; ITfSourceSingle *pSource = NULL; - HRESULT hr = pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void**)&pSource); + hr = pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void**)&pSource); if (FAILED(hr)) { DeactivateIMMX(pTLS, pThreadMgr); @@ -1823,7 +1829,7 @@ HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) SetCompartmentDWORD(m_cliendId, m_pDocMgr, GUID_COMPARTMENT_CTFIME_DIMFLAGS, TRUE, FALSE); } - //FIXME + pThreadMgr->SetSysHookSink(this); hr = S_OK; if (pTLS->m_dwUnknown2[1] & 1) @@ -1835,28 +1841,26 @@ HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) Finish: if (FAILED(hr)) DeactivateIMMX(pTLS, pThreadMgr); - if (pSource) pSource->Release(); - return hr; } /** - * @unimplemented + * @implemented */ -HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) +HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) { - if (m_dw[1] & 1) + if (m_bDeactivating) return TRUE; - m_dw[1] |= 1; + m_bDeactivating = TRUE; if (m_cliendId) { ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; ImmEnumInputContext(0, CicBridge::EnumDestroyInputContextCallback, (LPARAM)&Data); - pTLS->m_dwUnknown2[1] |= 1u; + pTLS->m_dwUnknown2[1] |= 1; ITfSourceSingle *pSource = NULL; if (pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) @@ -1880,9 +1884,9 @@ HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) m_pDocMgr = NULL; } - //FIXME + pThreadMgr->SetSysHookSink(NULL); - m_dw[1] &= ~1; + m_bDeactivating = FALSE; return S_OK; } @@ -1895,20 +1899,19 @@ HRESULT CicBridge::InitIMMX(TLS *pTLS) if (m_dwImmxInit & 1) return S_OK; - HRESULT hr; + HRESULT hr = S_OK; if (!pTLS->m_pThreadMgr) { - hr = TF_CreateThreadMgr(&pTLS->m_pThreadMgr); + ITfThreadMgr *pThreadMgr = NULL; + hr = TF_CreateThreadMgr(&pThreadMgr); if (FAILED(hr)) return E_FAIL; - hr = pTLS->m_pThreadMgr->QueryInterface(IID_ITfThreadMgr, (void **)&pTLS->m_pThreadMgr); + hr = pThreadMgr->QueryInterface(IID_ITfThreadMgr_P, (void **)&pTLS->m_pThreadMgr); + if (pThreadMgr) + pThreadMgr->Release(); if (FAILED(hr)) - { - pTLS->m_pThreadMgr->Release(); - pTLS->m_pThreadMgr = NULL; return E_FAIL; - } } if (!m_pThreadMgrEventSink) @@ -1930,6 +1933,7 @@ HRESULT CicBridge::InitIMMX(TLS *pTLS) pTLS->m_pProfile = new CicProfile(); if (!pTLS->m_pProfile) return E_OUTOFMEMORY; + hr = pTLS->m_pProfile->InitProfileInstance(pTLS); if (FAILED(hr)) { @@ -1938,7 +1942,7 @@ HRESULT CicBridge::InitIMMX(TLS *pTLS) } } - hr = pTLS->m_pThreadMgr->QueryInterface(IID_ITfKeystrokeMgr, (void **)&m_pKeystrokeMgr); + hr = pTLS->m_pThreadMgr->QueryInterface(IID_ITfKeystrokeMgr_P, (void **)&m_pKeystrokeMgr); if (FAILED(hr)) { UnInitIMMX(pTLS); diff --git a/sdk/include/reactos/cicero/cictf.h b/sdk/include/reactos/cicero/cictf.h index 33598b1c5b1..e11cebc3154 100644 --- a/sdk/include/reactos/cicero/cictf.h +++ b/sdk/include/reactos/cicero/cictf.h @@ -25,7 +25,7 @@ struct ITfThreadMgr_P : ITfThreadMgr STDMETHOD(RequestPostponedLock)(ITfContext *pContext) = 0; STDMETHOD(IsKeystrokeFeedEnabled)(int *) = 0; STDMETHOD(CallImm32HotkeyHandler)(UINT vKey, LPARAM lParam, HRESULT* phrResult) = 0; - STDMETHOD(ActivateEx)(LPDWORD, DWORD) = 0; + STDMETHOD(ActivateEx)(TfClientId*, DWORD) = 0; }; DEFINE_GUID(IID_ITfKeystrokeMgr_P, 0x53FA1BEC, 0x5BE1, 0x458E, 0xAE, 0x70, 0xA9, 0xF1, 0xDC, 0x84, 0x3E, 0x81);

9 months, 3 weeks

[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);

9 months, 3 weeks

[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));

9 months, 3 weeks

[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;

9 months, 3 weeks

[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; }

9 months, 3 weeks

[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);

9 months, 3 weeks

[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

9 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2023