Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [KERNEL32_APITEST] Add a test for FormatMessage backed with MC file.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72094e637d788448f4e1f… commit 72094e637d788448f4e1f3c121e1881343e17c07 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 16 19:39:37 2017 +0100 [KERNEL32_APITEST] Add a test for FormatMessage backed with MC file. --- modules/rostests/apitests/kernel32/CMakeLists.txt | 6 ++- modules/rostests/apitests/kernel32/FormatMessage.c | 51 ++++++++++++++++++++++ .../rostests/apitests/kernel32/FormatMessage.mc | 14 ++++++ .../rostests/apitests/kernel32/kernel32_apitest.rc | 6 +++ modules/rostests/apitests/kernel32/testlist.c | 2 + 5 files changed, 78 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 06edd1b9c3..c329031929 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -1,6 +1,8 @@ add_subdirectory(redirptest) +add_message_headers(ANSI FormatMessage.mc) + list(APPEND SOURCE Console.c CreateProcess.c @@ -9,6 +11,7 @@ list(APPEND SOURCE dosdev.c FindActCtxSectionStringW.c FindFiles.c + FormatMessage.c GetComputerNameEx.c GetCurrentDirectory.c GetDriveType.c @@ -30,11 +33,12 @@ list(APPEND SOURCE WideCharToMultiByte.c precomp.h) -add_executable(kernel32_apitest ${SOURCE} testlist.c) +add_executable(kernel32_apitest ${SOURCE} testlist.c kernel32_apitest.rc) target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) add_delay_importlibs(kernel32_apitest advapi32 shlwapi) add_importlibs(kernel32_apitest msvcrt kernel32 ntdll) +add_dependencies(kernel32_apitest FormatMessage) add_pch(kernel32_apitest precomp.h SOURCE) add_rostests_file(TARGET kernel32_apitest) diff --git a/modules/rostests/apitests/kernel32/FormatMessage.c b/modules/rostests/apitests/kernel32/FormatMessage.c new file mode 100644 index 0000000000..ed2284daa1 --- /dev/null +++ b/modules/rostests/apitests/kernel32/FormatMessage.c @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for FormatMessage and resources + * PROGRAMMERS: Pierre Schweitzer + */ + +#include <apitest.h> +#include <FormatMessage.h> + +WCHAR First[] = L"This is a test message.\r\n"; +WCHAR Second[] = L"This is a second test message.\r\n"; + +START_TEST(FormatMessage) +{ + PWSTR Buffer; + DWORD Written; + + Buffer = NULL; + Written = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, MSG_FIRST_MESSAGE, 0, (LPWSTR)&Buffer, 0, NULL); + ok(Written != 0, "Unexpected error: %lx\n", GetLastError()); + ok(Buffer != NULL, "No buffer allocated\n"); + ok(Written == (sizeof(First) - sizeof(UNICODE_NULL)) / sizeof(WCHAR), + "Invalid size: %ld (expected: %d)\n", + Written, (sizeof(First) - sizeof(UNICODE_NULL)) / sizeof(WCHAR)); + ok(RtlCompareMemory(Buffer, First, sizeof(First) - sizeof(UNICODE_NULL)) == + sizeof(First) - sizeof(UNICODE_NULL), + "Mismatching string: %S (expected : %S)\n", Buffer, First); + LocalFree(Buffer); + + Buffer = NULL; + Written = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, MSG_SECOND_MESSAGE, 0, (LPWSTR)&Buffer, 0, NULL); + ok(Written != 0, "Unexpected error: %lx\n", GetLastError()); + ok(Buffer != NULL, "No buffer allocated\n"); + ok(Written == (sizeof(Second) - sizeof(UNICODE_NULL)) / sizeof(WCHAR), + "Invalid size: %ld (expected: %d)\n", + Written, (sizeof(Second) - sizeof(UNICODE_NULL)) / sizeof(WCHAR)); + ok(RtlCompareMemory(Buffer, Second, sizeof(Second) - sizeof(UNICODE_NULL)) == + sizeof(Second) - sizeof(UNICODE_NULL), + "Mismatching string: %S (expected: %S)\n", Buffer, Second); + LocalFree(Buffer); + + Buffer = NULL; + Written = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, MSG_SECOND_MESSAGE + 1, 0, (LPWSTR)&Buffer, 0, NULL); + ok(Written == 0, "Unexpected success: %ld\n", Written); + ok(Buffer == NULL, "Unexpected success: %p\n", Buffer); + ok(GetLastError() == 0x13d, "Unexpected error: %lx\n", GetLastError()); +} diff --git a/modules/rostests/apitests/kernel32/FormatMessage.mc b/modules/rostests/apitests/kernel32/FormatMessage.mc new file mode 100644 index 0000000000..f13ba1269e --- /dev/null +++ b/modules/rostests/apitests/kernel32/FormatMessage.mc @@ -0,0 +1,14 @@ +MessageIdTypedef=DWORD +LanguageNames=(English=0x409:MSG0409) + +MessageId= +SymbolicName=MSG_FIRST_MESSAGE +Language=English +This is a test message. +. + +MessageId= +SymbolicName=MSG_SECOND_MESSAGE +Language=English +This is a second test message. +. diff --git a/modules/rostests/apitests/kernel32/kernel32_apitest.rc b/modules/rostests/apitests/kernel32/kernel32_apitest.rc new file mode 100644 index 0000000000..ea373085bc --- /dev/null +++ b/modules/rostests/apitests/kernel32/kernel32_apitest.rc @@ -0,0 +1,6 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Kernel32 Regtests" +#define REACTOS_STR_INTERNAL_NAME "kernel32_apitest" +#define REACTOS_STR_ORIGINAL_FILENAME "kernel32_apitest.exe" +#include <reactos/version.rc> + +#include <FormatMessage.rc> diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index f00b9e99a6..0bf5e424dc 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -10,6 +10,7 @@ extern void func_DeviceIoControl(void); extern void func_dosdev(void); extern void func_FindActCtxSectionStringW(void); extern void func_FindFiles(void); +extern void func_FormatMessage(void); extern void func_GetComputerNameEx(void); extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); @@ -39,6 +40,7 @@ const struct test winetest_testlist[] = { "dosdev", func_dosdev }, { "FindActCtxSectionStringW", func_FindActCtxSectionStringW }, { "FindFiles", func_FindFiles }, + { "FormatMessage", func_FormatMessage }, { "GetComputerNameEx", func_GetComputerNameEx }, { "GetCurrentDirectory", func_GetCurrentDirectory }, { "GetDriveType", func_GetDriveType },

6 years, 10 months

[reactos] 01/01: [SDK] pnp.idl: Add a reminder comment about removed Vista/+ functions. CORE-12580

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8b175216207c565b0a56… commit e8b175216207c565b0a56afbafb36be4082dbf5f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Dec 5 06:32:25 2017 +0100 [SDK] pnp.idl: Add a reminder comment about removed Vista/+ functions. CORE-12580 --- sdk/include/reactos/idl/pnp.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/reactos/idl/pnp.idl b/sdk/include/reactos/idl/pnp.idl index b166551d1a..2839017e03 100644 --- a/sdk/include/reactos/idl/pnp.idl +++ b/sdk/include/reactos/idl/pnp.idl @@ -925,6 +925,8 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [out] DWORD *pulSSDIFlags, [in] DWORD ulFlags); + /* Functions 65 to 74 are Vista+, see r63565 */ + cpp_quote("#endif /* _WIN32_WINNT >= 0x0501 */") }

