Ros-diffs October 2022

ros-diffs@reactos.org

23 participants
162 discussions

[reactos] 01/02: [CSR][NTDLL] Move the CSR subsystem into its own "csr" sub-directory. (#4802)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2aeaba5f8ecfa82c527c… commit d2aeaba5f8ecfa82c527cee3597fdd9ca64d9f2f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 23 18:02:38 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 29 17:17:29 2022 +0200 [CSR][NTDLL] Move the CSR subsystem into its own "csr" sub-directory. (#4802) Move CSRSS, CSRSRV there, as well as CSR client calls from NTDLL into a "CSRLIB" library. --- dll/ntdll/CMakeLists.txt | 5 +--- dll/ntdll/include/ntdll.h | 3 --- sdk/include/reactos/subsys/csr/csrsrv.h | 2 +- subsystems/CMakeLists.txt | 2 +- subsystems/{win32 => csr}/CMakeLists.txt | 1 + subsystems/csr/csrlib/CMakeLists.txt | 13 ++++++++++ {dll/ntdll/csr => subsystems/csr/csrlib}/api.c | 19 +++++++------- {dll/ntdll/csr => subsystems/csr/csrlib}/capture.c | 17 +++++-------- {dll/ntdll/csr => subsystems/csr/csrlib}/connect.c | 26 +++++++++++-------- subsystems/csr/csrlib/csrdll.spec | 17 +++++++++++++ subsystems/csr/csrlib/csrlib.h | 29 ++++++++++++++++++++++ subsystems/{win32 => csr}/csrsrv/CMakeLists.txt | 3 +-- subsystems/{win32 => csr}/csrsrv/api.c | 0 subsystems/{win32 => csr}/csrsrv/api.h | 0 subsystems/{win32 => csr}/csrsrv/csrsrv.rc | 0 subsystems/{win32 => csr}/csrsrv/csrsrv.spec | 0 subsystems/{win32 => csr}/csrsrv/init.c | 0 subsystems/{win32 => csr}/csrsrv/procsup.c | 0 subsystems/{win32 => csr}/csrsrv/server.c | 0 subsystems/{win32 => csr}/csrsrv/session.c | 0 subsystems/{win32 => csr}/csrsrv/srv.h | 0 subsystems/{win32 => csr}/csrsrv/status.h | 0 subsystems/{win32 => csr}/csrsrv/thredsup.c | 0 subsystems/{win32 => csr}/csrsrv/wait.c | 0 subsystems/{win32 => csr}/csrss/CMakeLists.txt | 0 subsystems/{win32 => csr}/csrss/csrss.c | 0 subsystems/{win32 => csr}/csrss/csrss.rc | 0 27 files changed, 94 insertions(+), 43 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index fbcd5272eb1..6d383bd6df4 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -18,9 +18,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) list(APPEND SOURCE - csr/api.c - csr/capture.c - csr/connect.c dbg/dbgui.c ldr/ldrapi.c ldr/ldrinit.c @@ -60,7 +57,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) set_subsystem(ntdll console) ################# END HACK ################# -target_link_libraries(ntdll rtl rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) +target_link_libraries(ntdll csrlib rtl rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) if (STACK_PROTECTOR) target_sources(ntdll PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) diff --git a/dll/ntdll/include/ntdll.h b/dll/ntdll/include/ntdll.h index 61b656feb27..007d5f42f55 100644 --- a/dll/ntdll/include/ntdll.h +++ b/dll/ntdll/include/ntdll.h @@ -43,9 +43,6 @@ /* Internal NTDLL */ #include "ntdllp.h" -/* CSRSS Headers */ -#include <csr/csr.h> - /* PSEH */ #include <pseh/pseh2.h> diff --git a/sdk/include/reactos/subsys/csr/csrsrv.h b/sdk/include/reactos/subsys/csr/csrsrv.h index 39fc5adfd2e..4f63c9bd152 100644 --- a/sdk/include/reactos/subsys/csr/csrsrv.h +++ b/sdk/include/reactos/subsys/csr/csrsrv.h @@ -23,7 +23,7 @@ /* TYPES **********************************************************************/ -// Used in ntdll/csr/connect.c +// Used in csr/connect.c #define CSR_CSRSS_SECTION_SIZE 65536 typedef struct _CSR_NT_SESSION diff --git a/subsystems/CMakeLists.txt b/subsystems/CMakeLists.txt index d77ca2fc6d4..ee58a57c40b 100644 --- a/subsystems/CMakeLists.txt +++ b/subsystems/CMakeLists.txt @@ -1,4 +1,4 @@ +add_subdirectory(csr) add_subdirectory(mvdm) add_subdirectory(win) -add_subdirectory(win32) diff --git a/subsystems/win32/CMakeLists.txt b/subsystems/csr/CMakeLists.txt similarity index 66% rename from subsystems/win32/CMakeLists.txt rename to subsystems/csr/CMakeLists.txt index 59bf8c3511c..487c1293343 100644 --- a/subsystems/win32/CMakeLists.txt +++ b/subsystems/csr/CMakeLists.txt @@ -1,3 +1,4 @@ +add_subdirectory(csrlib) add_subdirectory(csrsrv) add_subdirectory(csrss) diff --git a/subsystems/csr/csrlib/CMakeLists.txt b/subsystems/csr/csrlib/CMakeLists.txt new file mode 100644 index 00000000000..7e8be938676 --- /dev/null +++ b/subsystems/csr/csrlib/CMakeLists.txt @@ -0,0 +1,13 @@ + +add_definitions(-D_NTSYSTEM_) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys/csr) + +list(APPEND SOURCE + api.c + capture.c + connect.c) + +add_library(csrlib ${SOURCE}) +add_pch(csrlib csrlib.h SOURCE) +add_dependencies(csrlib psdk) diff --git a/dll/ntdll/csr/api.c b/subsystems/csr/csrlib/api.c similarity index 83% rename from dll/ntdll/csr/api.c rename to subsystems/csr/csrlib/api.c index b0ddf0478a7..b1611d1f34f 100644 --- a/dll/ntdll/csr/api.c +++ b/subsystems/csr/csrlib/api.c @@ -1,22 +1,21 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: dll/ntdll/csr/api.c - * PURPOSE: CSR APIs exported through NTDLL - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS Client/Server Runtime SubSystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CSR Client Library - API LPC Implementation + * COPYRIGHT: Copyright 2005-2012 Alex Ionescu <alex(a)relsoft.net> + * Copyright 2012-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ /* INCLUDES *******************************************************************/ -#include <ntdll.h> +#include "csrlib.h" + +#define NTOS_MODE_USER +#include <ndk/psfuncs.h> #define NDEBUG #include <debug.h> -/* GLOBALS ********************************************************************/ - -extern HANDLE CsrApiPort; - /* FUNCTIONS ******************************************************************/ /* diff --git a/dll/ntdll/csr/capture.c b/subsystems/csr/csrlib/capture.c similarity index 95% rename from dll/ntdll/csr/capture.c rename to subsystems/csr/csrlib/capture.c index 9252a521f0a..c5b6b10cb59 100644 --- a/dll/ntdll/csr/capture.c +++ b/subsystems/csr/csrlib/capture.c @@ -1,23 +1,18 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: dll/ntdll/csr/capture.c - * PURPOSE: Routines for probing and capturing CSR API Messages - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * PROJECT: ReactOS Client/Server Runtime SubSystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CSR Client Library - CSR API Messages probing and capturing + * COPYRIGHT: Copyright 2005 Alex Ionescu <alex(a)relsoft.net> + * Copyright 2012-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ /* INCLUDES *******************************************************************/ -#include <ntdll.h> +#include "csrlib.h" #define NDEBUG #include <debug.h> -/* GLOBALS ********************************************************************/ - -extern HANDLE CsrPortHeap; - /* FUNCTIONS ******************************************************************/ /* diff --git a/dll/ntdll/csr/connect.c b/subsystems/csr/csrlib/connect.c similarity index 96% rename from dll/ntdll/csr/connect.c rename to subsystems/csr/csrlib/connect.c index 98033274e44..51d7c006f75 100644 --- a/dll/ntdll/csr/connect.c +++ b/subsystems/csr/csrlib/connect.c @@ -1,17 +1,23 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: dll/ntdll/csr/connect.c - * PURPOSE: Routines for connecting and calling CSR - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS Client/Server Runtime SubSystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CSR Client Library - CSR connection and calling + * COPYRIGHT: Copyright 2005-2013 Alex Ionescu <alex(a)relsoft.net> + * Copyright 2012-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ /* INCLUDES *******************************************************************/ -#include <ntdll.h> +#include "csrlib.h" +#define NTOS_MODE_USER +#include <ndk/ldrfuncs.h> #include <ndk/lpcfuncs.h> -#include <csr/csrsrv.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/umfuncs.h> + +#include <csrsrv.h> // For CSR_CSRSS_SECTION_SIZE #define NDEBUG #include <debug.h> @@ -30,8 +36,6 @@ typedef NTSTATUS PCSR_SERVER_API_ROUTINE CsrServerApiRoutine; -#define UNICODE_PATH_SEP L"\\" - /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -80,8 +84,8 @@ CsrpConnectToServer(IN PWSTR ObjectDirectory) } /* Create the name */ - RtlAppendUnicodeToString(&PortName, ObjectDirectory ); - RtlAppendUnicodeToString(&PortName, UNICODE_PATH_SEP); + RtlAppendUnicodeToString(&PortName, ObjectDirectory); + RtlAppendUnicodeToString(&PortName, L"\\"); RtlAppendUnicodeToString(&PortName, CSR_PORT_NAME); /* Create a section for the port memory */ diff --git a/subsystems/csr/csrlib/csrdll.spec b/subsystems/csr/csrlib/csrdll.spec new file mode 100644 index 00000000000..5d170a92a81 --- /dev/null +++ b/subsystems/csr/csrlib/csrdll.spec @@ -0,0 +1,17 @@ +@ stdcall CsrAllocateCaptureBuffer(long long) +@ stdcall CsrAllocateMessagePointer(ptr long ptr) +@ stdcall CsrCaptureMessageBuffer(ptr ptr long ptr) +@ stdcall CsrCaptureMessageMultiUnicodeStringsInPlace(ptr long ptr) +@ stdcall CsrCaptureMessageString(ptr str long long ptr) +@ stdcall CsrCaptureTimeout(long ptr) +@ stdcall CsrClientCallServer(ptr ptr long long) +@ stdcall CsrClientConnectToServer(str long ptr ptr ptr) +@ stdcall CsrFreeCaptureBuffer(ptr) +@ stdcall CsrGetProcessId() +@ stdcall CsrIdentifyAlertableThread() +@ stdcall -version=0x502 CsrNewThread() +@ stdcall -version=0x502 CsrProbeForRead(ptr long long) +@ stdcall -version=0x502 CsrProbeForWrite(ptr long long) +@ stdcall CsrSetPriorityClass(ptr ptr) +@ stdcall -stub -version=0x600+ CsrVerifyRegion(ptr long) +@ stdcall -stub -version=0x600+ RtlRegisterThreadWithCsrss() diff --git a/subsystems/csr/csrlib/csrlib.h b/subsystems/csr/csrlib/csrlib.h new file mode 100644 index 00000000000..ed65a07d192 --- /dev/null +++ b/subsystems/csr/csrlib/csrlib.h @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS Client/Server Runtime SubSystem + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CSR Client Library - Main Header + * COPYRIGHT: Copyright 2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +#ifndef _CSRLIB_H_ +#define _CSRLIB_H_ + +/* INCLUDES ******************************************************************/ + +/* PSDK/NDK Headers */ +#define WIN32_NO_STATUS +//#include <windef.h> +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> + +/* CSRSS Headers */ +#include <csr.h> + +/* GLOBALS ********************************************************************/ + +extern HANDLE CsrApiPort; +extern HANDLE CsrPortHeap; + +#endif /* _CSRLIB_H_ */ + +/* EOF */ diff --git a/subsystems/win32/csrsrv/CMakeLists.txt b/subsystems/csr/csrsrv/CMakeLists.txt similarity index 81% rename from subsystems/win32/csrsrv/CMakeLists.txt rename to subsystems/csr/csrsrv/CMakeLists.txt index 3ee512e5dd9..72fe79b9083 100644 --- a/subsystems/win32/csrsrv/CMakeLists.txt +++ b/subsystems/csr/csrsrv/CMakeLists.txt @@ -1,5 +1,4 @@ -include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(csrsrv.dll csrsrv.spec ADD_IMPORTLIB) @@ -20,7 +19,7 @@ add_library(csrsrv MODULE ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def) set_module_type(csrsrv nativedll) -target_link_libraries(csrsrv ${PSEH_LIB} smlib) +target_link_libraries(csrsrv smlib ${PSEH_LIB}) add_importlibs(csrsrv ntdll) add_pch(csrsrv srv.h SOURCE) add_dependencies(csrsrv psdk bugcodes) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/csr/csrsrv/api.c similarity index 100% rename from subsystems/win32/csrsrv/api.c rename to subsystems/csr/csrsrv/api.c diff --git a/subsystems/win32/csrsrv/api.h b/subsystems/csr/csrsrv/api.h similarity index 100% rename from subsystems/win32/csrsrv/api.h rename to subsystems/csr/csrsrv/api.h diff --git a/subsystems/win32/csrsrv/csrsrv.rc b/subsystems/csr/csrsrv/csrsrv.rc similarity index 100% rename from subsystems/win32/csrsrv/csrsrv.rc rename to subsystems/csr/csrsrv/csrsrv.rc diff --git a/subsystems/win32/csrsrv/csrsrv.spec b/subsystems/csr/csrsrv/csrsrv.spec similarity index 100% rename from subsystems/win32/csrsrv/csrsrv.spec rename to subsystems/csr/csrsrv/csrsrv.spec diff --git a/subsystems/win32/csrsrv/init.c b/subsystems/csr/csrsrv/init.c similarity index 100% rename from subsystems/win32/csrsrv/init.c rename to subsystems/csr/csrsrv/init.c diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/csr/csrsrv/procsup.c similarity index 100% rename from subsystems/win32/csrsrv/procsup.c rename to subsystems/csr/csrsrv/procsup.c diff --git a/subsystems/win32/csrsrv/server.c b/subsystems/csr/csrsrv/server.c similarity index 100% rename from subsystems/win32/csrsrv/server.c rename to subsystems/csr/csrsrv/server.c diff --git a/subsystems/win32/csrsrv/session.c b/subsystems/csr/csrsrv/session.c similarity index 100% rename from subsystems/win32/csrsrv/session.c rename to subsystems/csr/csrsrv/session.c diff --git a/subsystems/win32/csrsrv/srv.h b/subsystems/csr/csrsrv/srv.h similarity index 100% rename from subsystems/win32/csrsrv/srv.h rename to subsystems/csr/csrsrv/srv.h diff --git a/subsystems/win32/csrsrv/status.h b/subsystems/csr/csrsrv/status.h similarity index 100% rename from subsystems/win32/csrsrv/status.h rename to subsystems/csr/csrsrv/status.h diff --git a/subsystems/win32/csrsrv/thredsup.c b/subsystems/csr/csrsrv/thredsup.c similarity index 100% rename from subsystems/win32/csrsrv/thredsup.c rename to subsystems/csr/csrsrv/thredsup.c diff --git a/subsystems/win32/csrsrv/wait.c b/subsystems/csr/csrsrv/wait.c similarity index 100% rename from subsystems/win32/csrsrv/wait.c rename to subsystems/csr/csrsrv/wait.c diff --git a/subsystems/win32/csrss/CMakeLists.txt b/subsystems/csr/csrss/CMakeLists.txt similarity index 100% rename from subsystems/win32/csrss/CMakeLists.txt rename to subsystems/csr/csrss/CMakeLists.txt diff --git a/subsystems/win32/csrss/csrss.c b/subsystems/csr/csrss/csrss.c similarity index 100% rename from subsystems/win32/csrss/csrss.c rename to subsystems/csr/csrss/csrss.c diff --git a/subsystems/win32/csrss/csrss.rc b/subsystems/csr/csrss/csrss.rc similarity index 100% rename from subsystems/win32/csrss/csrss.rc rename to subsystems/csr/csrss/csrss.rc

2 years, 1 month

[reactos] 01/01: [KBSWITCH] Fix shutdown and logout dialog CORE-18563

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6df7ddb959e9ffcda4e9… commit a6df7ddb959e9ffcda4e9920a527864907e2b2bb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 29 20:36:45 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Oct 29 20:36:45 2022 +0900 [KBSWITCH] Fix shutdown and logout dialog CORE-18563 20221028-0.4.15-dev-5273-g36f7d1a introduced bug. Quick fix. CORE-18563 --- base/applications/kbswitch/kbswitch.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 4f6baa7dc54..89159701fc7 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -603,9 +603,6 @@ UpdateLanguageDisplayCurrent(HWND hwnd, HWND hwndFore) HKL hKL = GetKeyboardLayout(dwThreadID); UpdateLanguageDisplay(hwnd, hKL); - if (IsWindow(g_hwndLastActive)) - SetForegroundWindow(g_hwndLastActive); - return 0; }

