Ros-diffs March 2023

ros-diffs@reactos.org

18 participants
139 discussions

[reactos] 01/01: [NTOS:KD] KdpDebugLogInit: Fix ZwCreateFile flags for appending to debug logging file.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a49732e5b650bef2c0512… commit a49732e5b650bef2c051260e78228e0eefa62b67 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 20:42:11 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:59:16 2023 +0100 [NTOS:KD] KdpDebugLogInit: Fix ZwCreateFile flags for appending to debug logging file. However, ReactOS currently doesn't handle FILE_APPEND_DATA correctly, so temporarily add a hack for fixing its support. CORE-18789 --- ntoskrnl/kd/kdio.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index c186e60752d..742121e08fb 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -272,8 +272,9 @@ KdpDebugLogInit( NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - FILE_SUPERSEDE, - FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT, + FILE_OPEN_IF, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_SEQUENTIAL_ONLY | FILE_WRITE_THROUGH, NULL, 0); @@ -285,6 +286,39 @@ KdpDebugLogInit( return; } + /** HACK for FILE_APPEND_DATA ** + ** Remove once CORE-18789 is fixed. ** + ** Enforce to go to the end of file **/ + { + FILE_STANDARD_INFORMATION FileInfo; + FILE_POSITION_INFORMATION FilePosInfo; + + Status = ZwQueryInformationFile(KdpLogFileHandle, + &Iosb, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + DPRINT("Status: 0x%08lx - EOF offset: %I64d\n", + Status, FileInfo.EndOfFile.QuadPart); + + Status = ZwQueryInformationFile(KdpLogFileHandle, + &Iosb, + &FilePosInfo, + sizeof(FilePosInfo), + FilePositionInformation); + DPRINT("Status: 0x%08lx - Position: %I64d\n", + Status, FilePosInfo.CurrentByteOffset.QuadPart); + + FilePosInfo.CurrentByteOffset.QuadPart = FileInfo.EndOfFile.QuadPart; + Status = ZwSetInformationFile(KdpLogFileHandle, + &Iosb, + &FilePosInfo, + sizeof(FilePosInfo), + FilePositionInformation); + DPRINT("ZwSetInformationFile(FilePositionInfo) returned: 0x%08lx\n", Status); + } + /** END OF HACK **/ + KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); /* Create the logger thread */

1 year, 9 months

[reactos] 01/01: [NTOS:KD] Add some annotations.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8b09eddc4a6c4a51f722… commit a8b09eddc4a6c4a51f72222faa259d0862197008 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 12:31:03 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:32:36 2023 +0100 [NTOS:KD] Add some annotations. --- ntoskrnl/include/internal/kd.h | 26 +++++++++++--------------- ntoskrnl/kd/kdio.c | 19 +++++++++++-------- ntoskrnl/kd/kdmain.c | 7 ++++--- ntoskrnl/kdbg/kdb_symbols.c | 4 ++-- sdk/include/reactos/kddll.h | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 87f0854693d..ef014a2c6a5 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -40,10 +40,9 @@ typedef enum _KD_CONTINUE_TYPE typedef VOID -(NTAPI*PKDP_INIT_ROUTINE)( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); +(NTAPI *PKDP_INIT_ROUTINE)( + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); typedef VOID @@ -63,30 +62,27 @@ KdpScreenRelease(VOID); VOID NTAPI KdpScreenInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); VOID NTAPI KdpSerialInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); VOID NTAPI KdpDebugLogInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); #ifdef KDBG VOID NTAPI KdpKdbgInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); #endif diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 5f2c7f966c7..c186e60752d 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -212,8 +212,9 @@ KdpPrintToLogFile(PCHAR String, VOID NTAPI -KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +KdpDebugLogInit( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { NTSTATUS Status; UNICODE_STRING FileName; @@ -340,8 +341,9 @@ KdpSerialPrint(PCHAR String, VOID NTAPI -KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +KdpSerialInit( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { if (!KdpDebugMode.Serial) return; @@ -504,8 +506,9 @@ KdpScreenPrint(PCHAR String, VOID NTAPI -KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +KdpScreenInit( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { if (!KdpDebugMode.Screen) return; @@ -550,8 +553,8 @@ KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); VOID NTAPI KdpKdbgInit( - PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { /* Forward the call */ KdbInitialize(DispatchTable, BootPhase); diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 073a128ef3a..be749a705a9 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -21,7 +21,8 @@ extern ANSI_STRING KdpLogFileName; static PCHAR NTAPI -KdpGetDebugMode(PCHAR Currentp2) +KdpGetDebugMode( + _In_ PCHAR Currentp2) { PCHAR p1, p2 = Currentp2; ULONG Value; @@ -83,7 +84,7 @@ KdpGetDebugMode(PCHAR Currentp2) NTSTATUS NTAPI KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG i; PCHAR CommandLine, Port = NULL; @@ -138,7 +139,7 @@ KdDebuggerInitialize0( NTSTATUS NTAPI KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index f2e0088d006..06325b65fb6 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -348,8 +348,8 @@ KdbDebugPrint( VOID NTAPI KdbInitialize( - PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { PCHAR p1, p2; SHORT Found = FALSE; diff --git a/sdk/include/reactos/kddll.h b/sdk/include/reactos/kddll.h index 5e6e45bd953..6829bde4822 100644 --- a/sdk/include/reactos/kddll.h +++ b/sdk/include/reactos/kddll.h @@ -9,13 +9,13 @@ typedef ULONG KDSTATUS; NTSTATUS NTAPI KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock ); NTSTATUS NTAPI KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock ); KDSTATUS