6 years, 10 months

[reactos] 01/01: [NTOS:MM] Fix NtFreeVirtualMemory() FreeType parameter checks. CORE-13126

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=614ace03fa4ec1957f327… commit 614ace03fa4ec1957f32727ab0975a98c858894d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Dec 9 12:16:44 2017 +0100 [NTOS:MM] Fix NtFreeVirtualMemory() FreeType parameter checks. CORE-13126 --- ntoskrnl/mm/ARM3/virtual.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 0e5fe77a23..fc4ea2e6d2 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -5108,21 +5108,11 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, PAGED_CODE(); // - // Only two flags are supported + // Only two flags are supported, exclusively. // - if (!(FreeType & (MEM_RELEASE | MEM_DECOMMIT))) + if (FreeType != MEM_RELEASE && FreeType != MEM_DECOMMIT) { - DPRINT1("Invalid FreeType\n"); - return STATUS_INVALID_PARAMETER_4; - } - - // - // Check if no flag was used, or if both flags were used - // - if (!((FreeType & (MEM_DECOMMIT | MEM_RELEASE))) || - ((FreeType & (MEM_DECOMMIT | MEM_RELEASE)) == (MEM_DECOMMIT | MEM_RELEASE))) - { - DPRINT1("Invalid FreeType combination\n"); + DPRINT1("Invalid FreeType (0x%08lx)\n", FreeType); return STATUS_INVALID_PARAMETER_4; } @@ -5200,8 +5190,8 @@ NtFreeVirtualMemory(IN HANDLE ProcessHandle, } } - DPRINT("NtFreeVirtualMemory: Process 0x%p, Adress 0x%p, size 0x%x, FreeType %x.\n", - Process, PBaseAddress, PRegionSize, FreeType); + DPRINT("NtFreeVirtualMemory: Process 0x%p, Address 0x%p, Size 0x%Ix, FreeType 0x%08lx\n", + Process, PBaseAddress, PRegionSize, FreeType); // // Lock the address space