2 years, 1 month

[reactos] 01/01: [KBSWITCH] Follow-up of #4815 (36f7d1a); Less flicker Alt+Shift

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=433240feec504b337d331… commit 433240feec504b337d3317c9fa1b85e8c571b967 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 29 16:23:58 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Oct 29 16:23:58 2022 +0900 [KBSWITCH] Follow-up of #4815 (36f7d1a); Less flicker Alt+Shift Add bNoActivate argument to ActivateLayout function. CORE-11700, CORE-2699, CORE-18546 --- base/applications/kbswitch/kbswitch.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 5bad013d964..4f6baa7dc54 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -401,7 +401,7 @@ EnumWindowsProc(HWND hwnd, LPARAM lParam) } static VOID -ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL) +ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL, BOOL bNoActivate) { HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLCID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH]; @@ -419,7 +419,7 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL) GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName)); UpdateTrayIcon(hwnd, szLCID, szLangName); - if (hwndTarget) + if (hwndTarget && !bNoActivate) SetForegroundWindow(hwndTarget); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); @@ -671,7 +671,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) AddTrayIcon(hwnd); - ActivateLayout(hwnd, ulCurrentLayoutNum, NULL); + ActivateLayout(hwnd, ulCurrentLayoutNum, NULL, FALSE); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); break; } @@ -775,13 +775,13 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) ulCurrentLayoutNum = uNum; } - ActivateLayout(hwnd, GetNextLayout(), hwndTarget); + ActivateLayout(hwnd, GetNextLayout(), hwndTarget, TRUE); /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ if (bCONWND) { - ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave); + ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave, TRUE); } break; } @@ -794,7 +794,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { g_hwndLastActive = NULL; } - ActivateLayout(hwnd, LOWORD(wParam), g_hwndLastActive); + ActivateLayout(hwnd, LOWORD(wParam), g_hwndLastActive, FALSE); } break; }

