Ros-diffs April 2023

ros-diffs@reactos.org

17 participants
89 discussions

[reactos] 01/01: [MSI] Revert to previous working solution for disk usage display in dialog.c (#5194)

by Atharva Kulkarni

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e13c3e856f82faa0d0990… commit e13c3e856f82faa0d09905b57f17efec73e0abdd Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Sun Apr 2 22:46:18 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 2 19:16:18 2023 +0200 [MSI] Revert to previous working solution for disk usage display in dialog.c (#5194) There is a bug, which displays empty optical drive as a valid Drive where applications can be installed, which is wrong. This change will skip displaying any drives that are not fixed in the disk usage table in the msi installer UI. JIRA issue: CORE-18758 Proposed changes Revert to old solution from Doug Lyons which was working fine. --- dll/win32/msi/dialog.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 8e4c1511081..1bea93dc081 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3206,7 +3206,11 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; +#ifdef __REACTOS__ + DWORD size; +#else DWORD size, flags; +#endif int i = 0; cost = msi_vcl_get_cost(dialog); @@ -3223,8 +3227,12 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { +#ifdef __REACTOS__ + if (GetDriveTypeW(ptr) != DRIVE_FIXED) +#else if (GetVolumeInformationW(ptr, NULL, 0, NULL, 0, &flags, NULL, 0) && flags & FILE_READ_ONLY_VOLUME) +#endif { ptr += lstrlenW(ptr) + 1; continue;

1 year, 8 months

[reactos] 01/01: Enable framebuf_new driver (#4775)

by hpoussin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bdefebc9ecb5eac6a7c6… commit 1bdefebc9ecb5eac6a7c608d1d6770f36281a5be Author: hpoussin <32227662+hpoussin(a)users.noreply.github.com> AuthorDate: Sun Apr 2 16:33:15 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 2 23:33:15 2023 +0900 Enable framebuf_new driver (#4775) Replace framebuf display driver by framebuf_new display driver Compile framebuf_new as framebuf.dll, and add it to bootcd/livecd Remove old framebuf from compilation, to not conflict --- win32ss/drivers/displays/CMakeLists.txt | 2 +- win32ss/drivers/displays/framebuf_new/CMakeLists.txt | 15 ++++++++------- win32ss/drivers/displays/framebuf_new/debug.c | 2 +- .../framebuf_new/{framebuf_new.rc => framebuf.rc} | 0 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/win32ss/drivers/displays/CMakeLists.txt b/win32ss/drivers/displays/CMakeLists.txt index ff7fd43541e..e390c7492e4 100644 --- a/win32ss/drivers/displays/CMakeLists.txt +++ b/win32ss/drivers/displays/CMakeLists.txt @@ -1,4 +1,4 @@ -add_subdirectory(framebuf) +#add_subdirectory(framebuf) add_subdirectory(framebuf_new) add_subdirectory(vga) diff --git a/win32ss/drivers/displays/framebuf_new/CMakeLists.txt b/win32ss/drivers/displays/framebuf_new/CMakeLists.txt index 13f52bd7055..a41e8df5692 100644 --- a/win32ss/drivers/displays/framebuf_new/CMakeLists.txt +++ b/win32ss/drivers/displays/framebuf_new/CMakeLists.txt @@ -7,12 +7,13 @@ list(APPEND SOURCE screen.c driver.h) -add_library(framebuf_new MODULE +add_library(framebuf MODULE ${SOURCE} - framebuf_new.rc) + framebuf.rc) -set_module_type(framebuf_new kerneldll ENTRYPOINT DrvEnableDriver 12) -target_link_libraries(framebuf_new libcntpr) -add_importlibs(framebuf_new win32k) -add_pch(framebuf_new driver.h SOURCE) -add_dependencies(framebuf_new psdk) +set_module_type(framebuf kerneldll ENTRYPOINT DrvEnableDriver 12) +target_link_libraries(framebuf libcntpr) +add_importlibs(framebuf win32k) +add_pch(framebuf driver.h SOURCE) +add_dependencies(framebuf psdk) +add_cd_file(TARGET framebuf DESTINATION reactos/system32 FOR all) diff --git a/win32ss/drivers/displays/framebuf_new/debug.c b/win32ss/drivers/displays/framebuf_new/debug.c index 0578932b4e5..e5d1186f5c3 100644 --- a/win32ss/drivers/displays/framebuf_new/debug.c +++ b/win32ss/drivers/displays/framebuf_new/debug.c @@ -10,7 +10,7 @@ #if DBG -ULONG DebugLevel = 0xFFFFFFFF; +ULONG DebugLevel = 0; /***************************************************************************** * diff --git a/win32ss/drivers/displays/framebuf_new/framebuf_new.rc b/win32ss/drivers/displays/framebuf_new/framebuf.rc similarity index 100% rename from win32ss/drivers/displays/framebuf_new/framebuf_new.rc rename to win32ss/drivers/displays/framebuf_new/framebuf.rc

1 year, 8 months

[reactos] 01/01: [NTUSER] Fix BSOD 0x1E nullptr deref CORE-18899 (#5212)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ee9f733694243a81fb45… commit 9ee9f733694243a81fb458cfc11edbdc3bdfc835 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Apr 2 16:27:42 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 2 23:27:42 2023 +0900 [NTUSER] Fix BSOD 0x1E nullptr deref CORE-18899 (#5212) fix authored by JIRA-user "TANGaming". I do suspect that the possibility of that nullptr deref was introduced on the master branch by 0.4.13-dev-962-g 4193b8d. Doug Lyons signalled his "ok" regarding the fix in chat already. CORE-18899 --- win32ss/user/ntuser/defwnd.c | 15 +++++++++------ win32ss/user/ntuser/event.c | 3 +-- win32ss/user/ntuser/hook.c | 7 +++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 81ece247b78..de4b4e12e18 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Miscellaneous User functions - * FILE: win32ss/user/ntuser/defwnd.c - * PROGRAMER: + * PROJECT: ReactOS Win32k subsystem + * LICENSE: See COPYING in the top level directory + * PURPOSE: Miscellaneous User functions + * COPYRIGHT: 2008-2020 James Tabor <james.tabor(a)reactos.org> */ #include <win32k.h> @@ -797,6 +796,10 @@ IntDefWindowProc( HWND hwndTop = UserGetForegroundWindow(); PWND topWnd = UserGetWindowObject(hwndTop); + // MS Doc: foreground window can be NULL, e.g. when window is losing activation + if (!topWnd) + return 0; + // We want to forbid snapping operations on the TaskBar // We use a heuristic for detecting the TaskBar Wnd by its typical Style & ExStyle Values ExStyleTB = (topWnd->ExStyle & WS_EX_TOOLWINDOW); @@ -805,7 +808,7 @@ IntDefWindowProc( && (ExStyleTB == WS_EX_TOOLWINDOW); TRACE("ExStyle=%x Style=%x IsTaskBar=%d\n", ExStyleTB, StyleTB, IsTaskBar); - if (topWnd && !IsTaskBar) + if (!IsTaskBar) { if ((topWnd->style & WS_THICKFRAME) == 0) return 0; diff --git a/win32ss/user/ntuser/event.c b/win32ss/user/ntuser/event.c index f5a3a65c3bc..b52efe9389e 100644 --- a/win32ss/user/ntuser/event.c +++ b/win32ss/user/ntuser/event.c @@ -2,8 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window event handlers - * FILE: win32ss/user/ntuser/event.c - * PROGRAMER: James Tabor (james.tabor(a)rectos.org) + * PROGRAMER: James Tabor <james.tabor(a)reactos.org> */ #include <win32k.h> diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index 792d195470a..8f82d5b2f46 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -2,10 +2,9 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window hooks - * FILE: win32ss/user/ntuser/hook.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * James Tabor (james.tabor(a)rectos.org) - * Rafal Harabien (rafalh(a)reactos.org) + * PROGRAMER: Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * James Tabor <james.tabor(a)reactos.org> + * Rafal Harabien <rafalh(a)reactos.org> * NOTE: Most of this code was adapted from Wine, * Copyright (C) 2002 Alexandre Julliard */

1 year, 8 months

[reactos] 01/01: [CONSOLE] Harmonize IDC_LBOX_FONTTYPE height to 40 for *.rc (#5211)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c37addcbf5feb05219bbe… commit c37addcbf5feb05219bbe8e030931f0dd54d6adc Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Apr 2 16:25:43 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 2 23:25:43 2023 +0900 [CONSOLE] Harmonize IDC_LBOX_FONTTYPE height to 40 for *.rc (#5211) 40 is what en-US uses, and most other langs used that meanwhile as well. Some were forgotten to be synced though. While comparing all the files, use the opportunity to slightly improve some headers also. --- dll/cpl/console/lang/cs-CZ.rc | 4 +--- dll/cpl/console/lang/de-DE.rc | 2 +- dll/cpl/console/lang/es-ES.rc | 2 +- dll/cpl/console/lang/id-ID.rc | 2 +- dll/cpl/console/lang/it-IT.rc | 2 +- dll/cpl/console/lang/pt-PT.rc | 1 - dll/cpl/console/lang/ro-RO.rc | 5 ++--- dll/cpl/console/lang/sk-SK.rc | 3 +-- dll/cpl/console/lang/sq-AL.rc | 3 +-- dll/cpl/console/lang/tr-TR.rc | 2 +- dll/cpl/console/lang/uk-UA.rc | 2 +- dll/cpl/console/lang/zh-CN.rc | 2 +- 12 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dll/cpl/console/lang/cs-CZ.rc b/dll/cpl/console/lang/cs-CZ.rc index 96a023b0ef7..414a63506cd 100644 --- a/dll/cpl/console/lang/cs-CZ.rc +++ b/dll/cpl/console/lang/cs-CZ.rc @@ -1,7 +1,5 @@ /* - * FILE: dll/cpl/console/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2011-03-31 + * TRANSLATOR: 2011 Radek Liska aka Black_Fox <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/dll/cpl/console/lang/de-DE.rc b/dll/cpl/console/lang/de-DE.rc index d144ea96947..d1842fdeec6 100644 --- a/dll/cpl/console/lang/de-DE.rc +++ b/dll/cpl/console/lang/de-DE.rc @@ -45,7 +45,7 @@ BEGIN AUTORADIOBUTTON "&Punkte", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Schriftart", IDC_STATIC, 10, 105, 35, 10 AUTOCHECKBOX "&Fett", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 - LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Gewählte Schriftart", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE LTEXT "Jedes Zeichen ist:", IDC_STATIC, 125, 166, 85, 10 diff --git a/dll/cpl/console/lang/es-ES.rc b/dll/cpl/console/lang/es-ES.rc index fc8140d340c..d4c6c77e52c 100644 --- a/dll/cpl/console/lang/es-ES.rc +++ b/dll/cpl/console/lang/es-ES.rc @@ -45,7 +45,7 @@ BEGIN AUTORADIOBUTTON "&puntos", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Fuente", IDC_STATIC, 10, 105, 35, 10 AUTOCHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 - LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Fuente seleccionada", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE LTEXT "Cada caracter es:", IDC_STATIC, 125, 166, 85, 10 diff --git a/dll/cpl/console/lang/id-ID.rc b/dll/cpl/console/lang/id-ID.rc index 0ada9f55aae..35449ad2855 100644 --- a/dll/cpl/console/lang/id-ID.rc +++ b/dll/cpl/console/lang/id-ID.rc @@ -45,7 +45,7 @@ BEGIN AUTORADIOBUTTON "&poin", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Fon", IDC_STATIC, 10, 105, 35, 10 AUTOCHECKBOX "Fon &tebal", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 - LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Fon Terpilih", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE LTEXT "Setiap karakter adalah:", IDC_STATIC, 125, 166, 85, 10 diff --git a/dll/cpl/console/lang/it-IT.rc b/dll/cpl/console/lang/it-IT.rc index 0677e07d1a2..f2e64cff0ef 100644 --- a/dll/cpl/console/lang/it-IT.rc +++ b/dll/cpl/console/lang/it-IT.rc @@ -45,7 +45,7 @@ BEGIN AUTORADIOBUTTON "&punti", IDC_RADIO_POINT_UNIT, 165, 28, 60, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&Font", IDC_STATIC, 10, 105, 35, 10 AUTOCHECKBOX "&Grassetto font", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 - LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Font Selezionate", IDC_GROUPBOX_FONT_NAME, 7, 156, 240, 50 CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 12, 166, 104, 35, WS_EX_CLIENTEDGE LTEXT "Ogni carattere è:", IDC_STATIC, 125, 166, 85, 10 diff --git a/dll/cpl/console/lang/pt-PT.rc b/dll/cpl/console/lang/pt-PT.rc index 1b359c75103..f94238ac42c 100644 --- a/dll/cpl/console/lang/pt-PT.rc +++ b/dll/cpl/console/lang/pt-PT.rc @@ -59,7 +59,6 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Pré-visualização da janela:", IDC_STATIC, 7, 7, 110, 10 CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "WinPreview", WS_BORDER | WS_CHILD | WS_VISIBLE, 7, 20, 110, 70 - GROUPBOX "Tamanho da memória intermédia do ecrã", IDC_STATIC, 110, 12, 138, 50 LTEXT "Largura:", IDC_STATIC, 120, 28, 40, 10 LTEXT "Altura:", IDC_STATIC, 120, 46, 39, 10 diff --git a/dll/cpl/console/lang/ro-RO.rc b/dll/cpl/console/lang/ro-RO.rc index 9564dd05d56..234528c960f 100644 --- a/dll/cpl/console/lang/ro-RO.rc +++ b/dll/cpl/console/lang/ro-RO.rc @@ -1,10 +1,9 @@ /* * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/console/lang/ro-RO.rc * PURPOSE: Romanian resource file - * TRANSLATOR: Petru Dimitriu (petrimetri AT gmail.com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * TRANSLATOR: Petru Dimitriu <petrimetri(a)gmail.com> + * Ștefan Fulea <stefan.fulea(a)mail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/dll/cpl/console/lang/sk-SK.rc b/dll/cpl/console/lang/sk-SK.rc index c98b1aca643..6bd56058115 100644 --- a/dll/cpl/console/lang/sk-SK.rc +++ b/dll/cpl/console/lang/sk-SK.rc @@ -1,5 +1,4 @@ -/* TRANSLATOR: Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 16-06-2008 +/* TRANSLATOR: 2008 Mário Kačmár /Mario Kacmar/ aka Kario <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/dll/cpl/console/lang/sq-AL.rc b/dll/cpl/console/lang/sq-AL.rc index e2981bb4b18..31fbd9a46ea 100644 --- a/dll/cpl/console/lang/sq-AL.rc +++ b/dll/cpl/console/lang/sq-AL.rc @@ -1,5 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 04-01-2014 +/* TRANSLATOR: 2014 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/dll/cpl/console/lang/tr-TR.rc b/dll/cpl/console/lang/tr-TR.rc index 0d390329537..c3f79aca514 100644 --- a/dll/cpl/console/lang/tr-TR.rc +++ b/dll/cpl/console/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014, 2020 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATOR: 2013-2020 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/dll/cpl/console/lang/uk-UA.rc b/dll/cpl/console/lang/uk-UA.rc index ee57973aa10..66decd4e328 100644 --- a/dll/cpl/console/lang/uk-UA.rc +++ b/dll/cpl/console/lang/uk-UA.rc @@ -1,4 +1,4 @@ -/* Ukraianian translation by Artem Reznikov & Yaroslav Kibysh */ +/* Ukrainian translation by Artem Reznikov & Yaroslav Kibysh */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/dll/cpl/console/lang/zh-CN.rc b/dll/cpl/console/lang/zh-CN.rc index 23b71608593..38c31e19a28 100644 --- a/dll/cpl/console/lang/zh-CN.rc +++ b/dll/cpl/console/lang/zh-CN.rc @@ -1,4 +1,4 @@ -/* Simplified Chinese translation by Jingjing Fu (jingjingf AT 188.com) */ +/* Simplified Chinese translation by Jingjing Fu <jingjingf(a)188.com> */ /* Improved by Luke Luo <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

1 year, 8 months

[reactos] 01/01: [SHELL32] Improve French (fr-FR) translation (#5179)

by fulup29

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14cf589cbc48e0d4f0577… commit 14cf589cbc48e0d4f0577df4471744a5427d575f Author: fulup29 <126885880+fulup29(a)users.noreply.github.com> AuthorDate: Sun Apr 2 00:07:52 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 2 00:07:52 2023 +0200 [SHELL32] Improve French (fr-FR) translation (#5179) CORE-18382 Original patch is used to fix and improve french translation and layout. The original (erroneous) horizontal shift of the second checkbox is kept. It should be fixed homogeneously in all translations at once later. --- dll/win32/shell32/lang/fr-FR.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 8f0d20c740a..b7bd7692c7a 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -326,7 +326,7 @@ BEGIN PUSHBUTTON "Nettoyage de &disque", 14010, 160, 154, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Autoriser le service d'indexation à indexer ce disque pour une recherche rapide de fichiers", 14012, 8, 205, 222, 10, WS_DISABLED + CHECKBOX "Autoriser l'indexation de ce disque pour la recherche rapide", 14012, 8, 205, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 @@ -609,17 +609,17 @@ BEGIN AUTOCHECKBOX "Activer la compression", 28675, 16, 152, 155, 10 END -IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 +IDD_CHECK_DISK DIALOGEX 50, 50, 244, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Vérifier le disque" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Démarrer", IDOK, 63, 95, 60, 14 - GROUPBOX "Options de vérification", -1, 7, 6, 179, 40 - PUSHBUTTON "Annuler", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "Réparer automatiquement les erreurs du système de fichiers", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scanner pour rechercher et réparer les secteurs défectueux", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 + DEFPUSHBUTTON "Démarrer", IDOK, 113, 95, 60, 14 + GROUPBOX "Options de vérification du disque", -1, 7, 6, 229, 40 + PUSHBUTTON "Annuler", IDCANCEL, 178, 95, 60, 14 + AUTOCHECKBOX "&Réparer automatiquement les erreurs du système de fichiers", 14000, 12, 20, 215, 10 + AUTOCHECKBOX "Re&chercher et tenter une récupération des secteurs défectueux", 14001, 16, 30, 215, 10 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 229, 8 LTEXT "", 14003, 60, 80, 170, 10 END

1 year, 8 months

[reactos] 01/01: [NTOSKRNL] Flush file to disk when deleting file mappings (#4302)

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=573d579873c2e98946050… commit 573d579873c2e989460500eef90e55c5939f0eda Author: Jérôme Gardou <zefklop(a)users.noreply.github.com> AuthorDate: Sat Apr 1 16:56:49 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 1 23:56:49 2023 +0900 [NTOSKRNL] Flush file to disk when deleting file mappings (#4302) CORE-17627 When closing a file, fastfat zeroes it out from ValidDataLength up to the end of the file. The ValidDataLength field is updated when the file content is actually written to disk. There is currently a race between the file-close path and the page out path, leading to potential file corruptions when the zeroing happens after the memory has been flushed to disk. Fix this by actually flushing the file to disk when unmapping files, with file lock acquired. This way, the FS driver cannot zero out the tail of the file while we're actually flushing it to disk. --- ntoskrnl/mm/section.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 2fba8e89908..9323a6da196 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -3578,7 +3578,7 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, ASSERT(Process); - AddressSpace = Process ? &Process->Vm : MmGetKernelAddressSpace(); + AddressSpace = &Process->Vm; MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); @@ -3645,6 +3645,15 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, } else { + PMM_SECTION_SEGMENT Segment = MemoryArea->SectionData.Segment; + PMMVAD Vad = &MemoryArea->VadNode; + PFILE_OBJECT FileObject; + SIZE_T ViewSize; + LARGE_INTEGER ViewOffset; + ViewOffset.QuadPart = MemoryArea->SectionData.ViewOffset; + + InterlockedIncrement64(Segment->ReferenceCount); + Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); if (!NT_SUCCESS(Status)) { @@ -3652,6 +3661,47 @@ MiRosUnmapViewOfSection(IN PEPROCESS Process, BaseAddress, Process, Status); ASSERT(NT_SUCCESS(Status)); } + + if (FlagOn(*Segment->Flags, MM_PHYSICALMEMORY_SEGMENT)) + { + /* Don't bother */ + MmDereferenceSegment(Segment); + return STATUS_SUCCESS; + } + ASSERT(FlagOn(*Segment->Flags, MM_DATAFILE_SEGMENT)); + + FileObject = Segment->FileObject; + FsRtlAcquireFileExclusive(FileObject); + + /* Don't bother for auto-delete closed file. */ + if (FlagOn(FileObject->Flags, FO_DELETE_ON_CLOSE) && FlagOn(FileObject->Flags, FO_CLEANUP_COMPLETE)) + { + FsRtlReleaseFile(FileObject); + MmDereferenceSegment(Segment); + return STATUS_SUCCESS; + } + + /* + * Flush only when last mapping is deleted. + * FIXME: Why Vad->ControlArea == NULL? + */ + if (Vad->ControlArea == NULL || Vad->ControlArea->NumberOfMappedViews == 1) + { + ViewSize = PAGE_SIZE + ((Vad->EndingVpn - Vad->StartingVpn) << PAGE_SHIFT); + while (ViewSize > 0) + { + ULONG FlushSize = min(ViewSize, PAGE_ROUND_DOWN(MAXULONG)); + MmFlushSegment(FileObject->SectionObjectPointer, + &ViewOffset, + FlushSize, + NULL); + ViewSize -= FlushSize; + ViewOffset.QuadPart += FlushSize; + } + } + + FsRtlReleaseFile(FileObject); + MmDereferenceSegment(Segment); } /* Notify debugger */

1 year, 8 months

[reactos] 01/01: [REGEDIT] Fix ListView selection and finding (#5150)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e580b67e5a407afdd66… commit 84e580b67e5a407afdd669c3204ef97d115d8cb0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 1 22:21:59 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 1 22:21:59 2023 +0900 [REGEDIT] Fix ListView selection and finding (#5150) We will check the data size correctly, instead of 3 NUL byte appending hack. Add bSelectNone parameter to UpdateAddress and RefreshListView functions. If bSelectNone is TRUE, then select nothing of ListView. Fix item selection of ListView. Rename CompareData helper function as MatchData and improve it. Improve the search algorithm. If the item selection of ListView changed, scroll down to the item. Follow up to #5146. CORE-15986, CORE-18230 --- base/applications/regedit/childwnd.c | 4 +- base/applications/regedit/find.c | 94 +++++++++++++++--------------------- base/applications/regedit/framewnd.c | 21 +++++--- base/applications/regedit/listview.c | 8 ++- base/applications/regedit/main.h | 4 +- base/applications/regedit/treeview.c | 4 +- 6 files changed, 65 insertions(+), 70 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 19c4cea780f..7910dcefdaa 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -229,7 +229,7 @@ LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar } VOID -UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) +UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath, BOOL bSelectNone) { LPCWSTR keyPath, rootName; LPWSTR fullPath; @@ -251,7 +251,7 @@ UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) if (keyPath) { - RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath, bSelectNone); rootName = get_root_key_name(hRootKey); cbFullPath = (wcslen(rootName) + 1 + wcslen(keyPath) + 1) * sizeof(WCHAR); fullPath = malloc(cbFullPath); diff --git a/base/applications/regedit/find.c b/base/applications/regedit/find.c index c970a53cf51..444f4a25952 100644 --- a/base/applications/regedit/find.c +++ b/base/applications/regedit/find.c @@ -87,41 +87,32 @@ static BOOL CompareName(LPCWSTR pszName1, LPCWSTR pszName2) } } -static BOOL -CompareData( - DWORD dwType, - LPCWSTR psz1, - LPCWSTR psz2) +/* Do not assume that pch1 is terminated with UNICODE_NULL */ +static BOOL MatchString(LPCWCH pch1, INT cch1, LPCWCH pch2, INT cch2) { - INT i, cch1 = wcslen(psz1), cch2 = wcslen(psz2); - if (dwType == REG_SZ || dwType == REG_EXPAND_SZ) - { - if (s_dwFlags & RSF_WHOLESTRING) - { - if (s_dwFlags & RSF_MATCHCASE) - return 2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, - psz1, cch1, psz2, cch2); - else - return 2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, - NORM_IGNORECASE, psz1, cch1, psz2, cch2); - } + INT i; + DWORD dwNorm = ((s_dwFlags & RSF_MATCHCASE) ? NORM_IGNORECASE : 0); - for(i = 0; i <= cch1 - cch2; i++) - { - if (s_dwFlags & RSF_MATCHCASE) - { - if (2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, - psz1 + i, cch2, psz2, cch2)) - return TRUE; - } - else - { - if (2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, - NORM_IGNORECASE, psz1 + i, cch2, psz2, cch2)) - return TRUE; - } - } + if (s_dwFlags & RSF_WHOLESTRING) + return 2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, dwNorm, pch1, cch1, pch2, cch2); + + if (cch1 < cch2) + return FALSE; + + for (i = 0; i <= cch1 - cch2; i++) + { + if (2 == CompareStringW(LOCALE_SYSTEM_DEFAULT, dwNorm, pch1 + i, cch2, pch2, cch2)) + return TRUE; } + + return FALSE; +} + +static BOOL MatchData(DWORD dwType, LPCVOID pv1, DWORD cb1) +{ + if (dwType == REG_SZ || dwType == REG_EXPAND_SZ || dwType == REG_MULTI_SZ) + return MatchString(pv1, (INT)(cb1 / sizeof(WCHAR)), s_szFindWhat, lstrlenW(s_szFindWhat)); + return FALSE; } @@ -143,7 +134,7 @@ BOOL RegFindRecurse( LONG lResult; WCHAR szSubKey[MAX_PATH]; DWORD i, c, cb, type; - BOOL fPast = FALSE; + BOOL fPast; LPWSTR *ppszNames = NULL; LPBYTE pb = NULL; @@ -169,6 +160,7 @@ BOOL RegFindRecurse( goto err; ZeroMemory(ppszNames, c * sizeof(LPWSTR)); + /* Retrieve the value names associated with the current key */ for(i = 0; i < c; i++) { if (DoEvents()) @@ -192,10 +184,11 @@ BOOL RegFindRecurse( qsort(ppszNames, c, sizeof(LPWSTR), compare); - if (pszValueName == NULL) - pszValueName = ppszNames[0]; + /* If pszValueName is NULL, the function will search for all values within the key */ + fPast = (pszValueName == NULL); - for(i = 0; i < c; i++) + /* Search within the values */ + for (i = 0; i < c; i++) { if (DoEvents()) goto err; @@ -212,10 +205,7 @@ BOOL RegFindRecurse( CompareName(ppszNames[i], s_szFindWhat)) { *ppszFoundSubKey = _wcsdup(szSubKey); - if (ppszNames[i][0] == 0) - *ppszFoundValueName = NULL; - else - *ppszFoundValueName = _wcsdup(ppszNames[i]); + *ppszFoundValueName = _wcsdup(ppszNames[i]); goto success; } @@ -223,7 +213,7 @@ BOOL RegFindRecurse( NULL, &cb); if (lResult != ERROR_SUCCESS) goto err; - pb = malloc(cb + 3); /* To avoid buffer overrun, append 3 NULs */ + pb = malloc(cb); if (pb == NULL) goto err; lResult = RegQueryValueExW(hSubKey, ppszNames[i], NULL, &type, @@ -231,19 +221,10 @@ BOOL RegFindRecurse( if (lResult != ERROR_SUCCESS) goto err; - /* To avoid buffer overrun, append 3 NUL bytes. - NOTE: cb can be an odd number although UNICODE_NULL is two bytes. - Two bytes at odd position is not enough to avoid buffer overrun. */ - pb[cb] = pb[cb + 1] = pb[cb + 2] = 0; - - if ((s_dwFlags & RSF_LOOKATDATA) && - CompareData(type, (LPWSTR) pb, s_szFindWhat)) + if ((s_dwFlags & RSF_LOOKATDATA) && MatchData(type, pb, cb)) { *ppszFoundSubKey = _wcsdup(szSubKey); - if (ppszNames[i][0] == 0) - *ppszFoundValueName = NULL; - else - *ppszFoundValueName = _wcsdup(ppszNames[i]); + *ppszFoundValueName = _wcsdup(ppszNames[i]); goto success; } free(pb); @@ -258,6 +239,7 @@ BOOL RegFindRecurse( } ppszNames = NULL; + /* Retrieve the number of sub-keys */ lResult = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &c, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (lResult != ERROR_SUCCESS) @@ -267,6 +249,7 @@ BOOL RegFindRecurse( goto err; ZeroMemory(ppszNames, c * sizeof(LPWSTR)); + /* Retrieve the names of the sub-keys */ for(i = 0; i < c; i++) { if (DoEvents()) @@ -290,6 +273,7 @@ BOOL RegFindRecurse( qsort(ppszNames, c, sizeof(LPWSTR), compare); + /* Search within the sub-keys */ for(i = 0; i < c; i++) { if (DoEvents()) @@ -315,6 +299,7 @@ BOOL RegFindRecurse( goto success; } + /* Search within the value entries of the sub-key */ if (RegFindRecurse(hSubKey, ppszNames[i], NULL, ppszFoundSubKey, ppszFoundValueName)) { @@ -371,7 +356,7 @@ BOOL RegFindWalk( WCHAR szKeyName[MAX_PATH]; WCHAR szSubKey[MAX_PATH]; LPWSTR pch; - BOOL fPast; + BOOL fPast, fKeyMatched; LPWSTR *ppszNames = NULL; hBaseKey = *phKey; @@ -470,7 +455,8 @@ BOOL RegFindWalk( goto success; } - if (RegFindRecurse(hSubKey, ppszNames[i], NULL, + fKeyMatched = (_wcsicmp(ppszNames[i], szKeyName) == 0); + if (RegFindRecurse(hSubKey, ppszNames[i], (fKeyMatched ? pszValueName : NULL), ppszFoundSubKey, ppszFoundValueName)) { LPWSTR psz = *ppszFoundSubKey; diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index e3d695a6728..f886e0c7730 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -383,7 +383,7 @@ static BOOL LoadHive(HWND hWnd) /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath, TRUE); } else { @@ -421,7 +421,7 @@ static BOOL UnloadHive(HWND hWnd) /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath, TRUE); } else { @@ -518,7 +518,7 @@ static BOOL ImportRegistryFile(HWND hWnd) /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, pszKeyPath); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, pszKeyPath, TRUE); return bRet; } @@ -877,7 +877,7 @@ static BOOL CreateNewValue(HKEY hRootKey, LPCWSTR pszKeyPath, DWORD dwType) return FALSE; } - RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath, TRUE); /* locate the newly added value, and get ready to rename it */ memset(&lvfi, 0, sizeof(lvfi)); @@ -885,7 +885,12 @@ static BOOL CreateNewValue(HKEY hRootKey, LPCWSTR pszKeyPath, DWORD dwType) lvfi.psz = szNewValue; iIndex = ListView_FindItem(g_pChildWnd->hListWnd, -1, &lvfi); if (iIndex >= 0) + { + ListView_SetItemState(g_pChildWnd->hListWnd, iIndex, + LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); + ListView_EnsureVisible(g_pChildWnd->hListWnd, iIndex, FALSE); (void)ListView_EditLabel(g_pChildWnd->hListWnd, iIndex); + } return TRUE; } @@ -1128,11 +1133,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { case ID_EDIT_MODIFY: if (valueName && ModifyValue(hWnd, hKey, valueName, FALSE)) - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, FALSE); break; case ID_EDIT_MODIFY_BIN: if (valueName && ModifyValue(hWnd, hKey, valueName, TRUE)) - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, FALSE); break; case ID_EDIT_RENAME: if (GetFocus() == g_pChildWnd->hListWnd) @@ -1180,7 +1185,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) item = ni; } - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, FALSE); if(errs > 0) { LoadStringW(hInst, IDS_ERR_DELVAL_CAPTION, caption, ARRAY_SIZE(caption)); @@ -1243,7 +1248,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_VIEW_REFRESH: RefreshTreeView(g_pChildWnd->hTreeWnd); keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, TRUE); break; /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/ diff --git a/base/applications/regedit/listview.c b/base/applications/regedit/listview.c index ce0d5408794..346ed784afa 100644 --- a/base/applications/regedit/listview.c +++ b/base/applications/regedit/listview.c @@ -91,7 +91,7 @@ VOID SetValueName(HWND hwndLV, LPCWSTR pszValueName) { ListView_SetItemState(hwndLV, i, 0, LVIS_FOCUSED | LVIS_SELECTED); } - if (pszValueName == NULL) + if (pszValueName == NULL || pszValueName[0] == 0) i = 0; else { @@ -101,6 +101,7 @@ VOID SetValueName(HWND hwndLV, LPCWSTR pszValueName) } ListView_SetItemState(hwndLV, i, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); + ListView_EnsureVisible(hwndLV, i, FALSE); iListViewSelect = i; } @@ -668,7 +669,7 @@ void DestroyListView(HWND hwndLV) } -BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath) +BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath, BOOL bSelectNone) { DWORD max_sub_key_len; DWORD max_val_name_len; @@ -738,6 +739,9 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath) { ListView_SetItemState(hwndLV, i, 0, LVIS_FOCUSED | LVIS_SELECTED); } + + if (bSelectNone) + iListViewSelect = -1; ListView_SetItemState(hwndLV, iListViewSelect, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); diff --git a/base/applications/regedit/main.h b/base/applications/regedit/main.h index 7c8b864626b..bb257e792cc 100644 --- a/base/applications/regedit/main.h +++ b/base/applications/regedit/main.h @@ -97,7 +97,7 @@ void ShowAboutBox(HWND hWnd); LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); void ResizeWnd(int cx, int cy); LPCWSTR get_root_key_name(HKEY hRootKey); -VOID UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath); +VOID UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath, BOOL bSelectNone); /* edit.c */ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin); @@ -125,7 +125,7 @@ BOOL ExportRegistryFile(HWND hWnd); /* listview.c */ HWND CreateListView(HWND hwndParent, HMENU id, INT cx); -BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath); +BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath, BOOL bSelectNone); WCHAR *GetValueName(HWND hwndLV, int iStartAt); BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index ee26a04538a..28222432fea 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -643,7 +643,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) /* Get the parent of the current item */ HTREEITEM hParentItem = TreeView_GetParent(g_pChildWnd->hTreeWnd, pnmtv->itemNew.hItem); - UpdateAddress(pnmtv->itemNew.hItem, NULL, NULL); + UpdateAddress(pnmtv->itemNew.hItem, NULL, NULL, TRUE); /* Disable the Permissions menu item for 'My Computer' */ EnableMenuItem(hMenuFrame, ID_EDIT_PERMISSIONS, MF_BYCOMMAND | (hParentItem ? MF_ENABLED : MF_GRAYED)); @@ -722,7 +722,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) lResult = FALSE; } else - UpdateAddress(ptvdi->item.hItem, hRootKey, szBuffer); + UpdateAddress(ptvdi->item.hItem, hRootKey, szBuffer, FALSE); } *Result = lResult; }

1 year, 8 months

[reactos] 01/01: [MSPAINT] Make selection window-less (#5208)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aac89519ec9270ffe0935… commit aac89519ec9270ffe0935cad267a4a87faccc92f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 1 22:01:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 1 22:01:04 2023 +0900 [MSPAINT] Make selection window-less (#5208) - Delete selection.cpp and selection.h and selectionWindow. - Extend ColorKeyedMaskBlt function. - Implement selection resizing. CORE-18867 --- base/applications/mspaint/CMakeLists.txt | 1 - base/applications/mspaint/canvas.cpp | 23 +- base/applications/mspaint/common.h | 1 - base/applications/mspaint/dib.cpp | 8 +- base/applications/mspaint/dib.h | 2 +- base/applications/mspaint/drawing.cpp | 97 +++-- base/applications/mspaint/drawing.h | 6 +- base/applications/mspaint/globalvar.h | 1 - base/applications/mspaint/history.cpp | 28 +- base/applications/mspaint/history.h | 1 - base/applications/mspaint/imgarea.cpp | 205 +++++++--- base/applications/mspaint/imgarea.h | 12 +- base/applications/mspaint/mouse.cpp | 129 +++---- base/applications/mspaint/palettemodel.cpp | 4 +- base/applications/mspaint/precomp.h | 1 - base/applications/mspaint/selection.cpp | 237 ------------ base/applications/mspaint/selection.h | 75 ---- base/applications/mspaint/selectionmodel.cpp | 544 +++++++++++++++------------ base/applications/mspaint/selectionmodel.h | 72 ++-- base/applications/mspaint/toolbox.cpp | 2 +- base/applications/mspaint/toolsmodel.cpp | 10 +- base/applications/mspaint/toolsmodel.h | 28 ++ base/applications/mspaint/winproc.cpp | 30 +- 23 files changed, 695 insertions(+), 822 deletions(-) diff --git a/base/applications/mspaint/CMakeLists.txt b/base/applications/mspaint/CMakeLists.txt index 2d6e24dc46d..57532cba22d 100644 --- a/base/applications/mspaint/CMakeLists.txt +++ b/base/applications/mspaint/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND SOURCE palette.cpp palettemodel.cpp registry.cpp - selection.cpp selectionmodel.cpp sizebox.cpp textedit.cpp diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index d538925f39d..c0fc4ad9210 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -150,14 +150,25 @@ LRESULT CCanvasWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BO if (hit == HIT_NONE || hit == HIT_BORDER) { - if (toolsModel.GetActiveTool() == TOOL_BEZIER || - toolsModel.GetActiveTool() == TOOL_SHAPE) + switch (toolsModel.GetActiveTool()) { - if (ToolBase::pointSP != 0) - { - toolsModel.OnCancelDraw(); + case TOOL_BEZIER: + case TOOL_SHAPE: + if (ToolBase::pointSP != 0) + { + toolsModel.OnCancelDraw(); + imageArea.Invalidate(); + } + break; + + case TOOL_FREESEL: + case TOOL_RECTSEL: + toolsModel.OnFinishDraw(); imageArea.Invalidate(); - } + break; + + default: + break; } toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 619133fc550..0b9890d27f9 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -56,6 +56,5 @@ enum CANVAS_HITTEST // hit BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); -void placeSelWin(void); void updateStartAndLast(LONG x, LONG y); void updateLast(LONG x, LONG y); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 96218a824a3..f46ef419934 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -220,9 +220,13 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile) return hBitmap; } -HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight) +HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) { - HBITMAP hbm2 = CreateDIBWithProperties(cy, cx); + HBITMAP hbm2; + if (bMono) + hbm2 = ::CreateBitmap(cy, cx, 1, 1, NULL); + else + hbm2 = CreateDIBWithProperties(cy, cx); if (!hbm2) return NULL; diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 82ccde6e9ed..f9eb7d37384 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -28,7 +28,7 @@ void ShowFileLoadError(LPCTSTR name); HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL isFile); -HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight); +HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono); HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical); diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index f94da436eca..86711c0f6f0 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -290,33 +290,76 @@ Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCT BOOL ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, - HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, - DWORD dwRop, COLORREF keyColor) + HDC hdcSrc, int nXSrc, int nYSrc, int nSrcWidth, int nSrcHeight, + HBITMAP hbmMask, COLORREF keyColor) { - HDC hTempDC; - HDC hTempDC2; - HBITMAP hTempBm; - HBRUSH hTempBrush; - HBITMAP hTempMask; - - hTempDC = CreateCompatibleDC(hdcSrc); - hTempDC2 = CreateCompatibleDC(hdcSrc); - hTempBm = CreateCompatibleBitmap(hTempDC, nWidth, nHeight); - SelectObject(hTempDC, hTempBm); - hTempBrush = CreateSolidBrush(keyColor); - SelectObject(hTempDC, hTempBrush); - BitBlt(hTempDC, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY); - PatBlt(hTempDC, 0, 0, nWidth, nHeight, PATINVERT); - hTempMask = CreateBitmap(nWidth, nHeight, 1, 1, NULL); - SelectObject(hTempDC2, hTempMask); - BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, 0, 0, SRCCOPY); - SelectObject(hTempDC, hbmMask); - BitBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC, xMask, yMask, SRCAND); - MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, hTempMask, xMask, yMask, dwRop); - DeleteDC(hTempDC); - DeleteDC(hTempDC2); - DeleteObject(hTempBm); - DeleteObject(hTempBrush); - DeleteObject(hTempMask); + HDC hTempDC1, hTempDC2; + HBITMAP hbmTempColor, hbmTempMask; + HGDIOBJ hbmOld1, hbmOld2; + + if (hbmMask == NULL) + { + if (keyColor == CLR_INVALID) + { + ::StretchBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, + hdcSrc, nXSrc, nYSrc, nSrcWidth, nSrcHeight, SRCCOPY); + } + else + { + ::GdiTransparentBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, + hdcSrc, nXSrc, nYSrc, nSrcWidth, nSrcHeight, keyColor); + } + return TRUE; + } + else if (nWidth == nSrcWidth && nHeight == nSrcHeight && keyColor == CLR_INVALID) + { + ::MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, + hdcSrc, nXSrc, nYSrc, hbmMask, 0, 0, MAKEROP4(SRCCOPY, 0xAA0029)); + return TRUE; + } + + hTempDC1 = ::CreateCompatibleDC(hdcDest); + hTempDC2 = ::CreateCompatibleDC(hdcDest); + hbmTempMask = ::CreateBitmap(nWidth, nHeight, 1, 1, NULL); + hbmTempColor = CreateColorDIB(nWidth, nHeight, RGB(255, 255, 255)); + + // hbmTempMask <-- hbmMask (stretched) + hbmOld1 = ::SelectObject(hTempDC1, hbmMask); + hbmOld2 = ::SelectObject(hTempDC2, hbmTempMask); + ::StretchBlt(hTempDC2, 0, 0, nWidth, nHeight, hTempDC1, 0, 0, nSrcWidth, nSrcHeight, SRCCOPY); + ::SelectObject(hTempDC2, hbmOld2); + ::SelectObject(hTempDC1, hbmOld1); + + hbmOld1 = ::SelectObject(hTempDC1, hbmTempColor); + if (keyColor == CLR_INVALID) + { + // hbmTempColor <-- hdcSrc (stretched) + ::StretchBlt(hTempDC1, 0, 0, nWidth, nHeight, + hdcSrc, nXSrc, nYSrc, nSrcWidth, nSrcHeight, SRCCOPY); + + // hdcDest <-- hbmTempColor (masked) + ::MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hTempDC1, 0, 0, + hbmTempMask, 0, 0, MAKEROP4(SRCCOPY, 0xAA0029)); + } + else + { + // hbmTempColor <-- hdcDest + ::BitBlt(hTempDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY); + + // hbmTempColor <-- hdcSrc (color key) + ::GdiTransparentBlt(hTempDC1, 0, 0, nWidth, nHeight, + hdcSrc, nXSrc, nYSrc, nSrcWidth, nSrcHeight, keyColor); + + // hdcDest <-- hbmTempColor (masked) + ::MaskBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hTempDC1, 0, 0, + hbmTempMask, 0, 0, MAKEROP4(SRCCOPY, 0xAA0029)); + } + ::SelectObject(hTempDC1, hbmOld1); + + ::DeleteObject(hbmTempColor); + ::DeleteObject(hbmTempMask); + ::DeleteDC(hTempDC2); + ::DeleteDC(hTempDC1); + return TRUE; } diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 5401168f92c..8fb0f54c6a6 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -34,7 +34,7 @@ void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); -extern BOOL +BOOL ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, - HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, - DWORD dwRop, COLORREF keyColor); + HDC hdcSrc, int nXSrc, int nYSrc, int nSrcWidth, int nSrcHeight, + HBITMAP hbmMask, COLORREF keyColor); diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index fe9e47f5f0b..058117f9390 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -52,6 +52,5 @@ extern CToolBox toolBoxContainer; extern CToolSettingsWindow toolSettingsWindow; extern CPaletteWindow paletteWindow; extern CCanvasWindow canvasWindow; -extern CSelectionWindow selectionWindow; extern CImgAreaWindow imageArea; extern CTextEditWindow textEditWindow; diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 847e6c6db81..0680865c2a6 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -64,7 +64,7 @@ void ImageModel::Undo(BOOL bClearRedo) { int oldWidth = GetWidth(); int oldHeight = GetHeight(); - selectionWindow.ShowWindow(SW_HIDE); + selectionModel.m_bShow = FALSE; currInd = (currInd + HISTORYSIZE - 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); undoSteps--; @@ -85,7 +85,7 @@ void ImageModel::Redo() { int oldWidth = GetWidth(); int oldHeight = GetHeight(); - selectionWindow.ShowWindow(SW_HIDE); + selectionModel.m_bShow = FALSE; currInd = (currInd + 1) % HISTORYSIZE; SelectObject(hDrawingDC, hBms[currInd]); redoSteps--; @@ -264,7 +264,7 @@ void ImageModel::RotateNTimes90Degrees(int iN) case 1: case 3: DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = Rotate90DegreeBlt(hDrawingDC, GetWidth(), GetHeight(), iN == 1); + hBms[(currInd + 1) % HISTORYSIZE] = Rotate90DegreeBlt(hDrawingDC, GetWidth(), GetHeight(), iN == 1, FALSE); currInd = (currInd + 1) % HISTORYSIZE; if (undoSteps < HISTORYSIZE - 1) undoSteps++; @@ -282,23 +282,15 @@ void ImageModel::RotateNTimes90Degrees(int iN) NotifyImageChanged(); } -void ImageModel::DrawSelectionBackground(COLORREF rgbBG) -{ - if (toolsModel.GetActiveTool() == TOOL_FREESEL) - selectionModel.DrawBackgroundPoly(hDrawingDC, rgbBG); - else - selectionModel.DrawBackgroundRect(hDrawingDC, rgbBG); -} - void ImageModel::DeleteSelection() { - if (selectionWindow.IsWindowVisible()) - ResetToPrevious(); - CopyPrevious(); - if (selectionWindow.IsWindowVisible()) - Undo(TRUE); - DrawSelectionBackground(paletteModel.GetBgColor()); - selectionWindow.ShowWindow(SW_HIDE); + if (!selectionModel.m_bShow) + return; + + selectionModel.TakeOff(); + selectionModel.m_bShow = FALSE; + selectionModel.ClearColor(); + selectionModel.ClearMask(); NotifyImageChanged(); } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 17ef43b9e48..40792f8d661 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -45,7 +45,6 @@ public: void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); - void DrawSelectionBackground(COLORREF rgbBG); void DeleteSelection(); void Bound(POINT& pt); }; diff --git a/base/applications/mspaint/imgarea.cpp b/base/applications/mspaint/imgarea.cpp index dfb93455b43..abae54c89a5 100644 --- a/base/applications/mspaint/imgarea.cpp +++ b/base/applications/mspaint/imgarea.cpp @@ -21,7 +21,6 @@ LRESULT CImgAreaWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& m_hCurZoom = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_ZOOM)); m_hCurPen = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_PEN)); m_hCurAirbrush = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDC_AIRBRUSH)); - return 0; } @@ -71,49 +70,61 @@ LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH LRESULT CImgAreaWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - HDC hdc = (HDC)wParam; - - if (toolsModel.GetActiveTool() == TOOL_TEXT && !toolsModel.IsBackgroundTransparent() && - ::IsWindowVisible(textEditWindow)) - { - // Do clipping - HWND hChild = textEditWindow; - RECT rcChild; - ::GetWindowRect(hChild, &rcChild); - ::MapWindowPoints(NULL, m_hWnd, (LPPOINT)&rcChild, 2); - ExcludeClipRect(hdc, rcChild.left, rcChild.top, rcChild.right, rcChild.bottom); - } - - return DefWindowProc(nMsg, wParam, lParam); + return TRUE; // Don't fill background } LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + RECT rcClient; + GetClientRect(&rcClient); + PAINTSTRUCT ps; HDC hdc = BeginPaint(&ps); - int imgXRes = imageModel.GetWidth(); - int imgYRes = imageModel.GetHeight(); - StretchBlt(hdc, 0, 0, Zoomed(imgXRes), Zoomed(imgYRes), imageModel.GetDC(), 0, 0, imgXRes, - imgYRes, SRCCOPY); + + // We use a memory bitmap to reduce flickering + HDC hdcMem = ::CreateCompatibleDC(hdc); + HBITMAP hbm = ::CreateCompatibleBitmap(hdc, rcClient.right, rcClient.bottom); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, hbm); + + // Draw the image + SIZE size = { imageModel.GetWidth(), imageModel.GetHeight() }; + StretchBlt(hdcMem, 0, 0, ::Zoomed(size.cx), ::Zoomed(size.cy), + imageModel.GetDC(), 0, 0, size.cx, size.cy, SRCCOPY); + + // Draw the grid if (showGrid && (toolsModel.GetZoom() >= 4000)) { - HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00a0a0a0)); - int counter; - for(counter = 0; counter <= imgYRes; counter++) + HPEN oldPen = (HPEN) SelectObject(hdcMem, CreatePen(PS_SOLID, 1, 0x00a0a0a0)); + for (int counter = 0; counter <= size.cy; counter++) { - MoveToEx(hdc, 0, Zoomed(counter), NULL); - LineTo(hdc, Zoomed(imgXRes), Zoomed(counter)); + ::MoveToEx(hdcMem, 0, ::Zoomed(counter), NULL); + ::LineTo(hdcMem, ::Zoomed(size.cx), ::Zoomed(counter)); } - for(counter = 0; counter <= imgXRes; counter++) + for (int counter = 0; counter <= size.cx; counter++) { - MoveToEx(hdc, Zoomed(counter), 0, NULL); - LineTo(hdc, Zoomed(counter), Zoomed(imgYRes)); + ::MoveToEx(hdcMem, ::Zoomed(counter), 0, NULL); + ::LineTo(hdcMem, ::Zoomed(counter), ::Zoomed(size.cy)); } - DeleteObject(SelectObject(hdc, oldPen)); + ::DeleteObject(::SelectObject(hdcMem, oldPen)); } + + // Draw selection + if (selectionModel.m_bShow) + { + RECT rc = selectionModel.m_rc; + Zoomed(rc); + ::InflateRect(&rc, GRIP_SIZE, GRIP_SIZE); + drawSizeBoxes(hdcMem, &rc, TRUE, &ps.rcPaint); + ::InflateRect(&rc, -GRIP_SIZE, -GRIP_SIZE); + selectionModel.DrawSelection(hdcMem, &rc, paletteModel.GetBgColor(), + toolsModel.IsBackgroundTransparent()); + } + + // Transfer bits + ::BitBlt(hdc, 0, 0, rcClient.right, rcClient.bottom, hdcMem, 0, 0, SRCCOPY); + ::SelectObject(hdcMem, hbmOld); EndPaint(&ps); - if (selectionWindow.IsWindow()) - selectionWindow.Invalidate(FALSE); + if (miniature.IsWindow()) miniature.Invalidate(FALSE); if (textEditWindow.IsWindow()) @@ -121,8 +132,57 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b return 0; } +CANVAS_HITTEST CImgAreaWindow::SelectionHitTest(POINT ptZoomed) +{ + if (!selectionModel.m_bShow) + return HIT_NONE; + + RECT rcSelection = selectionModel.m_rc; + Zoomed(rcSelection); + ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); + + return getSizeBoxHitTest(ptZoomed, &rcSelection); +} + +void CImgAreaWindow::StartSelectionDrag(CANVAS_HITTEST hit, POINT ptUnZoomed) +{ + m_hitSelection = hit; + selectionModel.m_ptHit = ptUnZoomed; + selectionModel.TakeOff(); + + SetCapture(); + Invalidate(FALSE); +} + +void CImgAreaWindow::SelectionDragging(POINT ptUnZoomed) +{ + selectionModel.Dragging(m_hitSelection, ptUnZoomed); + Invalidate(FALSE); +} + +void CImgAreaWindow::EndSelectionDrag(POINT ptUnZoomed) +{ + selectionModel.Dragging(m_hitSelection, ptUnZoomed); + m_hitSelection = HIT_NONE; + Invalidate(FALSE); +} + LRESULT CImgAreaWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt; + ::GetCursorPos(&pt); + ScreenToClient(&pt); + + CANVAS_HITTEST hit = SelectionHitTest(pt); + if (hit != HIT_NONE) + { + if (!setCursorOnSizeBox(hit)) + ::SetCursor(::LoadCursor(NULL, IDC_SIZEALL)); + return 0; + } + + UnZoomed(pt); + switch (toolsModel.GetActiveTool()) { case TOOL_FILL: @@ -148,20 +208,31 @@ LRESULT CImgAreaWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO LRESULT CImgAreaWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + + CANVAS_HITTEST hit = SelectionHitTest(pt); + if (hit != HIT_NONE) + { + UnZoomed(pt); + StartSelectionDrag(hit, pt); + return 0; + } + + UnZoomed(pt); drawing = TRUE; SetCapture(); - INT x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - toolsModel.OnButtonDown(TRUE, UnZoomed(x), UnZoomed(y), FALSE); + toolsModel.OnButtonDown(TRUE, pt.x, pt.y, FALSE); Invalidate(FALSE); return 0; } LRESULT CImgAreaWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + UnZoomed(pt); drawing = FALSE; ReleaseCapture(); - INT x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - toolsModel.OnButtonDown(TRUE, UnZoomed(x), UnZoomed(y), TRUE); + toolsModel.OnButtonDown(TRUE, pt.x, pt.y, TRUE); toolsModel.resetTool(); Invalidate(FALSE); return 0; @@ -169,20 +240,22 @@ LRESULT CImgAreaWindow::OnLButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CImgAreaWindow::OnRButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + UnZoomed(pt); drawing = TRUE; SetCapture(); - INT x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - toolsModel.OnButtonDown(FALSE, UnZoomed(x), UnZoomed(y), FALSE); + toolsModel.OnButtonDown(FALSE, pt.x, pt.y, FALSE); Invalidate(FALSE); return 0; } LRESULT CImgAreaWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + UnZoomed(pt); drawing = FALSE; ReleaseCapture(); - INT x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - toolsModel.OnButtonDown(FALSE, UnZoomed(x), UnZoomed(y), TRUE); + toolsModel.OnButtonDown(FALSE, pt.x, pt.y, TRUE); toolsModel.resetTool(); Invalidate(FALSE); return 0; @@ -190,20 +263,28 @@ LRESULT CImgAreaWindow::OnRButtonDblClk(UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT CImgAreaWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + UnZoomed(pt); if (drawing) { drawing = FALSE; - INT x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - toolsModel.OnButtonUp(TRUE, UnZoomed(x), UnZoomed(y)); + toolsModel.OnButtonUp(TRUE, pt.x, pt.y); Invalidate(FALSE); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); } + else if (m_hitSelection != HIT_NONE) + { + EndSelectionDrag(pt); + } ReleaseCapture(); return 0; } void CImgAreaWindow::cancelDrawing() { + selectionModel.ClearColor(); + selectionModel.ClearMask(); + m_hitSelection = HIT_NONE; drawing = FALSE; toolsModel.OnCancelDraw(); Invalidate(FALSE); @@ -226,7 +307,7 @@ LRESULT CImgAreaWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& } else { - if (drawing || ToolBase::pointSP != 0 || selectionWindow.IsWindowVisible()) + if (drawing || ToolBase::pointSP != 0 || selectionModel.m_bShow) cancelDrawing(); } } @@ -235,22 +316,34 @@ LRESULT CImgAreaWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CImgAreaWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + UnZoomed(pt); if (drawing) { drawing = FALSE; - INT x = GET_X_LPARAM(lParam), y = GET_Y_LPARAM(lParam); - toolsModel.OnButtonUp(FALSE, UnZoomed(x), UnZoomed(y)); + toolsModel.OnButtonUp(FALSE, pt.x, pt.y); Invalidate(FALSE); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) ""); } + else if (m_hitSelection != HIT_NONE) + { + EndSelectionDrag(pt); + } ReleaseCapture(); return 0; } LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - LONG xNow = UnZoomed(GET_X_LPARAM(lParam)); - LONG yNow = UnZoomed(GET_Y_LPARAM(lParam)); + POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; + UnZoomed(pt); + + if (m_hitSelection != HIT_NONE) + { + SelectionDragging(pt); + return 0; + } + if ((!drawing) || (toolsModel.GetActiveTool() <= TOOL_AIRBRUSH)) { TRACKMOUSEEVENT tme; @@ -271,26 +364,26 @@ LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO if (!drawing) { CString strCoord; - strCoord.Format(_T("%ld, %ld"), xNow, yNow); + strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); } } if (drawing) { /* values displayed in statusbar */ - LONG xRel = xNow - start.x; - LONG yRel = yNow - start.y; + LONG xRel = pt.x - start.x; + LONG yRel = pt.y - start.y; /* freesel, rectsel and text tools always show numbers limited to fit into image area */ if ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_TEXT)) { if (xRel < 0) - xRel = (xNow < 0) ? -start.x : xRel; - else if (xNow > imageModel.GetWidth()) + xRel = (pt.x < 0) ? -start.x : xRel; + else if (pt.x > imageModel.GetWidth()) xRel = imageModel.GetWidth() - start.x; if (yRel < 0) - yRel = (yNow < 0) ? -start.y : yRel; - else if (yNow > imageModel.GetHeight()) - yRel = imageModel.GetHeight() - start.y; + yRel = (pt.y < 0) ? -start.y : yRel; + else if (pt.y > imageModel.GetHeight()) + yRel = imageModel.GetHeight() - start.y; } /* rectsel and shape tools always show non-negative numbers when drawing */ if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_SHAPE)) @@ -310,7 +403,7 @@ LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO case TOOL_SHAPE: { CString strCoord; - strCoord.Format(_T("%ld, %ld"), xNow, yNow); + strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); break; } @@ -319,7 +412,7 @@ LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO } if (wParam & MK_LBUTTON) { - toolsModel.OnMouseMove(TRUE, xNow, yNow); + toolsModel.OnMouseMove(TRUE, pt.x, pt.y); Invalidate(FALSE); if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) { @@ -332,7 +425,7 @@ LRESULT CImgAreaWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO } if (wParam & MK_RBUTTON) { - toolsModel.OnMouseMove(FALSE, xNow, yNow); + toolsModel.OnMouseMove(FALSE, pt.x, pt.y); Invalidate(FALSE); if (toolsModel.GetActiveTool() >= TOOL_TEXT) { diff --git a/base/applications/mspaint/imgarea.h b/base/applications/mspaint/imgarea.h index daef656590a..941424d0af9 100644 --- a/base/applications/mspaint/imgarea.h +++ b/base/applications/mspaint/imgarea.h @@ -13,9 +13,15 @@ class CImgAreaWindow : public CWindowImpl<CImgAreaWindow> { public: - CImgAreaWindow() : drawing(FALSE) { } + CImgAreaWindow() + : drawing(FALSE) + , m_hitSelection(HIT_NONE) + { + } BOOL drawing; + CANVAS_HITTEST m_hitSelection; + void cancelDrawing(); void finishDrawing(); @@ -71,4 +77,8 @@ private: LRESULT OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); void drawZoomFrame(int mouseX, int mouseY); + CANVAS_HITTEST SelectionHitTest(POINT ptZoomed); + void StartSelectionDrag(CANVAS_HITTEST hit, POINT ptUnZoomed); + void SelectionDragging(POINT ptUnZoomed); + void EndSelectionDrag(POINT ptUnZoomed); }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 57f289487c6..5d1c4fcefea 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -16,20 +16,6 @@ POINT ToolBase::pointStack[256] = { { 0 } }; /* FUNCTIONS ********************************************************/ -void -placeSelWin() -{ - CRect rc; - rc.left = Zoomed(selectionModel.GetDestRectLeft()); - rc.top = Zoomed(selectionModel.GetDestRectTop()); - rc.right = rc.left + Zoomed(selectionModel.GetDestRectWidth()); - rc.bottom = rc.top + Zoomed(selectionModel.GetDestRectHeight()); - ::InflateRect(&rc, GRIP_SIZE, GRIP_SIZE); - selectionWindow.MoveWindow(rc.left, rc.top, rc.Width(), rc.Height(), TRUE); - selectionWindow.BringWindowToTop(); - imageArea.InvalidateRect(NULL, FALSE); -} - void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { @@ -82,8 +68,11 @@ void ToolBase::reset() pointSP = 0; start.x = start.y = last.x = last.y = -1; selectionModel.ResetPtStack(); - if (selectionWindow.IsWindow()) - selectionWindow.ShowWindow(SW_HIDE); + if (selectionModel.m_bShow) + { + selectionModel.Landing(); + selectionModel.m_bShow = FALSE; + } } void ToolBase::OnCancelDraw() @@ -121,12 +110,14 @@ struct FreeSelTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { + selectionModel.Landing(); if (bLeftButton) { imageModel.CopyPrevious(); - selectionWindow.ShowWindow(SW_HIDE); + selectionModel.m_bShow = FALSE; selectionModel.ResetPtStack(); - selectionModel.PushToPtStack(x, y); + POINT pt = { x, y }; + selectionModel.PushToPtStack(pt); } m_bLeftButton = bLeftButton; } @@ -137,7 +128,7 @@ struct FreeSelTool : ToolBase { POINT pt = { x, y }; imageModel.Bound(pt); - selectionModel.PushToPtStack(pt.x, pt.y); + selectionModel.PushToPtStack(pt); imageModel.ResetToPrevious(); selectionModel.DrawFramePoly(m_hdc); } @@ -150,28 +141,25 @@ struct FreeSelTool : ToolBase imageModel.ResetToPrevious(); if (selectionModel.PtStackSize() > 2) { - selectionModel.CalculateBoundingBoxAndContents(m_hdc); - placeSelWin(); - selectionWindow.IsMoved(FALSE); - selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); + selectionModel.BuildMaskFromPtStack(); + selectionModel.TakeOff(); + selectionModel.m_bShow = TRUE; } else { imageModel.Undo(TRUE); - selectionWindow.IsMoved(FALSE); selectionModel.ResetPtStack(); - selectionWindow.ShowWindow(SW_HIDE); + selectionModel.m_bShow = FALSE; } + imageArea.Invalidate(FALSE); } } void OnFinishDraw() { if (m_bLeftButton) - { - selectionWindow.IsMoved(FALSE); - selectionWindow.ForceRefreshSelectionContents(); - } + imageArea.Invalidate(FALSE); + m_bLeftButton = FALSE; ToolBase::OnFinishDraw(); } @@ -181,7 +169,6 @@ struct FreeSelTool : ToolBase if (m_bLeftButton) imageModel.Undo(TRUE); m_bLeftButton = FALSE; - selectionWindow.IsMoved(FALSE); ToolBase::OnCancelDraw(); } }; @@ -197,11 +184,12 @@ struct RectSelTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { + selectionModel.Landing(); if (bLeftButton) { imageModel.CopyPrevious(); - selectionWindow.ShowWindow(SW_HIDE); - selectionModel.SetSrcRectSizeToZero(); + selectionModel.m_bShow = FALSE; + ::SetRectEmpty(&selectionModel.m_rc); } m_bLeftButton = bLeftButton; } @@ -213,7 +201,7 @@ struct RectSelTool : ToolBase imageModel.ResetToPrevious(); POINT pt = { x, y }; imageModel.Bound(pt); - selectionModel.SetSrcAndDestRectFromPoints(start, pt); + selectionModel.SetRectFromPoints(start, pt); RectSel(m_hdc, start.x, start.y, pt.x, pt.y); } } @@ -225,23 +213,16 @@ struct RectSelTool : ToolBase imageModel.ResetToPrevious(); if (start.x == x && start.y == y) imageModel.Undo(TRUE); - selectionModel.CalculateContents(m_hdc); - placeSelWin(); - selectionWindow.IsMoved(FALSE); - if (selectionModel.IsSrcRectSizeNonzero()) - selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); - else - selectionWindow.ShowWindow(SW_HIDE); + selectionModel.m_bShow = !selectionModel.m_rc.IsRectEmpty(); + imageArea.Invalidate(FALSE); } } void OnFinishDraw() { if (m_bLeftButton) - { - selectionWindow.IsMoved(FALSE); - selectionWindow.ForceRefreshSelectionContents(); - } + imageArea.Invalidate(FALSE); + m_bLeftButton = FALSE; ToolBase::OnFinishDraw(); } @@ -251,7 +232,6 @@ struct RectSelTool : ToolBase if (m_bLeftButton) imageModel.Undo(TRUE); m_bLeftButton = FALSE; - selectionWindow.IsMoved(FALSE); ToolBase::OnCancelDraw(); } }; @@ -430,7 +410,7 @@ struct TextTool : ToolBase imageModel.ResetToPrevious(); POINT pt = { x, y }; imageModel.Bound(pt); - selectionModel.SetSrcAndDestRectFromPoints(start, pt); + selectionModel.SetRectFromPoints(start, pt); RectSel(m_hdc, start.x, start.y, pt.x, pt.y); } @@ -452,6 +432,10 @@ struct TextTool : ToolBase { imageModel.Undo(TRUE); + POINT pt = { x, y }; + imageModel.Bound(pt); + selectionModel.SetRectFromPoints(start, pt); + BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow); if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) { @@ -466,6 +450,13 @@ struct TextTool : ToolBase imageModel.CopyPrevious(); Text(m_hdc, rc.left, rc.top, rc.right, rc.bottom, m_fg, m_bg, szText, textEditWindow.GetFont(), style); + + if (selectionModel.m_rc.IsRectEmpty()) + { + textEditWindow.ShowWindow(SW_HIDE); + textEditWindow.SetWindowText(NULL); + return; + } } if (registrySettings.ShowTextTool) @@ -476,45 +467,35 @@ struct TextTool : ToolBase fontsDialog.ShowWindow(SW_SHOWNOACTIVATE); } - if (!bTextBoxShown || selectionModel.IsSrcRectSizeNonzero()) - { - RECT rc; - selectionModel.GetRect(&rc); + RECT rc = selectionModel.m_rc; - // Enlarge if tool small - INT cxMin = CX_MINTEXTEDIT, cyMin = CY_MINTEXTEDIT; - if (selectionModel.IsSrcRectSizeNonzero()) - { - if (rc.right - rc.left < cxMin) - rc.right = rc.left + cxMin; - if (rc.bottom - rc.top < cyMin) - rc.bottom = rc.top + cyMin; - } - else - { - SetRect(&rc, x, y, x + cxMin, y + cyMin); - } - - if (!textEditWindow.IsWindow()) - textEditWindow.Create(imageArea); - - textEditWindow.SetWindowText(NULL); - textEditWindow.ValidateEditRect(&rc); - textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); - textEditWindow.SetFocus(); + // Enlarge if tool small + INT cxMin = CX_MINTEXTEDIT, cyMin = CY_MINTEXTEDIT; + if (selectionModel.m_rc.IsRectEmpty()) + { + SetRect(&rc, x, y, x + cxMin, y + cyMin); } else { - textEditWindow.ShowWindow(SW_HIDE); - textEditWindow.SetWindowText(NULL); + if (rc.right - rc.left < cxMin) + rc.right = rc.left + cxMin; + if (rc.bottom - rc.top < cyMin) + rc.bottom = rc.top + cyMin; } + + if (!textEditWindow.IsWindow()) + textEditWindow.Create(imageArea); + + textEditWindow.SetWindowText(NULL); + textEditWindow.ValidateEditRect(&rc); + textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); + textEditWindow.SetFocus(); } void OnFinishDraw() { toolsModel.OnButtonDown(TRUE, -1, -1, TRUE); toolsModel.OnButtonUp(TRUE, -1, -1); - selectionWindow.IsMoved(FALSE); ToolBase::OnFinishDraw(); } }; diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index b4ae440658f..cf920bc43e0 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -97,8 +97,8 @@ void PaletteModel::NotifyColorChanged() { if (paletteWindow.IsWindow()) paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); - if (selectionWindow.IsWindow()) - selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); + if (imageArea.IsWindow()) + imageArea.SendMessage(WM_PALETTEMODELCOLORCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); } diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 5dda7a9c682..ae4e584e229 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -43,7 +43,6 @@ #include "palette.h" #include "palettemodel.h" #include "registry.h" -#include "selection.h" #include "selectionmodel.h" #include "sizebox.h" #include "canvas.h" diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp deleted file mode 100644 index 1426e086d59..00000000000 --- a/base/applications/mspaint/selection.cpp +++ /dev/null @@ -1,237 +0,0 @@ -/* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/selection.cpp - * PURPOSE: Window procedure of the selection window - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ - */ - -#include "precomp.h" - -CSelectionWindow selectionWindow; - -/* FUNCTIONS ********************************************************/ - -const LPCTSTR CSelectionWindow::m_lpszCursorLUT[9] = { /* action to mouse cursor lookup table */ - IDC_SIZEALL, - - IDC_SIZENWSE, IDC_SIZENS, IDC_SIZENESW, - IDC_SIZEWE, IDC_SIZEWE, - IDC_SIZENESW, IDC_SIZENS, IDC_SIZENWSE -}; - -void CSelectionWindow::ForceRefreshSelectionContents() -{ - if (::IsWindowVisible(selectionWindow)) - { - imageModel.ResetToPrevious(); - imageModel.DrawSelectionBackground(m_rgbBack); - selectionModel.DrawSelection(imageModel.GetDC(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - } -} - -int CSelectionWindow::IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeight) -{ - return 0; -} - -LRESULT CSelectionWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - PAINTSTRUCT ps; - HDC hDC = BeginPaint(&ps); - if (!m_bMoving) - { - RECT rcClient; - GetClientRect(&rcClient); - drawSizeBoxes(hDC, &rcClient, TRUE, &ps.rcPaint); - } - EndPaint(&ps); - return 0; -} - -LRESULT CSelectionWindow::OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - // do nothing => transparent background - return TRUE; -} - -LRESULT CSelectionWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - m_bMoving = FALSE; - m_iAction = ACTION_MOVE; - /* update the system selection color */ - Invalidate(); - return 0; -} - -LRESULT CSelectionWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - /* update the system selection color */ - Invalidate(); - return 0; -} - -LRESULT CSelectionWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - RECT rcClient; - GetClientRect(&rcClient); - - POINT pt; - ::GetCursorPos(&pt); - ScreenToClient(&pt); - - if (!setCursorOnSizeBox(getSizeBoxHitTest(pt, &rcClient))) - ::SetCursor(::LoadCursor(NULL, IDC_SIZEALL)); - - return 0; -} - -LRESULT CSelectionWindow::OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - m_ptPos.x = GET_X_LPARAM(lParam); - m_ptPos.y = GET_Y_LPARAM(lParam); - m_ptDelta.x = 0; - m_ptDelta.y = 0; - SetCapture(); - if (m_iAction != ACTION_MOVE) - SetCursor(LoadCursor(NULL, m_lpszCursorLUT[m_iAction])); - m_bMoving = TRUE; - imageArea.InvalidateRect(NULL, FALSE); - imageArea.SendMessage(WM_PAINT, 0, 0); - m_rgbBack = paletteModel.GetBgColor(); - return 0; -} - -LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (m_bMoving) - { - imageModel.ResetToPrevious(); - imageModel.DrawSelectionBackground(m_rgbBack); - m_ptFrac.x += GET_X_LPARAM(lParam) - m_ptPos.x; - m_ptFrac.y += GET_Y_LPARAM(lParam) - m_ptPos.y; - m_ptDelta.x += UnZoomed(m_ptFrac.x); - m_ptDelta.y += UnZoomed(m_ptFrac.y); - if (toolsModel.GetZoom() < 1000) - { - m_ptFrac.x = 0; - m_ptFrac.y = 0; - } - else - { - m_ptFrac.x -= Zoomed(UnZoomed(m_ptFrac.x)); - m_ptFrac.y -= Zoomed(UnZoomed(m_ptFrac.y)); - } - selectionModel.ModifyDestRect(m_ptDelta, m_iAction); - - CString strSize; - strSize.Format(_T("%ld x %ld"), selectionModel.GetDestRectWidth(), selectionModel.GetDestRectHeight()); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); - - if (m_iAction != ACTION_MOVE) - selectionModel.DrawSelectionStretched(imageModel.GetDC()); - else - selectionModel.DrawSelection(imageModel.GetDC(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); - imageArea.InvalidateRect(NULL, FALSE); - imageArea.SendMessage(WM_PAINT, 0, 0); - m_ptPos.x = GET_X_LPARAM(lParam); - m_ptPos.y = GET_Y_LPARAM(lParam); - } - else - { - int w = Zoomed(selectionModel.GetDestRectWidth()) + 2 * GRIP_SIZE; - int h = Zoomed(selectionModel.GetDestRectHeight()) + 2 * GRIP_SIZE; - m_ptPos.x = GET_X_LPARAM(lParam); - m_ptPos.y = GET_Y_LPARAM(lParam); - SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) NULL); - m_iAction = IdentifyCorner(m_ptPos.x, m_ptPos.y, w, h); - if (m_iAction != ACTION_MOVE) - SetCursor(LoadCursor(NULL, m_lpszCursorLUT[m_iAction])); - } - return 0; -} - -LRESULT CSelectionWindow::OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - m_bMoved = TRUE; - return 0; -} - -LRESULT CSelectionWindow::OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (m_bMoving) - { - m_bMoving = FALSE; - ReleaseCapture(); - if (m_iAction != ACTION_MOVE && toolsModel.GetActiveTool() != TOOL_TEXT) - { - imageModel.Undo(); - imageModel.DrawSelectionBackground(m_rgbBack); - selectionModel.ScaleContentsToFit(); - imageModel.CopyPrevious(); - } - placeSelWin(); - } - return 0; -} - -LRESULT CSelectionWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (m_bMoving) - { - m_bMoving = FALSE; - if (m_iAction == ACTION_MOVE) - { - if (toolsModel.GetActiveTool() == TOOL_RECTSEL) - imageArea.cancelDrawing(); - else - placeSelWin(); - } - else - { - m_iAction = ACTION_MOVE; - } - ShowWindow(SW_HIDE); - } - return 0; -} - -LRESULT CSelectionWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - if (wParam == VK_ESCAPE) - { - if (GetCapture() == m_hWnd) - { - ReleaseCapture(); - } - } - return 0; -} - -LRESULT CSelectionWindow::OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return 0; -} - -LRESULT CSelectionWindow::OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return 0; -} - -LRESULT CSelectionWindow::OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - ForceRefreshSelectionContents(); - return 0; -} - -LRESULT CSelectionWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return ::SendMessage(GetParent(), nMsg, wParam, lParam); -} - -LRESULT CSelectionWindow::OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - placeSelWin(); - return 0; -} diff --git a/base/applications/mspaint/selection.h b/base/applications/mspaint/selection.h deleted file mode 100644 index 8e61b77d9ef..00000000000 --- a/base/applications/mspaint/selection.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/selection.h - * PURPOSE: Window procedure of the selection window - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ - */ - -#pragma once - -class CSelectionWindow : public CWindowImpl<CSelectionWindow> -{ -public: - CSelectionWindow() : m_bMoved(FALSE) - { - } - - BOOL IsMoved() const { return m_bMoved; } - void IsMoved(BOOL bMoved) { m_bMoved = bMoved; } - - void ForceRefreshSelectionContents(); - - DECLARE_WND_CLASS_EX(_T("Selection"), CS_DBLCLKS, COLOR_BTNFACE) - - BEGIN_MSG_MAP(CSelectionWindow) - MESSAGE_HANDLER(WM_PAINT, OnPaint) - MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) - MESSAGE_HANDLER(WM_MOUSEWHEEL, OnMouseWheel) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_MOVE, OnMove) - MESSAGE_HANDLER(WM_PALETTEMODELCOLORCHANGED, OnPaletteModelColorChanged) - MESSAGE_HANDLER(WM_TOOLSMODELSETTINGSCHANGED, OnToolsModelSettingsChanged) - MESSAGE_HANDLER(WM_TOOLSMODELZOOMCHANGED, OnToolsModelZoomChanged) - MESSAGE_HANDLER(WM_SELECTIONMODELREFRESHNEEDED, OnSelectionModelRefreshNeeded) - MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) - MESSAGE_HANDLER(WM_KEYDOWN, OnKeyDown) - END_MSG_MAP() - - LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnPaletteModelColorChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnToolsModelSettingsChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnToolsModelZoomChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnSelectionModelRefreshNeeded(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - LRESULT OnMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); - -private: - static const LPCTSTR m_lpszCursorLUT[9]; - BOOL m_bMoved; - BOOL m_bMoving; - int m_iAction; - POINT m_ptPos; - POINT m_ptFrac; - POINT m_ptDelta; - COLORREF m_rgbBack; - - int IdentifyCorner(int iXPos, int iYPos, int iWidth, int iHeight); -}; - -void ForceRefreshSelectionContents(); diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 2079f7afd9b..f7c61d16c28 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -14,225 +14,295 @@ SelectionModel selectionModel; /* FUNCTIONS ********************************************************/ SelectionModel::SelectionModel() - : m_hDC(CreateCompatibleDC(NULL)) - , m_hBm(NULL) - , m_hMask(NULL) + : m_hbmColor(NULL) + , m_hbmMask(NULL) , m_ptStack(NULL) , m_iPtSP(0) + , m_bShow(FALSE) { - SetRectEmpty(&m_rcSrc); - SetRectEmpty(&m_rcDest); + ::SetRectEmpty(&m_rc); + m_ptHit.x = m_ptHit.y = -1; } SelectionModel::~SelectionModel() { - DeleteDC(m_hDC); + ClearColor(); + ClearMask(); ResetPtStack(); - if (m_hBm) - { - DeleteObject(m_hBm); - } - if (m_hMask) - { - DeleteObject(m_hMask); - } } void SelectionModel::ResetPtStack() { - if (m_ptStack != NULL) - HeapFree(GetProcessHeap(), 0, m_ptStack); - m_ptStack = NULL; + if (m_ptStack) + { + free(m_ptStack); + m_ptStack = NULL; + } m_iPtSP = 0; } -void SelectionModel::PushToPtStack(LONG x, LONG y) +void SelectionModel::PushToPtStack(POINT pt) { - if (m_iPtSP % 1024 == 0) +#define GROW_COUNT 256 + if (m_iPtSP % GROW_COUNT == 0) { - if (m_ptStack) - m_ptStack = (POINT*) HeapReAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, m_ptStack, sizeof(POINT) * (m_iPtSP + 1024)); - else - m_ptStack = (POINT*) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * 1024); + INT nNewCount = m_iPtSP + GROW_COUNT; + LPPOINT pptNew = (LPPOINT)realloc(m_ptStack, sizeof(POINT) * nNewCount); + if (pptNew == NULL) + return; + m_ptStack = pptNew; } - m_ptStack[m_iPtSP].x = x; - m_ptStack[m_iPtSP].y = y; + m_ptStack[m_iPtSP] = pt; m_iPtSP++; +#undef GROW_COUNT } -void SelectionModel::CalculateBoundingBoxAndContents(HDC hDCImage) +void SelectionModel::ShiftPtStack(BOOL bPlus) { - int i; - m_rcSrc.left = m_rcSrc.top = MAXLONG; - m_rcSrc.right = m_rcSrc.bottom = 0; - for (i = 0; i < m_iPtSP; i++) + if (bPlus) { - if (m_ptStack[i].x < m_rcSrc.left) - m_rcSrc.left = m_ptStack[i].x; - if (m_ptStack[i].y < m_rcSrc.top) - m_rcSrc.top = m_ptStack[i].y; - if (m_ptStack[i].x > m_rcSrc.right) - m_rcSrc.right = m_ptStack[i].x; - if (m_ptStack[i].y > m_rcSrc.bottom) - m_rcSrc.bottom = m_ptStack[i].y; + for (INT i = 0; i < m_iPtSP; ++i) + { + POINT& pt = m_ptStack[i]; + pt.x += m_rc.left; + pt.y += m_rc.top; + } } - m_rcSrc.right += 1; - m_rcSrc.bottom += 1; - m_rcDest.left = m_rcSrc.left; - m_rcDest.top = m_rcSrc.top; - m_rcDest.right = m_rcSrc.right; - m_rcDest.bottom = m_rcSrc.bottom; - - if (m_iPtSP > 1) + else { - DeleteObject(m_hMask); - m_hMask = CreateBitmap(RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc), 1, 1, NULL); - DeleteObject(SelectObject(m_hDC, m_hMask)); - POINT *m_ptStackCopy = (POINT*) HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(POINT) * m_iPtSP); - for (i = 0; i < m_iPtSP; i++) + for (INT i = 0; i < m_iPtSP; ++i) { - m_ptStackCopy[i].x = m_ptStack[i].x - m_rcSrc.left; - m_ptStackCopy[i].y = m_ptStack[i].y - m_rcSrc.top; + POINT& pt = m_ptStack[i]; + pt.x -= m_rc.left; + pt.y -= m_rc.top; } - Poly(m_hDC, m_ptStackCopy, m_iPtSP, 0x00ffffff, 0x00ffffff, 1, 2, TRUE, FALSE); - HeapFree(GetProcessHeap(), 0, m_ptStackCopy); - SelectObject(m_hDC, m_hBm = CreateDIBWithProperties(RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc))); - imageModel.ResetToPrevious(); - MaskBlt(m_hDC, 0, 0, RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc), hDCImage, m_rcSrc.left, - m_rcSrc.top, m_hMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); } } -void SelectionModel::CalculateContents(HDC hDCImage) +void SelectionModel::BuildMaskFromPtStack() { - DeleteObject(m_hMask); - m_hMask = CreateBitmap(RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc), 1, 1, NULL); - DeleteObject(SelectObject(m_hDC, m_hMask)); - Rect(m_hDC, 0, 0, RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc), 0x00ffffff, 0x00ffffff, 1, 2); - SelectObject(m_hDC, m_hBm = CreateDIBWithProperties(RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc))); - BitBlt(m_hDC, 0, 0, RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc), hDCImage, m_rcSrc.left, - m_rcSrc.top, SRCCOPY); + CRect rc = { MAXLONG, MAXLONG, 0, 0 }; + for (INT i = 0; i < m_iPtSP; ++i) + { + POINT& pt = m_ptStack[i]; + rc.left = min(pt.x, rc.left); + rc.top = min(pt.y, rc.top); + rc.right = max(pt.x, rc.right); + rc.bottom = max(pt.y, rc.bottom); + } + rc.right += 1; + rc.bottom += 1; + + m_rc = rc; + + ShiftPtStack(FALSE); + + ClearMask(); + + HDC hdcMem = ::CreateCompatibleDC(NULL); + m_hbmMask = ::CreateBitmap(rc.Width(), rc.Height(), 1, 1, NULL); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, m_hbmMask); + FillRect(hdcMem, &rc, (HBRUSH)::GetStockObject(BLACK_BRUSH)); + HGDIOBJ hPenOld = ::SelectObject(hdcMem, GetStockObject(NULL_PEN)); + HGDIOBJ hbrOld = ::SelectObject(hdcMem, GetStockObject(WHITE_BRUSH)); + ::Polygon(hdcMem, m_ptStack, m_iPtSP); + ::SelectObject(hdcMem, hbrOld); + ::SelectObject(hdcMem, hPenOld); + ::SelectObject(hdcMem, hbmOld); + ::DeleteDC(hdcMem); } void SelectionModel::DrawBackgroundPoly(HDC hDCImage, COLORREF crBg) { - Poly(hDCImage, m_ptStack, m_iPtSP, crBg, crBg, 1, 2, TRUE, FALSE); + ShiftPtStack(TRUE); + + HGDIOBJ hPenOld = ::SelectObject(hDCImage, ::GetStockObject(NULL_PEN)); + HGDIOBJ hbrOld = ::SelectObject(hDCImage, ::CreateSolidBrush(crBg)); + ::Polygon(hDCImage, m_ptStack, m_iPtSP); + ::DeleteObject(::SelectObject(hDCImage, hbrOld)); + ::SelectObject(hDCImage, hPenOld); + + ShiftPtStack(FALSE); } void SelectionModel::DrawBackgroundRect(HDC hDCImage, COLORREF crBg) { - Rect(hDCImage, m_rcSrc.left, m_rcSrc.top, m_rcSrc.right, m_rcSrc.bottom, crBg, crBg, 0, 1); + Rect(hDCImage, m_rc.left, m_rc.top, m_rc.right, m_rc.bottom, crBg, crBg, 0, 1); } -void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTransparent) +void SelectionModel::DrawSelection(HDC hDCImage, LPCRECT prc, COLORREF crBg, BOOL bBgTransparent) { - if (!bBgTransparent) - MaskBlt(hDCImage, m_rcDest.left, m_rcDest.top, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), - m_hDC, 0, 0, m_hMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); - else - ColorKeyedMaskBlt(hDCImage, m_rcDest.left, m_rcDest.top, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), - m_hDC, 0, 0, m_hMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND), crBg); + CRect rc = *prc; + if (::IsRectEmpty(&rc)) + return; + + BITMAP bm; + GetObject(m_hbmColor, sizeof(BITMAP), &bm); + + COLORREF keyColor = (bBgTransparent ? crBg : CLR_INVALID); + + HDC hMemDC = CreateCompatibleDC(hDCImage); + HGDIOBJ hbmOld = SelectObject(hMemDC, m_hbmColor); + ColorKeyedMaskBlt(hDCImage, rc.left, rc.top, rc.Width(), rc.Height(), + hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, m_hbmMask, keyColor); + SelectObject(hMemDC, hbmOld); + DeleteDC(hMemDC); +} + +void SelectionModel::GetSelectionContents(HDC hDCImage) +{ + ClearColor(); + + HDC hMemDC = ::CreateCompatibleDC(NULL); + m_hbmColor = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); + HGDIOBJ hbmOld = ::SelectObject(hMemDC, m_hbmColor); + ::BitBlt(hMemDC, 0, 0, m_rc.Width(), m_rc.Height(), hDCImage, m_rc.left, m_rc.top, SRCCOPY); + ::SelectObject(hMemDC, hbmOld); + ::DeleteDC(hMemDC); } -void SelectionModel::DrawSelectionStretched(HDC hDCImage) +BOOL SelectionModel::TakeOff() { - StretchBlt(hDCImage, m_rcDest.left, m_rcDest.top, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), m_hDC, 0, 0, GetDIBWidth(m_hBm), GetDIBHeight(m_hBm), SRCCOPY); + if (m_hbmColor || ::IsRectEmpty(&m_rc)) + return FALSE; + + HDC hDCImage = imageModel.GetDC(); + GetSelectionContents(hDCImage); + + if (toolsModel.GetActiveTool() == TOOL_FREESEL) + { + DrawBackgroundPoly(hDCImage, paletteModel.GetBgColor()); + } + else + { + ClearMask(); + DrawBackgroundRect(hDCImage, paletteModel.GetBgColor()); + } + + imageArea.Invalidate(FALSE); + return TRUE; } -void SelectionModel::ScaleContentsToFit() +void SelectionModel::Landing() { - HDC hTempDC; - HBITMAP hTempBm; - hTempDC = CreateCompatibleDC(m_hDC); - hTempBm = CreateDIBWithProperties(RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest)); - SelectObject(hTempDC, hTempBm); - SelectObject(m_hDC, m_hBm); - StretchBlt(hTempDC, 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), m_hDC, 0, 0, - GetDIBWidth(m_hBm), GetDIBHeight(m_hBm), SRCCOPY); - DeleteObject(m_hBm); - m_hBm = hTempBm; - hTempBm = CreateBitmap(RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), 1, 1, NULL); - SelectObject(hTempDC, hTempBm); - SelectObject(m_hDC, m_hMask); - StretchBlt(hTempDC, 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), m_hDC, 0, 0, - GetDIBWidth(m_hMask), GetDIBHeight(m_hMask), SRCCOPY); - DeleteObject(m_hMask); - m_hMask = hTempBm; - SelectObject(m_hDC, m_hBm); - DeleteDC(hTempDC); + if (!m_hbmColor) + return; + + DrawSelection(imageModel.GetDC(), &m_rc, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); + + ::SetRectEmpty(&m_rc); + ClearMask(); + ClearColor(); + + imageModel.CopyPrevious(); } void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) { - HDC hTempDC; - HBITMAP hTempMask; - - m_hBm = CopyDIBImage(hBm); - DeleteObject(SelectObject(m_hDC, m_hBm)); - - SetRectEmpty(&m_rcSrc); - m_rcDest.left = x; - m_rcDest.top = y; - m_rcDest.right = m_rcDest.left + GetDIBWidth(m_hBm); - m_rcDest.bottom = m_rcDest.top + GetDIBHeight(m_hBm); - - hTempDC = CreateCompatibleDC(m_hDC); - hTempMask = CreateBitmap(RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), 1, 1, NULL); - SelectObject(hTempDC, hTempMask); - Rect(hTempDC, 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), 0x00ffffff, 0x00ffffff, 1, 1); - DeleteObject(m_hMask); - m_hMask = hTempMask; - DeleteDC(hTempDC); + m_hbmColor = CopyDIBImage(hBm); + ::DeleteObject(m_hbmColor); + + m_rc.left = x; + m_rc.top = y; + m_rc.right = m_rc.left + GetDIBWidth(hBm); + m_rc.bottom = m_rc.top + GetDIBHeight(hBm); + + ClearMask(); } void SelectionModel::FlipHorizontally() { - SelectObject(m_hDC, m_hMask); - StretchBlt(m_hDC, RECT_WIDTH(m_rcDest) - 1, 0, -RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), m_hDC, - 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); - SelectObject(m_hDC, m_hBm); - StretchBlt(m_hDC, RECT_WIDTH(m_rcDest) - 1, 0, -RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), m_hDC, - 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); + TakeOff(); + + HDC hdcMem = ::CreateCompatibleDC(NULL); + if (m_hbmMask) + { + ::SelectObject(hdcMem, m_hbmMask); + ::StretchBlt(hdcMem, m_rc.Width() - 1, 0, -m_rc.Width(), m_rc.Height(), + hdcMem, 0, 0, m_rc.Width(), m_rc.Height(), SRCCOPY); + } + if (m_hbmColor) + { + ::SelectObject(hdcMem, m_hbmColor); + ::StretchBlt(hdcMem, m_rc.Width() - 1, 0, -m_rc.Width(), m_rc.Height(), + hdcMem, 0, 0, m_rc.Width(), m_rc.Height(), SRCCOPY); + } + ::DeleteDC(hdcMem); + NotifyRefreshNeeded(); } void SelectionModel::FlipVertically() { - SelectObject(m_hDC, m_hMask); - StretchBlt(m_hDC, 0, RECT_HEIGHT(m_rcDest) - 1, RECT_WIDTH(m_rcDest), -RECT_HEIGHT(m_rcDest), m_hDC, - 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); - SelectObject(m_hDC, m_hBm); - StretchBlt(m_hDC, 0, RECT_HEIGHT(m_rcDest) - 1, RECT_WIDTH(m_rcDest), -RECT_HEIGHT(m_rcDest), m_hDC, - 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); + TakeOff(); + + HDC hdcMem = ::CreateCompatibleDC(NULL); + if (m_hbmMask) + { + ::SelectObject(hdcMem, m_hbmMask); + ::StretchBlt(hdcMem, 0, m_rc.Height() - 1, m_rc.Width(), -m_rc.Height(), + hdcMem, 0, 0, m_rc.Width(), m_rc.Height(), SRCCOPY); + } + if (m_hbmColor) + { + ::SelectObject(hdcMem, m_hbmColor); + ::StretchBlt(hdcMem, 0, m_rc.Height() - 1, m_rc.Width(), -m_rc.Height(), + hdcMem, 0, 0, m_rc.Width(), m_rc.Height(), SRCCOPY); + } + ::DeleteDC(hdcMem); + NotifyRefreshNeeded(); } void SelectionModel::RotateNTimes90Degrees(int iN) { HBITMAP hbm; + HGDIOBJ hbmOld; + HDC hdcMem = ::CreateCompatibleDC(NULL); + switch (iN) { - case 1: - case 3: - imageModel.DeleteSelection(); - imageModel.CopyPrevious(); - SelectObject(m_hDC, m_hBm); - hbm = Rotate90DegreeBlt(m_hDC, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), iN == 1); - InsertFromHBITMAP(hbm, m_rcDest.left, m_rcDest.top); - DeleteObject(hbm); - selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); - selectionWindow.ForceRefreshSelectionContents(); - placeSelWin(); - break; - case 2: - SelectObject(m_hDC, m_hMask); - StretchBlt(m_hDC, RECT_WIDTH(m_rcDest) - 1, RECT_HEIGHT(m_rcDest) - 1, -RECT_WIDTH(m_rcDest), -RECT_HEIGHT(m_rcDest), m_hDC, - 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); - SelectObject(m_hDC, m_hBm); - StretchBlt(m_hDC, RECT_WIDTH(m_rcDest) - 1, RECT_HEIGHT(m_rcDest) - 1, -RECT_WIDTH(m_rcDest), -RECT_HEIGHT(m_rcDest), m_hDC, - 0, 0, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), SRCCOPY); - break; + case 1: + case 3: + TakeOff(); + if (m_hbmColor) + { + hbmOld = ::SelectObject(hdcMem, m_hbmColor); + hbm = Rotate90DegreeBlt(hdcMem, m_rc.Width(), m_rc.Height(), iN == 1, FALSE); + ::SelectObject(hdcMem, hbmOld); + ::DeleteObject(m_hbmColor); + m_hbmColor = hbm; + } + if (m_hbmMask) + { + hbmOld = ::SelectObject(hdcMem, m_hbmMask); + hbm = Rotate90DegreeBlt(hdcMem, m_rc.Width(), m_rc.Height(), iN == 1, TRUE); + ::SelectObject(hdcMem, hbmOld); + ::DeleteObject(m_hbmMask); + m_hbmMask = hbm; + } + break; + + case 2: + TakeOff(); + if (m_hbmColor) + { + hbmOld = ::SelectObject(hdcMem, m_hbmColor); + ::StretchBlt(hdcMem, m_rc.Width() - 1, m_rc.Height() - 1, -m_rc.Width(), -m_rc.Height(), + hdcMem, 0, 0, m_rc.Width(), m_rc.Height(), SRCCOPY); + ::SelectObject(hdcMem, hbmOld); + } + if (m_hbmMask) + { + hbmOld = ::SelectObject(hdcMem, m_hbmMask); + ::StretchBlt(hdcMem, m_rc.Width() - 1, m_rc.Height() - 1, -m_rc.Width(), -m_rc.Height(), + hdcMem, 0, 0, m_rc.Width(), m_rc.Height(), SRCCOPY); + ::SelectObject(hdcMem, hbmOld); + } + break; } + + ::DeleteDC(hdcMem); NotifyRefreshNeeded(); } @@ -241,47 +311,47 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int if (nStretchPercentX == 100 && nStretchPercentY == 100 && nSkewDegX == 0 && nSkewDegY == 0) return; - imageModel.DeleteSelection(); - imageModel.CopyPrevious(); + TakeOff(); - INT oldWidth = RECT_WIDTH(m_rcDest); - INT oldHeight = RECT_HEIGHT(m_rcDest); + INT oldWidth = m_rc.Width(); + INT oldHeight = m_rc.Height(); INT newWidth = oldWidth * nStretchPercentX / 100; INT newHeight = oldHeight * nStretchPercentY / 100; if (oldWidth != newWidth || oldHeight != newHeight) { - SelectObject(m_hDC, m_hBm); - HBITMAP hbm0 = CopyDIBImage(m_hBm, newWidth, newHeight); - InsertFromHBITMAP(hbm0, m_rcDest.left, m_rcDest.top); - DeleteObject(hbm0); + HBITMAP hbm0 = CopyDIBImage(m_hbmColor, newWidth, newHeight); + InsertFromHBITMAP(hbm0, m_rc.left, m_rc.top); + ::DeleteObject(hbm0); } + HDC hDC = ::CreateCompatibleDC(NULL); + if (nSkewDegX) { - SelectObject(m_hDC, m_hBm); - HBITMAP hbm1 = SkewDIB(m_hDC, m_hBm, nSkewDegX, FALSE); - InsertFromHBITMAP(hbm1, m_rcDest.left, m_rcDest.top); - DeleteObject(hbm1); + ::SelectObject(hDC, m_hbmColor); + HBITMAP hbm1 = SkewDIB(hDC, m_hbmColor, nSkewDegX, FALSE); + InsertFromHBITMAP(hbm1, m_rc.left, m_rc.top); + ::DeleteObject(hbm1); } if (nSkewDegY) { - SelectObject(m_hDC, m_hBm); - HBITMAP hbm2 = SkewDIB(m_hDC, m_hBm, nSkewDegY, TRUE); - InsertFromHBITMAP(hbm2, m_rcDest.left, m_rcDest.top); - DeleteObject(hbm2); + ::SelectObject(hDC, m_hbmColor); + HBITMAP hbm2 = SkewDIB(hDC, m_hbmColor, nSkewDegY, TRUE); + InsertFromHBITMAP(hbm2, m_rc.left, m_rc.top); + ::DeleteObject(hbm2); } - selectionWindow.ShowWindow(SW_SHOWNOACTIVATE); - selectionWindow.ForceRefreshSelectionContents(); - placeSelWin(); + ::DeleteDC(hDC); + + m_bShow = TRUE; NotifyRefreshNeeded(); } HBITMAP SelectionModel::GetBitmap() const { - return m_hBm; + return m_hbmColor; } int SelectionModel::PtStackSize() const @@ -291,114 +361,92 @@ int SelectionModel::PtStackSize() const void SelectionModel::DrawFramePoly(HDC hDCImage) { - Poly(hDCImage, m_ptStack, m_iPtSP, 0, 0, 2, 0, FALSE, TRUE); /* draw the freehand selection inverted/xored */ -} - -void SelectionModel::SetSrcAndDestRectFromPoints(const POINT& ptFrom, const POINT& ptTo) -{ - m_rcDest.left = m_rcSrc.left = min(ptFrom.x, ptTo.x); - m_rcDest.top = m_rcSrc.top = min(ptFrom.y, ptTo.y); - m_rcDest.right = m_rcSrc.right = max(ptFrom.x, ptTo.x); - m_rcDest.bottom = m_rcSrc.bottom = max(ptFrom.y, ptTo.y); -} - -void SelectionModel::SetSrcRectSizeToZero() -{ - m_rcSrc.right = m_rcSrc.left; - m_rcSrc.bottom = m_rcSrc.top; + /* draw the freehand selection inverted/xored */ + Poly(hDCImage, m_ptStack, m_iPtSP, 0, 0, 2, 0, FALSE, TRUE); } -BOOL SelectionModel::IsSrcRectSizeNonzero() const +void SelectionModel::SetRectFromPoints(const POINT& ptFrom, const POINT& ptTo) { - return (RECT_WIDTH(m_rcSrc) != 0) && (RECT_HEIGHT(m_rcSrc) != 0); + m_rc.left = min(ptFrom.x, ptTo.x); + m_rc.top = min(ptFrom.y, ptTo.y); + m_rc.right = max(ptFrom.x, ptTo.x); + m_rc.bottom = max(ptFrom.y, ptTo.y); } -void SelectionModel::ModifyDestRect(POINT& ptDelta, int iAction) +void SelectionModel::Dragging(CANVAS_HITTEST hit, POINT pt) { - POINT ptDeltaUsed; - - switch (iAction) + switch (hit) { - case ACTION_MOVE: /* move selection */ - ptDeltaUsed.x = ptDelta.x; - ptDeltaUsed.y = ptDelta.y; - OffsetRect(&m_rcDest, ptDeltaUsed.x, ptDeltaUsed.y); + case HIT_NONE: + break; + case HIT_UPPER_LEFT: + m_rc.left += pt.x - m_ptHit.x; + m_rc.top += pt.y - m_ptHit.y; break; - case ACTION_RESIZE_TOP_LEFT: /* resize at upper left corner */ - ptDeltaUsed.x = min(ptDelta.x, RECT_WIDTH(m_rcDest) - 1); - ptDeltaUsed.y = min(ptDelta.y, RECT_HEIGHT(m_rcDest) - 1); - m_rcDest.left += ptDeltaUsed.x; - m_rcDest.top += ptDeltaUsed.y; + case HIT_UPPER_CENTER: + m_rc.top += pt.y - m_ptHit.y; break; - case ACTION_RESIZE_TOP: /* resize at top edge */ - ptDeltaUsed.x = ptDelta.x; - ptDeltaUsed.y = min(ptDelta.y, RECT_HEIGHT(m_rcDest) - 1); - m_rcDest.top += ptDeltaUsed.y; + case HIT_UPPER_RIGHT: + m_rc.right += pt.x - m_ptHit.x; + m_rc.top += pt.y - m_ptHit.y; break; - case ACTION_RESIZE_TOP_RIGHT: /* resize at upper right corner */ - ptDeltaUsed.x = max(ptDelta.x, -(RECT_WIDTH(m_rcDest) - 1)); - ptDeltaUsed.y = min(ptDelta.y, RECT_HEIGHT(m_rcDest) - 1); - m_rcDest.top += ptDeltaUsed.y; - m_rcDest.right += ptDeltaUsed.x; + case HIT_MIDDLE_LEFT: + m_rc.left += pt.x - m_ptHit.x; break; - case ACTION_RESIZE_LEFT: /* resize at left edge */ - ptDeltaUsed.x = min(ptDelta.x, RECT_WIDTH(m_rcDest) - 1); - ptDeltaUsed.y = ptDelta.y; - m_rcDest.left += ptDeltaUsed.x; + case HIT_MIDDLE_RIGHT: + m_rc.right += pt.x - m_ptHit.x; break; - case ACTION_RESIZE_RIGHT: /* resize at right edge */ - ptDeltaUsed.x = max(ptDelta.x, -(RECT_WIDTH(m_rcDest) - 1)); - ptDeltaUsed.y = ptDelta.y; - m_rcDest.right += ptDeltaUsed.x; + case HIT_LOWER_LEFT: + m_rc.left += pt.x - m_ptHit.x; + m_rc.bottom += pt.y - m_ptHit.y; break; - case ACTION_RESIZE_BOTTOM_LEFT: /* resize at lower left corner */ - ptDeltaUsed.x = min(ptDelta.x, RECT_WIDTH(m_rcDest) - 1); - ptDeltaUsed.y = max(ptDelta.y, -(RECT_HEIGHT(m_rcDest) - 1)); - m_rcDest.left += ptDeltaUsed.x; - m_rcDest.bottom += ptDeltaUsed.y; + case HIT_LOWER_CENTER: + m_rc.bottom += pt.y - m_ptHit.y; break; - case ACTION_RESIZE_BOTTOM: /* resize at bottom edge */ - ptDeltaUsed.x = ptDelta.x; - ptDeltaUsed.y = max(ptDelta.y, -(RECT_HEIGHT(m_rcDest) - 1)); - m_rcDest.bottom += ptDeltaUsed.y; + case HIT_LOWER_RIGHT: + m_rc.right += pt.x - m_ptHit.x; + m_rc.bottom += pt.y - m_ptHit.y; break; - case ACTION_RESIZE_BOTTOM_RIGHT: /* resize at lower right corner */ - ptDeltaUsed.x = max(ptDelta.x, -(RECT_WIDTH(m_rcDest) - 1)); - ptDeltaUsed.y = max(ptDelta.y, -(RECT_HEIGHT(m_rcDest) - 1)); - m_rcDest.right += ptDeltaUsed.x; - m_rcDest.bottom += ptDeltaUsed.y; + case HIT_BORDER: + case HIT_INNER: + OffsetRect(&m_rc, pt.x - m_ptHit.x, pt.y - m_ptHit.y); break; } - ptDelta.x -= ptDeltaUsed.x; - ptDelta.y -= ptDeltaUsed.y; + m_ptHit = pt; } -LONG SelectionModel::GetDestRectWidth() const +void SelectionModel::NotifyRefreshNeeded() { - return m_rcDest.right - m_rcDest.left; + imageArea.Invalidate(FALSE); } -LONG SelectionModel::GetDestRectHeight() const +void SelectionModel::ClearMask() { - return m_rcDest.bottom - m_rcDest.top; + if (m_hbmMask) + { + ::DeleteObject(m_hbmMask); + m_hbmMask = NULL; + } } -LONG SelectionModel::GetDestRectLeft() const +void SelectionModel::ClearColor() { - return m_rcDest.left; + if (m_hbmColor) + { + ::DeleteObject(m_hbmColor); + m_hbmColor = NULL; + } } -LONG SelectionModel::GetDestRectTop() const +void SelectionModel::CancelSelection() { - return m_rcDest.top; -} + if (!m_bShow) + return; -void SelectionModel::NotifyRefreshNeeded() -{ - selectionWindow.SendMessage(WM_SELECTIONMODELREFRESHNEEDED); -} + imageModel.CopyPrevious(); + if (m_bShow) + imageModel.Undo(TRUE); -void SelectionModel::GetRect(LPRECT prc) const -{ - *prc = m_rcDest; + m_bShow = FALSE; + imageArea.Invalidate(FALSE); } diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index fbb208fed4b..fc1420de7fd 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -9,66 +9,54 @@ #pragma once -/* DEFINES **********************************************************/ - -#define ACTION_MOVE 0 -#define ACTION_RESIZE_TOP_LEFT 1 -#define ACTION_RESIZE_TOP 2 -#define ACTION_RESIZE_TOP_RIGHT 3 -#define ACTION_RESIZE_LEFT 4 -#define ACTION_RESIZE_RIGHT 5 -#define ACTION_RESIZE_BOTTOM_LEFT 6 -#define ACTION_RESIZE_BOTTOM 7 -#define ACTION_RESIZE_BOTTOM_RIGHT 8 - -/* CLASSES **********************************************************/ - class SelectionModel { private: - HDC m_hDC; - RECT m_rcSrc; - RECT m_rcDest; - HBITMAP m_hBm; - HBITMAP m_hMask; + HBITMAP m_hbmColor; + HBITMAP m_hbmMask; POINT *m_ptStack; int m_iPtSP; -// void NotifySelectionChanging(); -// void NotifySelectionChanged(); - void NotifyRefreshNeeded(); - public: + BOOL m_bShow; + CRect m_rc; // in image pixel coordinates + POINT m_ptHit; // in image pixel coordinates + SelectionModel(); ~SelectionModel(); + void ResetPtStack(); - void PushToPtStack(LONG x, LONG y); - void CalculateBoundingBoxAndContents(HDC hDCImage); - void CalculateContents(HDC hDCImage); + void PushToPtStack(POINT pt); + int PtStackSize() const; + void SetRectFromPoints(const POINT& ptFrom, const POINT& ptTo); + void BuildMaskFromPtStack(); + + BOOL TakeOff(); + void Landing(); + + HBITMAP GetBitmap() const; + void GetSelectionContents(HDC hDCImage); + void DrawFramePoly(HDC hDCImage); void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg); void DrawBackgroundRect(HDC hDCImage, COLORREF crBg); - void DrawSelection(HDC hDCImage, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); - void DrawSelectionStretched(HDC hDCImage); - void ScaleContentsToFit(); + void DrawSelection(HDC hDCImage, LPCRECT prc, COLORREF crBg = 0, BOOL bBgTransparent = FALSE); void InsertFromHBITMAP(HBITMAP hBm, INT x = 0, INT y = 0); + + // operation void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); - void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); - HBITMAP GetBitmap() const; - int PtStackSize() const; - void DrawFramePoly(HDC hDCImage); - void SetSrcAndDestRectFromPoints(const POINT& ptFrom, const POINT& ptTo); - void SetSrcRectSizeToZero(); - BOOL IsSrcRectSizeNonzero() const; - void ModifyDestRect(POINT& ptDelta, int iAction); - LONG GetDestRectWidth() const; - LONG GetDestRectHeight() const; - LONG GetDestRectLeft() const; - LONG GetDestRectTop() const; - void GetRect(LPRECT prc) const; + void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY); + + void CancelSelection(); + void NotifyRefreshNeeded(); + void Dragging(CANVAS_HITTEST hit, POINT pt); + void ClearMask(); + void ClearColor(); private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); + + void ShiftPtStack(BOOL bPlus); }; diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 6ba23375ebb..64f90f9c807 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -114,7 +114,7 @@ LRESULT CToolBox::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHand LRESULT CToolBox::OnToolsModelToolChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - selectionWindow.ShowWindow(SW_HIDE); + selectionModel.m_bShow = FALSE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions // Check the toolbar button diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 34341635554..5f07ddf6132 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -141,8 +141,8 @@ void ToolsModel::SetBackgroundTransparent(BOOL bTransparent) { m_transpBg = bTransparent; NotifyToolSettingsChanged(); - if (selectionWindow.IsWindow()) - selectionWindow.ForceRefreshSelectionContents(); + if (imageArea.IsWindow()) + imageArea.Invalidate(FALSE); } int ToolsModel::GetZoom() const @@ -172,8 +172,6 @@ void ToolsModel::NotifyToolSettingsChanged() { if (toolSettingsWindow.IsWindow()) toolSettingsWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); - if (selectionWindow.IsWindow()) - selectionWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_TOOLSMODELSETTINGSCHANGED); } @@ -184,8 +182,8 @@ void ToolsModel::NotifyZoomChanged() toolSettingsWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); if (textEditWindow.IsWindow()) textEditWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); - if (selectionWindow.IsWindow()) - selectionWindow.SendMessage(WM_TOOLSMODELZOOMCHANGED); + if (imageArea.IsWindow()) + imageArea.SendMessage(WM_TOOLSMODELZOOMCHANGED); } void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index c7fc2302415..da0e06cfa2f 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -132,3 +132,31 @@ static inline int UnZoomed(int xy) { return xy * 1000 / toolsModel.GetZoom(); } + +static inline void Zoomed(POINT& pt) +{ + pt.x = Zoomed(pt.x); + pt.y = Zoomed(pt.y); +} + +static inline void Zoomed(RECT& rc) +{ + rc.left = Zoomed(rc.left); + rc.top = Zoomed(rc.top); + rc.right = Zoomed(rc.right); + rc.bottom = Zoomed(rc.bottom); +} + +static inline void UnZoomed(POINT& pt) +{ + pt.x = UnZoomed(pt.x); + pt.y = UnZoomed(pt.y); +} + +static inline void UnZoomed(RECT& rc) +{ + rc.left = UnZoomed(rc.left); + rc.top = UnZoomed(rc.top); + rc.right = UnZoomed(rc.right); + rc.bottom = UnZoomed(rc.bottom); +} diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ee09d6fba99..b44534a8043 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -182,11 +182,9 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); imageModel.CopyPrevious(); - selectionModel.InsertFromHBITMAP(bitmap); - - placeSelWin(); - selectionWindow.ShowWindow(SW_SHOW); - selectionWindow.ForceRefreshSelectionContents(); + selectionModel.InsertFromHBITMAP(bitmap, 0, 0); + selectionModel.m_bShow = TRUE; + imageArea.Invalidate(FALSE); } LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -279,9 +277,6 @@ LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa // Creating the window inside the canvas imageArea.Create(canvasWindow, rcEmpty, NULL, WS_CHILD | WS_VISIBLE); - // Create selection window (initially hidden) - selectionWindow.Create(imageArea, rcEmpty, NULL, WS_CHILD | BS_OWNERDRAW); - // Create and show the miniature if necessary if (registrySettings.ShowThumbnail) { @@ -407,7 +402,7 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO { HMENU menu = (HMENU)wParam; BOOL trueSelection = - (::IsWindowVisible(selectionWindow) && + (selectionModel.m_bShow && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); switch (lParam) @@ -438,7 +433,7 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(registrySettings.ShowThumbnail)); break; case 3: /* Image menu */ - EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(::IsWindowVisible(selectionWindow))); + EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionModel.m_bShow)); CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); break; } @@ -484,7 +479,6 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (hwndCapture) { if (canvasWindow.m_hWnd == hwndCapture || - selectionWindow.m_hWnd == hwndCapture || imageArea.m_hWnd == hwndCapture || fullscreenWindow.m_hWnd == hwndCapture) { @@ -610,7 +604,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_EDITUNDO: if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) break; - if (selectionWindow.IsWindowVisible()) + if (selectionModel.m_bShow) { if (toolsModel.GetActiveTool() == TOOL_RECTSEL || toolsModel.GetActiveTool() == TOOL_FREESEL) @@ -736,31 +730,31 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ - if (::IsWindowVisible(selectionWindow)) + if (selectionModel.m_bShow) selectionModel.FlipHorizontally(); else imageModel.FlipHorizontally(); break; case 2: /* flip vertically */ - if (::IsWindowVisible(selectionWindow)) + if (selectionModel.m_bShow) selectionModel.FlipVertically(); else imageModel.FlipVertically(); break; case 3: /* rotate 90 degrees */ - if (::IsWindowVisible(selectionWindow)) + if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(1); else imageModel.RotateNTimes90Degrees(1); break; case 4: /* rotate 180 degrees */ - if (::IsWindowVisible(selectionWindow)) + if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(2); else imageModel.RotateNTimes90Degrees(2); break; case 5: /* rotate 270 degrees */ - if (::IsWindowVisible(selectionWindow)) + if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(3); else imageModel.RotateNTimes90Degrees(3); @@ -779,7 +773,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { - if (::IsWindowVisible(selectionWindow)) + if (selectionModel.m_bShow) { selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, stretchSkewDialog.angle.x, stretchSkewDialog.angle.y);

1 year, 8 months

[reactos] 01/01: [KERNEL32] LCMapString: Fullwidth/halfwidth conversion (#5206)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f5bcf577550e66cffb2b… commit 3f5bcf577550e66cffb2b4961090fb38fc216d19 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 1 11:33:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 1 11:33:36 2023 +0900 [KERNEL32] LCMapString: Fullwidth/halfwidth conversion (#5206) - Add file dll/win32/kernel32/winnls/string/dakuten.h. - Add file dll/win32/kernel32/winnls/string/full2half.h. - Support LCMAP_FULLWIDTH and LCMAP_HALFWIDTH in LCMapString. CORE-11700 --- dll/win32/kernel32/winnls/string/dakuten.h | 59 ++++ dll/win32/kernel32/winnls/string/full2half.h | 99 ++++++ dll/win32/kernel32/winnls/string/lang.c | 508 +++++++++++++++++++++------ 3 files changed, 554 insertions(+), 112 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/dakuten.h b/dll/win32/kernel32/winnls/string/dakuten.h new file mode 100644 index 00000000000..0ad563f8105 --- /dev/null +++ b/dll/win32/kernel32/winnls/string/dakuten.h @@ -0,0 +1,59 @@ +/* + * The dakuten (Japanese voiced letter) table + */ +/* DEFINE_DAKUTEN(voiced, single1, single2, half1, half2) */ +/* NOTE: This list must be sorted. */ +DEFINE_DAKUTEN(0x304C, 0x304B, 0x309B, 0xFF76, 0x309B) /* が --> か゛ --> ｶﾞ */ +DEFINE_DAKUTEN(0x304E, 0x304D, 0x309B, 0xFF77, 0x309B) /* ぎ --> き゛ --> ｷﾞ */ +DEFINE_DAKUTEN(0x3050, 0x304F, 0x309B, 0xFF78, 0x309B) /* ぐ --> く゛ --> ｸﾞ */ +DEFINE_DAKUTEN(0x3052, 0x3051, 0x309B, 0xFF79, 0x309B) /* げ --> け゛ --> ｹﾞ */ +DEFINE_DAKUTEN(0x3054, 0x3053, 0x309B, 0xFF7A, 0x309B) /* ご --> こ゛ --> ｺﾞ */ +DEFINE_DAKUTEN(0x3056, 0x3055, 0x309B, 0xFF7B, 0x309B) /* ざ --> さ゛ --> ｻﾞ */ +DEFINE_DAKUTEN(0x3058, 0x3057, 0x309B, 0xFF7C, 0x309B) /* じ --> し゛ --> ｼﾞ */ +DEFINE_DAKUTEN(0x305A, 0x3059, 0xFF9E, 0xFF7D, 0x309B) /* ず --> す゛ --> ｽﾞ */ +DEFINE_DAKUTEN(0x305C, 0x305B, 0x309B, 0xFF7E, 0x309B) /* ぜ --> せ゛ --> ｾﾞ */ +DEFINE_DAKUTEN(0x305E, 0x305D, 0x309B, 0xFF7F, 0x309B) /* ぞ --> そ゛ --> ｿﾞ */ +DEFINE_DAKUTEN(0x3060, 0x305F, 0x309B, 0xFF80, 0x309B) /* だ --> た゛ --> ﾀﾞ */ +DEFINE_DAKUTEN(0x3062, 0x3061, 0x309B, 0xFF81, 0x309B) /* ぢ --> ち゛ --> ﾁﾞ */ +DEFINE_DAKUTEN(0x3065, 0x3064, 0x309B, 0xFF82, 0x309B) /* づ --> つ゛ --> ﾂﾞ */ +DEFINE_DAKUTEN(0x3067, 0x3066, 0x309B, 0xFF83, 0x309B) /* で --> て゛ --> ﾃﾞ */ +DEFINE_DAKUTEN(0x3069, 0x3068, 0x309B, 0xFF84, 0x309B) /* ど --> と゛ --> ﾄﾞ */ +DEFINE_DAKUTEN(0x3070, 0x306F, 0x309B, 0xFF8A, 0x309B) /* ば --> は゛ --> ﾊﾞ */ +DEFINE_DAKUTEN(0x3071, 0x306F, 0x309C, 0xFF8A, 0x309B) /* ぱ --> は゜ --> ﾊﾟ */ +DEFINE_DAKUTEN(0x3073, 0x3072, 0x309B, 0xFF8B, 0x309B) /* び --> ひ゛ --> ﾋﾞ */ +DEFINE_DAKUTEN(0x3074, 0x3072, 0x309C, 0xFF8B, 0x309B) /* ぴ --> ひ゜ --> ﾋﾟ */ +DEFINE_DAKUTEN(0x3076, 0x3075, 0x309B, 0xFF8C, 0x309B) /* ぶ --> ふ゛ --> ﾌﾞ */ +DEFINE_DAKUTEN(0x3077, 0x3075, 0x309C, 0xFF8C, 0x309B) /* ぷ --> ふ゜ --> ﾌﾟ */ +DEFINE_DAKUTEN(0x3079, 0x3078, 0x309B, 0xFF8D, 0x309B) /* べ --> へ゛ --> ﾍﾞ */ +DEFINE_DAKUTEN(0x307A, 0x3078, 0x309C, 0xFF8D, 0x309B) /* ぺ --> へ゜ --> ﾍﾟ */ +DEFINE_DAKUTEN(0x307C, 0x307B, 0x309B, 0xFF8E, 0x309B) /* ぼ --> ほ゛ --> ﾎﾞ */ +DEFINE_DAKUTEN(0x307D, 0x307B, 0x309C, 0xFF8E, 0x309B) /* ぽ --> ほ゜ --> ﾎﾟ */ +DEFINE_DAKUTEN(0x3094, 0x3046, 0x309B, 0xFF73, 0x309B) /* ゔ --> う゛ --> ｳﾞ */ +DEFINE_DAKUTEN(0x30AC, 0xFF76, 0x309B, 0xFF76, 0x309B) /* ガ --> カ゛ --> ｶﾞ */ +DEFINE_DAKUTEN(0x30AE, 0xFF77, 0x309B, 0xFF77, 0x309B) /* ギ --> キ゛ --> ｷﾞ */ +DEFINE_DAKUTEN(0x30B0, 0xFF78, 0x309B, 0xFF78, 0x309B) /* グ --> ク゛ --> ｸﾞ */ +DEFINE_DAKUTEN(0x30B2, 0xFF79, 0x309B, 0xFF79, 0x309B) /* ゲ --> ケ゛ --> ｹﾞ */ +DEFINE_DAKUTEN(0x30B4, 0xFF7A, 0x309B, 0xFF7A, 0x309B) /* ゴ --> コ゛ --> ｺﾞ */ +DEFINE_DAKUTEN(0x30B6, 0xFF7B, 0x309B, 0xFF7B, 0x309B) /* ザ --> サ゛ --> ｻﾞ */ +DEFINE_DAKUTEN(0x30B8, 0xFF7C, 0x309B, 0xFF7C, 0x309B) /* ジ --> シ゛ --> ｼﾞ */ +DEFINE_DAKUTEN(0x30BA, 0xFF7D, 0xFF9E, 0xFF7D, 0x309B) /* ズ --> ス゛ --> ｽﾞ */ +DEFINE_DAKUTEN(0x30BC, 0xFF7E, 0x309B, 0xFF7E, 0x309B) /* ゼ --> セ゛ --> ｾﾞ */ +DEFINE_DAKUTEN(0x30BE, 0xFF7F, 0x309B, 0xFF7F, 0x309B) /* ゾ --> ソ゛ --> ｿﾞ */ +DEFINE_DAKUTEN(0x30C0, 0xFF80, 0x309B, 0xFF80, 0x309B) /* ダ --> タ゛ --> ﾀﾞ */ +DEFINE_DAKUTEN(0x30C2, 0xFF81, 0x309B, 0xFF81, 0x309B) /* ヂ --> チ゛ --> ﾁﾞ */ +DEFINE_DAKUTEN(0x30C5, 0xFF82, 0x309B, 0xFF82, 0x309B) /* ヅ --> ツ゛ --> ﾂﾞ */ +DEFINE_DAKUTEN(0x30C7, 0xFF83, 0x309B, 0xFF83, 0x309B) /* デ --> テ゛ --> ﾃﾞ */ +DEFINE_DAKUTEN(0x30C9, 0xFF84, 0x309B, 0xFF84, 0x309B) /* ド --> ト゛ --> ﾄﾞ */ +DEFINE_DAKUTEN(0x30D0, 0xFF8A, 0x309B, 0xFF8A, 0x309B) /* バ --> ハ゛ --> ﾊﾞ */ +DEFINE_DAKUTEN(0x30D1, 0xFF8A, 0x309C, 0xFF8A, 0x309B) /* パ --> ハ゜ --> ﾊﾟ */ +DEFINE_DAKUTEN(0x30D3, 0xFF8B, 0x309B, 0xFF8B, 0x309B) /* ビ --> ヒ゛ --> ﾋﾞ */ +DEFINE_DAKUTEN(0x30D4, 0xFF8B, 0x309C, 0xFF8B, 0x309B) /* ピ --> ヒ゜ --> ﾋﾟ */ +DEFINE_DAKUTEN(0x30D6, 0xFF8C, 0x309B, 0xFF8C, 0x309B) /* ブ --> フ゛ --> ﾌﾞ */ +DEFINE_DAKUTEN(0x30D7, 0xFF8C, 0x309C, 0xFF8C, 0x309B) /* プ --> フ゜ --> ﾌﾟ */ +DEFINE_DAKUTEN(0x30D9, 0xFF8D, 0x309B, 0xFF8D, 0x309B) /* ベ --> ヘ゛ --> ﾍﾞ */ +DEFINE_DAKUTEN(0x30DA, 0xFF8D, 0x309C, 0xFF8D, 0x309B) /* ペ --> ヘ゜ --> ﾍﾟ */ +DEFINE_DAKUTEN(0x30DC, 0xFF8E, 0x309B, 0xFF8E, 0x309B) /* ボ --> ホ゛ --> ﾎﾞ */ +DEFINE_DAKUTEN(0x30DD, 0xFF8E, 0x309C, 0xFF8E, 0x309B) /* ポ --> ホ゜ --> ﾎﾟ */ +DEFINE_DAKUTEN(0x30F4, 0xFF73, 0x309B, 0xFF73, 0x309B) /* ヴ --> ウ゛ --> ｳﾞ */ +DEFINE_DAKUTEN(0x30F7, 0xFF9C, 0x309B, 0xFF9C, 0x309B) /* ヷ --> ワ゛ --> ﾜﾞ */ +DEFINE_DAKUTEN(0x30FA, 0xFF66, 0x309B, 0xFF66, 0x309B) /* ヺ --> ヲ゛ --> ｦﾞ */ diff --git a/dll/win32/kernel32/winnls/string/full2half.h b/dll/win32/kernel32/winnls/string/full2half.h new file mode 100644 index 00000000000..f613574143f --- /dev/null +++ b/dll/win32/kernel32/winnls/string/full2half.h @@ -0,0 +1,99 @@ +/* + * The fullwidth/halfwidth character table. + */ +/* DEFINE_FULL2HALF(full, half1, half2) */ +/* NOTE: This list must be sorted. */ +DEFINE_FULL2HALF(0x3000, 0x0020, 0) /* 　 --> */ +DEFINE_FULL2HALF(0x3001, 0xFF64, 0) /* 、 --> ､ */ +DEFINE_FULL2HALF(0x3002, 0xFF61, 0) /* 。 --> ｡ */ +DEFINE_FULL2HALF(0x300C, 0xFF62, 0) /* 「 --> ｢ */ +DEFINE_FULL2HALF(0x300D, 0xFF63, 0) /* 」 --> ｣ */ +DEFINE_FULL2HALF(0x309B, 0xFF9E, 0) /* ゛ --> ﾞ */ +DEFINE_FULL2HALF(0x309C, 0xFF9F, 0) /* ゜ --> ﾟ */ +DEFINE_FULL2HALF(0x30A1, 0xFF67, 0) /* ァ --> ｧ */ +DEFINE_FULL2HALF(0x30A2, 0xFF71, 0) /* ア --> ｱ */ +DEFINE_FULL2HALF(0x30A3, 0xFF68, 0) /* ィ --> ｨ */ +DEFINE_FULL2HALF(0x30A4, 0xFF72, 0) /* イ --> ｲ */ +DEFINE_FULL2HALF(0x30A5, 0xFF69, 0) /* ゥ --> ｩ */ +DEFINE_FULL2HALF(0x30A6, 0xFF73, 0) /* ウ --> ｳ */ +DEFINE_FULL2HALF(0x30A7, 0xFF6A, 0) /* ェ --> ｪ */ +DEFINE_FULL2HALF(0x30A8, 0xFF74, 0) /* エ --> ｴ */ +DEFINE_FULL2HALF(0x30A9, 0xFF6B, 0) /* ォ --> ｫ */ +DEFINE_FULL2HALF(0x30AA, 0xFF75, 0) /* オ --> ｵ */ +DEFINE_FULL2HALF(0x30AB, 0xFF76, 0) /* カ --> ｶ */ +DEFINE_FULL2HALF(0x30AC, 0xFF76, 0xFF9E) /* ガ --> ｶﾞ */ +DEFINE_FULL2HALF(0x30AD, 0xFF77, 0) /* キ --> ｷ */ +DEFINE_FULL2HALF(0x30AE, 0xFF77, 0xFF9E) /* ギ --> ｷﾞ */ +DEFINE_FULL2HALF(0x30AF, 0xFF78, 0) /* ク --> ｸ */ +DEFINE_FULL2HALF(0x30B0, 0xFF78, 0xFF9E) /* グ --> ｸﾞ */ +DEFINE_FULL2HALF(0x30B1, 0xFF79, 0) /* ケ --> ｹ */ +DEFINE_FULL2HALF(0x30B2, 0xFF79, 0xFF9E) /* ゲ --> ｹﾞ */ +DEFINE_FULL2HALF(0x30B3, 0xFF7A, 0) /* コ --> ｺ */ +DEFINE_FULL2HALF(0x30B4, 0xFF7A, 0xFF9E) /* ゴ --> ｺﾞ */ +DEFINE_FULL2HALF(0x30B5, 0xFF7B, 0) /* サ --> ｻ */ +DEFINE_FULL2HALF(0x30B6, 0xFF7B, 0xFF9E) /* ザ --> ｻﾞ */ +DEFINE_FULL2HALF(0x30B7, 0xFF7C, 0) /* シ --> ｼ */ +DEFINE_FULL2HALF(0x30B8, 0xFF7C, 0xFF9E) /* ジ --> ｼﾞ */ +DEFINE_FULL2HALF(0x30B9, 0xFF7D, 0) /* ス --> ｽ */ +DEFINE_FULL2HALF(0x30BA, 0xFF7D, 0xFF9E) /* ズ --> ｽﾞ */ +DEFINE_FULL2HALF(0x30BB, 0xFF7E, 0) /* セ --> ｾ */ +DEFINE_FULL2HALF(0x30BC, 0xFF7E, 0xFF9E) /* ゼ --> ｾﾞ */ +DEFINE_FULL2HALF(0x30BD, 0xFF7F, 0) /* ソ --> ｿ */ +DEFINE_FULL2HALF(0x30BE, 0xFF7F, 0xFF9E) /* ゾ --> ｿﾞ */ +DEFINE_FULL2HALF(0x30BF, 0xFF80, 0) /* タ --> ﾀ */ +DEFINE_FULL2HALF(0x30C0, 0xFF80, 0xFF9E) /* ダ --> ﾀﾞ */ +DEFINE_FULL2HALF(0x30C1, 0xFF81, 0) /* チ --> ﾁ */ +DEFINE_FULL2HALF(0x30C2, 0xFF81, 0xFF9E) /* ヂ --> ﾁﾞ */ +DEFINE_FULL2HALF(0x30C3, 0xFF6F, 0) /* ッ --> ｯ */ +DEFINE_FULL2HALF(0x30C4, 0xFF82, 0) /* ツ --> ﾂ */ +DEFINE_FULL2HALF(0x30C5, 0xFF82, 0xFF9E) /* ヅ --> ﾂﾞ */ +DEFINE_FULL2HALF(0x30C6, 0xFF83, 0) /* テ --> ﾃ */ +DEFINE_FULL2HALF(0x30C7, 0xFF83, 0xFF9E) /* デ --> ﾃﾞ */ +DEFINE_FULL2HALF(0x30C8, 0xFF84, 0) /* ト --> ﾄ */ +DEFINE_FULL2HALF(0x30C9, 0xFF84, 0xFF9E) /* ド --> ﾄﾞ */ +DEFINE_FULL2HALF(0x30CA, 0xFF85, 0) /* ナ --> ﾅ */ +DEFINE_FULL2HALF(0x30CB, 0xFF86, 0) /* ニ --> ﾆ */ +DEFINE_FULL2HALF(0x30CC, 0xFF87, 0) /* ヌ --> ﾇ */ +DEFINE_FULL2HALF(0x30CD, 0xFF88, 0) /* ネ --> ﾈ */ +DEFINE_FULL2HALF(0x30CE, 0xFF89, 0) /* ノ --> ﾉ */ +DEFINE_FULL2HALF(0x30CF, 0xFF8A, 0) /* ハ --> ﾊ */ +DEFINE_FULL2HALF(0x30D0, 0xFF8A, 0xFF9E) /* バ --> ﾊﾞ */ +DEFINE_FULL2HALF(0x30D1, 0xFF8A, 0x309C) /* パ <-- ハ゜ */ +DEFINE_FULL2HALF(0x30D1, 0xFF8A, 0xFF9F) /* パ --> ﾊﾟ */ +DEFINE_FULL2HALF(0x30D2, 0xFF8B, 0) /* ヒ --> ﾋ */ +DEFINE_FULL2HALF(0x30D3, 0xFF8B, 0xFF9E) /* ビ --> ﾋﾞ */ +DEFINE_FULL2HALF(0x30D4, 0xFF8B, 0x309C) /* ピ <-- ヒ゜ */ +DEFINE_FULL2HALF(0x30D4, 0xFF8B, 0xFF9F) /* ピ --> ﾋﾟ */ +DEFINE_FULL2HALF(0x30D5, 0xFF8C, 0) /* フ --> ﾌ */ +DEFINE_FULL2HALF(0x30D6, 0xFF8C, 0xFF9E) /* ブ --> ﾌﾞ */ +DEFINE_FULL2HALF(0x30D7, 0xFF8C, 0xFF9F) /* プ --> ﾌﾟ */ +DEFINE_FULL2HALF(0x30D8, 0xFF8D, 0) /* ヘ --> ﾍ */ +DEFINE_FULL2HALF(0x30D9, 0xFF8D, 0xFF9E) /* ベ --> ﾍﾞ */ +DEFINE_FULL2HALF(0x30DA, 0xFF8D, 0xFF9F) /* ペ --> ﾍﾟ */ +DEFINE_FULL2HALF(0x30DB, 0xFF8E, 0) /* ホ --> ﾎ */ +DEFINE_FULL2HALF(0x30DC, 0xFF8E, 0xFF9E) /* ボ --> ﾎﾞ */ +DEFINE_FULL2HALF(0x30DD, 0xFF8E, 0xFF9F) /* ポ --> ﾎﾟ */ +DEFINE_FULL2HALF(0x30DE, 0xFF8F, 0) /* マ --> ﾏ */ +DEFINE_FULL2HALF(0x30DF, 0xFF90, 0) /* ミ --> ﾐ */ +DEFINE_FULL2HALF(0x30E0, 0xFF91, 0) /* ム --> ﾑ */ +DEFINE_FULL2HALF(0x30E1, 0xFF92, 0) /* メ --> ﾒ */ +DEFINE_FULL2HALF(0x30E2, 0xFF93, 0) /* モ --> ﾓ */ +DEFINE_FULL2HALF(0x30E3, 0xFF6C, 0) /* ャ --> ｬ */ +DEFINE_FULL2HALF(0x30E4, 0xFF94, 0) /* ヤ --> ﾔ */ +DEFINE_FULL2HALF(0x30E5, 0xFF6D, 0) /* ュ --> ｭ */ +DEFINE_FULL2HALF(0x30E6, 0xFF95, 0) /* ユ --> ﾕ */ +DEFINE_FULL2HALF(0x30E7, 0xFF6E, 0) /* ョ --> ｮ */ +DEFINE_FULL2HALF(0x30E8, 0xFF96, 0) /* ヨ --> ﾖ */ +DEFINE_FULL2HALF(0x30E9, 0xFF97, 0) /* ラ --> ﾗ */ +DEFINE_FULL2HALF(0x30EA, 0xFF98, 0) /* リ --> ﾘ */ +DEFINE_FULL2HALF(0x30EB, 0xFF99, 0) /* ル --> ﾙ */ +DEFINE_FULL2HALF(0x30EC, 0xFF9A, 0) /* レ --> ﾚ */ +DEFINE_FULL2HALF(0x30ED, 0xFF9B, 0) /* ロ --> ﾛ */ +DEFINE_FULL2HALF(0x30EF, 0xFF9C, 0) /* ワ --> ﾜ */ +DEFINE_FULL2HALF(0x30F2, 0xFF66, 0) /* ヲ --> ｦ */ +DEFINE_FULL2HALF(0x30F3, 0xFF9D, 0) /* ン --> ﾝ */ +DEFINE_FULL2HALF(0x30F4, 0xFF73, 0xFF9E) /* ヴ --> ｳﾞ */ +DEFINE_FULL2HALF(0x30F7, 0xFF9C, 0xFF9E) /* ヷ --> ﾜﾞ */ +DEFINE_FULL2HALF(0x30FA, 0xFF66, 0xFF9E) /* ヺ --> ｦﾞ */ +DEFINE_FULL2HALF(0x30FB, 0xFF65, 0) /* ・ --> ･ */ +DEFINE_FULL2HALF(0x30FC, 0xFF70, 0) /* ー --> ｰ */ diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index a3fa2af9d75..acd6f560063 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -1866,6 +1866,399 @@ BOOL WINAPI GetStringTypeExA( LCID locale, DWORD type, LPCSTR src, INT count, LP return GetStringTypeA(locale, type, src, count, chartype); } +static inline void map_byterev(const WCHAR *src, int len, WCHAR *dst) +{ + while (len--) + *dst++ = RtlUshortByteSwap(*src++); +} + +static int map_to_hiragana(const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos; + for (pos = 0; srclen; src++, srclen--, pos++) + { + /* + * U+30A1 ... U+30F3: Katakana + * U+30F4: Katakana Letter VU + * U+30F5: Katakana Letter Small KA + * U+30FD: Katakana Iteration Mark + * U+30FE: Katakana Voiced Iteration Mark + */ + WCHAR wch = *src; + if ((0x30A1 <= wch && wch <= 0x30F3) || + wch == 0x30F4 || wch == 0x30F5 || wch == 0x30FD || wch == 0x30FE) + { + wch -= 0x60; /* Katakana to Hiragana */ + } + if (pos < dstlen) + dst[pos] = wch; + } + return pos; +} + +static int map_to_katakana(const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos; + for (pos = 0; srclen; src++, srclen--, pos++) + { + /* + * U+3041 ... U+3093: Hiragana + * U+3094: Hiragana Letter VU + * U+3095: Hiragana Letter Small KA + * U+309D: Hiragana Iteration Mark + * U+309E: Hiragana Voiced Iteration Mark + */ + WCHAR wch = *src; + if ((0x3041 <= wch && wch <= 0x3093) || + wch == 3094 || wch == 0x3095 || wch == 0x309D || wch == 0x309E) + { + wch += 0x60; /* Hiragana to Katakana */ + } + if (pos < dstlen) + dst[pos] = wch; + } + return pos; +} + +/* The table that contains fullwidth characters and halfwidth characters */ +typedef WCHAR FULL2HALF_ENTRY[3]; +static const FULL2HALF_ENTRY full2half_table[] = +{ +#define DEFINE_FULL2HALF(full, half1, half2) { full, half1, half2 }, +#include "full2half.h" +#undef DEFINE_FULL2HALF +}; +#define GET_FULL(table, index) ((table)[index][0]) +#define GET_HALF1(table, index) ((table)[index][1]) +#define GET_HALF2(table, index) ((table)[index][2]) + +/* The table that contains dakuten entries */ +typedef WCHAR DAKUTEN_ENTRY[3]; +static const DAKUTEN_ENTRY dakuten_table[] = +{ +#define DEFINE_DAKUTEN(voiced, single1, single2, half1, half2) { voiced, single1, single2 }, +#include "dakuten.h" +#undef DEFINE_DAKUTEN +}; +#define GET_VOICED(table, index) ((table)[index][0]) +#define GET_SINGLE1(table, index) ((table)[index][1]) +#define GET_SINGLE2(table, index) ((table)[index][2]) + +static int map_to_halfwidth(DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos, i; + const int count1 = (int)ARRAY_SIZE(full2half_table); + const FULL2HALF_ENTRY *table1 = full2half_table; + + for (pos = 0; srclen; src++, srclen--, pos++) + { + WCHAR ch = *src; + + if (flags & LCMAP_KATAKANA) + map_to_katakana(&ch, 1, &ch, 1); + else if (flags & LCMAP_HIRAGANA) + map_to_hiragana(&ch, 1, &ch, 1); + + if (ch < 0x3000) /* Quick judgment */ + { + if (pos < dstlen) + dst[pos] = ch; + continue; + } + + if (0xFF01 <= ch && ch <= 0xFF5E) /* U+FF01 ... U+FF5E */ + { + if (pos < dstlen) + dst[pos] = ch - 0xFEE0; /* Fullwidth ASCII to halfwidth ASCII */ + continue; + } + + /* Search in table1 (full/half) */ + for (i = count1 - 1; i >= 0; --i) /* In reverse order */ + { + if (GET_FULL(table1, i) != ch) + continue; + + if (GET_HALF2(table1, i) == 0) + { + if (pos < dstlen) + dst[pos] = GET_HALF1(table1, i); + } + else if (!dstlen) + { + pos++; + } + else if (pos + 1 < dstlen) + { + dst[pos++] = GET_HALF1(table1, i); + dst[pos ] = GET_HALF2(table1, i); + } + else + { + dst[pos] = ch; + } + break; + } + + if (i >= 0) + continue; + + if (pos < dstlen) + dst[pos] = ch; + } + + return pos; +} + +static int map_to_fullwidth(const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos, i; + const FULL2HALF_ENTRY *table1 = full2half_table; + const DAKUTEN_ENTRY *table2 = dakuten_table; + const int count1 = (int)ARRAY_SIZE(full2half_table); + const int count2 = (int)ARRAY_SIZE(dakuten_table); + + for (pos = 0; srclen; src++, srclen--, pos++) + { + WCHAR ch = *src; + + if (ch == 0x20) /* U+0020: Space */ + { + if (pos < dstlen) + dst[pos] = 0x3000; /* U+3000: Ideographic Space */ + continue; + } + + if (0x21 <= ch && ch <= 0x7E) /* Mappable halfwidth ASCII */ + { + if (pos < dstlen) + dst[pos] = ch + 0xFEE0; /* U+FF01 ... U+FF5E */ + continue; + } + + if (ch < 0xFF00) /* Quick judgment */ + { + if (pos < dstlen) + dst[pos] = ch; + continue; + } + + /* Search in table1 (full/half) */ + for (i = count1 - 1; i >= 0; --i) /* In reverse order */ + { + if (GET_HALF1(table1, i) != ch) + continue; /* Mismatched */ + + if (GET_HALF2(table1, i) == 0) + { + if (pos < dstlen) + dst[pos] = GET_FULL(table1, i); + break; + } + + if (srclen <= 1 || GET_HALF2(table1, i) != src[1]) + continue; /* Mismatched */ + + --srclen; + ++src; + + if (pos < dstlen) + dst[pos] = GET_FULL(table1, i); + break; + } + + if (i >= 0) + continue; + + /* Search in table2 (dakuten) */ + for (i = count2 - 1; i >= 0; --i) /* In reverse order */ + { + if (GET_SINGLE1(table2, i) != ch) + continue; /* Mismatched */ + + if (srclen <= 1 || GET_SINGLE2(table2, i) != src[1]) + continue; /* Mismatched */ + + --srclen; + ++src; + + if (pos < dstlen) + dst[pos] = GET_VOICED(table2, i); + break; + } + + if (i >= 0) + continue; + + if (pos < dstlen) + dst[pos] = ch; + } + + return pos; +} + +static int map_to_lowercase(DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos; + for (pos = 0; srclen; src++, srclen--) + { + WCHAR wch = *src; + if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) + continue; + if (pos < dstlen) + dst[pos] = tolowerW(wch); + pos++; + } + return pos; +} + +static int map_to_uppercase(DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos; + for (pos = 0; srclen; src++, srclen--) + { + WCHAR wch = *src; + if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) + continue; + if (pos < dstlen) + dst[pos] = toupperW(wch); + pos++; + } + return pos; +} + +static int map_remove_ignored(DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int pos; + WORD wC1, wC2, wC3; + for (pos = 0; srclen; src++, srclen--) + { + WCHAR wch = *src; + GetStringTypeW(CT_CTYPE1, &wch, 1, &wC1); + GetStringTypeW(CT_CTYPE2, &wch, 1, &wC2); + GetStringTypeW(CT_CTYPE3, &wch, 1, &wC3); + if (flags & NORM_IGNORESYMBOLS) + { + if ((wC1 & C1_PUNCT) || (wC3 & C3_SYMBOL)) + continue; + } + if (flags & NORM_IGNORENONSPACE) + { + if ((wC2 & C2_OTHERNEUTRAL) && (wC3 & (C3_NONSPACING | C3_DIACRITIC))) + continue; + } + if (pos < dstlen) + dst[pos] = wch; + pos++; + } + return pos; +} + +static int lcmap_string(DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen) +{ + int ret = 0; + + if ((flags & (LCMAP_LOWERCASE | LCMAP_UPPERCASE)) == (LCMAP_LOWERCASE | LCMAP_UPPERCASE)) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + switch (flags & ~(LCMAP_BYTEREV | LCMAP_LOWERCASE | LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING)) + { + case LCMAP_HIRAGANA: + ret = map_to_hiragana(src, srclen, dst, dstlen); + break; + case LCMAP_KATAKANA: + ret = map_to_katakana(src, srclen, dst, dstlen); + break; + case LCMAP_HALFWIDTH: + ret = map_to_halfwidth(flags, src, srclen, dst, dstlen); + break; + case LCMAP_HIRAGANA | LCMAP_HALFWIDTH: + ret = map_to_halfwidth(flags, src, srclen, dst, dstlen); + break; + case LCMAP_KATAKANA | LCMAP_HALFWIDTH: + ret = map_to_halfwidth(flags, src, srclen, dst, dstlen); + break; + case LCMAP_FULLWIDTH: + ret = map_to_fullwidth(src, srclen, dst, dstlen); + break; + case LCMAP_HIRAGANA | LCMAP_FULLWIDTH: + ret = map_to_fullwidth(src, srclen, dst, dstlen); + if (dstlen && ret) + map_to_hiragana(dst, ret, dst, dstlen); + break; + case LCMAP_KATAKANA | LCMAP_FULLWIDTH: + ret = map_to_fullwidth(src, srclen, dst, dstlen); + if (dstlen && ret) + map_to_katakana(dst, ret, dst, dstlen); + break; + case LCMAP_SIMPLIFIED_CHINESE: + FIXME("LCMAP_SIMPLIFIED_CHINESE\n"); + break; + case LCMAP_TRADITIONAL_CHINESE: + FIXME("LCMAP_TRADITIONAL_CHINESE\n"); + break; + case NORM_IGNORENONSPACE: + case NORM_IGNORESYMBOLS: + case NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS: + if (flags & ~(NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS | LCMAP_BYTEREV)) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + ret = map_remove_ignored(flags, src, srclen, dst, dstlen); + break; + case 0: + if (flags & LCMAP_LOWERCASE) + { + ret = map_to_lowercase(flags, src, srclen, dst, dstlen); + flags &= ~LCMAP_LOWERCASE; + break; + } + if (flags & LCMAP_UPPERCASE) + { + ret = map_to_uppercase(flags, src, srclen, dst, dstlen); + flags &= ~LCMAP_UPPERCASE; + break; + } + if (flags & LCMAP_BYTEREV) + { + if (dstlen == 0) + { + ret = srclen; + break; + } + ret = min(srclen, dstlen); + RtlCopyMemory(dst, src, ret * sizeof(WCHAR)); + break; + } + /* fall through */ + default: + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if (dstlen) + { + if (flags & LCMAP_LOWERCASE) + map_to_lowercase(flags, dst, ret, dst, dstlen); + if (flags & LCMAP_UPPERCASE) + map_to_uppercase(flags, dst, ret, dst, dstlen); + if (flags & LCMAP_BYTEREV) + map_byterev(dst, min(ret, dstlen), dst); + + if (dstlen < ret) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + + return ret; +} + /************************************************************************* * LCMapStringEx (KERNEL32.@) * @@ -1889,8 +2282,6 @@ BOOL WINAPI GetStringTypeExA( LCID locale, DWORD type, LPCSTR src, INT count, LP INT WINAPI LCMapStringEx(LPCWSTR locale, DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM handle) { - LPWSTR dst_ptr; - if (version) FIXME("unsupported version structure %p\n", version); if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); if (handle) @@ -1918,28 +2309,14 @@ INT WINAPI LCMapStringEx(LPCWSTR locale, DWORD flags, LPCWSTR src, INT srclen, L return 0; } - /* mutually exclusive flags */ - if ((flags & (LCMAP_LOWERCASE | LCMAP_UPPERCASE)) == (LCMAP_LOWERCASE | LCMAP_UPPERCASE) || - (flags & (LCMAP_HIRAGANA | LCMAP_KATAKANA)) == (LCMAP_HIRAGANA | LCMAP_KATAKANA) || - (flags & (LCMAP_HALFWIDTH | LCMAP_FULLWIDTH)) == (LCMAP_HALFWIDTH | LCMAP_FULLWIDTH) || - (flags & (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) == (LCMAP_TRADITIONAL_CHINESE | LCMAP_SIMPLIFIED_CHINESE)) - { - SetLastError(ERROR_INVALID_FLAGS); - return 0; - } - if (!dstlen) dst = NULL; if (flags & LCMAP_SORTKEY) { INT ret; - if (src == dst) - { - SetLastError(ERROR_INVALID_FLAGS); - return 0; - } - if (srclen < 0) srclen = strlenW(src); + if (srclen < 0) + srclen = strlenW(src); ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); if (ret == 0) @@ -1956,100 +2333,7 @@ INT WINAPI LCMapStringEx(LPCWSTR locale, DWORD flags, LPCWSTR src, INT srclen, L return 0; } - if (!dst) /* return required string length */ - { - INT len; - - for (len = 0; srclen; src++, srclen--) - { - WCHAR wch = *src; - /* tests show that win2k just ignores NORM_IGNORENONSPACE, - * and skips white space and punctuation characters for - * NORM_IGNORESYMBOLS. - */ - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - len++; - } - return len; - } - - if (flags & LCMAP_UPPERCASE) - { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) - { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = toupperW(wch); - dstlen--; - } - } - else if (flags & LCMAP_LOWERCASE) - { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) - { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = tolowerW(wch); - dstlen--; - } - } - else - { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) - { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = wch; - dstlen--; - } - } - -#ifdef __REACTOS__ - if (flags & LCMAP_KATAKANA) - { - INT convlen = dst_ptr - dst; - for (dst_ptr = dst; convlen; --convlen, ++dst_ptr) - { - /* - * U+3041 ... U+3093: Hiragana - * U+3095: Hiragana Letter Small KA - * U+309D: Hiragana Iteration Mark - * U+309E: Hiragana Voiced Iteration Mark - */ - WCHAR wch = *dst_ptr; - if ((0x3041 <= wch && wch <= 0x3093) || wch == 0x3095 || wch == 0x309D || wch == 0x309E) - *dst_ptr = wch + 0x60; /* Hiragana to Katanaka */ - } - } - else if (flags & LCMAP_HIRAGANA) - { - INT convlen = dst_ptr - dst; - for (dst_ptr = dst; convlen; --convlen, ++dst_ptr) - { - /* - * U+30A1 ... U+30F3: Katakana - * U+30F5: Katakana Letter Small KA - * U+30FD: Katakana Iteration Mark - * U+30FE: Katakana Voiced Iteration Mark - */ - WCHAR wch = *dst_ptr; - if ((0x30A1 <= wch && wch <= 0x30F3) || wch == 0x30F5 || wch == 0x30FD || wch == 0x30FE) - *dst_ptr = wch - 0x60; /* Katanaka to Hiragana */ - } - } -#endif - - if (srclen) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - - return dst_ptr - dst; + return lcmap_string(flags, src, srclen, dst, dstlen); } /*************************************************************************

1 year, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2023