Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 01/01: [IMM32_APITEST] Add ImmGetImeInfoEx testcase (#3988)
by Katayama Hirofumi MZ 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afec737142b50eef2be09… commit afec737142b50eef2be0952616658592918a1061 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 4 07:35:00 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 4 07:35:00 2021 +0900 [IMM32_APITEST] Add ImmGetImeInfoEx testcase (#3988) CORE-11700 --- modules/rostests/apitests/imm32/CMakeLists.txt | 1 + modules/rostests/apitests/imm32/ImmGetImeInfoEx.c | 123 ++++++++++++++++++++++ modules/rostests/apitests/imm32/testlist.c | 2 + 3 files changed, 126 insertions(+) diff --git a/modules/rostests/apitests/imm32/CMakeLists.txt b/modules/rostests/apitests/imm32/CMakeLists.txt index 97ca3c4123e..30b7dd66a8e 100644 --- a/modules/rostests/apitests/imm32/CMakeLists.txt +++ b/modules/rostests/apitests/imm32/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE clientimc.c himc.c imcc.c + ImmGetImeInfoEx.c ImmIsUIMessage.c testlist.c) diff --git a/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c b/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c new file mode 100644 index 00000000000..3a7451e00ab --- /dev/null +++ b/modules/rostests/apitests/imm32/ImmGetImeInfoEx.c @@ -0,0 +1,123 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for ImmGetImeInfoEx + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" + +//#define DO_PRINT + +static VOID PrintInfoEx(PIMEINFOEX pInfoEx) +{ +#ifdef DO_PRINT + trace("---\n"); + trace("hkl: %p\n", pInfoEx->hkl); + trace("ImeInfo.dwPrivateDataSize: 0x%lX\n", pInfoEx->ImeInfo.dwPrivateDataSize); + trace("ImeInfo.fdwProperty: 0x%lX\n", pInfoEx->ImeInfo.fdwProperty); + trace("ImeInfo.fdwConversionCaps: 0x%lX\n", pInfoEx->ImeInfo.fdwConversionCaps); + trace("ImeInfo.fdwSentenceCaps: 0x%lX\n", pInfoEx->ImeInfo.fdwSentenceCaps); + trace("ImeInfo.fdwUICaps: 0x%lX\n", pInfoEx->ImeInfo.fdwUICaps); + trace("ImeInfo.fdwSCSCaps: 0x%lX\n", pInfoEx->ImeInfo.fdwSCSCaps); + trace("ImeInfo.fdwSelectCaps: 0x%lX\n", pInfoEx->ImeInfo.fdwSelectCaps); + trace("wszUIClass: '%ls'\n", pInfoEx->wszUIClass); + trace("fdwInitConvMode: 0x%lX\n", pInfoEx->fdwInitConvMode); + trace("fInitOpen: %d\n", pInfoEx->fInitOpen); + trace("fLoadFlag: %d\n", pInfoEx->fLoadFlag); + trace("dwProdVersion: 0x%lX\n", pInfoEx->dwProdVersion); + trace("dwImeWinVersion: 0x%lX\n", pInfoEx->dwImeWinVersion); + trace("wszImeDescription: '%ls'\n", pInfoEx->wszImeDescription); + trace("wszImeFile: '%ls'\n", pInfoEx->wszImeFile); + trace("fInitOpen: %d\n", pInfoEx->fInitOpen); +#endif +} + +typedef BOOL (WINAPI *FN_ImmGetImeInfoEx)(PIMEINFOEX, IMEINFOEXCLASS, PVOID); + +START_TEST(ImmGetImeInfoEx) +{ + IMEINFOEX InfoEx; + BOOL ret, bMatch; + size_t ib; + LANGID LangID = GetSystemDefaultLangID(); + HKL hKL = GetKeyboardLayout(0), hOldKL; + + HMODULE hImm32 = GetModuleHandleA("imm32"); + FN_ImmGetImeInfoEx fnImmGetImeInfoEx = + (FN_ImmGetImeInfoEx)GetProcAddress(hImm32, "ImmGetImeInfoEx"); + if (!fnImmGetImeInfoEx) + { + skip("ImmGetImeInfoEx not found\n"); + return; + } + + if (!GetSystemMetrics(SM_IMMENABLED)) + { + skip("IME is not available\n"); + return; + } + + // ImeInfoExKeyboardLayout + hOldKL = hKL; + FillMemory(&InfoEx, sizeof(InfoEx), 0xCC); + InfoEx.wszUIClass[0] = InfoEx.wszImeFile[0] = 0; + ret = fnImmGetImeInfoEx(&InfoEx, ImeInfoExKeyboardLayout, &hKL); + PrintInfoEx(&InfoEx); + ok_int(ret, TRUE); + ok_long((DWORD)(DWORD_PTR)hOldKL, (DWORD)(DWORD_PTR)hKL); + if (IS_IME_HKL(InfoEx.hkl)) + { + ok_long(LOWORD(InfoEx.hkl), LangID); + } + else + { + ok_int(LOWORD(InfoEx.hkl), LangID); + ok_int(HIWORD(InfoEx.hkl), LangID); + } + ok(InfoEx.ImeInfo.dwPrivateDataSize >= 4, "\n"); + ok(InfoEx.wszUIClass[0] != 0, "wszUIClass was empty\n"); + ok_long(InfoEx.dwImeWinVersion, 0x40000); + ok(InfoEx.wszImeFile[0] != 0, "wszImeFile was empty\n"); + hKL = hOldKL; + + // ImeInfoExImeWindow + hOldKL = hKL; + FillMemory(&InfoEx, sizeof(InfoEx), 0xCC); + InfoEx.wszUIClass[0] = InfoEx.wszImeFile[0] = 0; + ret = fnImmGetImeInfoEx(&InfoEx, ImeInfoExImeWindow, &hKL); + PrintInfoEx(&InfoEx); + ok_int(ret, TRUE); + if (IS_IME_HKL(InfoEx.hkl)) + { + ok_long(LOWORD(InfoEx.hkl), LangID); + } + else + { + ok_int(LOWORD(InfoEx.hkl), LangID); + ok_int(HIWORD(InfoEx.hkl), LangID); + } + ok(InfoEx.ImeInfo.dwPrivateDataSize >= 4, "\n"); + ok(InfoEx.wszUIClass[0] != 0, "wszUIClass was empty\n"); + ok_long(InfoEx.dwImeWinVersion, 0x40000); + ok(InfoEx.wszImeFile[0] != 0, "wszImeFile was empty\n"); + hKL = hOldKL; + + // TODO: ImeInfoExImeFileName + + // 4 + hOldKL = hKL; + FillMemory(&InfoEx, sizeof(InfoEx), 0xCC); + ret = fnImmGetImeInfoEx(&InfoEx, 4, &hKL); + ok_int(ret, FALSE); + bMatch = TRUE; + for (ib = 0; ib < sizeof(InfoEx); ++ib) + { + if (((LPBYTE)&InfoEx)[ib] != 0xCC) + { + bMatch = FALSE; + break; + } + } + ok_int(bMatch, TRUE); +} diff --git a/modules/rostests/apitests/imm32/testlist.c b/modules/rostests/apitests/imm32/testlist.c index fa243280dec..d73e9878113 100644 --- a/modules/rostests/apitests/imm32/testlist.c +++ b/modules/rostests/apitests/imm32/testlist.c @@ -5,6 +5,7 @@ extern void func_clientimc(void); extern void func_himc(void); extern void func_imcc(void); +extern void func_ImmGetImeInfoEx(void); extern void func_ImmIsUIMessage(void); const struct test winetest_testlist[] = @@ -12,6 +13,7 @@ const struct test winetest_testlist[] = { "clientimc", func_clientimc }, { "himc", func_himc }, { "imcc", func_imcc }, + { "ImmGetImeInfoEx", func_ImmGetImeInfoEx }, { "ImmIsUIMessage", func_ImmIsUIMessage }, { 0, 0 } };

1 0

[reactos] 01/01: [IMM32] Implement ImmActivateLayout (#3987)
by Katayama Hirofumi MZ 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66ef31494e4a9da8a1bd6… commit 66ef31494e4a9da8a1bd688a631f4a02f2fcf1da Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 4 07:33:15 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 4 07:33:15 2021 +0900 [IMM32] Implement ImmActivateLayout (#3987) - Add IME_STATE and IME_SUBSTATE structures. - Modify INPUTCONTEXTDX structure. - Implement ImmActivateLayout function. - Improve ImmDestroyContext function by using newly-defined Imm32FreeImeStates. - Add Imm32FetchImeState, Imm32FetchImeSubState, Imm32LoadImeStateSentence, Imm32SaveImeStateSentence, and Imm32SelectLayout helper functions. - Modify NtUserSetThreadLayoutHandles prototype. CORE-11700 --- dll/win32/imm32/ime.c | 8 - dll/win32/imm32/imm.c | 332 ++++++++++++++++++++++++++++++++++++- dll/win32/imm32/imm32.spec | 2 +- dll/win32/imm32/precomp.h | 9 + dll/win32/imm32/utils.c | 74 +++++++++ sdk/include/psdk/imm.h | 2 + sdk/include/reactos/wine/ddk/imm.h | 40 ++++- win32ss/include/ntuser.h | 4 +- win32ss/user/ntuser/ntstubs.c | 4 +- 9 files changed, 453 insertions(+), 22 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index e831a81fcee..02b47bd1b88 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -533,14 +533,6 @@ BOOL WINAPI ImmDisableLegacyIME(void) return TRUE; } -/*********************************************************************** - * CtfImmIsTextFrameServiceDisabled(IMM32.@) - */ -BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) -{ - return !!(GetWin32ClientInfo()->CI_flags & CI_TFSDISABLED); -} - /*********************************************************************** * ImmGetImeInfoEx (IMM32.@) */ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index f458685e0ec..c840cdf3ee7 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -168,6 +168,314 @@ Retry: return TRUE; } +VOID APIENTRY Imm32SelectLayout(HKL hNewKL, HKL hOldKL, HIMC hIMC) +{ + PCLIENTIMC pClientImc; + LPINPUTCONTEXTDX pIC; + LPGUIDELINE pGL; + LPCANDIDATEINFO pCI; + LPCOMPOSITIONSTRING pCS; + LOGFONTA LogFontA; + LOGFONTW LogFontW; + BOOL fOpen, bIsNewHKLIme = TRUE, bIsOldHKLIme = TRUE, bClientWide, bNewDpiWide; + DWORD cbNewPrivate = 0, cbOldPrivate = 0, dwConversion, dwSentence, dwSize, dwNewSize; + PIMEDPI pNewImeDpi = NULL, pOldImeDpi = NULL; + HANDLE hPrivate; + PIME_STATE pNewState = NULL, pOldState = NULL; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return; + + pNewImeDpi = ImmLockImeDpi(hNewKL); + + if (hNewKL != hOldKL) + pOldImeDpi = ImmLockImeDpi(hOldKL); + + if (pNewImeDpi) + { + cbNewPrivate = pNewImeDpi->ImeInfo.dwPrivateDataSize; + pClientImc->uCodePage = pNewImeDpi->uCodePage; + } + else + { + pClientImc->uCodePage = CP_ACP; + } + + if (cbNewPrivate < 4) + cbNewPrivate = 4; + + if (pOldImeDpi) + cbOldPrivate = pOldImeDpi->ImeInfo.dwPrivateDataSize; + + if (cbOldPrivate < 4) + cbOldPrivate = 4; + + if (pClientImc->hKL == hOldKL) + { + if (pOldImeDpi) + { + if (IS_IME_HKL(hOldKL)) + pOldImeDpi->ImeSelect(hIMC, FALSE); + else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pOldImeDpi->CtfImeSelectEx) + pOldImeDpi->CtfImeSelectEx(hIMC, FALSE, hOldKL); + } + pClientImc->hKL = NULL; + } + + if (CtfImmIsTextFrameServiceDisabled()) + { + if (Imm32IsImmMode() && !Imm32IsCiceroMode()) + { + bIsNewHKLIme = IS_IME_HKL(hNewKL); + bIsOldHKLIme = IS_IME_HKL(hOldKL); + } + } + + pIC = (LPINPUTCONTEXTDX)Imm32LockIMCEx(hIMC, FALSE); + if (!pIC) + { + if (pNewImeDpi) + { + if (IS_IME_HKL(hNewKL)) + pNewImeDpi->ImeSelect(hIMC, TRUE); + else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) + pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); + + pClientImc->hKL = hNewKL; + } + } + else + { + dwConversion = pIC->fdwConversion; + dwSentence = pIC->fdwSentence; + fOpen = pIC->fOpen; + + if (pNewImeDpi) + { + bClientWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + bNewDpiWide = ImeDpi_IsUnicode(pNewImeDpi); + if (bClientWide && !bNewDpiWide) + { + if (pIC->fdwInit & INIT_LOGFONT) + { + LogFontWideToAnsi(&pIC->lfFont.W, &LogFontA); + pIC->lfFont.A = LogFontA; + } + pClientImc->dwFlags &= ~CLIENTIMC_WIDE; + } + else if (!bClientWide && bNewDpiWide) + { + if (pIC->fdwInit & INIT_LOGFONT) + { + LogFontAnsiToWide(&pIC->lfFont.A, &LogFontW); + pIC->lfFont.W = LogFontW; + } + pClientImc->dwFlags |= CLIENTIMC_WIDE; + } + } + + if (cbOldPrivate != cbNewPrivate) + { + hPrivate = ImmReSizeIMCC(pIC->hPrivate, cbNewPrivate); + if (!hPrivate) + { + ImmDestroyIMCC(pIC->hPrivate); + hPrivate = ImmCreateIMCC(cbNewPrivate); + } + pIC->hPrivate = hPrivate; + } + +#define MAX_IMCC_SIZE 0x1000 + dwSize = ImmGetIMCCSize(pIC->hMsgBuf); + if (ImmGetIMCCLockCount(pIC->hMsgBuf) || dwSize > MAX_IMCC_SIZE) + { + ImmDestroyIMCC(pIC->hMsgBuf); + pIC->hMsgBuf = ImmCreateIMCC(sizeof(UINT)); + pIC->dwNumMsgBuf = 0; + } + + dwSize = ImmGetIMCCSize(pIC->hGuideLine); + dwNewSize = sizeof(GUIDELINE); + if (ImmGetIMCCLockCount(pIC->hGuideLine) || + dwSize < dwNewSize || dwSize > MAX_IMCC_SIZE) + { + ImmDestroyIMCC(pIC->hGuideLine); + pIC->hGuideLine = ImmCreateIMCC(dwNewSize); + pGL = ImmLockIMCC(pIC->hGuideLine); + if (pGL) + { + pGL->dwSize = dwNewSize; + ImmUnlockIMCC(pIC->hGuideLine); + } + } + + dwSize = ImmGetIMCCSize(pIC->hCandInfo); + dwNewSize = sizeof(CANDIDATEINFO); + if (ImmGetIMCCLockCount(pIC->hCandInfo) || + dwSize < dwNewSize || dwSize > MAX_IMCC_SIZE) + { + ImmDestroyIMCC(pIC->hCandInfo); + pIC->hCandInfo = ImmCreateIMCC(dwNewSize); + pCI = ImmLockIMCC(pIC->hCandInfo); + if (pCI) + { + pCI->dwSize = dwNewSize; + ImmUnlockIMCC(pIC->hCandInfo); + } + } + + dwSize = ImmGetIMCCSize(pIC->hCompStr); + dwNewSize = sizeof(COMPOSITIONSTRING); + if (ImmGetIMCCLockCount(pIC->hCompStr) || + dwSize < dwNewSize || dwSize > MAX_IMCC_SIZE) + { + ImmDestroyIMCC(pIC->hCompStr); + pIC->hCompStr = ImmCreateIMCC(dwNewSize); + pCS = ImmLockIMCC(pIC->hCompStr); + if (pCS) + { + pCS->dwSize = dwNewSize; + ImmUnlockIMCC(pIC->hCompStr); + } + } +#undef MAX_IMCC_SIZE + + if (pOldImeDpi && bIsOldHKLIme) + { + pOldState = Imm32FetchImeState(pIC, hOldKL); + if (pOldState) + Imm32SaveImeStateSentence(pIC, pOldState, hOldKL); + } + + if (pNewImeDpi && bIsNewHKLIme) + pNewState = Imm32FetchImeState(pIC, hNewKL); + + if (pOldState != pNewState) + { + if (pOldState) + { + pOldState->fOpen = !!pIC->fOpen; + pOldState->dwConversion = (pIC->fdwConversion & ~IME_CMODE_EUDC); + pOldState->dwSentence = pIC->fdwSentence; + pOldState->dwInit = pIC->fdwInit; + } + + if (pNewState) + { + if (pIC->dwChange & INPUTCONTEXTDX_CHANGE_FORCE_OPEN) + { + pIC->dwChange &= ~INPUTCONTEXTDX_CHANGE_FORCE_OPEN; + pIC->fOpen = TRUE; + } + else + { + pIC->fOpen = pNewState->fOpen; + } + + pIC->fdwConversion = (pNewState->dwConversion & ~IME_CMODE_EUDC); + pIC->fdwSentence = pNewState->dwSentence; + pIC->fdwInit = pNewState->dwInit; + } + } + + if (pNewState) + Imm32LoadImeStateSentence(pIC, pNewState, hNewKL); + + if (pNewImeDpi) + { + if (IS_IME_HKL(hNewKL)) + pNewImeDpi->ImeSelect(hIMC, TRUE); + else if (Imm32IsCiceroMode() && !Imm32Is16BitMode() && pNewImeDpi->CtfImeSelectEx) + pNewImeDpi->CtfImeSelectEx(hIMC, TRUE, hNewKL); + + pClientImc->hKL = hNewKL; + } + + pIC->dwChange = 0; + if (pIC->fOpen != fOpen) + pIC->dwChange |= INPUTCONTEXTDX_CHANGE_OPEN; + if (pIC->fdwConversion != dwConversion) + pIC->dwChange |= INPUTCONTEXTDX_CHANGE_CONVERSION; + if (pIC->fdwSentence != dwSentence) + pIC->dwChange |= INPUTCONTEXTDX_CHANGE_SENTENCE; + + ImmUnlockIMC(hIMC); + } + + ImmUnlockImeDpi(pOldImeDpi); + ImmUnlockImeDpi(pNewImeDpi); + ImmUnlockClientImc(pClientImc); +} + +typedef struct SELECT_LAYOUT +{ + HKL hNewKL; + HKL hOldKL; +} SELECT_LAYOUT, *LPSELECT_LAYOUT; + +static BOOL CALLBACK Imm32SelectLayoutProc(HIMC hIMC, LPARAM lParam) +{ + LPSELECT_LAYOUT pSelect = (LPSELECT_LAYOUT)lParam; + Imm32SelectLayout(pSelect->hNewKL, pSelect->hOldKL, hIMC); + return TRUE; +} + +static BOOL CALLBACK Imm32NotifyCompStrProc(HIMC hIMC, LPARAM lParam) +{ + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, (DWORD)lParam, 0); + return TRUE; +} + +/*********************************************************************** + * ImmActivateLayout (IMM32.@) + */ +BOOL WINAPI ImmActivateLayout(HKL hKL) +{ + PIMEDPI pImeDpi; + HKL hOldKL; + LPARAM lParam; + HWND hwndDefIME = NULL; + SELECT_LAYOUT SelectLayout; + + hOldKL = GetKeyboardLayout(0); + + if (hOldKL == hKL && !(GetWin32ClientInfo()->CI_flags & CI_IMMACTIVATE)) + return TRUE; + + ImmLoadIME(hKL); + + if (hOldKL != hKL) + { + pImeDpi = ImmLockImeDpi(hOldKL); + if (pImeDpi) + { + if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_COMPLETE_ON_UNSELECT) + lParam = CPS_COMPLETE; + else + lParam = CPS_CANCEL; + ImmUnlockImeDpi(pImeDpi); + + ImmEnumInputContext(0, Imm32NotifyCompStrProc, lParam); + } + + hwndDefIME = ImmGetDefaultIMEWnd(NULL); + if (IsWindow(hwndDefIME)) + SendMessageW(hwndDefIME, WM_IME_SELECT, FALSE, (LPARAM)hOldKL); + + NtUserSetThreadLayoutHandles(hKL, hOldKL); + } + + SelectLayout.hNewKL = hKL; + SelectLayout.hOldKL = hOldKL; + ImmEnumInputContext(0, Imm32SelectLayoutProc, (LPARAM)&SelectLayout); + + if (IsWindow(hwndDefIME)) + SendMessageW(hwndDefIME, WM_IME_SELECT, TRUE, (LPARAM)hKL); + + return TRUE; +} + typedef struct _tagImmHkl { struct list entry; @@ -362,15 +670,29 @@ HIMC WINAPI ImmCreateContext(void) return hIMC; } -static VOID APIENTRY Imm32CleanupContextExtra(LPINPUTCONTEXT pIC) +static VOID APIENTRY Imm32FreeImeStates(LPINPUTCONTEXTDX pIC) { - FIXME("We have to do something do here"); + PIME_STATE pState, pStateNext; + PIME_SUBSTATE pSubState, pSubStateNext; + + pState = pIC->pState; + pIC->pState = NULL; + for (; pState; pState = pStateNext) + { + pStateNext = pState->pNext; + for (pSubState = pState->pSubState; pSubState; pSubState = pSubStateNext) + { + pSubStateNext = pSubState->pNext; + Imm32HeapFree(pSubState); + } + Imm32HeapFree(pState); + } } BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) { PIMEDPI pImeDpi; - LPINPUTCONTEXT pIC; + LPINPUTCONTEXTDX pIC; PCLIENTIMC pClientImc; PIMC pIMC; @@ -394,7 +716,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) return TRUE; } - pIC = ImmLockIMC(hIMC); + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (pIC == NULL) { ImmUnlockClientImc(pClientImc); @@ -427,7 +749,7 @@ BOOL APIENTRY Imm32CleanupContext(HIMC hIMC, HKL hKL, BOOL bKeep) pIC->hCandInfo = ImmDestroyIMCC(pIC->hCandInfo); pIC->hCompStr = ImmDestroyIMCC(pIC->hCompStr); - Imm32CleanupContextExtra(pIC); + Imm32FreeImeStates(pIC); ImmUnlockIMC(hIMC); diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 221c8a85e80..162d3d0c4ff 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -4,7 +4,7 @@ @ stdcall -stub CtfImmRestoreToolbarWnd(long) @ stdcall -stub CtfImmHideToolbarWnd() @ stdcall -stub CtfImmDispatchDefImeMessage(ptr long ptr ptr) -@ stdcall -stub ImmActivateLayout(long) +@ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @ stdcall ImmConfigureIMEA(ptr ptr long ptr) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index c5522127cc3..caaf30c1c09 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -81,6 +81,7 @@ LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL); +LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect); BOOL APIENTRY Imm32ReleaseIME(HKL hKL); static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) @@ -122,3 +123,11 @@ Imm32ImeMenuAnsiToWide(const IMEMENUITEMINFOA *pItemA, LPIMEMENUITEMINFOW pItemW INT APIENTRY Imm32ImeMenuWideToAnsi(const IMEMENUITEMINFOW *pItemW, LPIMEMENUITEMINFOA pItemA, UINT uCodePage); + +PIME_STATE APIENTRY Imm32FetchImeState(LPINPUTCONTEXTDX pIC, HKL hKL); +PIME_SUBSTATE APIENTRY Imm32FetchImeSubState(PIME_STATE pState, HKL hKL); + +BOOL APIENTRY +Imm32LoadImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL); +BOOL APIENTRY +Imm32SaveImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 40512338d22..5be74913595 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -262,6 +262,80 @@ Imm32ImeMenuWideToAnsi(const IMEMENUITEMINFOW *pItemW, LPIMEMENUITEMINFOA pItemA return ret; } +PIME_STATE APIENTRY +Imm32FetchImeState(LPINPUTCONTEXTDX pIC, HKL hKL) +{ + PIME_STATE pState; + WORD Lang = PRIMARYLANGID(LOWORD(hKL)); + for (pState = pIC->pState; pState; pState = pState->pNext) + { + if (pState->wLang == Lang) + break; + } + if (!pState) + { + pState = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IME_STATE)); + if (pState) + { + pState->wLang = Lang; + pState->pNext = pIC->pState; + pIC->pState = pState; + } + } + return pState; +} + +PIME_SUBSTATE APIENTRY +Imm32FetchImeSubState(PIME_STATE pState, HKL hKL) +{ + PIME_SUBSTATE pSubState; + for (pSubState = pState->pSubState; pSubState; pSubState = pSubState->pNext) + { + if (pSubState->hKL == hKL) + return pSubState; + } + pSubState = Imm32HeapAlloc(0, sizeof(IME_SUBSTATE)); + if (!pSubState) + return NULL; + pSubState->dwValue = 0; + pSubState->hKL = hKL; + pSubState->pNext = pState->pSubState; + pState->pSubState = pSubState; + return pSubState; +} + +BOOL APIENTRY +Imm32LoadImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL) +{ + PIME_SUBSTATE pSubState = Imm32FetchImeSubState(pState, hKL); + if (pSubState) + { + pIC->fdwSentence |= pSubState->dwValue; + return TRUE; + } + return FALSE; +} + +BOOL APIENTRY +Imm32SaveImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL) +{ + PIME_SUBSTATE pSubState = Imm32FetchImeSubState(pState, hKL); + if (pSubState) + { + pSubState->dwValue = (pIC->fdwSentence & 0xffff0000); + return TRUE; + } + return FALSE; +} + +/*********************************************************************** + * CtfImmIsTextFrameServiceDisabled(IMM32.@) + */ +BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) +{ + return !!(GetWin32ClientInfo()->CI_flags & CI_TFSDISABLED); +} + /*********************************************************************** * ImmCreateIMCC(IMM32.@) */ diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 14458e26203..fb7032181a7 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -635,6 +635,8 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC hIMC, BOOL fFlag); BOOL WINAPI ImmDestroyContext(_In_ HIMC hIMC); BOOL WINAPI ImmDisableIME(_In_ DWORD idThread); BOOL WINAPI ImmEnumInputContext(_In_ DWORD, _In_ IMCENUMPROC, _In_ LPARAM); +BOOL WINAPI ImmLoadIME(HKL hKL); +BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID); UINT WINAPI diff --git a/sdk/include/reactos/wine/ddk/imm.h b/sdk/include/reactos/wine/ddk/imm.h index 842c7cac015..33ed8e49a82 100644 --- a/sdk/include/reactos/wine/ddk/imm.h +++ b/sdk/include/reactos/wine/ddk/imm.h @@ -87,6 +87,8 @@ C_ASSERT(offsetof(INPUTCONTEXT, dwReserve) == 0x134); C_ASSERT(sizeof(INPUTCONTEXT) == 0x140); #endif +struct IME_STATE; + typedef struct INPUTCONTEXTDX /* unconfirmed */ { INPUTCONTEXT; @@ -95,8 +97,8 @@ typedef struct INPUTCONTEXTDX /* unconfirmed */ DWORD dwUnknown1; DWORD dwUIFlags; DWORD dwUnknown2; - void *pUnknown3; - DWORD dwUnknown4; + struct IME_STATE *pState; + DWORD dwChange; DWORD dwUnknown5; } INPUTCONTEXTDX, *LPINPUTCONTEXTDX; @@ -104,6 +106,8 @@ typedef struct INPUTCONTEXTDX /* unconfirmed */ C_ASSERT(offsetof(INPUTCONTEXTDX, nVKey) == 0x140); C_ASSERT(offsetof(INPUTCONTEXTDX, bNeedsTrans) == 0x144); C_ASSERT(offsetof(INPUTCONTEXTDX, dwUIFlags) == 0x14c); +C_ASSERT(offsetof(INPUTCONTEXTDX, pState) == 0x154); +C_ASSERT(offsetof(INPUTCONTEXTDX, dwChange) == 0x158); C_ASSERT(sizeof(INPUTCONTEXTDX) == 0x160); #endif @@ -115,6 +119,12 @@ C_ASSERT(sizeof(INPUTCONTEXTDX) == 0x160); #define INIT_COMPFORM 0x00000010 #define INIT_SOFTKBDPOS 0x00000020 +// bits for INPUTCONTEXTDX.dwChange +#define INPUTCONTEXTDX_CHANGE_OPEN 0x1 +#define INPUTCONTEXTDX_CHANGE_CONVERSION 0x2 +#define INPUTCONTEXTDX_CHANGE_SENTENCE 0x4 +#define INPUTCONTEXTDX_CHANGE_FORCE_OPEN 0x100 + #ifndef WM_IME_REPORT #define WM_IME_REPORT 0x280 #endif @@ -154,4 +164,30 @@ typedef struct tagUNDETERMINESTRUCT LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); +typedef struct IME_SUBSTATE +{ + struct IME_SUBSTATE *pNext; + HKL hKL; + DWORD dwValue; +} IME_SUBSTATE, *PIME_SUBSTATE; + +#ifndef _WIN64 +C_ASSERT(sizeof(IME_SUBSTATE) == 0xc); +#endif + +typedef struct IME_STATE +{ + struct IME_STATE *pNext; + WORD wLang; + WORD fOpen; + DWORD dwConversion; + DWORD dwSentence; + DWORD dwInit; + PIME_SUBSTATE pSubState; +} IME_STATE, *PIME_STATE; + +#ifndef _WIN64 +C_ASSERT(sizeof(IME_STATE) == 0x18); +#endif + #endif /* _WINE_IMM_H_ */ diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index a6a45af167b..eb5fb285a79 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3314,9 +3314,7 @@ NtUserSetSystemTimer( DWORD NTAPI -NtUserSetThreadLayoutHandles( - DWORD dwUnknown1, - DWORD dwUnknown2); +NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL); UINT_PTR NTAPI diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 6a1b3c4673e..e3de96b1d51 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -894,9 +894,7 @@ Quit: DWORD APIENTRY -NtUserSetThreadLayoutHandles( - DWORD dwUnknown1, - DWORD dwUnknown2) +NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) { STUB; return 0;

1 0

[reactos] 01/01: [UNIATA] Better split of model name between Vendor and Product
by Hervé Poussineau 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fdf0781345eeb6fded67… commit 7fdf0781345eeb6fded67a02a8e6a5a8f79724b3 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Oct 3 19:13:19 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Oct 3 23:09:55 2021 +0200 [UNIATA] Better split of model name between Vendor and Product UNIATA is converting IDE identify data into SCSI identify data. However, IDE model is described with a unique field of 20 chars, while SCSI model is described with 2 fields of 16 + 8 chars. When displaying SCSI model, a space is added between vendor and product fields. Try to split model into vendor and product on a space if possible. CORE-17400 --- drivers/storage/ide/uniata/id_ata.cpp | 54 +++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/storage/ide/uniata/id_ata.cpp b/drivers/storage/ide/uniata/id_ata.cpp index 7068beda353..6957956b88e 100644 --- a/drivers/storage/ide/uniata/id_ata.cpp +++ b/drivers/storage/ide/uniata/id_ata.cpp @@ -570,6 +570,52 @@ AtapiSuckPortBuffer2( return i; } // AtapiSuckPortBuffer2() +#ifdef __REACTOS__ +VOID +DDKFASTAPI +FillDeviceIdentificationString( + IN OUT PINQUIRYDATA InquiryData, + IN PIDENTIFY_DATA2 IdentifyData) +{ + ULONG i; + ULONG IdentifierLen, FirstWordLen; + + /* We need to copy a field which is 20 chars long to two fields which are 8+16 bytes long (VendorId + ProductId) + * Note that a space will be added between those fields when displaying them. + * => Try to split identifier on space char. + */ + +#define IDENTIFIER_LETTER(Identifier, i) (((PUCHAR)Identifier)[(i) ^ 1]) + + for (IdentifierLen = 20; IdentifierLen > 0 && IDENTIFIER_LETTER(IdentifyData->ModelNumber, IdentifierLen - 1) == ' '; IdentifierLen--) + ; + + /* Strategy 1: copy first word to VendorId if len <= 8. Copy other chars to ProductId */ + for (FirstWordLen = 0; IDENTIFIER_LETTER(IdentifyData->ModelNumber, FirstWordLen) != ' ' && FirstWordLen < IdentifierLen; FirstWordLen++) + ; + if (FirstWordLen <= 8) + { + for (i = 0; i < FirstWordLen; i++) + InquiryData->VendorId[i] = IDENTIFIER_LETTER(IdentifyData->ModelNumber, i); + for (i = FirstWordLen + 1; i < IdentifierLen; i++) + InquiryData->ProductId[i - FirstWordLen - 1] = IDENTIFIER_LETTER(IdentifyData->ModelNumber, i); + return; + } + + /* Strategy 2: copy everything to ProductId */ + if (IdentifierLen <= 16) + { + for (i = 0; i < IdentifierLen; i++) + InquiryData->ProductId[i] = IDENTIFIER_LETTER(IdentifyData->ModelNumber, i); + return; + } + + /* Strategy 3: copy first to VendorId, then to ProductId */ + for (i = 0; i < 24; i += 2) + MOV_DW_SWP(InquiryData->DeviceIdentificationString[i], ((PUCHAR)IdentifyData->ModelNumber)[i]); +} +#endif + UCHAR DDKFASTAPI SelectDrive( @@ -8354,9 +8400,13 @@ default_no_prep: inquiryData->CommandQueue = 1; // Fill in vendor identification fields. +#ifdef __REACTOS__ + FillDeviceIdentificationString(inquiryData, identifyData); +#else for (i = 0; i < 24; i += 2) { MOV_DW_SWP(inquiryData->DeviceIdentificationString[i], ((PUCHAR)identifyData->ModelNumber)[i]); } +#endif /* // Initialize unused portion of product id. for (i = 0; i < 4; i++) { @@ -9560,9 +9610,13 @@ reject_srb: inquiryData->CommandQueue = 1; // Fill in vendor identification fields. +#ifdef __REACTOS__ + FillDeviceIdentificationString(inquiryData, identifyData); +#else for (i = 0; i < 24; i += 2) { MOV_DW_SWP(inquiryData->DeviceIdentificationString[i], ((PUCHAR)identifyData->ModelNumber)[i]); } +#endif // Move firmware revision from IDENTIFY data to // product revision in INQUIRY data.

1 0

[reactos] 02/02: [RAPPS] Speed up app loading by caching the INI sections
by Mark Jansen 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bdeaca56e8e01473d985… commit 9bdeaca56e8e01473d9858a1b7ea4bbdbbc836cf Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 30 20:19:21 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 3 20:26:25 2021 +0200 [RAPPS] Speed up app loading by caching the INI sections --- base/applications/rapps/appview.cpp | 6 + base/applications/rapps/configparser.cpp | 182 ++++++++++++++++--------- base/applications/rapps/include/appview.h | 13 +- base/applications/rapps/include/configparser.h | 13 +- base/applications/rapps/include/gui.h | 7 - base/applications/rapps/misc.cpp | 35 +++-- 6 files changed, 157 insertions(+), 99 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index c15c3ab1172..631eecbad9c 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1705,6 +1705,12 @@ BOOL CApplicationView::CreateAppInfoDisplay() return m_AppsInfo->Create(m_hWnd) != NULL; } +void CApplicationView::SetRedraw(BOOL bRedraw) +{ + CWindow::SetRedraw(bRedraw); + m_ListView->SetRedraw(bRedraw); +} + VOID CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { if (wParam == SIZE_MINIMIZED) diff --git a/base/applications/rapps/configparser.cpp b/base/applications/rapps/configparser.cpp index 5e191da800b..d5c65991daa 100644 --- a/base/applications/rapps/configparser.cpp +++ b/base/applications/rapps/configparser.cpp @@ -2,18 +2,31 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Config parser - * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> */ #include "rapps.h" +#include <debug.h> -CConfigParser::CConfigParser(const ATL::CStringW& FileName) : szConfigPath(GetINIFullPath(FileName)) +struct CLocaleSections { - CacheINILocale(); -} + CStringW Locale; + CStringW LocaleNeutral; + CStringW Section; +}; -ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) +struct CSectionNames +{ + CLocaleSections ArchSpecific; + CLocaleSections ArchNeutral; +}; +static CSectionNames g_Names; + + +static +ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName) { ATL::CStringW szDir; ATL::CStringW szBuffer; @@ -24,79 +37,124 @@ ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) return szBuffer; } -VOID CConfigParser::CacheINILocale() +CConfigParser::CConfigParser(const ATL::CStringW& FileName) + : szConfigPath(GetINIFullPath(FileName)) { - // TODO: Set default locale if call fails - // find out what is the current system lang code (e.g. "0a") and append it to SectionLocale - GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, - m_szLocaleID.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); - - m_szLocaleID.ReleaseBuffer(); - m_szCachedINISectionLocale = L"Section." + m_szLocaleID; - - // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part - if (m_szLocaleID.GetLength() >= 2) - m_szCachedINISectionLocaleNeutral = L"Section." + m_szLocaleID.Right(2); - else - m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale; + CacheINI(); } -BOOL CConfigParser::GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString) +void CConfigParser::ReadSection(ATL::CStringW& Buffer, const ATL::CStringW& Section, BOOL isArch) { - DWORD dwResult; - - LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); - // 1st - find localized strings (e.g. "Section.0c0a") - dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocale + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - - if (!dwResult) + DWORD len = 512; + DWORD result; + + do { - // 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") - dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocaleNeutral + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - if (!dwResult) + len *= 2; + + result = GetPrivateProfileSectionW(Section, Buffer.GetBuffer(len), len, szConfigPath); + Buffer.ReleaseBuffer(result); + } while (result == len - 2); + + len = 0; + while (len < result) + { + // Explicitly use the null terminator! + CString tmp = Buffer.GetBuffer() + len; + if (tmp.GetLength() > 0) + { + len += tmp.GetLength() + 1; + + int idx = tmp.Find('='); + if (idx >= 0) + { + CString key = tmp.Left(idx); + +#ifndef _M_IX86 + // On non-x86 architecture we need the architecture specific URL + if (!isArch && key == "URLDownload") + { + continue; + } +#endif + + // Is this key already present from a more specific translation? + if (m_Keys.FindKey(key) >= 0) + { + continue; + } + + CString value = tmp.Mid(idx+1); + m_Keys.Add(key, value); + } + else + { + DPRINT1("ERROR: invalid key/value pair: '%S'\n", tmp.GetString()); + } + } + else { - // 3rd - if they weren't present fallback to standard english strings (just "Section") - dwResult = GetPrivateProfileStringW((ATL::CStringW(L"Section") + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); + break; } } - - ResultString.ReleaseBuffer(); - return (dwResult != 0 ? TRUE : FALSE); } -BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +VOID CConfigParser::CacheINI() { - /* First try */ - if (GetStringWorker(KeyName, L"." CurrentArchitecture, ResultString)) + // Cache section names + if (g_Names.ArchSpecific.Locale.IsEmpty()) { - return TRUE; + CString szLocaleID; + const INT cchLocaleSize = 5; + + GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, szLocaleID.GetBuffer(cchLocaleSize), cchLocaleSize); + szLocaleID.ReleaseBuffer(); + CString INISectionLocale = L"Section." + szLocaleID; + + g_Names.ArchSpecific.Locale = INISectionLocale + L"." CurrentArchitecture; + g_Names.ArchNeutral.Locale = INISectionLocale; + + // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part + if (szLocaleID.GetLength() >= 2) + { + g_Names.ArchSpecific.LocaleNeutral = L"Section." + szLocaleID.Right(2) + L"." CurrentArchitecture; + g_Names.ArchNeutral.LocaleNeutral = L"Section." + szLocaleID.Right(2); + } + + g_Names.ArchSpecific.Section = L"Section." CurrentArchitecture; + g_Names.ArchNeutral.Section = L"Section"; } -#ifndef _M_IX86 - /* On non-x86 architecture we need the architecture specific URL */ - if (KeyName == L"URLDownload") + // Use a shared buffer so that we don't have to re-allocate it every time + CStringW Buffer; + + ReadSection(Buffer, g_Names.ArchSpecific.Locale, TRUE); + if (!g_Names.ArchSpecific.LocaleNeutral.IsEmpty()) { - return FALSE; + ReadSection(Buffer, g_Names.ArchSpecific.LocaleNeutral, TRUE); + } + ReadSection(Buffer, g_Names.ArchSpecific.Section, TRUE); + + + ReadSection(Buffer, g_Names.ArchNeutral.Locale, FALSE); + if (!g_Names.ArchNeutral.LocaleNeutral.IsEmpty()) + { + ReadSection(Buffer, g_Names.ArchNeutral.LocaleNeutral, FALSE); + } + ReadSection(Buffer, g_Names.ArchNeutral.Section, FALSE); +} + +BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +{ + int nIndex = m_Keys.FindKey(KeyName); + if (nIndex >= 0) + { + ResultString = m_Keys.GetValueAt(nIndex); + return TRUE; } -#endif - /* Fall back to default */ - return GetStringWorker(KeyName, L"", ResultString); + ResultString.Empty(); + return FALSE; } BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 192a59c7489..b625d5ed296 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -351,42 +351,31 @@ private: BOOL ProcessWindowMessage(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT &theResult, DWORD dwMapId); BOOL CreateToolbar(); - BOOL CreateSearchBar(); - BOOL CreateComboBox(); - BOOL CreateHSplitter(); - BOOL CreateListView(); - BOOL CreateAppInfoDisplay(); VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam); - VOID OnCommand(WPARAM wParam, LPARAM lParam); public: CApplicationView(CMainWindow *MainWindow); - ~CApplicationView(); static ATL::CWndClassInfo &GetWndClassInfo(); HWND Create(HWND hwndParent); - + void SetRedraw(BOOL bRedraw); BOOL SetDisplayAppType(APPLICATION_VIEW_TYPE AppType); BOOL AddInstalledApplication(CInstalledApplicationInfo *InstAppInfo, LPVOID param); - BOOL AddAvailableApplication(CAvailableApplicationInfo *AvlbAppInfo, BOOL InitCheckState, LPVOID param); void CheckAll(); - PVOID GetFocusedItemData(); - int GetItemCount(); - VOID AppendTabOrderWindow(int Direction, ATL::CSimpleArray<HWND> &TabOrderList); // this function is called when a item of listview get focus. diff --git a/base/applications/rapps/include/configparser.h b/base/applications/rapps/include/configparser.h index 5df9150269c..7ccfa115bd4 100644 --- a/base/applications/rapps/include/configparser.h +++ b/base/applications/rapps/include/configparser.h @@ -5,18 +5,11 @@ class CConfigParser { - // Locale names cache - const static INT m_cchLocaleSize = 5; - - ATL::CStringW m_szLocaleID; - ATL::CStringW m_szCachedINISectionLocale; - ATL::CStringW m_szCachedINISectionLocaleNeutral; - const ATL::CStringW szConfigPath; + CSimpleMap<CStringW, CStringW> m_Keys; - ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); - VOID CacheINILocale(); - BOOL GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString); + void CacheINI(); + void ReadSection(ATL::CStringW& Buffer, const ATL::CStringW& Section, BOOL isArch); public: CConfigParser(const ATL::CStringW& FileName); diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index 1d8b6141ece..738379d7a1e 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -71,13 +71,9 @@ private: VOID InitCategoriesList(); BOOL CreateStatusBar(); - BOOL CreateTreeView(); - BOOL CreateApplicationView(); - BOOL CreateVSplitter(); - BOOL CreateLayout(); VOID LayoutCleanup(); @@ -99,11 +95,8 @@ private: VOID OnCommand(WPARAM wParam, LPARAM lParam); BOOL CALLBACK EnumInstalledAppProc(CInstalledApplicationInfo *Info); - BOOL CALLBACK EnumAvailableAppProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState); - static BOOL CALLBACK s_EnumInstalledAppProc(CInstalledApplicationInfo *Info, PVOID param); - static BOOL CALLBACK s_EnumAvailableAppProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param); static BOOL CALLBACK s_EnumSelectedAppForDownloadProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 742d4d67bb4..b5d142828ff 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -140,17 +140,36 @@ BOOL StartProcess(const ATL::CStringW& Path, BOOL Wait) BOOL GetStorageDirectory(ATL::CStringW& Directory) { - LPWSTR DirectoryStr = Directory.GetBuffer(MAX_PATH); - if (!SHGetSpecialFolderPathW(NULL, DirectoryStr, CSIDL_LOCAL_APPDATA, TRUE)) + static CStringW CachedDirectory; + static BOOL CachedDirectoryInitialized = FALSE; + + if (!CachedDirectoryInitialized) { - Directory.ReleaseBuffer(); - return FALSE; - } + LPWSTR DirectoryStr = CachedDirectory.GetBuffer(MAX_PATH); + BOOL bHasPath = SHGetSpecialFolderPathW(NULL, DirectoryStr, CSIDL_LOCAL_APPDATA, TRUE); + if (bHasPath) + { + PathAppendW(DirectoryStr, L"rapps"); + } + CachedDirectory.ReleaseBuffer(); + + if (bHasPath) + { + if (!CreateDirectoryW(CachedDirectory, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) + { + CachedDirectory.Empty(); + } + } + else + { + CachedDirectory.Empty(); + } - PathAppendW(DirectoryStr, L"rapps"); - Directory.ReleaseBuffer(); + CachedDirectoryInitialized = TRUE; + } - return (CreateDirectoryW(Directory.GetString(), NULL) || GetLastError() == ERROR_ALREADY_EXISTS); + Directory = CachedDirectory; + return !Directory.IsEmpty(); } VOID InitLogs()

1 0

[reactos] 01/02: [RAPPS] Cleanup
by Mark Jansen 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f9dd96dcf89b7f40f271… commit 6f9dd96dcf89b7f40f2717c30bce10c53ef95977 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 30 20:19:05 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 3 20:26:19 2021 +0200 [RAPPS] Cleanup --- base/applications/rapps/include/misc.h | 12 +------- base/applications/rapps/misc.cpp | 51 ++++------------------------------ base/applications/rapps/winmain.cpp | 47 ++++++------------------------- 3 files changed, 15 insertions(+), 95 deletions(-) diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 1a00feeb526..ff78d0a45bd 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -3,9 +3,6 @@ #include <windef.h> #include <atlstr.h> -#define EPOCH_DIFF 116444736000000000 //FILETIME starts from 1601-01-01 UTC, UnixTime starts from 1970-01-01 -#define RATE_DIFF 10000000 - #ifdef _M_IX86 #define CurrentArchitecture L"x86" #elif defined(_M_AMD64) @@ -20,16 +17,9 @@ #define CurrentArchitecture L"ppc" #endif -INT GetWindowWidth(HWND hwnd); -INT GetWindowHeight(HWND hwnd); -INT GetClientWindowWidth(HWND hwnd); -INT GetClientWindowHeight(HWND hwnd); - VOID CopyTextToClipboard(LPCWSTR lpszText); VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem); -VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem); -BOOL StartProcess(ATL::CStringW &Path, BOOL Wait); -BOOL StartProcess(LPWSTR lpPath, BOOL Wait); +BOOL StartProcess(const ATL::CStringW &Path, BOOL Wait); BOOL GetStorageDirectory(ATL::CStringW &lpDirectory); VOID InitLogs(); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 0380705f4e3..742d4d67bb4 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -15,38 +15,6 @@ static HANDLE hLog = NULL; static BOOL bIsSys64ResultCached = FALSE; static BOOL bIsSys64Result = FALSE; -INT GetWindowWidth(HWND hwnd) -{ - RECT Rect; - - GetWindowRect(hwnd, &Rect); - return (Rect.right - Rect.left); -} - -INT GetWindowHeight(HWND hwnd) -{ - RECT Rect; - - GetWindowRect(hwnd, &Rect); - return (Rect.bottom - Rect.top); -} - -INT GetClientWindowWidth(HWND hwnd) -{ - RECT Rect; - - GetClientRect(hwnd, &Rect); - return (Rect.right - Rect.left); -} - -INT GetClientWindowHeight(HWND hwnd) -{ - RECT Rect; - - GetClientRect(hwnd, &Rect); - return (Rect.bottom - Rect.top); -} - VOID CopyTextToClipboard(LPCWSTR lpszText) { if (!OpenClipboard(NULL)) @@ -112,18 +80,7 @@ VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) } } -VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) -{ - ShowPopupMenuEx(hwnd, hMainWnd, MenuID, DefaultItem); -} - - -BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) -{ - return StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait);; -} - -BOOL StartProcess(LPWSTR lpPath, BOOL Wait) +BOOL StartProcess(const ATL::CStringW& Path, BOOL Wait) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -135,7 +92,11 @@ BOOL StartProcess(LPWSTR lpPath, BOOL Wait) si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; - if (!CreateProcessW(NULL, lpPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + // The Unicode version of CreateProcess can modify the contents of this string. + CStringW Tmp = Path; + BOOL fSuccess = CreateProcessW(NULL, Tmp.GetBuffer(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + Tmp.ReleaseBuffer(); + if (!fSuccess) { return FALSE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 894bbb43f9c..cd2d82302b1 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -19,51 +19,20 @@ HWND hMainWnd; HINSTANCE hInst; SETTINGS_INFO SettingsInfo; -class CRAppsModule : public CComModule -{ -public: -}; - BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() -CRAppsModule gModule; +CComModule gModule; CAtlWinModule gWinModule; -Gdiplus::GdiplusStartupInput gdiplusStartupInput; -ULONG_PTR gdiplusToken; - - -static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) -{ - if (bInitialize) - { - gModule.Init(ObjectMap, hInstance, NULL); - } - else - { - gModule.Term(); - } -} - -VOID InitializeGDIPlus(BOOL bInitialize) -{ - if (bInitialize) - { - Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - } - else - { - Gdiplus::GdiplusShutdown(gdiplusToken); - } -} INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) { - BOOL bIsFirstLaunch; + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; - InitializeAtlModule(hInstance, TRUE); - InitializeGDIPlus(TRUE); + gModule.Init(ObjectMap, hInstance, NULL); + Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); if (GetUserDefaultUILanguage() == MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT)) { @@ -72,7 +41,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi hInst = hInstance; - bIsFirstLaunch = !LoadSettings(&SettingsInfo); + BOOL bIsFirstLaunch = !LoadSettings(&SettingsInfo); if (bIsFirstLaunch) { FillDefaultSettings(&SettingsInfo); @@ -84,8 +53,8 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi // parse cmd-line and perform the corresponding operation BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL); - InitializeGDIPlus(FALSE); - InitializeAtlModule(GetModuleHandle(NULL), FALSE); + Gdiplus::GdiplusShutdown(gdiplusToken); + gModule.Term(); return bSuccess ? 0 : 1; }

1 0

[reactos] 01/01: [SHELL32] Fix uninitialized variable usage. This fixes log spam about NM_CUSTOMDRAW not being handled
by Mark Jansen 01 Oct '21

01 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22e58e68aa35a1ba49d28… commit 22e58e68aa35a1ba49d280b12f99f7f03f5f8633 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 30 20:44:05 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 1 17:40:01 2021 +0200 [SHELL32] Fix uninitialized variable usage. This fixes log spam about NM_CUSTOMDRAW not being handled --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 05ecbdfc8f8..9044e134359 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -258,6 +258,10 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } *theResult = TRUE; return S_OK; + + default: + *theResult = 0L; + break; } return S_OK; }

1 0

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