2 years, 1 month

[reactos] 01/01: [NTUSER] Add 'Win:' comment to InitThreadCallback

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f9283398a4815ba00b66… commit 8f9283398a4815ba00b6628ab2c8cb6fb9115296 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 29 14:06:40 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Oct 29 14:08:15 2022 +0900 [NTUSER] Add 'Win:' comment to InitThreadCallback --- win32ss/user/ntuser/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index ea092317809..bdb36d45236 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -452,6 +452,7 @@ UserThreadDestroy(PETHREAD Thread) return STATUS_SUCCESS; } +/* Win: xxxCreateThreadInfo */ NTSTATUS NTAPI InitThreadCallback(PETHREAD Thread) {

2 years, 1 month

[reactos] 01/01: [IMM32_APITEST] Add JapanImeConvTestA/W testcases (#4820)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb58782012d5d0b3ba95b… commit fb58782012d5d0b3ba95b388731fa43a262cfea4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 29 13:49:28 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 29 13:49:28 2022 +0900 [IMM32_APITEST] Add JapanImeConvTestA/W testcases (#4820) Add IME conversion tests to verify IMM/IME support. CORE-11700 --- modules/rostests/apitests/imm32/CMakeLists.txt | 5 +- modules/rostests/apitests/imm32/JapanImeConvTest.h | 284 +++++++++++++++++++++ .../rostests/apitests/imm32/JapanImeConvTestA.c | 9 + .../rostests/apitests/imm32/JapanImeConvTestW.c | 9 + modules/rostests/apitests/imm32/resource.rc | 16 ++ modules/rostests/apitests/imm32/testlist.c | 4 + 6 files changed, 326 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/imm32/CMakeLists.txt b/modules/rostests/apitests/imm32/CMakeLists.txt index 30b7dd66a8e..9c6486a8508 100644 --- a/modules/rostests/apitests/imm32/CMakeLists.txt +++ b/modules/rostests/apitests/imm32/CMakeLists.txt @@ -7,7 +7,10 @@ list(APPEND SOURCE imcc.c ImmGetImeInfoEx.c ImmIsUIMessage.c - testlist.c) + JapanImeConvTestA.c + JapanImeConvTestW.c + testlist.c + resource.rc) add_executable(imm32_apitest ${SOURCE}) target_link_libraries(imm32_apitest wine ${PSEH_LIB}) diff --git a/modules/rostests/apitests/imm32/JapanImeConvTest.h b/modules/rostests/apitests/imm32/JapanImeConvTest.h new file mode 100644 index 00000000000..8878553d1c1 --- /dev/null +++ b/modules/rostests/apitests/imm32/JapanImeConvTest.h @@ -0,0 +1,284 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for Japanese IME conversion + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include <windows.h> +#include <windowsx.h> +#include <imm.h> +#include <wine/test.h> + +/* + * We emulate some keyboard typing on dialog box and watch the conversion of Japanese IME. + * This program needs Japanese environment and Japanese IME. + * Tested on Japanese WinXP and Japanese Win10. + */ + +#define INTERVAL 300 +#define WM_PRESS_KEY_COMPLETE (WM_USER + 100) + +/* The test entry structure */ +typedef struct tagTEST_ENTRY +{ + const UINT *pKeys; + UINT cKeys; + const void *pvResult; + INT cWM_IME_ENDCOMPOSITION; +} TEST_ENTRY, *PTEST_ENTRY; + +// The Japanese word "テスト" conversion in Romaji +static const UINT s_keys1[] = +{ + 'T', 'E', 'S', 'U', 'T', 'O', VK_SPACE, VK_RETURN +}; +// The Japanese word "調査員" conversion in Romaji +static const UINT s_keys2[] = +{ + 'C', 'H', 'O', 'U', 'S', 'A', 'I', 'N', 'N', VK_SPACE, VK_RETURN +}; + +#ifdef UNICODE + #define AorW(a, w) w +#else + #define AorW(a, w) a +#endif + +/* The test entries */ +static const TEST_ENTRY s_entries[] = +{ + // "テスト" + { s_keys1, _countof(s_keys1), AorW("\x83\x65\x83\x58\x83\x67", L"\x30C6\x30B9\x30C8"), 1 }, + // "調査員" + { s_keys2, _countof(s_keys2), AorW("\x92\xB2\x8D\xB8\x88\xF5", L"\x8ABF\x67FB\x54E1"), 1 }, +}; + +static INT s_iEntry = 0; +static INT s_cWM_IME_ENDCOMPOSITION = 0; +static WNDPROC s_fnOldEditWndProc = NULL; + +#ifdef UNICODE +static LPSTR WideToAnsi(INT nCodePage, LPCWSTR pszWide) +{ + static CHAR s_sz[512]; + WideCharToMultiByte(nCodePage, 0, pszWide, -1, s_sz, _countof(s_sz), NULL, NULL); + return s_sz; +} +#endif + +/* The window procedure for textbox to watch the IME conversion */ +static LRESULT CALLBACK +EditWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_IME_ENDCOMPOSITION: + { + const TEST_ENTRY *entry = &s_entries[s_iEntry]; + HIMC hIMC; + LONG cbResult, cbBuffer; + LPTSTR pszResult; + + /* Check conversion results of composition string */ + hIMC = ImmGetContext(hwnd); + cbResult = ImmGetCompositionString(hIMC, GCS_RESULTSTR, NULL, 0); + trace("cbResult: %ld\n", cbResult); + if (cbResult > 0) /* Ignore zero string */ + { + ok(hIMC != NULL, "hIMC was NULL\n"); + ++s_cWM_IME_ENDCOMPOSITION; + + cbBuffer = cbResult + sizeof(WCHAR); + pszResult = (LPTSTR)calloc(cbBuffer, sizeof(BYTE)); /* Zero-fill */ + ok(pszResult != NULL, "pszResult was NULL\n"); + ImmGetCompositionString(hIMC, GCS_RESULTSTR, pszResult, cbBuffer); +#ifdef UNICODE + trace("%s\n", WideToAnsi(CP_ACP, (LPTSTR)pszResult)); +#else + trace("%s\n", (LPTSTR)pszResult); +#endif + ok(lstrcmp(pszResult, (LPTSTR)entry->pvResult) == 0, "pszResult differs\n"); + free(pszResult); + } + + ImmReleaseContext(hwnd, hIMC); + } + break; + } + + return CallWindowProc(s_fnOldEditWndProc, hwnd, uMsg, wParam, lParam); +} + +/* Timer IDs */ +#define STAGE_1 10001 +#define STAGE_2 10002 +#define STAGE_3 10003 +#define STAGE_4 10004 +#define STAGE_5 10005 + +/* WM_INITDIALOG */ +static BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam) +{ + /* Subclass the textbox to watch the IME conversion */ + HWND hEdt1 = GetDlgItem(hwnd, edt1); + s_fnOldEditWndProc = (WNDPROC)SetWindowLongPtr(hEdt1, GWLP_WNDPROC, (LONG_PTR)EditWindowProc); + + /* Go to first stage */ + SetTimer(hwnd, STAGE_1, INTERVAL, 0); + return TRUE; +} + +/* WM_COMMAND */ +static void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) +{ + switch (id) + { + case IDOK: + case IDCANCEL: + EndDialog(hwnd, id); + break; + } +} + +/* Emulate keyboard typing */ +static VOID PressKey(UINT vk) +{ + INPUT inputs[2]; + ZeroMemory(inputs, sizeof(inputs)); + inputs[0].type = INPUT_KEYBOARD; + inputs[0].ki.wVk = vk; + inputs[1].type = INPUT_KEYBOARD; + inputs[1].ki.wVk = vk; + inputs[1].ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(_countof(inputs), inputs, sizeof(INPUT)); +} + +/* WM_TIMER */ +static void OnTimer(HWND hwnd, UINT id) +{ + HIMC hIMC; + INT i; + const TEST_ENTRY *entry = &s_entries[s_iEntry]; + static DWORD dwOldConversion, dwOldSentence; + + KillTimer(hwnd, id); + + switch (id) + { + case STAGE_1: + /* Check focus. See WM_INITDIALOG return code. */ + ok(GetFocus() == GetDlgItem(hwnd, edt1), "GetFocus() was %p\n", GetFocus()); + + hIMC = ImmGetContext(hwnd); + ok(hIMC != NULL, "hIMC was NULL"); + if (hIMC) + { + /* Open the IME */ + ImmSetOpenStatus(hIMC, TRUE); + /* Save the IME conversion status */ + ImmGetConversionStatus(hIMC, &dwOldConversion, &dwOldSentence); + /* Modify the IME conversion status */ + ImmSetConversionStatus(hIMC, + IME_CMODE_FULLSHAPE | IME_CMODE_ROMAN | IME_CMODE_NATIVE, + IME_SMODE_SINGLECONVERT); + + ImmReleaseContext(hwnd, hIMC); + } + /* Initialize the counter */ + s_cWM_IME_ENDCOMPOSITION = 0; + /* Go to next stage */ + SetTimer(hwnd, STAGE_2, INTERVAL, NULL); + break; + + case STAGE_2: + /* Emulate keyboard typing */ + for (i = 0; i < entry->cKeys; ++i) + { + PressKey(entry->pKeys[i]); + } + /* Wait for message queue processed */ + PostMessage(hwnd, WM_PRESS_KEY_COMPLETE, 0, 0); + break; + + case STAGE_3: + /* Revert the IME conversion status */ + hIMC = ImmGetContext(hwnd); + ok(hIMC != NULL, "hIMC was NULL"); + if (hIMC) + { + ImmSetConversionStatus(hIMC, dwOldConversion, dwOldSentence); + ImmReleaseContext(hwnd, hIMC); + } + /* Go to next stage */ + SetTimer(hwnd, STAGE_4, INTERVAL, NULL); + break; + + case STAGE_4: + /* Check the counter */ + ok_int(s_cWM_IME_ENDCOMPOSITION, entry->cWM_IME_ENDCOMPOSITION); + if (s_cWM_IME_ENDCOMPOSITION < entry->cWM_IME_ENDCOMPOSITION) + { + skip("Some tests were skipped.\n"); + } + + /* Go to next test entry */ + ++s_iEntry; + if (s_iEntry == _countof(s_entries)) + PostMessage(hwnd, WM_CLOSE, 0, 0); /* No more entry */ + else + SetTimer(hwnd, STAGE_1, INTERVAL, NULL); + break; + } +} + +/* Dialog procedure */ +static INT_PTR CALLBACK +DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog); + HANDLE_MSG(hwnd, WM_COMMAND, OnCommand); + HANDLE_MSG(hwnd, WM_TIMER, OnTimer); + + case WM_PRESS_KEY_COMPLETE: + /* Message queue is processed. Go to next stage. */ + SetTimer(hwnd, STAGE_3, INTERVAL, NULL); + break; + } + return 0; +} + +#ifdef UNICODE +START_TEST(JapanImeConvTestW) +#else +START_TEST(JapanImeConvTestA) +#endif +{ + /* Is the system Japanese? */ + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_JAPANESE) + { + skip("This testcase is for Japanese only.\n"); + return; + } + + /* Is IMM enabled? */ + if (!GetSystemMetrics(SM_IMMENABLED)) + { + skip("SM_IMMENABLED is OFF.\n"); + return; + } + + /* Check the current keyboard layout is IME */ + if (!ImmIsIME(GetKeyboardLayout(0))) + { + skip("The IME keyboard layout was not default\n"); + return; + } + + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(1), NULL, DialogProc); + + if (s_iEntry < _countof(s_entries)) + skip("Some tests were skipped.\n"); +} diff --git a/modules/rostests/apitests/imm32/JapanImeConvTestA.c b/modules/rostests/apitests/imm32/JapanImeConvTestA.c new file mode 100644 index 00000000000..72d2e83581f --- /dev/null +++ b/modules/rostests/apitests/imm32/JapanImeConvTestA.c @@ -0,0 +1,9 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for Japanese IME conversion + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#undef UNICODE /* ANSI */ +#include "JapanImeConvTest.h" diff --git a/modules/rostests/apitests/imm32/JapanImeConvTestW.c b/modules/rostests/apitests/imm32/JapanImeConvTestW.c new file mode 100644 index 00000000000..9499b861931 --- /dev/null +++ b/modules/rostests/apitests/imm32/JapanImeConvTestW.c @@ -0,0 +1,9 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for Japanese IME conversion + * COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#define UNICODE /* Unicode */ +#include "JapanImeConvTest.h" diff --git a/modules/rostests/apitests/imm32/resource.rc b/modules/rostests/apitests/imm32/resource.rc new file mode 100644 index 00000000000..c01bc75b2da --- /dev/null +++ b/modules/rostests/apitests/imm32/resource.rc @@ -0,0 +1,16 @@ +#include <windows.h> +#include <commctrl.h> +#pragma code_page(65001) /* UTF-8 */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +1 DIALOG 0, 0, 215, 135 +CAPTION "JapanImeConvTest" +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +FONT 9, "MS UI Gothic" +{ + EDITTEXT edt1, 8, 7, 147, 14 + LISTBOX lst1, 7, 30, 202, 82, LBS_NOINTEGRALHEIGHT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 35, 115, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 115, 115, 60, 14 +} diff --git a/modules/rostests/apitests/imm32/testlist.c b/modules/rostests/apitests/imm32/testlist.c index d73e9878113..b9c16be52cf 100644 --- a/modules/rostests/apitests/imm32/testlist.c +++ b/modules/rostests/apitests/imm32/testlist.c @@ -7,6 +7,8 @@ extern void func_himc(void); extern void func_imcc(void); extern void func_ImmGetImeInfoEx(void); extern void func_ImmIsUIMessage(void); +extern void func_JapanImeConvTestA(void); +extern void func_JapanImeConvTestW(void); const struct test winetest_testlist[] = { @@ -15,5 +17,7 @@ const struct test winetest_testlist[] = { "imcc", func_imcc }, { "ImmGetImeInfoEx", func_ImmGetImeInfoEx }, { "ImmIsUIMessage", func_ImmIsUIMessage }, + { "JapanImeConvTestA", func_JapanImeConvTestA }, + { "JapanImeConvTestW", func_JapanImeConvTestW }, { 0, 0 } };

2 years, 1 month

[reactos] 01/01: [KBSWITCH][CPL:INPUT][NTUSER][EXPLORER] Fix keyboard layout icon (#4815)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36f7d1a953698157dddb7… commit 36f7d1a953698157dddb723506453039b9dcf11d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 29 07:35:19 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 29 07:35:19 2022 +0900 [KBSWITCH][CPL:INPUT][NTUSER][EXPLORER] Fix keyboard layout icon (#4815) Fix keyboard layout icon in taskbar notification area. JIRA issue: CORE-11700, CORE-2699, CORE-18546 - Call ActivateKeyboardLayout to select the keyboard layout correctly. - Modify WM_INPUTLANGCHANGEREQUEST parameter. - Modify BroadcastSystemMessageW parameter. - Revert Taskbar Notification Area MA_NOACTIVATE HACK 8344291 . This fixes Context Menu display. - Load the "IME File" value and set the IME icon if necessary. - Correctly implement global hooks. --- base/applications/kbswitch/CMakeLists.txt | 2 +- base/applications/kbswitch/kbsdll/kbsdll.c | 36 ++- base/applications/kbswitch/kbswitch.c | 328 ++++++++++++++++++---- base/applications/kbswitch/kbswitch.h | 1 - base/shell/explorer/trayntfy.cpp | 6 - dll/cpl/input/input_list.c | 7 +- win32ss/user/ntuser/defwnd.c | 2 +- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 5 + 8 files changed, 317 insertions(+), 70 deletions(-) diff --git a/base/applications/kbswitch/CMakeLists.txt b/base/applications/kbswitch/CMakeLists.txt index 2b735411437..ede579f6181 100644 --- a/base/applications/kbswitch/CMakeLists.txt +++ b/base/applications/kbswitch/CMakeLists.txt @@ -2,7 +2,7 @@ add_rc_deps(kbswitch.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/kbswitch.ico) add_executable(kbswitch kbswitch.c kbswitch.rc) set_module_type(kbswitch win32gui UNICODE) -add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) +add_importlibs(kbswitch advapi32 imm32 user32 shell32 gdi32 msvcrt kernel32) add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all) add_subdirectory(kbsdll) diff --git a/base/applications/kbswitch/kbsdll/kbsdll.c b/base/applications/kbswitch/kbsdll/kbsdll.c index 6afb63a08c5..ffcc0344d6d 100644 --- a/base/applications/kbswitch/kbsdll/kbsdll.c +++ b/base/applications/kbswitch/kbsdll/kbsdll.c @@ -13,7 +13,7 @@ HINSTANCE hInstance = NULL; HWND hKbSwitchWnd = NULL; static VOID -SendMessageToMainWnd(UINT Msg, WPARAM wParam, LPARAM lParam) +PostMessageToMainWnd(UINT Msg, WPARAM wParam, LPARAM lParam) { PostMessage(hKbSwitchWnd, Msg, wParam, lParam); } @@ -21,36 +21,40 @@ SendMessageToMainWnd(UINT Msg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK WinHookProc(int code, WPARAM wParam, LPARAM lParam) { - int id = GlobalAddAtom(_T("KBSWITCH")); + if (code < 0) + { + return CallNextHookEx(hWinHook, code, wParam, lParam); + } switch (code) { case HCBT_SETFOCUS: { - if ((HWND)wParam != NULL) + HWND hwndFocus = (HWND)wParam; + if (hwndFocus && hwndFocus != hKbSwitchWnd) { - if ((HWND)wParam != hKbSwitchWnd) - { - SendMessageToMainWnd(WM_WINDOW_ACTIVATE, wParam, lParam); - } + PostMessageToMainWnd(WM_WINDOW_ACTIVATE, wParam, lParam); } } break; } - GlobalDeleteAtom(id); - return CallNextHookEx(hWinHook, code, wParam, lParam); } LRESULT CALLBACK ShellHookProc(int code, WPARAM wParam, LPARAM lParam) { + if (code < 0) + { + return CallNextHookEx(hShellHook, code, wParam, lParam); + } + switch (code) { case HSHELL_LANGUAGE: { - SendMessageToMainWnd(WM_LANG_CHANGED, wParam, lParam); + PostMessageToMainWnd(WM_LANG_CHANGED, wParam, lParam); } break; } @@ -75,8 +79,16 @@ KbSwitchSetHooks(VOID) VOID WINAPI KbSwitchDeleteHooks(VOID) { - if (hWinHook) UnhookWindowsHookEx(hWinHook); - if (hShellHook) UnhookWindowsHookEx(hShellHook); + if (hWinHook) + { + UnhookWindowsHookEx(hWinHook); + hWinHook = NULL; + } + if (hShellHook) + { + UnhookWindowsHookEx(hShellHook); + hShellHook = NULL; + } } BOOL WINAPI diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 6e301ee5207..5bad013d964 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -8,6 +8,21 @@ */ #include "kbswitch.h" +#include <imm.h> + +/* + * This program kbswitch is a mimic of Win2k's internat.exe. + * However, there are some differences. + * + * Comparing with WinNT4 ActivateKeyboardLayout, WinXP ActivateKeyboardLayout has + * process boundary, so we cannot activate the IME keyboard layout from the outer process. + * It needs special care. + * + * We use global hook by our kbsdll.dll, to watch the shell and the windows. + * + * It might not work correctly on Vista+ because keyboard layout change notification + * won't be generated in Vista+. + */ #define WM_NOTIFYICONMSG (WM_USER + 248) @@ -20,6 +35,7 @@ HANDLE hProcessHeap; HMODULE g_hHookDLL = NULL; ULONG ulCurrentLayoutNum = 1; HICON g_hTrayIcon = NULL; +HWND g_hwndLastActive = NULL; static BOOL GetLayoutID(LPCTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength) @@ -65,6 +81,17 @@ GetLayoutID(LPCTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength) return TRUE; } +static BOOL +GetSystemLibraryPath(LPTSTR szPath, SIZE_T cchPath, LPCTSTR FileName) +{ + if (!GetSystemDirectory(szPath, cchPath)) + return FALSE; + + StringCchCat(szPath, cchPath, TEXT("\\")); + StringCchCat(szPath, cchPath, FileName); + return TRUE; +} + static BOOL GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) { @@ -131,18 +158,86 @@ GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) /* Otherwise, use "Layout Text" value as an entry name */ dwBufLen = NameLength * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, - (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) + (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS) { RegCloseKey(hKey); - return TRUE; + return FALSE; } RegCloseKey(hKey); - return FALSE; + return TRUE; +} + +static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szLCID) +{ + HKEY hKey; + DWORD dwBufLen; + TCHAR szBuf[MAX_PATH]; + + szImeFile[0] = UNICODE_NULL; + + if (_tcslen(szLCID) != CCH_LAYOUT_ID) + return FALSE; /* Invalid LCID */ + + if (szLCID[0] != TEXT('E') && szLCID[0] != TEXT('e')) + return FALSE; /* Not an IME HKL */ + + StringCchPrintf(szBuf, ARRAYSIZE(szBuf), + _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwBufLen = cchImeFile * sizeof(TCHAR); + if (RegQueryValueEx(hKey, _T("IME File"), NULL, NULL, + (LPBYTE)szImeFile, &dwBufLen) != ERROR_SUCCESS) + { + szImeFile[0] = UNICODE_NULL; + } + + RegCloseKey(hKey); + + return (szImeFile[0] != UNICODE_NULL); +} + +typedef struct tagLOAD_ICON +{ + INT cxIcon, cyIcon; + HICON hIcon; +} LOAD_ICON, *PLOAD_ICON; + +static BOOL CALLBACK +EnumResNameProc( + HMODULE hModule, + LPCTSTR lpszType, + LPTSTR lpszName, + LPARAM lParam) +{ + PLOAD_ICON pLoadIcon = (PLOAD_ICON)lParam; + pLoadIcon->hIcon = (HICON)LoadImage(hModule, lpszName, IMAGE_ICON, + pLoadIcon->cxIcon, pLoadIcon->cyIcon, + LR_DEFAULTCOLOR); + if (pLoadIcon->hIcon) + return FALSE; /* Stop enumeration */ + return TRUE; +} + +static HICON FakeExtractIcon(LPCTSTR szIconPath, INT cxIcon, INT cyIcon) +{ + LOAD_ICON LoadIcon = { cxIcon, cyIcon, NULL }; + HMODULE hImeDLL = LoadLibraryEx(szIconPath, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (hImeDLL) + { + EnumResourceNames(hImeDLL, RT_GROUP_ICON, EnumResNameProc, (LPARAM)&LoadIcon); + FreeLibrary(hImeDLL); + } + return LoadIcon.hIcon; } static HICON -CreateTrayIcon(LPTSTR szLCID) +CreateTrayIcon(LPTSTR szLCID, LPCTSTR szImeFile OPTIONAL) { LANGID LangID; TCHAR szBuf[4]; @@ -155,6 +250,13 @@ CreateTrayIcon(LPTSTR szLCID) HICON hIcon; INT cxIcon = GetSystemMetrics(SM_CXSMICON); INT cyIcon = GetSystemMetrics(SM_CYSMICON); + TCHAR szPath[MAX_PATH]; + + if (szImeFile && szImeFile[0]) + { + if (GetSystemLibraryPath(szPath, ARRAYSIZE(szPath), szImeFile)) + return FakeExtractIcon(szPath, cxIcon, cyIcon); + } /* Getting "EN", "FR", etc. from English, French, ... */ LangID = LANGIDFROMLCID(_tcstoul(szLCID, NULL, 16)); @@ -236,12 +338,14 @@ AddTrayIcon(HWND hwnd) { NOTIFYICONDATA tnid = { sizeof(tnid), hwnd, 1, NIF_ICON | NIF_MESSAGE | NIF_TIP }; TCHAR szLCID[CCH_LAYOUT_ID + 1], szName[MAX_PATH]; + TCHAR szImeFile[80]; GetLayoutID(_T("1"), szLCID, ARRAYSIZE(szLCID)); GetLayoutName(_T("1"), szName, ARRAYSIZE(szName)); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = CreateTrayIcon(szLCID); + tnid.hIcon = CreateTrayIcon(szLCID, szImeFile); StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_ADD, &tnid); @@ -268,9 +372,12 @@ static VOID UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) { NOTIFYICONDATA tnid = { sizeof(tnid), hwnd, 1, NIF_ICON | NIF_MESSAGE | NIF_TIP }; + TCHAR szImeFile[80]; + + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = CreateTrayIcon(szLCID); + tnid.hIcon = CreateTrayIcon(szLCID, szImeFile); StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_MODIFY, &tnid); @@ -289,12 +396,12 @@ GetLayoutIDByHkl(HKL hKl, LPTSTR szLayoutID, SIZE_T LayoutIDLength) static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) { - PostMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); + PostMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, INPUTLANGCHANGE_SYSCHARSET, lParam); return TRUE; } static VOID -ActivateLayout(HWND hwnd, ULONG uLayoutNum) +ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL) { HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLCID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH]; @@ -311,10 +418,24 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum) /* Switch to the new keyboard layout */ GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName)); UpdateTrayIcon(hwnd, szLCID, szLangName); + + if (hwndTarget) + SetForegroundWindow(hwndTarget); + hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); + if (hKl) + ActivateKeyboardLayout(hKl, KLF_SETFORPROCESS); - /* Post WM_INPUTLANGCHANGEREQUEST to every top-level window */ - EnumWindows(EnumWindowsProc, (LPARAM) hKl); + /* Post WM_INPUTLANGCHANGEREQUEST */ + if (hwndTarget) + { + PostMessage(hwndTarget, WM_INPUTLANGCHANGEREQUEST, + INPUTLANGCHANGE_SYSCHARSET, (LPARAM)hKl); + } + else + { + EnumWindows(EnumWindowsProc, (LPARAM) hKl); + } ulCurrentLayoutNum = uLayoutNum; } @@ -411,8 +532,16 @@ SetHooks(VOID) VOID DeleteHooks(VOID) { - if (KbSwitchDeleteHooks) KbSwitchDeleteHooks(); - if (g_hHookDLL) FreeLibrary(g_hHookDLL); + if (KbSwitchDeleteHooks) + { + KbSwitchDeleteHooks(); + KbSwitchDeleteHooks = NULL; + } + if (g_hHookDLL) + { + FreeLibrary(g_hHookDLL); + g_hHookDLL = NULL; + } } ULONG @@ -436,7 +565,7 @@ GetNextLayout(VOID) return ulCurrentLayoutNum; } -LRESULT +UINT UpdateLanguageDisplay(HWND hwnd, HKL hKl) { TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; @@ -450,12 +579,76 @@ UpdateLanguageDisplay(HWND hwnd, HKL hKl) return 0; } -LRESULT -UpdateLanguageDisplayCurrent(HWND hwnd, WPARAM wParam) +HWND +GetTargetWindow(HWND hwndFore) +{ + TCHAR szClass[64]; + HWND hwndIME; + HWND hwndTarget = hwndFore; + if (hwndTarget == NULL) + hwndTarget = GetForegroundWindow(); + + GetClassName(hwndTarget, szClass, ARRAYSIZE(szClass)); + if (_tcsicmp(szClass, szKbSwitcherName) == 0) + hwndTarget = g_hwndLastActive; + + hwndIME = ImmGetDefaultIMEWnd(hwndTarget); + return (hwndIME ? hwndIME : hwndTarget); +} + +UINT +UpdateLanguageDisplayCurrent(HWND hwnd, HWND hwndFore) { - DWORD dwThreadID = GetWindowThreadProcessId((HWND)wParam, 0); + DWORD dwThreadID = GetWindowThreadProcessId(GetTargetWindow(hwndFore), NULL); HKL hKL = GetKeyboardLayout(dwThreadID); - return UpdateLanguageDisplay(hwnd, hKL); + UpdateLanguageDisplay(hwnd, hKL); + + if (IsWindow(g_hwndLastActive)) + SetForegroundWindow(g_hwndLastActive); + + return 0; +} + +static UINT GetCurLayoutNum(HKL hKL) +{ + UINT i, nCount; + HKL ahKL[256]; + + nCount = GetKeyboardLayoutList(ARRAYSIZE(ahKL), ahKL); + for (i = 0; i < nCount; ++i) + { + if (ahKL[i] == hKL) + return i + 1; + } + + return 0; +} + +static BOOL RememberLastActive(HWND hwnd, HWND hwndFore) +{ + TCHAR szClass[64]; + + hwndFore = GetAncestor(hwndFore, GA_ROOT); + + if (!IsWindowVisible(hwndFore) || !GetClassName(hwndFore, szClass, ARRAYSIZE(szClass))) + return FALSE; + + if (_tcsicmp(szClass, szKbSwitcherName) == 0 || + _tcsicmp(szClass, TEXT("Shell_TrayWnd")) == 0) + { + return FALSE; /* Special window */ + } + + /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and + DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + if (_tcsicmp(szClass, TEXT("ConsoleWindowClass")) == 0) + { + HKL hKL = GetKeyboardLayout(0); + UpdateLanguageDisplay(hwnd, hKL); + } + + g_hwndLastActive = hwndFore; + return TRUE; } LRESULT CALLBACK @@ -471,31 +664,30 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_CREATE: { if (!SetHooks()) + { + MessageBox(NULL, TEXT("SetHooks failed."), NULL, MB_ICONERROR); return -1; + } AddTrayIcon(hwnd); - ActivateLayout(hwnd, ulCurrentLayoutNum); + ActivateLayout(hwnd, ulCurrentLayoutNum, NULL); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); break; } - case WM_LANG_CHANGED: - { - return UpdateLanguageDisplay(hwnd, (HKL)lParam); - } - - case WM_LOAD_LAYOUT: + case WM_LANG_CHANGED: /* Comes from kbsdll.dll and this module */ { - ULONG uNextNum = GetNextLayout(); - if (ulCurrentLayoutNum != uNextNum) - ActivateLayout(hwnd, uNextNum); + UpdateLanguageDisplay(hwnd, (HKL)lParam); break; } - case WM_WINDOW_ACTIVATE: + case WM_WINDOW_ACTIVATE: /* Comes from kbsdll.dll and this module */ { - return UpdateLanguageDisplayCurrent(hwnd, wParam); + HWND hwndFore = GetForegroundWindow(); + if (RememberLastActive(hwnd, hwndFore)) + return UpdateLanguageDisplayCurrent(hwnd, hwndFore); + break; } case WM_NOTIFYICONMSG: @@ -537,32 +729,73 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { case ID_EXIT: { - SendMessage(hwnd, WM_CLOSE, 0, 0); + PostMessage(hwnd, WM_CLOSE, 0, 0); break; } case ID_PREFERENCES: { - SHELLEXECUTEINFO shInputDll = { sizeof(shInputDll) }; - shInputDll.hwnd = hwnd; - shInputDll.lpVerb = _T("open"); - shInputDll.lpFile = _T("rundll32.exe"); - shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll"); - if (!ShellExecuteEx(&shInputDll)) - MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR); - + INT_PTR ret = (INT_PTR)ShellExecute(hwnd, NULL, + TEXT("control.exe"), TEXT("input.dll"), + NULL, SW_SHOWNORMAL); + if (ret <= 32) + MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_ICONERROR); break; } case ID_NEXTLAYOUT: { - ActivateLayout(hwnd, GetNextLayout()); + HWND hwndTarget = (HWND)lParam, hwndTargetSave = NULL; + DWORD dwThreadID; + HKL hKL; + UINT uNum; + TCHAR szClass[64]; + BOOL bCONWND = FALSE; + + if (hwndTarget == NULL) + hwndTarget = g_hwndLastActive; + + /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and + DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + if (hwndTarget && + GetClassName(hwndTarget, szClass, ARRAYSIZE(szClass)) && + _tcsicmp(szClass, TEXT("ConsoleWindowClass")) == 0) + { + bCONWND = TRUE; + hwndTargetSave = hwndTarget; + hwndTarget = NULL; + } + + if (hwndTarget) + { + dwThreadID = GetWindowThreadProcessId(hwndTarget, NULL); + hKL = GetKeyboardLayout(dwThreadID); + uNum = GetCurLayoutNum(hKL); + if (uNum != 0) + ulCurrentLayoutNum = uNum; + } + + ActivateLayout(hwnd, GetNextLayout(), hwndTarget); + + /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and + DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + if (bCONWND) + { + ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave); + } break; } default: { - ActivateLayout(hwnd, LOWORD(wParam)); + if (1 <= LOWORD(wParam) && LOWORD(wParam) <= 1000) + { + if (!IsWindow(g_hwndLastActive)) + { + g_hwndLastActive = NULL; + } + ActivateLayout(hwnd, LOWORD(wParam), g_hwndLastActive); + } break; } } @@ -570,13 +803,10 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case WM_SETTINGCHANGE: { - if (wParam == SPI_SETDEFAULTINPUTLANG) - { - //FIXME: Should detect default language changes by CPL applet or by other tools and update UI - } if (wParam == SPI_SETNONCLIENTMETRICS) { - return UpdateLanguageDisplayCurrent(hwnd, wParam); + PostMessage(hwnd, WM_WINDOW_ACTIVATE, wParam, lParam); + break; } } break; @@ -597,9 +827,13 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) AddTrayIcon(hwnd); break; } - else if (Message == ShellHookMessage && wParam == HSHELL_LANGUAGE) + else if (Message == ShellHookMessage) { - PostMessage(hwnd, WM_LANG_CHANGED, wParam, lParam); + if (wParam == HSHELL_LANGUAGE) + PostMessage(hwnd, WM_LANG_CHANGED, wParam, lParam); + else if (wParam == HSHELL_WINDOWACTIVATED) + PostMessage(hwnd, WM_WINDOW_ACTIVATE, wParam, lParam); + break; } return DefWindowProc(hwnd, Message, wParam, lParam); diff --git a/base/applications/kbswitch/kbswitch.h b/base/applications/kbswitch/kbswitch.h index 10d295401fb..91906a08e6b 100644 --- a/base/applications/kbswitch/kbswitch.h +++ b/base/applications/kbswitch/kbswitch.h @@ -22,7 +22,6 @@ #define WM_KEY_PRESSED (WM_USER + 10100) #define WM_LANG_CHANGED (WM_USER + 10200) #define WM_WINDOW_ACTIVATE (WM_USER + 10300) -#define WM_LOAD_LAYOUT (WM_USER + 10400) typedef BOOL (WINAPI *PKBSWITCHSETHOOKS) (VOID); typedef VOID (WINAPI *PKBSWITCHDELETEHOOKS) (VOID); diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 94dd369103b..9a279240f3c 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -124,11 +124,6 @@ public: return TRUE; } - LRESULT OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - return MA_NOACTIVATE; - } - BOOL GetMinimumSize(IN OUT PSIZE pSize) { SIZE szClock = { 0, 0 }; @@ -350,7 +345,6 @@ public: BEGIN_MSG_MAP(CTrayNotifyWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate) MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) diff --git a/dll/cpl/input/input_list.c b/dll/cpl/input/input_list.c index ec415b372fe..49347d841dc 100644 --- a/dll/cpl/input/input_list.c +++ b/dll/cpl/input/input_list.c @@ -423,6 +423,9 @@ InputList_Process(VOID) { bRet = InputList_SetFontSubstitutes(pCurrent->pLocale->dwId); InputList_AddInputMethodToUserRegistry(hPreloadKey, hSubstKey, 1, pCurrent); + + /* Activate the DEFAULT entry */ + ActivateKeyboardLayout(pCurrent->hkl, KLF_RESET); break; } } @@ -450,12 +453,12 @@ InputList_Process(VOID) /* Change the default keyboard language */ if (SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &pCurrent->hkl, 0)) { - DWORD dwRecipients = BSM_ALLCOMPONENTS | BSM_ALLDESKTOPS; + DWORD dwRecipients = BSM_ALLDESKTOPS | BSM_APPLICATIONS; BroadcastSystemMessageW(BSF_POSTMESSAGE, &dwRecipients, WM_INPUTLANGCHANGEREQUEST, - 0, + INPUTLANGCHANGE_SYSCHARSET, (LPARAM)pCurrent->hkl); } diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 9d2021a70eb..e9a44f44bd9 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -960,7 +960,7 @@ IntDefWindowProc( if (hwndSwitch) { #define ID_NEXTLAYOUT 10003 - UserPostMessage(hwndSwitch, WM_COMMAND, ID_NEXTLAYOUT, 0); + UserPostMessage(hwndSwitch, WM_COMMAND, ID_NEXTLAYOUT, (LPARAM)UserHMGetHandle(Wnd)); } } } diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 8b6f67c7e9d..d265711f261 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -2356,6 +2356,11 @@ ConWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProcW(hWnd, msg, wParam, lParam); } + /* Detect Alt+Shift */ + if (wParam == VK_SHIFT && (msg == WM_SYSKEYDOWN || msg == WM_SYSKEYUP)) + { + return DefWindowProcW(hWnd, msg, wParam, lParam); + } OnKey(GuiData, msg, wParam, lParam); break;

2 years, 1 month

[reactos] 01/01: [BROWSEUI] Fix CAutoComplete use after free

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a06f10d0c0f0c95f2416f… commit a06f10d0c0f0c95f2416fba2b73ba578ceb85af7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Oct 20 19:51:47 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Oct 27 23:45:18 2022 +0200 [BROWSEUI] Fix CAutoComplete use after free CORE-18395 --- dll/win32/browseui/CAutoComplete.cpp | 16 ++++++++++++---- dll/win32/browseui/CAutoComplete.h | 6 ++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index f9929870085..6bb970c87f8 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -1,7 +1,7 @@ /* * AutoComplete interfaces implementation. * - * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> + * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * @@ -1549,7 +1549,7 @@ LRESULT CAutoComplete::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b m_hFont = reinterpret_cast<HFONT>(::GetStockObject(DEFAULT_GUI_FONT)); m_hwndList.SetFont(m_hFont); - // add reference to CAutoComplete::m_hWnd + // add reference so we won't be deleted during message processing AddRef(); return 0; // success } @@ -1575,11 +1575,19 @@ LRESULT CAutoComplete::OnNCDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL // clean up m_hwndCombo = NULL; - // remove reference to CAutoComplete::m_hWnd - Release(); + + // Tell ATL to clean up + bHandled = 0; + return 0; } +VOID CAutoComplete::OnFinalMessage(HWND) +{ + // The message loop is finished, now we can safely destruct! + Release(); +} + // WM_EXITSIZEMOVE // This message is sent once to a window after it has exited the moving or sizing mode. LRESULT CAutoComplete::OnExitSizeMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index 97d633c5db2..b8370f899a0 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -1,7 +1,7 @@ /* * AutoComplete interfaces implementation. * - * Copyright 2004 Maxime Belleng� <maxime.bellenge(a)laposte.net> + * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> * Copyright 2009 Andrew Hill * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * @@ -156,9 +156,9 @@ public: // public methods CAutoComplete(); - HWND CreateDropDown(); virtual ~CAutoComplete(); + HWND CreateDropDown(); BOOL CanAutoSuggest() const; BOOL CanAutoAppend() const; BOOL UseTab() const; @@ -284,6 +284,8 @@ protected: LRESULT OnAutoCompStart(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnAutoCompFinish(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + virtual VOID OnFinalMessage(HWND) override; + DECLARE_REGISTRY_RESOURCEID(IDR_AUTOCOMPLETE) DECLARE_NOT_AGGREGATABLE(CAutoComplete) DECLARE_PROTECT_FINAL_CONSTRUCT()

2 years, 1 month

[reactos] 01/01: [DBGHELP] Add ARM64 definitions into compat.h (#4810)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98b90e73944dd9f2fb04c… commit 98b90e73944dd9f2fb04cf2efec7a2e94351ef80 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Thu Oct 27 08:14:10 2022 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 27 18:14:10 2022 +0300 [DBGHELP] Add ARM64 definitions into compat.h (#4810) This fixes ARM64 build in preparation for PR #4809. CORE-18200 --- dll/win32/dbghelp/compat.h | 143 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index f7bef66bc91..02e693f62a5 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -450,7 +450,7 @@ typedef struct _CONTEXT { DWORD64 LastExceptionFromRip; } CONTEXT; -#elif defined TARGET_arm /* ARM? */ +#elif defined TARGET_arm /* The following flags control the contents of the CONTEXT structure. */ @@ -549,6 +549,147 @@ typedef struct _CONTEXT { BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); + +#elif defined TARGET_arm64 + +#define CONTEXT_ARM64 0x00400000L +#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x1L) +#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x2L) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x4L) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x8L) +#define CONTEXT_X18 (CONTEXT_ARM64 | 0x10L) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +typedef union NEON128 { + struct { + ULONGLONG Low; + LONGLONG High; + } DUMMYSTRUCTNAME; + double D[2]; + float S[4]; + WORD H[8]; + BYTE B[16]; +} NEON128, *PNEON128; + +#define ARM64_MAX_BREAKPOINTS 8 +#define ARM64_MAX_WATCHPOINTS 2 + +typedef struct _CONTEXT { + + // + // Control flags. + // + + DWORD ContextFlags; + + // + // Integer registers + // + + DWORD Cpsr; + union { + struct { + DWORD64 X0; + DWORD64 X1; + DWORD64 X2; + DWORD64 X3; + DWORD64 X4; + DWORD64 X5; + DWORD64 X6; + DWORD64 X7; + DWORD64 X8; + DWORD64 X9; + DWORD64 X10; + DWORD64 X11; + DWORD64 X12; + DWORD64 X13; + DWORD64 X14; + DWORD64 X15; + DWORD64 X16; + DWORD64 X17; + DWORD64 X18; + DWORD64 X19; + DWORD64 X20; + DWORD64 X21; + DWORD64 X22; + DWORD64 X23; + DWORD64 X24; + DWORD64 X25; + DWORD64 X26; + DWORD64 X27; + DWORD64 X28; + DWORD64 Fp; + DWORD64 Lr; + } DUMMYSTRUCTNAME; + DWORD64 X[31]; + } DUMMYUNIONNAME; + + DWORD64 Sp; + DWORD64 Pc; + + // + // Floating Point/NEON Registers + // + + NEON128 V[32]; + DWORD Fpcr; + DWORD Fpsr; + + // + // Debug registers + // + + DWORD Bcr[ARM64_MAX_BREAKPOINTS]; + DWORD64 Bvr[ARM64_MAX_BREAKPOINTS]; + DWORD Wcr[ARM64_MAX_WATCHPOINTS]; + DWORD64 Wvr[ARM64_MAX_WATCHPOINTS]; + +} _CONTEXT, *P_CONTEXT; +typedef _CONTEXT CONTEXT, *PCONTEXT; + +typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY { + DWORD BeginAddress; + union { + DWORD UnwindData; + struct { + DWORD Flag : 2; + DWORD FunctionLength : 11; + DWORD RegF : 3; + DWORD RegI : 4; + DWORD H : 1; + DWORD CR : 2; + DWORD FrameSize : 9; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; +} IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY, * PIMAGE_ARM64_RUNTIME_FUNCTION_ENTRY; +typedef struct _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY { + ULONG_PTR ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE { + DWORD Count; + BYTE LocalHint; + BYTE GlobalHint; + BYTE Search; + BYTE Once; + ULONG_PTR LowAddress; + ULONG_PTR HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); +BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); + #else #error "Unknown target platform"

2 years, 1 month

[reactos] 01/01: [CONTRIBUTING] Fix broken hash links. (#4816)

by Tuur Martens

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df77f88f0ddc9c337a374… commit df77f88f0ddc9c337a3743eb549a518459cc6615 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Thu Oct 27 16:37:16 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 27 16:37:16 2022 +0200 [CONTRIBUTING] Fix broken hash links. (#4816) These links did not actually work, as GitHub expected no question mark, but we did provide one. --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 73ea943e487..2792d14bdcb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,9 +2,9 @@ There are several ways to contribute to the development of ReactOS. The most often encountered problem is not knowing where to begin or what to do. If you are able to program or understand the technical information that is pertinent to this project, helping the development can be easy. -- [What To Do?](#what-to-do?) -- [How To Contribute?](#how-to-contribute?) -- [Where To Start?](#where-to-start?) +- [What To Do?](#what-to-do) +- [How To Contribute?](#how-to-contribute) +- [Where To Start?](#where-to-start) **Legal notice:** If you have seen Microsoft Windows source code, your contribution won't be accepted because of potential copyright violation. Before contributing, you must affirm that the following is true: >I hereby swear that I have not used nor seen the source code to any version of the Windows operating system

2 years, 1 month

[reactos] 01/01: [NTUSER] Support SM_DBCSENABLED and SM_IMMENABLED (#4806)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a8ddbf1479f67f93225a… commit 7a8ddbf1479f67f93225abf6c2a57a8aef6efcf5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 27 21:53:58 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 27 21:53:58 2022 +0900 [NTUSER] Support SM_DBCSENABLED and SM_IMMENABLED (#4806) - Don't set SRVINFO_CICERO_ENABLED flag because we don't have Cicero support. - Improve UserGetSystemMetrics for SM_DBCSENABLED and SM_IMMENABLED. - Delete useless UserIsDBCSEnabled function. CORE-11700 --- win32ss/user/ntuser/metric.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c index a50d10df4c8..b9801486024 100644 --- a/win32ss/user/ntuser/metric.c +++ b/win32ss/user/ntuser/metric.c @@ -14,20 +14,6 @@ static BOOL Setup = FALSE; /* FUNCTIONS *****************************************************************/ -BOOL APIENTRY UserIsDBCSEnabled(VOID) -{ - switch (PRIMARYLANGID(gusLanguageID)) - { - case LANG_CHINESE: - case LANG_JAPANESE: - case LANG_KOREAN: - return TRUE; - - default: - return FALSE; - } -} - BOOL NTAPI InitMetrics(VOID) @@ -164,12 +150,12 @@ InitMetrics(VOID) piSysMet[SM_NETWORK] = 3; piSysMet[SM_SLOWMACHINE] = 0; piSysMet[SM_SECURE] = 0; - piSysMet[SM_DBCSENABLED] = UserIsDBCSEnabled(); + piSysMet[SM_DBCSENABLED] = NLS_MB_CODE_PAGE_TAG; piSysMet[SM_SHOWSOUNDS] = gspv.bShowSounds; piSysMet[SM_MIDEASTENABLED] = 0; piSysMet[SM_CMONITORS] = 1; piSysMet[SM_SAMEDISPLAYFORMAT] = 1; - piSysMet[SM_IMMENABLED] = 0; + piSysMet[SM_IMMENABLED] = NLS_MB_CODE_PAGE_TAG; /* Reserved */ piSysMet[SM_RESERVED1] = 0; @@ -183,7 +169,13 @@ InitMetrics(VOID) piSysMet[90] = 0; #endif - gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED; + /*gpsi->dwSRVIFlags |= SRVINFO_CICERO_ENABLED;*/ /* Cicero is not supported yet */ + + if (NLS_MB_CODE_PAGE_TAG) /* Is the system multi-byte codepage? */ + { + gpsi->dwSRVIFlags |= (SRVINFO_DBCSENABLED | SRVINFO_IMM32); /* DBCS+IME Support */ + } + Setup = TRUE; return TRUE; @@ -198,7 +190,10 @@ UserGetSystemMetrics(ULONG Index) TRACE("UserGetSystemMetrics(%lu)\n", Index); if (Index == SM_DBCSENABLED) - return UserIsDBCSEnabled(); + return !!(gpsi->dwSRVIFlags & SRVINFO_DBCSENABLED); + + if (Index == SM_IMMENABLED) + return !!(gpsi->dwSRVIFlags & SRVINFO_IMM32); /* Get metrics from array */ if (Index < SM_CMETRICS)

2 years, 1 month

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 October 2022