Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KERNEL32] Remove a pointless SEH in VirtualAllocEx (#5117)
by Ratin Gao 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df7ab5d8f7a59fd407f2f… commit df7ab5d8f7a59fd407f2f2de89f155ab90c98711 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Fri Mar 10 00:08:08 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 17:08:08 2023 +0100 [KERNEL32] Remove a pointless SEH in VirtualAllocEx (#5117) Win2K3 just wraps in SEH only this syscall, which appears pointless and was removed since NT6.0. We remove it too as an experiment. Revert the change that added SEH here from commit 6d97180 (r52899). --- dll/win32/kernel32/client/virtmem.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dll/win32/kernel32/client/virtmem.c b/dll/win32/kernel32/client/virtmem.c index 7b4085c0ba4..e2ae076266f 100644 --- a/dll/win32/kernel32/client/virtmem.c +++ b/dll/win32/kernel32/client/virtmem.c @@ -37,22 +37,13 @@ VirtualAllocEx(IN HANDLE hProcess, return NULL; } - /* Handle any possible exceptions */ - _SEH2_TRY - { - /* Allocate the memory */ - Status = NtAllocateVirtualMemory(hProcess, - &lpAddress, - 0, - &dwSize, - flAllocationType, - flProtect); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; + /* Allocate the memory */ + Status = NtAllocateVirtualMemory(hProcess, + &lpAddress, + 0, + &dwSize, + flAllocationType, + flProtect); /* Check for status */ if (!NT_SUCCESS(Status))

1 0

[reactos] 01/01: [NOTEPAD] Use DestroyIcon instead of DeleteObject to destroy icon (#5130)
by Katayama Hirofumi MZ 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=139809b747aed5f0afc34… commit 139809b747aed5f0afc34734d5703845efbcd435 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 9 08:24:19 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 08:24:19 2023 +0900 [NOTEPAD] Use DestroyIcon instead of DeleteObject to destroy icon (#5130) CORE-18837 --- base/applications/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index be7f1148b69..345f76a9fbd 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1413,7 +1413,7 @@ VOID DIALOG_HelpAboutNotepad(VOID) LoadString(Globals.hInstance, STRING_NOTEPAD_AUTHORS, szNotepadAuthors, ARRAY_SIZE(szNotepadAuthors)); ShellAbout(Globals.hMainWnd, szNotepad, szNotepadAuthors, notepadIcon); - DeleteObject(notepadIcon); + DestroyIcon(notepadIcon); } /***********************************************************************

1 0

[reactos] 01/01: [NOTEPAD] Remove some needless type casts (#5134)
by Katayama Hirofumi MZ 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc89074cd5e8f4424c2db… commit bc89074cd5e8f4424c2db400d50e99d8e9546b06 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 9 08:23:08 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 08:23:08 2023 +0900 [NOTEPAD] Remove some needless type casts (#5134) CORE-18837 --- base/applications/notepad/dialog.c | 8 ++++---- base/applications/notepad/settings.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 6d3341b1ffc..be7f1148b69 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -141,7 +141,7 @@ VOID DIALOG_StatusBarAlignParts(VOID) parts[0] = max(parts[0], defaultWidths[0]); parts[1] = max(parts[1], defaultWidths[0] + defaultWidths[1]); - SendMessageW(Globals.hStatusBar, SB_SETPARTS, (WPARAM)ARRAY_SIZE(parts), (LPARAM)parts); + SendMessageW(Globals.hStatusBar, SB_SETPARTS, ARRAY_SIZE(parts), (LPARAM)parts); } static VOID DIALOG_StatusBarUpdateLineEndings(VOID) @@ -1032,7 +1032,7 @@ VOID DIALOG_FilePrint(VOID) VOID DIALOG_FileExit(VOID) { - PostMessage(Globals.hMainWnd, WM_CLOSE, 0, 0l); + PostMessage(Globals.hMainWnd, WM_CLOSE, 0, 0); } VOID DIALOG_EditUndo(VOID) @@ -1062,7 +1062,7 @@ VOID DIALOG_EditDelete(VOID) VOID DIALOG_EditSelectAll(VOID) { - SendMessage(Globals.hEdit, EM_SETSEL, 0, (LPARAM)-1); + SendMessage(Globals.hEdit, EM_SETSEL, 0, -1); } VOID DIALOG_EditTimeDate(VOID) @@ -1233,7 +1233,7 @@ VOID DIALOG_SelectFont(VOID) Globals.hFont = CreateFontIndirect(&lf); Globals.lfFont = lf; - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, TRUE); if (currfont != NULL) DeleteObject(currfont); } diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 87410a1673b..e9abc643324 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -210,7 +210,7 @@ void NOTEPAD_LoadSettingsFromRegistry(void) } hFont = CreateFontIndirect(&Globals.lfFont); - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)hFont, (LPARAM)TRUE); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)hFont, TRUE); if (hFont) { if (Globals.hFont)

1 0

[reactos] 01/01: [WORDPAD][WRITE] Remove redundant pragma code_page(65001)...
by Hermès Bélusca-Maïto 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abece16776ff3f1bb959c… commit abece16776ff3f1bb959cb837f899fde8c4f5451 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 9 00:13:48 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 00:13:59 2023 +0100 [WORDPAD][WRITE] Remove redundant pragma code_page(65001)... ... since this is done in the main RC file, from which the per-language resource files are included. --- base/applications/wordpad/lang/da-DK.rc | 2 -- base/applications/wordpad/lang/de-DE.rc | 2 -- base/applications/wordpad/lang/he-IL.rc | 3 --- base/applications/wordpad/lang/it-IT.rc | 3 --- base/applications/wordpad/lang/ja-JP.rc | 3 --- base/applications/wordpad/lang/lt-LT.rc | 3 --- base/applications/wordpad/lang/nl-NL.rc | 2 -- base/applications/wordpad/lang/no-NO.rc | 2 -- base/applications/wordpad/lang/pt-BR.rc | 2 -- base/applications/wordpad/lang/pt-PT.rc | 2 -- base/applications/wordpad/lang/ro-RO.rc | 2 -- base/applications/wordpad/lang/ru-RU.rc | 3 --- base/applications/wordpad/lang/sl-SI.rc | 2 -- base/applications/wordpad/lang/sv-SE.rc | 2 -- base/applications/wordpad/lang/uk-UA.rc | 3 --- base/applications/wordpad/lang/zh-CN.rc | 3 --- base/applications/wordpad/lang/zh-TW.rc | 3 --- base/applications/wordpad/rsrc.rc | 5 ++--- base/applications/write/lang/Bg.rc | 6 ------ base/applications/write/lang/De.rc | 2 -- base/applications/write/lang/Es.rc | 4 ---- base/applications/write/lang/Fr.rc | 2 -- base/applications/write/lang/It.rc | 3 --- base/applications/write/lang/Ja.rc | 3 --- base/applications/write/lang/Lt.rc | 3 --- base/applications/write/lang/Ro.rc | 2 -- base/applications/write/lang/Ru.rc | 3 --- base/applications/write/lang/Si.rc | 2 -- base/applications/write/lang/Sr.rc | 2 -- base/applications/write/lang/Uk.rc | 3 --- base/applications/write/lang/Zh.rc | 3 --- 31 files changed, 2 insertions(+), 83 deletions(-) diff --git a/base/applications/wordpad/lang/da-DK.rc b/base/applications/wordpad/lang/da-DK.rc index daf4ad2f438..4e40e9d991e 100644 --- a/base/applications/wordpad/lang/da-DK.rc +++ b/base/applications/wordpad/lang/da-DK.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/de-DE.rc b/base/applications/wordpad/lang/de-DE.rc index e31704a7d0e..9e256966672 100644 --- a/base/applications/wordpad/lang/de-DE.rc +++ b/base/applications/wordpad/lang/de-DE.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/he-IL.rc b/base/applications/wordpad/lang/he-IL.rc index aed29115643..bffa05fbad2 100644 --- a/base/applications/wordpad/lang/he-IL.rc +++ b/base/applications/wordpad/lang/he-IL.rc @@ -18,9 +18,6 @@ * Translated by Baruch Rutman 2013 */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/it-IT.rc b/base/applications/wordpad/lang/it-IT.rc index 942e02e5dac..bba8b0a008b 100644 --- a/base/applications/wordpad/lang/it-IT.rc +++ b/base/applications/wordpad/lang/it-IT.rc @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/*UTF-8*/ -#pragma code_page(65001) - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/ja-JP.rc b/base/applications/wordpad/lang/ja-JP.rc index 83932cb6837..d3e675e8874 100644 --- a/base/applications/wordpad/lang/ja-JP.rc +++ b/base/applications/wordpad/lang/ja-JP.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/lt-LT.rc b/base/applications/wordpad/lang/lt-LT.rc index e56a581857d..42facf9a258 100644 --- a/base/applications/wordpad/lang/lt-LT.rc +++ b/base/applications/wordpad/lang/lt-LT.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/nl-NL.rc b/base/applications/wordpad/lang/nl-NL.rc index 5bf953c2c3e..7421f5f9f4e 100644 --- a/base/applications/wordpad/lang/nl-NL.rc +++ b/base/applications/wordpad/lang/nl-NL.rc @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/no-NO.rc b/base/applications/wordpad/lang/no-NO.rc index a764d952616..5d03829ac4f 100644 --- a/base/applications/wordpad/lang/no-NO.rc +++ b/base/applications/wordpad/lang/no-NO.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/pt-BR.rc b/base/applications/wordpad/lang/pt-BR.rc index cb7a8c8a30f..c14518bafa0 100644 --- a/base/applications/wordpad/lang/pt-BR.rc +++ b/base/applications/wordpad/lang/pt-BR.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/pt-PT.rc b/base/applications/wordpad/lang/pt-PT.rc index c8fcf23fe29..6a5e42e1558 100644 --- a/base/applications/wordpad/lang/pt-PT.rc +++ b/base/applications/wordpad/lang/pt-PT.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/ro-RO.rc b/base/applications/wordpad/lang/ro-RO.rc index d76e7728ef3..d8f35872429 100644 --- a/base/applications/wordpad/lang/ro-RO.rc +++ b/base/applications/wordpad/lang/ro-RO.rc @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/ru-RU.rc b/base/applications/wordpad/lang/ru-RU.rc index 682aa5e59bc..2c1ad795b5f 100644 --- a/base/applications/wordpad/lang/ru-RU.rc +++ b/base/applications/wordpad/lang/ru-RU.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/sl-SI.rc b/base/applications/wordpad/lang/sl-SI.rc index 30b0d5d2ea3..d5cf804d7ee 100644 --- a/base/applications/wordpad/lang/sl-SI.rc +++ b/base/applications/wordpad/lang/sl-SI.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/sv-SE.rc b/base/applications/wordpad/lang/sv-SE.rc index 198eb9aac4a..0fe176926a7 100644 --- a/base/applications/wordpad/lang/sv-SE.rc +++ b/base/applications/wordpad/lang/sv-SE.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) - LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/uk-UA.rc b/base/applications/wordpad/lang/uk-UA.rc index 399c552c1c0..ecdc3338ad2 100644 --- a/base/applications/wordpad/lang/uk-UA.rc +++ b/base/applications/wordpad/lang/uk-UA.rc @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/zh-CN.rc b/base/applications/wordpad/lang/zh-CN.rc index 007e06ced05..928962ce70a 100644 --- a/base/applications/wordpad/lang/zh-CN.rc +++ b/base/applications/wordpad/lang/zh-CN.rc @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDM_MAINMENU MENU diff --git a/base/applications/wordpad/lang/zh-TW.rc b/base/applications/wordpad/lang/zh-TW.rc index 6f95571306a..b4491dae6b3 100644 --- a/base/applications/wordpad/lang/zh-TW.rc +++ b/base/applications/wordpad/lang/zh-TW.rc @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDM_MAINMENU MENU diff --git a/base/applications/wordpad/rsrc.rc b/base/applications/wordpad/rsrc.rc index 42bd9eb4d31..56d20b73f5d 100644 --- a/base/applications/wordpad/rsrc.rc +++ b/base/applications/wordpad/rsrc.rc @@ -25,9 +25,10 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS WordPad" #define REACTOS_STR_INTERNAL_NAME "wordpad" #define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe" - #include <reactos/version.rc> +#include <reactos/manifest_exe.rc> + MAINACCELTABLE ACCELERATORS BEGIN "1", ID_BACK_1, VIRTKEY, CONTROL @@ -67,8 +68,6 @@ IDI_RTFDOC ICON "res/document.ico" /* @makedep: zoom.cur */ IDC_ZOOM CURSOR "res/zoom.cur" -#include <reactos/manifest_exe.rc> - /* UTF-8 */ #pragma code_page(65001) diff --git a/base/applications/write/lang/Bg.rc b/base/applications/write/lang/Bg.rc index d89914cde38..23dcd6a95dd 100644 --- a/base/applications/write/lang/Bg.rc +++ b/base/applications/write/lang/Bg.rc @@ -22,14 +22,8 @@ /* https://reactos.org/wiki/Bulgarian_translation */ /* LOCATION: \base\applications\write\lang */ -/* WARNING */ -/* Do NOT save this file with BOM */ - #include "resources.h" -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/write/lang/De.rc b/base/applications/write/lang/De.rc index db175a02d56..a9535767bb6 100644 --- a/base/applications/write/lang/De.rc +++ b/base/applications/write/lang/De.rc @@ -19,8 +19,6 @@ #include "resources.h" -#pragma code_page(65001) - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/write/lang/Es.rc b/base/applications/write/lang/Es.rc index 5c44eb9a5dc..9d97e2515f0 100644 --- a/base/applications/write/lang/Es.rc +++ b/base/applications/write/lang/Es.rc @@ -21,10 +21,6 @@ #include "resources.h" -/*UTF-8*/ -#pragma code_page(65001) - - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/write/lang/Fr.rc b/base/applications/write/lang/Fr.rc index a81dffda827..32acf284e71 100644 --- a/base/applications/write/lang/Fr.rc +++ b/base/applications/write/lang/Fr.rc @@ -20,8 +20,6 @@ #include "resources.h" -#pragma code_page(65001) - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/write/lang/It.rc b/base/applications/write/lang/It.rc index b906a7906b8..7f16693d911 100644 --- a/base/applications/write/lang/It.rc +++ b/base/applications/write/lang/It.rc @@ -20,9 +20,6 @@ #include "resources.h" -/*UTF-8*/ -#pragma code_page(65001) - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/write/lang/Ja.rc b/base/applications/write/lang/Ja.rc index 5c9a8259a97..9d5b77d48d2 100644 --- a/base/applications/write/lang/Ja.rc +++ b/base/applications/write/lang/Ja.rc @@ -20,9 +20,6 @@ #include "resources.h" -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/write/lang/Lt.rc b/base/applications/write/lang/Lt.rc index 5cef934fbc7..a826252ae5a 100644 --- a/base/applications/write/lang/Lt.rc +++ b/base/applications/write/lang/Lt.rc @@ -20,9 +20,6 @@ #include "resources.h" -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/base/applications/write/lang/Ro.rc b/base/applications/write/lang/Ro.rc index f6a7b65665f..354310bb838 100644 --- a/base/applications/write/lang/Ro.rc +++ b/base/applications/write/lang/Ro.rc @@ -21,8 +21,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -#pragma code_page(65001) - STRINGTABLE { IDS_FAILED, "Execuția Wordpad a eșuat" diff --git a/base/applications/write/lang/Ru.rc b/base/applications/write/lang/Ru.rc index 008011f2720..32c24c283b2 100644 --- a/base/applications/write/lang/Ru.rc +++ b/base/applications/write/lang/Ru.rc @@ -20,9 +20,6 @@ #include "resources.h" -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/write/lang/Si.rc b/base/applications/write/lang/Si.rc index 9d3e5fe1520..ec779d8e65f 100644 --- a/base/applications/write/lang/Si.rc +++ b/base/applications/write/lang/Si.rc @@ -22,8 +22,6 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -#pragma code_page(65001) - STRINGTABLE { IDS_FAILED, "Zagon programa Wordpad ni uspel" diff --git a/base/applications/write/lang/Sr.rc b/base/applications/write/lang/Sr.rc index da4dae9fd4f..d04173dc4c9 100644 --- a/base/applications/write/lang/Sr.rc +++ b/base/applications/write/lang/Sr.rc @@ -21,8 +21,6 @@ #include "resources.h" -#pragma code_page(65001) - LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC STRINGTABLE diff --git a/base/applications/write/lang/Uk.rc b/base/applications/write/lang/Uk.rc index f922210e0e3..b1ab0c7bead 100644 --- a/base/applications/write/lang/Uk.rc +++ b/base/applications/write/lang/Uk.rc @@ -22,9 +22,6 @@ #include "resources.h" -/* UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/base/applications/write/lang/Zh.rc b/base/applications/write/lang/Zh.rc index c14a9ac9d9f..2463f43dfb1 100644 --- a/base/applications/write/lang/Zh.rc +++ b/base/applications/write/lang/Zh.rc @@ -21,9 +21,6 @@ #include "resources.h" -/* Chinese text is encoded in UTF-8 */ -#pragma code_page(65001) - LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE

1 0

[reactos] 01/01: [MSAFD] Work around regression of CORE-18848 from 0.4.12-dev-693-g2b1f6c8 (#5102)
by Doug Lyons 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f43d9c18338722999f18… commit 2f43d9c18338722999f18630dabd77821a1d79cb Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Mar 8 14:47:45 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 8 21:47:45 2023 +0100 [MSAFD] Work around regression of CORE-18848 from 0.4.12-dev-693-g2b1f6c8 (#5102) Fix winetest for ws2_32:sock that crashes on 'test_AcceptEX' by modifying return values of WSPIoctl for 'case SIO_GET_EXTENSION_FUNCTION_POINTER' --- dll/win32/msafd/misc/dllmain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index 7723b93d236..a4cded75c00 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -2513,7 +2513,12 @@ WSPIoctl(IN SOCKET Handle, *((PVOID *)lpvOutBuffer) = WSPGetAcceptExSockaddrs; cbRet = sizeof(PVOID); Errno = NO_ERROR; - Ret = NO_ERROR; + /* See CORE-14966 and associated commits. + * Original line below was 'Ret = NO_ERROR:'. + * This caused winetest ws2_32:sock to hang. + * This new Ret value allows the test to complete. */ + ERR("SIO_GET_EXTENSION_FUNCTION_POINTER UNIMPLEMENTED\n"); + Ret = SOCKET_ERROR; } else {

1 0

[reactos] 01/01: [SDK:SCRNSAVE] Implement mouse move threshold.
by Mark Jansen 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bc045c041f0c90d54f00… commit 5bc045c041f0c90d54f009c622d085422c80b662 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Mar 1 21:35:17 2023 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Mar 8 20:19:19 2023 +0100 [SDK:SCRNSAVE] Implement mouse move threshold. This makes it easier to start the screensavers by double-clicking. --- sdk/lib/scrnsave/scrnsave.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sdk/lib/scrnsave/scrnsave.c b/sdk/lib/scrnsave/scrnsave.c index a0a16f29140..d9ea0d797d8 100644 --- a/sdk/lib/scrnsave/scrnsave.c +++ b/sdk/lib/scrnsave/scrnsave.c @@ -14,6 +14,7 @@ #include <wingdi.h> #include <winuser.h> #include <tchar.h> +#include <stdlib.h> #include <scrnsave.h> // Screen Saver window class @@ -33,6 +34,7 @@ UINT MyHelpMessage; // Local house keeping static POINT pt_orig; +static BOOL pt_init = FALSE; static int ISSPACE(TCHAR c) { @@ -65,11 +67,6 @@ static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP { switch(uMsg) { - case WM_CREATE: - // Mouse is not supposed to move from this position - GetCursorPos(&pt_orig); - break; - case WM_DESTROY: PostQuitMessage(0); break; @@ -114,12 +111,17 @@ LRESULT WINAPI DefScreenSaverProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP { POINT pt; GetCursorPos(&pt); - // TODO: Implement mouse move threshold. See: - // http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… - if (pt.x == pt_orig.x && pt.y == pt_orig.y) + + if (!pt_init) + { + pt_orig = pt; + pt_init = TRUE; break; + } - // Fall through + if (abs(pt.x-pt_orig.x) > 10 || abs(pt.y-pt_orig.y) > 10) + PostMessage(hWnd, WM_CLOSE, 0, 0); + break; } case WM_LBUTTONDOWN:

1 0

[reactos] 01/01: [NOTEPAD] Delete main.h (#5133)
by Katayama Hirofumi MZ 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f91b92c3f9277b2d0bc1c… commit f91b92c3f9277b2d0bc1ca7f93a0808a48304635 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 9 03:41:11 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 03:41:11 2023 +0900 [NOTEPAD] Delete main.h (#5133) Reduce files to improve readability. Move the codes in main.h into notepad.h. Make the size of Globals.szFilter 512. CORE-18837 --- base/applications/notepad/dialog.h | 1 + base/applications/notepad/main.h | 103 ------------------------------------ base/applications/notepad/notepad.h | 93 +++++++++++++++++++++++++++++--- 3 files changed, 86 insertions(+), 111 deletions(-) diff --git a/base/applications/notepad/dialog.h b/base/applications/notepad/dialog.h index 5ebe3b227b2..43b70b4fa12 100644 --- a/base/applications/notepad/dialog.h +++ b/base/applications/notepad/dialog.h @@ -69,3 +69,4 @@ BOOL DoCloseFile(VOID); VOID DoOpenFile(LPCTSTR szFileName); VOID DoShowHideStatusBar(VOID); VOID DoCreateEditWindow(VOID); +void UpdateWindowCaption(BOOL clearModifyAlert); diff --git a/base/applications/notepad/main.h b/base/applications/notepad/main.h deleted file mode 100644 index a1ecae7e641..00000000000 --- a/base/applications/notepad/main.h +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Notepad (notepad.h) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) - -#include "notepad_res.h" - -#define EDIT_STYLE_WRAP (WS_CHILD | WS_VSCROLL \ - | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) -#define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL) - -#define EDIT_CLASS _T("EDIT") - -#define MAX_STRING_LEN 255 - -/* Values are indexes of the items in the Encoding combobox. */ -typedef enum -{ - ENCODING_AUTO = -1, - ENCODING_ANSI = 0, - ENCODING_UTF16LE = 1, - ENCODING_UTF16BE = 2, - ENCODING_UTF8 = 3, - ENCODING_UTF8BOM = 4 -} ENCODING; - -#define ENCODING_DEFAULT ENCODING_UTF8 // ENCODING_ANSI - -typedef enum -{ - EOLN_CRLF = 0, /* "\r\n" */ - EOLN_LF = 1, /* "\n" */ - EOLN_CR = 2 /* "\r" */ -} EOLN; /* End of line (NewLine) type */ - -typedef struct -{ - HINSTANCE hInstance; - HWND hMainWnd; - HWND hFindReplaceDlg; - HWND hEdit; - HWND hStatusBar; - HFONT hFont; /* Font used by the edit control */ - HMENU hMenu; - HGLOBAL hDevMode; - HGLOBAL hDevNames; - LOGFONT lfFont; - BOOL bWrapLongLines; - BOOL bShowStatusBar; - TCHAR szFindText[MAX_PATH]; - TCHAR szReplaceText[MAX_PATH]; - TCHAR szFileName[MAX_PATH]; - TCHAR szFileTitle[MAX_PATH]; - TCHAR szFilter[2 * MAX_STRING_LEN + 100]; - RECT lMargins; - TCHAR szHeader[MAX_PATH]; - TCHAR szFooter[MAX_PATH]; - TCHAR szStatusBarLineCol[MAX_PATH]; - - ENCODING encFile; - EOLN iEoln; - - FINDREPLACE find; - WNDPROC EditProc; - RECT main_rect; - BOOL bWasModified; -} NOTEPAD_GLOBALS; - -extern NOTEPAD_GLOBALS Globals; - -VOID SetFileName(LPCTSTR szFileName); - -/* from text.c */ -BOOL ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln); -BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, EOLN iEoln); - -/* from settings.c */ -void NOTEPAD_LoadSettingsFromRegistry(void); -void NOTEPAD_SaveSettingsToRegistry(void); - -/* from main.c */ -BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert); -VOID NOTEPAD_EnableSearchMenu(VOID); diff --git a/base/applications/notepad/notepad.h b/base/applications/notepad/notepad.h index 2817acb58b4..af329f24dd6 100644 --- a/base/applications/notepad/notepad.h +++ b/base/applications/notepad/notepad.h @@ -1,12 +1,20 @@ -#ifndef _NOTEPAD_H -#define _NOTEPAD_H +/* + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * Copyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au> + * Copyright 2020-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once #ifndef STRSAFE_NO_DEPRECATE -#define STRSAFE_NO_DEPRECATE + #define STRSAFE_NO_DEPRECATE #endif -#include <stdarg.h> - #include <windef.h> #include <winbase.h> #include <winuser.h> @@ -17,9 +25,78 @@ #include <tchar.h> #include <malloc.h> -#include "main.h" #include "dialog.h" +#include "notepad_res.h" + +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) + +#define EDIT_STYLE_WRAP (WS_CHILD | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) +#define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL) +#define EDIT_CLASS _T("EDIT") + +#define MAX_STRING_LEN 255 + +/* Values are indexes of the items in the Encoding combobox. */ +typedef enum +{ + ENCODING_AUTO = -1, + ENCODING_ANSI = 0, + ENCODING_UTF16LE = 1, + ENCODING_UTF16BE = 2, + ENCODING_UTF8 = 3, + ENCODING_UTF8BOM = 4 +} ENCODING; + +#define ENCODING_DEFAULT ENCODING_UTF8 // ENCODING_ANSI + +typedef enum +{ + EOLN_CRLF = 0, /* "\r\n" */ + EOLN_LF = 1, /* "\n" */ + EOLN_CR = 2 /* "\r" */ +} EOLN; /* End of line (NewLine) type */ + +typedef struct +{ + HINSTANCE hInstance; + HWND hMainWnd; + HWND hFindReplaceDlg; + HWND hEdit; + HWND hStatusBar; + HFONT hFont; /* Font used by the edit control */ + HMENU hMenu; + HGLOBAL hDevMode; + HGLOBAL hDevNames; + LOGFONT lfFont; + BOOL bWrapLongLines; + BOOL bShowStatusBar; + TCHAR szFindText[MAX_PATH]; + TCHAR szReplaceText[MAX_PATH]; + TCHAR szFileName[MAX_PATH]; + TCHAR szFileTitle[MAX_PATH]; + TCHAR szFilter[512]; + RECT lMargins; /* The margin values in 100th millimeters */ + TCHAR szHeader[MAX_PATH]; + TCHAR szFooter[MAX_PATH]; + TCHAR szStatusBarLineCol[MAX_PATH]; + + ENCODING encFile; + EOLN iEoln; + + FINDREPLACE find; + WNDPROC EditProc; + RECT main_rect; + BOOL bWasModified; +} NOTEPAD_GLOBALS; + +extern NOTEPAD_GLOBALS Globals; + +BOOL ReadText(HANDLE hFile, HLOCAL *phLocal, ENCODING *pencFile, EOLN *piEoln); +BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, EOLN iEoln); -void UpdateWindowCaption(BOOL clearModifyAlert); +void NOTEPAD_LoadSettingsFromRegistry(void); +void NOTEPAD_SaveSettingsToRegistry(void); -#endif /* _NOTEPAD_H */ +BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert); +VOID NOTEPAD_EnableSearchMenu(VOID); +VOID SetFileName(LPCTSTR szFileName);

1 0

[reactos] 01/01: [NOTEPAD] Reduce lines in and around comments (#5131)
by Katayama Hirofumi MZ 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ac20a7fe24b66f10397b… commit 9ac20a7fe24b66f10397b9929ef59695d5c67d9b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 9 03:11:57 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 03:11:57 2023 +0900 [NOTEPAD] Reduce lines in and around comments (#5131) Reduce lines. CORE-18837 --- base/applications/notepad/dialog.c | 3 --- base/applications/notepad/main.c | 13 ------------- base/applications/notepad/settings.c | 2 -- 3 files changed, 18 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index d9c71447264..6d3341b1ffc 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1417,7 +1417,6 @@ VOID DIALOG_HelpAboutNotepad(VOID) } /*********************************************************************** - * * DIALOG_FilePageSetup */ VOID DIALOG_FilePageSetup(void) @@ -1443,10 +1442,8 @@ VOID DIALOG_FilePageSetup(void) } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * * DIALOG_PAGESETUP_Hook */ - static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index f4312159731..d2d7331db3f 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -20,7 +20,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ #include "notepad.h" @@ -41,7 +40,6 @@ VOID NOTEPAD_EnableSearchMenu() } /*********************************************************************** - * * SetFileName * * Sets Global File Name. @@ -57,7 +55,6 @@ VOID SetFileName(LPCTSTR szFileName) } /*********************************************************************** - * * NOTEPAD_MenuCommand * * All handling of main menu events @@ -104,10 +101,8 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) } /*********************************************************************** - * * NOTEPAD_FindTextAt */ - static BOOL NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, INT iTextLength, DWORD dwPosition) { @@ -145,10 +140,8 @@ NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, INT iTextLength, } /*********************************************************************** - * * NOTEPAD_FindNext */ - BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert) { int iTextLength, iTargetLength; @@ -235,10 +228,8 @@ BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert) } /*********************************************************************** - * * NOTEPAD_ReplaceAll */ - static VOID NOTEPAD_ReplaceAll(FINDREPLACE *pFindReplace) { BOOL bShowAlert = TRUE; @@ -252,10 +243,8 @@ static VOID NOTEPAD_ReplaceAll(FINDREPLACE *pFindReplace) } /*********************************************************************** - * * NOTEPAD_FindTerm */ - static VOID NOTEPAD_FindTerm(VOID) { Globals.hFindReplaceDlg = NULL; @@ -341,7 +330,6 @@ LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) } /*********************************************************************** - * * NOTEPAD_WndProc */ static LRESULT @@ -557,7 +545,6 @@ static BOOL HandleCommandLine(LPTSTR cmdline) } /*********************************************************************** - * * WinMain */ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int show) diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 32bfd098683..87410a1673b 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -111,7 +111,6 @@ static BOOL QueryString(HKEY hKey, LPCTSTR pszValueName, LPTSTR pszResult, DWORD } /*********************************************************************** - * * NOTEPAD_LoadSettingsFromRegistry * * Load settings from registry HKCU\Software\Microsoft\Notepad. @@ -231,7 +230,6 @@ static BOOL SaveString(HKEY hKey, LPCTSTR pszValueNameT, LPCTSTR pszValue) } /*********************************************************************** - * * NOTEPAD_SaveSettingsToRegistry * * Save settings to registry HKCU\Software\Microsoft\Notepad.

1 0

[reactos] 01/01: [WINESYNC] user32/edit: Allow buffer access after EM_GETHANDLE.
by Thomas Faber 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e0c920fd2649b1127abe… commit 8e0c920fd2649b1127abe37b88f5753647df5d7d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 5 14:42:22 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Mar 7 21:48:06 2023 -0500 [WINESYNC] user32/edit: Allow buffer access after EM_GETHANDLE. wine commit id f62d8dc58fb3fb5f11a8ab55620ab9b2fbdaf967 by Nikolay Sivov <nsivov(a)codeweavers.com> --- win32ss/user/user32/controls/edit.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index a65a4d6dab3..46a0ed5b8b7 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -1293,8 +1293,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { #ifdef __REACTOS__ @@ -1358,8 +1356,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -5346,12 +5342,12 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } #ifdef __REACTOS__ - /* ReactOS: check GetWindowLong in case es has been destroyed during processing */ - if (IsWindow(hwnd) && es && GetWindowLongPtrW(hwnd, 0)) - EDIT_UnlockBuffer(es, FALSE); + /* ReactOS: check GetWindowLong in case es has been destroyed during processing */ + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE && GetWindowLongPtrW(hwnd, 0)) #else - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) #endif + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result);

1 0

[reactos] 01/01: [REGEDIT] Avoid buffer overflow in SelectNode. CORE-18602
by Thomas Faber 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ee9ea451861f4059937d… commit 1ee9ea451861f4059937ddb78070700950b95d43 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Jan 19 20:34:46 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Mar 7 19:43:57 2023 -0500 [REGEDIT] Avoid buffer overflow in SelectNode. CORE-18602 --- base/applications/regedit/regedit.h | 1 + base/applications/regedit/treeview.c | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/base/applications/regedit/regedit.h b/base/applications/regedit/regedit.h index 2549aee7b73..d1decef5893 100644 --- a/base/applications/regedit/regedit.h +++ b/base/applications/regedit/regedit.h @@ -9,6 +9,7 @@ #include <stdio.h> #include <aclapi.h> #include <shellapi.h> +#include <strsafe.h> #include "main.h" #include "hexedit.h" diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index 7719039e835..ee26a04538a 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -781,7 +781,7 @@ BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath) /* Load "My Computer" string... */ LoadStringW(hInst, IDS_MY_COMPUTER, szBuffer, ARRAY_SIZE(szBuffer)); - wcscat(szBuffer, L"\\"); + StringCbCatW(szBuffer, sizeof(szBuffer), L"\\"); /* ... and remove it from the key path */ if (!_wcsnicmp(keyPath, szBuffer, wcslen(szBuffer))) @@ -795,24 +795,33 @@ BOOL SelectNode(HWND hwndTV, LPCWSTR keyPath) while(keyPath[0]) { + size_t copyLength; s = wcschr(keyPath, L'\\'); - lstrcpynW(szPathPart, keyPath, s ? s - keyPath + 1 : wcslen(keyPath) + 1); + if (s != NULL) + { + copyLength = (s - keyPath) * sizeof(WCHAR); + } + else + { + copyLength = sizeof(szPathPart); + } + StringCbCopyNW(szPathPart, sizeof(szPathPart), keyPath, copyLength); /* Special case for root to expand root key abbreviations */ if (hItem == hRoot) { if (!_wcsicmp(szPathPart, L"HKCR")) - wcscpy(szPathPart, L"HKEY_CLASSES_ROOT"); + StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_CLASSES_ROOT"); else if (!_wcsicmp(szPathPart, L"HKCU")) - wcscpy(szPathPart, L"HKEY_CURRENT_USER"); + StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_CURRENT_USER"); else if (!_wcsicmp(szPathPart, L"HKLM")) - wcscpy(szPathPart, L"HKEY_LOCAL_MACHINE"); + StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_LOCAL_MACHINE"); else if (!_wcsicmp(szPathPart, L"HKU")) - wcscpy(szPathPart, L"HKEY_USERS"); + StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_USERS"); else if (!_wcsicmp(szPathPart, L"HKCC")) - wcscpy(szPathPart, L"HKEY_CURRENT_CONFIG"); + StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_CURRENT_CONFIG"); else if (!_wcsicmp(szPathPart, L"HKDD")) - wcscpy(szPathPart, L"HKEY_DYN_DATA"); + StringCbCopyW(szPathPart, sizeof(szPathPart), L"HKEY_DYN_DATA"); } for (hChildItem = TreeView_GetChild(hwndTV, hItem); hChildItem;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs