Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 01/01: [CMAKE] Remove /fallback compile flag from clang-cl builds
by Victor Perevertkin 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55f1f3000a8bc5273b4e4… commit 55f1f3000a8bc5273b4e4edaca70f3f3fef8b7ad Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Oct 14 19:27:02 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Oct 14 20:30:27 2021 +0300 [CMAKE] Remove /fallback compile flag from clang-cl builds This option is not needed anymore and was removed from LLVM 13 --- drivers/filesystems/ext2/CMakeLists.txt | 11 +---------- sdk/lib/crt/stdlib/stdlib.cmake | 4 ---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index b948b50c9b5..005bfcb6dac 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -88,10 +88,6 @@ list(APPEND SOURCE add_library(ext2fs MODULE ${SOURCE} ext2fs.rc) -if(USE_CLANG_CL) - set_property(SOURCE src/create.c src/fileinfo.c src/memory.c src/read.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") -endif() - if(MSVC) if (NOT CLANG) # Disable warning C4101: 'i': unreferenced local variable @@ -120,12 +116,7 @@ target_link_libraries(ext2fs memcmp ${PSEH_LIB}) add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) - set_property(TARGET ext2fs PROPERTY C_STANDARD 90) - -if(NOT USE_CLANG_CL) - # The fallback we have above prevents cl and clang-cl from using the same PCH - add_pch(ext2fs inc/ext2fs.h SOURCE) -endif() +add_pch(ext2fs inc/ext2fs.h SOURCE) add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all) diff --git a/sdk/lib/crt/stdlib/stdlib.cmake b/sdk/lib/crt/stdlib/stdlib.cmake index 5325319f839..aaf745c4519 100644 --- a/sdk/lib/crt/stdlib/stdlib.cmake +++ b/sdk/lib/crt/stdlib/stdlib.cmake @@ -33,10 +33,6 @@ list(APPEND CRT_STDLIB_SOURCE ) if(USE_CLANG_CL) - # clang-cl is missing pragma function support - # https://bugs.llvm.org/show_bug.cgi?id=35116 - set_property(SOURCE stdlib/rot.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") - if(ARCH STREQUAL "i386") list(APPEND CRT_STDLIB_ASM_SOURCE stdlib/clang-alias.s

1 0

[reactos] 01/01: [Win32K] Fix typo
by James Tabor 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63e7d6c29ed5f1ee73910… commit 63e7d6c29ed5f1ee73910bec165c8dfaa87837ed Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Thu Oct 14 09:59:53 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Thu Oct 14 09:59:53 2021 -0500 [Win32K] Fix typo Fix a GERRRR typo. --- win32ss/gdi/ntgdi/dcutil.c | 2 +- win32ss/include/ntgdityp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c index cb41e6cfcd5..d66086d72d8 100644 --- a/win32ss/gdi/ntgdi/dcutil.c +++ b/win32ss/gdi/ntgdi/dcutil.c @@ -492,7 +492,7 @@ NtGdiGetDCDword( SafeResult = pdcattr->lBreakExtra; break; - case GdiGerCharBreak: + case GdiGetCharBreak: SafeResult = pdcattr->cBreak; break; diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 3144df2745d..137937ee498 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -48,7 +48,7 @@ typedef enum _GETDCDWORD GdiGetJournal, GdiGetRelAbs, GdiGetBreakExtra, - GdiGerCharBreak, + GdiGetCharBreak, GdiGetArcDirection, GdiGetEMFRestorDc, GdiGetFontLanguageInfo,

1 0

[reactos] 01/01: [NOTEPAD] Improve Japanese translation
by Katayama Hirofumi MZ 14 Oct '21

14 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e356a9b6c4508cccbb53… commit 6e356a9b6c4508cccbb53888b2baa28c9b2f211c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 14 13:08:38 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Oct 14 13:08:38 2021 +0900 [NOTEPAD] Improve Japanese translation --- base/applications/notepad/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index b4f42011326..ad1359f9aca 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -24,7 +24,7 @@ BEGIN POPUP "ファイル(&F)" BEGIN MENUITEM "新規作成(&N)\tCtrl+N", CMD_NEW - MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "新規ウィンドウ(&W)\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "開く(&O)...\tCtrl+O", CMD_OPEN MENUITEM "上書き保存(&S)\tCtrl+S", CMD_SAVE MENUITEM "名前を付けて保存(&A)...", CMD_SAVE_AS @@ -64,7 +64,7 @@ BEGIN BEGIN MENUITEM "目次(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "メモ帳について(&A)", CMD_HELP_ABOUT_NOTEPAD END END

1 0

[reactos] 01/01: [IMM32] Re-implement ImmGetCompositionStringA/W (#4026)
by Katayama Hirofumi MZ 13 Oct '21

13 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfb7bd05a404d43985502… commit bfb7bd05a404d43985502282ce9cccbcae0c832d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 14 08:07:06 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 14 08:07:06 2021 +0900 [IMM32] Re-implement ImmGetCompositionStringA/W (#4026) - Re-implement ImmGetCompositionStringA and ImmGetCompositionStringW functions. - Add Imm32CompStrAnsiToWide, Imm32CompStrWideToAnsi, Imm32CompAttrWideToAnsi, Imm32CompAttrAnsiToWide, Imm32CompClauseAnsiToWide, and Imm32CompClauseWideToAnsi helper functions. CORE-11700 --- dll/win32/imm32/compstr.c | 403 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 390 insertions(+), 13 deletions(-) diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index 4ce157356e3..df0726c2fa2 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -2,38 +2,251 @@ * PROJECT: ReactOS IMM32 * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Implementing composition strings of IMM32 - * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 1998 Patrik Stridvall + * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart + * Copyright 2017 James Tabor <james.tabor(a)reactos.org> + * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> + * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> + * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); +static inline LONG APIENTRY +Imm32CompStrAnsiToWide(LPCSTR psz, DWORD cb, LPWSTR lpBuf, DWORD dwBufLen, UINT uCodePage) +{ + DWORD ret = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, psz, cb / sizeof(CHAR), + lpBuf, dwBufLen / sizeof(WCHAR)); + if ((ret + 1) * sizeof(WCHAR) <= dwBufLen) + lpBuf[ret] = 0; + return ret * sizeof(WCHAR); +} + +static inline LONG APIENTRY +Imm32CompStrWideToAnsi(LPCWSTR psz, DWORD cb, LPSTR lpBuf, DWORD dwBufLen, UINT uCodePage) +{ + DWORD ret = WideCharToMultiByte(uCodePage, 0, psz, cb / sizeof(WCHAR), + lpBuf, dwBufLen / sizeof(CHAR), NULL, NULL); + if ((ret + 1) * sizeof(CHAR) <= dwBufLen) + lpBuf[ret] = 0; + return ret * sizeof(CHAR); +} + +static INT APIENTRY +Imm32CompAttrWideToAnsi(const BYTE *src, INT src_len, LPCWSTR text, + INT str_len, LPBYTE dst, INT dst_len, UINT uCodePage) +{ + INT rc; + INT i, j = 0, k = 0, len; + + if (!src_len) + return 0; + + rc = WideCharToMultiByte(uCodePage, 0, text, str_len, NULL, 0, NULL, NULL); + + if (dst_len) + { + if (dst_len > rc) + dst_len = rc; + + for (i = 0; i < str_len; ++i, ++k) + { + len = WideCharToMultiByte(uCodePage, 0, &text[i], 1, NULL, 0, NULL, NULL); + for (; len > 0; --len) + { + dst[j++] = src[k]; + + if (dst_len <= j) + goto end; + } + } +end: + rc = j; + } + + return rc; +} + +static INT APIENTRY +Imm32CompAttrAnsiToWide(const BYTE *src, INT src_len, LPCSTR text, + INT str_len, LPBYTE dst, INT dst_len, UINT uCodePage) +{ + INT rc; + INT i, j = 0; + + if (!src_len) + return 0; + + rc = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, text, str_len, NULL, 0); + + if (dst_len) + { + if (dst_len > rc) + dst_len = rc; + + for (i = 0; i < str_len; ++i) + { + if (IsDBCSLeadByteEx(uCodePage, text[i]) && text[i + 1]) + continue; + + dst[j++] = src[i]; + + if (dst_len <= j) + break; + } + + rc = j; + } + + return rc; +} + +static INT APIENTRY +Imm32CompClauseAnsiToWide(const DWORD *source, INT slen, LPCSTR text, + LPDWORD target, INT tlen, UINT uCodePage) +{ + INT rc, i; + + if (!slen) + return 0; + + if (tlen) + { + if (tlen > slen) + tlen = slen; + + tlen /= sizeof(DWORD); + + for (i = 0; i < tlen; ++i) + { + target[i] = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, text, source[i], NULL, 0); + } + + rc = sizeof(DWORD) * i; + } + else + { + rc = slen; + } + + return rc; +} + +static INT APIENTRY +Imm32CompClauseWideToAnsi(const DWORD *source, INT slen, LPCWSTR text, + LPDWORD target, INT tlen, UINT uCodePage) +{ + INT rc, i; + + if (!slen) + return 0; + + if (tlen) + { + if (tlen > slen) + tlen = slen; + + tlen /= sizeof(DWORD); + + for (i = 0; i < tlen; ++i) + { + target[i] = WideCharToMultiByte(uCodePage, 0, text, source[i], NULL, 0, NULL, NULL); + } + + rc = sizeof(DWORD) * i; + } + else + { + rc = slen; + } + + return rc; +} + +#define CS_StrA(pCS, Name) ((LPCSTR)(pCS) + (pCS)->dw##Name##Offset) +#define CS_StrW(pCS, Name) ((LPCWSTR)CS_StrA(pCS, Name)) +#define CS_Attr(pCS, Name) ((const BYTE *)CS_StrA(pCS, Name)) +#define CS_Clause(pCS, Name) ((const DWORD *)CS_StrA(pCS, Name)) +#define CS_Size(pCS, Name) ((pCS)->dw##Name##Len) +#define CS_SizeA(pCS, Name) (CS_Size(pCS, Name) * sizeof(CHAR)) +#define CS_SizeW(pCS, Name) (CS_Size(pCS, Name) * sizeof(WCHAR)) + +#define CS_DoStr(pCS, Name, AorW) do { \ + if (dwBufLen == 0) { \ + dwBufLen = CS_Size##AorW((pCS), Name); \ + } else { \ + if (dwBufLen > CS_Size##AorW((pCS), Name)) \ + dwBufLen = CS_Size##AorW((pCS), Name); \ + RtlCopyMemory(lpBuf, CS_Str##AorW((pCS), Name), dwBufLen); \ + } \ +} while (0) + +#define CS_DoStrA(pCS, Name) CS_DoStr(pCS, Name, A) +#define CS_DoStrW(pCS, Name) CS_DoStr(pCS, Name, W) +#define CS_DoAttr CS_DoStrA +#define CS_DoClause CS_DoStrA + LONG APIENTRY Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsiClient, UINT uCodePage) { - LONG ret = IMM_ERROR_GENERAL; - if (bAnsiClient) { switch (dwIndex) { case GCS_COMPREADSTR: + CS_DoStrA(pCS, CompReadStr); + break; + case GCS_COMPREADATTR: + CS_DoAttr(pCS, CompReadAttr); + break; + case GCS_COMPREADCLAUSE: + CS_DoClause(pCS, CompReadClause); + break; + case GCS_COMPSTR: + CS_DoStrA(pCS, CompStr); + break; + case GCS_COMPATTR: + CS_DoAttr(pCS, CompAttr); + break; + case GCS_COMPCLAUSE: + CS_DoClause(pCS, CompClause); + break; + case GCS_CURSORPOS: + dwBufLen = pCS->dwCursorPos; + break; + case GCS_DELTASTART: + dwBufLen = pCS->dwDeltaStart; + break; + case GCS_RESULTREADSTR: + CS_DoStrA(pCS, ResultReadStr); + break; + case GCS_RESULTREADCLAUSE: + CS_DoClause(pCS, ResultReadClause); + break; + case GCS_RESULTSTR: + CS_DoStrA(pCS, ResultStr); + break; + case GCS_RESULTCLAUSE: + CS_DoClause(pCS, ResultClause); + break; + default: FIXME("TODO:\n"); - break; + return IMM_ERROR_GENERAL; } } else /* !bAnsiClient */ @@ -41,51 +254,175 @@ Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, switch (dwIndex) { case GCS_COMPREADSTR: + dwBufLen = Imm32CompStrWideToAnsi(CS_StrW(pCS, CompReadStr), + CS_SizeW(pCS, CompReadStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPREADATTR: + dwBufLen = Imm32CompAttrWideToAnsi(CS_Attr(pCS, CompReadAttr), + CS_Size(pCS, CompReadAttr), + CS_StrW(pCS, CompStr), + CS_SizeW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPREADCLAUSE: + dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, CompReadClause), + CS_Size(pCS, CompReadClause), + CS_StrW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPSTR: + dwBufLen = Imm32CompStrWideToAnsi(CS_StrW(pCS, CompStr), + CS_SizeW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPATTR: + dwBufLen = Imm32CompAttrWideToAnsi(CS_Attr(pCS, CompAttr), + CS_Size(pCS, CompAttr), + CS_StrW(pCS, CompStr), + CS_SizeW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPCLAUSE: + dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, CompClause), + CS_Size(pCS, CompClause), + CS_StrW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_CURSORPOS: + dwBufLen = IchAnsiFromWide(pCS->dwCursorPos, CS_StrW(pCS, CompStr), uCodePage); + break; + case GCS_DELTASTART: + dwBufLen = IchAnsiFromWide(pCS->dwDeltaStart, CS_StrW(pCS, CompStr), uCodePage); + break; + case GCS_RESULTREADSTR: + dwBufLen = Imm32CompStrWideToAnsi(CS_StrW(pCS, ResultReadStr), + CS_SizeW(pCS, ResultReadStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_RESULTREADCLAUSE: + dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, ResultReadClause), + CS_Size(pCS, ResultReadClause), + CS_StrW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_RESULTSTR: + dwBufLen = Imm32CompStrWideToAnsi(CS_StrW(pCS, ResultStr), + CS_SizeW(pCS, ResultStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_RESULTCLAUSE: + dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, ResultClause), + CS_Size(pCS, ResultClause), + CS_StrW(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + default: FIXME("TODO:\n"); - break; + return IMM_ERROR_GENERAL; } } - return ret; + return dwBufLen; } LONG APIENTRY Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsiClient, UINT uCodePage) { - LONG ret = IMM_ERROR_GENERAL; - if (bAnsiClient) { switch (dwIndex) { case GCS_COMPREADSTR: + dwBufLen = Imm32CompStrAnsiToWide(CS_StrA(pCS, CompReadStr), + CS_SizeA(pCS, CompReadStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPREADATTR: + dwBufLen = Imm32CompAttrAnsiToWide(CS_Attr(pCS, CompReadAttr), + CS_Size(pCS, CompReadAttr), + CS_StrA(pCS, CompStr), CS_SizeA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPREADCLAUSE: + dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, CompReadClause), + CS_Size(pCS, CompReadClause), + CS_StrA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPSTR: + dwBufLen = Imm32CompStrAnsiToWide(CS_StrA(pCS, CompStr), + CS_SizeA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPATTR: + dwBufLen = Imm32CompAttrAnsiToWide(CS_Attr(pCS, CompAttr), + CS_Size(pCS, CompAttr), + CS_StrA(pCS, CompStr), CS_SizeA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_COMPCLAUSE: + dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, CompClause), + CS_Size(pCS, CompClause), + CS_StrA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_CURSORPOS: + dwBufLen = IchWideFromAnsi(pCS->dwCursorPos, CS_StrA(pCS, CompStr), uCodePage); + break; + case GCS_DELTASTART: + dwBufLen = IchWideFromAnsi(pCS->dwDeltaStart, CS_StrA(pCS, CompStr), uCodePage); + break; + case GCS_RESULTREADSTR: + dwBufLen = Imm32CompStrAnsiToWide(CS_StrA(pCS, ResultReadStr), + CS_SizeA(pCS, ResultReadStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_RESULTREADCLAUSE: + dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, ResultReadClause), + CS_Size(pCS, ResultReadClause), + CS_StrA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_RESULTSTR: + dwBufLen = Imm32CompStrAnsiToWide(CS_StrA(pCS, ResultStr), + CS_SizeA(pCS, ResultStr), + lpBuf, dwBufLen, uCodePage); + break; + case GCS_RESULTCLAUSE: + dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, ResultClause), + CS_Size(pCS, ResultClause), + CS_StrA(pCS, CompStr), + lpBuf, dwBufLen, uCodePage); + break; + default: FIXME("TODO:\n"); - break; + return IMM_ERROR_GENERAL; } } else /* !bAnsiClient */ @@ -93,24 +430,60 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, switch (dwIndex) { case GCS_COMPREADSTR: + CS_DoStrW(pCS, CompReadStr); + break; + case GCS_COMPREADATTR: + CS_DoAttr(pCS, CompReadAttr); + break; + case GCS_COMPREADCLAUSE: + CS_DoClause(pCS, CompReadClause); + break; + case GCS_COMPSTR: + CS_DoStrW(pCS, CompStr); + break; + case GCS_COMPATTR: + CS_DoAttr(pCS, CompAttr); + break; + case GCS_COMPCLAUSE: + CS_DoClause(pCS, CompClause); + break; + case GCS_CURSORPOS: + dwBufLen = pCS->dwCursorPos; + break; + case GCS_DELTASTART: + dwBufLen = pCS->dwDeltaStart; + break; + case GCS_RESULTREADSTR: + CS_DoStrW(pCS, ResultReadStr); + break; + case GCS_RESULTREADCLAUSE: + CS_DoClause(pCS, ResultReadClause); + break; + case GCS_RESULTSTR: + CS_DoStrW(pCS, ResultStr); + break; + case GCS_RESULTCLAUSE: + CS_DoClause(pCS, ResultClause); + break; + default: FIXME("TODO:\n"); - break; + return IMM_ERROR_GENERAL; } } - return ret; + return dwBufLen; } BOOL APIENTRY @@ -131,6 +504,7 @@ LONG WINAPI ImmGetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO PCLIENTIMC pClientImc; LPCOMPOSITIONSTRING pCS; BOOL bAnsiClient; + UINT uCodePage; TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); @@ -142,6 +516,7 @@ LONG WINAPI ImmGetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO return 0; bAnsiClient = !(pClientImc->dwFlags & CLIENTIMC_WIDE); + uCodePage = pClientImc->uCodePage; ImmUnlockClientImc(pClientImc); pIC = ImmLockIMC(hIMC); @@ -155,7 +530,7 @@ LONG WINAPI ImmGetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO return 0; } - ret = Imm32GetCompStrA(hIMC, pCS, dwIndex, lpBuf, dwBufLen, bAnsiClient, CP_ACP); + ret = Imm32GetCompStrA(hIMC, pCS, dwIndex, lpBuf, dwBufLen, bAnsiClient, uCodePage); ImmUnlockIMCC(pIC->hCompStr); ImmUnlockIMC(hIMC); return ret; @@ -171,6 +546,7 @@ LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO PCLIENTIMC pClientImc; LPCOMPOSITIONSTRING pCS; BOOL bAnsiClient; + UINT uCodePage; TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); @@ -182,6 +558,7 @@ LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO return 0; bAnsiClient = !(pClientImc->dwFlags & CLIENTIMC_WIDE); + uCodePage = pClientImc->uCodePage; ImmUnlockClientImc(pClientImc); pIC = ImmLockIMC(hIMC); @@ -195,7 +572,7 @@ LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWO return 0; } - ret = Imm32GetCompStrW(hIMC, pCS, dwIndex, lpBuf, dwBufLen, bAnsiClient, CP_ACP); + ret = Imm32GetCompStrW(hIMC, pCS, dwIndex, lpBuf, dwBufLen, bAnsiClient, uCodePage); ImmUnlockIMCC(pIC->hCompStr); ImmUnlockIMC(hIMC); return ret;

1 0

[reactos] 01/01: [RAPPS] Speed up installed application loading
by Mark Jansen 13 Oct '21

13 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=143b2a50350b3c9608d65… commit 143b2a50350b3c9608d65fbd2675f32e06c3babe Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 3 20:35:13 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 13 19:27:40 2021 +0200 [RAPPS] Speed up installed application loading Only load in details when we are going to display them --- base/applications/rapps/appview.cpp | 2 + base/applications/rapps/gui.cpp | 4 +- base/applications/rapps/include/appview.h | 1 - base/applications/rapps/include/dialogs.h | 2 +- base/applications/rapps/include/installed.h | 57 ++++--- base/applications/rapps/installed.cpp | 241 ++++++++++++---------------- base/applications/rapps/loaddlg.cpp | 4 +- 7 files changed, 140 insertions(+), 171 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 631eecbad9c..a9fe2922254 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -398,6 +398,8 @@ BOOL CAppRichEdit::ShowInstalledAppInfo(CInstalledApplicationInfo *Info) SetText(Info->szDisplayName, CFE_BOLD); InsertText(L"\n", 0); + Info->EnsureDetailsLoaded(); + InsertTextWithString(IDS_INFO_VERSION, CFE_BOLD, Info->szDisplayVersion, 0); InsertTextWithString(IDS_INFO_PUBLISHER, CFE_BOLD, Info->szPublisher, 0); InsertTextWithString(IDS_INFO_REGOWNER, CFE_BOLD, Info->szRegOwner, 0); diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index f0616c08aff..80cd779bed1 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -567,7 +567,7 @@ VOID CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) CAvailableApplicationInfo *FocusedApps = (CAvailableApplicationInfo *)m_ApplicationView->GetFocusedItemData(); if (FocusedApps) { - if (DownloadApplication(FocusedApps, FALSE)) + if (DownloadApplication(FocusedApps)) { UpdateApplicationsList(-1); } @@ -782,7 +782,7 @@ BOOL CMainWindow::InstallApplication(CAvailableApplicationInfo *Info) { if (Info) { - if (DownloadApplication(Info, FALSE)) + if (DownloadApplication(Info)) { UpdateApplicationsList(-1); return TRUE; diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index b625d5ed296..9042a361d33 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -191,7 +191,6 @@ public: HWND Create(HWND hwndParent); BOOL ShowAvailableAppInfo(CAvailableApplicationInfo *Info); - BOOL ShowInstalledAppInfo(CInstalledApplicationInfo *Info); VOID SetWelcomeText(); diff --git a/base/applications/rapps/include/dialogs.h b/base/applications/rapps/include/dialogs.h index 917effd8c6e..79d7d494017 100644 --- a/base/applications/rapps/include/dialogs.h +++ b/base/applications/rapps/include/dialogs.h @@ -13,5 +13,5 @@ VOID MainWindowLoop(INT nShowCmd); // Download dialogs VOID DownloadApplicationsDB(LPCWSTR lpUrl, BOOL IsOfficial); -BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal); +BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo); BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInfo>& AppsList, BOOL bIsModal); diff --git a/base/applications/rapps/include/installed.h b/base/applications/rapps/include/installed.h index 6e950056481..68ada9da094 100644 --- a/base/applications/rapps/include/installed.h +++ b/base/applications/rapps/include/installed.h @@ -5,41 +5,48 @@ class CInstalledApplicationInfo { +private: + BOOL m_IsUserKey; + REGSAM m_WowKey; + HKEY m_hSubKey; + + CStringW m_szKeyName; + public: - BOOL IsUserKey; - REGSAM WowKey; - HKEY hSubKey; - BOOL bIsUpdate = FALSE; + CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey, const CStringW& szKeyName); + ~CInstalledApplicationInfo(); - ATL::CStringW szKeyName; + VOID EnsureDetailsLoaded(); - CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey); BOOL GetApplicationRegString(LPCWSTR lpKeyName, ATL::CStringW& String); BOOL GetApplicationRegDword(LPCWSTR lpKeyName, DWORD *lpValue); BOOL RetrieveIcon(ATL::CStringW& IconLocation); BOOL UninstallApplication(BOOL bModify); LSTATUS RemoveFromRegistry(); - ATL::CStringW szDisplayIcon; - ATL::CStringW szDisplayName; - ATL::CStringW szDisplayVersion; - ATL::CStringW szPublisher; - ATL::CStringW szRegOwner; - ATL::CStringW szProductID; - ATL::CStringW szHelpLink; - ATL::CStringW szHelpTelephone; - ATL::CStringW szReadme; - ATL::CStringW szContact; - ATL::CStringW szURLUpdateInfo; - ATL::CStringW szURLInfoAbout; - ATL::CStringW szComments; - ATL::CStringW szInstallDate; - ATL::CStringW szInstallLocation; - ATL::CStringW szInstallSource; - ATL::CStringW szUninstallString; - ATL::CStringW szModifyPath; + // These fields are always loaded + BOOL bIsUpdate; + CStringW szDisplayIcon; + CStringW szDisplayName; + CStringW szDisplayVersion; + CStringW szComments; + + // These details are loaded on demand + CStringW szPublisher; + CStringW szRegOwner; + CStringW szProductID; + CStringW szHelpLink; + CStringW szHelpTelephone; + CStringW szReadme; + CStringW szContact; + CStringW szURLUpdateInfo; + CStringW szURLInfoAbout; + CStringW szInstallDate; + CStringW szInstallLocation; + CStringW szInstallSource; + CStringW szUninstallString; + CStringW szModifyPath; - ~CInstalledApplicationInfo(); }; typedef BOOL(CALLBACK *APPENUMPROC)(CInstalledApplicationInfo * Info, PVOID param); diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index eaec4429480..fed899e9448 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -2,123 +2,122 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Classes for working with installed applications - * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) - * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) - * Copyright 2020 He Yang (1160386205(a)qq.com) + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev <dmitry(a)reactos.org> + * Copyright 2017 Alexander Shaposhnikov <sanchaez(a)reactos.org> + * Copyright 2020 He Yang <1160386205(a)qq.com> + * Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> */ -#include "rapps.h" +#include "rapps.h" #include "installed.h" - #include "misc.h" -CInstalledApplicationInfo::CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey) - : IsUserKey(bIsUserKey), WowKey(RegWowKey), hSubKey(hKey) +CInstalledApplicationInfo::CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey, const CStringW& szKeyName) + : m_IsUserKey(bIsUserKey) + , m_WowKey(RegWowKey) + , m_hSubKey(hKey) + , m_szKeyName(szKeyName) { - // if Initialize failed, hSubKey will be closed automatically and set to zero - - DWORD dwSize = MAX_PATH, dwType, dwValue; - BOOL bIsSystemComponent; - ATL::CStringW szParentKeyName; - - dwType = REG_DWORD; - dwSize = sizeof(DWORD); + DWORD dwSize = 0; + bIsUpdate = (RegQueryValueExW(m_hSubKey, L"ParentKeyName", NULL, NULL, NULL, &dwSize) == ERROR_SUCCESS); +} - if (RegQueryValueExW(hSubKey, - L"SystemComponent", - NULL, - &dwType, - (LPBYTE)&dwValue, - &dwSize) == ERROR_SUCCESS) +CInstalledApplicationInfo::~CInstalledApplicationInfo() +{ + if (m_hSubKey) { - bIsSystemComponent = (dwValue == 0x1); + CloseHandle(m_hSubKey); + m_hSubKey = NULL; } - else +} + +void CInstalledApplicationInfo::EnsureDetailsLoaded() +{ + // Key not closed, so we have not loaded details yet + if (m_hSubKey) { - bIsSystemComponent = FALSE; - } + GetApplicationRegString(L"Publisher", szPublisher); + GetApplicationRegString(L"RegOwner", szRegOwner); + GetApplicationRegString(L"ProductID", szProductID); + GetApplicationRegString(L"HelpLink", szHelpLink); + GetApplicationRegString(L"HelpTelephone", szHelpTelephone); + GetApplicationRegString(L"Readme", szReadme); + GetApplicationRegString(L"Contact", szContact); + GetApplicationRegString(L"URLUpdateInfo", szURLUpdateInfo); + GetApplicationRegString(L"URLInfoAbout", szURLInfoAbout); + if (GetApplicationRegString(L"InstallDate", szInstallDate) == FALSE) + { + // It might be a DWORD (Unix timestamp). try again. + DWORD dwInstallTimeStamp; + if (GetApplicationRegDword(L"InstallDate", &dwInstallTimeStamp)) + { + FILETIME InstallFileTime; + SYSTEMTIME InstallSystemTime, InstallLocalTime; - dwType = REG_SZ; - dwSize = MAX_PATH * sizeof(WCHAR); - bIsUpdate = (RegQueryValueExW(hSubKey, - L"ParentKeyName", - NULL, - &dwType, - (LPBYTE)szParentKeyName.GetBuffer(MAX_PATH), - &dwSize) == ERROR_SUCCESS); - szParentKeyName.ReleaseBuffer(); + UnixTimeToFileTime(dwInstallTimeStamp, &InstallFileTime); + FileTimeToSystemTime(&InstallFileTime, &InstallSystemTime); - if (bIsSystemComponent) - { - CloseHandle(hSubKey); - hSubKey = NULL; - } + // convert to localtime + SystemTimeToTzSpecificLocalTime(NULL, &InstallSystemTime, &InstallLocalTime); -} + // convert to readable date string + int cchTimeStrLen = GetDateFormatW(LOCALE_USER_DEFAULT, 0, &InstallLocalTime, NULL, 0, 0); -CInstalledApplicationInfo::~CInstalledApplicationInfo() -{ - if (hSubKey) - { - CloseHandle(hSubKey); - hSubKey = NULL; + GetDateFormatW( + LOCALE_USER_DEFAULT, // use default locale for current user + 0, &InstallLocalTime, NULL, szInstallDate.GetBuffer(cchTimeStrLen), cchTimeStrLen); + szInstallDate.ReleaseBuffer(); + } + } + GetApplicationRegString(L"InstallLocation", szInstallLocation); + GetApplicationRegString(L"InstallSource", szInstallSource); + GetApplicationRegString(L"UninstallString", szUninstallString); + GetApplicationRegString(L"ModifyPath",szModifyPath); + + CloseHandle(m_hSubKey); + m_hSubKey = NULL; } } BOOL CInstalledApplicationInfo::GetApplicationRegString(LPCWSTR lpKeyName, ATL::CStringW& String) { - DWORD dwSize = 0; - String.Empty(); - DWORD dwType; + DWORD dwAllocated = 0, dwSize, dwType; // retrieve the size of value first. - if (RegQueryValueExW(hSubKey, - lpKeyName, - NULL, - &dwType, - NULL, - &dwSize) != ERROR_SUCCESS) + if (RegQueryValueExW(m_hSubKey, lpKeyName, NULL, &dwType, NULL, &dwAllocated) != ERROR_SUCCESS || + dwType != REG_SZ) { + String.Empty(); return FALSE; } - // TODO: I assume the type as REG_SZ. but I think REG_EXPAND_SZ should be handled correctly too. - if (dwType != REG_SZ) - { - return FALSE; - } + // query the value + dwSize = dwAllocated; + LSTATUS Result = + RegQueryValueExW(m_hSubKey, lpKeyName, NULL, NULL, (LPBYTE)String.GetBuffer(dwAllocated / sizeof(WCHAR)), &dwSize); - // allocate buffer. - // attention: dwSize is size in bytes, and RegQueryValueExW does not guarantee the terminating null character. - String.GetBuffer(dwSize + sizeof(WCHAR)); + dwSize = min(dwAllocated, dwSize); + // CString takes care of zero-terminating it + String.ReleaseBuffer(dwSize / sizeof(WCHAR)); - // query the value - if (RegQueryValueExW(hSubKey, - lpKeyName, - NULL, - NULL, - (LPBYTE)String.GetBuffer(), - &dwSize) != ERROR_SUCCESS) + if (Result != ERROR_SUCCESS) { - String.ReleaseBuffer(); String.Empty(); return FALSE; } - String.GetBuffer()[dwSize / sizeof(WCHAR)] = L'\0'; // ensure zero terminated - String.ReleaseBuffer(); + return TRUE; } BOOL CInstalledApplicationInfo::GetApplicationRegDword(LPCWSTR lpKeyName, DWORD *lpValue) { - DWORD dwType = REG_DWORD; - DWORD dwSize = sizeof(DWORD); - if (RegQueryValueExW(hSubKey, + DWORD dwSize = sizeof(DWORD), dwType; + if (RegQueryValueExW(m_hSubKey, lpKeyName, NULL, &dwType, (LPBYTE)lpValue, - &dwSize) != ERROR_SUCCESS) + &dwSize) != ERROR_SUCCESS || dwType != REG_DWORD) { return FALSE; } @@ -148,7 +147,7 @@ typedef LSTATUS (WINAPI *RegDeleteKeyExWProc)(HKEY, LPCWSTR, REGSAM, DWORD); LSTATUS CInstalledApplicationInfo::RemoveFromRegistry() { - ATL::CStringW szFullName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + szKeyName; + ATL::CStringW szFullName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + m_szKeyName; HMODULE hMod = GetModuleHandleW(L"advapi32.dll"); RegDeleteKeyExWProc pRegDeleteKeyExW; @@ -166,12 +165,12 @@ LSTATUS CInstalledApplicationInfo::RemoveFromRegistry() if (pRegDeleteKeyExW) { /* Return it */ - return pRegDeleteKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, WowKey, 0); + return pRegDeleteKeyExW(m_IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, m_WowKey, 0); } } /* Otherwise, return non-Ex function */ - return RegDeleteKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName); + return RegDeleteKeyW(m_IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName); } BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) @@ -225,72 +224,34 @@ BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) ItemIndex++; szKeyName.ReleaseBuffer(); - if (RegOpenKeyW(hKey, szKeyName.GetString(), &hSubKey) == ERROR_SUCCESS) + if (RegOpenKeyW(hKey, szKeyName, &hSubKey) == ERROR_SUCCESS) { - BOOL bSuccess = FALSE; - CInstalledApplicationInfo *Info = new CInstalledApplicationInfo(RootKeyEnum[i] == HKEY_CURRENT_USER, RegSamEnum[i], hSubKey); - Info->szKeyName = szKeyName; + DWORD dwValue = 0; + BOOL bIsSystemComponent = FALSE; - // check for failure. if failed to init, Info->hSubKey will be set to NULL - if (Info->hSubKey) + dwSize = sizeof(DWORD); + if (RegQueryValueExW(hSubKey, L"SystemComponent", NULL, NULL, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) { - // those items without display name are ignored - if (Info->GetApplicationRegString(L"DisplayName", Info->szDisplayName)) - { - Info->GetApplicationRegString(L"DisplayIcon", Info->szDisplayIcon); - Info->GetApplicationRegString(L"DisplayVersion", Info->szDisplayVersion); - Info->GetApplicationRegString(L"Publisher", Info->szPublisher); - Info->GetApplicationRegString(L"RegOwner", Info->szRegOwner); - Info->GetApplicationRegString(L"ProductID", Info->szProductID); - Info->GetApplicationRegString(L"HelpLink", Info->szHelpLink); - Info->GetApplicationRegString(L"HelpTelephone", Info->szHelpTelephone); - Info->GetApplicationRegString(L"Readme", Info->szReadme); - Info->GetApplicationRegString(L"Contact", Info->szContact); - Info->GetApplicationRegString(L"URLUpdateInfo", Info->szURLUpdateInfo); - Info->GetApplicationRegString(L"URLInfoAbout", Info->szURLInfoAbout); - Info->GetApplicationRegString(L"Comments", Info->szComments); - if (Info->GetApplicationRegString(L"InstallDate", Info->szInstallDate) == FALSE) - { - // It might be a DWORD (Unix timestamp). try again. - DWORD dwInstallTimeStamp; - if (Info->GetApplicationRegDword(L"InstallDate", &dwInstallTimeStamp)) - { - FILETIME InstallFileTime; - SYSTEMTIME InstallSystemTime, InstallLocalTime; - - UnixTimeToFileTime(dwInstallTimeStamp, &InstallFileTime); - FileTimeToSystemTime(&InstallFileTime, &InstallSystemTime); - - // convert to localtime - SystemTimeToTzSpecificLocalTime(NULL, &InstallSystemTime, &InstallLocalTime); - - // convert to readable date string - int cchTimeStrLen = GetDateFormatW(LOCALE_USER_DEFAULT, - 0, - &InstallLocalTime, - NULL, 0, 0); - - GetDateFormatW(LOCALE_USER_DEFAULT, // use default locale for current user - 0, - &InstallLocalTime, - NULL, Info->szInstallDate.GetBuffer(cchTimeStrLen), cchTimeStrLen); - Info->szInstallDate.ReleaseBuffer(); - } - } - Info->GetApplicationRegString(L"InstallLocation", Info->szInstallLocation); - Info->GetApplicationRegString(L"InstallSource", Info->szInstallSource); - Info->GetApplicationRegString(L"UninstallString", Info->szUninstallString); - Info->GetApplicationRegString(L"ModifyPath", Info->szModifyPath); - - bSuccess = TRUE; - } + bIsSystemComponent = (dwValue == 0x1); + } + // Ignore system components + if (bIsSystemComponent) + { + RegCloseKey(hSubKey); + continue; } - // close handle - if (Info->hSubKey) + BOOL bSuccess = FALSE; + CInstalledApplicationInfo *Info = new CInstalledApplicationInfo(RootKeyEnum[i] == HKEY_CURRENT_USER, RegSamEnum[i], hSubKey, szKeyName); + + // items without display name are ignored + if (Info->GetApplicationRegString(L"DisplayName", Info->szDisplayName)) { - CloseHandle(Info->hSubKey); - Info->hSubKey = NULL; + Info->GetApplicationRegString(L"DisplayIcon", Info->szDisplayIcon); + Info->GetApplicationRegString(L"DisplayVersion", Info->szDisplayVersion); + Info->GetApplicationRegString(L"Comments", Info->szComments); + + bSuccess = TRUE; } if (bSuccess) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 49538ac1d06..d86bdda5131 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -1030,12 +1030,12 @@ BOOL DownloadListOfApplications(const ATL::CSimpleArray<CAvailableApplicationInf return TRUE; } -BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo, BOOL bIsModal) +BOOL DownloadApplication(CAvailableApplicationInfo* pAppInfo) { if (!pAppInfo) return FALSE; - CDownloadManager::Download(*pAppInfo, bIsModal); + CDownloadManager::Download(*pAppInfo, FALSE); return TRUE; }

1 0

[reactos] 02/02: [TASKMGR] Make performance graph grid scroll (#3581)
by Wu Haotian 13 Oct '21

13 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ed04e36406fc24b3d08e… commit 0ed04e36406fc24b3d08e795a89962c253226f1f Author: Wu Haotian <rigoligo03(a)gmail.com> AuthorDate: Sun Apr 4 04:04:06 2021 +0800 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Oct 13 19:14:29 2021 +0300 [TASKMGR] Make performance graph grid scroll (#3581) The grids are now rolling along with performance graphs. --- base/applications/taskmgr/graphctl.c | 93 ++++++++++++++++++++++++++---------- base/applications/taskmgr/graphctl.h | 4 ++ 2 files changed, 72 insertions(+), 25 deletions(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 4d62ba4aedf..ee7a9f844f2 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -1,23 +1,9 @@ /* - * ReactOS Task Manager - * - * graphctl.c - * - * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS Task Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Graph plotting controls + * COPYRIGHT: Copyright 2002 Robert Dickenson <robd(a)reactos.org> + * Copyright 2021 Wu Haotian <rigoligo03(a)gmail.com> */ #include "precomp.h" @@ -76,6 +62,14 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_nHalfShiftPixels = this->m_nShiftPixels / 2; /* protected */ this->m_nPlotShiftPixels = this->m_nShiftPixels + this->m_nHalfShiftPixels; /* protected */ + /* Set how big the grid boxes are */ + this->m_nGridXPixels = 12; + this->m_nGridYPixels = 12; + + /* Task manager should scroll grid with the graph. This variable contains the */ + /* amount of pixels the grid paint origin should shift to left */ + this->m_nGridOffsetPixels = 0; + /* background, grid and data colors */ /* these are public variables and can be set directly */ this->m_crBackColor = RGB( 0, 0, 0); /* see also SetBackgroundColor */ @@ -251,17 +245,19 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize) /* LineTo(m_dcGrid, m_rectPlot.left, m_rectPlot.top); */ /* draw the horizontal axis */ - for (i = this->m_rectPlot.top; i < this->m_rectPlot.bottom; i += 12) + for (i = this->m_rectPlot.top; i <= this->m_rectPlot.bottom; i += this->m_nGridYPixels) { - MoveToEx(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top + i, NULL); - LineTo(this->m_dcGrid, this->m_rectPlot.right, this->m_rectPlot.top + i); + MoveToEx(this->m_dcGrid, this->m_rectPlot.left, i, NULL); + LineTo(this->m_dcGrid, this->m_rectPlot.right, i); } /* draw the vertical axis */ - for (i = this->m_rectPlot.left; i < this->m_rectPlot.right; i += 12) + /* In order to keep grid position uniform when resizing, vertical axis should be */ + /* drawn from right to left */ + for (i = this->m_rectPlot.right - this->m_nGridOffsetPixels; i >= this->m_rectPlot.left; i -= this->m_nGridXPixels) { - MoveToEx(this->m_dcGrid, this->m_rectPlot.left + i, this->m_rectPlot.bottom, NULL); - LineTo(this->m_dcGrid, this->m_rectPlot.left + i, this->m_rectPlot.top); + MoveToEx(this->m_dcGrid, i, this->m_rectPlot.bottom, NULL); + LineTo(this->m_dcGrid, i, this->m_rectPlot.top); } SelectObject(this->m_dcGrid, oldPen); @@ -342,6 +338,7 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize) DeleteObject(this->m_bitmapPlot); this->m_bitmapPlot = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); SelectObject(this->m_dcPlot, this->m_bitmapPlot); + GraphCtrl_DrawPoint(this); } } @@ -366,6 +363,7 @@ double GraphCtrl_AppendPoint(TGraphCtrl* this, this->m_dCurrentPosition[1] = dNewPoint1; this->m_dCurrentPosition[2] = dNewPoint2; this->m_dCurrentPosition[3] = dNewPoint3; + GraphCtrl_ShiftGrid(this); GraphCtrl_DrawPoint(this); /* Invalidate(); */ return dPrevious; @@ -407,6 +405,51 @@ void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) DeleteDC(memDC); } +void GraphCtrl_ShiftGrid(TGraphCtrl* this) +{ + RECT rectCleanUp; + HPEN oldPen, solidPen; + int i; + + if (this->m_dcGrid == NULL) + return; + + solidPen = CreatePen(PS_SOLID, 0, this->m_crGridColor); + + /* Scroll the grid left: BitBlt it to itself */ + BitBlt(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top + 1, + this->m_nPlotWidth, this->m_nPlotHeight, + this->m_dcGrid, this->m_rectPlot.left + this->m_nShiftPixels, this->m_rectPlot.top + 1, + SRCCOPY); + + /* Set shift pixels */ + this->m_nGridOffsetPixels = (this->m_nGridOffsetPixels + this->m_nShiftPixels) % this->m_nGridXPixels; + + /* Construct a rect in which needs update */ + rectCleanUp = this->m_rectPlot; + rectCleanUp.left = rectCleanUp.right - this->m_nShiftPixels; + + /* Fill the cleanup area with the background */ + FillRect(this->m_dcGrid, &rectCleanUp, this->m_brushBack); + + /* Draw the plot rectangle */ + oldPen = (HPEN)SelectObject(this->m_dcGrid, solidPen); + + /* Redraw horizontal axis */ + for (i = rectCleanUp.top; i < rectCleanUp.bottom; i += this->m_nGridYPixels) + { + MoveToEx(this->m_dcGrid, rectCleanUp.left, i, NULL); + LineTo(this->m_dcGrid, rectCleanUp.right, i); + } + + /* Redraw scrolled vertical axis */ + MoveToEx(this->m_dcGrid, rectCleanUp.right - this->m_nGridOffsetPixels, rectCleanUp.top, NULL); + LineTo(this->m_dcGrid, rectCleanUp.right - this->m_nGridOffsetPixels, rectCleanUp.bottom); + + SelectObject(this->m_dcGrid, oldPen); + DeleteObject(solidPen); +} + void GraphCtrl_DrawPoint(TGraphCtrl* this) { /* this does the work of "scrolling" the plot to the left diff --git a/base/applications/taskmgr/graphctl.h b/base/applications/taskmgr/graphctl.h index e9ef84f05f7..428d9c30b7d 100644 --- a/base/applications/taskmgr/graphctl.h +++ b/base/applications/taskmgr/graphctl.h @@ -60,10 +60,13 @@ typedef struct /* those were protected fields */ int m_nHalfShiftPixels; int m_nPlotShiftPixels; + int m_nGridOffsetPixels; int m_nClientHeight; int m_nClientWidth; int m_nPlotHeight; int m_nPlotWidth; + int m_nGridXPixels; + int m_nGridYPixels; double m_dLowerLimit; /* lower bounds */ double m_dUpperLimit; /* upper bounds */ @@ -92,6 +95,7 @@ void GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID); void GraphCtrl_Dispose(TGraphCtrl* this); void GraphCtrl_DrawPoint(TGraphCtrl* this); +void GraphCtrl_ShiftGrid(TGraphCtrl* this); void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize); void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc); void GraphCtrl_Reset(TGraphCtrl* this);

1 0

[reactos] 01/02: [TASKMGR] Formatting only (#3581)
by Wu Haotian 13 Oct '21

13 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4ab9a1e196a216333494… commit a4ab9a1e196a21633349496c211756f1e5cdbaf2 Author: Wu Haotian <rigoligo03(a)gmail.com> AuthorDate: Sun Apr 4 03:27:05 2021 +0800 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Oct 13 19:14:20 2021 +0300 [TASKMGR] Formatting only (#3581) --- base/applications/taskmgr/graphctl.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 95c5108acd4..4d62ba4aedf 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -68,18 +68,18 @@ static void GraphCtrl_Init(TGraphCtrl* this) /* m_dUpperLimit = 10.0; */ this->m_dLowerLimit = 0.0; this->m_dUpperLimit = 100.0; - this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; /* protected member variable */ + this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; /* protected member variable */ /* m_nShiftPixels determines how much the plot shifts (in terms of pixels) */ /* with the addition of a new data point */ this->m_nShiftPixels = 4; - this->m_nHalfShiftPixels = this->m_nShiftPixels/2; /* protected */ + this->m_nHalfShiftPixels = this->m_nShiftPixels / 2; /* protected */ this->m_nPlotShiftPixels = this->m_nShiftPixels + this->m_nHalfShiftPixels; /* protected */ /* background, grid and data colors */ /* these are public variables and can be set directly */ this->m_crBackColor = RGB( 0, 0, 0); /* see also SetBackgroundColor */ - this->m_crGridColor = RGB( 0, 128, 64); /* see also SetGridColor */ + this->m_crGridColor = RGB( 0, 128, 64); /* see also SetGridColor */ this->m_crPlotColor[0] = RGB(255, 255, 255); /* see also SetPlotColor */ this->m_crPlotColor[1] = RGB(100, 255, 255); /* see also SetPlotColor */ this->m_crPlotColor[2] = RGB(255, 100, 255); /* see also SetPlotColor */ @@ -245,9 +245,9 @@ void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize) /* draw the plot rectangle */ oldPen = (HPEN)SelectObject(this->m_dcGrid, solidPen); MoveToEx(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.top, NULL); - LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.top); - LineTo(this->m_dcGrid, this->m_rectPlot.right+1, this->m_rectPlot.bottom+1); - LineTo(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.bottom+1); + LineTo(this->m_dcGrid, this->m_rectPlot.right + 1, this->m_rectPlot.top); + LineTo(this->m_dcGrid, this->m_rectPlot.right + 1, this->m_rectPlot.bottom + 1); + LineTo(this->m_dcGrid, this->m_rectPlot.left, this->m_rectPlot.bottom + 1); /* LineTo(m_dcGrid, m_rectPlot.left, m_rectPlot.top); */ /* draw the horizontal axis */ @@ -428,9 +428,9 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this) * grab the right side of the plot (excluding m_nShiftPixels on the left) * move this grabbed bitmap to the left by m_nShiftPixels */ - BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top+1, + BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top + 1, this->m_nPlotWidth, this->m_nPlotHeight, this->m_dcPlot, - this->m_rectPlot.left+this->m_nShiftPixels, this->m_rectPlot.top+1, + this->m_rectPlot.left+this->m_nShiftPixels, this->m_rectPlot.top + 1, SRCCOPY); /* establish a rectangle over the right side of plot */ @@ -470,19 +470,19 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this) if ((prevY <= this->m_rectPlot.top) || (currY <= this->m_rectPlot.top)) { RECT rc; - rc.bottom = this->m_rectPlot.top+1; + rc.bottom = this->m_rectPlot.top + 1; rc.left = prevX; - rc.right = currX+1; + rc.right = currX + 1; rc.top = this->m_rectClient.top; FillRect(this->m_dcPlot, &rc, this->m_brushBack); } if ((prevY >= this->m_rectPlot.bottom) || (currY >= this->m_rectPlot.bottom)) { RECT rc; - rc.bottom = this->m_rectClient.bottom+1; + rc.bottom = this->m_rectClient.bottom + 1; rc.left = prevX; - rc.right = currX+1; - rc.top = this->m_rectPlot.bottom+1; + rc.right = currX + 1; + rc.top = this->m_rectPlot.bottom + 1; /* RECT rc(prevX, m_rectPlot.bottom+1, currX+1, m_rectClient.bottom+1); */ FillRect(this->m_dcPlot, &rc, this->m_brushBack); } @@ -512,8 +512,8 @@ void GraphCtrl_Resize(TGraphCtrl* this) #else this->m_rectPlot.left = 0; this->m_rectPlot.top = -1; - this->m_rectPlot.right = this->m_rectClient.right-0; - this->m_rectPlot.bottom = this->m_rectClient.bottom-0; + this->m_rectPlot.right = this->m_rectClient.right; + this->m_rectPlot.bottom = this->m_rectClient.bottom; #endif /* set some member variables to avoid multiple function calls */

1 0

[reactos] 01/01: [NTOS:PNP] Fix resource conflict detection
by Victor Perevertkin 12 Oct '21

12 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43f1d91687b231ea0df7d… commit 43f1d91687b231ea0df7d4c4a1ad7f36a4f0157a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Oct 13 00:00:25 2021 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 13 00:00:25 2021 +0300 [NTOS:PNP] Fix resource conflict detection Previous code did not detect equal resource ranges as conflicting. Thanks Hervé Poussineau for pointing this out! Meanwhile, simplify the code to make it more readable. --- ntoskrnl/io/pnpmgr/pnpres.c | 66 ++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpres.c b/ntoskrnl/io/pnpmgr/pnpres.c index f8a47975c03..1cdf1d85b84 100644 --- a/ntoskrnl/io/pnpmgr/pnpres.c +++ b/ntoskrnl/io/pnpmgr/pnpres.c @@ -590,18 +590,21 @@ IopCheckResourceDescriptor( switch (ResDesc->Type) { case CmResourceTypeMemory: - if (((ULONGLONG)ResDesc->u.Memory.Start.QuadPart < (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart && - (ULONGLONG)ResDesc->u.Memory.Start.QuadPart + ResDesc->u.Memory.Length > - (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart) || ((ULONGLONG)ResDesc2->u.Memory.Start.QuadPart < - (ULONGLONG)ResDesc->u.Memory.Start.QuadPart && (ULONGLONG)ResDesc2->u.Memory.Start.QuadPart + - ResDesc2->u.Memory.Length > (ULONGLONG)ResDesc->u.Memory.Start.QuadPart)) + { + /* NOTE: ranges are in a form [x1;x2) */ + UINT64 rStart = (UINT64)ResDesc->u.Memory.Start.QuadPart; + UINT64 rEnd = (UINT64)ResDesc->u.Memory.Start.QuadPart + + ResDesc->u.Memory.Length; + UINT64 r2Start = (UINT64)ResDesc2->u.Memory.Start.QuadPart; + UINT64 r2End = (UINT64)ResDesc2->u.Memory.Start.QuadPart + + ResDesc2->u.Memory.Length; + + if (rStart < r2End && r2Start < rEnd) { if (!Silent) { DPRINT1("Resource conflict: Memory (0x%I64x to 0x%I64x vs. 0x%I64x to 0x%I64x)\n", - ResDesc->u.Memory.Start.QuadPart, ResDesc->u.Memory.Start.QuadPart + - ResDesc->u.Memory.Length, ResDesc2->u.Memory.Start.QuadPart, - ResDesc2->u.Memory.Start.QuadPart + ResDesc2->u.Memory.Length); + rStart, rEnd, r2Start, r2End); } Result = TRUE; @@ -609,20 +612,23 @@ IopCheckResourceDescriptor( goto ByeBye; } break; - + } case CmResourceTypePort: - if (((ULONGLONG)ResDesc->u.Port.Start.QuadPart < (ULONGLONG)ResDesc2->u.Port.Start.QuadPart && - (ULONGLONG)ResDesc->u.Port.Start.QuadPart + ResDesc->u.Port.Length > - (ULONGLONG)ResDesc2->u.Port.Start.QuadPart) || ((ULONGLONG)ResDesc2->u.Port.Start.QuadPart < - (ULONGLONG)ResDesc->u.Port.Start.QuadPart && (ULONGLONG)ResDesc2->u.Port.Start.QuadPart + - ResDesc2->u.Port.Length > (ULONGLONG)ResDesc->u.Port.Start.QuadPart)) + { + /* NOTE: ranges are in a form [x1;x2) */ + UINT64 rStart = (UINT64)ResDesc->u.Port.Start.QuadPart; + UINT64 rEnd = (UINT64)ResDesc->u.Port.Start.QuadPart + + ResDesc->u.Port.Length; + UINT64 r2Start = (UINT64)ResDesc2->u.Port.Start.QuadPart; + UINT64 r2End = (UINT64)ResDesc2->u.Port.Start.QuadPart + + ResDesc2->u.Port.Length; + + if (rStart < r2End && r2Start < rEnd) { if (!Silent) { DPRINT1("Resource conflict: Port (0x%I64x to 0x%I64x vs. 0x%I64x to 0x%I64x)\n", - ResDesc->u.Port.Start.QuadPart, ResDesc->u.Port.Start.QuadPart + - ResDesc->u.Port.Length, ResDesc2->u.Port.Start.QuadPart, - ResDesc2->u.Port.Start.QuadPart + ResDesc2->u.Port.Length); + rStart, rEnd, r2Start, r2End); } Result = TRUE; @@ -630,8 +636,9 @@ IopCheckResourceDescriptor( goto ByeBye; } break; - + } case CmResourceTypeInterrupt: + { if (ResDesc->u.Interrupt.Vector == ResDesc2->u.Interrupt.Vector) { if (!Silent) @@ -646,20 +653,21 @@ IopCheckResourceDescriptor( goto ByeBye; } break; - + } case CmResourceTypeBusNumber: - if ((ResDesc->u.BusNumber.Start < ResDesc2->u.BusNumber.Start && - ResDesc->u.BusNumber.Start + ResDesc->u.BusNumber.Length > - ResDesc2->u.BusNumber.Start) || (ResDesc2->u.BusNumber.Start < - ResDesc->u.BusNumber.Start && ResDesc2->u.BusNumber.Start + - ResDesc2->u.BusNumber.Length > ResDesc->u.BusNumber.Start)) + { + /* NOTE: ranges are in a form [x1;x2) */ + UINT32 rStart = ResDesc->u.BusNumber.Start; + UINT32 rEnd = ResDesc->u.BusNumber.Start + ResDesc->u.BusNumber.Length; + UINT32 r2Start = ResDesc2->u.BusNumber.Start; + UINT32 r2End = ResDesc2->u.BusNumber.Start + ResDesc2->u.BusNumber.Length; + + if (rStart < r2End && r2Start < rEnd) { if (!Silent) { DPRINT1("Resource conflict: Bus number (0x%x to 0x%x vs. 0x%x to 0x%x)\n", - ResDesc->u.BusNumber.Start, ResDesc->u.BusNumber.Start + - ResDesc->u.BusNumber.Length, ResDesc2->u.BusNumber.Start, - ResDesc2->u.BusNumber.Start + ResDesc2->u.BusNumber.Length); + rStart, rEnd, r2Start, r2End); } Result = TRUE; @@ -667,8 +675,9 @@ IopCheckResourceDescriptor( goto ByeBye; } break; - + } case CmResourceTypeDma: + { if (ResDesc->u.Dma.Channel == ResDesc2->u.Dma.Channel) { if (!Silent) @@ -683,6 +692,7 @@ IopCheckResourceDescriptor( goto ByeBye; } break; + } } } }

1 0

[reactos] 01/01: [NOTEPAD] Fix access key for "New Window" menu item (#4024)
by Chan Chilung 12 Oct '21

12 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=025f58a0519c6e7178aa1… commit 025f58a0519c6e7178aa1d786e8fdef1d94e4296 Author: Chan Chilung <eason066(a)gmail.com> AuthorDate: Tue Oct 12 20:34:34 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 12 15:34:34 2021 +0300 [NOTEPAD] Fix access key for "New Window" menu item (#4024) --- base/applications/notepad/lang/bg-BG.rc | 2 +- base/applications/notepad/lang/cs-CZ.rc | 2 +- base/applications/notepad/lang/da-DK.rc | 2 +- base/applications/notepad/lang/de-DE.rc | 2 +- base/applications/notepad/lang/el-GR.rc | 2 +- base/applications/notepad/lang/en-US.rc | 2 +- base/applications/notepad/lang/es-ES.rc | 2 +- base/applications/notepad/lang/et-EE.rc | 2 +- base/applications/notepad/lang/eu-ES.rc | 2 +- base/applications/notepad/lang/fi-FI.rc | 2 +- base/applications/notepad/lang/fr-FR.rc | 2 +- base/applications/notepad/lang/he-IL.rc | 2 +- base/applications/notepad/lang/hi-IN.rc | 2 +- base/applications/notepad/lang/hy-AM.rc | 2 +- base/applications/notepad/lang/id-ID.rc | 2 +- base/applications/notepad/lang/it-IT.rc | 2 +- base/applications/notepad/lang/ja-JP.rc | 2 +- base/applications/notepad/lang/lt-LT.rc | 2 +- base/applications/notepad/lang/ms-MY.rc | 2 +- base/applications/notepad/lang/nl-NL.rc | 2 +- base/applications/notepad/lang/no-NO.rc | 2 +- base/applications/notepad/lang/pl-PL.rc | 2 +- base/applications/notepad/lang/pt-BR.rc | 2 +- base/applications/notepad/lang/pt-PT.rc | 2 +- base/applications/notepad/lang/ro-RO.rc | 2 +- base/applications/notepad/lang/ru-RU.rc | 2 +- base/applications/notepad/lang/sk-SK.rc | 2 +- base/applications/notepad/lang/sl-SI.rc | 2 +- base/applications/notepad/lang/sq-AL.rc | 2 +- base/applications/notepad/lang/sv-SE.rc | 2 +- base/applications/notepad/lang/th-TH.rc | 2 +- base/applications/notepad/lang/tr-TR.rc | 2 +- base/applications/notepad/lang/uk-UA.rc | 2 +- base/applications/notepad/lang/uz-UZ.rc | 2 +- base/applications/notepad/lang/zh-CN.rc | 2 +- base/applications/notepad/lang/zh-TW.rc | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index b218b72afee..d17e24ab300 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Файл" BEGIN MENUITEM "&Нов\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Отваряне\tCtrl+O", CMD_OPEN MENUITEM "&Запис\tCtrl+S", CMD_SAVE MENUITEM "Запис &като...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index a1b569b6e25..1338063e8e9 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Soubor" BEGIN MENUITEM "&Nový\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Otevřít\tCtrl+O", CMD_OPEN MENUITEM "&Uložit\tCtrl+S", CMD_SAVE MENUITEM "Uložit j&ako...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index 58bf47d8264..f24b93562cb 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "Å&bn...\tCtrl+O", CMD_OPEN MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index a09dfcdd64b..12304456c6f 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Datei" BEGIN MENUITEM "&Neu\tStrg+N", CMD_NEW - MENUITEM "&Neues Fenster\tStrg+Umschalt+N", CMD_NEW_WINDOW + MENUITEM "Neues &Fenster\tStrg+Umschalt+N", CMD_NEW_WINDOW MENUITEM "Ö&ffnen\tStrg+O", CMD_OPEN MENUITEM "&Speichern\tStrg+S", CMD_SAVE MENUITEM "Speichern &unter...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 0e449613f8b..c27cb97636a 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Αρχείο" BEGIN MENUITEM "&Νέο\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Άνοιγμα\tCtrl+O", CMD_OPEN MENUITEM "Αποθήκευ&ση\tCtrl+S", CMD_SAVE MENUITEM "Αποθήκευση &ως...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index aaf60dda1aa..6f284bdbf21 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&File" BEGIN MENUITEM "&New\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Open...\tCtrl+O", CMD_OPEN MENUITEM "&Save\tCtrl+S", CMD_SAVE MENUITEM "Save &As...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 6b43662c06c..a22083ca956 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -26,7 +26,7 @@ BEGIN POPUP "&Archivo" BEGIN MENUITEM "&Nuevo\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Abrir\tCtrl+A", CMD_OPEN MENUITEM "&Guardar\tCtrl+G", CMD_SAVE MENUITEM "Guardar &como...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 6e46f21306f..3df808c417e 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -32,7 +32,7 @@ BEGIN POPUP "&Fail" BEGIN MENUITEM "&Uus\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Ava...\tCtrl+O", CMD_OPEN MENUITEM "&Salvesta\tCtrl+S", CMD_SAVE MENUITEM "Salvesta &nimega...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index f5b9b83e39d..0923ac47c4d 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fitxategia" BEGIN MENUITEM "&Berria\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Ireki\tCtrl+O", CMD_OPEN MENUITEM "&Gorde\tCtrl+S", CMD_SAVE MENUITEM "Gorde &honela...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index bd77e4e8f67..a12be32822e 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Tiedosto" BEGIN MENUITEM "&Uusi\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Avaa\tCtrl+O", CMD_OPEN MENUITEM "Ta&lleta\tCtrl+S", CMD_SAVE MENUITEM "Talleta &nimellä...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index df41b785d39..29bac1aa9c9 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fichier" BEGIN MENUITEM "&Nouveau\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE MENUITEM "Enregistrer &sous...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index fd1cd198869..63c3a2c2f46 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&קובץ" BEGIN MENUITEM "&חדש\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&פתח...\tCtrl+O", CMD_OPEN MENUITEM "&שמור\tCtrl+S", CMD_SAVE MENUITEM "שמור &בשם...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 7d5a823ff73..abb0c2810fd 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -31,7 +31,7 @@ BEGIN POPUP "&फ़ाइल" BEGIN MENUITEM "&नया\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&खोलो...\tCtrl+O", CMD_OPEN MENUITEM "&सेव\tCtrl+S", CMD_SAVE MENUITEM "सेव &इज़...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index 41a85142a10..7c82d538f26 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Ֆայլ" BEGIN MENUITEM "&Ստեղծել\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Բացել...\tCtrl+O", CMD_OPEN MENUITEM "&Պահպանել\tCtrl+S", CMD_SAVE MENUITEM "Պահպանել &ինչպես...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 1eb143bd665..32f002e078a 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -24,7 +24,7 @@ BEGIN POPUP "Be&rkas" BEGIN MENUITEM "Bar&u\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Buka\tCtrl+O", CMD_OPEN MENUITEM "&Simpan\tCtrl+S", CMD_SAVE MENUITEM "Simpan seb&agai...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index a7f5f4ae287..b239f11b7e8 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&File" BEGIN MENUITEM "&Nuovo\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Apri...\tCtrl+O", CMD_OPEN MENUITEM "&Salva\tCtrl+S", CMD_SAVE MENUITEM "Sal&va con nome...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index a7b50820d2e..b4f42011326 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -24,7 +24,7 @@ BEGIN POPUP "ファイル(&F)" BEGIN MENUITEM "新規作成(&N)\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "開く(&O)...\tCtrl+O", CMD_OPEN MENUITEM "上書き保存(&S)\tCtrl+S", CMD_SAVE MENUITEM "名前を付けて保存(&A)...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 12838c274c5..494161c1eb3 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Byla" BEGIN MENUITEM "&Nauja\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Atverti...\tCtrl+O", CMD_OPEN MENUITEM "Į&rašyti\tCtrl+S", CMD_SAVE MENUITEM "Įrašyti &kaip...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index d1d505ba8f3..26787eeb4ef 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -26,7 +26,7 @@ BEGIN POPUP "&Fail" BEGIN MENUITEM "Baru(&N)\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "Buka(&O)...\tCtrl+O", CMD_OPEN MENUITEM "&Simpan\tCtrl+S", CMD_SAVE MENUITEM "Simp&an sebagai...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index 7b47c2b7f83..d6c30f26403 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Bestand" BEGIN MENUITEM "&Nieuw\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Openen\tCtrl+O", CMD_OPEN MENUITEM "O&pslaan\tCtrl+S", CMD_SAVE MENUITEM "Ops&laan als...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index b99474ca0b7..ae83e8a270c 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Åpne\tCtrl+O", CMD_OPEN MENUITEM "&Lagre\tCtrl+S", CMD_SAVE MENUITEM "Lagre &som...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index e9a47589fe3..70c29377898 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Plik" BEGIN MENUITEM "&Nowy\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Otwórz...\tCtrl+O", CMD_OPEN MENUITEM "Zapi&sz\tCtrl+S", CMD_SAVE MENUITEM "Z&apisz jako...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 181ea79daed..1ba2f1788b5 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Arquivo" BEGIN MENUITEM "&Novo\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "A&brir\tCtrl+O", CMD_OPEN MENUITEM "&Salvar\tCtrl+S", CMD_SAVE MENUITEM "Salvar &como...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 673721f726a..5e597417040 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Arquivo" BEGIN MENUITEM "&Novo\tCtrl+N", CMD_NEW - MENUITEM "&Nova janela\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Nova &janela\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "A&brir\tCtrl+O", CMD_OPEN MENUITEM "&Guardar\tCtrl+S", CMD_SAVE MENUITEM "Guardar &como...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index 873c6fe70f6..a032dc0d67e 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -29,7 +29,7 @@ BEGIN POPUP "&Fișier" BEGIN MENUITEM "&Nou\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Deschidere…\tCtrl+O", CMD_OPEN MENUITEM "&Păstrează\tCtrl+S", CMD_SAVE MENUITEM "Păst&rare în…", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 95e7db8fa70..4ebb9037727 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Файл" BEGIN MENUITEM "Созд&ать\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Открыть...\tCtrl+O", CMD_OPEN MENUITEM "&Сохранить\tCtrl+S", CMD_SAVE MENUITEM "Сохранить &как...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 1b5ac9eb0bf..730ac82e4b9 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -32,7 +32,7 @@ BEGIN POPUP "&Súbor" BEGIN MENUITEM "&Nový\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Otvoriť...\tCtrl+O", CMD_OPEN MENUITEM "&Uložiť\tCtrl+S", CMD_SAVE MENUITEM "Uložiť &ako...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index a7607da25d4..a694e53c068 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Datoteka" BEGIN MENUITEM "&Nova\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Odpri\tCtrl+O", CMD_OPEN MENUITEM "&Shrani\tCtrl+S", CMD_SAVE MENUITEM "Shrani &kot ...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 6b1cfb22c80..542b5b93936 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -28,7 +28,7 @@ BEGIN POPUP "&File" BEGIN MENUITEM "E Re\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "Hap...\tCtrl+O", CMD_OPEN MENUITEM "Ruaj\tCtrl+S", CMD_SAVE MENUITEM "Ruaj si...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index c7fbc07f6da..6536306b1e7 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Arkiv" BEGIN MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Öppna\tCtrl+O", CMD_OPEN MENUITEM "&Spara\tCtrl+S", CMD_SAVE MENUITEM "Spara so&m...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index 156ab1d5f3c..ed6277314a8 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -24,7 +24,7 @@ BEGIN POPUP "แฟ้ม" BEGIN MENUITEM "สร้างใหม่\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "เปิด...\tCtrl+O", CMD_OPEN MENUITEM "บันทืก\tCtrl+S", CMD_SAVE MENUITEM "บันทืกเป็น...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 7c9e8447afa..391b0e70d83 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -27,7 +27,7 @@ BEGIN POPUP "&Dosya" BEGIN MENUITEM "&Yeni\tCtrl+N", CMD_NEW - MENUITEM "&Yeni Pencere\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "Yeni P&encere\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Aç...\tCtrl+O", CMD_OPEN MENUITEM "&Kaydet\tCtrl+S", CMD_SAVE MENUITEM "&Farklı Kaydet...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index 8d8ef3e0cc0..8c39417b9ec 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Файл" BEGIN MENUITEM "&Створити\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "&Відкрити...\tCtrl+O", CMD_OPEN MENUITEM "&Зберегти\tCtrl+S", CMD_SAVE MENUITEM "Зберегти &як...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index fdc61df2fd7..e6857a5f546 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -24,7 +24,7 @@ BEGIN POPUP "&Fayl" BEGIN MENUITEM "&Yangi\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "Oc&hmoq...\tCtrl+O", CMD_OPEN MENUITEM "&Saqlamoq\tCtrl+S", CMD_SAVE MENUITEM "Quyid&agicha saqlamoq...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 42c06a08303..701672bd777 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -26,7 +26,7 @@ BEGIN POPUP "文件(&F)" BEGIN MENUITEM "新建(&N)\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "打开(&O)...\tCtrl+O", CMD_OPEN MENUITEM "保存(&S)\tCtrl+S", CMD_SAVE MENUITEM "另存为(&A)...", CMD_SAVE_AS diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 30e7cfe4063..f66efcec3b7 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -24,7 +24,7 @@ BEGIN POPUP "檔案(&F)" BEGIN MENUITEM "開新檔案(&N)\tCtrl+N", CMD_NEW - MENUITEM "&New Window\tCtrl+Shift+N", CMD_NEW_WINDOW + MENUITEM "New &Window\tCtrl+Shift+N", CMD_NEW_WINDOW MENUITEM "開啟舊檔(&O)...\tCtrl+O", CMD_OPEN MENUITEM "儲存檔案(&S)\tCtrl+S", CMD_SAVE MENUITEM "另存新檔(&A)...", CMD_SAVE_AS

1 0

[reactos] 01/01: [IMM32] Move Imm(Get|Set)CompositionStringA/W (#4021)
by Katayama Hirofumi MZ 12 Oct '21

12 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d14d3dedcbb92496a21c6… commit d14d3dedcbb92496a21c6c55bde0f1ea70ff18a9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 12 13:10:01 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 12 13:10:01 2021 +0900 [IMM32] Move Imm(Get|Set)CompositionStringA/W (#4021) - Add new file compstr.c. - Move ImmGetCompositionStringA, ImmGetCompositionStringW, ImmSetCompositionStringA, and ImmSetCompositionStringW functions into compstr.c. - Half-implement ImmGetCompositionStringA/W. CORE-11700 --- dll/win32/imm32/CMakeLists.txt | 1 + dll/win32/imm32/compstr.c | 228 ++++++++++++++++++++ dll/win32/imm32/imm.c | 469 ----------------------------------------- 3 files changed, 229 insertions(+), 469 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index 3597068bdbc..5e67f36f4f5 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -9,6 +9,7 @@ spec2def(imm32.dll imm32.spec ADD_IMPORTLIB) list(APPEND SOURCE candidate.c + compstr.c guideline.c ime.c imm.c diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c new file mode 100644 index 00000000000..4ce157356e3 --- /dev/null +++ b/dll/win32/imm32/compstr.c @@ -0,0 +1,228 @@ +/* + * PROJECT: ReactOS IMM32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Implementing composition strings of IMM32 + * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(imm); + +LONG APIENTRY +Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, + LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsiClient, UINT uCodePage) +{ + LONG ret = IMM_ERROR_GENERAL; + + if (bAnsiClient) + { + switch (dwIndex) + { + case GCS_COMPREADSTR: + case GCS_COMPREADATTR: + case GCS_COMPREADCLAUSE: + case GCS_COMPSTR: + case GCS_COMPATTR: + case GCS_COMPCLAUSE: + case GCS_CURSORPOS: + case GCS_DELTASTART: + case GCS_RESULTREADSTR: + case GCS_RESULTREADCLAUSE: + case GCS_RESULTSTR: + case GCS_RESULTCLAUSE: + default: + FIXME("TODO:\n"); + break; + } + } + else /* !bAnsiClient */ + { + switch (dwIndex) + { + case GCS_COMPREADSTR: + case GCS_COMPREADATTR: + case GCS_COMPREADCLAUSE: + case GCS_COMPSTR: + case GCS_COMPATTR: + case GCS_COMPCLAUSE: + case GCS_CURSORPOS: + case GCS_DELTASTART: + case GCS_RESULTREADSTR: + case GCS_RESULTREADCLAUSE: + case GCS_RESULTSTR: + case GCS_RESULTCLAUSE: + default: + FIXME("TODO:\n"); + break; + } + } + + return ret; +} + +LONG APIENTRY +Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex, + LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsiClient, UINT uCodePage) +{ + LONG ret = IMM_ERROR_GENERAL; + + if (bAnsiClient) + { + switch (dwIndex) + { + case GCS_COMPREADSTR: + case GCS_COMPREADATTR: + case GCS_COMPREADCLAUSE: + case GCS_COMPSTR: + case GCS_COMPATTR: + case GCS_COMPCLAUSE: + case GCS_CURSORPOS: + case GCS_DELTASTART: + case GCS_RESULTREADSTR: + case GCS_RESULTREADCLAUSE: + case GCS_RESULTSTR: + case GCS_RESULTCLAUSE: + default: + FIXME("TODO:\n"); + break; + } + } + else /* !bAnsiClient */ + { + switch (dwIndex) + { + case GCS_COMPREADSTR: + case GCS_COMPREADATTR: + case GCS_COMPREADCLAUSE: + case GCS_COMPSTR: + case GCS_COMPATTR: + case GCS_COMPCLAUSE: + case GCS_CURSORPOS: + case GCS_DELTASTART: + case GCS_RESULTREADSTR: + case GCS_RESULTREADCLAUSE: + case GCS_RESULTSTR: + case GCS_RESULTCLAUSE: + default: + FIXME("TODO:\n"); + break; + } + } + + return ret; +} + +BOOL APIENTRY +Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, + LPCVOID lpRead, DWORD dwReadLen, BOOL bAnsi) +{ + FIXME("TODO:\n"); + return FALSE; +} + +/*********************************************************************** + * ImmGetCompositionStringA (IMM32.@) + */ +LONG WINAPI ImmGetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) +{ + LONG ret = 0; + LPINPUTCONTEXT pIC; + PCLIENTIMC pClientImc; + LPCOMPOSITIONSTRING pCS; + BOOL bAnsiClient; + + TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); + + if (dwBufLen && !lpBuf) + return 0; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return 0; + + bAnsiClient = !(pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return 0; + + pCS = ImmLockIMCC(pIC->hCompStr); + if (!pCS) + { + ImmUnlockIMC(hIMC); + return 0; + } + + ret = Imm32GetCompStrA(hIMC, pCS, dwIndex, lpBuf, dwBufLen, bAnsiClient, CP_ACP); + ImmUnlockIMCC(pIC->hCompStr); + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmGetCompositionStringW (IMM32.@) + */ +LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) +{ + LONG ret = 0; + LPINPUTCONTEXT pIC; + PCLIENTIMC pClientImc; + LPCOMPOSITIONSTRING pCS; + BOOL bAnsiClient; + + TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); + + if (dwBufLen && !lpBuf) + return 0; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return 0; + + bAnsiClient = !(pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return 0; + + pCS = ImmLockIMCC(pIC->hCompStr); + if (!pCS) + { + ImmUnlockIMC(hIMC); + return 0; + } + + ret = Imm32GetCompStrW(hIMC, pCS, dwIndex, lpBuf, dwBufLen, bAnsiClient, CP_ACP); + ImmUnlockIMCC(pIC->hCompStr); + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmSetCompositionStringA (IMM32.@) + */ +BOOL WINAPI +ImmSetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, + LPCVOID lpRead, DWORD dwReadLen) +{ + TRACE("(%p, %lu, %p, %lu, %p, %lu)\n", + hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + return Imm32SetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, + lpRead, dwReadLen, TRUE); +} + +/*********************************************************************** + * ImmSetCompositionStringW (IMM32.@) + */ +BOOL WINAPI +ImmSetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, + LPCVOID lpRead, DWORD dwReadLen) +{ + TRACE("(%p, %lu, %p, %lu, %p, %lu)\n", + hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + return Imm32SetCompositionStringAW(hIMC, dwIndex, lpComp, dwCompLen, + lpRead, dwReadLen, FALSE); +} diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 69cd4281a55..f4fa021b619 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -476,74 +476,10 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) return TRUE; } -typedef struct _tagImmHkl -{ - struct list entry; - HKL hkl; - HMODULE hIME; - IMEINFO imeInfo; - WCHAR imeClassName[17]; /* 16 character max */ - ULONG uSelected; - HWND UIWnd; - - /* Function Pointers */ - BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *); - BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); - BOOL (WINAPI *pImeDestroy)(UINT); - LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); - BOOL (WINAPI *pImeSelect)(HIMC, BOOL); - BOOL (WINAPI *pImeSetActiveContext)(HIMC, BOOL); - UINT (WINAPI *pImeToAsciiEx)(UINT, UINT, const BYTE *, DWORD *, UINT, HIMC); - BOOL (WINAPI *pNotifyIME)(HIMC, DWORD, DWORD, DWORD); - BOOL (WINAPI *pImeRegisterWord)(const WCHAR *, DWORD, const WCHAR *); - BOOL (WINAPI *pImeUnregisterWord)(const WCHAR *, DWORD, const WCHAR *); - UINT (WINAPI *pImeEnumRegisterWord)(REGISTERWORDENUMPROCW, const WCHAR *, DWORD, const WCHAR *, void *); - BOOL (WINAPI *pImeSetCompositionString)(HIMC, DWORD, const void *, DWORD, const void *, DWORD); - DWORD (WINAPI *pImeConversionList)(HIMC, const WCHAR *, CANDIDATELIST *, DWORD, UINT); - BOOL (WINAPI *pImeProcessKey)(HIMC, UINT, LPARAM, const BYTE *); - UINT (WINAPI *pImeGetRegisterWordStyle)(UINT, STYLEBUFW *); - DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD); -} ImmHkl; - -typedef struct tagInputContextData -{ - DWORD dwLock; - INPUTCONTEXT IMC; - DWORD threadID; - - ImmHkl *immKbd; - UINT lastVK; - BOOL threadDefault; - DWORD magic; -} InputContextData; - -#define WINE_IMC_VALID_MAGIC 0x56434D49 - -static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; -static inline BOOL is_himc_ime_unicode(const InputContextData *data) -{ - return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); -} - -static InputContextData* get_imc_data(HIMC hIMC) -{ - InputContextData *data = (InputContextData *)hIMC; - - if (hIMC == NULL) - return NULL; - - if(IsBadReadPtr(data, sizeof(InputContextData)) || data->magic != WINE_IMC_VALID_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return NULL; - } - return data; -} - static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) { FIXME("We have to do something\n"); @@ -1060,297 +996,6 @@ Quit: return hIMC; } - -/* Helpers for the GetCompositionString functions */ - -/* Source encoding is defined by context, source length is always given in respective characters. Destination buffer - length is always in bytes. */ -static INT -CopyCompStringIMEtoClient(const InputContextData *data, const void *src, INT src_len, void *dst, - INT dst_len, BOOL unicode) -{ - int char_size = unicode ? sizeof(WCHAR) : sizeof(char); - INT ret; - - if (is_himc_ime_unicode(data) ^ unicode) - { - if (unicode) - ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len / sizeof(WCHAR)); - else - ret = WideCharToMultiByte(CP_ACP, 0, src, src_len, dst, dst_len, NULL, NULL); - ret *= char_size; - } - else - { - if (dst_len) - { - ret = min(src_len * char_size, dst_len); - memcpy(dst, src, ret); - } - else - ret = src_len * char_size; - } - - return ret; -} - -/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to - passed mode. String length is in characters, attributes are in byte arrays. */ -static INT -CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, - INT str_len, BYTE *dst, INT dst_len, BOOL unicode) -{ - union - { - const void *str; - const WCHAR *strW; - const char *strA; - } string; - INT rc; - - string.str = comp_string; - - if (is_himc_ime_unicode(data) && !unicode) - { - rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); - if (dst_len) - { - int i, j = 0, k = 0; - - if (rc < dst_len) - dst_len = rc; - for (i = 0; i < str_len; ++i) - { - int len; - - len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); - for (; len > 0; --len) - { - dst[j++] = src[k]; - - if (j >= dst_len) - goto end; - } - ++k; - } - end: - rc = j; - } - } - else if (!is_himc_ime_unicode(data) && unicode) - { - rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); - if (dst_len) - { - int i, j = 0; - - if (rc < dst_len) - dst_len = rc; - for (i = 0; i < str_len; ++i) - { - if (IsDBCSLeadByte(string.strA[i])) - continue; - - dst[j++] = src[i]; - - if (j >= dst_len) - break; - } - rc = j; - } - } - else - { - memcpy(dst, src, min(src_len, dst_len)); - rc = src_len; - } - - return rc; -} - -static INT -CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, - LPBYTE target, INT tlen, BOOL unicode ) -{ - INT rc; - - if (is_himc_ime_unicode(data) && !unicode) - { - if (tlen) - { - int i; - - if (slen < tlen) - tlen = slen; - tlen /= sizeof (DWORD); - for (i = 0; i < tlen; ++i) - { - ((DWORD *)target)[i] = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, - ((DWORD *)source)[i], - NULL, 0, - NULL, NULL); - } - rc = sizeof (DWORD) * i; - } - else - rc = slen; - } - else if (!is_himc_ime_unicode(data) && unicode) - { - if (tlen) - { - int i; - - if (slen < tlen) - tlen = slen; - tlen /= sizeof (DWORD); - for (i = 0; i < tlen; ++i) - { - ((DWORD *)target)[i] = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, - ((DWORD *)source)[i], - NULL, 0); - } - rc = sizeof (DWORD) * i; - } - else - rc = slen; - } - else - { - memcpy( target, source, min(slen,tlen)); - rc = slen; - } - - return rc; -} - -static INT -CopyCompOffsetIMEtoClient(InputContextData *data, DWORD offset, LPBYTE ssource, BOOL unicode) -{ - int rc; - - if (is_himc_ime_unicode(data) && !unicode) - { - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, offset, NULL, 0, NULL, NULL); - } - else if (!is_himc_ime_unicode(data) && unicode) - { - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, offset, NULL, 0); - } - else - rc = offset; - - return rc; -} - -static LONG -ImmGetCompositionStringT(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, - DWORD dwBufLen, BOOL unicode) -{ - LONG rc = 0; - InputContextData *data = get_imc_data(hIMC); - LPCOMPOSITIONSTRING compstr; - LPBYTE compdata; - - TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen); - - if (!data) - return FALSE; - - if (!data->IMC.hCompStr) - return FALSE; - - compdata = ImmLockIMCC(data->IMC.hCompStr); - compstr = (LPCOMPOSITIONSTRING)compdata; - - switch (dwIndex) - { - case GCS_RESULTSTR: - TRACE("GCS_RESULTSTR\n"); - rc = CopyCompStringIMEtoClient(data, compdata + compstr->dwResultStrOffset, compstr->dwResultStrLen, lpBuf, dwBufLen, unicode); - break; - case GCS_COMPSTR: - TRACE("GCS_COMPSTR\n"); - rc = CopyCompStringIMEtoClient(data, compdata + compstr->dwCompStrOffset, compstr->dwCompStrLen, lpBuf, dwBufLen, unicode); - break; - case GCS_COMPATTR: - TRACE("GCS_COMPATTR\n"); - rc = CopyCompAttrIMEtoClient(data, compdata + compstr->dwCompAttrOffset, compstr->dwCompAttrLen, - compdata + compstr->dwCompStrOffset, compstr->dwCompStrLen, - lpBuf, dwBufLen, unicode); - break; - case GCS_COMPCLAUSE: - TRACE("GCS_COMPCLAUSE\n"); - rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwCompClauseOffset,compstr->dwCompClauseLen, - compdata + compstr->dwCompStrOffset, - lpBuf, dwBufLen, unicode); - break; - case GCS_RESULTCLAUSE: - TRACE("GCS_RESULTCLAUSE\n"); - rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwResultClauseOffset,compstr->dwResultClauseLen, - compdata + compstr->dwResultStrOffset, - lpBuf, dwBufLen, unicode); - break; - case GCS_RESULTREADSTR: - TRACE("GCS_RESULTREADSTR\n"); - rc = CopyCompStringIMEtoClient(data, compdata + compstr->dwResultReadStrOffset, compstr->dwResultReadStrLen, lpBuf, dwBufLen, unicode); - break; - case GCS_RESULTREADCLAUSE: - TRACE("GCS_RESULTREADCLAUSE\n"); - rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwResultReadClauseOffset,compstr->dwResultReadClauseLen, - compdata + compstr->dwResultStrOffset, - lpBuf, dwBufLen, unicode); - break; - case GCS_COMPREADSTR: - TRACE("GCS_COMPREADSTR\n"); - rc = CopyCompStringIMEtoClient(data, compdata + compstr->dwCompReadStrOffset, compstr->dwCompReadStrLen, lpBuf, dwBufLen, unicode); - break; - case GCS_COMPREADATTR: - TRACE("GCS_COMPREADATTR\n"); - rc = CopyCompAttrIMEtoClient(data, compdata + compstr->dwCompReadAttrOffset, compstr->dwCompReadAttrLen, - compdata + compstr->dwCompReadStrOffset, compstr->dwCompReadStrLen, - lpBuf, dwBufLen, unicode); - break; - case GCS_COMPREADCLAUSE: - TRACE("GCS_COMPREADCLAUSE\n"); - rc = CopyCompClauseIMEtoClient(data, compdata + compstr->dwCompReadClauseOffset,compstr->dwCompReadClauseLen, - compdata + compstr->dwCompStrOffset, - lpBuf, dwBufLen, unicode); - break; - case GCS_CURSORPOS: - TRACE("GCS_CURSORPOS\n"); - rc = CopyCompOffsetIMEtoClient(data, compstr->dwCursorPos, compdata + compstr->dwCompStrOffset, unicode); - break; - case GCS_DELTASTART: - TRACE("GCS_DELTASTART\n"); - rc = CopyCompOffsetIMEtoClient(data, compstr->dwDeltaStart, compdata + compstr->dwCompStrOffset, unicode); - break; - default: - FIXME("Unhandled index 0x%x\n",dwIndex); - break; - } - - ImmUnlockIMCC(data->IMC.hCompStr); - - return rc; -} - -/*********************************************************************** - * ImmGetCompositionStringA (IMM32.@) - */ -LONG WINAPI ImmGetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) -{ - return ImmGetCompositionStringT(hIMC, dwIndex, lpBuf, dwBufLen, FALSE); -} - -/*********************************************************************** - * ImmGetCompositionStringW (IMM32.@) - */ -LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) -{ - return ImmGetCompositionStringT(hIMC, dwIndex, lpBuf, dwBufLen, TRUE); -} - /*********************************************************************** * ImmGetContext (IMM32.@) */ @@ -1494,120 +1139,6 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) return TRUE; // Do nothing. This is correct. } -/*********************************************************************** - * ImmSetCompositionStringA (IMM32.@) - */ -BOOL WINAPI -ImmSetCompositionStringA(HIMC hIMC, DWORD dwIndex, - LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen) -{ - DWORD comp_len; - DWORD read_len; - WCHAR *CompBuffer = NULL; - WCHAR *ReadBuffer = NULL; - BOOL rc; - InputContextData *data = get_imc_data(hIMC); - - TRACE("(%p, %d, %p, %d, %p, %d):\n", - hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - - if (!data) - return FALSE; - - if (!(dwIndex == SCS_SETSTR || - dwIndex == SCS_CHANGEATTR || - dwIndex == SCS_CHANGECLAUSE || - dwIndex == SCS_SETRECONVERTSTRING || - dwIndex == SCS_QUERYRECONVERTSTRING)) - return FALSE; - - if (!is_himc_ime_unicode(data)) - return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, - dwCompLen, lpRead, dwReadLen); - - comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0); - if (comp_len) - { - CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len); - } - - read_len = MultiByteToWideChar(CP_ACP, 0, lpRead, dwReadLen, NULL, 0); - if (read_len) - { - ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len); - } - - rc = ImmSetCompositionStringW(hIMC, dwIndex, CompBuffer, comp_len, - ReadBuffer, read_len); - - HeapFree(GetProcessHeap(), 0, CompBuffer); - HeapFree(GetProcessHeap(), 0, ReadBuffer); - - return rc; -} - -/*********************************************************************** - * ImmSetCompositionStringW (IMM32.@) - */ -BOOL WINAPI -ImmSetCompositionStringW(HIMC hIMC, DWORD dwIndex, - LPCVOID lpComp, DWORD dwCompLen, - LPCVOID lpRead, DWORD dwReadLen) -{ - DWORD comp_len; - DWORD read_len; - CHAR *CompBuffer = NULL; - CHAR *ReadBuffer = NULL; - BOOL rc; - InputContextData *data = get_imc_data(hIMC); - - TRACE("(%p, %d, %p, %d, %p, %d):\n", - hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - - if (!data) - return FALSE; - - if (!(dwIndex == SCS_SETSTR || - dwIndex == SCS_CHANGEATTR || - dwIndex == SCS_CHANGECLAUSE || - dwIndex == SCS_SETRECONVERTSTRING || - dwIndex == SCS_QUERYRECONVERTSTRING)) - return FALSE; - - if (is_himc_ime_unicode(data)) - return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, - dwCompLen, lpRead, dwReadLen); - - comp_len = WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, NULL, 0, NULL, - NULL); - if (comp_len) - { - CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len); - WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len, - NULL, NULL); - } - - read_len = WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, NULL, 0, NULL, - NULL); - if (read_len) - { - ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len); - WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len, - NULL, NULL); - } - - rc = ImmSetCompositionStringA(hIMC, dwIndex, CompBuffer, comp_len, - ReadBuffer, read_len); - - HeapFree(GetProcessHeap(), 0, CompBuffer); - HeapFree(GetProcessHeap(), 0, ReadBuffer); - - return rc; -} - /*********************************************************************** * ImmCreateSoftKeyboard(IMM32.@) */

1 0

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

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