Ros-diffs July 2023

ros-diffs@reactos.org

26 participants
189 discussions

[reactos] 01/01: [SDK][HAL] Enable x86Bios on x86 (#5454)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce2d4740a6d0393870f4d… commit ce2d4740a6d0393870f4dcf48496f6d501870426 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Thu Jul 20 21:44:44 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 21:44:44 2023 +0200 [SDK][HAL] Enable x86Bios on x86 (#5454) This will be needed for compatibility with x86 Windows Vista/7 videoprt.sys builds. Might be also useful in future for platforms (x86 , ...) where V86 mode is not available or buggy. CORE-11954, CORE-18185 --- hal/hal.spec | 15 ++++++++++----- hal/halx86/CMakeLists.txt | 10 ++-------- hal/halx86/generic.cmake | 3 ++- hal/halx86/generic/halinit.c | 6 ++---- hal/halx86/{amd64 => generic}/x86bios.c | 2 ++ hal/halx86/include/halp.h | 3 +-- hal/halx86/pc98.cmake | 3 ++- hal/halx86/xbox.cmake | 1 + sdk/include/ndk/halfuncs.h | 4 ---- sdk/include/ndk/haltypes.h | 4 ---- 10 files changed, 22 insertions(+), 29 deletions(-) diff --git a/hal/hal.spec b/hal/hal.spec index 4f8e0bec939..94bb141afee 100644 --- a/hal/hal.spec +++ b/hal/hal.spec @@ -101,8 +101,13 @@ @ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) -@ stdcall -arch=x86_64 x86BiosAllocateBuffer() -@ stdcall -arch=x86_64 x86BiosCall() -@ stdcall -arch=x86_64 x86BiosFreeBuffer() -@ stdcall -arch=x86_64 x86BiosReadMemory() -@ stdcall -arch=x86_64 x86BiosWriteMemory() +@ stdcall -version=0x0502 -arch=x86_64 x86BiosAllocateBuffer(ptr ptr ptr) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosAllocateBuffer(ptr ptr ptr) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosCall(long ptr) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosCall(long ptr) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosFreeBuffer(long long) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosFreeBuffer(long long) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosReadMemory(long long ptr long) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosReadMemory(long long ptr long) +@ stdcall -version=0x0502 -arch=x86_64 x86BiosWriteMemory(long long ptr long) +@ stdcall -version=0x0600+ -arch=i386,x86_64 x86BiosWriteMemory(long long ptr long) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 50e1342f47f..dc22b0c9614 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -23,9 +23,9 @@ function(add_hal _halname) ${CMAKE_CURRENT_BINARY_DIR}/hal.def) if(${_halname} STREQUAL "hal") - target_link_libraries(${_halname} libcntpr arbiter) + target_link_libraries(${_halname} libcntpr arbiter fast486) else() - target_link_libraries(${_halname} libcntpr) + target_link_libraries(${_halname} libcntpr fast486) endif() add_importlibs(${_halname} ntoskrnl) @@ -71,13 +71,7 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") - list(APPEND HAL_SOURCE - amd64/x86bios.c) - add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi up apic) - target_link_libraries(hal fast486) - add_hal(halmp SOURCES ${HAL_SOURCE} COMPONENTS generic acpi smp apic) - target_link_libraries(halmp fast486) endif() diff --git a/hal/halx86/generic.cmake b/hal/halx86/generic.cmake index e9e60264e2b..b04bd23616d 100644 --- a/hal/halx86/generic.cmake +++ b/hal/halx86/generic.cmake @@ -13,7 +13,8 @@ list(APPEND HAL_GENERIC_SOURCE generic/pic.c generic/reboot.c generic/sysinfo.c - generic/usage.c) + generic/usage.c + generic/x86bios.c) if(ARCH STREQUAL "i386") list(APPEND HAL_GENERIC_SOURCE diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c index 868e1b48ffa..bbd3c49204e 100644 --- a/hal/halx86/generic/halinit.c +++ b/hal/halx86/generic/halinit.c @@ -142,9 +142,8 @@ HalInitSystem(IN ULONG BootPhase, /* Do some HAL-specific initialization */ HalpInitPhase0(LoaderBlock); -#ifdef _M_AMD64 + /* Initialize Phase 0 of the x86 emulator */ HalInitializeBios(0, LoaderBlock); -#endif } else if (BootPhase == 1) { @@ -154,9 +153,8 @@ HalInitSystem(IN ULONG BootPhase, /* Do some HAL-specific initialization */ HalpInitPhase1(); -#ifdef _M_AMD64 + /* Initialize Phase 1 of the x86 emulator */ HalInitializeBios(1, LoaderBlock); -#endif } /* All done, return */ diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/generic/x86bios.c similarity index 99% rename from hal/halx86/amd64/x86bios.c rename to hal/halx86/generic/x86bios.c index 80cefebc322..9a3c7e3bdfb 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/generic/x86bios.c @@ -493,6 +493,7 @@ x86BiosCall( return TRUE; } +#ifdef _M_AMD64 BOOLEAN NTAPI HalpBiosDisplayReset(VOID) @@ -521,3 +522,4 @@ HalpBiosDisplayReset(VOID) return FALSE; #endif } +#endif // _M_AMD64 diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 5446482dfc8..9ea22e8c3c5 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -555,8 +555,6 @@ HalpInitializeClockPc98(VOID); extern ULONG PIT_FREQUENCY; #endif /* SARCH_PC98 */ -#ifdef _M_AMD64 - VOID NTAPI HalInitializeBios( @@ -564,6 +562,7 @@ HalInitializeBios( _In_ PLOADER_PARAMETER_BLOCK LoaderBlock ); +#ifdef _M_AMD64 #define KfLowerIrql KeLowerIrql #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */ diff --git a/hal/halx86/pc98.cmake b/hal/halx86/pc98.cmake index 3a46043df3a..3f28342eb2c 100644 --- a/hal/halx86/pc98.cmake +++ b/hal/halx86/pc98.cmake @@ -19,7 +19,8 @@ list(APPEND HAL_PC98_SOURCE generic/nmi.c generic/portio.c generic/sysinfo.c - generic/usage.c) + generic/usage.c + generic/x86bios.c) list(APPEND HAL_PC98_ASM_SOURCE generic/v86.S) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index 90db5a730b3..4f08c0c2437 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -21,6 +21,7 @@ list(APPEND HAL_XBOX_SOURCE generic/usage.c generic/bios.c generic/portio.c + generic/x86bios.c legacy/bus/bushndlr.c legacy/bus/cmosbus.c legacy/bus/isabus.c diff --git a/sdk/include/ndk/halfuncs.h b/sdk/include/ndk/halfuncs.h index 6c5e480acb9..2c4b56075ad 100644 --- a/sdk/include/ndk/halfuncs.h +++ b/sdk/include/ndk/halfuncs.h @@ -298,8 +298,6 @@ HalSetTimeIncrement( // // BIOS call API // -#ifdef _M_AMD64 - NTSTATUS NTAPI x86BiosAllocateBuffer( @@ -335,7 +333,5 @@ x86BiosCall( _In_ ULONG InterruptNumber, _Inout_ PX86_BIOS_REGISTERS Registers); -#endif // _M_AMD64 - #endif // NTOS_MODE_USER #endif // _HALFUNCS_H diff --git a/sdk/include/ndk/haltypes.h b/sdk/include/ndk/haltypes.h index 8e850e11c0e..ccba81a536d 100644 --- a/sdk/include/ndk/haltypes.h +++ b/sdk/include/ndk/haltypes.h @@ -289,8 +289,6 @@ extern NTHALAPI PUCHAR KdComPortInUse; // // BIOS call structure // -#ifdef _M_AMD64 - typedef struct _X86_BIOS_REGISTERS { ULONG Eax; @@ -304,8 +302,6 @@ typedef struct _X86_BIOS_REGISTERS USHORT SegEs; } X86_BIOS_REGISTERS, *PX86_BIOS_REGISTERS; -#endif // _M_AMD64 - #endif #endif

1 year, 5 months

[reactos] 01/01: [APPWIZ] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27ebedb3678e7f89eb14f… commit 27ebedb3678e7f89eb14fbeb7f6a69b997b57938 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Jul 20 16:06:54 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jul 20 16:06:54 2023 +0300 [APPWIZ] Update Russian (ru-RU) translation --- dll/cpl/appwiz/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 8f30157d963..25a825bd639 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -85,6 +85,6 @@ BEGIN IDS_NO_MEMORY "Невозможно выделить память." IDS_NO_DIRECTORY "Не указано ни одного каталога!" IDS_INVALID_PATH "Указанный путь неверен!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." - IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" + IDS_INVALID_NAME "Заданное имя ярлыка содержит символы, недопустимые в именах файлов, или имеет слишком большую длину." + IDS_BROWSE_FOR_TARGET "Укажите объект для ярлыка:" END

1 year, 5 months

[reactos] 01/01: [APPWIZ] Add title caption to 'Browse for Folder' #5460

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08d42a7ec7dd4273904a5… commit 08d42a7ec7dd4273904a56338782b94b7881cacf Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 20:17:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 20:17:22 2023 +0900 [APPWIZ] Add title caption to 'Browse for Folder' #5460 - Add IDS_BROWSE_FOR_TARGET resource string. - Use it in setting the title caption of "Browse for Folder" dialog. CORE-5866 --- dll/cpl/appwiz/createlink.c | 3 +++ dll/cpl/appwiz/lang/bg-BG.rc | 1 + dll/cpl/appwiz/lang/cs-CZ.rc | 1 + dll/cpl/appwiz/lang/de-DE.rc | 1 + dll/cpl/appwiz/lang/el-GR.rc | 1 + dll/cpl/appwiz/lang/en-US.rc | 1 + dll/cpl/appwiz/lang/es-ES.rc | 1 + dll/cpl/appwiz/lang/et-EE.rc | 1 + dll/cpl/appwiz/lang/fr-FR.rc | 1 + dll/cpl/appwiz/lang/he-IL.rc | 1 + dll/cpl/appwiz/lang/hu-HU.rc | 1 + dll/cpl/appwiz/lang/id-ID.rc | 1 + dll/cpl/appwiz/lang/it-IT.rc | 1 + dll/cpl/appwiz/lang/ja-JP.rc | 1 + dll/cpl/appwiz/lang/no-NO.rc | 1 + dll/cpl/appwiz/lang/pl-PL.rc | 1 + dll/cpl/appwiz/lang/pt-BR.rc | 1 + dll/cpl/appwiz/lang/pt-PT.rc | 1 + dll/cpl/appwiz/lang/ro-RO.rc | 1 + dll/cpl/appwiz/lang/ru-RU.rc | 1 + dll/cpl/appwiz/lang/sk-SK.rc | 1 + dll/cpl/appwiz/lang/sq-AL.rc | 1 + dll/cpl/appwiz/lang/tr-TR.rc | 1 + dll/cpl/appwiz/lang/uk-UA.rc | 1 + dll/cpl/appwiz/lang/zh-CN.rc | 1 + dll/cpl/appwiz/lang/zh-HK.rc | 1 + dll/cpl/appwiz/lang/zh-TW.rc | 1 + dll/cpl/appwiz/resource.h | 1 + 28 files changed, 30 insertions(+) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 25de942ed2b..9f80dc5aa7c 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -234,6 +234,7 @@ WelcomeDlgProc(HWND hwndDlg, LPPSHNOTIFY lppsn; WCHAR szPath[MAX_PATH * 2]; WCHAR szDesc[100]; + WCHAR szTitle[100]; BROWSEINFOW brws; LPITEMIDLIST pidllist; LPWSTR pch; @@ -265,10 +266,12 @@ WelcomeDlgProc(HWND hwndDlg, switch(LOWORD(wParam)) { case IDC_SHORTCUT_BROWSE: + LoadStringW(hApplet, IDS_BROWSE_FOR_TARGET, szTitle, _countof(szTitle)); ZeroMemory(&brws, sizeof(brws)); brws.hwndOwner = hwndDlg; brws.pidlRoot = NULL; brws.pszDisplayName = szPath; + brws.lpszTitle = szTitle; brws.ulFlags = BIF_BROWSEINCLUDEFILES | BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE | BIF_SHAREABLE; brws.lpfn = NULL; diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 5dd00adec24..b472e7b75de 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index 76f9163173a..60e7acd2dd4 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -91,4 +91,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index df7c01c0cc8..7a1b2508e15 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 6911ffdfc39..8669a85588d 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 1cf1a7ab924..29c51714a0c 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 824035af140..23cb4c36f58 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -96,4 +96,5 @@ BEGIN IDS_NO_DIRECTORY "No se ha especificado directorio alguno" IDS_INVALID_PATH "La ruta proporcionada es inválida" IDS_INVALID_NAME "El nombre del acceso directo que has introducido contiene o bien caracteres inválidos, o su nombre es demasiado largo." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 2e1bcf4b404..4d9825e3ec9 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -93,4 +93,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index 59a069a0739..c304ac8f323 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index cb068fdaec9..c0a1628ba01 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -87,4 +87,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc index 7b28593ab34..c2f868fafd3 100644 --- a/dll/cpl/appwiz/lang/hu-HU.rc +++ b/dll/cpl/appwiz/lang/hu-HU.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_DIRECTORY "Nincs megadva mappa!" IDS_INVALID_PATH "A megadott mappa érvénytelen!" IDS_INVALID_NAME "A megadott parancsikon név érvénytelen fájlnév karaktereket tartalmaz, vagy túl hosszú." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 4be97de03c6..2992561f292 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "Direktori belum diberi!" IDS_INVALID_PATH "Jalur yang diberikan tidak sah!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index c545681392a..ed400f1523c 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 3c9b052a5dd..5a532f9a1f9 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "ディレクトリが与えられてません!" IDS_INVALID_PATH "与えられたパスは無効です!" IDS_INVALID_NAME "入力したショートカット名にファイル名としては無効な文字が含まれているか長すぎます。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 72b6971e4ee..7719769826b 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 8cbb5f3a136..bdd2a0cf284 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -97,4 +97,5 @@ BEGIN IDS_NO_DIRECTORY "Nie podano ścieżki!" IDS_INVALID_PATH "Podana ścieżka jest niepoprawna!" IDS_INVALID_NAME "Wprowadzona nazwa skrótu zawiera nieprawidłowe znaki lub jest za długa." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index 1b5fb17e00c..e3165c75d30 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -88,4 +88,5 @@ BEGIN IDS_NO_DIRECTORY "Sem diretoria!" IDS_INVALID_PATH "O caminho é invalido!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index 940d84b0744..4e03e1cc06f 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -88,4 +88,5 @@ BEGIN IDS_NO_DIRECTORY "Sem directoria!" IDS_INVALID_PATH "O caminho é invalido!" IDS_INVALID_NAME "O nome do atalho contém caracteres inválidos para nomes de ficheiro ou é muito longo." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 2b7f0a4a4ce..1ff04fc7495 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_DIRECTORY "Nu a fost dat niciun director!" IDS_INVALID_PATH "Calea dată este nevalidă!" IDS_INVALID_NAME "Numele comenzii rapide pe care l-ați introdus conținea fie caractere nevalide pentru numele fișierelor, fie era prea lung." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index fcabc788e33..8f30157d963 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -86,4 +86,5 @@ BEGIN IDS_NO_DIRECTORY "Не указано ни одного каталога!" IDS_INVALID_PATH "Указанный путь неверен!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 0e10958df79..1e85530000e 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index 284231fd78c..f0598c3aef3 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -90,4 +90,5 @@ BEGIN IDS_NO_DIRECTORY "No directory given!" IDS_INVALID_PATH "The given path is invalid!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index e233bf0fbf3..f9d5e06ce50 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -88,4 +88,5 @@ BEGIN IDS_NO_DIRECTORY "Hiç dizin verilmedi!" IDS_INVALID_PATH "Verilen yol geçersiz!" IDS_INVALID_NAME "Girdiğiniz kısayol adı, ya geçersiz karakterler içeriyor ya dosya adları için geçersiz ya da çok uzun." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 79af27fdb4f..bdcdc9d45ba 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_DIRECTORY "Не вказано жодного каталогу!" IDS_INVALID_PATH "Вказаний шлях недійсний!" IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index ba5886c7a20..a1b57cfbbf1 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -95,4 +95,5 @@ BEGIN IDS_NO_DIRECTORY "没有指定路径。" IDS_INVALID_PATH "指定的路径无效。" IDS_INVALID_NAME "您输入的快捷方式名称过长，或含有不能在文件名中使用的字符。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/zh-HK.rc b/dll/cpl/appwiz/lang/zh-HK.rc index 14e59763e3d..5f32adf1dbd 100644 --- a/dll/cpl/appwiz/lang/zh-HK.rc +++ b/dll/cpl/appwiz/lang/zh-HK.rc @@ -94,4 +94,5 @@ BEGIN IDS_NO_DIRECTORY "沒有指定路徑。" IDS_INVALID_PATH "指定的路徑無效。" IDS_INVALID_NAME "您輸入的捷徑名稱太長，或包含不能在檔案名稱中使用的字元。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 9ab2051d539..413ae7285bd 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -95,4 +95,5 @@ BEGIN IDS_NO_DIRECTORY "沒有指定路徑。" IDS_INVALID_PATH "指定的路徑無效。" IDS_INVALID_NAME "您輸入的捷徑名稱過長，或包含不能在檔案名稱中使用的字元。" + IDS_BROWSE_FOR_TARGET "Please select the target of the shortcut below:" END diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h index 28ddc864cf7..9b780c71867 100644 --- a/dll/cpl/appwiz/resource.h +++ b/dll/cpl/appwiz/resource.h @@ -29,6 +29,7 @@ #define IDS_NO_DIRECTORY 2027 #define IDS_INVALID_PATH 2028 #define IDS_INVALID_NAME 2029 +#define IDS_BROWSE_FOR_TARGET 2030 #define IDS_DOWNLOADING 14 #define IDS_INSTALLING 15

1 year, 5 months

[reactos] 01/01: [SHELL32] CD-ROM drive shouldn't be renamed (#5461)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62eaad1811b47187a3849… commit 62eaad1811b47187a38490aca97f29d7fabbf773 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 16:53:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 16:53:04 2023 +0900 [SHELL32] CD-ROM drive shouldn't be renamed (#5461) - Add _ILGetDriveType helper function. - Use _ILGetDrive and GetDriveType functions to determine the drive type. - If it was a CD-ROM drive, then remove SFGAO_CANRENAME flag. CORE-18272 --- dll/win32/shell32/folders/CDrivesFolder.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 24df6235f4a..2293884e9ea 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -55,6 +55,17 @@ static int iDriveTypeIds[7] = { IDS_DRIVE_FIXED, /* DRIVE_UNKNOWN */ IDS_DRIVE_FIXED /* DRIVE_RAMDISK*/ }; +BOOL _ILGetDriveType(LPCITEMIDLIST pidl) +{ + char szDrive[8]; + if (!_ILGetDrive(pidl, szDrive, _countof(szDrive))) + { + ERR("pidl %p is not a drive\n", pidl); + return DRIVE_UNKNOWN; + } + return ::GetDriveTypeA(szDrive); +} + /*********************************************************************** * IShellFolder implementation */ @@ -660,7 +671,12 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST if (pdwAttributes && *pdwAttributes) { if (_ILIsDrive(pidlTemp)) + { *pdwAttributes &= dwDriveAttributes; + + if (_ILGetDriveType(pidlTemp) == DRIVE_CDROM) + *pdwAttributes &= ~SFGAO_CANRENAME; // CD-ROM drive cannot rename + } else if (_ILIsSpecialFolder(pidlTemp)) m_regFolder->GetAttributesOf(1, &pidlTemp, pdwAttributes); else @@ -877,7 +893,12 @@ HRESULT WINAPI CDrivesFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY a for (UINT i = 0; i < cidl; ++i) { if (_ILIsDrive(apidl[i])) + { *rgfInOut &= dwDriveAttributes; + + if (_ILGetDriveType(apidl[i]) == DRIVE_CDROM) + *rgfInOut &= ~SFGAO_CANRENAME; // CD-ROM drive cannot rename + } else if (_ILIsControlPanel(apidl[i])) *rgfInOut &= dwControlPanelAttributes; else if (_ILIsSpecialFolder(*apidl))

1 year, 5 months

[reactos] 01/01: [APPWIZ] "Create Shortcut" wizard: Only filesystem items (#5455)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca62121b4dd9d7fb763d4… commit ca62121b4dd9d7fb763d4634b89b1ed95ce02106 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 08:46:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 08:46:51 2023 +0900 [APPWIZ] "Create Shortcut" wizard: Only filesystem items (#5455) - Add (BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE | BIF_SHAREABLE) flags. - Consider the failure of SHGetPathFromIDListW. CORE-5866 --- dll/cpl/appwiz/createlink.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 5646ce29477..25de942ed2b 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -269,7 +269,8 @@ WelcomeDlgProc(HWND hwndDlg, brws.hwndOwner = hwndDlg; brws.pidlRoot = NULL; brws.pszDisplayName = szPath; - brws.ulFlags = BIF_BROWSEINCLUDEFILES; + brws.ulFlags = BIF_BROWSEINCLUDEFILES | BIF_RETURNONLYFSDIRS | + BIF_NEWDIALOGSTYLE | BIF_SHAREABLE; brws.lpfn = NULL; pidllist = SHBrowseForFolderW(&brws); if (!pidllist) @@ -281,6 +282,11 @@ WelcomeDlgProc(HWND hwndDlg, SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, WM_SETFOCUS, 0, 0); SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); } + else + { + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, NULL); + } + /* Free memory, if possible */ CoTaskMemFree(pidllist); break;

1 year, 5 months

[reactos] 01/01: [ATL][ATL_APITEST] Add <atlconv.h> and atlconv testcase (#5449)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1191bcaf03ae005332f92… commit 1191bcaf03ae005332f92a9f3b2665fc2fc631c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 07:54:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 07:54:11 2023 +0900 [ATL][ATL_APITEST] Add <atlconv.h> and atlconv testcase (#5449) - Add <atlconv.h> header file. - Add atlconv testcase to atl_apitest.exe. CORE-16668 --- modules/rostests/apitests/atl/CMakeLists.txt | 1 + modules/rostests/apitests/atl/atlconv.cpp | 218 +++++++++++++ modules/rostests/apitests/atl/atltest.h | 2 +- modules/rostests/apitests/atl/devenv/.gitignore | 4 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 + .../rostests/apitests/atl/devenv/atlconv.vcxproj | 154 +++++++++ modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlconv.h | 348 +++++++++++++++++++++ 8 files changed, 738 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index dfaddd62b61..411c5ad068c 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -3,6 +3,7 @@ add_definitions(-DINITGUID -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE AtlObjMap.cpp + atlconv.cpp atltypes.cpp CAtlFileMapping.cpp CAtlArray.cpp diff --git a/modules/rostests/apitests/atl/atlconv.cpp b/modules/rostests/apitests/atl/atlconv.cpp new file mode 100644 index 00000000000..96cbac21790 --- /dev/null +++ b/modules/rostests/apitests/atl/atlconv.cpp @@ -0,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for <atlconv.h> + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#ifdef HAVE_APITEST + #include <apitest.h> +#else + #include "atltest.h" +#endif +#include <atlbase.h> +#include <atlconv.h> + +START_TEST(atlconv) +{ + char dataA[MAX_PATH]; + wchar_t dataW[MAX_PATH]; + const char *dataAX = "test12345"; + const wchar_t *dataWX = L"test12345"; + using namespace ATL; + + // + // Initialize long data + // + FillMemory(dataA, sizeof(dataA), 'A'); + dataA[_countof(dataA) - 1] = 0; + + for (size_t i = 0; i < _countof(dataW); ++i) + dataW[i] = L'A'; + dataW[_countof(dataW) - 1] = 0; + + // + // The NULL strings + // + { + CA2A a2a(NULL); + ok_ptr((LPSTR)a2a, NULL); + ok_ptr(a2a.m_psz, NULL); + ok_int(a2a.m_szBuffer[0], 0); + + CW2A w2a(NULL); + ok_ptr((LPSTR)w2a, NULL); + ok_ptr(w2a.m_psz, NULL); + ok_int(w2a.m_szBuffer[0], 0); + + CA2W a2w(NULL); + ok_ptr((LPWSTR)a2w, NULL); + ok_ptr(a2w.m_psz, NULL); + ok_int(a2w.m_szBuffer[0], 0); + + CW2W w2w(NULL); + ok_ptr((LPWSTR)w2w, NULL); + ok_ptr(w2w.m_psz, NULL); + ok_int(w2w.m_szBuffer[0], 0); + } + + // + // The zero-length strings + // + { + CA2A a2a(""); + ok_str((LPSTR)a2a, ""); + ok_str(a2a.m_psz, ""); + ok_int(a2a.m_szBuffer[0], 0); + ok_ptr(a2a.m_psz, a2a.m_szBuffer); + + CW2A w2a(L""); + ok_str((LPSTR)w2a, ""); + ok_str(w2a.m_psz, ""); + ok_int(w2a.m_szBuffer[0], 0); + ok_ptr(w2a.m_psz, w2a.m_szBuffer); + + CA2W a2w(""); + ok_wstr((LPWSTR)a2w, L""); + ok_wstr(a2w.m_psz, L""); + ok_int(a2w.m_szBuffer[0], 0); + ok_ptr(a2w.m_psz, a2w.m_szBuffer); + + CW2W w2w(L""); + ok_wstr((LPWSTR)w2w, L""); + ok_wstr(w2w.m_psz, L""); + ok_int(w2w.m_szBuffer[0], 0); + ok_ptr(w2w.m_psz, w2w.m_szBuffer); + } + + // + // The short strings + // + { + CA2A a2a("TEST123"); + ok_str((LPSTR)a2a, "TEST123"); + ok_str(a2a.m_psz, "TEST123"); + ok_ptr(a2a.m_psz, a2a.m_szBuffer); + + CW2A w2a(L"TEST123"); + ok_str((LPSTR)w2a, "TEST123"); + ok_str(w2a.m_psz, "TEST123"); + ok_ptr(w2a.m_psz, w2a.m_szBuffer); + + CA2W a2w("TEST123"); + ok_wstr((LPWSTR)a2w, L"TEST123"); + ok_wstr(a2w.m_psz, L"TEST123"); + ok_ptr(a2w.m_psz, a2w.m_szBuffer); + + CW2W w2w(L"TEST123"); + ok_wstr((LPWSTR)w2w, L"TEST123"); + ok_wstr(w2w.m_psz, L"TEST123"); + ok_ptr(w2w.m_psz, w2w.m_szBuffer); + } + + // + // The short strings (EX) + // + { + CA2AEX<5> a2ax("123"); + ok_str((LPSTR)a2ax, "123"); + ok_str(a2ax.m_psz, "123"); + ok_ptr(a2ax.m_psz, a2ax.m_szBuffer); + + CW2AEX<5> w2ax(L"123"); + ok_str((LPSTR)w2ax, "123"); + ok_str(w2ax.m_psz, "123"); + ok(w2ax.m_psz != w2ax.m_szBuffer, "w2ax.m_psz == w2ax.m_szBuffer\n"); // corner case + + CA2WEX<5> a2wx("123"); + ok_wstr((LPWSTR)a2wx, L"123"); + ok_wstr(a2wx.m_psz, L"123"); + ok_ptr(a2wx.m_psz, a2wx.m_szBuffer); + + CW2WEX<5> w2wx(L"123"); + ok_wstr((LPWSTR)w2wx, L"123"); + ok_wstr(w2wx.m_psz, L"123"); + ok_ptr(w2wx.m_psz, w2wx.m_szBuffer); + } + + // + // The long strings + // + { + CA2A a2a2(dataA); + ok_str((LPSTR)a2a2, dataA); + ok_str(a2a2.m_psz, dataA); + ok_str(a2a2.m_szBuffer, ""); + ok(a2a2.m_psz != dataA, "a2a2.m_psz == dataA\n"); + ok(a2a2.m_psz != a2a2.m_szBuffer, "a2a2.m_psz == a2a2.m_szBuffer\n"); + + CW2A w2a2(dataW); + ok_str((LPSTR)w2a2, dataA); + ok_str(w2a2.m_psz, dataA); + ok_str(w2a2.m_szBuffer, ""); + ok(w2a2.m_psz != dataA, "w2a2.m_psz == dataA\n"); + ok(w2a2.m_psz != w2a2.m_szBuffer, "w2a2.m_psz == w2a2.m_szBuffer\n"); + + CA2W a2w2(dataA); + ok_wstr((LPWSTR)a2w2, dataW); + ok_wstr(a2w2.m_psz, dataW); + ok_wstr(a2w2.m_szBuffer, L""); + ok(a2w2.m_psz != dataW, "a2w2.m_psz == dataW\n"); + ok(a2w2.m_psz != a2w2.m_szBuffer, "a2w2.m_psz == a2w2.m_szBuffer\n"); + + CW2W w2w2(dataW); + ok_wstr((LPWSTR)w2w2, dataW); + ok_wstr(w2w2.m_psz, dataW); + ok_wstr(w2w2.m_szBuffer, L""); + ok(w2w2.m_psz != dataW, "w2w2.m_psz == dataW\n"); + ok(w2w2.m_psz != w2w2.m_szBuffer, "w2w2.m_psz == w2w2.m_szBuffer\n"); + } + + // + // The long strings (EX) + // + { + CA2AEX<5> a2a2x(dataAX); + ok_str((LPSTR)a2a2x, dataAX); + ok_str(a2a2x.m_psz, dataAX); + ok_str(a2a2x.m_szBuffer, ""); + ok(a2a2x.m_psz != dataAX, "a2a2x.m_psz == dataAX\n"); + ok(a2a2x.m_psz != a2a2x.m_szBuffer, "a2a2x.m_psz == a2a2x.m_szBuffer\n"); + + CW2AEX<5> w2a2x(dataWX); + ok_str((LPSTR)w2a2x, dataAX); + ok_str(w2a2x.m_psz, dataAX); + ok_str(w2a2x.m_szBuffer, ""); + ok(w2a2x.m_psz != dataAX, "w2a2x.m_psz == dataAX\n"); + ok(w2a2x.m_psz != w2a2x.m_szBuffer, "w2a2x.m_psz == w2a2x.m_szBuffer\n"); + + CA2WEX<5> a2w2x(dataAX); + ok_wstr((LPWSTR)a2w2x, dataWX); + ok_wstr(a2w2x.m_psz, dataWX); + ok_wstr(a2w2x.m_szBuffer, L""); + ok(a2w2x.m_psz != dataWX, "a2w2x.m_psz == dataWX\n"); + ok(a2w2x.m_psz != a2w2x.m_szBuffer, "a2w2x.m_psz == a2w2x.m_szBuffer\n"); + + CW2WEX<5> w2w2x(dataWX); + ok_wstr((LPWSTR)w2w2x, dataWX); + ok_wstr(w2w2x.m_psz, dataWX); + ok_wstr(w2w2x.m_szBuffer, L""); + ok(w2w2x.m_psz != dataWX, "w2w2x.m_psz == dataWX\n"); + ok(w2w2x.m_psz != w2w2x.m_szBuffer, "w2w2x.m_psz == w2w2x.m_szBuffer\n"); + } + + // + // The const strings + // + { + CA2CA a2ca(dataA); + ok_str((LPCSTR)a2ca, dataA); + ok_str(a2ca.m_psz, dataA); + ok_ptr(a2ca.m_psz, dataA); + + CW2CW w2cw(dataW); + ok_wstr((LPCWSTR)w2cw, dataW); + ok_wstr(w2cw.m_psz, dataW); + ok_ptr(w2cw.m_psz, dataW); + } +} diff --git a/modules/rostests/apitests/atl/atltest.h b/modules/rostests/apitests/atl/atltest.h index 9fb1ede6ac5..42740868814 100644 --- a/modules/rostests/apitests/atl/atltest.h +++ b/modules/rostests/apitests/atl/atltest.h @@ -107,7 +107,7 @@ char *wine_dbgstr_w(const wchar_t *wstr) #define ok_ptr(expression, result) \ do { \ - void *_value = (expression); \ + const void *_value = (expression); \ ok(_value == (result), "Wrong value for '%s', expected: " #result " (%p), got: %p\n", \ #expression, (void*)(result), _value); \ } while (0) diff --git a/modules/rostests/apitests/atl/devenv/.gitignore b/modules/rostests/apitests/atl/devenv/.gitignore index 15eeeeb1607..442c28bde1d 100644 --- a/modules/rostests/apitests/atl/devenv/.gitignore +++ b/modules/rostests/apitests/atl/devenv/.gitignore @@ -1,7 +1,11 @@ *.opendb *.db +*.user +*.filters x64/ .vs/ +ipch/ +atlconv/ CAtlArray/ CAtlFileMapping/ CAtlList/ diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 5b3cc7d4247..128101222af 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -31,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPath", "CPath.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtlObjMap", "AtlObjMap.vcxproj", "{B628C42A-A38E-488E-8512-2B997B75E95C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlconv", "atlconv.vcxproj", "{85194CA3-A828-4270-962A-333743E2BF83}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -151,6 +153,14 @@ Global {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x64.Build.0 = Release|x64 {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x86.ActiveCfg = Release|Win32 {B628C42A-A38E-488E-8512-2B997B75E95C}.Release|x86.Build.0 = Release|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x64.ActiveCfg = Debug|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x64.Build.0 = Debug|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x86.ActiveCfg = Debug|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Debug|x86.Build.0 = Debug|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x64.ActiveCfg = Release|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x64.Build.0 = Release|x64 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x86.ActiveCfg = Release|Win32 + {85194CA3-A828-4270-962A-333743E2BF83}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/atlconv.vcxproj b/modules/rostests/apitests/atl/devenv/atlconv.vcxproj new file mode 100644 index 00000000000..606a5db9987 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/atlconv.vcxproj @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\atlconv.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{85194CA3-A828-4270-962A-333743E2BF83}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>atlconv</RootNamespace> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>Use</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 2309a421512..c56b2024d53 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -2,6 +2,7 @@ #include <apitest.h> extern void func_AtlObjMap(void); +extern void func_atlconv(void); extern void func_atltypes(void); extern void func_CAtlFileMapping(void); extern void func_CAtlArray(void); @@ -23,6 +24,7 @@ extern void func_SubclassWindow(void); const struct test winetest_testlist[] = { { "AtlObjMap", func_AtlObjMap }, + { "atlconv", func_atlconv }, { "atltypes", func_atltypes }, { "CAtlFileMapping", func_CAtlFileMapping }, { "CAtlArray", func_CAtlArray }, diff --git a/sdk/lib/atl/atlconv.h b/sdk/lib/atl/atlconv.h new file mode 100644 index 00000000000..7ba62045575 --- /dev/null +++ b/sdk/lib/atl/atlconv.h @@ -0,0 +1,348 @@ +/* + * PROJECT: ReactOS ATL + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: String conversion + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#ifndef __ATLCONV_H__ +#define __ATLCONV_H__ + +#pragma once + +#include "atlbase.h" + +namespace ATL +{ + +// This class does not own the string +template <int t_nBufferLength = 128> +class CA2CAEX +{ +public: + LPCSTR m_psz; + + CA2CAEX(_In_z_ LPCSTR psz) : m_psz(psz) { } + + CA2CAEX(_In_z_ LPCSTR psz, _In_ UINT nCodePage) : m_psz(psz) + { + UNREFERENCED_PARAMETER(nCodePage); + } + + ~CA2CAEX() throw() { } // There is nothing to free here + + _Ret_z_ operator LPCSTR() const throw() { return m_psz; } + +private: + // CA2CAEX is not copyable + CA2CAEX(_In_ const CA2CAEX&) throw() = delete; + CA2CAEX& operator=(_In_ const CA2CAEX&) throw() = delete; +}; + +// This class does not own the string +template <int t_nBufferLength = 128> +class CW2CWEX +{ +public: + LPCWSTR m_psz; + + CW2CWEX(_In_z_ LPCWSTR psz) : m_psz(psz) { } + + CW2CWEX(_In_z_ LPCWSTR psz, _In_ UINT nCodePage) : m_psz(psz) + { + UNREFERENCED_PARAMETER(nCodePage); + } + + ~CW2CWEX() throw() { } // There is nothing to free here + + _Ret_z_ operator LPCWSTR() const throw() { return m_psz; } + +private: + // CW2CWEX is not copyable + CW2CWEX(_In_ const CW2CWEX&) throw() = delete; + CW2CWEX& operator=(_In_ const CW2CWEX&) throw() = delete; +}; + +template <int t_nBufferLength = 128> +class CA2AEX +{ +public: + LPSTR m_psz; + char m_szBuffer[t_nBufferLength]; + + CA2AEX(_In_z_ LPCSTR psz) + { + Init(psz); + } + + CA2AEX(_In_z_ LPCSTR psz, _In_ UINT nCodePage) + { + UNREFERENCED_PARAMETER(nCodePage); + Init(psz); + } + + ~CA2AEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPSTR() const throw() + { + return m_psz; + } + +private: + // CA2AEX is not copyable + CA2AEX(_In_ const CA2AEX &) throw() = delete; + CA2AEX& operator=(_In_ const CA2AEX &) throw() = delete; + + void Init(_In_z_ LPCSTR psz) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + int cchMax = lstrlenA(psz) + 1; + if (cchMax <= t_nBufferLength) + { +#ifdef _STRSAFE_H_INCLUDED_ + StringCchCopyA(m_szBuffer, _countof(m_szBuffer), psz); +#else + lstrcpynA(m_szBuffer, psz, _countof(m_szBuffer)); +#endif + m_psz = m_szBuffer; + return; + } + + m_szBuffer[0] = 0; + m_psz = _strdup(psz); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } +}; + +template <int t_nBufferLength = 128> +class CW2WEX +{ +public: + LPWSTR m_psz; + wchar_t m_szBuffer[t_nBufferLength]; + + CW2WEX(_In_z_ LPCWSTR psz) + { + Init(psz); + } + + CW2WEX(_In_z_ LPCWSTR psz, _In_ UINT nCodePage) + { + UNREFERENCED_PARAMETER(nCodePage); + Init(psz); + } + + ~CW2WEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPWSTR() const throw() + { + return m_psz; + } + +private: + // CW2WEX is not copyable + CW2WEX(_In_ const CW2WEX&) throw() = delete; + CW2WEX& operator=(_In_ const CW2WEX&) throw() = delete; + + void Init(_In_z_ LPCWSTR psz) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + int cchMax = lstrlenW(psz); + if (cchMax <= t_nBufferLength) + { +#ifdef _STRSAFE_H_INCLUDED_ + StringCchCopyW(m_szBuffer, _countof(m_szBuffer), psz); +#else + lstrcpynW(m_szBuffer, psz, _countof(m_szBuffer)); +#endif + m_psz = m_szBuffer; + return; + } + + m_szBuffer[0] = 0; + m_psz = _wcsdup(psz); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } +}; + +template <int t_nBufferLength = 128> +class CA2WEX +{ +public: + LPWSTR m_psz; + wchar_t m_szBuffer[t_nBufferLength]; + + CA2WEX(_In_z_ LPCSTR psz) + { + Init(psz, CP_ACP); + } + + CA2WEX(_In_z_ LPCSTR psz, _In_ UINT nCodePage) + { + Init(psz, nCodePage); + } + + ~CA2WEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPWSTR() const throw() + { + return m_psz; + } + +private: + // CA2WEX is not copyable + CA2WEX(_In_ const CA2WEX&) throw() = delete; + CA2WEX& operator=(_In_ const CA2WEX&) throw() = delete; + + void Init(_In_z_ LPCSTR psz, _In_ UINT nCodePage) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + +#if 1 + int cchMax = lstrlenA(psz) + 1; // This is 3 times faster +#else + int cchMax = MultiByteToWideChar(nCodePage, 0, psz, -1, NULL, 0); // It's slow +#endif + if (cchMax <= (int)_countof(m_szBuffer)) + { + // Use the static buffer + m_psz = m_szBuffer; + cchMax = _countof(m_szBuffer); + } + else + { + // Allocate a new buffer + m_szBuffer[0] = 0; + m_psz = (LPWSTR)malloc(cchMax * sizeof(WCHAR)); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } + + MultiByteToWideChar(nCodePage, 0, psz, -1, m_psz, cchMax); + m_psz[cchMax - 1] = 0; + } +}; + +template <int t_nBufferLength = 128> +class CW2AEX +{ +public: + LPSTR m_psz; + char m_szBuffer[t_nBufferLength]; + + CW2AEX(_In_z_ LPCWSTR psz) + { + Init(psz, CP_ACP); + } + + CW2AEX(_In_z_ LPCWSTR psz, _In_ UINT nCodePage) + { + Init(psz, nCodePage); + } + + ~CW2AEX() throw() + { + if (m_psz != m_szBuffer) + free(m_psz); + } + + _Ret_z_ operator LPSTR() const throw() + { + return m_psz; + } + +private: + // CW2AEX is not copyable + CW2AEX(_In_ const CW2AEX&) throw() = delete; + CW2AEX& operator=(_In_ const CW2AEX&) throw() = delete; + + void Init(_In_z_ LPCWSTR psz, _In_ UINT nConvertCodePage) + { + if (!psz) + { + m_psz = NULL; + m_szBuffer[0] = 0; + return; + } + + // NOTE: This has a failure. + int cchMax = WideCharToMultiByte(nConvertCodePage, 0, psz, -1, NULL, 0, NULL, NULL); + if (cchMax <= (int)_countof(m_szBuffer)) + { + // Use the static buffer + m_psz = m_szBuffer; + cchMax = _countof(m_szBuffer); + } + else + { + // Allocate a new buffer + m_szBuffer[0] = 0; + m_psz = (LPSTR)malloc(cchMax * sizeof(CHAR)); + if (!m_psz) + AtlThrow(E_OUTOFMEMORY); + } + + WideCharToMultiByte(nConvertCodePage, 0, psz, -1, m_psz, cchMax, NULL, NULL); + m_psz[cchMax - 1] = 0; + } +}; + +typedef CA2AEX<> CA2A; +typedef CW2AEX<> CW2A; +typedef CA2WEX<> CA2W; +typedef CW2WEX<> CW2W; +typedef CA2CAEX<> CA2CA; +typedef CW2CWEX<> CW2CW; + +#ifdef UNICODE + #define CA2CTEX CA2WEX + #define CA2TEX CA2WEX + #define CT2AEX CW2AEX + #define CT2CAEX CW2AEX + #define CT2CWEX CW2CWEX + #define CT2WEX CW2WEX + #define CW2CTEX CW2CWEX + #define CW2CTEX CW2CWEX +#else + #define CA2CTEX CA2CAEX + #define CA2TEX CA2AEX + #define CT2AEX CA2AEX + #define CT2CAEX CA2CAEX + #define CT2CWEX CA2WEX + #define CT2WEX CA2WEX + #define CW2CTEX CW2AEX + #define CW2TEX CW2AEX +#endif + +} // namespace ATL + +#endif // ndef __ATLCONV_H__

1 year, 5 months

[reactos] 01/01: [SHELL32] Revert 'Update the status bar asynchronously #5420' (#5458)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d24c991aa7f980ef4dda2… commit d24c991aa7f980ef4dda2d50a54b96ffb356497f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jul 20 01:29:24 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jul 20 01:29:24 2023 +0900 [SHELL32] Revert 'Update the status bar asynchronously #5420' (#5458) CORE-18663 --- dll/win32/shell32/CDefView.cpp | 71 +++++++++--------------------------------- 1 file changed, 14 insertions(+), 57 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 73d0f657f7c..ebcfa767090 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -36,7 +36,6 @@ TODO: #include "precomp.h" -#include <process.h> #include <atlwin.h> #include <ui/rosctrls.h> @@ -154,7 +153,6 @@ class CDefView : SFVM_CUSTOMVIEWINFO_DATA m_viewinfo_data; HICON m_hMyComputerIcon; - HANDLE m_hUpdateStatusbarThread; private: HRESULT _MergeToolbar(); @@ -173,8 +171,6 @@ class CDefView : HRESULT IncludeObject(PCUITEMID_CHILD pidl); HRESULT OnDefaultCommand(); HRESULT OnStateChange(UINT uFlags); - static unsigned __stdcall _UpdateStatusbarProc(void *args); - void UpdateStatusbarWorker(HANDLE hThread); void UpdateStatusbar(); void CheckToolbar(); BOOL CreateList(); @@ -432,9 +428,7 @@ CDefView::CDefView() : m_cScrollDelay(0), m_isEditing(FALSE), m_isParentFolderSpecial(FALSE), - m_Destroyed(FALSE), - m_hMyComputerIcon(::LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_COMPUTER_DESKTOP))), - m_hUpdateStatusbarThread(NULL) + m_Destroyed(FALSE) { ZeroMemory(&m_FolderSettings, sizeof(m_FolderSettings)); ZeroMemory(&m_sortInfo, sizeof(m_sortInfo)); @@ -443,6 +437,8 @@ CDefView::CDefView() : m_viewinfo_data.clrText = GetSysColor(COLOR_WINDOWTEXT); m_viewinfo_data.clrTextBack = GetSysColor(COLOR_WINDOW); m_viewinfo_data.hbmBack = NULL; + + m_hMyComputerIcon = LoadIconW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_COMPUTER_DESKTOP)); } CDefView::~CDefView() @@ -543,9 +539,10 @@ void CDefView::CheckToolbar() } } -void CDefView::UpdateStatusbarWorker(HANDLE hThread) +void CDefView::UpdateStatusbar() { - WCHAR szFormat[MAX_PATH], szPartText[MAX_PATH]; + WCHAR szFormat[MAX_PATH] = {0}; + WCHAR szPartText[MAX_PATH] = {0}; UINT cSelectedItems; cSelectedItems = m_ListView.GetSelectedCount(); @@ -574,13 +571,12 @@ void CDefView::UpdateStatusbarWorker(HANDLE hThread) /* If we have something selected then only count selected file sizes. */ if (cSelectedItems) + { uFileFlags = LVNI_SELECTED; + } while ((nItem = m_ListView.GetNextItem(nItem, uFileFlags)) >= 0) { - if (hThread != m_hUpdateStatusbarThread) - return; - PCUITEMID_CHILD pidl = _PidlByItem(nItem); uTotalFileSize += _ILGetFileSize(pidl, NULL, 0); @@ -593,14 +589,18 @@ void CDefView::UpdateStatusbarWorker(HANDLE hThread) /* Don't show the file size text if there is 0 bytes in the folder * OR we only have folders selected. */ - szPartText[0] = UNICODE_NULL; if ((cSelectedItems && !bIsOnlyFoldersSelected) || uTotalFileSize) + { StrFormatByteSizeW(uTotalFileSize, szPartText, _countof(szPartText)); + } + else + { + *szPartText = 0; + } m_pShellBrowser->SendControlMsg(FCW_STATUS, SB_SETTEXT, 1, (LPARAM)szPartText, &lResult); /* If we are in a Recycle Bin folder then show no text for the location part. */ - szPartText[0] = UNICODE_NULL; if (!_ILIsBitBucket(m_pidlParent)) { LoadStringW(shell32_hInstance, IDS_MYCOMPUTER, szPartText, _countof(szPartText)); @@ -612,38 +612,6 @@ void CDefView::UpdateStatusbarWorker(HANDLE hThread) } } -unsigned __stdcall CDefView::_UpdateStatusbarProc(void *args) -{ - CDefView* pView = static_cast<CDefView*>(args); - pView->UpdateStatusbarWorker(pView->m_hUpdateStatusbarThread); - pView->Release(); - return 0; -} - -void CDefView::UpdateStatusbar() -{ - HANDLE hOldThread = m_hUpdateStatusbarThread; - - AddRef(); - - // We have to initialize m_hUpdateStatusbarThread before the target thread begins. - // So, we use CREATE_SUSPENDED. - HANDLE hNewThread = reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0, _UpdateStatusbarProc, - this, CREATE_SUSPENDED, NULL)); - if (hNewThread) - { - m_hUpdateStatusbarThread = hNewThread; - ::ResumeThread(hNewThread); - - if (hOldThread) - ::CloseHandle(hOldThread); - } - else - { - Release(); - } -} - /********************************************************** * * ##### helperfunctions for initializing the view ##### @@ -2614,17 +2582,6 @@ HRESULT WINAPI CDefView::DestroyViewWindow() { TRACE("(%p)\n", this); - if (m_hUpdateStatusbarThread) - { - HANDLE hOldThread = m_hUpdateStatusbarThread; - - // Assigning NULL to m_hUpdateStatusbarThread will terminate the target thread - m_hUpdateStatusbarThread = NULL; - ::WaitForSingleObject(hOldThread, INFINITE); - - ::CloseHandle(hOldThread); - } - /* Make absolutely sure all our UI is cleaned up */ UIActivate(SVUIA_DEACTIVATE);

1 year, 5 months

[reactos] 01/01: [ZIPFLDR] Support UTF-8 Zip extraction (#5411)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf2cec186cc7655e062ec… commit bf2cec186cc7655e062ec0e53ccfac860bcae70d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 17 20:12:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 17 20:12:45 2023 +0900 [ZIPFLDR] Support UTF-8 Zip extraction (#5411) - Extend some Ansi strings to Wide strings. - Check the UTF-8 flag (1 << 11). If UTF-8, then use CP_UTF8. - s/LPCWSTR/PCWSTR/. - s/LPWSTR/PWSTR/. CORE-16668 --- dll/shellext/zipfldr/CConfirmReplace.cpp | 15 ++++---- dll/shellext/zipfldr/CEnumZipContents.cpp | 11 +++--- dll/shellext/zipfldr/CExplorerCommand.cpp | 6 +-- dll/shellext/zipfldr/CZipCreator.cpp | 20 +++++----- dll/shellext/zipfldr/CZipCreator.hpp | 2 +- dll/shellext/zipfldr/CZipEnumerator.hpp | 29 ++++++++------ dll/shellext/zipfldr/CZipExtract.cpp | 63 +++++++++++++++++-------------- dll/shellext/zipfldr/CZipFolder.hpp | 33 +++++++--------- dll/shellext/zipfldr/CZipPassword.cpp | 17 +++++---- dll/shellext/zipfldr/precomp.h | 9 +++-- dll/shellext/zipfldr/zipfldr.cpp | 16 ++++++-- dll/shellext/zipfldr/zippidl.cpp | 15 +++++--- dll/shellext/zipfldr/zippidl.hpp | 10 ++--- 13 files changed, 134 insertions(+), 112 deletions(-) diff --git a/dll/shellext/zipfldr/CConfirmReplace.cpp b/dll/shellext/zipfldr/CConfirmReplace.cpp index 8ee027a52ec..cdbf9be5ece 100644 --- a/dll/shellext/zipfldr/CConfirmReplace.cpp +++ b/dll/shellext/zipfldr/CConfirmReplace.cpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Ask the user to replace a file * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -10,10 +11,9 @@ class CConfirmReplace : public CDialogImpl<CConfirmReplace> { private: - CStringA m_Filename; + CStringW m_Filename; public: - - CConfirmReplace(const char* filename) + CConfirmReplace(PCWSTR filename) : m_Filename(filename) { } @@ -25,9 +25,9 @@ public: HICON hIcon = LoadIcon(NULL, IDI_EXCLAMATION); SendDlgItemMessage(IDC_EXCLAMATION_ICON, STM_SETICON, (WPARAM)hIcon); - CStringA message; + CStringW message; message.FormatMessage(IDS_OVERWRITEFILE_TEXT, m_Filename.GetString()); - ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message); + ::SetDlgItemTextW(m_hWnd, IDC_MESSAGE, message); return TRUE; } @@ -50,10 +50,9 @@ public: END_MSG_MAP() }; - -eZipConfirmResponse _CZipAskReplace(HWND hDlg, PCSTR FullPath) +eZipConfirmResponse _CZipAskReplace(HWND hDlg, PCWSTR FullPath) { - PCSTR Filename = PathFindFileNameA(FullPath); + PCWSTR Filename = PathFindFileNameW(FullPath); CConfirmReplace confirm(Filename); INT_PTR Result = confirm.DoModal(hDlg); switch (Result) diff --git a/dll/shellext/zipfldr/CEnumZipContents.cpp b/dll/shellext/zipfldr/CEnumZipContents.cpp index 0899468f9d7..372e21ba772 100644 --- a/dll/shellext/zipfldr/CEnumZipContents.cpp +++ b/dll/shellext/zipfldr/CEnumZipContents.cpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: CEnumZipContents * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -14,14 +15,14 @@ class CEnumZipContents : private: CZipEnumerator mEnumerator; DWORD dwFlags; - CStringA m_Prefix; + CStringW m_Prefix; public: CEnumZipContents() :dwFlags(0) { } - STDMETHODIMP Initialize(IZip* zip, DWORD flags, const char* prefix) + STDMETHODIMP Initialize(IZip* zip, DWORD flags, PCWSTR prefix) { dwFlags = flags; m_Prefix = prefix; @@ -41,7 +42,7 @@ public: if (celt != 1) return E_FAIL; - CStringA name; + CStringW name; bool dir; unz_file_info64 info; if (mEnumerator.next_unique(m_Prefix, name, dir, info)) @@ -55,7 +56,7 @@ public: } STDMETHODIMP Skip(ULONG celt) { - CStringA name; + CStringW name; bool dir; unz_file_info64 info; while (celt--) @@ -88,7 +89,7 @@ public: }; -HRESULT _CEnumZipContents_CreateInstance(IZip* zip, DWORD flags, const char* prefix, REFIID riid, LPVOID * ppvOut) +HRESULT _CEnumZipContents_CreateInstance(IZip* zip, DWORD flags, PCWSTR prefix, REFIID riid, LPVOID * ppvOut) { return ShellObjectCreatorInit<CEnumZipContents>(zip, flags, prefix, riid, ppvOut); } diff --git a/dll/shellext/zipfldr/CExplorerCommand.cpp b/dll/shellext/zipfldr/CExplorerCommand.cpp index 1e634f81c81..8f007509d86 100644 --- a/dll/shellext/zipfldr/CExplorerCommand.cpp +++ b/dll/shellext/zipfldr/CExplorerCommand.cpp @@ -23,17 +23,17 @@ public: } // *** IExplorerCommand methods *** - STDMETHODIMP GetTitle(IShellItemArray *psiItemArray, LPWSTR *ppszName) + STDMETHODIMP GetTitle(IShellItemArray *psiItemArray, PWSTR *ppszName) { CStringW Title(MAKEINTRESOURCEW(IDS_MENUITEM)); return SHStrDup(Title, ppszName); } - STDMETHODIMP GetIcon(IShellItemArray *psiItemArray, LPWSTR *ppszIcon) + STDMETHODIMP GetIcon(IShellItemArray *psiItemArray, PWSTR *ppszIcon) { CStringW IconName = L"zipfldr.dll,-1"; return SHStrDup(IconName, ppszIcon); } - STDMETHODIMP GetToolTip(IShellItemArray *psiItemArray, LPWSTR *ppszInfotip) + STDMETHODIMP GetToolTip(IShellItemArray *psiItemArray, PWSTR *ppszInfotip) { CStringW HelpText(MAKEINTRESOURCEW(IDS_HELPTEXT)); return SHStrDup(HelpText, ppszInfotip); diff --git a/dll/shellext/zipfldr/CZipCreator.cpp b/dll/shellext/zipfldr/CZipCreator.cpp index 62b6a3929e7..00f44932b42 100644 --- a/dll/shellext/zipfldr/CZipCreator.cpp +++ b/dll/shellext/zipfldr/CZipCreator.cpp @@ -12,7 +12,7 @@ #include "minizip/iowin32.h" #include <process.h> -static CStringW DoGetZipName(LPCWSTR filename) +static CStringW DoGetZipName(PCWSTR filename) { WCHAR szPath[MAX_PATH]; StringCbCopyW(szPath, sizeof(szPath), filename); @@ -34,14 +34,14 @@ static CStringW DoGetZipName(LPCWSTR filename) return ret; } -static CStringA DoGetAnsiName(LPCWSTR filename) +static CStringA DoGetAnsiName(PCWSTR filename) { CHAR buf[MAX_PATH]; WideCharToMultiByte(CP_ACP, 0, filename, -1, buf, _countof(buf), NULL, NULL); return buf; } -static CStringW DoGetBaseName(LPCWSTR filename) +static CStringW DoGetBaseName(PCWSTR filename) { WCHAR szBaseName[MAX_PATH]; StringCbCopyW(szBaseName, sizeof(szBaseName), filename); @@ -69,7 +69,7 @@ DoGetNameInZip(const CStringW& basename, const CStringW& filename) } static BOOL -DoReadAllOfFile(LPCWSTR filename, CSimpleArray<BYTE>& contents, +DoReadAllOfFile(PCWSTR filename, CSimpleArray<BYTE>& contents, zip_fileinfo *pzi) { contents.RemoveAll(); @@ -124,7 +124,7 @@ DoReadAllOfFile(LPCWSTR filename, CSimpleArray<BYTE>& contents, } static void -DoAddFilesFromItem(CSimpleArray<CStringW>& files, LPCWSTR item) +DoAddFilesFromItem(CSimpleArray<CStringW>& files, PCWSTR item) { if (!PathIsDirectoryW(item)) { @@ -208,7 +208,7 @@ BOOL CZipCreator::runThread(CZipCreator *pCreator) return FALSE; } -void CZipCreator::DoAddItem(LPCWSTR pszFile) +void CZipCreator::DoAddItem(PCWSTR pszFile) { // canonicalize path WCHAR szPath[MAX_PATH]; @@ -247,7 +247,7 @@ unsigned CZipCreatorImpl::JustDoIt() CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); CStringW strText; - strText.Format(IDS_NOFILES, static_cast<LPCWSTR>(m_items[0])); + strText.Format(IDS_NOFILES, static_cast<PCWSTR>(m_items[0])); MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); return CZCERR_NOFILES; @@ -266,7 +266,7 @@ unsigned CZipCreatorImpl::JustDoIt() CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); CStringW strText; - strText.Format(IDS_CANTCREATEZIP, static_cast<LPCWSTR>(strZipName), err); + strText.Format(IDS_CANTCREATEZIP, static_cast<PCWSTR>(strZipName), err); MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); return err; @@ -347,9 +347,9 @@ unsigned CZipCreatorImpl::JustDoIt() CStringW strText; if (err < 0) - strText.Format(IDS_CANTCREATEZIP, static_cast<LPCWSTR>(strZipName), err); + strText.Format(IDS_CANTCREATEZIP, static_cast<PCWSTR>(strZipName), err); else - strText.Format(IDS_CANTREADFILE, static_cast<LPCWSTR>(strTarget)); + strText.Format(IDS_CANTREADFILE, static_cast<PCWSTR>(strTarget)); MessageBoxW(NULL, strText, strTitle, MB_ICONERROR); } diff --git a/dll/shellext/zipfldr/CZipCreator.hpp b/dll/shellext/zipfldr/CZipCreator.hpp index 1a77451ea8f..8e5ffa8e093 100644 --- a/dll/shellext/zipfldr/CZipCreator.hpp +++ b/dll/shellext/zipfldr/CZipCreator.hpp @@ -22,7 +22,7 @@ public: return new CZipCreator(); } - virtual void DoAddItem(LPCWSTR pszFile); + virtual void DoAddItem(PCWSTR pszFile); static BOOL runThread(CZipCreator* pCreator); protected: diff --git a/dll/shellext/zipfldr/CZipEnumerator.hpp b/dll/shellext/zipfldr/CZipEnumerator.hpp index 9948413d908..3e7037c1e5d 100644 --- a/dll/shellext/zipfldr/CZipEnumerator.hpp +++ b/dll/shellext/zipfldr/CZipEnumerator.hpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: CZipEnumerator * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ struct CZipEnumerator @@ -10,7 +11,7 @@ struct CZipEnumerator private: CComPtr<IZip> m_Zip; bool m_First; - CAtlList<CStringA> m_Returned; + CAtlList<CStringW> m_Returned; public: CZipEnumerator() :m_First(true) @@ -33,15 +34,15 @@ public: return true; } - bool next_unique(const char* prefix, CStringA& name, bool& folder, unz_file_info64& info) + bool next_unique(PCWSTR prefix, CStringW& name, bool& folder, unz_file_info64& info) { - size_t len = strlen(prefix); - CStringA tmp; + size_t len = wcslen(prefix); + CStringW tmp; while (next(tmp, info)) { - if (!_strnicmp(tmp, prefix, len)) + if (!_wcsnicmp(tmp, prefix, len)) { - int pos = tmp.Find('/', len); + int pos = tmp.Find(L'/', len); if (pos < 0) { name = tmp.Mid(len); @@ -66,7 +67,7 @@ public: return false; } - bool next(CStringA& name, unz_file_info64& info) + bool next(CStringW& name, unz_file_info64& info) { int err; @@ -84,10 +85,16 @@ public: err = unzGetCurrentFileInfo64(uf, &info, NULL, 0, NULL, 0, NULL, 0); if (err == UNZ_OK) { - PSTR buf = name.GetBuffer(info.size_filename); - err = unzGetCurrentFileInfo64(uf, NULL, buf, name.GetAllocLength(), NULL, 0, NULL, 0); - name.ReleaseBuffer(info.size_filename); - name.Replace('\\', '/'); + CStringA nameA; + PSTR buf = nameA.GetBuffer(info.size_filename); + err = unzGetCurrentFileInfo64(uf, NULL, buf, nameA.GetAllocLength(), NULL, 0, NULL, 0); + nameA.ReleaseBuffer(info.size_filename); + nameA.Replace('\\', '/'); + + if (info.flag & MINIZIP_UTF8_FLAG) + Utf8ToWide(nameA, name); + else + name = CStringW(nameA); } return err == UNZ_OK; } diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 20a8087a029..2e58d7564f6 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -3,9 +3,11 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Zip extraction * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" +#include <atlpath.h> class CZipExtract : public IZip @@ -204,7 +206,7 @@ public: struct browse_info { HWND hWnd; - LPCWSTR Directory; + PCWSTR Directory; }; static INT CALLBACK s_BrowseCallbackProc(HWND hWnd, UINT uMsg, LPARAM lp, LPARAM pData) @@ -370,10 +372,10 @@ public: eZipExtractError ExtractSingle( HWND hDlg, - LPCSTR FullPath, + PCWSTR FullPath, bool is_dir, unz_file_info64* Info, - CStringA Name, + CStringW Name, CStringA Password, bool* bOverwriteAll, const bool* bCancel, @@ -383,7 +385,7 @@ public: int err; BYTE Buffer[2048]; DWORD dwFlags = SHPPFW_DIRCREATE | (is_dir ? SHPPFW_NONE : SHPPFW_IGNOREFILENAME); - HRESULT hr = SHPathPrepareForWriteA(hDlg, NULL, FullPath, dwFlags); + HRESULT hr = SHPathPrepareForWriteW(hDlg, NULL, FullPath, dwFlags); if (FAILED_UNEXPECTEDLY(hr)) { *ErrorCode = hr; @@ -439,7 +441,7 @@ public: return eOpenError; } - HANDLE hFile = CreateFileA(FullPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE hFile = CreateFileW(FullPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { DWORD dwErr = GetLastError(); @@ -467,7 +469,7 @@ public: if (bOverwrite) { - hFile = CreateFileA(FullPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(FullPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { dwErr = GetLastError(); @@ -482,7 +484,7 @@ public: if (hFile == INVALID_HANDLE_VALUE) { unzCloseCurrentFile(uf); - DPRINT1("ERROR, CreateFileA: 0x%x (%s)\n", dwErr, *bOverwriteAll ? "Y" : "N"); + DPRINT1("ERROR, CreateFile: 0x%x (%s)\n", dwErr, *bOverwriteAll ? "Y" : "N"); *ErrorCode = dwErr; return eFileError; } @@ -493,9 +495,9 @@ public: if (*bCancel) { CloseHandle(hFile); - BOOL deleteResult = DeleteFileA(FullPath); + BOOL deleteResult = DeleteFileW(FullPath); if (!deleteResult) - DPRINT1("ERROR, DeleteFileA: 0x%x\n", GetLastError()); + DPRINT1("ERROR, DeleteFile: 0x%x\n", GetLastError()); return eExtractAbort; } @@ -575,8 +577,8 @@ public: Progress.SendMessage(PBM_SETRANGE32, 0, gi.number_entry); Progress.SendMessage(PBM_SETPOS, 0, 0); - CStringA BaseDirectory = m_Directory; - CStringA Name; + CStringW BaseDirectory = m_Directory; + CStringW Name; CStringA Password = m_Password; unz_file_info64 Info; int CurrentFile = 0; @@ -591,10 +593,15 @@ public: bool is_dir = Name.GetLength() > 0 && Name[Name.GetLength()-1] == '/'; - char CombinedPath[MAX_PATH * 2] = { 0 }; - PathCombineA(CombinedPath, BaseDirectory, Name); - CStringA FullPath = CombinedPath; - FullPath.Replace('/', '\\'); /* SHPathPrepareForWriteA does not handle '/' */ + // Build a combined path + CPathW FullPath(BaseDirectory); + FullPath += Name; + + // We use SHPathPrepareForWrite for this path. + // SHPathPrepareForWrite will prepare the necessary directories. + // Windows and ReactOS SHPathPrepareForWrite do not support '/'. + FullPath.m_strPath.Replace(L'/', L'\\'); + Retry: eZipExtractError Result = ExtractSingle(hDlg, FullPath, is_dir, &Info, Name, Password, &bOverwriteAll, bCancel, &err); if (Result != eDirectoryError) @@ -613,13 +620,13 @@ public: case eDirectoryError: { - char StrippedPath[MAX_PATH] = { 0 }; + WCHAR StrippedPath[MAX_PATH] = { 0 }; - StrCpyNA(StrippedPath, FullPath, _countof(StrippedPath)); + StrCpyNW(StrippedPath, FullPath, _countof(StrippedPath)); if (!is_dir) - PathRemoveFileSpecA(StrippedPath); - PathStripPathA(StrippedPath); - if (ShowExtractError(hDlg, (LPCSTR)&StrippedPath, err, eDirectoryError) == IDRETRY) + PathRemoveFileSpecW(StrippedPath); + PathStripPathW(StrippedPath); + if (ShowExtractError(hDlg, StrippedPath, err, eDirectoryError) == IDRETRY) goto Retry; Close(); return false; @@ -665,11 +672,11 @@ public: return true; } - int ShowExtractError(HWND hDlg, LPCSTR path, int Error, eZipExtractError ErrorType) + int ShowExtractError(HWND hDlg, PCWSTR path, int Error, eZipExtractError ErrorType) { - CStringA strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); - CStringA strErr, strText; - PSTR Win32ErrorString; + CStringW strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); + CStringW strErr, strText; + PWSTR Win32ErrorString; if (ErrorType == eFileError || ErrorType == eOpenError) strText.LoadString(IDS_CANTEXTRACTFILE); @@ -680,9 +687,9 @@ public: if (ErrorType == eFileError || HRESULT_FACILITY(Error) == FACILITY_WIN32) { - if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorType == eFileError ? Error : HRESULT_CODE(Error), 0, - (PSTR)&Win32ErrorString, 0, NULL) != 0) + (PWSTR)&Win32ErrorString, 0, NULL) != 0) { strErr.SetString(Win32ErrorString); LocalFree(Win32ErrorString); @@ -693,7 +700,7 @@ public: else if (strErr.GetLength() == 0) strErr.Format(IDS_UNKNOWNERROR, Error); - strText.Append("\r\n\r\n" + strErr); + strText.Append(L"\r\n\r\n" + strErr); UINT mbFlags = MB_ICONWARNING; if (ErrorType == eDirectoryError) @@ -703,7 +710,7 @@ public: else if (ErrorType == eOpenError) mbFlags |= MB_YESNO; - return MessageBoxA(hDlg, strText, strTitle, mbFlags); + return MessageBoxW(hDlg, strText, strTitle, mbFlags); } }; diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp index 29644d95c2b..09a3f84ff69 100644 --- a/dll/shellext/zipfldr/CZipFolder.hpp +++ b/dll/shellext/zipfldr/CZipFolder.hpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Main class * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ struct FolderViewColumns @@ -37,7 +38,7 @@ class CZipFolder : public IZip { CStringW m_ZipFile; - CStringA m_ZipDir; + CStringW m_ZipDir; CComHeapPtr<ITEMIDLIST> m_CurDir; unzFile m_UnzipFile; @@ -99,7 +100,7 @@ public: return E_NOTIMPL; } // Adapted from CFileDefExt::GetFileTimeString - BOOL _GetFileTimeString(LPFILETIME lpFileTime, LPWSTR pwszResult, UINT cchResult) + BOOL _GetFileTimeString(LPFILETIME lpFileTime, PWSTR pwszResult, UINT cchResult) { SYSTEMTIME st; @@ -107,7 +108,7 @@ public: return FALSE; size_t cchRemaining = cchResult; - LPWSTR pwszEnd = pwszResult; + PWSTR pwszEnd = pwszResult; int cchWritten = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, pwszEnd, cchRemaining); if (cchWritten) --cchWritten; // GetDateFormatW returns count with terminating zero @@ -158,9 +159,9 @@ public: return GetDisplayNameOf(pidl, 0, &psd->str); case 1: /* Type */ { - SHFILEINFOA shfi; + SHFILEINFOW shfi; DWORD dwAttributes = isDir ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL; - ULONG_PTR firet = SHGetFileInfoA(zipEntry->Name, dwAttributes, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES | SHGFI_TYPENAME); + ULONG_PTR firet = SHGetFileInfoW(zipEntry->Name, dwAttributes, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES | SHGFI_TYPENAME); if (!firet) return E_FAIL; return SHSetStrRet(&psd->str, shfi.szTypeName); @@ -226,7 +227,7 @@ public: { if (riid == IID_IShellFolder) { - CStringA newZipDir = m_ZipDir; + CStringW newZipDir = m_ZipDir; PCUIDLIST_RELATIVE curpidl = pidl; while (curpidl->mkid.cb) { @@ -236,7 +237,7 @@ public: return E_FAIL; } newZipDir += zipEntry->Name; - newZipDir += '/'; + newZipDir += L'/'; curpidl = ILGetNext(curpidl); } @@ -262,7 +263,7 @@ public: if (zipEntry1->ZipType != zipEntry2->ZipType) result = zipEntry1->ZipType - zipEntry2->ZipType; else - result = stricmp(zipEntry1->Name, zipEntry2->Name); + result = _wcsicmp(zipEntry1->Name, zipEntry2->Name); if (!result && zipEntry1->ZipType == ZIP_PIDL_DIRECTORY) { @@ -392,14 +393,8 @@ public: const ZipPidlEntry* zipEntry = _ZipFromIL(*apidl); if (zipEntry) { - CComHeapPtr<WCHAR> pathW; - - int len = MultiByteToWideChar(CP_ACP, 0, zipEntry->Name, -1, NULL, 0); - pathW.Allocate(len); - MultiByteToWideChar(CP_ACP, 0, zipEntry->Name, -1, pathW, len); - DWORD dwAttributes = (zipEntry->ZipType == ZIP_PIDL_DIRECTORY) ? FILE_ATTRIBUTE_DIRECTORY : FILE_ATTRIBUTE_NORMAL; - return SHCreateFileExtractIconW(pathW, dwAttributes, riid, ppvOut); + return SHCreateFileExtractIconW(zipEntry->Name, dwAttributes, riid, ppvOut); } } else if (riid == IID_IContextMenu && cidl >= 0) @@ -444,7 +439,7 @@ public: if (!zipEntry) return E_FAIL; - return SHSetStrRet(strRet, (LPCSTR)zipEntry->Name); + return SHSetStrRet(strRet, zipEntry->Name); } STDMETHODIMP SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) { @@ -479,7 +474,7 @@ public: case GCS_VERBA: return StringCchCopyA(pszName, cchMax, EXTRACT_VERBA); case GCS_VERBW: - return StringCchCopyW((LPWSTR)pszName, cchMax, EXTRACT_VERBW); + return StringCchCopyW((PWSTR)pszName, cchMax, EXTRACT_VERBW); case GCS_HELPTEXTA: { CStringA helpText(MAKEINTRESOURCEA(IDS_HELPTEXT)); @@ -488,7 +483,7 @@ public: case GCS_HELPTEXTW: { CStringW helpText(MAKEINTRESOURCEA(IDS_HELPTEXT)); - return StringCchCopyW((LPWSTR)pszName, cchMax, helpText); + return StringCchCopyW((PWSTR)pszName, cchMax, helpText); } case GCS_VALIDATEA: case GCS_VALIDATEW: @@ -621,7 +616,7 @@ public: } - STDMETHODIMP Initialize(PCWSTR zipFile, PCSTR zipDir, PCUIDLIST_ABSOLUTE curDir, PCUIDLIST_RELATIVE pidl) + STDMETHODIMP Initialize(PCWSTR zipFile, PCWSTR zipDir, PCUIDLIST_ABSOLUTE curDir, PCUIDLIST_RELATIVE pidl) { m_ZipFile = zipFile; m_ZipDir = zipDir; diff --git a/dll/shellext/zipfldr/CZipPassword.cpp b/dll/shellext/zipfldr/CZipPassword.cpp index 0a1964a23d1..919c8c219fd 100644 --- a/dll/shellext/zipfldr/CZipPassword.cpp +++ b/dll/shellext/zipfldr/CZipPassword.cpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Ask the user for a password * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -10,10 +11,10 @@ class CZipPassword : public CDialogImpl<CZipPassword> { private: - CStringA m_Filename; + CStringW m_Filename; CStringA* m_pPassword; public: - CZipPassword(const char* filename, CStringA* Password) + CZipPassword(PCWSTR filename, CStringA* Password) :m_pPassword(Password) { if (filename != NULL) @@ -27,15 +28,15 @@ public: /* No filename, so this is the question before starting to extract */ if (m_Filename.IsEmpty()) { - CStringA message(MAKEINTRESOURCE(IDS_PASSWORD_ZIP_TEXT)); - ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message); + CStringW message(MAKEINTRESOURCEW(IDS_PASSWORD_ZIP_TEXT)); + ::SetDlgItemTextW(m_hWnd, IDC_MESSAGE, message); ::ShowWindow(GetDlgItem(IDSKIP), SW_HIDE); } else { - CStringA message; + CStringW message; message.FormatMessage(IDS_PASSWORD_FILE_TEXT, m_Filename.GetString()); - ::SetDlgItemTextA(m_hWnd, IDC_MESSAGE, message); + ::SetDlgItemTextW(m_hWnd, IDC_MESSAGE, message); } return TRUE; } @@ -64,10 +65,10 @@ public: END_MSG_MAP() }; -eZipPasswordResponse _CZipAskPassword(HWND hDlg, const char* filename, CStringA& Password) +eZipPasswordResponse _CZipAskPassword(HWND hDlg, PCWSTR filename, CStringA& Password) { if (filename) - filename = PathFindFileNameA(filename); + filename = PathFindFileNameW(filename); CZipPassword password(filename, &Password); INT_PTR Result = password.DoModal(hDlg); switch (Result) diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index b5845168073..7eaab9c3738 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -21,7 +21,7 @@ #include <reactos/debug.h> #include <shellutils.h> - +void Utf8ToWide(const CStringA& strUtf8, CStringW& strWide); #define EXTRACT_VERBA "extract" #define EXTRACT_VERBW L"extract" @@ -41,6 +41,7 @@ WCHAR* guid2string(REFCLSID iid); #define MINIZIP_PASSWORD_FLAG 1 +#define MINIZIP_UTF8_FLAG (1 << 11) #include "minizip/unzip.h" #include "minizip/ioapi.h" @@ -52,7 +53,7 @@ extern zlib_filefunc64_def g_FFunc; #include "zippidl.hpp" #include "IZip.hpp" -HRESULT _CEnumZipContents_CreateInstance(IZip* zip, DWORD flags, const char* prefix, REFIID riid, LPVOID * ppvOut); +HRESULT _CEnumZipContents_CreateInstance(IZip* zip, DWORD flags, PCWSTR prefix, REFIID riid, LPVOID * ppvOut); HRESULT _CExplorerCommandProvider_CreateInstance(IContextMenu* zipObject, REFIID riid, LPVOID * ppvOut); HRESULT _CFolderViewCB_CreateInstance(REFIID riid, LPVOID * ppvOut); void _CZipExtract_runWizard(PCWSTR Filename); @@ -64,7 +65,7 @@ enum eZipPasswordResponse eAccept, }; -eZipPasswordResponse _CZipAskPassword(HWND hDlg, const char* filename, CStringA& Password); +eZipPasswordResponse _CZipAskPassword(HWND hDlg, PCWSTR filename, CStringA& Password); enum eZipConfirmResponse { @@ -74,7 +75,7 @@ enum eZipConfirmResponse eCancel }; -eZipConfirmResponse _CZipAskReplace(HWND hDlg, const char* FullPath); +eZipConfirmResponse _CZipAskReplace(HWND hDlg, PCWSTR FullPath); enum eZipExtractError { diff --git a/dll/shellext/zipfldr/zipfldr.cpp b/dll/shellext/zipfldr/zipfldr.cpp index 5dee2d1cb24..07fcc3a01b5 100644 --- a/dll/shellext/zipfldr/zipfldr.cpp +++ b/dll/shellext/zipfldr/zipfldr.cpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: zipfldr entrypoint * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" @@ -47,8 +48,15 @@ static void init_zlib() fill_win32_filefunc64W(&g_FFunc); } +void Utf8ToWide(const CStringA& strUtf8, CStringW& strWide) +{ + INT cchWide = MultiByteToWideChar(CP_UTF8, 0, strUtf8, -1, NULL, 0); + MultiByteToWideChar(CP_UTF8, 0, strUtf8, -1, strWide.GetBuffer(cchWide), cchWide); + strWide.ReleaseBuffer(); +} + static BOOL -CreateEmptyFile(LPCWSTR pszFile) +CreateEmptyFile(PCWSTR pszFile) { HANDLE hFile; hFile = CreateFileW(pszFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, @@ -62,7 +70,7 @@ CreateEmptyFile(LPCWSTR pszFile) } static HRESULT -CreateSendToZip(LPCWSTR pszSendTo) +CreateSendToZip(PCWSTR pszSendTo) { WCHAR szTarget[MAX_PATH], szSendToFile[MAX_PATH]; @@ -80,7 +88,7 @@ CreateSendToZip(LPCWSTR pszSendTo) } static HRESULT -GetDefaultUserSendTo(LPWSTR pszPath) +GetDefaultUserSendTo(PWSTR pszPath) { return SHGetFolderPathW(NULL, CSIDL_SENDTO, INVALID_HANDLE_VALUE, SHGFP_TYPE_DEFAULT, pszPath); @@ -154,7 +162,7 @@ BOOL WINAPI RouteTheCall( IN HWND hWndOwner, IN HINSTANCE hInstance, - IN LPCSTR lpStringArg, + IN PCWSTR lpStringArg, IN INT Show) { CStringW path = lpStringArg; diff --git a/dll/shellext/zipfldr/zippidl.cpp b/dll/shellext/zipfldr/zippidl.cpp index 09f26cd6f21..3f3b2cbc862 100644 --- a/dll/shellext/zipfldr/zippidl.cpp +++ b/dll/shellext/zipfldr/zippidl.cpp @@ -3,20 +3,24 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: zip pidl handling * COPYRIGHT: Copyright 2017-2019 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" -LPITEMIDLIST _ILCreate(ZipPidlType Type, LPCSTR lpString, unz_file_info64& info) +LPITEMIDLIST _ILCreate(ZipPidlType Type, PCWSTR lpString, unz_file_info64& info) { - int cbData = sizeof(ZipPidlEntry) + strlen(lpString); + size_t cbData = sizeof(ZipPidlEntry) + wcslen(lpString) * sizeof(WCHAR); + if (cbData > MAXWORD) + return NULL; + ZipPidlEntry* pidl = (ZipPidlEntry*)SHAlloc(cbData + sizeof(WORD)); if (!pidl) return NULL; ZeroMemory(pidl, cbData + sizeof(WORD)); - pidl->cb = cbData; + pidl->cb = (WORD)cbData; pidl->MagicType = 'z'; pidl->ZipType = Type; @@ -28,13 +32,12 @@ LPITEMIDLIST _ILCreate(ZipPidlType Type, LPCSTR lpString, unz_file_info64& info) pidl->Password = info.flag & MINIZIP_PASSWORD_FLAG; } - strcpy(pidl->Name, lpString); - *(WORD*)((char*)pidl + cbData) = 0; + wcscpy(pidl->Name, lpString); + *(WORD*)((char*)pidl + cbData) = 0; // The end of an ITEMIDLIST return (LPITEMIDLIST)pidl; } - const ZipPidlEntry* _ZipFromIL(LPCITEMIDLIST pidl) { const ZipPidlEntry* zipPidl = (const ZipPidlEntry*)pidl; diff --git a/dll/shellext/zipfldr/zippidl.hpp b/dll/shellext/zipfldr/zippidl.hpp index 8c81158525f..dae339a7aea 100644 --- a/dll/shellext/zipfldr/zippidl.hpp +++ b/dll/shellext/zipfldr/zippidl.hpp @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: zip pidl handling * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2023 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ @@ -15,20 +16,19 @@ enum ZipPidlType #include <pshpack1.h> struct ZipPidlEntry { - WORD cb; + WORD cb; // This must be a WORD to keep compatibility to SHITEMID BYTE MagicType; + BOOLEAN Password; ZipPidlType ZipType; ULONG64 CompressedSize; ULONG64 UncompressedSize; ULONG DosDate; - BYTE Password; - char Name[1]; + WCHAR Name[1]; }; #include <poppack.h> -LPITEMIDLIST _ILCreate(ZipPidlType Type, LPCSTR lpString, unz_file_info64& info); +LPITEMIDLIST _ILCreate(ZipPidlType Type, PCWSTR lpString, unz_file_info64& info); const ZipPidlEntry* _ZipFromIL(LPCITEMIDLIST pidl); -

1 year, 5 months

[reactos] 01/01: [BROWSEUI] Respect status bar display state in Folders/Search panes (#5445)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfadb22da19bd50118ab4… commit bfadb22da19bd50118ab4671b80dadd575cc9525 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Sun Jul 16 16:14:33 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 17 01:14:33 2023 +0300 [BROWSEUI] Respect status bar display state in Folders/Search panes (#5445) - Use proper window styles when creating status bar window. - Specify WS_VISIBLE style only when status bar display is enabled. - Use ::CreateWindowExW() with a global namespace scope operator. - Fix some magic constants. CORE-19027 --- dll/win32/browseui/resource.h | 1 + dll/win32/browseui/shellbrowser.cpp | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index 9a80d85e045..9620a89eeb5 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -177,6 +177,7 @@ #define IDS_SEARCH_FOLDER 9234 #define IDS_SEARCH_RESULTS 30520 #define IDS_SEARCH_OPEN_FOLDER 40960 +#define IDC_STATUSBAR 40961 #define IDS_PARSE_ADDR_ERR_TITLE 9600 #define IDS_PARSE_ADDR_ERR_TEXT 9601 diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 3aec6c38272..71068d22ef4 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -788,9 +788,12 @@ HRESULT CShellBrowser::Initialize() // create status bar - fStatusBar = CreateWindow(STATUSCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - SBT_NOBORDERS | SBT_TOOLTIPS, 0, 0, 500, 20, m_hWnd, (HMENU)0xa001, - _AtlBaseModule.GetModuleInstance(), 0); + DWORD dwStatusStyle = WS_CHILD | WS_CLIPSIBLINGS | SBARS_SIZEGRIP | SBARS_TOOLTIPS; + if (fStatusBarVisible) + dwStatusStyle |= WS_VISIBLE; + fStatusBar = ::CreateWindowExW(0, STATUSCLASSNAMEW, NULL, dwStatusStyle, + 0, 0, 500, 20, m_hWnd, (HMENU)IDC_STATUSBAR, + _AtlBaseModule.GetModuleInstance(), 0); ShowWindow(SW_SHOWNORMAL); UpdateWindow(); @@ -1878,7 +1881,7 @@ bool IUnknownIsEqual(IUnknown *int1, IUnknown *int2) HRESULT STDMETHODCALLTYPE CShellBrowser::GetBorderDW(IUnknown *punkObj, LPRECT prcBorder) { - static const INT excludeItems[] = { 1, 1, 1, 0xa001, 0, 0 }; + static const INT excludeItems[] = { 1, 1, 1, IDC_STATUSBAR, 0, 0 }; RECT availableBounds; @@ -1985,7 +1988,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::QueryStatus(const GUID *pguidCmdGroup, { switch (prgCmds->cmdID) { - case 0xa022: // up level + case IDM_GOTO_UPONELEVEL: prgCmds->cmdf = OLECMDF_SUPPORTED; if (fCurrentDirectoryPIDL->mkid.cb != 0) prgCmds->cmdf |= OLECMDF_ENABLED; @@ -3473,7 +3476,7 @@ LRESULT CShellBrowser::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHa { CComPtr<IDockingWindow> dockingWindow; RECT availableBounds; - static const INT excludeItems[] = {1, 1, 1, 0xa001, 0, 0}; + static const INT excludeItems[] = {1, 1, 1, IDC_STATUSBAR, 0, 0}; HRESULT hResult; if (wParam != SIZE_MINIMIZED)

1 year, 5 months

[reactos] 01/01: [CMD][SDK][WINSRV] DIR command: Consider double-width characters (#5442)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=726c46d2dad91f7b2a012… commit 726c46d2dad91f7b2a0120597d3b2bb3f264a533 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 17 07:03:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 17 07:03:22 2023 +0900 [CMD][SDK][WINSRV] DIR command: Consider double-width characters (#5442) The "dir /w" command didn't look good due to unaligned columns. - Add sdk/include/reactos/cjkcode.h header file. - Add ConGetTextWidthA/W helper functions. - Add base/shell/cmd/wcwidth.c to implement ConGetTextWidthW. - Use ConGetTextWidth in DirPrintWideList function. - Adjust some STRING_DIR_HELP5, STRING_DIR_HELP6 and STRING_DIR_HELP8 resource strings to make the column aligned. CORE-17591 --- base/shell/cmd/console.c | 40 +++++ base/shell/cmd/console.h | 9 ++ base/shell/cmd/dir.c | 30 ++-- base/shell/cmd/lang/cs-CZ.rc | 6 +- base/shell/cmd/lang/de-DE.rc | 6 +- base/shell/cmd/lang/el-GR.rc | 6 +- base/shell/cmd/lang/en-US.rc | 6 +- base/shell/cmd/lang/es-ES.rc | 6 +- base/shell/cmd/lang/fr-FR.rc | 6 +- base/shell/cmd/lang/hu-HU.rc | 4 +- base/shell/cmd/lang/id-ID.rc | 6 +- base/shell/cmd/lang/it-IT.rc | 6 +- base/shell/cmd/lang/ja-JP.rc | 6 +- base/shell/cmd/lang/no-NO.rc | 6 +- base/shell/cmd/lang/pl-PL.rc | 6 +- base/shell/cmd/lang/pt-BR.rc | 2 +- base/shell/cmd/lang/pt-PT.rc | 2 +- base/shell/cmd/lang/ro-RO.rc | 6 +- base/shell/cmd/lang/ru-RU.rc | 6 +- base/shell/cmd/lang/sk-SK.rc | 6 +- base/shell/cmd/lang/sq-AL.rc | 6 +- base/shell/cmd/lang/sv-SE.rc | 6 +- base/shell/cmd/lang/tr-TR.rc | 6 +- base/shell/cmd/lang/uk-UA.rc | 6 +- base/shell/cmd/lang/zh-CN.rc | 6 +- base/shell/cmd/lang/zh-TW.rc | 6 +- base/shell/cmd/wcwidth.c | 313 ++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/cjkcode.h | 47 ++++++ win32ss/user/winsrv/concfg/font.h | 39 +---- 29 files changed, 493 insertions(+), 113 deletions(-) diff --git a/base/shell/cmd/console.c b/base/shell/cmd/console.c index 9d14d273011..a3d6b6c984d 100644 --- a/base/shell/cmd/console.c +++ b/base/shell/cmd/console.c @@ -329,4 +329,44 @@ BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill) } #endif +#include <cjkcode.h> +#include "wcwidth.c" + +// NOTE: The check against 0x80 is to avoid calling the helper function +// for characters that we already know are not full-width. +#define IS_FULL_WIDTH(wch) \ + (((USHORT)(wch) >= 0x0080) && (mk_wcwidth_cjk(wch) == 2)) + +SIZE_T ConGetTextWidthW(PCWSTR pszText) +{ + SIZE_T ich, cxWidth; + + if (!IsCJKCodePage(OutputCodePage)) + return _tcslen(pszText); + + for (ich = cxWidth = 0; pszText[ich]; ++ich) + { + if (IS_FULL_WIDTH(pszText[ich])) + cxWidth += 2; + else + ++cxWidth; + } + + return cxWidth; +} + +SIZE_T ConGetTextWidthA(PCSTR pszText) +{ + int cchMax; + PWSTR pszWide; + SIZE_T cxWidth; + + cchMax = MultiByteToWideChar(OutputCodePage, 0, pszText, -1, NULL, 0); + pszWide = cmd_alloc(cchMax * sizeof(WCHAR)); + MultiByteToWideChar(OutputCodePage, 0, pszText, -1, pszWide, cchMax); + cxWidth = ConGetTextWidthW(pszWide); + cmd_free(pszWide); + return cxWidth; +} + /* EOF */ diff --git a/base/shell/cmd/console.h b/base/shell/cmd/console.h index 445225690f7..9ea070dfe6c 100644 --- a/base/shell/cmd/console.h +++ b/base/shell/cmd/console.h @@ -96,3 +96,12 @@ BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill); // INT FilePromptYN (UINT); // INT FilePromptYNA (UINT); + +SIZE_T ConGetTextWidthA(PCSTR pszText); +SIZE_T ConGetTextWidthW(PCWSTR pszText); + +#ifdef UNICODE + #define ConGetTextWidth ConGetTextWidthW +#else + #define ConGetTextWidth ConGetTextWidthA +#endif diff --git a/base/shell/cmd/dir.c b/base/shell/cmd/dir.c index 5750dd236b8..1862d69edee 100644 --- a/base/shell/cmd/dir.c +++ b/base/shell/cmd/dir.c @@ -141,6 +141,7 @@ */ #include "precomp.h" +#include <cjkcode.h> #ifdef INCLUDE_CMD_DIR @@ -965,22 +966,20 @@ DirPrintWideList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ DWORD i; DWORD j; DWORD temp; + BOOL bCJK = IsCJKCodePage(OutputCodePage); + SIZE_T cxWidth; /* Calculate longest name */ iLongestName = 1; for (i = 0; i < dwCount; i++) { + cxWidth = ConGetTextWidth(ptrFiles[i]->stFindInfo.cFileName); + + /* Directories need 2 additional characters for brackets */ if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - /* Directories need 2 additional characters for brackets */ - if ((_tcslen(ptrFiles[i]->stFindInfo.cFileName) + 2) > iLongestName) - iLongestName = _tcslen(ptrFiles[i]->stFindInfo.cFileName) + 2; - } - else - { - if (_tcslen(ptrFiles[i]->stFindInfo.cFileName) > iLongestName) - iLongestName = _tcslen(ptrFiles[i]->stFindInfo.cFileName); - } + cxWidth += 2; + + iLongestName = max(iLongestName, cxWidth); } /* Count the highest number of columns */ @@ -1019,7 +1018,16 @@ DirPrintWideList(PDIRFINDINFO ptrFiles[], /* [IN] Files' Info */ else _stprintf(szTempFname, _T("%s"), ptrFiles[temp]->stFindInfo.cFileName); - DirPrintf(lpFlags, _T("%-*s"), iLongestName + 1, szTempFname); + if (bCJK) + { + cxWidth = ConGetTextWidth(szTempFname); + /* Print string and add space padding */ + DirPrintf(lpFlags, _T("%s%*s"), szTempFname, iLongestName + 1 - cxWidth, _T("")); + } + else + { + DirPrintf(lpFlags, _T("%-*s"), iLongestName + 1, szTempFname); + } } /* Add a new line after the last item in the column */ diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 4754bff4a95..25b7282795d 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -175,10 +175,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" STRING_DIR_HELP2 " Volume in drive %c is %s\n" STRING_DIR_HELP3 " Volume in drive %c has no label.\n" STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n" - STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" + STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s) %14s bytes\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" - STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n" + STRING_DIR_HELP8 "%16i File(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 7422018a5f2..ea323f28c7a 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -170,10 +170,10 @@ Optionen können in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\ STRING_DIR_HELP2 " Datenträger in Laufwerk %c ist %s\n" STRING_DIR_HELP3 " Datenträger in Laufwerk %c hat keine Bezeichnung\n" STRING_DIR_HELP4 " Volumeseriennummer: %04X-%04X\n" - STRING_DIR_HELP5 "\n Anzahl der angezeigten Dateien:\n%16i Datei(en)% 15s Bytes\n" - STRING_DIR_HELP6 "%16i Verzeichnis(se), % 15s Bytes frei\n" + STRING_DIR_HELP5 "\n Anzahl der angezeigten Dateien:\n%16i Datei(en) %14s Bytes\n" + STRING_DIR_HELP6 "%16i Verzeichnis(se), %14s Bytes frei\n" STRING_DIR_HELP7 "\n Verzeichnis von %s\n\n" - STRING_DIR_HELP8 "%16i Datei(en)% 14s Bytes\n" + STRING_DIR_HELP8 "%16i Datei(en) %14s Bytes\n" STRING_DIRSTACK_HELP1 "Speichert das aktuelle Verzeichnis für den POPD-Befehl und\n\ wechselt dann in das festgelegte Verzeichnis.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 3c81b6a4827..fc811d25dc6 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -174,10 +174,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" STRING_DIR_HELP2 " Volume in drive %c is %s\n" STRING_DIR_HELP3 " Volume in drive %c has no label.\n" STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n" - STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" + STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s) %14s bytes\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" - STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n" + STRING_DIR_HELP8 "%16i File(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 3751bdb54b0..070e997db8c 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -170,10 +170,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" STRING_DIR_HELP2 " Volume in drive %c is %s\n" STRING_DIR_HELP3 " Volume in drive %c has no label.\n" STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n" - STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" + STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s) %14s bytes\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" - STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n" + STRING_DIR_HELP8 "%16i File(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index 85e74e06520..3bae0a9794e 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -174,10 +174,10 @@ ajustes previos anteponiendo a cualquier modificador - (hyphen)--por ejemplo, /- STRING_DIR_HELP2 " El volumen en la unidad %c es %s\n" STRING_DIR_HELP3 " El volumen en la unidad %c no tiene etiqueta.\n" STRING_DIR_HELP4 " El volumen Serial Number is %04X-%04X\n" - STRING_DIR_HELP5 "\n Total de archivos mostrados:\n%16i archivo(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Directorio(s)% 15s bytes libres\n" + STRING_DIR_HELP5 "\n Total de archivos mostrados:\n%16i archivo(s) %14s bytes\n" + STRING_DIR_HELP6 "%16i Directorio(s) %14s bytes libres\n" STRING_DIR_HELP7 "\n Directorio %s\n\n" - STRING_DIR_HELP8 "%16i archivo(s)% 14s bytes\n" + STRING_DIR_HELP8 "%16i archivo(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Almacena el directorio actual para usarlo por el comando,\n\ entonces cambia al directorio especificado.\n\n\ PUSHD [ruta | ..]\n\n\ diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index 4401cb31f98..a87e276a888 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -183,10 +183,10 @@ Modifier les paramètres mémorisés avec un - (tiret)--par exemple, /-W.\n" STRING_DIR_HELP2 " Le nom de volume du lecteur %c est %s\n" STRING_DIR_HELP3 " Le lecteur %c n'a pas de nom de volume\n" STRING_DIR_HELP4 " Le numéro de série du volume est %04X-%04X\n" - STRING_DIR_HELP5 "\n Total de fichiers listés :\n%16i Fichier(s)% 14s octets\n" - STRING_DIR_HELP6 "%16i Rép(s)% 15s octets libres\n" + STRING_DIR_HELP5 "\n Total de fichiers listés :\n%16i Fichier(s) %14s octets\n" + STRING_DIR_HELP6 "%16i Rép(s) %14s octets libres\n" STRING_DIR_HELP7 "\n Répertoire de %s\n\n" - STRING_DIR_HELP8 "%16i Fichier(s)% 14s octets\n" + STRING_DIR_HELP8 "%16i Fichier(s) %14s octets\n" STRING_DIRSTACK_HELP1 "Stocke le répertoire courant pour utilisation avec la commande POPD,\n\ ensuite change de répertoire vers le répertoire spécifié.\n\n\ PUSHD [chemin | ..]\n\n\ diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index a6b32acd36f..9e62549b518 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -171,8 +171,8 @@ használja a kapcsolót a - (mínusz) jellel, pl. /-W.\n" STRING_DIR_HELP2 " A (%c) meghajtóban található kötet %s\n" STRING_DIR_HELP3 " A (%c) meghajtóban található kötetnek nincs címkéje.\n" STRING_DIR_HELP4 " A kötet sorozatszáma: %04X-%04X\n" - STRING_DIR_HELP5 "\n Összes listázott fájl:\n%16i Fájl% 14s bájt\n" - STRING_DIR_HELP6 "%16i Mappa %15s bájt szabad" + STRING_DIR_HELP5 "\n Összes listázott fájl:\n%16i Fájl %14s bájt\n" + STRING_DIR_HELP6 "%16i Mappa %14s bájt szabad" STRING_DIR_HELP7 "\n %s mappája\n\n" STRING_DIR_HELP8 "%16i Állomány %14s bájt\n" STRING_DIRSTACK_HELP1 "Megjegyzi az aktuális mappát a POPD parancsnak,\n\ diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index f5fa43576f3..7623e6208af 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -172,10 +172,10 @@ preset dengan mengawali setiap saklar dengan - (minus)--contohnya, /-W.\n" STRING_DIR_HELP2 " Volume di drive %c adalah %s\n" STRING_DIR_HELP3 " Volume di drive %c tidak berlabel.\n" STRING_DIR_HELP4 " Nomor Seri Volume adalah %04X-%04X\n" - STRING_DIR_HELP5 "\n Total File Didaftar:\n%16i File% 14s byte\n" - STRING_DIR_HELP6 "%16i Dir% 15s byte tersisa\n" + STRING_DIR_HELP5 "\n Total File Didaftar:\n%16i File %14s byte\n" + STRING_DIR_HELP6 "%16i Dir %14s byte tersisa\n" STRING_DIR_HELP7 "\n Direktori %s\n\n" - STRING_DIR_HELP8 "%16i File% 14s byte\n" + STRING_DIR_HELP8 "%16i File %14s byte\n" STRING_DIRSTACK_HELP1 "Menyimpan direktori sekarang untuk digunakan oleh perintah POPD, lalu\n\ mengubah ke direktori yang ditetapkan.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 6451daaea96..e39c246abe6 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -169,10 +169,10 @@ le selezioni preimpostate mettendo - (trattino) prima della selezione per esempi STRING_DIR_HELP2 " Il Volume nel disco %c è %s\n" STRING_DIR_HELP3 " Il Volume nel disco %c non ha etichetta.\n" STRING_DIR_HELP4 " Il numero di serie del Volume è %04X-%04X\n" - STRING_DIR_HELP5 "\n Numero dei file elencati:\n%16i % 14s byte\n" - STRING_DIR_HELP6 "%16i Cartelle% 15s byte liberi\n" + STRING_DIR_HELP5 "\n Numero dei file elencati:\n%16i File %14s byte\n" + STRING_DIR_HELP6 "%16i Cartelle %14s byte liberi\n" STRING_DIR_HELP7 "\n Cartelle di %s\n\n" - STRING_DIR_HELP8 "%16i File% 14s byte\n" + STRING_DIR_HELP8 "%16i File %14s byte\n" STRING_DIRSTACK_HELP1 "Salva la cartella corrente per l'uso con il comando POPD, poi\n\ passa alla cartella indicata.\n\n\ PUSHD [percorso | ..]\n\n\ diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index b74faf98385..aa32b46c436 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -177,10 +177,10 @@ DIR [ドライブ:][パス][ファイル名] [/A[[:]属性]] [/B] [/C] [/D] [/L] STRING_DIR_HELP2 " ドライブ %c のボリュームラベルは %s です\n" STRING_DIR_HELP3 " ドライブ %c にはボリュームラベルがありません。\n" STRING_DIR_HELP4 " ボリュームシリアル番号は %04X-%04X です\n" - STRING_DIR_HELP5 "\n ファイルの総数:\n%16i 個のファイル% 14s バイト\n" - STRING_DIR_HELP6 "%16i 個のディレクトリ% 15s バイト\n" + STRING_DIR_HELP5 "\n ファイルの総数:\n%16i 個のファイル %14s バイト\n" + STRING_DIR_HELP6 "%16i 個のディレクトリ %14s バイト\n" STRING_DIR_HELP7 "\n %s のディレクトリ\n\n" - STRING_DIR_HELP8 "%16i 個のファイル% 14s バイト\n" + STRING_DIR_HELP8 "%16i 個のファイル %14s バイト\n" STRING_DIRSTACK_HELP1 "POPD コマンドで使用するために現在のディレクトリを保存し、\n\ 指定したディレクトリに変更します。\n\n\ PUSHD [パス | ..]\n\n\ diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index d63aa0ebaca..9f7183151c1 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -170,10 +170,10 @@ forhåndsinnstilte brytere ved å sette en bindestrek (-) foran, for eksempel, / STRING_DIR_HELP2 " Volumet i stasjon %c er %s\n" STRING_DIR_HELP3 " Volumet i stasjon %c er uten navn.\n" STRING_DIR_HELP4 " Volumserienummeret er %04X-%04X\n" - STRING_DIR_HELP5 "\n Totalt filer listet:\n%16i fil(er)% 14s byte\n" - STRING_DIR_HELP6 "%16i mappe(r)% 15s byte ledig\n" + STRING_DIR_HELP5 "\n Totalt filer listet:\n%16i fil(er) %14s byte\n" + STRING_DIR_HELP6 "%16i mappe(r) %14s byte ledig\n" STRING_DIR_HELP7 "\n mappe av %s\n\n" - STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n" + STRING_DIR_HELP8 "%16i fil(er) %14s byte\n" STRING_DIRSTACK_HELP1 "Lagrer gjeldende mappe for bruk av POPD kommando, og\n\ endrer deretter til spesifisert mappe.\n\n\ PUSHD [mappe | ..]\n\n\ diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index e19b7841ca9..20361769681 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -179,10 +179,10 @@ odwrócić działanie parametrów przedrostkiem - (myślnik)-- na przykład, /-W STRING_DIR_HELP2 " Wolumin w napędzie %c ma etykietę: %s\n" STRING_DIR_HELP3 " Wolumin w napędzie %c nie posiada etykiety.\n" STRING_DIR_HELP4 " Numer seryjny woluminu to: %04X-%04X\n" - STRING_DIR_HELP5 "\n Ogółem wyświetonych:\n%16i plik(ów)% 14s bajtów\n" - STRING_DIR_HELP6 "%16i katalog(ów)% 15s bajtów wolne\n" + STRING_DIR_HELP5 "\n Ogółem wyświetonych:\n%16i plik(ów) %14s bajtów\n" + STRING_DIR_HELP6 "%16i katalog(ów) %14s bajtów wolne\n" STRING_DIR_HELP7 "\n katalog %s\n\n" - STRING_DIR_HELP8 "%16i plik(ów)% 14s bajtów\n" + STRING_DIR_HELP8 "%16i plik(ów) %14s bajtów\n" STRING_DIRSTACK_HELP1 "Przechowuje obecny katalog dla potrzeb komendy POPD, następnie\n\ zmienia na podany.\n\n\ PUSHD [ścieżka | ..]\n\n\ diff --git a/base/shell/cmd/lang/pt-BR.rc b/base/shell/cmd/lang/pt-BR.rc index f0b4c9c0a07..4cc11ed42c9 100644 --- a/base/shell/cmd/lang/pt-BR.rc +++ b/base/shell/cmd/lang/pt-BR.rc @@ -185,7 +185,7 @@ parâmetro - por exemplo, /-W.\n" STRING_DIR_HELP3 " Volume na unidade %c não tem rótulo.\n" STRING_DIR_HELP4 " Número de série do volume é %04X-%04X\n" STRING_DIR_HELP5 "\n Total de arquivos listados:\n%16i arquivo(s) %14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s) %15s bytes livres\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes livres\n" STRING_DIR_HELP7 "\n Diretório de %s\n\n" STRING_DIR_HELP8 "%16i arquivo(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Armazena o diretório atual para uso pelo comando POPD, de\n\ diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc index 420156e1634..9cbe01d818a 100644 --- a/base/shell/cmd/lang/pt-PT.rc +++ b/base/shell/cmd/lang/pt-PT.rc @@ -178,7 +178,7 @@ parâmetro - por exemplo, /-W.\n" STRING_DIR_HELP3 " Volume na unidade %c não tem rótulo.\n" STRING_DIR_HELP4 " Número de série do volume é %04X-%04X\n" STRING_DIR_HELP5 "\n Total de ficheiros listados:\n%16i ficheiro(s) %14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s) %15s bytes livres\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes livres\n" STRING_DIR_HELP7 "\n Diretório de %s\n\n" STRING_DIR_HELP8 "%16i ficheiro(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Armazena o directório actual para uso pelo comando POPD, de\n\ diff --git a/base/shell/cmd/lang/ro-RO.rc b/base/shell/cmd/lang/ro-RO.rc index 12b282417b0..097728b6cfe 100644 --- a/base/shell/cmd/lang/ro-RO.rc +++ b/base/shell/cmd/lang/ro-RO.rc @@ -190,10 +190,10 @@ De exemplu /-W.\n" STRING_DIR_HELP2 " Volumul unității %c este etichetat ca %s\n" STRING_DIR_HELP3 " Volumul unității %c nu este etichetat.\n" STRING_DIR_HELP4 " Numărul de serie al volumului este %04X-%04X\n" - STRING_DIR_HELP5 "\n Numărul de fișiere enumerate:\n%16i fișier(e)% 14s octeți\n" - STRING_DIR_HELP6 "%16i dir-re% 15s octeți liberi\n" + STRING_DIR_HELP5 "\n Numărul de fișiere enumerate:\n%16i fișier(e) %14s octeți\n" + STRING_DIR_HELP6 "%16i dir-re %14s octeți liberi\n" STRING_DIR_HELP7 "\n Directorul %s\n\n" - STRING_DIR_HELP8 "%16i fișiere% 14s octeți\n" + STRING_DIR_HELP8 "%16i fișier(e) %14s octeți\n" STRING_DIRSTACK_HELP1 "Înregistrează directorul curent în stivă, pentru a-l accesa\n\ ulterior prin comanda POPD, apoi schimbă directorul curent cu cel specificat.\n\n\ PUSHD [cale | ..]\n\n\ diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index 48f007feb57..a08ed2db272 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -178,10 +178,10 @@ DELAY [/m]n\n\n\ STRING_DIR_HELP2 " Том в устройстве %c имеет метку %s\n" STRING_DIR_HELP3 " Том в устройстве %c не имеет метки.\n" STRING_DIR_HELP4 " Серийный номер тома: %04X-%04X\n" - STRING_DIR_HELP5 "\n Всего:\n%16i файл(ов)% 14s байт\n" - STRING_DIR_HELP6 "%16i каталог(ов)% 15s байт свободно\n" + STRING_DIR_HELP5 "\n Всего:\n%16i файл(ов) %14s байт\n" + STRING_DIR_HELP6 "%16i каталог(ов) %14s байт свободно\n" STRING_DIR_HELP7 "\n каталог %s\n\n" - STRING_DIR_HELP8 "%16i файл(ов)% 14s байт\n" + STRING_DIR_HELP8 "%16i файл(ов) %14s байт\n" STRING_DIRSTACK_HELP1 "Сохраняет текущую директорию для использования командой POPD, затем\n\ изменяет ее на указанную.\n\n\ PUSHD [путь | ..]\n\n\ diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 261b8cde527..c8da98bdfda 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -176,10 +176,10 @@ preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" STRING_DIR_HELP2 " Volume in drive %c is %s\n" STRING_DIR_HELP3 " Volume in drive %c has no label.\n" STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n" - STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" + STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s) %14s bytes\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" - STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n" + STRING_DIR_HELP8 "%16i File(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index 70c523c5867..6149ab9da4a 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -174,10 +174,10 @@ ndryshimet prezente duke vënë përpara një ndryshim me - (hyphen)--për shemb STRING_DIR_HELP2 " Volumi në drive %c is %s\n" STRING_DIR_HELP3 " Volumi në drive %c has no label.\n" STRING_DIR_HELP4 " Volumi Serial dhe Numberi është %04X-%04X\n" - STRING_DIR_HELP5 "\n Lista e dokumentave total:\n%16i File(s)% 14s bytes\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" + STRING_DIR_HELP5 "\n Lista e dokumentave total:\n%16i File(s) %14s bytes\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" - STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n" + STRING_DIR_HELP8 "%16i File(s) %14s bytes\n" STRING_DIRSTACK_HELP1 "Ndryshimet mund të jenë paraprakisht në variablin e mjedisit DIRCMD\n\ dhe skedes specifike.\n\n\ PUSHD [rrugë | ..]\n\n\ diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index ba10b6c944d..91653be0023 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -170,10 +170,10 @@ förinställda växlar med ett bindestreck (-) före, till exempel, /-W.\n" STRING_DIR_HELP2 " Volumen i enhet %c är %s\n" STRING_DIR_HELP3 " Volumet i enhet %c är utan namn.\n" STRING_DIR_HELP4 " Volymens serienummer är %04X-%04X\n" - STRING_DIR_HELP5 "\n Totalt filer listet:\n%16i fil(är)% 14s byte\n" - STRING_DIR_HELP6 "%16i mapp(ar)% 15s byte ledigt\n" + STRING_DIR_HELP5 "\n Totalt filer listet:\n%16i fil(är) %14s byte\n" + STRING_DIR_HELP6 "%16i mapp(ar) %14s byte ledigt\n" STRING_DIR_HELP7 "\n mapp av %s\n\n" - STRING_DIR_HELP8 "%16i fil(er)% 14s byte\n" + STRING_DIR_HELP8 "%16i fil(er) %14s byte\n" STRING_DIRSTACK_HELP1 "Sparar aktuell mapp for användning av POPD kommandot, och\n\ ändrar därefter till angiven mapp.\n\n\ PUSHD [mapp | ..]\n\n\ diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index 2f86c3646d4..0cbc3a72e2f 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -173,10 +173,10 @@ bir anahtarın önüne - (tire) koyarak ön ayarlı anahtarları geçersiz kıl STRING_DIR_HELP2 " %c sürücüsündeki birimin etiketi %s\n" STRING_DIR_HELP3 " %c sürücüsündeki birimin etiketi yok.\n" STRING_DIR_HELP4 " Birimin Seri Numarası: %04X-%04X\n" - STRING_DIR_HELP5 "\n Toplam Listelenen Dosya Miktarı:\n%16i dosya(lar)% 14s bayt değerinde\n" - STRING_DIR_HELP6 "%16i dizin %15s bayt boş\n" + STRING_DIR_HELP5 "\n Toplam Listelenen Dosya Miktarı:\n%16i dosya(lar) %14s bayt değerinde\n" + STRING_DIR_HELP6 "%16i dizin %14s bayt boş\n" STRING_DIR_HELP7 "\n %s'nın dizini\n\n" - STRING_DIR_HELP8 "%16i dosya(lar)% 14s bayt\n" + STRING_DIR_HELP8 "%16i dosya(lar) %14s bayt\n" STRING_DIRSTACK_HELP1 "Şimdiki dizini POPD komutu tarafından kullanılmak üzere depolar,\n\ ardından belirtilen dizine değiştirir.\n\n\ PUSHD [yol | ..]\n\n\ diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index 4dbd88aa831..62eb7db3de0 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -181,10 +181,10 @@ DELAY [/m]n\n\n\ STRING_DIR_HELP2 " Том в пристрої %c має мiтку %s\n" STRING_DIR_HELP3 " Том в пристрої %c не має мiтки.\n" STRING_DIR_HELP4 " Серiйний номер тому: %04X-%04X\n" - STRING_DIR_HELP5 "\n Всього:\n%16i Файл(iв)% 14s байт\n" - STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" + STRING_DIR_HELP5 "\n Всього:\n%16i Файл(iв) %14s байт\n" + STRING_DIR_HELP6 "%16i Dir(s) %14s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" - STRING_DIR_HELP8 "%16i Файл(iв)% 14s байт\n" + STRING_DIR_HELP8 "%16i Файл(iв) %14s байт\n" STRING_DIRSTACK_HELP1 "Зберiгає поточну директорiю для використання командою POPD, потiм\n\ замiнює її на вказану.\n\n\ PUSHD [path | ..]\n\n\ diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index e51d6d41d5a..0d002218656 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -169,10 +169,10 @@ DELAY [/m]n\n\n\ STRING_DIR_HELP2 " 驱动器 %c 中的卷是 %s\n" STRING_DIR_HELP3 " 驱动器 %c 中的卷没有卷标。\n" STRING_DIR_HELP4 " 卷的序列号是 %04X-%04X\n" - STRING_DIR_HELP5 "\n 总计：\n%16i 个文件共占据 % 14s 字节\n" - STRING_DIR_HELP6 "%16i 个目录 % 15s 字节空闲\n" + STRING_DIR_HELP5 "\n 总计：\n%16i 个文件共占据 %14s 字节\n" + STRING_DIR_HELP6 "%16i 个目录 %14s 字节空闲\n" STRING_DIR_HELP7 "\n %s 的目录\n\n" - STRING_DIR_HELP8 "%16i 个文件 % 14s 字节\n" + STRING_DIR_HELP8 "%16i 个文件 %14s 字节\n" STRING_DIRSTACK_HELP1 "将当前目录存储以便 POPD 命令使用，然后切换到指定的目录。\n\n\ PUSHD [路径 | ..]\n\n\ 路径指定要切换到的目录。\n" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index b4447a8b6f2..bc32ae71020 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -169,10 +169,10 @@ DELAY [/m]n\n\n\ STRING_DIR_HELP2 " 磁碟機 %c 中的磁碟區標籤是 %s\n" STRING_DIR_HELP3 " 磁碟機 %c 中的磁碟區沒有標籤。\n" STRING_DIR_HELP4 " 磁碟區的序列號是 %04X-%04X\n" - STRING_DIR_HELP5 "\n 總計：\n%16i 個檔案共佔據 % 14s 位元組\n" - STRING_DIR_HELP6 "%16i 個目錄 % 15s 位元組的可用空間\n" + STRING_DIR_HELP5 "\n 總計：\n%16i 個檔案共佔據 %14s 位元組\n" + STRING_DIR_HELP6 "%16i 個目錄 %14s 位元組的可用空間\n" STRING_DIR_HELP7 "\n %s 的目錄\n\n" - STRING_DIR_HELP8 "%16i 個檔案 % 14s 位元組\n" + STRING_DIR_HELP8 "%16i 個檔案 %14s 位元組\n" STRING_DIRSTACK_HELP1 "將目前的目錄存儲以便 POPD 命令使用，然後切換到指定的目錄。\n\n\ PUSHD [路徑 | ..]\n\n\ 路徑指定要切換到的目錄。\n" diff --git a/base/shell/cmd/wcwidth.c b/base/shell/cmd/wcwidth.c new file mode 100644 index 00000000000..6a39b02a2a6 --- /dev/null +++ b/base/shell/cmd/wcwidth.c @@ -0,0 +1,313 @@ +/* + * This is an implementation of wcwidth() and wcswidth() (defined in + * IEEE Std 1002.1-2001) for Unicode. + * + * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html + * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html + * + * In fixed-width output devices, Latin characters all occupy a single + * "cell" position of equal width, whereas ideographic CJK characters + * occupy two such cells. Interoperability between terminal-line + * applications and (teletype-style) character terminals using the + * UTF-8 encoding requires agreement on which character should advance + * the cursor by how many cell positions. No established formal + * standards exist at present on which Unicode character shall occupy + * how many cell positions on character terminals. These routines are + * a first attempt of defining such behavior based on simple rules + * applied to data provided by the Unicode Consortium. + * + * For some graphical characters, the Unicode standard explicitly + * defines a character-cell width via the definition of the East Asian + * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes. + * In all these cases, there is no ambiguity about which width a + * terminal shall use. For characters in the East Asian Ambiguous (A) + * class, the width choice depends purely on a preference of backward + * compatibility with either historic CJK or Western practice. + * Choosing single-width for these characters is easy to justify as + * the appropriate long-term solution, as the CJK practice of + * displaying these characters as double-width comes from historic + * implementation simplicity (8-bit encoded characters were displayed + * single-width and 16-bit ones double-width, even for Greek, + * Cyrillic, etc.) and not any typographic considerations. + * + * Much less clear is the choice of width for the Not East Asian + * (Neutral) class. Existing practice does not dictate a width for any + * of these characters. It would nevertheless make sense + * typographically to allocate two character cells to characters such + * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be + * represented adequately with a single-width glyph. The following + * routines at present merely assign a single-cell width to all + * neutral characters, in the interest of simplicity. This is not + * entirely satisfactory and should be reconsidered before + * establishing a formal standard in this area. At the moment, the + * decision which Not East Asian (Neutral) characters should be + * represented by double-width glyphs cannot yet be answered by + * applying a simple rule from the Unicode database content. Setting + * up a proper standard for the behavior of UTF-8 character terminals + * will require a careful analysis not only of each Unicode character, + * but also of each presentation form, something the author of these + * routines has avoided to do so far. + * + * http://www.unicode.org/unicode/reports/tr11/ + * + * Markus Kuhn -- 2007-05-26 (Unicode 5.0) + * + * Permission to use, copy, modify, and distribute this software + * for any purpose and without fee is hereby granted. The author + * disclaims all warranties with regard to this software. + * + * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c + */ + +#include <wchar.h> + +struct interval { + int first; + int last; +}; + +/* auxiliary function for binary search in interval table */ +static int bisearch(wchar_t ucs, const struct interval *table, int max) { + int min = 0; + int mid; + + if (ucs < table[0].first || ucs > table[max].last) + return 0; + while (max >= min) { + mid = (min + max) / 2; + if (ucs > table[mid].last) + min = mid + 1; + else if (ucs < table[mid].first) + max = mid - 1; + else + return 1; + } + + return 0; +} + + +/* The following two functions define the column width of an ISO 10646 + * character as follows: + * + * - The null character (U+0000) has a column width of 0. + * + * - Other C0/C1 control characters and DEL will lead to a return + * value of -1. + * + * - Non-spacing and enclosing combining characters (general + * category code Mn or Me in the Unicode database) have a + * column width of 0. + * + * - SOFT HYPHEN (U+00AD) has a column width of 1. + * + * - Other format characters (general category code Cf in the Unicode + * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0. + * + * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) + * have a column width of 0. + * + * - Spacing characters in the East Asian Wide (W) or East Asian + * Full-width (F) category as defined in Unicode Technical + * Report #11 have a column width of 2. + * + * - All remaining characters (including all printable + * ISO 8859-1 and WGL4 characters, Unicode control characters, + * etc.) have a column width of 1. + * + * This implementation assumes that wchar_t characters are encoded + * in ISO 10646. + */ + +int mk_wcwidth(wchar_t ucs) +{ + /* sorted list of non-overlapping intervals of non-spacing characters */ + /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ + static const struct interval combining[] = { + { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, + { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, + { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, + { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, + { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, + { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, + { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, + { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, + { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, + { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, + { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, + { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, + { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, + { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, + { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, + { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, + { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, + { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, + { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, + { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, + { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, + { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, + { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, + { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, + { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, + { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, + { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, + { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, + { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, + { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, + { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, + { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, + { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, + { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, + { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, + { 0xE0100, 0xE01EF } + }; + + /* test for 8-bit control characters */ + if (ucs == 0) + return 0; + if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) + return -1; + + /* binary search in table of non-spacing characters */ + if (bisearch(ucs, combining, + sizeof(combining) / sizeof(struct interval) - 1)) + return 0; + + /* if we arrive here, ucs is not a combining or C0/C1 control character */ + + return 1 + + (ucs >= 0x1100 && + (ucs <= 0x115f || /* Hangul Jamo init. consonants */ + ucs == 0x2329 || ucs == 0x232a || + (ucs >= 0x2e80 && ucs <= 0xa4cf && + ucs != 0x303f) || /* CJK ... Yi */ + (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ + (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ + (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ + (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ + (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ + (ucs >= 0xffe0 && ucs <= 0xffe6) +#if !defined(__REACTOS__) || (defined(WCHAR_MAX) && (WCHAR_MAX >= 0x10000)) + || + (ucs >= 0x20000 && ucs <= 0x2fffd) || + (ucs >= 0x30000 && ucs <= 0x3fffd) +#endif + )); +} + + +int mk_wcswidth(const wchar_t *pwcs, size_t n) +{ + int w, width = 0; + + for (;*pwcs && n-- > 0; pwcs++) + if ((w = mk_wcwidth(*pwcs)) < 0) + return -1; + else + width += w; + + return width; +} + + +/* + * The following functions are the same as mk_wcwidth() and + * mk_wcswidth(), except that spacing characters in the East Asian + * Ambiguous (A) category as defined in Unicode Technical Report #11 + * have a column width of 2. This variant might be useful for users of + * CJK legacy encodings who want to migrate to UCS without changing + * the traditional terminal character-width behaviour. It is not + * otherwise recommended for general use. + */ +int mk_wcwidth_cjk(wchar_t ucs) +{ + /* sorted list of non-overlapping intervals of East Asian Ambiguous + * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */ + static const struct interval ambiguous[] = { + { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 }, + { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 }, + { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 }, + { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 }, + { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED }, + { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA }, + { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 }, + { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B }, + { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 }, + { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 }, + { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 }, + { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE }, + { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 }, + { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA }, + { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 }, + { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB }, + { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB }, + { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 }, + { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 }, + { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 }, + { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 }, + { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 }, + { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 }, + { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 }, + { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC }, + { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 }, + { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, + { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 }, + { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 }, + { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, + { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, + { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B }, + { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, + { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, + { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E }, + { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 }, + { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, + { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F }, + { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, + { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, + { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B }, + { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 }, + { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, + { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, + { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, + { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 }, + { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 }, + { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 }, + { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 }, + { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F }, + { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF }, + { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } + }; + + /* binary search in table of non-spacing characters */ + if (bisearch(ucs, ambiguous, + sizeof(ambiguous) / sizeof(struct interval) - 1)) + return 2; + + return mk_wcwidth(ucs); +} + + +int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) +{ + int w, width = 0; + + for (;*pwcs && n-- > 0; pwcs++) + if ((w = mk_wcwidth_cjk(*pwcs)) < 0) + return -1; + else + width += w; + + return width; +} diff --git a/sdk/include/reactos/cjkcode.h b/sdk/include/reactos/cjkcode.h new file mode 100644 index 00000000000..3cc43b3f08d --- /dev/null +++ b/sdk/include/reactos/cjkcode.h @@ -0,0 +1,47 @@ +/* + * PROJECT: ReactOS header + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Encoding, charsets and codepages for Chinese, Japanese and Korean (CJK) + * COPYRIGHT: Copyright 2017-2022 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + Copyright 2017-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#define CP_SHIFTJIS 932 // Japanese Shift-JIS +#define CP_HANGUL 949 // Korean Hangul/Wansung +#define CP_JOHAB 1361 // Korean Johab +#define CP_GB2312 936 // Chinese Simplified (GB2312) +#define CP_BIG5 950 // Chinese Traditional (Big5) + +/* + * "Human-understandable" names for the previous standard code pages. + * Taken from https://github.com/microsoft/terminal/blob/main/src/inc/unicode.hpp + */ +#define CP_JAPANESE CP_SHIFTJIS +#define CP_KOREAN CP_HANGUL +#define CP_CHINESE_SIMPLIFIED CP_GB2312 +#define CP_CHINESE_TRADITIONAL CP_BIG5 + +/* IsFarEastCP(CodePage) */ +#define IsCJKCodePage(CodePage) \ + ((CodePage) == CP_SHIFTJIS || (CodePage) == CP_HANGUL || \ + /* (CodePage) == CP_JOHAB || */ \ + (CodePage) == CP_BIG5 || (CodePage) == CP_GB2312) + +#if !defined(_WINGDI_) || defined(NOGDI) +#define SHIFTJIS_CHARSET 128 +#define HANGEUL_CHARSET 129 +#define HANGUL_CHARSET 129 // HANGEUL_CHARSET +#if (WINVER >= 0x0400) +#define JOHAB_CHARSET 130 +#endif /* WINVER */ +#define GB2312_CHARSET 134 +#define CHINESEBIG5_CHARSET 136 +#endif /* !defined(_WINGDI_) || defined(NOGDI) */ + +/* IsAnyDBCSCharSet(CharSet) */ +#define IsCJKCharSet(CharSet) \ + ((CharSet) == SHIFTJIS_CHARSET || (CharSet) == HANGUL_CHARSET || \ + /* (CharSet) == JOHAB_CHARSET || */ \ + (CharSet) == GB2312_CHARSET || (CharSet) == CHINESEBIG5_CHARSET) diff --git a/win32ss/user/winsrv/concfg/font.h b/win32ss/user/winsrv/concfg/font.h index 382792817c5..a45d5a81653 100644 --- a/win32ss/user/winsrv/concfg/font.h +++ b/win32ss/user/winsrv/concfg/font.h @@ -18,48 +18,11 @@ #define CP_USA 437 // United States (OEM) -#define CP_SHIFTJIS 932 // Japanese Shift-JIS -#define CP_HANGUL 949 // Korean Hangul/Wansung -#define CP_JOHAB 1361 // Korean Johab -#define CP_GB2312 936 // Chinese Simplified (GB2312) -#define CP_BIG5 950 // Chinese Traditional (Big5) - -/* - * "Human-understandable" names for the previous standard code pages. - * Taken from https://github.com/microsoft/terminal/blob/main/src/inc/unicode.hpp - */ -#define CP_JAPANESE CP_SHIFTJIS -#define CP_KOREAN CP_HANGUL -#define CP_CHINESE_SIMPLIFIED CP_GB2312 -#define CP_CHINESE_TRADITIONAL CP_BIG5 - -/* IsFarEastCP(CodePage) */ -#define IsCJKCodePage(CodePage) \ - ((CodePage) == CP_SHIFTJIS || (CodePage) == CP_HANGUL || \ - /* (CodePage) == CP_JOHAB || */ \ - (CodePage) == CP_BIG5 || (CodePage) == CP_GB2312) - -#if !defined(_WINGDI_) || defined(NOGDI) -#define SHIFTJIS_CHARSET 128 -#define HANGEUL_CHARSET 129 -#define HANGUL_CHARSET 129 // HANGEUL_CHARSET -#if(WINVER >= 0x0400) -#define JOHAB_CHARSET 130 -#endif /* WINVER */ -#define GB2312_CHARSET 134 -#define CHINESEBIG5_CHARSET 136 -#endif /* !defined(_WINGDI_) || defined(NOGDI) */ - -/* IsAnyDBCSCharSet(CharSet) */ -#define IsCJKCharSet(CharSet) \ - ((CharSet) == SHIFTJIS_CHARSET || (CharSet) == HANGUL_CHARSET || \ - /* (CharSet) == JOHAB_CHARSET || */ \ - (CharSet) == GB2312_CHARSET || (CharSet) == CHINESEBIG5_CHARSET) +#include <cjkcode.h> #define IsBoldFont(Weight) \ ((Weight) >= FW_SEMIBOLD) /* Sometimes, just > FW_MEDIUM */ - /* * @struct TrueType font list, cached from * HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion\Console\TrueTypeFont

1 year, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2023