1 year, 9 months

[reactos] 02/02: [NTOS:KD] Simplify min-values calculations in KdpPrintToLogFile and KdpScreenPrint.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cee893be99b5cd159a580… commit cee893be99b5cd159a580a5dec9eef1ccef93dc5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 16:08:07 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:26:53 2023 +0100 [NTOS:KD] Simplify min-values calculations in KdpPrintToLogFile and KdpScreenPrint. --- ntoskrnl/kd/kdio.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 45733e0b3ca..5f2c7f966c7 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -174,10 +174,7 @@ KdpPrintToLogFile(PCHAR String, OldIrql = KdbpAcquireLock(&KdpDebugLogSpinLock); beg = KdpCurrentPosition; - num = KdpFreeBytes; - if (Length < num) - num = Length; - + num = min(Length, KdpFreeBytes); if (num != 0) { end = (beg + num) % KdpBufferSize; @@ -470,16 +467,14 @@ KdpScreenPrint(PCHAR String, return; if (KdpDmesgBuffer == NULL) - return; + return; /* Acquire the printing spinlock without waiting at raised IRQL */ OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); - /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); - * set num to min(KdpDmesgFreeBytes, Length). - */ - num = (Length < KdpDmesgFreeBytes) ? Length : KdpDmesgFreeBytes; beg = KdpDmesgCurrentPosition; + /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); */ + num = min(Length, KdpDmesgFreeBytes); if (num != 0) { end = (beg + num) % KdpDmesgBufferSize;

1 year, 9 months

[reactos] 01/02: [NTOS:IO/KD/KDBG] Formatting fixes only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4585372c6ddd86c02ee84… commit 4585372c6ddd86c02ee84f9252a529d549af1cad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 12:11:19 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:26:02 2023 +0100 [NTOS:IO/KD/KDBG] Formatting fixes only. --- ntoskrnl/io/iomgr/iomgr.c | 6 +++--- ntoskrnl/io/iomgr/iotimer.c | 2 +- ntoskrnl/kd/kdmain.c | 2 +- ntoskrnl/kdbg/kdb_cli.c | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 0e901c605e9..380a8518661 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -584,8 +584,8 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return FALSE; } - // the disk subsystem is initialized here and the SystemRoot is set too - // we can finally load other drivers from the boot volume + /* The disk subsystem is initialized here and the SystemRoot is set too. + * We can finally load other drivers from the boot volume. */ PnPBootDriversInitialized = TRUE; #if !defined(_WINKD_) && defined(KDBG) @@ -640,7 +640,7 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return FALSE; } - /* Load the System DLL and its Entrypoints */ + /* Load the System DLL and its entrypoints */ Status = PsLocateSystemDll(); if (!NT_SUCCESS(Status)) { diff --git a/ntoskrnl/io/iomgr/iotimer.c b/ntoskrnl/io/iomgr/iotimer.c index 9c62db19a11..4bd8ab2ca1f 100644 --- a/ntoskrnl/io/iomgr/iotimer.c +++ b/ntoskrnl/io/iomgr/iotimer.c @@ -39,7 +39,7 @@ IopTimerDispatch(IN PKDPC Dpc, PIO_TIMER Timer; ULONG i; - /* Check if any Timers are actualyl enabled as of now */ + /* Check if any Timers are actually enabled as of now */ if (IopTimerCount) { /* Lock the Timers */ diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 76e28962a98..073a128ef3a 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -36,7 +36,7 @@ KdpGetDebugMode(PCHAR Currentp2) /* Check for Serial Debugging */ else if (!_strnicmp(p2, "COM", 3)) { - /* Gheck for a valid Serial Port */ + /* Check for a valid Serial Port */ p2 += 3; if (*p2 != ':') { diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 4a351db9afe..114f4116838 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3832,7 +3832,8 @@ KdbpCliInit(VOID) } /* Get the size of the file */ - Status = ZwQueryInformationFile(hFile, &Iosb, &FileStdInfo, sizeof(FileStdInfo), + Status = ZwQueryInformationFile(hFile, &Iosb, + &FileStdInfo, sizeof(FileStdInfo), FileStandardInformation); if (!NT_SUCCESS(Status)) { @@ -3855,7 +3856,7 @@ KdbpCliInit(VOID) Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, FileBuffer, FileSize, NULL, NULL); ZwClose(hFile); - if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) + if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { ExFreePool(FileBuffer); DPRINT("Could not read KDBinit file into memory (Status 0x%lx)\n", Status);

1 year, 9 months

[reactos] 01/01: [KERNEL32] Remove a pointless SEH in VirtualAllocEx (#5117)

by Ratin Gao

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 year, 9 months

[reactos] 01/01: [NOTEPAD] Use DestroyIcon instead of DeleteObject to destroy icon (#5130)

by Katayama Hirofumi MZ

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 year, 9 months

[reactos] 01/01: [NOTEPAD] Remove some needless type casts (#5134)

by Katayama Hirofumi MZ

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 year, 9 months

[reactos] 01/01: [WORDPAD][WRITE] Remove redundant pragma code_page(65001)...

by Hermès Bélusca-Maïto

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 year, 9 months

[reactos] 01/01: [MSAFD] Work around regression of CORE-18848 from 0.4.12-dev-693-g2b1f6c8 (#5102)

by Doug Lyons

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 year, 9 months

[reactos] 01/01: [SDK:SCRNSAVE] Implement mouse move threshold.

by Mark Jansen

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 year, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2023