Ros-diffs September 2023

ros-diffs@reactos.org

23 participants
113 discussions

[reactos] 01/01: [NTOS:CM] Fix lock leak
by Timo Kreuzer 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed06c06dcbccdc08a049b… commit ed06c06dcbccdc08a049bb659b6413be527118f3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Sep 20 23:21:10 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 23 18:34:00 2023 +0300 [NTOS:CM] Fix lock leak Triggered by low available pool memory during kmtest ExPools. --- ntoskrnl/config/cmalloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/config/cmalloc.c b/ntoskrnl/config/cmalloc.c index eda161da97e..7d44ff82135 100644 --- a/ntoskrnl/config/cmalloc.c +++ b/ntoskrnl/config/cmalloc.c @@ -176,6 +176,9 @@ SearchKcbList: /* Now go back and search the list */ goto SearchKcbList; } + + /* Release the allocation lock */ + KeReleaseGuardedMutex(&CmpAllocBucketLock); } /* Allocate a KCB only */

1 0

[reactos] 01/01: [THEMES] Optimize png for Lautus style (#5712)
by Andrew Dent 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa84645bccda8d7095f60… commit aa84645bccda8d7095f6053cae67b1e9bf816345 Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Sep 20 22:56:06 2023 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 23 15:54:39 2023 +0300 [THEMES] Optimize png for Lautus style (#5712) Lossless optimization of new png Start button in Lautus style, original by @Splitwirez (ed134bf2, #5540). Slimmed 464 bytes, ~20% saving. This png is encoded as a grayscale+alpha, so should be tested. --- .../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png | Bin 2341 -> 1877 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png index 5508ccbc79f..c79d4711f09 100644 Binary files a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png differ

1 0

[reactos] 01/01: [RPCRT4] Fix x64 assembly code
by Timo Kreuzer 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88808bad8a29213bc51ca… commit 88808bad8a29213bc51ca54db265e9425a457981 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 10 14:35:20 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 23 11:06:24 2023 +0300 [RPCRT4] Fix x64 assembly code movaps is a 128 bit aligned move, we need a 64 bit unaligned move, so use movsd. Fixes a crash in oleaut32_winetest tmarshal. Also add a comment about the use of movd instead of movq. --- dll/win32/rpcrt4/msvc.S | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dll/win32/rpcrt4/msvc.S b/dll/win32/rpcrt4/msvc.S index fca5ee5e612..a1da254285b 100644 --- a/dll/win32/rpcrt4/msvc.S +++ b/dll/win32/rpcrt4/msvc.S @@ -62,9 +62,9 @@ FUNC call_stubless_func add rdx, [rcx + 8] /* info->ProcFormatString + offset */ mov rcx, [rcx] /* info->pStubDesc */ - movaps [rsp + 20h], xmm1 - movaps [rsp + 28h], xmm2 - movaps [rsp + 30h], xmm3 + movsd qword ptr [rsp + 20h], xmm1 + movsd qword ptr [rsp + 28h], xmm2 + movsd qword ptr [rsp + 30h], xmm3 lea r9, [rsp + 18h] /* fpu_args */ call ndr_client_call add rsp, 38h @@ -97,6 +97,14 @@ FUNC call_server_func mov rdx, [rsp + 8] mov r8, [rsp + 16] mov r9, [rsp + 24] + + /* Usually the 64 bit SSE2 version of movd is called movq, as in GCC code + (see https://www.felixcloutier.com/x86/movd:movq). But there is another + movq with different encoding, which does not accept an integer register + as source (see https://www.felixcloutier.com/x86/movq). Older versions + of ML64 get confused and do not accept movq with integer registers, + but they translate movd to 64 bit, when 64 bit registers are used as + source, so we use that here. */ movd xmm0, rcx movd xmm1, rdx movd xmm2, r8

1 0

[reactos] 01/01: [MSPAINT] Introduce Ctrl+Plus / Ctrl+Minus (#5717)
by Katayama Hirofumi MZ 23 Sep '23

23 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed9973f87621489568314… commit ed9973f876214895683144fa85a61d4695191b60 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 23 09:26:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 23 09:26:11 2023 +0900 [MSPAINT] Introduce Ctrl+Plus / Ctrl+Minus (#5717) - Add Ctrl+Plus and Ctrl+Minus accelerators. - Add IDM_CTRL_PLUS and IDM_CTRL_MINUS commands. - Stretch the selection area on IDM_CTRL_PLUS and IDM_CTRL_MINUS actions. CORE-19094 --- base/applications/mspaint/canvas.cpp | 4 +-- base/applications/mspaint/lang/bg-BG.rc | 4 +++ base/applications/mspaint/lang/cs-CZ.rc | 4 +++ base/applications/mspaint/lang/de-DE.rc | 4 +++ base/applications/mspaint/lang/en-GB.rc | 4 +++ base/applications/mspaint/lang/en-US.rc | 4 +++ base/applications/mspaint/lang/es-ES.rc | 4 +++ base/applications/mspaint/lang/et-EE.rc | 4 +++ base/applications/mspaint/lang/eu-ES.rc | 4 +++ base/applications/mspaint/lang/fr-FR.rc | 4 +++ base/applications/mspaint/lang/he-IL.rc | 4 +++ base/applications/mspaint/lang/hu-HU.rc | 4 +++ base/applications/mspaint/lang/id-ID.rc | 4 +++ base/applications/mspaint/lang/it-IT.rc | 4 +++ base/applications/mspaint/lang/ja-JP.rc | 4 +++ base/applications/mspaint/lang/nl-NL.rc | 4 +++ base/applications/mspaint/lang/no-NO.rc | 4 +++ base/applications/mspaint/lang/pl-PL.rc | 4 +++ base/applications/mspaint/lang/pt-BR.rc | 4 +++ base/applications/mspaint/lang/pt-PT.rc | 4 +++ base/applications/mspaint/lang/ro-RO.rc | 4 +++ base/applications/mspaint/lang/ru-RU.rc | 4 +++ base/applications/mspaint/lang/sk-SK.rc | 4 +++ base/applications/mspaint/lang/sq-AL.rc | 4 +++ base/applications/mspaint/lang/sv-SE.rc | 4 +++ base/applications/mspaint/lang/tr-TR.rc | 4 +++ base/applications/mspaint/lang/uk-UA.rc | 4 +++ base/applications/mspaint/lang/vi-VN.rc | 4 +++ base/applications/mspaint/lang/zh-CN.rc | 4 +++ base/applications/mspaint/lang/zh-HK.rc | 4 +++ base/applications/mspaint/lang/zh-TW.rc | 4 +++ base/applications/mspaint/mouse.cpp | 10 ++++++ base/applications/mspaint/resource.h | 3 ++ base/applications/mspaint/selectionmodel.cpp | 48 ++++++++++++++++++++++------ base/applications/mspaint/selectionmodel.h | 6 ++-- base/applications/mspaint/toolsmodel.cpp | 5 +++ base/applications/mspaint/toolsmodel.h | 4 +++ base/applications/mspaint/winproc.cpp | 7 ++++ 38 files changed, 193 insertions(+), 14 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 186b88dc044..a403c8bd456 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -750,8 +750,8 @@ LRESULT CCanvasWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH VOID CCanvasWindow::cancelDrawing() { - selectionModel.ClearColor(); - selectionModel.ClearMask(); + selectionModel.ClearColorImage(); + selectionModel.ClearMaskImage(); m_hitSelection = HIT_NONE; m_drawing = FALSE; toolsModel.OnCancelDraw(); diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index cf525cd4514..e880803577d 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index c6a8c018a83..22f2387752a 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 97466efcbb1..07511f578ed 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -139,6 +139,10 @@ BEGIN "^U", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 6a714ff0998..29b47c1b7de 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 029eaa11384..9119010ce53 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 5ad11ac1f2c..6af66999fea 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 6103e1608cb..c6fef7bb171 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 3340d338c46..fdda0e8edbd 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 6fb2dc383be..056a79f6f8e 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 1dff4387dc0..853dfb9852f 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index ded0865a4d2..266ab21eeb2 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 3ae30e7f170..b03210330f4 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 9327ca498e5..6ef469f5923 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 5969044d5b4..5c41f90053b 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index a6c32b7e7ab..de8539ebfc3 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 4c4f0398db5..001ca09b9f2 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index d29933dd321..0f9b0076a7a 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index c178150a2a5..be53b2cc1b4 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 155c6b3e9a2..f4b9638e03e 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index b74925b6523..274c14a28ea 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 05bfa15efc9..964453968e6 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -143,6 +143,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index ab02f98cf27..5fa46a01124 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index e19521d570e..5da01332cd3 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index cdfc04e71a3..ec2f3205a74 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index de836e273e4..b7768297a36 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index e50eb7b1877..e54a662e1fe 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -141,6 +141,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 07cc7fa0ae0..cebeb1d53cc 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -139,6 +139,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 6a5e2d6349e..962479ab51f 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -142,6 +142,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index f3429ab9c1f..65dd0e96eb3 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 953bf47b481..f08299a24f1 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -140,6 +140,10 @@ BEGIN "^I", IDM_IMAGEINVERTCOLORS "^E", IDM_IMAGEATTRIBUTES "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY + VK_ADD, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_SUBTRACT, IDM_CTRL_MINUS, CONTROL, VIRTKEY + VK_OEM_PLUS, IDM_CTRL_PLUS, CONTROL, VIRTKEY + VK_OEM_MINUS, IDM_CTRL_MINUS, CONTROL, VIRTKEY END IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f6cb9e2ac22..f896ccd84f3 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -199,6 +199,11 @@ struct FreeSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; // TOOL_RECTSEL @@ -280,6 +285,11 @@ struct RectSelTool : ToolBase selectionModel.HideSelection(); ToolBase::OnCancelDraw(); } + + void OnSpecialTweak(BOOL bMinus) override + { + selectionModel.StretchSelection(bMinus); + } }; struct TwoPointDrawTool : ToolBase diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 310554de200..b41486cee4d 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -102,6 +102,9 @@ #define IDM_UNDERLINE 282 #define IDM_VERTICAL 283 +#define IDM_CTRL_PLUS 290 +#define IDM_CTRL_MINUS 291 + /* the following 16 numbers need to be in order, increasing by 1 */ #define ID_FREESEL 600 #define ID_RECTSEL 601 diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index b46a72263b9..c768c360744 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -28,8 +28,8 @@ SelectionModel::SelectionModel() SelectionModel::~SelectionModel() { - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ResetPtStack(); } @@ -85,7 +85,7 @@ void SelectionModel::BuildMaskFromPtStack() m_rc = m_rcOld = rc; - ClearMask(); + ClearMaskImage(); ShiftPtStack(-m_rcOld.left, -m_rcOld.top); @@ -154,7 +154,7 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTranspar void SelectionModel::GetSelectionContents(HDC hDCImage) { - ClearColor(); + ClearColorImage(); HDC hMemDC = ::CreateCompatibleDC(NULL); m_hbmColor = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); @@ -174,12 +174,17 @@ BOOL SelectionModel::TakeOff() if (!IsLanded() || ::IsRectEmpty(&m_rc)) return FALSE; + // The background color is needed for transparency of selection m_rgbBack = paletteModel.GetBgColor(); + + // Get the contents of the selection area GetSelectionContents(imageModel.GetDC()); + // RectSel doesn't need the mask image if (toolsModel.GetActiveTool() == TOOL_RECTSEL) - ClearMask(); + ClearMaskImage(); + // Save the selection area m_rcOld = m_rc; imageModel.NotifyImageChanged(); @@ -225,7 +230,7 @@ void SelectionModel::InsertFromHBITMAP(HBITMAP hbmColor, INT x, INT y, HBITMAP h } else { - ClearMask(); + ClearMaskImage(); } NotifyContentChanged(); @@ -458,7 +463,7 @@ void SelectionModel::Dragging(HITTEST hit, POINT pt) m_ptHit = pt; } -void SelectionModel::ClearMask() +void SelectionModel::ClearMaskImage() { if (m_hbmMask) { @@ -467,7 +472,7 @@ void SelectionModel::ClearMask() } } -void SelectionModel::ClearColor() +void SelectionModel::ClearColorImage() { if (m_hbmColor) { @@ -479,8 +484,8 @@ void SelectionModel::ClearColor() void SelectionModel::HideSelection() { m_bShow = m_bContentChanged = FALSE; - ClearColor(); - ClearMask(); + ClearColorImage(); + ClearMaskImage(); ::SetRectEmpty(&m_rc); ::SetRectEmpty(&m_rcOld); imageModel.NotifyImageChanged(); @@ -540,3 +545,26 @@ void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) { m_hbmColor = hbmLocked; } + +void SelectionModel::StretchSelection(BOOL bShrink) +{ + if (!m_bShow) + return; + + TakeOff(); + + INT cx = m_rc.Width(), cy = m_rc.Height(); + + if (bShrink) + m_rc.InflateRect(-cx / 4, -cy / 4); + else + m_rc.InflateRect(+cx / 2, +cy / 2); + + // The selection area must exist there + if (m_rc.Width() <= 0) + m_rc.right = m_rc.left + 1; + if (m_rc.Height() <= 0) + m_rc.bottom = m_rc.top + 1; + + imageModel.NotifyImageChanged(); +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index febc6072263..1d0c1b28614 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -58,10 +58,12 @@ public: void InvertSelection(); void Dragging(HITTEST hit, POINT pt); - void ClearMask(); - void ClearColor(); + void ClearMaskImage(); + void ClearColorImage(); void NotifyContentChanged(); + void StretchSelection(BOOL bShrink); + private: SelectionModel(const SelectionModel&); SelectionModel& operator=(const SelectionModel&); diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 604d4bead54..b9a5ac2e4b6 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -248,3 +248,8 @@ void ToolsModel::selectAll() OnMouseMove(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); OnButtonUp(TRUE, imageModel.GetWidth(), imageModel.GetHeight()); } + +void ToolsModel::SpecialTweak(BOOL bMinus) +{ + m_pToolObject->OnSpecialTweak(bMinus); +} diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index a00e8682a5f..33335c07ffd 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -51,6 +51,8 @@ struct ToolBase virtual void OnDrawOverlayOnImage(HDC hdc) { } virtual void OnDrawOverlayOnCanvas(HDC hdc) { } + virtual void OnSpecialTweak(BOOL bMinus) { } + void beginEvent(); void endEvent(); void reset(); @@ -115,6 +117,8 @@ public: void NotifyToolChanged(); void NotifyToolSettingsChanged(); void NotifyZoomChanged(); + + void SpecialTweak(BOOL bMinus); }; extern ToolsModel toolsModel; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 130c81ebbd9..99658fccd52 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -1069,6 +1069,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH fullscreenWindow.DoCreate(); fullscreenWindow.ShowWindow(SW_SHOWMAXIMIZED); break; + + case IDM_CTRL_PLUS: + toolsModel.SpecialTweak(FALSE); + break; + case IDM_CTRL_MINUS: + toolsModel.SpecialTweak(TRUE); + break; } return 0; }

1 0

[reactos] 01/01: [MSPAINT] Don't show error message twice (#5715)
by Katayama Hirofumi MZ 22 Sep '23

22 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bbb33a6ed52e9adf4af07… commit bbb33a6ed52e9adf4af07f7d3cfdd74baa76bfbb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 22 10:48:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 22 10:48:13 2023 +0900 [MSPAINT] Don't show error message twice (#5715) - Reduce display of error message on IDM_EDITCOPYTO and IDM_EDITPASTEFROM. - Introduce LockBitmap/UnlockBitmap mechanism for ImageModel and SelectionModel. CORE-19181, CORE-19182 --- base/applications/mspaint/history.cpp | 34 ++++++++++++++++++++-------- base/applications/mspaint/history.h | 2 ++ base/applications/mspaint/main.cpp | 6 ++--- base/applications/mspaint/selectionmodel.cpp | 12 ++++++++++ base/applications/mspaint/selectionmodel.h | 2 ++ base/applications/mspaint/winproc.cpp | 18 ++++++--------- 6 files changed, 50 insertions(+), 24 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 4451b06f927..e44eca7dc4d 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -261,27 +261,41 @@ void ImageModel::Clamp(POINT& pt) const HBITMAP ImageModel::CopyBitmap() { - // NOTE: An app cannot select a bitmap into more than one device context at a time. - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP ret = CopyDIBImage(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + HBITMAP ret = CopyDIBImage(hBitmap); + UnlockBitmap(hBitmap); return ret; } BOOL ImageModel::IsBlackAndWhite() { - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - BOOL bBlackAndWhite = IsBitmapBlackAndWhite(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); return bBlackAndWhite; } void ImageModel::PushBlackAndWhite() { - ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select - HBITMAP hNewBitmap = ConvertToBlackAndWhite(m_hBms[m_currInd]); - m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + HBITMAP hBitmap = LockBitmap(); + HBITMAP hNewBitmap = ConvertToBlackAndWhite(hBitmap); + UnlockBitmap(hBitmap); if (hNewBitmap) PushImageForUndo(hNewBitmap); } + +HBITMAP ImageModel::LockBitmap() +{ + // NOTE: An app cannot select a bitmap into more than one device context at a time. + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + HBITMAP hbmLocked = m_hBms[m_currInd]; + m_hBms[m_currInd] = NULL; + return hbmLocked; +} + +void ImageModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hBms[m_currInd] = hbmLocked; + m_hbmOld = ::SelectObject(m_hDrawingDC, hbmLocked); // Re-select +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 5bee4105240..fb369dff72c 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -31,6 +31,8 @@ public: int GetWidth() const; int GetHeight() const; HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void InvertColors(); void FlipHorizontally(); void FlipVertically(); diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index ba7ad18c213..dda9db7618e 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -117,9 +117,9 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) strFileTitle += L".png"; // Save it to the temporary file - HBITMAP hbm = imageModel.CopyBitmap(); - BOOL ret = SaveDIBToFile(hbm, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); - ::DeleteObject(hbm); + HBITMAP hbmLocked = imageModel.LockBitmap(); + BOOL ret = SaveDIBToFile(hbmLocked, g_szMailTempFile, FALSE, Gdiplus::ImageFormatPNG); + imageModel.UnlockBitmap(hbmLocked); if (!ret) { g_szMailTempFile[0] = UNICODE_NULL; diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index a5e81d5c41a..b46a72263b9 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -528,3 +528,15 @@ void SelectionModel::SwapWidthAndHeight() m_rc.right = m_rc.left + cy; m_rc.bottom = m_rc.top + cx; } + +HBITMAP SelectionModel::LockBitmap() +{ + HBITMAP hbm = m_hbmColor; + m_hbmColor = NULL; + return hbm; +} + +void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) +{ + m_hbmColor = hbmLocked; +} diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index b47a0d40821..febc6072263 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -40,6 +40,8 @@ public: void DeleteSelection(); HBITMAP CopyBitmap(); + HBITMAP LockBitmap(); + void UnlockBitmap(HBITMAP hbmLocked); void GetSelectionContents(HDC hDCImage); void DrawFramePoly(HDC hDCImage); void DrawBackground(HDC hDCImage); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 8f9e0ca9b31..130c81ebbd9 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -741,13 +741,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH selectionModel.TakeOff(); { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (hbm) + HBITMAP hbmLocked = selectionModel.LockBitmap(); + if (hbmLocked) { - HGLOBAL hGlobal = BitmapToClipboardDIB(hbm); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbmLocked); if (hGlobal) ::SetClipboardData(CF_DIB, hGlobal); - ::DeleteObject(hbm); + selectionModel.UnlockBitmap(hbmLocked); } } @@ -865,10 +865,9 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH WCHAR szFileName[MAX_LONG_PATH] = L"*.png"; if (GetSaveFileName(szFileName, _countof(szFileName))) { - HBITMAP hbm = selectionModel.CopyBitmap(); - if (!SaveDIBToFile(hbm, szFileName, FALSE)) - ShowError(IDS_SAVEERROR, szFileName); - ::DeleteObject(hbm); + HBITMAP hbmLocked = selectionModel.LockBitmap(); + SaveDIBToFile(hbmLocked, szFileName, FALSE); + selectionModel.UnlockBitmap(hbmLocked); } break; } @@ -880,8 +879,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HBITMAP hbmNew = DoLoadImageFile(m_hWnd, szFileName, FALSE); if (hbmNew) InsertSelectionFromHBITMAP(hbmNew, m_hWnd); - else - ShowError(IDS_LOADERRORTEXT, szFileName); } break; } @@ -1008,7 +1005,6 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.PushImageForUndo(selectionModel.CopyBitmap()); selectionModel.HideSelection(); break; - case IDM_VIEWTOOLBOX: registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE);

1 0

[reactos] 01/01: [MSPAINT] Don't copy bits on resizing (#5716)
by Katayama Hirofumi MZ 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98050f91390e1fc6f7034… commit 98050f91390e1fc6f7034c0033c44a66f1fd9f6e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 22 07:35:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 22 07:35:03 2023 +0900 [MSPAINT] Don't copy bits on resizing (#5716) - Fix the graphical glitches on resizing and moving toolbars. - Add SWP_NOCOPYBITS flag on positioning controls on resizing of main window. CORE-19137 --- base/applications/mspaint/winproc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 8a6e259b12f..8f9e0ca9b31 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -77,6 +77,7 @@ void CMainWindow::alignChildrenToMainWindow() RECT clientRect, rc; GetClientRect(&clientRect); RECT rcSpace = clientRect; + const UINT uFlags = (SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOCOPYBITS); if (::IsWindowVisible(g_hStatusBar)) { @@ -93,7 +94,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.right - CX_TOOLBAR, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.right -= CX_TOOLBAR; } else @@ -101,7 +102,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, toolBoxContainer, NULL, rcSpace.left, rcSpace.top, CX_TOOLBAR, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.left += CX_TOOLBAR; } } @@ -113,7 +114,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.bottom - CY_PALETTE, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.bottom -= CY_PALETTE; } else @@ -121,7 +122,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, paletteWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, CY_PALETTE, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); rcSpace.top += CY_PALETTE; } } @@ -131,7 +132,7 @@ void CMainWindow::alignChildrenToMainWindow() hDWP = ::DeferWindowPos(hDWP, canvasWindow, NULL, rcSpace.left, rcSpace.top, rcSpace.right - rcSpace.left, rcSpace.bottom - rcSpace.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION); + uFlags); } ::EndDeferWindowPos(hDWP);

1 0

[reactos] 01/01: [WIN32K] Prevent dereferencing NULL pointer
by Timo Kreuzer 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4661bc006d0e49e78b1eb… commit 4661bc006d0e49e78b1ebaee9509e078f12c70a8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Aug 18 08:35:59 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 21 23:45:31 2023 +0300 [WIN32K] Prevent dereferencing NULL pointer Initialize a window's ThreadListEntry as an empty list on creation and only remove the window from the list on destruction, when the entry is not an empty list. Previously the window creation could fail before the list entry was initialized and the window would get destroyed after that, resulting in a NULL pointer dereference. --- win32ss/user/ntuser/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index e4a7b1affd6..27881a1cdf9 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -596,7 +596,8 @@ LRESULT co_UserFreeWindow(PWND Window, /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still in co_UserFreeWindow() */ - RemoveEntryList(&Window->ThreadListEntry); + if (!IsListEmpty(&Window->ThreadListEntry)) + RemoveEntryList(&Window->ThreadListEntry); BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); @@ -1917,6 +1918,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, pWnd->HideAccel = pWnd->spwndParent->HideAccel; } + InitializeListHead(&pWnd->ThreadListEntry); pWnd->head.pti->cWindows++; if (Class->spicn && !Class->spicnSm)

1 0

[reactos] 01/01: [KERNEL32] Fix RaiseException to correctly copy the passed in parameters as ULONG_PTR
by Timo Kreuzer 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41c99aa60ad9e8d9141ca… commit 41c99aa60ad9e8d9141caa988b68d54911d64c00 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Sep 19 02:56:07 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Sep 21 21:33:47 2023 +0300 [KERNEL32] Fix RaiseException to correctly copy the passed in parameters as ULONG_PTR Fixes C++ exception handling on x64. --- dll/win32/kernel32/client/except.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/client/except.c b/dll/win32/kernel32/client/except.c index b248878366e..04931ecd606 100644 --- a/dll/win32/kernel32/client/except.c +++ b/dll/win32/kernel32/client/except.c @@ -697,14 +697,16 @@ Quit: */ VOID WINAPI -RaiseException(IN DWORD dwExceptionCode, - IN DWORD dwExceptionFlags, - IN DWORD nNumberOfArguments, - IN CONST ULONG_PTR *lpArguments OPTIONAL) +RaiseException( + _In_ DWORD dwExceptionCode, + _In_ DWORD dwExceptionFlags, + _In_ DWORD nNumberOfArguments, + _In_opt_ const ULONG_PTR *lpArguments) { EXCEPTION_RECORD ExceptionRecord; /* Setup the exception record */ + RtlZeroMemory(&ExceptionRecord, sizeof(ExceptionRecord)); ExceptionRecord.ExceptionCode = dwExceptionCode; ExceptionRecord.ExceptionRecord = NULL; ExceptionRecord.ExceptionAddress = (PVOID)RaiseException; @@ -726,7 +728,7 @@ RaiseException(IN DWORD dwExceptionCode, ExceptionRecord.NumberParameters = nNumberOfArguments; RtlCopyMemory(ExceptionRecord.ExceptionInformation, lpArguments, - nNumberOfArguments * sizeof(ULONG)); + nNumberOfArguments * sizeof(ULONG_PTR)); } /* Better handling of Delphi Exceptions... a ReactOS Hack */

1 0

[reactos] 01/01: [SHELL32][SDK] Implement SHOpenEffectiveToken and SHGetUserSessionId (#5713)
by Katayama Hirofumi MZ 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4407e0aefabb4b2f88628… commit 4407e0aefabb4b2f8862886719412dfe41ca34d0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 21 22:44:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 21 22:44:20 2023 +0900 [SHELL32][SDK] Implement SHOpenEffectiveToken and SHGetUserSessionId (#5713) - Implement SHOpenEffectiveToken and SHGetUserSessionId functions. - Add them to <undocshell.h>. --- dll/win32/shell32/stubs.cpp | 22 ----------------- dll/win32/shell32/utils.cpp | 53 ++++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 3 +++ 3 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index a048e2c5274..ae4ce677e66 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1099,17 +1099,6 @@ SHSetUserPicturePathW(LPCWSTR lpPath, int csidl, LPVOID lpUnknown) return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHOpenEffectiveToken(LPVOID Token) -{ - FIXME("SHOpenEffectiveToken() stub\n"); - return FALSE; -} - /* * Unimplemented */ @@ -1178,17 +1167,6 @@ SHGetProcessDword(DWORD dwUnknown1, DWORD dwUnknown2) return 0; } -/* - * Unimplemented - */ -EXTERN_C LPVOID -WINAPI -SHGetUserSessionId(HANDLE hHandle) -{ - FIXME("SHGetUserSessionId() stub\n"); - return NULL; -} - EXTERN_C DWORD WINAPI CheckStagingArea(VOID) { diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index edb1f64b87d..537f23a6504 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -9,6 +9,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static BOOL OpenEffectiveToken(DWORD DesiredAccess, HANDLE *phToken) +{ + BOOL ret; + + if (phToken == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *phToken = NULL; + + ret = OpenThreadToken(GetCurrentThread(), DesiredAccess, FALSE, phToken); + if (!ret && GetLastError() == ERROR_NO_TOKEN) + ret = OpenProcessToken(GetCurrentProcess(), DesiredAccess, phToken); + + return ret; +} + +/************************************************************************* + * SHOpenEffectiveToken (SHELL32.235) + */ +EXTERN_C BOOL WINAPI SHOpenEffectiveToken(_Out_ LPHANDLE phToken) +{ + TRACE("%p\n", phToken); + return OpenEffectiveToken(TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, phToken); +} + +/************************************************************************* + * SHGetUserSessionId (SHELL32.248) + */ +EXTERN_C DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken) +{ + DWORD dwSessionId, dwLength; + BOOL bOpenToken = FALSE; + + TRACE("%p\n", hToken); + + if (!hToken) + bOpenToken = SHOpenEffectiveToken(&hToken); + + if (!hToken || + !GetTokenInformation(hToken, TokenSessionId, &dwSessionId, sizeof(dwSessionId), &dwLength)) + { + dwSessionId = 0; + } + + if (bOpenToken) + CloseHandle(hToken); + + return dwSessionId; +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 93fc4201d8c..9c74f8d9b00 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -684,6 +684,9 @@ LargeIntegerToString( _In_opt_ const NUMBERFMTW *pNumberFormat, _In_ DWORD dwNumberFlags); +BOOL WINAPI SHOpenEffectiveToken(_Out_ LPHANDLE phToken); +DWORD WINAPI SHGetUserSessionId(_In_opt_ HANDLE hToken); + /***************************************************************************** * Shell32 resources */

1 0

[reactos] 06/06: [NTOS:EX] Initialize ExpResourceTimeoutCount also via the "Session Manager/ResourceTimeoutCount" registry value (#4089)
by Hermès Bélusca-Maïto 21 Sep '23

21 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bdfee8e8bec17c37b7b5… commit 4bdfee8e8bec17c37b7b57720f460fe3bded2e6a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 7 01:17:32 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 21 13:33:28 2023 +0200 [NTOS:EX] Initialize ExpResourceTimeoutCount also via the "Session Manager/ResourceTimeoutCount" registry value (#4089) For more details, see http://systemmanager.ru/win2k_regestry.en/29859.htm https://www.betaarchive.com/wiki/index.php/Microsoft_KB_Archive/102985#Reso… --- ntoskrnl/config/cmdata.c | 2 +- ntoskrnl/ex/resource.c | 15 ++++++++++----- ntoskrnl/include/internal/ex.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index 28ac7041793..80c91534b44 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -561,7 +561,7 @@ DATA_SEG("INITDATA") CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = { L"Session Manager", L"ResourceTimeoutCount", - &DummyData, + &ExpResourceTimeoutCount, NULL, NULL }, diff --git a/ntoskrnl/ex/resource.c b/ntoskrnl/ex/resource.c index 5b90c89813c..2ea09a92053 100644 --- a/ntoskrnl/ex/resource.c +++ b/ntoskrnl/ex/resource.c @@ -18,7 +18,7 @@ #define IsOwnedExclusive(r) (r->Flag & ResourceOwnedExclusive) #define IsBoostAllowed(r) (!(r->Flag & ResourceHasDisabledPriorityBoost)) -#if (!(defined(CONFIG_SMP)) && !(DBG)) +#if !defined(CONFIG_SMP) && !DBG FORCEINLINE VOID @@ -65,13 +65,17 @@ ExReleaseResourceLock(IN PERESOURCE Resource, /* Release the lock */ KeReleaseInStackQueuedSpinLock(LockHandle); } -#endif + +#endif // !defined(CONFIG_SMP) && !DBG /* DATA***********************************************************************/ LARGE_INTEGER ExShortTime = {{-100000, -1}}; LARGE_INTEGER ExpTimeout; -ULONG ExpResourceTimeoutCount = 90 * 3600 / 2; + +/* Timeout value for resources in 4-second units (7 days) */ +ULONG ExpResourceTimeoutCount = 90 * 3600 / 2; // NT value: 648000 (30 days) + KSPIN_LOCK ExpResourceSpinLock; LIST_ENTRY ExpSystemResourcesList; BOOLEAN ExResourceStrict = TRUE; @@ -631,7 +635,7 @@ ExpWaitForResource(IN PERESOURCE Resource, /* Increase contention count and use a 5 second timeout */ Resource->ContentionCount++; - Timeout.QuadPart = 500 * -10000; + Timeout.QuadPart = 500 * -10000LL; for (;;) { /* Wait for ownership */ @@ -640,7 +644,8 @@ ExpWaitForResource(IN PERESOURCE Resource, KernelMode, FALSE, &Timeout); - if (Status != STATUS_TIMEOUT) break; + if (Status != STATUS_TIMEOUT) + break; /* Increase wait count */ WaitCount++; diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 03d9d29a8b5..f80cc7f8efd 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -19,6 +19,7 @@ extern ERESOURCE ExpFirmwareTableResource; extern ERESOURCE ExpTimeRefreshLock; extern LIST_ENTRY ExpFirmwareTableProviderListHead; extern BOOLEAN ExpIsWinPEMode; +extern ULONG ExpResourceTimeoutCount; extern LIST_ENTRY ExpSystemResourcesList; extern ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; extern ULONG ExpUnicodeCaseTableDataOffset;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2023