Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 01/01: [GDI32] Fix rectangle flag issues.

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e98684ed8b034c5ef45ab… commit e98684ed8b034c5ef45ab793c1612771ff44bf52 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sat Oct 16 11:16:43 2021 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sat Oct 16 11:16:43 2021 -0500 [GDI32] Fix rectangle flag issues. Fix CORE-17815. Remove dumb dumb code breakers. --- win32ss/gdi/gdi32/objects/text.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 799c20f5f72..2a3831aff27 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -494,6 +494,22 @@ ExtTextOutW( { PDC_ATTR pdcattr; + // Need both, should return a parameter error? No they don't! + if ( !lpDx && fuOptions & ETO_PDY ) + return FALSE; + + // Now sorting out rectangle. + + // Here again, need both. + if ( lprc && !(fuOptions & (ETO_CLIPPED|ETO_OPAQUE)) ) + { + lprc = NULL; // No flags, no rectangle. + } + else if (!lprc) // No rectangle, force clear flags if set and continue. + { + fuOptions &= ~(ETO_CLIPPED|ETO_OPAQUE); + } + if ( !bBypassETOWMF ) { HANDLE_METADC(BOOL,

3 years

[reactos] 01/01: [CONFIGURE][CMAKE] Add support for MSVC ARM64 target

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3b1bd66a07ecc7b510e4… commit b3b1bd66a07ecc7b510e490d407eac676faab310 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Oct 16 16:30:36 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Oct 16 16:30:36 2021 +0300 [CONFIGURE][CMAKE] Add support for MSVC ARM64 target Addendum to e4feaa1a and 51e2ab52. CORE-17518 --- configure.cmd | 3 +++ sdk/cmake/msvc.cmake | 2 ++ 2 files changed, 5 insertions(+) diff --git a/configure.cmd b/configure.cmd index 813fb48f2e3..53eb586b339 100755 --- a/configure.cmd +++ b/configure.cmd @@ -50,6 +50,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm + cl 2>&1 | find "ARM64" > NUL && set ARCH=arm64 cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14 cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set VS_VERSION=15 cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 @@ -121,6 +122,8 @@ REM Parse command line parameters set CMAKE_ARCH=-A x64 ) else if "!ARCH!" == "arm" ( set CMAKE_ARCH=-A ARM + ) else if "!ARCH!" == "arm64" ( + set CMAKE_ARCH=-A ARM64 ) ) else if /I "%1" NEQ "" ( echo.%1| find /I "-D" >nul 2>&1 diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 925fbe8c7fb..d284cae91a5 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -416,6 +416,8 @@ elseif((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) elseif(ARCH STREQUAL "arm") set(CMAKE_ASM16_COMPILER armasm.exe) +elseif(ARCH STREQUAL "arm64") + set(CMAKE_ASM16_COMPILER armasm64.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) endif()

3 years

[reactos] 01/01: [SDK] gcc.cmake: Only add -mstackrealign on i386 (#4016)

by Konrad Dybcio

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7c1b95b4573a8adaf454… commit b7c1b95b4573a8adaf454de9847f12c905d4aa27 Author: Konrad Dybcio <32096130+konradybcio(a)users.noreply.github.com> AuthorDate: Sat Oct 16 10:58:08 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 16 11:58:08 2021 +0300 [SDK] gcc.cmake: Only add -mstackrealign on i386 (#4016) This option is only useful for the i386 architecture and breaks ARM builds. Reviewed-by: Victor Perevertkin <victor.perevertkin(a)reactos.org> Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- sdk/cmake/gcc.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index cb20227501d..65085aba793 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -45,8 +45,6 @@ add_compile_options(-pipe -fms-extensions -fno-strict-aliasing) # The case for C++ is handled through the reactos_c++ INTERFACE library add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:CXX>>:-nostdinc>") -add_compile_options(-mstackrealign) - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") add_compile_options(-fno-aggressive-loop-optimizations) if (DBG) @@ -145,7 +143,7 @@ if(LTCG) endif() if(ARCH STREQUAL "i386") - add_compile_options(-fno-optimize-sibling-calls -fno-omit-frame-pointer) + add_compile_options(-fno-optimize-sibling-calls -fno-omit-frame-pointer -mstackrealign) if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options(-mpreferred-stack-boundary=3 -fno-set-stack-executable) endif()

3 years

[reactos] 01/01: [SETUP][REACTOS] Improve Japanese translation (#4033)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea4c1a067b6e816a188f7… commit ea4c1a067b6e816a188f7aed69da8b898c68366f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 16 07:51:40 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 16 07:51:40 2021 +0900 [SETUP][REACTOS] Improve Japanese translation (#4033) Improve the Japanese GUI of ReactOS Setup. --- base/setup/reactos/lang/ja-JP.rc | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/base/setup/reactos/lang/ja-JP.rc b/base/setup/reactos/lang/ja-JP.rc index e90ab15e4c7..d19a5e3c9d6 100644 --- a/base/setup/reactos/lang/ja-JP.rc +++ b/base/setup/reactos/lang/ja-JP.rc @@ -19,18 +19,18 @@ BEGIN LTEXT "ReactOSを新しくインストールします。このオプションは、あなたのファイル、設定、プログラムを維持しません。あなたはディスクとパーティションに変更を加えることができます。", IDC_INSTALLTEXT, 18, 18, 269, 25, NOT WS_GROUP AUTORADIOBUTTON "ReactOSを更新または修正する", IDC_UPDATE, 7, 50, 277, 10 LTEXT "インストールされたReactOSを更新または修正します。このオプションはあなたのファイル、設定、プログラムを保持します。このオプションは、このコンピュータですでにReactOSがインストール済みのときのみ利用できます。", IDC_UPDATETEXT, 18, 61, 269, 30, NOT WS_GROUP - LTEXT "次へをクリックすると続行します", IDC_STATIC, 7, 128, 297, 8 + LTEXT "次へをクリックすると続行します。", IDC_STATIC, 7, 128, 297, 8 END IDD_UPDATEREPAIRPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS セットアップ" -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic" BEGIN - LTEXT "The ReactOS Setup can upgrade one of the available ReactOS installations listed below, or, if a ReactOS installation is damaged, the Setup program can attempt to repair it.", IDC_STATIC, 6, 6, 300, 18 + LTEXT "ReactOS セットアップは、以下のリストのうち、一つをアップグレードできます。また、ReactOSインストールが壊れていれば、セットアップは修正を試すことができます。", IDC_STATIC, 6, 6, 300, 18 CONTROL "", IDC_NTOSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 6, 30, 303, 90 - PUSHBUTTON "&Do not upgrade", IDC_SKIPUPGRADE, 230, 128, 80, 14 - LTEXT "Click Next to upgrade the selected OS installation, or on 'Do not upgrade' to continue a new installation without upgrading.", IDC_STATIC, 7, 124, 222, 16 + PUSHBUTTON "アップグレードしない(&D)", IDC_SKIPUPGRADE, 218, 127, 92, 14 + LTEXT "次へをクリックしてOSのインストールをアップグレードするか、「アップグレードしない」をクリックして下さい。", IDC_STATIC, 7, 124, 207, 16 END IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 143 @@ -44,7 +44,7 @@ BEGIN CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 35, 180, 80 LTEXT "キーボード:", IDC_STATIC, 20, 55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 100, 55, 180, 80 - LTEXT "デバイスをセットアップするために、次へをクリック", IDC_STATIC, 7, 128, 297, 8 + LTEXT "デバイスをセットアップするために、次へをクリックして下さい。", IDC_STATIC, 7, 128, 297, 8 END IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 143 @@ -60,20 +60,20 @@ BEGIN // LTEXT "次へをクリックすれば、要約をチェックできます。", IDC_STATIC, 7, 128, 277, 8 END -IDD_PARTITION DIALOGEX 0, 0, 145, 90 +IDD_PARTITION DIALOGEX 0, 0, 175, 90 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CAPTION CAPTION "パーティションの作成" FONT 9, "MS UI Gothic" BEGIN - CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "パーティションを作成し、フォーマットします", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 129, 22, 9, 13 + CONTROL "パーティションを作成し、フォーマットします", IDC_STATIC, "Button", BS_GROUPBOX, 6, 5, 161, 57 LTEXT "サイズ:", IDC_STATIC, 13, 24, 27, 9 - EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP - LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 - LTEXT "ファイルシステム:", IDC_STATIC, 13, 46, 42, 9 - CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 42, 73, 50 + EDITTEXT IDC_PARTSIZE, 83, 22, 47, 13, WS_VISIBLE | WS_TABSTOP + LTEXT "GB", IDC_UNIT, 142, 24, 14, 9 + LTEXT "ファイルシステム:", IDC_STATIC, 13, 46, 63, 9 + CONTROL "", IDC_FSTYPE, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 83, 42, 73, 50 PUSHBUTTON "&OK", IDOK, 35, 68, 47, 15, WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "キャンセル(&C)", IDCANCEL, 87, 68, 47, 15, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "キャンセル(&C)", IDCANCEL, 89, 68, 55, 15, WS_VISIBLE | WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX 0, 0, 305, 116 @@ -96,25 +96,25 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "インストールの種類:", IDC_STATIC, 6, 5, 88, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + LTEXT "インストール元のソース:", IDC_STATIC, 6, 17, 88, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + LTEXT "アーキテクチャ:", IDC_STATIC, 6, 29, 88, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "コンピューター:", IDC_STATIC, 6, 41, 88, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "ディスプレイ:", IDC_STATIC, 6, 53, 88, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "キーボード:", IDC_STATIC, 6, 65, 88, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination volume:", IDC_STATIC, 18, 77, 74, 11 + LTEXT "インストール先ボリューム:", IDC_STATIC, 6, 77, 88, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Destination directory:", IDC_STATIC, 18, 89, 74, 11 + LTEXT "インストール先フォルダ:", IDC_STATIC, 6, 89, 88, 11 EDITTEXT IDC_PATH, 95, 88, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - AUTOCHECKBOX "I confirm that all the installation settings are correct. I also acknowledge that\nReactOS is alpha-quality software and may break on my computer or corrupt my data.", + AUTOCHECKBOX "すべてのインストール設定が正しいことを確認しました。また、ReactOSがまだアルファ版であり、あなたのコンピュータやデータを壊す恐れがあることを理解しています。", IDC_CONFIRM_INSTALL, 7, 104, 303, 18, BS_MULTILINE - LTEXT "Please confirm that all the installation settings are correct,\nthen click on Install to start the installation process.", IDC_STATIC, 7, 124, 303, 18 + LTEXT "すべてのインストール設定が正しいことを確認し、インストールプロセスを開始するために、インストールをクリックして下さい。", IDC_STATIC, 7, 124, 303, 18 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -132,11 +132,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Completing the ReactOS Setup Wizard", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "ReactOS セットアップウィザードの完了", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS セットアップの最初の段階が正しく完了しました。", IDC_STATIC, 115, 50, 195, 10 - LTEXT "完了をクリックすると、あなたのコンピュータは再起動されます。", IDC_STATIC, 115, 80, 195, 10 + LTEXT "完了をクリックすると、あなたのコンピュータは再起動されます。", IDC_STATIC, 115, 80, 195, 20 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 110, 195, 8 - LTEXT "もしCDがドライブにあれば、取り除いて下さい。その後、あなたのコンピュータを再起動するには、完了をクリックして下さい。", IDC_STATIC, 115, 169, 195, 17 + LTEXT "もしCDがドライブにあれば、取り除いて下さい。その後、あなたのコンピュータを再起動するには、完了をクリックして下さい。", IDC_STATIC, 115, 163, 195, 26 END STRINGTABLE @@ -161,9 +161,9 @@ END STRINGTABLE BEGIN - IDS_INSTALLATION_NAME "Name" - IDS_INSTALLATION_PATH "Installation Path" - IDS_INSTALLATION_VENDOR "Vendor Name" + IDS_INSTALLATION_NAME "名前" + IDS_INSTALLATION_PATH "インストール先パス" + IDS_INSTALLATION_VENDOR "ベンダー名" END STRINGTABLE @@ -171,5 +171,5 @@ BEGIN IDS_PARTITION_NAME "名前" IDS_PARTITION_TYPE "種類" IDS_PARTITION_SIZE "サイズ" - IDS_PARTITION_STATUS "Status" + IDS_PARTITION_STATUS "状態" END

3 years

[reactos] 01/01: [SDK] host-tools.cmake: Allow cross-compilation from aarch64 (#4013)

by Konrad Dybcio

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30c7c161fcfbadaa4dda8… commit 30c7c161fcfbadaa4dda8c6ad479ef0c86b9577e Author: Konrad Dybcio <32096130+konradybcio(a)users.noreply.github.com> AuthorDate: Sat Oct 16 00:38:33 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 16 01:38:33 2021 +0300 [SDK] host-tools.cmake: Allow cross-compilation from aarch64 (#4013) Some compilers call it 'arm64', while others prefer 'aarch64'. It's a big mess, thanks Arm Ltd... Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> Reviewed-by: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- sdk/cmake/host-tools.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index a415297455c..a3e7947cd82 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -40,6 +40,10 @@ function(setup_host_tools) elseif(lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm) set(HOST_ARCH arm) set(VCVARSALL_ARCH arm) + # 'aarch64' is used in GNU tools instead of 'arm64' + elseif(lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64 OR lowercase_CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL aarch64) + set(HOST_ARCH arm64) + set(VCVARSALL_ARCH arm64) else() message(FATAL_ERROR "Unknown host architecture: ${lowercase_CMAKE_HOST_SYSTEM_PROCESSOR}") endif()

3 years

[reactos] 01/01: [HHPCOMP] lz_nonslide.h: Define u_char on Linux (#4011)

by Konrad Dybcio

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dff479c82f5d34b5527e1… commit dff479c82f5d34b5527e1e4a4e8999107696a259 Author: Konrad Dybcio <32096130+konradybcio(a)users.noreply.github.com> AuthorDate: Sat Oct 16 00:30:22 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 16 01:30:22 2021 +0300 [HHPCOMP] lz_nonslide.h: Define u_char on Linux (#4011) Not defining the type breaks the compilation on (at least arm) Linux. Add a check for Linux-as-build-host to make it pass. Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- sdk/tools/hhpcomp/lzx_compress/lz_nonslide.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.h b/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.h index 829697f9116..7db3f58c0d7 100644 --- a/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.h +++ b/sdk/tools/hhpcomp/lzx_compress/lz_nonslide.h @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(_WIN32) || defined(__APPLE__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) typedef unsigned char u_char; #endif

3 years

[reactos] 01/01: [IMM32] Refactor about reconversion (#4031)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04cb13bc57f6fd81e881c… commit 04cb13bc57f6fd81e881c6fbe9bb49fe636c76d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 15 22:46:58 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 15 22:46:58 2021 +0900 [IMM32] Refactor about reconversion (#4031) - Delete Imm32ReconvertSize and Imm32ConvertReconvert helper functions. - Add Imm32ReconvertAnsiFromWide and Imm32ReconvertWideFromAnsi helper functions. CORE-11700 --- dll/win32/imm32/keymsg.c | 129 ++++++++-------------------------------------- dll/win32/imm32/precomp.h | 5 ++ dll/win32/imm32/utils.c | 123 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+), 107 deletions(-) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 168382559e4..4273220d24b 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -355,106 +355,6 @@ VOID APIENTRY Imm32RequestError(DWORD dwError) SetLastError(dwError); } -DWORD APIENTRY Imm32ReconvertSize(DWORD dwSize, BOOL bAnsi, BOOL bConvert) -{ - DWORD dwOffset; - if (dwSize < sizeof(RECONVERTSTRING)) - return 0; - if (!bConvert) - return dwSize; - dwOffset = dwSize - sizeof(RECONVERTSTRING); - if (bAnsi) - dwOffset /= sizeof(WCHAR); - else - dwOffset *= sizeof(WCHAR); - return sizeof(RECONVERTSTRING) + dwOffset; -} - -DWORD APIENTRY -Imm32ConvertReconvert(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, BOOL bAnsi, - UINT uCodePage) -{ - DWORD ret = sizeof(RECONVERTSTRING), cch0, cch1, cchDest; - - if ((pSrc->dwVersion != 0) || (pDest->dwVersion != 0)) - return 0; - - pDest->dwStrOffset = sizeof(RECONVERTSTRING); - - /* - * See RECONVERTSTRING structure: - * https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/RECONVERTSTRING.html - * - * The dwCompStrOffset and dwTargetOffset members are the relative position of dwStrOffset. - * dwStrLen, dwCompStrLen, and dwTargetStrLen are the TCHAR count. dwStrOffset, - * dwCompStrOffset, and dwTargetStrOffset are the byte offset. - */ - if (bAnsi) /* Ansi <-- Wide */ - { - LPCWSTR pchSrc = (LPCWSTR)((LPCSTR)pSrc + pSrc->dwStrOffset); - LPSTR pchDest = (LPSTR)pDest + pDest->dwStrOffset; - - cchDest = WideCharToMultiByte(uCodePage, 0, pchSrc, pSrc->dwStrLen, - pchDest, pSrc->dwStrLen, NULL, NULL); - - /* dwCompStrOffset */ - cch1 = pSrc->dwCompStrOffset / sizeof(WCHAR); - cch0 = IchAnsiFromWide(cch1, pchSrc, uCodePage); - pDest->dwCompStrOffset = cch0 * sizeof(CHAR); - - /* dwCompStrLen */ - cch0 = IchAnsiFromWide(cch1 + pSrc->dwCompStrLen, pchSrc, uCodePage); - pDest->dwCompStrLen = cch0 * sizeof(CHAR) - pDest->dwCompStrOffset; - - /* dwTargetStrOffset */ - cch1 = pSrc->dwTargetStrOffset / sizeof(WCHAR); - cch0 = IchAnsiFromWide(cch1, pchSrc, uCodePage); - pDest->dwTargetStrOffset = cch0 * sizeof(CHAR); - - /* dwTargetStrLen */ - cch0 = IchAnsiFromWide(cch1 + pSrc->dwTargetStrLen, pchSrc, uCodePage); - pDest->dwTargetStrLen = cch0 * sizeof(CHAR) - pDest->dwTargetStrOffset; - - /* dwStrLen */ - pDest->dwStrLen = cchDest; - pchDest[cchDest] = 0; - - ret += (cchDest + 1) * sizeof(CHAR); - } - else /* Wide <-- Ansi */ - { - LPCSTR pchSrc = (LPCSTR)pSrc + pSrc->dwStrOffset; - LPWSTR pchDest = (LPWSTR)((LPBYTE)pDest + pDest->dwStrOffset); - - cchDest = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, pchSrc, pSrc->dwStrLen, - pchDest, pSrc->dwStrLen); - - /* dwCompStrOffset */ - cch0 = IchWideFromAnsi(pSrc->dwCompStrOffset, pchSrc, uCodePage); - pDest->dwCompStrOffset = cch0 * sizeof(WCHAR); - - /* dwCompStrLen */ - cch0 = IchWideFromAnsi(pSrc->dwCompStrOffset + pSrc->dwCompStrLen, pchSrc, uCodePage); - pDest->dwCompStrLen = (cch0 * sizeof(WCHAR) - pDest->dwCompStrOffset) / sizeof(WCHAR); - - /* dwTargetStrOffset */ - cch0 = IchWideFromAnsi(pSrc->dwTargetStrOffset, pchSrc, uCodePage); - pDest->dwTargetStrOffset = cch0 * sizeof(WCHAR); - - /* dwTargetStrLen */ - cch0 = IchWideFromAnsi(pSrc->dwTargetStrOffset + pSrc->dwTargetStrLen, pchSrc, uCodePage); - pDest->dwTargetStrLen = (cch0 * sizeof(WCHAR) - pSrc->dwTargetStrOffset) / sizeof(WCHAR); - - /* dwStrLen */ - pDest->dwStrLen = cchDest; - pchDest[cchDest] = 0; - - ret += (cchDest + 1) * sizeof(WCHAR); - } - - return ret; -} - LRESULT APIENTRY Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bAnsiAPI) { @@ -539,8 +439,11 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA if (bAnsiAPI == bAnsiWnd || !pData) goto DoIt; - pRS = pData; - ret = Imm32ReconvertSize(pRS->dwSize, FALSE, bAnsiWnd); + if (bAnsiWnd) + ret = Imm32ReconvertAnsiFromWide(NULL, pData, uCodePage); + else + ret = Imm32ReconvertWideFromAnsi(NULL, pData, uCodePage); + pTempData = Imm32HeapAlloc(0, ret + sizeof(WCHAR)); if (!pTempData) return 0; @@ -550,7 +453,12 @@ Imm32ProcessRequest(HIMC hIMC, PWND pWnd, DWORD dwCommand, LPVOID pData, BOOL bA pRS->dwVersion = 0; if (dwCommand == IMR_CONFIRMRECONVERTSTRING) - Imm32ConvertReconvert(pData, pTempData, bAnsiWnd, uCodePage); + { + if (bAnsiWnd) + ret = Imm32ReconvertAnsiFromWide(pTempData, pData, uCodePage); + else + ret = Imm32ReconvertWideFromAnsi(pTempData, pData, uCodePage); + } break; case IMR_QUERYCHARPOSITION: @@ -617,13 +525,20 @@ DoIt: case IMR_RECONVERTSTRING: case IMR_DOCUMENTFEED: if (!ret) - goto Quit; + break; - ret = Imm32ReconvertSize(ret, TRUE, bAnsiWnd); - if (ret < sizeof(RECONVERTSTRING) || - (pTempData && !Imm32ConvertReconvert(pData, pTempData, bAnsiAPI, uCodePage))) + if (ret < sizeof(RECONVERTSTRING)) { ret = 0; + break; + } + + if (pTempData) + { + if (bAnsiWnd) + ret = Imm32ReconvertWideFromAnsi(pData, pTempData, uCodePage); + else + ret = Imm32ReconvertAnsiFromWide(pData, pTempData, uCodePage); } break; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 35d03332835..584defc5501 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -134,3 +134,8 @@ BOOL APIENTRY Imm32LoadImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL); BOOL APIENTRY Imm32SaveImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL); + +DWORD APIENTRY +Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage); +DWORD APIENTRY +Imm32ReconvertWideFromAnsi(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 6dddd9df22a..abbe5717bc9 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -361,6 +361,129 @@ Imm32SaveImeStateSentence(LPINPUTCONTEXTDX pIC, PIME_STATE pState, HKL hKL) return FALSE; } +/* + * See RECONVERTSTRING structure: + * https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/RECONVERTSTRING.html + * + * The dwCompStrOffset and dwTargetOffset members are the relative position of dwStrOffset. + * dwStrLen, dwCompStrLen, and dwTargetStrLen are the TCHAR count. dwStrOffset, + * dwCompStrOffset, and dwTargetStrOffset are the byte offset. + */ + +DWORD APIENTRY +Imm32ReconvertWideFromAnsi(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage) +{ + DWORD cch0, cchDest, cbDest; + LPCSTR pchSrc = (LPCSTR)pSrc + pSrc->dwStrOffset; + LPWSTR pchDest; + + if (pSrc->dwVersion != 0) + return 0; + + cchDest = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, pchSrc, pSrc->dwStrLen, + NULL, 0); + cbDest = sizeof(RECONVERTSTRING) + (cchDest + 1) * sizeof(WCHAR); + if (!pDest) + return cbDest; + + if (pDest->dwSize < cbDest) + return 0; + + /* dwSize */ + pDest->dwSize = cbDest; + + /* dwVersion */ + pDest->dwVersion = 0; + + /* dwStrOffset */ + pDest->dwStrOffset = sizeof(RECONVERTSTRING); + + /* dwCompStrOffset */ + cch0 = IchWideFromAnsi(pSrc->dwCompStrOffset, pchSrc, uCodePage); + pDest->dwCompStrOffset = cch0 * sizeof(WCHAR); + + /* dwCompStrLen */ + cch0 = IchWideFromAnsi(pSrc->dwCompStrOffset + pSrc->dwCompStrLen, pchSrc, uCodePage); + pDest->dwCompStrLen = (cch0 * sizeof(WCHAR) - pDest->dwCompStrOffset) / sizeof(WCHAR); + + /* dwTargetStrOffset */ + cch0 = IchWideFromAnsi(pSrc->dwTargetStrOffset, pchSrc, uCodePage); + pDest->dwTargetStrOffset = cch0 * sizeof(WCHAR); + + /* dwTargetStrLen */ + cch0 = IchWideFromAnsi(pSrc->dwTargetStrOffset + pSrc->dwTargetStrLen, pchSrc, uCodePage); + pDest->dwTargetStrLen = (cch0 * sizeof(WCHAR) - pSrc->dwTargetStrOffset) / sizeof(WCHAR); + + /* dwStrLen */ + pDest->dwStrLen = cchDest; + + /* the string */ + pchDest = (LPWSTR)((LPBYTE)pDest + pDest->dwStrOffset); + cchDest = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, pchSrc, pSrc->dwStrLen, + pchDest, cchDest); + pchDest[cchDest] = 0; + + return cbDest; +} + +DWORD APIENTRY +Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage) +{ + DWORD cch0, cch1, cchDest, cbDest; + LPCWSTR pchSrc = (LPCWSTR)((LPCSTR)pSrc + pSrc->dwStrOffset); + LPSTR pchDest; + + if (pSrc->dwVersion != 0) + return 0; + + cchDest = WideCharToMultiByte(uCodePage, 0, pchSrc, pSrc->dwStrLen, + NULL, 0, NULL, NULL); + cbDest = sizeof(RECONVERTSTRING) + (cchDest + 1) * sizeof(CHAR); + if (!pDest) + return cbDest; + + if (pDest->dwSize < cbDest) + return 0; + + /* dwSize */ + pDest->dwSize = cbDest; + + /* dwVersion */ + pDest->dwVersion = 0; + + /* dwStrOffset */ + pDest->dwStrOffset = sizeof(RECONVERTSTRING); + + /* dwCompStrOffset */ + cch1 = pSrc->dwCompStrOffset / sizeof(WCHAR); + cch0 = IchAnsiFromWide(cch1, pchSrc, uCodePage); + pDest->dwCompStrOffset = cch0 * sizeof(CHAR); + + /* dwCompStrLen */ + cch0 = IchAnsiFromWide(cch1 + pSrc->dwCompStrLen, pchSrc, uCodePage); + pDest->dwCompStrLen = cch0 * sizeof(CHAR) - pDest->dwCompStrOffset; + + /* dwTargetStrOffset */ + cch1 = pSrc->dwTargetStrOffset / sizeof(WCHAR); + cch0 = IchAnsiFromWide(cch1, pchSrc, uCodePage); + pDest->dwTargetStrOffset = cch0 * sizeof(CHAR); + + /* dwTargetStrLen */ + cch0 = IchAnsiFromWide(cch1 + pSrc->dwTargetStrLen, pchSrc, uCodePage); + pDest->dwTargetStrLen = cch0 * sizeof(CHAR) - pDest->dwTargetStrOffset; + + /* dwStrLen */ + pDest->dwStrLen = cchDest; + + /* the string */ + pchDest = (LPSTR)pDest + pDest->dwStrOffset; + cchDest = WideCharToMultiByte(uCodePage, 0, pchSrc, pSrc->dwStrLen, + pchDest, cchDest, NULL, NULL); + pchDest[cchDest] = 0; + + return cbDest; +} + /*********************************************************************** * CtfImmIsTextFrameServiceDisabled(IMM32.@) */

3 years

[reactos] 01/01: [IMM32] Improve IchWideFromAnsi and IchAnsiFromWide (#4028)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fec35dc89386eb02761b5… commit fec35dc89386eb02761b5e12573de164fb5904c9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 15 10:31:08 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 15 10:31:08 2021 +0900 [IMM32] Improve IchWideFromAnsi and IchAnsiFromWide (#4028) - Use LONG instead of DWORD for indexing and counting the characters. - Use the sign for the loop condition. - Add NUL check. CORE-11700 --- dll/win32/imm32/precomp.h | 4 ++-- dll/win32/imm32/utils.c | 28 +++++++++++----------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 17f46493c88..35d03332835 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -81,8 +81,8 @@ LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); -DWORD APIENTRY IchWideFromAnsi(DWORD cchAnsi, LPCSTR pchAnsi, UINT uCodePage); -DWORD APIENTRY IchAnsiFromWide(DWORD cchWide, LPCWSTR pchWide, UINT uCodePage); +LONG APIENTRY IchWideFromAnsi(LONG cchAnsi, LPCSTR pchAnsi, UINT uCodePage); +LONG APIENTRY IchAnsiFromWide(LONG cchWide, LPCWSTR pchWide, UINT uCodePage); PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL); LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect); BOOL APIENTRY Imm32ReleaseIME(HKL hKL); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 20790f78110..6dddd9df22a 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -50,23 +50,16 @@ LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW) return pszA; } -DWORD APIENTRY IchWideFromAnsi(DWORD cchAnsi, LPCSTR pchAnsi, UINT uCodePage) +/* Converts the character index */ +LONG APIENTRY IchWideFromAnsi(LONG cchAnsi, LPCSTR pchAnsi, UINT uCodePage) { - DWORD cchWide; - for (cchWide = 0; cchAnsi; ++cchWide) + LONG cchWide; + for (cchWide = 0; cchAnsi > 0; ++cchWide) { - if (IsDBCSLeadByteEx(uCodePage, *pchAnsi)) + if (IsDBCSLeadByteEx(uCodePage, *pchAnsi) && pchAnsi[1]) { - if (cchAnsi <= 1) - { - ++cchWide; - break; - } - else - { - cchAnsi -= 2; - pchAnsi += 2; - } + cchAnsi -= 2; + pchAnsi += 2; } else { @@ -77,10 +70,11 @@ DWORD APIENTRY IchWideFromAnsi(DWORD cchAnsi, LPCSTR pchAnsi, UINT uCodePage) return cchWide; } -DWORD APIENTRY IchAnsiFromWide(DWORD cchWide, LPCWSTR pchWide, UINT uCodePage) +/* Converts the character index */ +LONG APIENTRY IchAnsiFromWide(LONG cchWide, LPCWSTR pchWide, UINT uCodePage) { - DWORD cb, cchAnsi; - for (cchAnsi = 0; cchWide; ++cchAnsi, ++pchWide, --cchWide) + LONG cb, cchAnsi; + for (cchAnsi = 0; cchWide > 0; ++cchAnsi, ++pchWide, --cchWide) { cb = WideCharToMultiByte(uCodePage, 0, pchWide, 1, NULL, 0, NULL, NULL); if (cb > 1)

3 years

[reactos] 11/11: [NTOS:PNP] HACK: release resources when device is removed

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89fd2b86e4e1013269961… commit 89fd2b86e4e1013269961a30c3f1135342df08c9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Oct 13 07:56:12 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:31 2021 +0200 [NTOS:PNP] HACK: release resources when device is removed CORE-17789 --- ntoskrnl/io/pnpmgr/devaction.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 18a435f3a38..e9caa760bb5 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1635,6 +1635,10 @@ PiIrpSendRemoveCheckVpb( return IopSynchronousCall(targetDevice, &stack, &info); } +NTSTATUS +IopUpdateResourceMapForPnPDevice( + IN PDEVICE_NODE DeviceNode); + static VOID NTAPI @@ -1647,6 +1651,12 @@ IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ PiIrpSendRemoveCheckVpb(DeviceObject, IRP_MN_REMOVE_DEVICE); + /* Start of HACK: update resources stored in registry, so IopDetectResourceConflict works */ + DeviceNode->ResourceList->Count = 0; + DeviceNode->ResourceListTranslated->Count = 0; + IopUpdateResourceMapForPnPDevice(DeviceNode); + /* End of HACK */ + PiSetDevNodeState(DeviceNode, DeviceNodeRemoved); PiNotifyTargetDeviceChange(&GUID_TARGET_DEVICE_REMOVE_COMPLETE, DeviceObject, NULL); LONG_PTR refCount = ObDereferenceObject(DeviceObject);

3 years

[reactos] 10/11: [NTOS:PNP] Fix resource conflict detection

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49358f34160e75623690d… commit 49358f34160e75623690d1b7fdc4138a4d2391c0 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Oct 7 21:45:10 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Oct 14 23:39:31 2021 +0200 [NTOS:PNP] Fix resource conflict detection Only resources of HAL were checked against conflicts, not those of PnP Manager Let IoReportResourceForDetection() make a silent conflict check. Otherwise IopCheckResourceDescriptor() will always return 'no conflict'. CORE-17789 --- ntoskrnl/io/pnpmgr/pnpreport.c | 2 +- ntoskrnl/io/pnpmgr/pnpres.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpreport.c b/ntoskrnl/io/pnpmgr/pnpreport.c index 65e256075da..3357925ec65 100644 --- a/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/ntoskrnl/io/pnpmgr/pnpreport.c @@ -376,7 +376,7 @@ IoReportResourceForDetection(IN PDRIVER_OBJECT DriverObject, ResourceList = DriverList; /* Look for a resource conflict */ - Status = IopDetectResourceConflict(ResourceList, FALSE, NULL); + Status = IopDetectResourceConflict(ResourceList, TRUE, NULL); if (Status == STATUS_CONFLICTING_ADDRESSES) { /* Oh noes */ diff --git a/ntoskrnl/io/pnpmgr/pnpres.c b/ntoskrnl/io/pnpmgr/pnpres.c index 57eabfe69c2..982ffe2afed 100644 --- a/ntoskrnl/io/pnpmgr/pnpres.c +++ b/ntoskrnl/io/pnpmgr/pnpres.c @@ -1264,7 +1264,7 @@ IopDetectResourceConflict( PKEY_BASIC_INFORMATION KeyInformation; PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation; PKEY_VALUE_BASIC_INFORMATION KeyNameInformation; - ULONG ChildKeyIndex1 = 0, ChildKeyIndex2 = 0, ChildKeyIndex3 = 0; + ULONG ChildKeyIndex1 = 0, ChildKeyIndex2, ChildKeyIndex3; NTSTATUS Status; RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); @@ -1332,6 +1332,7 @@ IopDetectResourceConflict( if (!NT_SUCCESS(Status)) goto cleanup; + ChildKeyIndex2 = 0; while (TRUE) { Status = ZwEnumerateKey(ChildKey2, @@ -1382,6 +1383,7 @@ IopDetectResourceConflict( if (!NT_SUCCESS(Status)) goto cleanup; + ChildKeyIndex3 = 0; while (TRUE) { Status = ZwEnumerateValueKey(ChildKey3,

3 years

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

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