6 years, 10 months

[reactos] 01/01: [BOOTDATA] Start menu, shortcuts: port r61988 to LiveCD from BootCD. CORE-13994

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f7159e3a51cb155b61fb… commit 4f7159e3a51cb155b61fb4ee0949eb9baede2734 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Nov 11 04:42:48 2017 +0100 [BOOTDATA] Start menu, shortcuts: port r61988 to LiveCD from BootCD. CORE-13994 - Move Accessibility, Entertainment and System Tools folders into Accessories. - Move mstsc.exe shortcut into new Accessories/Communications folder. - Rename Remote desktop to Remote Desktop Connection. - Rename Regedit to Registry Editor. - Plus: Sort touched lines in the list. --- boot/bootdata/CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt index 6698791d4f..42dbfff18b 100644 --- a/boot/bootdata/CMakeLists.txt +++ b/boot/bootdata/CMakeLists.txt @@ -77,26 +77,26 @@ add_livecd_shortcut("Device Manager" devmgmt.exe "Profiles/All Users/Start Menu/ add_livecd_shortcut("Event Viewer" eventvwr.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") add_livecd_shortcut("Service Manager" servman.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") add_livecd_shortcut("System Configuration" msconfig.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") -add_livecd_shortcut("Magnify" magnify.exe "Profiles/All Users/Start Menu/Programs/Accessibility") -add_livecd_shortcut("On-Screen Keyboard" osk.exe "Profiles/All Users/Start Menu/Programs/Accessibility") +add_livecd_shortcut("Magnify" magnify.exe "Profiles/All Users/Start Menu/Programs/Accessories/Accessibility") +add_livecd_shortcut("On-Screen Keyboard" osk.exe "Profiles/All Users/Start Menu/Programs/Accessories/Accessibility") +add_livecd_shortcut("Remote Desktop Connection" mstsc.exe "Profiles/All Users/Start Menu/Programs/Accessories/Communications") +add_livecd_shortcut("Multimedia Player" mplay32.exe "Profiles/All Users/Start Menu/Programs/Accessories/Entertainment") +add_livecd_shortcut("Sound Recorder" sndrec32.exe "Profiles/All Users/Start Menu/Programs/Accessories/Entertainment") +add_livecd_shortcut("Volume Control" sndvol32.exe "Profiles/All Users/Start Menu/Programs/Accessories/Entertainment") +add_livecd_shortcut("Character Map" charmap.exe "Profiles/All Users/Start Menu/Programs/Accessories/System Tools") +add_livecd_shortcut("Clipboard Viewer" clipbrd.exe "Profiles/All Users/Start Menu/Programs/Accessories/System Tools") +add_livecd_shortcut("Keyboard Layout Switcher" kbswitch.exe "Profiles/All Users/Start Menu/Programs/Accessories/System Tools") +add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe "Profiles/All Users/Start Menu/Programs/Accessories/System Tools") +add_livecd_shortcut("Registry Editor" regedit.exe "Profiles/All Users/Start Menu/Programs/Accessories/System Tools") +add_livecd_shortcut("Task Manager" taskmgr.exe "Profiles/All Users/Start Menu/Programs/Accessories/System Tools") add_livecd_shortcut("Calculator" calc.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("Paint" mspaint.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("Notepad" notepad.exe "Profiles/All Users/Start Menu/Programs/Accessories") -add_livecd_shortcut("Remote desktop" mstsc.exe "Profiles/All Users/Start Menu/Programs/Accessories") add_livecd_shortcut("WordPad" wordpad.exe "Profiles/All Users/Start Menu/Programs/Accessories") -add_livecd_shortcut("Sound Recorder" sndrec32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") -add_livecd_shortcut("Multimedia Player" mplay32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") -add_livecd_shortcut("Volume Control" sndvol32.exe "Profiles/All Users/Start Menu/Programs/Entertainment") add_livecd_shortcut("Solitaire" sol.exe "Profiles/All Users/Start Menu/Programs/Games") add_livecd_shortcut("Spider Solitaire" spider.exe "Profiles/All Users/Start Menu/Programs/Games") add_livecd_shortcut("WineMine" winmine.exe "Profiles/All Users/Start Menu/Programs/Games") -add_livecd_shortcut("Character Map" charmap.exe "Profiles/All Users/Start Menu/Programs/System Tools") -add_livecd_shortcut("Clipboard Viewer" clipbrd.exe "Profiles/All Users/Start Menu/Programs/System Tools") -add_livecd_shortcut("Keyboard Layout Switcher" kbswitch.exe "Profiles/All Users/Start Menu/Programs/System Tools") -add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe "Profiles/All Users/Start Menu/Programs/System Tools") -add_livecd_shortcut("Regedit" regedit.exe "Profiles/All Users/Start Menu/Programs/System Tools") -add_livecd_shortcut("Task Manager" taskmgr.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/All Users/Start Menu/Programs") add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/Default User/Application Data/Microsoft/Internet Explorer/Quick Launch") add_livecd_shortcut("ReactOS Explorer" explorer.exe "Profiles/Default User/Application Data/Microsoft/Internet Explorer/Quick Launch")

6 years, 11 months

[reactos] 01/01: [TRANSLATION] Start menu, shortcuts, r61988: update untranslated strings too. CORE-13994

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48cfd0249782fecb7be43… commit 48cfd0249782fecb7be439065b2f176aed642b4d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Nov 11 04:42:48 2017 +0100 [TRANSLATION] Start menu, shortcuts, r61988: update untranslated strings too. CORE-13994 ToDo: Translators should check already translated strings too. --- media/inf/shortcuts.inf | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 561e96f4f3..422919d8b4 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -287,7 +287,7 @@ CALC_TITLE=Rechner CALC_DESC=Starte Taschenrechner NOTEPAD_TITLE=Editor NOTEPAD_DESC=Starte Texteditor -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Verbindung MSTSC_DESC=Remote Desktop Verbindung starten WORDPAD_TITLE=WordPad WORDPAD_DESC=Starte Dokumenteneditor @@ -372,7 +372,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Launch Multimedia Player SNDVOL_TITLE=Volume Control SNDVOL_DESC=Launch Volume Control -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Launch Sound Recorder SOL_TITLE=Πασιέντζα SOL_DESC=Πασιέντζα @@ -473,7 +473,7 @@ CALC_TITLE=Calculator CALC_DESC=Ava Kalkulaator NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Ava Tekstiredaktor -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection WORDPAD_TITLE=WordPad WORDPAD_DESC=Ava Dokumendiredaktor @@ -497,7 +497,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Ava Meediamängija SNDVOL_TITLE=Volume Control SNDVOL_DESC=Ava Helitugevuse Kontroll -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Launch Sound Recorder SOL_TITLE=Solitaire SOL_DESC=Solitaire @@ -661,7 +661,7 @@ CALC_TITLE=Calculator CALC_DESC=Launch Calculator NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Launch Text Editor -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection WORDPAD_TITLE=WordPad WORDPAD_DESC=Launch Document Editor @@ -685,7 +685,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Launch Multimedia Player SNDVOL_TITLE=Volume Control SNDVOL_DESC=Launch Volume Control -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Launch Sound Recorder SOL_TITLE=Solitaire SOL_DESC=Pasziánsz @@ -722,7 +722,7 @@ CALC_TITLE=Calculator CALC_DESC=Jalankan Kalkulator NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Jalankan Editor Teks -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection WORDPAD_TITLE=WordPad WORDPAD_DESC=Jalankan Editor Dokumen @@ -746,7 +746,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Launch Multimedia Player SNDVOL_TITLE=Volume Control SNDVOL_DESC=Launch Volume Control -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Launch Sound Recorder SOL_TITLE=Solitaire SOL_DESC=Solitaire @@ -911,7 +911,7 @@ CALC_TITLE=Calculator CALC_DESC=Launch Calculator NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Launch Text Editor -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection WORDPAD_TITLE=WordPad WORDPAD_DESC=Launch Document Editor @@ -935,7 +935,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Launch Multimedia Player SNDVOL_TITLE=Volume Control SNDVOL_DESC=Launch Volume Control -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Launch Sound Recorder SOL_TITLE=Solitaire SOL_DESC=Solitaire @@ -972,7 +972,7 @@ CALC_TITLE=Calculator CALC_DESC=Start Kalkulator NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Start Tekstredigering -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection WORDPAD_TITLE=WordPad WORDPAD_DESC=Start Dokument redigering @@ -996,7 +996,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Start Multimedia avspiller SNDVOL_TITLE=Volume Control SNDVOL_DESC=Start Volumkontroll -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Launch Sound Recorder SOL_TITLE=Solitaire SOL_DESC=Kabal @@ -1037,7 +1037,7 @@ MSTSC_TITLE=Dostęp zdalny MSTSC_DESC=Uruchom Dostęp zdalny WORDPAD_TITLE=WordPad WORDPAD_DESC=Uruchom WordPada -MSPAINT_TITLE=MSPaint +MSPAINT_TITLE=Paint MSPAINT_DESC=Uruchom Paint CHARMAP_TITLE=Tablica znaków CHARMAP_DESC=Tablica znaków @@ -1099,7 +1099,7 @@ CALC_TITLE=Calculator CALC_DESC=Iniciar Calculadora NOTEPAD_TITLE=Notepad NOTEPAD_DESC=Iniciar Editor de Texto -MSTSC_TITLE=Remote Desktop +MSTSC_TITLE=Remote Desktop Connection MSTSC_DESC=Launch Remote Desktop Connection WORDPAD_TITLE=WordPad WORDPAD_DESC=Iniciar Editor de Documentos @@ -1123,7 +1123,7 @@ MPLAY_TITLE=Multimedia Player MPLAY_DESC=Iniciar Player Multimídia SNDVOL_TITLE=Volume Control SNDVOL_DESC=Iniciar Controle de Volume -SNDREC32_TITLE=Audiorecorder +SNDREC32_TITLE=Sound Recorder SNDREC32_DESC=Iniciar Gravador de Som SOL_TITLE=Solitaire SOL_DESC=Paciência

6 years, 11 months

[reactos] 03/03: [NTOS:KD] Pass PreviousMode down to KdpPrintString, since ExGetPreviousMode is not accurate. CORE-14103

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e8de26164861fc8f6dc0… commit 7e8de26164861fc8f6dc09c92d2211ed925e981e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Thu Dec 14 11:43:57 2017 +0100 [NTOS:KD] Pass PreviousMode down to KdpPrintString, since ExGetPreviousMode is not accurate. CORE-14103 --- ntoskrnl/include/internal/kd.h | 3 ++- ntoskrnl/kd/kdio.c | 5 +++-- ntoskrnl/kd/kdmain.c | 13 +++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 05179ea6d3..daad7538e1 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -194,7 +194,8 @@ ULONG NTAPI KdpPrintString( _In_reads_bytes_(Length) PCHAR UnsafeString, - _In_ ULONG Length); + _In_ ULONG Length, + _In_ KPROCESSOR_MODE PreviousMode); ULONG NTAPI diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 50e4d8168f..53c99c43d4 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -569,7 +569,8 @@ ULONG NTAPI KdpPrintString( _In_reads_bytes_(Length) PCHAR UnsafeString, - _In_ ULONG Length) + _In_ ULONG Length, + _In_ KPROCESSOR_MODE PreviousMode) { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; @@ -580,7 +581,7 @@ KdpPrintString( Length = min(Length, sizeof(StringBuffer)); - if (ExGetPreviousMode() != KernelMode) + if (PreviousMode != KernelMode) { _SEH2_TRY { diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 52b8babbce..d219f1bb04 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -41,14 +41,15 @@ ULONG NTAPI KdpServiceDispatcher(ULONG Service, PVOID Buffer1, - ULONG Buffer1Length) + ULONG Buffer1Length, + KPROCESSOR_MODE PreviousMode) { ULONG Result = 0; switch (Service) { case BREAKPOINT_PRINT: /* DbgPrint */ - Result = KdpPrintString(Buffer1, Buffer1Length); + Result = KdpPrintString(Buffer1, Buffer1Length, PreviousMode); break; #if DBG @@ -145,7 +146,8 @@ KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, /* Print the string */ KdpServiceDispatcher(BREAKPOINT_PRINT, (PVOID)ExceptionRecord->ExceptionInformation[1], - ExceptionRecord->ExceptionInformation[2]); + ExceptionRecord->ExceptionInformation[2], + PreviousMode); /* Return success */ KeSetContextReturnRegister(Context, STATUS_SUCCESS); @@ -493,7 +495,10 @@ KdSystemDebugControl(IN SYSDBG_COMMAND Command, IN KPROCESSOR_MODE PreviousMode) { /* HACK */ - return KdpServiceDispatcher(Command, InputBuffer, InputBufferLength); + return KdpServiceDispatcher(Command, + InputBuffer, + InputBufferLength, + PreviousMode); } PKDEBUG_ROUTINE KiDebugRoutine = KdpEnterDebuggerException;

6 years, 11 months

[reactos] 02/03: [NTOS:KD] Avoid _alloca inside SEH, as it's apparently incompatible with PSEH. CORE-14103

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b95fcf93d5ec38edd442… commit 7b95fcf93d5ec38edd442492ec66459175f81106 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Dec 12 12:44:44 2017 +0100 [NTOS:KD] Avoid _alloca inside SEH, as it's apparently incompatible with PSEH. CORE-14103 --- ntoskrnl/kd/kdio.c | 5 +++-- ntoskrnl/kd64/kdprint.c | 10 +++++----- ntoskrnl/kdbg/kdb_cli.c | 10 ++++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 205842056f..50e4d8168f 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -574,17 +574,18 @@ KdpPrintString( PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; PCHAR String; + CHAR StringBuffer[512]; if (!KdpDebugMode.Value) return 0; - Length = min(Length, 512); + Length = min(Length, sizeof(StringBuffer)); if (ExGetPreviousMode() != KernelMode) { _SEH2_TRY { ProbeForRead(UnsafeString, Length, 1); - String = _alloca(Length); + String = StringBuffer; RtlCopyMemory(String, UnsafeString, Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) diff --git a/ntoskrnl/kd64/kdprint.c b/ntoskrnl/kd64/kdprint.c index 71a681d6e7..7604a255ab 100644 --- a/ntoskrnl/kd64/kdprint.c +++ b/ntoskrnl/kd64/kdprint.c @@ -220,14 +220,15 @@ KdpPrompt(IN LPSTR PromptString, { STRING PromptBuffer, ResponseBuffer; BOOLEAN Enable, Resend; - PVOID CapturedPrompt; + CHAR CapturedPrompt[512]; + CHAR SafeResponseBuffer[512]; PCHAR SafeResponseString; /* Normalize the lengths */ PromptLength = min(PromptLength, - 512); + sizeof(CapturedPrompt)); MaximumResponseLength = min(MaximumResponseLength, - 512); + sizeof(SafeResponseBuffer)); /* Check if we need to verify the string */ if (PreviousMode != KernelMode) @@ -241,7 +242,6 @@ KdpPrompt(IN LPSTR PromptString, 1); /* Capture prompt */ - CapturedPrompt = _alloca(PromptLength); KdpMoveMemory(CapturedPrompt, PromptString, PromptLength); @@ -251,7 +251,7 @@ KdpPrompt(IN LPSTR PromptString, ProbeForWrite(ResponseString, MaximumResponseLength, 1); - SafeResponseString = _alloca(MaximumResponseLength); + SafeResponseString = SafeResponseBuffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index a2829e40ca..f5e71bd369 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3675,12 +3675,14 @@ KdpPrompt( KIRQL OldIrql; PCHAR InString; PCHAR OutString; + CHAR InStringBuffer[512]; + CHAR OutStringBuffer[512]; /* Normalize the lengths */ InStringLength = min(InStringLength, - 512); + sizeof(InStringBuffer)); OutStringLength = min(OutStringLength, - 512); + sizeof(OutStringBuffer)); /* Check if we need to verify the string */ if (PreviousMode != KernelMode) @@ -3694,7 +3696,7 @@ KdpPrompt( 1); /* Capture prompt */ - InString = _alloca(InStringLength); + InString = InStringBuffer; RtlCopyMemory(InString, UnsafeInString, InStringLength); @@ -3703,7 +3705,7 @@ KdpPrompt( ProbeForWrite(UnsafeOutString, OutStringLength, 1); - OutString = _alloca(OutStringLength); + OutString = OutStringBuffer; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

6 years, 11 months

[reactos] 01/03: [NTOS:KD] Don't assume null termination in KdpSerialDebugPrint and KdpScreenPrint. CORE-14057 CORE-14103

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a07b569b255477fe754dc… commit a07b569b255477fe754dcc836c411ace8e6d1b7b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Dec 12 12:38:45 2017 +0100 [NTOS:KD] Don't assume null termination in KdpSerialDebugPrint and KdpScreenPrint. CORE-14057 CORE-14103 --- ntoskrnl/kd/kdio.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 3fedfd7ca5..205842056f 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -340,7 +340,7 @@ KdpSerialDebugPrint(LPSTR Message, } /* Output the message */ - while (*pch != 0) + while (pch < Message + Length && *pch != '\0') { if (*pch == '\n') { @@ -412,7 +412,7 @@ KdpScreenPrint(LPSTR Message, KIRQL OldIrql; PCHAR pch = (PCHAR) Message; - while (*pch) + while (pch < Message + Length && *pch) { if(*pch == '\b') { @@ -584,9 +584,8 @@ KdpPrintString( _SEH2_TRY { ProbeForRead(UnsafeString, Length, 1); - String = _alloca(Length + 1); + String = _alloca(Length); RtlCopyMemory(String, UnsafeString, Length); - String[Length] = ANSI_NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

6 years, 11 months

[reactos] 01/01: [SYSDM] Extend build string to fit commit hash

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0fe72e2189bae4543da8… commit a0fe72e2189bae4543da85e48a005717b47019b0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 13 12:50:22 2017 +0300 [SYSDM] Extend build string to fit commit hash --- dll/cpl/sysdm/lang/bg-BG.rc | 2 +- dll/cpl/sysdm/lang/cs-CZ.rc | 2 +- dll/cpl/sysdm/lang/da-DK.rc | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- dll/cpl/sysdm/lang/el-GR.rc | 2 +- dll/cpl/sysdm/lang/en-US.rc | 2 +- dll/cpl/sysdm/lang/es-ES.rc | 2 +- dll/cpl/sysdm/lang/fr-FR.rc | 2 +- dll/cpl/sysdm/lang/he-IL.rc | 2 +- dll/cpl/sysdm/lang/hu-HU.rc | 2 +- dll/cpl/sysdm/lang/id-ID.rc | 2 +- dll/cpl/sysdm/lang/it-IT.rc | 2 +- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- dll/cpl/sysdm/lang/nl-NL.rc | 2 +- dll/cpl/sysdm/lang/no-NO.rc | 2 +- dll/cpl/sysdm/lang/pl-PL.rc | 2 +- dll/cpl/sysdm/lang/ro-RO.rc | 2 +- dll/cpl/sysdm/lang/ru-RU.rc | 2 +- dll/cpl/sysdm/lang/sk-SK.rc | 2 +- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- dll/cpl/sysdm/lang/sv-SE.rc | 2 +- dll/cpl/sysdm/lang/tr-TR.rc | 2 +- dll/cpl/sysdm/lang/uk-UA.rc | 2 +- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/cpl/sysdm/lang/zh-TW.rc | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 5c67d4c8cc..98260e8e01 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Версия:", IDC_STATIC, 10, 153, 40, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 45, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Машина:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 7acac79cf0..25f12d8f84 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -15,7 +15,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Verze ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 273cb4271f..a9f6371945 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 48493df583..166d5e2f8d 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -19,7 +19,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Computer:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 12fd49befd..454d27c640 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Έκδοση ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Υπολογιστής:", IDC_STATIC, 124, 132, 44, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index a505f24e24..8f65427a4d 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index 136a7014c8..b2d636416f 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versión ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Equipo:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index e5ec007c33..6ed87532fe 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 344b37d832..317aafaed1 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "גרסה ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "מכונה:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index a603a44798..39373ead8b 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Verzió ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Számítógép:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 0e14f50f3b..7c9daa6665 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versi ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Mesin:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index ad0d63a62e..17bb7ac6ea 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versione ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Macchina:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 7f88ea4360..21d78d0a35 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "マシン:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 3ca481ef40..e46a2ca3e6 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versie ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 45f37a1fc4..db0c1dd722 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versjon ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Maskin:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 8c272dfc07..6421937276 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -19,7 +19,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Wersja ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Komputer:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 609c9388f3..8723809fcd 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -19,7 +19,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versiune", IDC_STATIC, 10, 153, 30, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 40, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Calculator:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 26f2a5f19e..f546534cb7 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Версия ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Компьютер:", IDC_STATIC, 124, 132, 40, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 695b54ec66..d15c69f527 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -18,7 +18,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Verzia ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 32, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 4e17b77342..b5c84edcd2 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -10,7 +10,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versioni", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Makinë:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index ea886c1086..b5ceaa7a93 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Dator:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 5a2f6d8168..3c825a5ce7 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Sürüm:", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Makine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 75e9193eaf..42d9229adb 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -18,7 +18,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Версія ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index c43eda38eb..92e82e3a6c 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "版本 ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "计算机:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index e914fb295c..c99b53d919 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -12,7 +12,7 @@ BEGIN LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "版本 ", IDC_STATIC, 10, 153, 25, 9 LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 - LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "計算機:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9

6 years, 11 months

[reactos] 01/01: [ASM][NDK][NTOS] Rename Self to SelfPcr in the KIPCR structure.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=631a14ff641c1b8a5ebba… commit 631a14ff641c1b8a5ebba40829625ff0b1c72d1a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Tue Dec 12 12:50:58 2017 +0100 [ASM][NDK][NTOS] Rename Self to SelfPcr in the KIPCR structure. --- ntoskrnl/kd64/kddata.c | 2 +- ntoskrnl/kdbg/kdb_cli.c | 4 ++-- ntoskrnl/ke/i386/kiinit.c | 2 +- sdk/include/asm/ks386.template.h | 4 ++-- sdk/include/ndk/i386/ketypes.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c index d7b02c9baa..681eb9bed9 100644 --- a/ntoskrnl/kd64/kddata.c +++ b/ntoskrnl/kd64/kddata.c @@ -25,7 +25,7 @@ VOID NTAPI RtlpBreakWithStatusInstruction(VOID); #if defined(_M_IX86) -#define KPCR_SELF_PCR_OFFSET FIELD_OFFSET(KPCR, Self) +#define KPCR_SELF_PCR_OFFSET FIELD_OFFSET(KPCR, SelfPcr) #define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb) #define KPCR_CONTAINED_PRCB_OFFSET FIELD_OFFSET(KPCR, PrcbData) #define KPCR_INITIAL_STACK_OFFSET 0 diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index db7dae7981..a2829e40ca 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -2112,7 +2112,7 @@ KdbpCmdPcr( " Tib.FiberData/Version: 0x%08x\n" " Tib.ArbitraryUserPointer: 0x%08x\n" " Tib.Self: 0x%08x\n" - " Self: 0x%08x\n" + " SelfPcr: 0x%08x\n" " PCRCB: 0x%08x\n" " Irql: 0x%02x\n" " IRR: 0x%08x\n" @@ -2133,7 +2133,7 @@ KdbpCmdPcr( " InterruptMode: 0x%08x\n", Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit, Pcr->NtTib.SubSystemTib, Pcr->NtTib.FiberData, Pcr->NtTib.ArbitraryUserPointer, - Pcr->NtTib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, + Pcr->NtTib.Self, Pcr->SelfPcr, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS, Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor, Pcr->Number, Pcr->SecondLevelCacheAssociativity, diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 5f192cc7ca..cba2c423fd 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -345,7 +345,7 @@ KiInitializePcr(IN ULONG ProcessorNumber, Pcr->PrcbData.CurrentThread = IdleThread; /* Set pointers to ourselves */ - Pcr->Self = (PKPCR)Pcr; + Pcr->SelfPcr = (PKPCR)Pcr; Pcr->Prcb = &Pcr->PrcbData; /* Set the PCR Version */ diff --git a/sdk/include/asm/ks386.template.h b/sdk/include/asm/ks386.template.h index dedeefa0af..e5f672cb1b 100644 --- a/sdk/include/asm/ks386.template.h +++ b/sdk/include/asm/ks386.template.h @@ -369,7 +369,7 @@ OFFSET(PcTssCopy, KIPCR, TssCopy), OFFSET(PcContextSwitches, KIPCR, ContextSwitches), OFFSET(PcSetMemberCopy, KIPCR, SetMemberCopy), OFFSET(PcTeb, KIPCR, NtTib.Self), -OFFSET(PcSelfPcr, KIPCR, Self), +OFFSET(PcSelfPcr, KIPCR, SelfPcr), OFFSET(PcPrcb, KIPCR, Prcb), OFFSET(PcIrql, KIPCR, Irql), OFFSET(PcIRR, KIPCR, IRR), @@ -582,7 +582,7 @@ OFFSET(KPCR_EXCEPTION_LIST, KPCR, NtTib.ExceptionList), OFFSET(KPCR_PERF_GLOBAL_GROUP_MASK, KIPCR, PerfGlobalGroupMask), OFFSET(KPCR_CONTEXT_SWITCHES, KPCR, ContextSwitches), OFFSET(KPCR_TEB, KIPCR, Used_Self), -OFFSET(KPCR_SELF, KIPCR, Self), +OFFSET(KPCR_SELF, KIPCR, SelfPcr), OFFSET(KPCR_PRCB, KPCR, Prcb), OFFSET(KPCR_IDT, KIPCR, IDT), OFFSET(KPCR_GDT, KIPCR, GDT), diff --git a/sdk/include/ndk/i386/ketypes.h b/sdk/include/ndk/i386/ketypes.h index cd005d7700..e7563b8d52 100644 --- a/sdk/include/ndk/i386/ketypes.h +++ b/sdk/include/ndk/i386/ketypes.h @@ -746,7 +746,7 @@ typedef struct _KIPCR PVOID Used_Self; }; }; - struct _KPCR *Self; + struct _KPCR *SelfPcr; struct _KPRCB *Prcb; KIRQL Irql; ULONG IRR;

6 years, 11 months

← Newer
1
...
16
17
18
19
20
21
22
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017