Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 01/01: [USER32] Implement ImeWnd_OnImeControl (#4320)
by Katayama Hirofumi MZ 29 Jan '22

29 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fc83b4361a5ae6bf0ce8… commit 3fc83b4361a5ae6bf0ce88d82248296bf2276ebc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 29 10:35:48 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 29 10:35:48 2022 +0900 [USER32] Implement ImeWnd_OnImeControl (#4320) - Add IMC_GETCONVERSIONMODE, IMC_GETSENTENCEMODE, IMC_GETOPENSTATUS, IMC_GETSOFTKBDPOS, and IMC_SETSOFTKBDPOS macros into <ddk/imm.h>. - Implement WM_IME_CONTROL message handling of the IME window. CORE-11700 --- sdk/include/reactos/wine/ddk/imm.h | 7 +++ win32ss/user/user32/misc/imm.c | 126 ++++++++++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 3 deletions(-) diff --git a/sdk/include/reactos/wine/ddk/imm.h b/sdk/include/reactos/wine/ddk/imm.h index 33ed8e49a82..4f5e16a3568 100644 --- a/sdk/include/reactos/wine/ddk/imm.h +++ b/sdk/include/reactos/wine/ddk/imm.h @@ -24,6 +24,13 @@ #include <psdk/imm.h> +/* wParam for WM_IME_CONTROL */ +#define IMC_GETCONVERSIONMODE 0x0001 +#define IMC_GETSENTENCEMODE 0x0003 +#define IMC_GETOPENSTATUS 0x0005 +#define IMC_GETSOFTKBDPOS 0x0013 +#define IMC_SETSOFTKBDPOS 0x0014 + typedef struct _tagINPUTCONTEXT { HWND hWnd; BOOL fOpen; diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 8a7a5eb7c14..13f749926b4 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -341,7 +341,7 @@ static VOID User32DestroyImeUIWindow(PIMEUI pimeui) pimeui->hwndUI = NULL; } -VOID ImeWnd_OnImeSelect(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) +static VOID ImeWnd_OnImeSelect(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) { HKL hKL; HWND hwndUI, hwndIMC = pimeui->hwndIMC; @@ -370,6 +370,127 @@ VOID ImeWnd_OnImeSelect(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) } } +static LRESULT +ImeWnd_OnImeControl(PIMEUI pimeui, WPARAM wParam, LPARAM lParam, BOOL unicode) +{ + HIMC hIMC = pimeui->hIMC; + DWORD dwConversion, dwSentence; + POINT pt; + + if (!hIMC) + return 0; + + switch (wParam) + { + case IMC_GETCONVERSIONMODE: + if (!IMM_FN(ImmGetConversionStatus)(hIMC, &dwConversion, &dwSentence)) + return 1; + return dwConversion; + + case IMC_GETSENTENCEMODE: + if (!IMM_FN(ImmGetConversionStatus)(hIMC, &dwConversion, &dwSentence)) + return 1; + return dwSentence; + + case IMC_GETOPENSTATUS: + return IMM_FN(ImmGetOpenStatus)(hIMC); + + case IMC_SETCONVERSIONMODE: + if (!IMM_FN(ImmGetConversionStatus)(hIMC, &dwConversion, &dwSentence) || + !IMM_FN(ImmSetConversionStatus)(hIMC, (DWORD)lParam, dwSentence)) + { + return 1; + } + break; + + case IMC_SETSENTENCEMODE: + if (!IMM_FN(ImmGetConversionStatus)(hIMC, &dwConversion, &dwSentence) || + !IMM_FN(ImmSetConversionStatus)(hIMC, dwConversion, (DWORD)lParam)) + { + return 1; + } + break; + + case IMC_SETOPENSTATUS: + if (!IMM_FN(ImmSetOpenStatus)(hIMC, (BOOL)lParam)) + return 1; + break; + + case IMC_GETCANDIDATEPOS: + case IMC_GETCOMPOSITIONWINDOW: + case IMC_GETSOFTKBDPOS: + case IMC_SETSOFTKBDPOS: + case IMC_GETSTATUSWINDOWPOS: + return User32SendImeUIMessage(pimeui, WM_IME_CONTROL, wParam, lParam, unicode); + + case IMC_SETCANDIDATEPOS: + if (!IMM_FN(ImmSetCandidateWindow)(hIMC, (LPCANDIDATEFORM)lParam)) + return 1; + break; + + case IMC_GETCOMPOSITIONFONT: + if (unicode) + { + if (!IMM_FN(ImmGetCompositionFontW)(hIMC, (LPLOGFONTW)lParam)) + return 1; + } + else + { + if (!IMM_FN(ImmGetCompositionFontA)(hIMC, (LPLOGFONTA)lParam)) + return 1; + } + break; + + case IMC_SETCOMPOSITIONFONT: + if (unicode) + { + if (!IMM_FN(ImmSetCompositionFontW)(hIMC, (LPLOGFONTW)lParam)) + return 1; + } + else + { + if (!IMM_FN(ImmSetCompositionFontA)(hIMC, (LPLOGFONTA)lParam)) + return 1; + } + break; + + case IMC_SETCOMPOSITIONWINDOW: + if (!IMM_FN(ImmSetCompositionWindow)(hIMC, (LPCOMPOSITIONFORM)lParam)) + return 1; + break; + + case IMC_SETSTATUSWINDOWPOS: + pt.x = GET_X_LPARAM(lParam); + pt.y = GET_Y_LPARAM(lParam); + if (!IMM_FN(ImmSetStatusWindowPos)(hIMC, &pt)) + return 1; + break; + + case IMC_CLOSESTATUSWINDOW: + if (pimeui->fShowStatus && User32GetImeShowStatus()) + { + pimeui->fShowStatus = FALSE; + User32SendImeUIMessage(pimeui, WM_IME_NOTIFY, IMN_CLOSESTATUSWINDOW, 0, TRUE); + } + pimeui->fCtrlShowStatus = FALSE; + break; + + case IMC_OPENSTATUSWINDOW: + if (!pimeui->fShowStatus && User32GetImeShowStatus()) + { + pimeui->fShowStatus = TRUE; + User32SendImeUIMessage(pimeui, WM_IME_NOTIFY, IMN_OPENSTATUSWINDOW, 0, TRUE); + } + pimeui->fCtrlShowStatus = TRUE; + break; + + default: + break; + } + + return 0; +} + LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS { PWND pWnd; @@ -467,8 +588,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return User32SendImeUIMessage(pimeui, msg, wParam, lParam, unicode); case WM_IME_CONTROL: - // TODO: - break; + return ImeWnd_OnImeControl(pimeui, wParam, lParam, unicode); case WM_IME_NOTIFY: return ImeWnd_OnImeNotify(pimeui, wParam, lParam);

1 0

[reactos] 01/01: [USER32] Implement ImeWnd_OnImeNotify (#4318)
by Katayama Hirofumi MZ 28 Jan '22

28 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82136b3ee4c4164d02c68… commit 82136b3ee4c4164d02c68bf66ae3d2961661621f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 28 19:21:21 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 28 19:21:21 2022 +0900 [USER32] Implement ImeWnd_OnImeNotify (#4318) - Modify CMakeLists.txt to include <ddk/imm.h> - Implement WM_IME_NOTIFY message handling of the IME window. CORE-11700 --- win32ss/user/user32/CMakeLists.txt | 1 + win32ss/user/user32/misc/imm.c | 46 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index fb2655dcf6c..4cf9620a5c8 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -4,6 +4,7 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB) include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys include + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine ${REACTOS_SOURCE_DIR}/win32ss/include) list(APPEND SOURCE diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 7e70167b277..8a7a5eb7c14 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -11,6 +11,7 @@ #include <user32.h> #include <strsafe.h> +#include <ddk/imm.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); @@ -209,6 +210,48 @@ static VOID User32UpdateImcOfImeUI(PIMEUI pimeui, HIMC hNewIMC) User32SetImeWindowOfImc(hNewIMC, hImeWnd); } +static LRESULT ImeWnd_OnImeNotify(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret = 0; + HIMC hIMC; + LPINPUTCONTEXT pIC; + HWND hwndUI, hwndIMC; + + switch (wParam) + { + case IMN_SETCONVERSIONMODE: + case IMN_SETOPENSTATUS: + hIMC = pimeui->hIMC; + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (pIC) + { + hwndIMC = pimeui->hwndIMC; + if (IsWindow(hwndIMC)) + { + NtUserNotifyIMEStatus(hwndIMC, pIC->fOpen, pIC->fdwConversion); + } + else + { + // TODO: + } + + IMM_FN(ImmUnlockIMC)(hIMC); + } + /* FALL THROUGH */ + default: + ret = User32SendImeUIMessage(pimeui, WM_IME_NOTIFY, wParam, lParam, TRUE); + break; + + case IMN_PRIVATE: + hwndUI = pimeui->hwndUI; + if (IsWindow(hwndUI)) + ret = SendMessageW(hwndUI, WM_IME_NOTIFY, wParam, lParam); + break; + } + + return ret; +} + static HWND User32CreateImeUIWindow(PIMEUI pimeui, HKL hKL) { IMEINFOEX ImeInfoEx; @@ -428,8 +471,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_IME_NOTIFY: - // TODO: - break; + return ImeWnd_OnImeNotify(pimeui, wParam, lParam); case WM_IME_REQUEST: break;

1 0

[reactos] 01/01: [CRYPTUI] RC Addendum to 0.4.15-dev-3739-gff9301e CORE-18017
by Joachim Henze 28 Jan '22

28 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a496c39919569945ee62… commit 6a496c39919569945ee623549015253a03779a77 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Jan 28 02:10:40 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Jan 28 02:10:40 2022 +0100 [CRYPTUI] RC Addendum to 0.4.15-dev-3739-gff9301e CORE-18017 Strip the backslash to avoid GCC8.4.0 RosBE2.2.1 warning: [104/108] Building RC object dll/win32.../CMakeFiles/cryptui.dir/cryptui.rc.obj C:/ros/reactos/dll/win32/cryptui/lang/cryptui_En.rc:383: unrecognized escape sequence The glitch was introduced yesterday by 0.4.15-dev-3739-g ff9301e9db3215641d69d2b462d5cd0c48b8cb3f --- dll/win32/cryptui/lang/cryptui_En.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/cryptui/lang/cryptui_En.rc b/dll/win32/cryptui/lang/cryptui_En.rc index bdeb329cf7f..d20f90ba006 100644 --- a/dll/win32/cryptui/lang/cryptui_En.rc +++ b/dll/win32/cryptui/lang/cryptui_En.rc @@ -380,7 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\n\Computers can use certificates for identification and signing.", + LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\nComputers can use certificates for identification and signing.", -1, 115,40,195,120 END

1 0

[reactos] 01/01: [USER32] Implement User32CreateImeUI (#4316)
by Katayama Hirofumi MZ 27 Jan '22

27 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23bb27037d90c3d3c5a8a… commit 23bb27037d90c3d3c5a8a5441d93d0b922ac14fa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 27 21:19:37 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 27 21:19:37 2022 +0900 [USER32] Implement User32CreateImeUI (#4316) Implementing Japanese input... - Add User32CreateImeUIWindow, User32GetImeShowStatus, User32SendImeUIMessage, User32UpdateImcOfImeUI, User32SetImeWindowOfImc and User32NotifyOpenStatus helper functions. - Add WM_IME_SELECT, WM_IME_COMPOSITION, WM_IME_STARTCOMPOSITION and WM_IME_ENDCOMPOSITION message handling of the IME window. - Rename ImeWnd_OnDestroy as User32DestroyImeUIWindow. - Rename CheckIMCForWindow as User32CanSetImeWindowToImc. - Improve ImeWnd_OnCreate function. CORE-11700 --- win32ss/include/ntuser.h | 2 +- win32ss/user/user32/misc/imm.c | 171 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 157 insertions(+), 16 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 400830ab3e5..705f5aa08a9 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1200,7 +1200,7 @@ typedef struct tagIMEUI HWND hwndIMC; HKL hKL; HWND hwndUI; - INT nCntInIMEProc; + LONG nCntInIMEProc; struct { UINT fShowStatus:1; UINT fActivate:1; diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 26bc38cad4c..7e70167b277 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -133,29 +133,142 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) return IMM_FN(ImmRegisterClient)(&gSharedInfo, ghImm32); } -static BOOL CheckIMCForWindow(HIMC hIMC, HWND hWnd) +static BOOL User32CanSetImeWindowToImc(HIMC hIMC, HWND hImeWnd) { PIMC pIMC = ValidateHandle(hIMC, TYPE_INPUTCONTEXT); - return pIMC && (!pIMC->hImeWnd || pIMC->hImeWnd == hWnd || !ValidateHwnd(pIMC->hImeWnd)); + return pIMC && (!pIMC->hImeWnd || pIMC->hImeWnd == hImeWnd || !ValidateHwnd(pIMC->hImeWnd)); +} + +static BOOL User32GetImeShowStatus(VOID) +{ + return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_GETIMESHOWSTATUS); +} + +static LRESULT +User32SendImeUIMessage(PIMEUI pimeui, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode) +{ + LRESULT ret = 0; + HWND hwndUI = pimeui->hwndUI; + PWND pwnd, pwndUI; + + pwnd = pimeui->spwnd; + pwndUI = ValidateHwnd(hwndUI); + if (!pwnd || (pwnd->state & WNDS_DESTROYED) || (pwnd->state2 & WNDS2_INDESTROY) || + !pwndUI || (pwndUI->state & WNDS_DESTROYED) || (pwndUI->state2 & WNDS2_INDESTROY)) + { + return 0; + } + + InterlockedIncrement(&pimeui->nCntInIMEProc); + + if (unicode) + ret = SendMessageW(hwndUI, uMsg, wParam, lParam); + else + ret = SendMessageA(hwndUI, uMsg, wParam, lParam); + + InterlockedDecrement(&pimeui->nCntInIMEProc); + + return ret; +} + +static VOID User32NotifyOpenStatus(PIMEUI pimeui, HWND hwndIMC, BOOL bOpen) +{ + WPARAM wParam = (bOpen ? IMN_OPENSTATUSWINDOW : IMN_CLOSESTATUSWINDOW); + + pimeui->fShowStatus = bOpen; + + if (LOWORD(GetWin32ClientInfo()->dwExpWinVer) >= 0x400) + SendMessageW(hwndIMC, WM_IME_NOTIFY, wParam, 0); + else + User32SendImeUIMessage(pimeui, WM_IME_NOTIFY, wParam, 0, TRUE); +} + +static VOID User32SetImeWindowOfImc(HIMC hIMC, HWND hImeWnd) +{ + PIMC pIMC = ValidateHandle(hIMC, TYPE_INPUTCONTEXT); + if (!pIMC || pIMC->hImeWnd == hImeWnd) + return; + + NtUserUpdateInputContext(hIMC, UIC_IMEWINDOW, (ULONG_PTR)hImeWnd); +} + +static VOID User32UpdateImcOfImeUI(PIMEUI pimeui, HIMC hNewIMC) +{ + HWND hImeWnd = UserHMGetHandle(pimeui->spwnd); + HIMC hOldIMC = pimeui->hIMC; + + if (hNewIMC == hOldIMC) + return; + + if (hOldIMC) + User32SetImeWindowOfImc(hOldIMC, NULL); + + pimeui->hIMC = hNewIMC; + + if (hNewIMC) + User32SetImeWindowOfImc(hNewIMC, hImeWnd); +} + +static HWND User32CreateImeUIWindow(PIMEUI pimeui, HKL hKL) +{ + IMEINFOEX ImeInfoEx; + PIMEDPI pImeDpi; + WNDCLASSW wc; + HWND hwndUI = NULL; + CHAR szUIClass[32]; + PWND pwnd = pimeui->spwnd; + + if (!pwnd || !IMM_FN(ImmGetImeInfoEx)(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL)) + return NULL; + + pImeDpi = IMM_FN(ImmLockImeDpi)(hKL); + if (!pImeDpi) + return NULL; + + if (!GetClassInfoW(pImeDpi->hInst, ImeInfoEx.wszUIClass, &wc)) + goto Quit; + + if (ImeInfoEx.ImeInfo.fdwProperty & IME_PROP_UNICODE) + { + hwndUI = CreateWindowW(ImeInfoEx.wszUIClass, ImeInfoEx.wszUIClass, WS_POPUP | WS_DISABLED, + 0, 0, 0, 0, UserHMGetHandle(pwnd), 0, wc.hInstance, NULL); + } + else + { + WideCharToMultiByte(CP_ACP, 0, ImeInfoEx.wszUIClass, -1, + szUIClass, _countof(szUIClass), NULL, NULL); + szUIClass[_countof(szUIClass) - 1] = 0; + + hwndUI = CreateWindowA(szUIClass, szUIClass, WS_POPUP | WS_DISABLED, + 0, 0, 0, 0, UserHMGetHandle(pwnd), 0, wc.hInstance, NULL); + } + + if (hwndUI) + NtUserSetWindowLong(hwndUI, IMMGWL_IMC, (LONG_PTR)pimeui->hIMC, FALSE); + +Quit: + IMM_FN(ImmUnlockImeDpi)(pImeDpi); + return hwndUI; } static BOOL ImeWnd_OnCreate(PIMEUI pimeui, LPCREATESTRUCT lpCS) { PWND pParentWnd, pWnd = pimeui->spwnd; - HIMC hIMC; + HIMC hIMC = NULL; if (!pWnd || (pWnd->style & (WS_DISABLED | WS_POPUP)) != (WS_DISABLED | WS_POPUP)) return FALSE; - pimeui->hIMC = NULL; pParentWnd = ValidateHwnd(lpCS->hwndParent); if (pParentWnd) { hIMC = pParentWnd->hImc; - if (hIMC && CheckIMCForWindow(hIMC, UserHMGetHandle(pWnd))) - pimeui->hIMC = hIMC; + if (hIMC && !User32CanSetImeWindowToImc(hIMC, UserHMGetHandle(pWnd))) + hIMC = NULL; } + User32UpdateImcOfImeUI(pimeui, hIMC); + pimeui->fShowStatus = FALSE; pimeui->nCntInIMEProc = 0; pimeui->fActivate = FALSE; @@ -165,10 +278,13 @@ static BOOL ImeWnd_OnCreate(PIMEUI pimeui, LPCREATESTRUCT lpCS) pimeui->fCtrlShowStatus = TRUE; IMM_FN(ImmLoadIME)(pimeui->hKL); + + pimeui->hwndUI = NULL; + return TRUE; } -static void ImeWnd_OnDestroy(PIMEUI pimeui) +static VOID User32DestroyImeUIWindow(PIMEUI pimeui) { HWND hwndUI = pimeui->hwndUI; @@ -182,6 +298,35 @@ static void ImeWnd_OnDestroy(PIMEUI pimeui) pimeui->hwndUI = NULL; } +VOID ImeWnd_OnImeSelect(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) +{ + HKL hKL; + HWND hwndUI, hwndIMC = pimeui->hwndIMC; + + if (wParam) + { + pimeui->hKL = hKL = (HKL)lParam; + pimeui->hwndUI = hwndUI = User32CreateImeUIWindow(pimeui, hKL); + if (hwndUI) + User32SendImeUIMessage(pimeui, WM_IME_SELECT, wParam, lParam, TRUE); + + if (User32GetImeShowStatus() && pimeui->fCtrlShowStatus) + { + if (!pimeui->fShowStatus && pimeui->fActivate && IsWindow(hwndIMC)) + User32NotifyOpenStatus(pimeui, hwndIMC, TRUE); + } + } + else + { + if (pimeui->fShowStatus && pimeui->fActivate && IsWindow(hwndIMC)) + User32NotifyOpenStatus(pimeui, hwndIMC, FALSE); + + User32SendImeUIMessage(pimeui, WM_IME_SELECT, wParam, lParam, TRUE); + User32DestroyImeUIWindow(pimeui); + pimeui->hKL = NULL; + } +} + LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS { PWND pWnd; @@ -226,6 +371,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_IME_CHAR: case WM_IME_COMPOSITIONFULL: case WM_IME_CONTROL: + case WM_IME_NOTIFY: case WM_IME_REQUEST: case WM_IME_SELECT: case WM_IME_SETCONTEXT: @@ -234,10 +380,6 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_IME_ENDCOMPOSITION: return 0; - case WM_IME_NOTIFY: - // TODO: - return 0; - case WM_IME_SYSTEM: // TODO: return 0; @@ -257,7 +399,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return (ImeWnd_OnCreate(pimeui, (LPCREATESTRUCT)lParam) ? 0 : -1); case WM_DESTROY: - ImeWnd_OnDestroy(pimeui); + User32DestroyImeUIWindow(pimeui); break; case WM_NCDESTROY: @@ -279,8 +421,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_IME_STARTCOMPOSITION: case WM_IME_COMPOSITION: case WM_IME_ENDCOMPOSITION: - // TODO: - break; + return User32SendImeUIMessage(pimeui, msg, wParam, lParam, unicode); case WM_IME_CONTROL: // TODO: @@ -294,7 +435,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_IME_SELECT: - // TODO: + ImeWnd_OnImeSelect(pimeui, wParam, lParam); break; case WM_IME_SETCONTEXT:

1 0

[reactos] 01/01: [3DTEXT] Rearrange settings dialog window to look nicer (#4263)
by Tibor Lajos Füzi 27 Jan '22

27 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f010059e631292eea6e29… commit f010059e631292eea6e29e5966d0c20f2d5491ff Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Thu Jan 27 12:12:25 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 27 20:12:25 2022 +0900 [3DTEXT] Rearrange settings dialog window to look nicer (#4263) The settings for the 3d text screensaver was unnecessarily big. --- base/applications/screensavers/3dtext/lang/bg-BG.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/cs-CZ.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/de-DE.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/el-GR.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/en-US.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/es-ES.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/et-EE.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/eu-ES.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/fr-FR.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/he-IL.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/it-IT.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/ja-JP.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/ko-KR.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/lt-LT.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/no-NO.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/pl-PL.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/pt-BR.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/pt-PT.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/ro-RO.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/ru-RU.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/sk-SK.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/sq-AL.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/sv-SE.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/tr-TR.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/uk-UA.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/zh-CN.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/zh-HK.rc | 10 +++++----- base/applications/screensavers/3dtext/lang/zh-TW.rc | 10 +++++----- 28 files changed, 140 insertions(+), 140 deletions(-) diff --git a/base/applications/screensavers/3dtext/lang/bg-BG.rc b/base/applications/screensavers/3dtext/lang/bg-BG.rc index 3f3224e580c..db429f02fef 100644 --- a/base/applications/screensavers/3dtext/lang/bg-BG.rc +++ b/base/applications/screensavers/3dtext/lang/bg-BG.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Настройки на екранния предпазител „Тримерен текст“." FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Добре", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Отказ", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Собствен текст", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "Добре", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Отказ", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Собствен текст", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/cs-CZ.rc b/base/applications/screensavers/3dtext/lang/cs-CZ.rc index a1be4286fa4..36afc18877c 100644 --- a/base/applications/screensavers/3dtext/lang/cs-CZ.rc +++ b/base/applications/screensavers/3dtext/lang/cs-CZ.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nastavení spořiče obrazovky 3D Text" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Storno", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Vlastní text", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Storno", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Vlastní text", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/de-DE.rc b/base/applications/screensavers/3dtext/lang/de-DE.rc index edf2b75e72c..a3299e1615c 100644 --- a/base/applications/screensavers/3dtext/lang/de-DE.rc +++ b/base/applications/screensavers/3dtext/lang/de-DE.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D-Text-Bildschirmschoner-Einstellungen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Eigener Text:", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Eigener Text:", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/el-GR.rc b/base/applications/screensavers/3dtext/lang/el-GR.rc index 80d58d4b7d7..351c41b339c 100644 --- a/base/applications/screensavers/3dtext/lang/el-GR.rc +++ b/base/applications/screensavers/3dtext/lang/el-GR.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ρυθμίσεις Κειμένου 3Δ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Άκυρο", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Προσαρμοσμένο κείμενο:", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Άκυρο", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Προσαρμοσμένο κείμενο:", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/en-US.rc b/base/applications/screensavers/3dtext/lang/en-US.rc index 182d96cffb7..bb8e0eba883 100644 --- a/base/applications/screensavers/3dtext/lang/en-US.rc +++ b/base/applications/screensavers/3dtext/lang/en-US.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Text Screensaver Settings" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Custom text", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Cancel", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Custom text", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/es-ES.rc b/base/applications/screensavers/3dtext/lang/es-ES.rc index 30ca6b862ed..408285d5944 100644 --- a/base/applications/screensavers/3dtext/lang/es-ES.rc +++ b/base/applications/screensavers/3dtext/lang/es-ES.rc @@ -3,15 +3,15 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configuración del Salvapantallas de texto en 3D" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Aceptar", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Texto personalizado", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "Aceptar", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Texto personalizado", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/et-EE.rc b/base/applications/screensavers/3dtext/lang/et-EE.rc index ee64afca1d8..a628932aada 100644 --- a/base/applications/screensavers/3dtext/lang/et-EE.rc +++ b/base/applications/screensavers/3dtext/lang/et-EE.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D teksti ekraanisäästja sätted" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Loobu", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Kohandatud tekst", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Loobu", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Kohandatud tekst", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/eu-ES.rc b/base/applications/screensavers/3dtext/lang/eu-ES.rc index c644a790b78..d965e254e87 100644 --- a/base/applications/screensavers/3dtext/lang/eu-ES.rc +++ b/base/applications/screensavers/3dtext/lang/eu-ES.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Pantaila-babeslearen konfigurazioa Testua 3D-n" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Ados", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Utzi", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Testu pertsonalizatua", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "Ados", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Utzi", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Testu pertsonalizatua", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/fr-FR.rc b/base/applications/screensavers/3dtext/lang/fr-FR.rc index 2a7b02ac9cf..f363c69c7c3 100644 --- a/base/applications/screensavers/3dtext/lang/fr-FR.rc +++ b/base/applications/screensavers/3dtext/lang/fr-FR.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Paramètres de l'écran de veille Texte 3D" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Texte personnalisé", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Annuler", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Texte personnalisé", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/he-IL.rc b/base/applications/screensavers/3dtext/lang/he-IL.rc index 3468e6d8950..1e9269486a3 100644 --- a/base/applications/screensavers/3dtext/lang/he-IL.rc +++ b/base/applications/screensavers/3dtext/lang/he-IL.rc @@ -1,15 +1,15 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL CAPTION "הגדרות שומר מסך של טקסט תלת מימדי" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "אישור", IDOK, 216, 7, 50, 14 - PUSHBUTTON "ביטול", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "טקסט מותאם אישית:", IDC_STATIC, 18, 17, 77, 8 + DEFPUSHBUTTON "אישור", IDOK, 175, 4, 65, 14 + PUSHBUTTON "ביטול", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "טקסט מותאם אישית:", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/it-IT.rc b/base/applications/screensavers/3dtext/lang/it-IT.rc index 8a296a64d4b..40bf1e4fa29 100644 --- a/base/applications/screensavers/3dtext/lang/it-IT.rc +++ b/base/applications/screensavers/3dtext/lang/it-IT.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Impostazioni del salvaschermo 'Testo 3D'" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Annulla", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Testo personalizzato", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Annulla", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Testo personalizzato", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/ja-JP.rc b/base/applications/screensavers/3dtext/lang/ja-JP.rc index 101ca39caa9..2309d5c00d5 100644 --- a/base/applications/screensavers/3dtext/lang/ja-JP.rc +++ b/base/applications/screensavers/3dtext/lang/ja-JP.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D テキストスクリーンセーバーの設定" FONT 9, "MS UI Gothic", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "キャンセル", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "カスタムテキスト", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "カスタムテキスト", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/ko-KR.rc b/base/applications/screensavers/3dtext/lang/ko-KR.rc index a5161d96ee0..11b5e8a833a 100644 --- a/base/applications/screensavers/3dtext/lang/ko-KR.rc +++ b/base/applications/screensavers/3dtext/lang/ko-KR.rc @@ -2,15 +2,15 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D 텍스트 화면 보호기 설정" FONT 9, "굴림", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "확인", IDOK, 216, 7, 50, 14 - PUSHBUTTON "취소", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "커스텀 텍스트", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "확인", IDOK, 175, 4, 65, 14 + PUSHBUTTON "취소", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "커스텀 텍스트", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/lt-LT.rc b/base/applications/screensavers/3dtext/lang/lt-LT.rc index dc0ba370d59..4bd1e8c5c79 100644 --- a/base/applications/screensavers/3dtext/lang/lt-LT.rc +++ b/base/applications/screensavers/3dtext/lang/lt-LT.rc @@ -9,15 +9,15 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 136, 58 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ekrano užsklandos nustatymai" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Gerai", IDOK, 14, 38, 50, 14 - PUSHBUTTON "Atsisakyti", IDCANCEL, 72, 38, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 6, 18, 122, 14, ES_AUTOHSCROLL - LTEXT "Pasirinktas tekstas", IDC_STATIC, 7, 7, 65, 8 + DEFPUSHBUTTON "Gerai", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Atsisakyti", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Pasirinktas tekstas", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/no-NO.rc b/base/applications/screensavers/3dtext/lang/no-NO.rc index 7a7174f23f2..ba874adf3bd 100644 --- a/base/applications/screensavers/3dtext/lang/no-NO.rc +++ b/base/applications/screensavers/3dtext/lang/no-NO.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Tekst skjermsparer innstillinger" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Tilpass tekst", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Tilpass tekst", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/pl-PL.rc b/base/applications/screensavers/3dtext/lang/pl-PL.rc index 9021f5c20e8..67658a0fe63 100644 --- a/base/applications/screensavers/3dtext/lang/pl-PL.rc +++ b/base/applications/screensavers/3dtext/lang/pl-PL.rc @@ -8,15 +8,15 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia wygaszacza ekranu Tekst 3d" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Własny tekst", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Własny tekst", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/pt-BR.rc b/base/applications/screensavers/3dtext/lang/pt-BR.rc index e83ccd9294a..1971654cca7 100644 --- a/base/applications/screensavers/3dtext/lang/pt-BR.rc +++ b/base/applications/screensavers/3dtext/lang/pt-BR.rc @@ -1,15 +1,15 @@ /* Portuguese translation of 3D Text ScreenSaver by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Opções do Protetor de Tela" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Personalizar Text", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Personalizar Text", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/pt-PT.rc b/base/applications/screensavers/3dtext/lang/pt-PT.rc index c1e71287703..c207eab0e5c 100644 --- a/base/applications/screensavers/3dtext/lang/pt-PT.rc +++ b/base/applications/screensavers/3dtext/lang/pt-PT.rc @@ -1,15 +1,15 @@ /* Translation to Portuguese (PT) by zecarlos1957(a)hotmail.com 10-09-2020 */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Opções de Protecção de Ecrã" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Personalizar Texto", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Personalizar Texto", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/ro-RO.rc b/base/applications/screensavers/3dtext/lang/ro-RO.rc index 79be743acc8..fae9183ea12 100644 --- a/base/applications/screensavers/3dtext/lang/ro-RO.rc +++ b/base/applications/screensavers/3dtext/lang/ro-RO.rc @@ -7,15 +7,15 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Preferințe" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Con&firmă", IDOK, 216, 7, 50, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Text afișat:", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "Con&firmă", IDOK, 175, 4, 65, 14 + PUSHBUTTON "A&nulează", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Text afișat:", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/ru-RU.rc b/base/applications/screensavers/3dtext/lang/ru-RU.rc index 3c1edba64cd..7941a9a4e3b 100644 --- a/base/applications/screensavers/3dtext/lang/ru-RU.rc +++ b/base/applications/screensavers/3dtext/lang/ru-RU.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Параметры заставки" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Отмена", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Другой текст", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Отмена", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Другой текст", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/sk-SK.rc b/base/applications/screensavers/3dtext/lang/sk-SK.rc index 7ba9802051f..5d159b5f161 100644 --- a/base/applications/screensavers/3dtext/lang/sk-SK.rc +++ b/base/applications/screensavers/3dtext/lang/sk-SK.rc @@ -4,15 +4,15 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Nastavenie šetriča obrazovky 3D text" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Zrušiť", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Ľubovoľný text", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Zrušiť", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Ľubovoľný text", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/sq-AL.rc b/base/applications/screensavers/3dtext/lang/sq-AL.rc index a8a2f47cb9a..27e4f46f41c 100644 --- a/base/applications/screensavers/3dtext/lang/sq-AL.rc +++ b/base/applications/screensavers/3dtext/lang/sq-AL.rc @@ -4,15 +4,15 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Teksti i Screensaverit Konfigurimi" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Anulo", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Shkruaj tekstin", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Anulo", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Shkruaj tekstin", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/sv-SE.rc b/base/applications/screensavers/3dtext/lang/sv-SE.rc index 18ccd33a994..d803851562a 100644 --- a/base/applications/screensavers/3dtext/lang/sv-SE.rc +++ b/base/applications/screensavers/3dtext/lang/sv-SE.rc @@ -1,14 +1,14 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Text skärmsläckarinställingar" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Anpassa text", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Anpassa text", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/tr-TR.rc b/base/applications/screensavers/3dtext/lang/tr-TR.rc index 41ae908c0af..b0f39035088 100644 --- a/base/applications/screensavers/3dtext/lang/tr-TR.rc +++ b/base/applications/screensavers/3dtext/lang/tr-TR.rc @@ -2,15 +2,15 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D Metin Ekran Koruyucusu Ayarları" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Tamam", IDOK, 216, 7, 50, 14 - PUSHBUTTON "İptal", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Metin:", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "Tamam", IDOK, 175, 4, 65, 14 + PUSHBUTTON "İptal", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Metin:", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/uk-UA.rc b/base/applications/screensavers/3dtext/lang/uk-UA.rc index 27af6e75ccf..be4fb6a6ce7 100644 --- a/base/applications/screensavers/3dtext/lang/uk-UA.rc +++ b/base/applications/screensavers/3dtext/lang/uk-UA.rc @@ -8,15 +8,15 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Параметры заставки ""Об'ємний текст""" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 - PUSHBUTTON "Скасувати", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "Текст", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "Текст", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/zh-CN.rc b/base/applications/screensavers/3dtext/lang/zh-CN.rc index cb50e7ed43c..aa83fc91cd3 100644 --- a/base/applications/screensavers/3dtext/lang/zh-CN.rc +++ b/base/applications/screensavers/3dtext/lang/zh-CN.rc @@ -2,15 +2,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D 文字屏幕保护程序设置" FONT 9, "宋体", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "确定", IDOK, 216, 7, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "自定义文字", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "确定", IDOK, 175, 4, 65, 14 + PUSHBUTTON "取消", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "自定义文字", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/zh-HK.rc b/base/applications/screensavers/3dtext/lang/zh-HK.rc index 8500687e9c1..2c06bd0e7f1 100644 --- a/base/applications/screensavers/3dtext/lang/zh-HK.rc +++ b/base/applications/screensavers/3dtext/lang/zh-HK.rc @@ -7,15 +7,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D 文字螢幕保護程式設定" FONT 9, "新細明體", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "確定", IDOK, 216, 7, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "自訂文字", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "確定", IDOK, 175, 4, 65, 14 + PUSHBUTTON "取消", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "自訂文字", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE diff --git a/base/applications/screensavers/3dtext/lang/zh-TW.rc b/base/applications/screensavers/3dtext/lang/zh-TW.rc index d07029ac10f..7ef769b75cc 100644 --- a/base/applications/screensavers/3dtext/lang/zh-TW.rc +++ b/base/applications/screensavers/3dtext/lang/zh-TW.rc @@ -2,15 +2,15 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D 文字螢幕保護程式設定" FONT 9, "新細明體", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "確定", IDOK, 216, 7, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 216, 24, 50, 14 - EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL - LTEXT "自訂文字", IDC_STATIC, 18, 17, 65, 8 + DEFPUSHBUTTON "確定", IDOK, 175, 4, 65, 14 + PUSHBUTTON "取消", IDCANCEL, 175, 21, 65, 14 + EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL + LTEXT "自訂文字", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE

1 0

[reactos] 01/01: [IMM32] s/Imm32IsImmMode/IS_IMM_MODE/
by Katayama Hirofumi MZ 26 Jan '22

26 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=356babcaf3726c0e8f261… commit 356babcaf3726c0e8f2617c006650ff8a989753e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 27 07:34:29 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jan 27 07:34:29 2022 +0900 [IMM32] s/Imm32IsImmMode/IS_IMM_MODE/ CORE-11700 --- dll/win32/imm32/ime.c | 2 +- dll/win32/imm32/imm.c | 18 +++++++++--------- dll/win32/imm32/precomp.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 853951b352b..ef18b027a77 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -630,7 +630,7 @@ BOOL WINAPI ImmIsIME(HKL hKL) */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return NULL; if (hWnd == NULL) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index b965e0d3093..dc0d19ecf1f 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -235,7 +235,7 @@ VOID APIENTRY Imm32SelectLayout(HKL hNewKL, HKL hOldKL, HIMC hIMC) if (CtfImmIsTextFrameServiceDisabled()) { - if (Imm32IsImmMode() && !Imm32IsCiceroMode()) + if (IS_IMM_MODE() && !Imm32IsCiceroMode()) { bIsNewHKLIme = IS_IME_HKL(hNewKL); bIsOldHKLIme = IS_IME_HKL(hOldKL); @@ -503,7 +503,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) TRACE("(%p, %p)\n", hWnd, hIMC); - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return NULL; pWnd = ValidateHwndNoErr(hWnd); @@ -545,7 +545,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) TRACE("(%p, %p, 0x%lX)\n", hWnd, hIMC, dwFlags); - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return FALSE; if (hIMC && !(dwFlags & IACE_DEFAULT) && Imm32IsCrossThreadAccess(hIMC)) @@ -590,7 +590,7 @@ HIMC WINAPI ImmCreateContext(void) TRACE("()\n"); - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return NULL; pClientImc = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(CLIENTIMC)); @@ -637,7 +637,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) PCLIENTIMC pClientImc; PIMC pIMC; - if (!Imm32IsImmMode() || hIMC == NULL) + if (!IS_IMM_MODE() || hIMC == NULL) return FALSE; pIMC = ValidateHandleNoErr(hIMC, TYPE_INPUTCONTEXT); @@ -888,7 +888,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) TRACE("(%p)\n", hIMC); - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return FALSE; if (Imm32IsCrossThreadAccess(hIMC)) @@ -972,7 +972,7 @@ static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) PCLIENTIMC pClientImc; PWND pWnd; - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return NULL; if (!hWnd) @@ -1141,7 +1141,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) TRACE("(%p, %p, %d)\n", hWnd, hIMC, fActive); - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return FALSE; pClientImc = ImmLockClientImc(hIMC); @@ -1264,7 +1264,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) break; case DLL_THREAD_DETACH: - if (!Imm32IsImmMode()) + if (!IS_IMM_MODE()) return TRUE; pTeb = NtCurrentTeb(); diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 4cd92e5e09d..a7a3b3c904a 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -111,7 +111,7 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) -#define Imm32IsImmMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32)) +#define IS_IMM_MODE() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32)) #define Imm32IsCiceroMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) #define Imm32Is16BitMode() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT)

1 0

[reactos] 01/01: [USER32] Implement WM_CREATE of IME window (#4314)
by Katayama Hirofumi MZ 26 Jan '22

26 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc62d268d237d56024889… commit fc62d268d237d5602488953d6c36bd4b3c6973ae Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 27 07:30:11 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 27 07:30:11 2022 +0900 [USER32] Implement WM_CREATE of IME window (#4314) Implement handling of WM_CREATE and WM_DESTROY messages of the IME window. CORE-11700 --- win32ss/user/user32/misc/imm.c | 150 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 9 deletions(-) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 8f267df2983..26bc38cad4c 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -133,6 +133,55 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) return IMM_FN(ImmRegisterClient)(&gSharedInfo, ghImm32); } +static BOOL CheckIMCForWindow(HIMC hIMC, HWND hWnd) +{ + PIMC pIMC = ValidateHandle(hIMC, TYPE_INPUTCONTEXT); + return pIMC && (!pIMC->hImeWnd || pIMC->hImeWnd == hWnd || !ValidateHwnd(pIMC->hImeWnd)); +} + +static BOOL ImeWnd_OnCreate(PIMEUI pimeui, LPCREATESTRUCT lpCS) +{ + PWND pParentWnd, pWnd = pimeui->spwnd; + HIMC hIMC; + + if (!pWnd || (pWnd->style & (WS_DISABLED | WS_POPUP)) != (WS_DISABLED | WS_POPUP)) + return FALSE; + + pimeui->hIMC = NULL; + pParentWnd = ValidateHwnd(lpCS->hwndParent); + if (pParentWnd) + { + hIMC = pParentWnd->hImc; + if (hIMC && CheckIMCForWindow(hIMC, UserHMGetHandle(pWnd))) + pimeui->hIMC = hIMC; + } + + pimeui->fShowStatus = FALSE; + pimeui->nCntInIMEProc = 0; + pimeui->fActivate = FALSE; + pimeui->fDestroy = FALSE; + pimeui->hwndIMC = NULL; + pimeui->hKL = GetWin32ClientInfo()->hKL; + pimeui->fCtrlShowStatus = TRUE; + + IMM_FN(ImmLoadIME)(pimeui->hKL); + return TRUE; +} + +static void ImeWnd_OnDestroy(PIMEUI pimeui) +{ + HWND hwndUI = pimeui->hwndUI; + + if (IsWindow(hwndUI)) + { + pimeui->fDestroy = TRUE; + NtUserDestroyWindow(hwndUI); + } + + pimeui->fShowStatus = pimeui->fDestroy = FALSE; + pimeui->hwndUI = NULL; +} + LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS { PWND pWnd; @@ -151,6 +200,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } NtUserSetWindowFNID(hwnd, FNID_IME); pimeui = HeapAlloc( GetProcessHeap(), 0, sizeof(IMEUI) ); + pimeui->spwnd = pWnd; SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); } else @@ -169,19 +219,101 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } } - if (msg==WM_CREATE || msg==WM_NCCREATE) - return TRUE; + if (pimeui->nCntInIMEProc > 0) + { + switch (msg) + { + case WM_IME_CHAR: + case WM_IME_COMPOSITIONFULL: + case WM_IME_CONTROL: + case WM_IME_REQUEST: + case WM_IME_SELECT: + case WM_IME_SETCONTEXT: + case WM_IME_STARTCOMPOSITION: + case WM_IME_COMPOSITION: + case WM_IME_ENDCOMPOSITION: + return 0; + + case WM_IME_NOTIFY: + // TODO: + return 0; + + case WM_IME_SYSTEM: + // TODO: + return 0; + + default: + { + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); + } + } + } - if (msg==WM_NCDESTROY) + switch (msg) { - HeapFree( GetProcessHeap(), 0, pimeui ); - SetWindowLongPtrW(hwnd, 0, 0); - NtUserSetWindowFNID(hwnd, FNID_DESTROY); + case WM_CREATE: + return (ImeWnd_OnCreate(pimeui, (LPCREATESTRUCT)lParam) ? 0 : -1); + + case WM_DESTROY: + ImeWnd_OnDestroy(pimeui); + break; + + case WM_NCDESTROY: + HeapFree(GetProcessHeap(), 0, pimeui); + SetWindowLongPtrW(hwnd, 0, 0); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); + break; + + case WM_ERASEBKGND: + return TRUE; + + case WM_PAINT: + break; + + case WM_COPYDATA: + // TODO: + break; + + case WM_IME_STARTCOMPOSITION: + case WM_IME_COMPOSITION: + case WM_IME_ENDCOMPOSITION: + // TODO: + break; + + case WM_IME_CONTROL: + // TODO: + break; + + case WM_IME_NOTIFY: + // TODO: + break; + + case WM_IME_REQUEST: + break; + + case WM_IME_SELECT: + // TODO: + break; + + case WM_IME_SETCONTEXT: + // TODO: + break; + + case WM_IME_SYSTEM: + // TODO: + break; + + default: + { + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); + } } - if (unicode) - return DefWindowProcW(hwnd, msg, wParam, lParam); - return DefWindowProcA(hwnd, msg, wParam, lParam); + return 0; } LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )

1 0

[reactos] 01/01: [NTUSER] Implement NtUserGetAppImeLevel and NtUserSetAppImeLevel (#4313)
by Katayama Hirofumi MZ 26 Jan '22

26 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c8167e90ab856627bda1… commit 9c8167e90ab856627bda1940be7a76790a7b0441 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 27 07:29:19 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 27 07:29:19 2022 +0900 [NTUSER] Implement NtUserGetAppImeLevel and NtUserSetAppImeLevel (#4313) - Add AtomImeLevel atom. - Modify NtUserSetAppImeLevel prototype. - Implement NtUserGetAppImeLevel and NtUserSetAppImeLevel functions. CORE-11700 --- win32ss/include/ntuser.h | 6 ++--- win32ss/user/ntuser/ime.c | 56 +++++++++++++++++++++++++++++++++++++------- win32ss/user/ntuser/ntuser.c | 2 ++ win32ss/user/ntuser/ntuser.h | 1 + 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index dab6b267781..400830ab3e5 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3084,11 +3084,11 @@ NTAPI NtUserSetActiveWindow( HWND Wnd); -DWORD +BOOL NTAPI NtUserSetAppImeLevel( - DWORD dwUnknown1, - DWORD dwUnknown2); + HWND hWnd, + DWORD dwLevel); HWND NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 3a8af9d46a9..18806d68a8d 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -238,8 +238,29 @@ DWORD APIENTRY NtUserGetAppImeLevel(HWND hWnd) { - STUB; - return 0; + DWORD ret = 0; + PWND pWnd; + PTHREADINFO pti; + + UserEnterShared(); + + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd) + goto Quit; + + if (!IS_IMM_MODE()) + { + EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto Quit; + } + + pti = PsGetCurrentThreadWin32Thread(); + if (pWnd->head.pti->ppi == pti->ppi) + ret = (DWORD)(ULONG_PTR)UserGetProp(pWnd, AtomImeLevel, TRUE); + +Quit: + UserLeave(); + return ret; } BOOL FASTCALL UserGetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pInfoEx, IMEINFOEXCLASS SearchType) @@ -335,14 +356,33 @@ Quit: return ret; } -DWORD +BOOL APIENTRY -NtUserSetAppImeLevel( - DWORD dwUnknown1, - DWORD dwUnknown2) +NtUserSetAppImeLevel(HWND hWnd, DWORD dwLevel) { - STUB; - return 0; + BOOL ret = FALSE; + PWND pWnd; + PTHREADINFO pti; + + UserEnterExclusive(); + + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd) + goto Quit; + + if (!IS_IMM_MODE()) + { + EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto Quit; + } + + pti = PsGetCurrentThreadWin32Thread(); + if (pWnd->head.pti->ppi == pti->ppi) + ret = UserSetProp(pWnd, AtomImeLevel, (HANDLE)(ULONG_PTR)dwLevel, TRUE); + +Quit: + UserLeave(); + return ret; } BOOL FASTCALL UserSetImeInfoEx(LPVOID pUnknown, PIMEINFOEX pImeInfoEx) diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c index 32805901b33..220ed8db6af 100644 --- a/win32ss/user/ntuser/ntuser.c +++ b/win32ss/user/ntuser/ntuser.c @@ -25,6 +25,7 @@ ATOM AtomQOS; // Window DDE Quality of Service atom. HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; ATOM gaGuiConsoleWndClass; +ATOM AtomImeLevel; /* PRIVATE FUNCTIONS **********************************************************/ @@ -55,6 +56,7 @@ InitUserAtoms(VOID) AtomDDETrack = IntAddGlobalAtom(L"SysDT", TRUE); AtomQOS = IntAddGlobalAtom(L"SysQOS", TRUE); + AtomImeLevel = IntAddGlobalAtom(L"SysIMEL", TRUE); /* * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 29ee2fae600..090a7973690 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -18,6 +18,7 @@ extern BOOL g_AlwaysDisplayVersion; extern ATOM gaGuiConsoleWndClass; extern ATOM AtomDDETrack; extern ATOM AtomQOS; +extern ATOM AtomImeLevel; extern ERESOURCE UserLock; CODE_SEG("INIT") NTSTATUS NTAPI InitUserImpl(VOID);

1 0

[reactos] 03/03: [VIDEOPRT] Fix typo: DEViCEMAP -> DEVICEMAP
by Hervé Poussineau 26 Jan '22

26 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=963e76fd6071525f21007… commit 963e76fd6071525f21007f3e2f423de82b06ab76 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jan 24 22:46:01 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 26 19:30:32 2022 +0100 [VIDEOPRT] Fix typo: DEViCEMAP -> DEVICEMAP --- win32ss/drivers/videoprt/videoprt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 803d934c920..337c3c84760 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -85,7 +85,7 @@ IntVideoPortAddDeviceMapLink( RegistryPath->Length + sizeof(UNICODE_NULL)); if (!NT_SUCCESS(Status)) { - ERR_(VIDEOPRT, "Failed to create DEViCEMAP registry entry: 0x%X\n", Status); + ERR_(VIDEOPRT, "Failed to create DEVICEMAP registry entry: 0x%X\n", Status); return Status; }

1 0

[reactos] 02/03: [VIDEOPRT] Change case of device registry path written to registry
by Hervé Poussineau 26 Jan '22

26 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1add6de3e813904ff6903… commit 1add6de3e813904ff69037530b839929a87a9571 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jan 24 18:55:26 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 26 19:30:32 2022 +0100 [VIDEOPRT] Change case of device registry path written to registry Change it it two places, to handle when 'UseNewKey' is enabled or disabled. This fixes the Spice guest agent, which searches 'System' case-sensitively in it. --- win32ss/drivers/videoprt/videoprt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 0348b677c7b..803d934c920 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -524,7 +524,7 @@ IntLoadRegistryParameters(VOID) NTSTATUS Status; HANDLE KeyHandle; UNICODE_STRING UseNewKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\GraphicsDrivers\\UseNewKey"); - UNICODE_STRING Path = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control"); + UNICODE_STRING Path = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SystemStartOptions"); OBJECT_ATTRIBUTES ObjectAttributes; PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; @@ -792,6 +792,14 @@ VideoPortInitialize( } RtlCopyUnicodeString(&DriverExtension->RegistryPath, RegistryPath); + + /* There is a bug in Spice guest agent, which searches 'System' case-sensitively. + * Replace 'SYSTEM' by 'System' to fix that. + * Probably for similar reason, Windows also replaces 'MACHINE' by 'Machine'. + */ + wcsncpy(wcsstr(DriverExtension->RegistryPath.Buffer, L"\\SYSTEM\\"), L"\\System\\", ARRAYSIZE(L"\\SYSTEM\\") - 1); + wcsncpy(wcsstr(DriverExtension->RegistryPath.Buffer, L"\\MACHINE\\"), L"\\Machine\\", ARRAYSIZE(L"\\MACHINE\\") - 1); + INFO_(VIDEOPRT, "RegistryPath: %wZ\n", &DriverExtension->RegistryPath); } else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2022