Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [SHELL32_APITEST] Disabled DragDrop test due to race condition To be enabled back when the bug is fixed CORE-17057

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b105ceb56ee94e961958… commit 7b105ceb56ee94e961958693c813c09bf2f7ab69 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon May 18 20:50:07 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 18 20:50:07 2020 +0300 [SHELL32_APITEST] Disabled DragDrop test due to race condition To be enabled back when the bug is fixed CORE-17057 --- modules/rostests/apitests/shell32/testlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 5b6afe32963..ba56769a97a 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -38,7 +38,7 @@ const struct test winetest_testlist[] = { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, { "CUserNotification", func_CUserNotification }, - { "DragDrop", func_DragDrop }, + // { "DragDrop", func_DragDrop }, disabled due to CORE-17057 { "ExtractIconEx", func_ExtractIconEx }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu },

4 years, 7 months

[reactos] 03/03: [CMD] Add a ExecuteCommandWithEcho() helper and use it in Batch() and as the implementation of RunInstance() FOR-loop helper.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=240f6737e95eee6e80bfc… commit 240f6737e95eee6e80bfc5b3f4dbac7b4da3b679 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 18 02:03:15 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 18 02:21:57 2020 +0200 [CMD] Add a ExecuteCommandWithEcho() helper and use it in Batch() and as the implementation of RunInstance() FOR-loop helper. --- base/shell/cmd/batch.c | 13 ++----------- base/shell/cmd/cmd.c | 21 ++++++++++++++++++++- base/shell/cmd/cmd.h | 10 +++++++++- base/shell/cmd/for.c | 16 +++------------- 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 3c384e279af..8d6afb222e5 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -353,18 +353,9 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) continue; /* JPP 19980807 */ - /* Echo batch file line */ - if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) - { - if (!bIgnoreEcho) - ConOutChar(_T('\n')); - PrintPrompt(); - EchoCommand(Cmd); - ConOutChar(_T('\n')); - } - + /* Echo the command and execute it */ bc->current = Cmd; - ret = ExecuteCommand(Cmd); + ret = ExecuteCommandWithEcho(Cmd); FreeCommand(Cmd); } diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index ed79b192339..bef99f272c4 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -769,7 +769,8 @@ failed: } INT -ExecuteCommand(PARSED_COMMAND *Cmd) +ExecuteCommand( + IN PARSED_COMMAND *Cmd) { PARSED_COMMAND *Sub; LPTSTR First, Rest; @@ -830,6 +831,24 @@ ExecuteCommand(PARSED_COMMAND *Cmd) return Ret; } +INT +ExecuteCommandWithEcho( + IN PARSED_COMMAND *Cmd) +{ + /* Echo the reconstructed command line */ + if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) + { + if (!bIgnoreEcho) + ConOutChar(_T('\n')); + PrintPrompt(); + EchoCommand(Cmd); + ConOutChar(_T('\n')); + } + + /* Run the command */ + return ExecuteCommand(Cmd); +} + LPTSTR GetEnvVar(LPCTSTR varName) { diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 20f946463ca..875ce5ec113 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -80,7 +80,15 @@ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeparator HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT); INT ParseCommandLine(LPTSTR); struct _PARSED_COMMAND; -INT ExecuteCommand(struct _PARSED_COMMAND *Cmd); + +INT +ExecuteCommand( + IN struct _PARSED_COMMAND *Cmd); + +INT +ExecuteCommandWithEcho( + IN struct _PARSED_COMMAND *Cmd); + LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index b8628145d47..0bfedb967bf 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -69,19 +69,9 @@ static BOOL GetNextElement(TCHAR **pStart, TCHAR **pEnd) } /* Execute a single instance of a FOR command */ -static INT RunInstance(PARSED_COMMAND *Cmd) -{ - if (bEcho && !bDisableBatchEcho && Cmd->Subcommands->Type != C_QUIET) - { - if (!bIgnoreEcho) - ConOutChar(_T('\n')); - PrintPrompt(); - EchoCommand(Cmd->Subcommands); - ConOutChar(_T('\n')); - } - /* Just run the command (variable expansion is done in DoDelayedExpansion) */ - return ExecuteCommand(Cmd->Subcommands); -} +/* Just run the command (variable expansion is done in DoDelayedExpansion) */ +#define RunInstance(Cmd) \ + ExecuteCommandWithEcho((Cmd)->Subcommands) /* Check if this FOR should be terminated early */ static BOOL Exiting(PARSED_COMMAND *Cmd)

4 years, 7 months

[reactos] 02/03: [CMD] Fix the stop-batch prompt appearance: do not display it more than once in a row.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce543fbb72f2c4d9c4da4… commit ce543fbb72f2c4d9c4da4fe71c4cf0cf9c7882dd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 17 20:13:32 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 18 02:21:57 2020 +0200 [CMD] Fix the stop-batch prompt appearance: do not display it more than once in a row. --- base/shell/cmd/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index bcefe215002..8d5239949b6 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -151,10 +151,9 @@ BOOL CheckCtrlBreak(INT mode) LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, ARRAYSIZE(options)); - /* we need to be sure the string arrives on the screen! */ + ConOutResPuts(STRING_CANCEL_BATCH_FILE); do { - ConOutResPuts(STRING_CANCEL_BATCH_FILE); c = _totupper(cgetchar()); } while (!(_tcschr(options, c) || c == _T('\3')) || !c);

4 years, 7 months

[reactos] 01/03: [CMD] Fix the ErrorMessage() function.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0ced4ffdffa83cd4aa1c… commit d0ced4ffdffa83cd4aa1cf7694912a9a5c2c8793 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 17 20:08:41 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 18 02:21:56 2020 +0200 [CMD] Fix the ErrorMessage() function. Specify its szFormat parameter optional, and correctly initialize the szMessage buffer. --- base/shell/cmd/cmd.h | 6 +++++- base/shell/cmd/del.c | 2 +- base/shell/cmd/error.c | 16 ++++++++++------ base/shell/cmd/vol.c | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 48f6df0b5b2..20f946463ca 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -165,7 +165,11 @@ INT CommandEchoerr (LPTSTR); INT CommandEchoserr (LPTSTR); /* Prototypes for ERROR.C */ -VOID ErrorMessage (DWORD, LPTSTR, ...); +VOID +ErrorMessage( + IN DWORD dwErrorCode, + IN LPTSTR szFormat OPTIONAL, + ...); VOID error_no_pipe (VOID); VOID error_bad_command (LPTSTR); diff --git a/base/shell/cmd/del.c b/base/shell/cmd/del.c index 7f2d2a63db6..8e5cfbdccb8 100644 --- a/base/shell/cmd/del.c +++ b/base/shell/cmd/del.c @@ -263,7 +263,7 @@ DeleteFiles(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) } else { - ErrorMessage (GetLastError(), _T("")); + ErrorMessage (GetLastError(), NULL); // FindClose(hFile); // return -1; } diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index 92f08a0d996..c0f61fd00a7 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -22,19 +22,23 @@ #include "precomp.h" - -VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) +VOID +ErrorMessage( + IN DWORD dwErrorCode, + IN LPTSTR szFormat OPTIONAL, + ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szMessage[1024]; - LPTSTR szError; va_list arg_ptr; + LPTSTR szError; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMessage[1024]; if (dwErrorCode == ERROR_SUCCESS) return; nErrorLevel = 1; + *szMessage = 0; if (szFormat) { va_start(arg_ptr, szFormat); @@ -48,7 +52,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) { ConErrPrintf(_T("%s %s\n"), szError, szMessage); if (szError) - LocalFree (szError); + LocalFree(szError); return; } diff --git a/base/shell/cmd/vol.c b/base/shell/cmd/vol.c index eed27c9dd57..cdd529e6376 100644 --- a/base/shell/cmd/vol.c +++ b/base/shell/cmd/vol.c @@ -41,7 +41,7 @@ PrintVolumeHeader (LPTSTR pszRootPath) NULL, 0)) { - ErrorMessage(GetLastError (), _T("")); + ErrorMessage(GetLastError (), NULL); return 1; }

4 years, 7 months

[reactos] 01/01: [DESK][TIMEDATE] Update Portuguese translation (#2801)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5784d6345c017dee59d8… commit d5784d6345c017dee59d8b856070eb5dd0f96f8d Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun May 17 22:53:54 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 17 23:53:54 2020 +0200 [DESK][TIMEDATE] Update Portuguese translation (#2801) --- dll/cpl/desk/lang/pt-PT.rc | 12 ++++++------ dll/cpl/timedate/lang/pt-PT.rc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index e84f7541c10..1f37033814a 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -6,15 +6,15 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_THEMES DIALOGEX 0, 0, 246, 210 -CAPTION "Themes" +CAPTION "Temas" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 - LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + LTEXT "Um tema é um plano de fundo, além de um conjunto de sons, ícones e outros elementos para ajudá-lo a personalizar seu computador com um clique.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Tema:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 - PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + PUSHBUTTON "Guardar &como...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Eliminar", IDC_THEMES_DELETE, 170, 70, 70, 14 CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE END @@ -81,7 +81,7 @@ CAPTION "Aspecto avançado" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE + LTEXT "Se seleccionar um tema que não seja o ReactOS classic, ele substituirá as seguintes configurações, excepto em alguns programas mais antigos.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Item:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/timedate/lang/pt-PT.rc b/dll/cpl/timedate/lang/pt-PT.rc index 9a61c0ed89b..9824e4711a7 100644 --- a/dll/cpl/timedate/lang/pt-PT.rc +++ b/dll/cpl/timedate/lang/pt-PT.rc @@ -55,5 +55,5 @@ BEGIN IDS_INETTIMESYNCING "Aguarde enquanto o ReactOS é sincronizado com %s" IDS_INETTIMEERROR "Erro enquanto o ReactOS estava a sincronizar com %s" IDS_INETTIMESUCFILL "Por favor digite um nome de servidor NTP para sincronizar o horário" - IDS_INETTIMEWELCOME "Selecione um servidor NTP na lista ou digite o nome do servidor NTP para sincronizar a hora do computador." + IDS_INETTIMEWELCOME "Seleccione um servidor NTP na lista ou digite o nome do servidor NTP para sincronizar a hora do computador." END

4 years, 7 months

[reactos] 01/01: [EVENTVWR] Update polish translation (#2804)

by Adam Stachowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc662bfde8089b873299d… commit cc662bfde8089b873299d533bad708a000e2a62b Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Sun May 17 23:39:56 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 17 23:39:56 2020 +0200 [EVENTVWR] Update polish translation (#2804) After commit 8756cec0. --- base/applications/mscutils/eventvwr/lang/pl-PL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mscutils/eventvwr/lang/pl-PL.rc b/base/applications/mscutils/eventvwr/lang/pl-PL.rc index 76b9982fb7e..dbd32e5235e 100644 --- a/base/applications/mscutils/eventvwr/lang/pl-PL.rc +++ b/base/applications/mscutils/eventvwr/lang/pl-PL.rc @@ -146,7 +146,7 @@ BEGIN IDS_EVENTLOG_USER "Dzienniki użytkownika" IDS_SAVE_FILTER "Dziennik zdarzeń (*.evt)\0*.evt\0" IDS_CLEAREVENTS_MSG "Czy chcesz zapisać dziennik zdarzeń przed czyszczeniem?" - IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" + IDS_RESTOREDEFAULTS "Czy chcesz przywrócić wszystkie ustawienia tego dziennika do wartości domyślnych?" IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID ( %lu ) nie został odnaleziony w źródle ( %s ). Ten komputer może nie miec wystarczających informacji w rejestrze, albo bibliotek DLL, aby wyświetlić wiadomości z komputera zdalnego.\n\nThe following information is part of the event:\n\n" END

4 years, 7 months

[reactos] 01/01: [FREELDR] Fix I/O range size of serial ports

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=468b8f3719aa6794e4976… commit 468b8f3719aa6794e4976b746956b1753b7be2eb Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun May 17 22:49:47 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun May 17 23:08:26 2020 +0200 [FREELDR] Fix I/O range size of serial ports --- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 8aea5d9d13f..c0893049aaf 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -706,7 +706,7 @@ DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey, GET_SERIAL_PORT MachGetS PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; PartialDescriptor->u.Port.Start.LowPart = Base; PartialDescriptor->u.Port.Start.HighPart = 0x0; - PartialDescriptor->u.Port.Length = 7; + PartialDescriptor->u.Port.Length = 8; /* Set Interrupt */ PartialDescriptor = &PartialResourceList->PartialDescriptors[1];

4 years, 7 months

[reactos] 01/01: [NTOS:OB] Fix incorrect variable name in ObfDereferenceObject.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c8c03e9a8ba0bc28e1bb… commit 8c8c03e9a8ba0bc28e1bb0edc0c2ee17aa17aacb Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 8 17:53:29 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 17 21:43:58 2020 +0200 [NTOS:OB] Fix incorrect variable name in ObfDereferenceObject. --- ntoskrnl/ob/obref.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/ob/obref.c b/ntoskrnl/ob/obref.c index 099903d6308..694d4fa5073 100644 --- a/ntoskrnl/ob/obref.c +++ b/ntoskrnl/ob/obref.c @@ -111,7 +111,7 @@ ObInitializeFastReference(IN PEX_FAST_REF FastRef, { /* Check if we were given an object and reference it 7 times */ if (Object) ObReferenceObjectEx(Object, MAX_FAST_REFS); - + /* Setup the fast reference */ ExInitializeFastReference(FastRef, Object); } @@ -152,7 +152,7 @@ ObFastReferenceObject(IN PEX_FAST_REF FastRef) /* Otherwise, reference the object 7 times */ ObReferenceObjectEx(Object, MAX_FAST_REFS); - + /* Now update the reference count */ if (!ExInsertFastReference(FastRef, Object)) { @@ -184,11 +184,11 @@ ObFastReplaceObject(IN PEX_FAST_REF FastRef, /* Check if we were given an object and reference it 7 times */ if (Object) ObReferenceObjectEx(Object, MAX_FAST_REFS); - + /* Do the swap */ OldValue = ExSwapFastReference(FastRef, Object); OldObject = ExGetObjectFastReference(OldValue); - + /* Check if we had an active object and dereference it */ Count = ExGetCountFastReference(OldValue); if ((OldObject) && (Count)) ObDereferenceObjectEx(OldObject, Count); @@ -320,7 +320,7 @@ FASTCALL ObfDereferenceObject(IN PVOID Object) { POBJECT_HEADER Header; - LONG_PTR OldCount; + LONG_PTR NewCount; /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); @@ -332,8 +332,8 @@ ObfDereferenceObject(IN PVOID Object) } /* Check whether the object can now be deleted. */ - OldCount = InterlockedDecrementSizeT(&Header->PointerCount); - if (!OldCount) + NewCount = InterlockedDecrementSizeT(&Header->PointerCount); + if (!NewCount) { /* Sanity check */ ASSERT(Header->HandleCount == 0); @@ -351,8 +351,8 @@ ObfDereferenceObject(IN PVOID Object) } } - /* Return the old count */ - return OldCount; + /* Return the new count */ + return NewCount; } VOID

4 years, 7 months

[reactos] 01/01: [NTOS] Prohibit use of MAX_PATH in the kernel. Use MAX_WIN32_PATH if you really mean it. CORE-15882

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60346a5732726bc52002d… commit 60346a5732726bc52002da36d8d7f25845bec3c3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Mar 31 09:18:16 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 17 21:30:08 2020 +0200 [NTOS] Prohibit use of MAX_PATH in the kernel. Use MAX_WIN32_PATH if you really mean it. CORE-15882 --- ntoskrnl/ex/init.c | 10 +++++----- ntoskrnl/include/ntoskrnl.h | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 39869a5b061..c09918e2533 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -401,7 +401,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, ProcessInformation = &InitBuffer->ProcessInfo; /* Allocate memory for the process parameters */ - Size = sizeof(*ProcessParams) + ((MAX_PATH * 6) * sizeof(WCHAR)); + Size = sizeof(*ProcessParams) + ((MAX_WIN32_PATH * 6) * sizeof(WCHAR)); Status = ZwAllocateVirtualMemory(NtCurrentProcess(), (PVOID*)&ProcessParams, 0, @@ -456,7 +456,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, /* Make a buffer for the DOS path */ p = (PWSTR)(ProcessParams + 1); ProcessParams->CurrentDirectory.DosPath.Buffer = p; - ProcessParams->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * + ProcessParams->CurrentDirectory.DosPath.MaximumLength = MAX_WIN32_PATH * sizeof(WCHAR); /* Copy the DOS path */ @@ -467,7 +467,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, p = (PWSTR)((PCHAR)ProcessParams->CurrentDirectory.DosPath.Buffer + ProcessParams->CurrentDirectory.DosPath.MaximumLength); ProcessParams->DllPath.Buffer = p; - ProcessParams->DllPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + ProcessParams->DllPath.MaximumLength = MAX_WIN32_PATH * sizeof(WCHAR); /* Copy the DLL path and append the system32 directory */ RtlCopyUnicodeString(&ProcessParams->DllPath, @@ -478,7 +478,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, p = (PWSTR)((PCHAR)ProcessParams->DllPath.Buffer + ProcessParams->DllPath.MaximumLength); ProcessParams->ImagePathName.Buffer = p; - ProcessParams->ImagePathName.MaximumLength = MAX_PATH * sizeof(WCHAR); + ProcessParams->ImagePathName.MaximumLength = MAX_WIN32_PATH * sizeof(WCHAR); /* Make sure the buffer is a valid string which within the given length */ if ((NtInitialUserProcessBufferType != REG_SZ) || @@ -516,7 +516,7 @@ ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, p = (PWSTR)((PCHAR)ProcessParams->ImagePathName.Buffer + ProcessParams->ImagePathName.MaximumLength); ProcessParams->CommandLine.Buffer = p; - ProcessParams->CommandLine.MaximumLength = MAX_PATH * sizeof(WCHAR); + ProcessParams->CommandLine.MaximumLength = MAX_WIN32_PATH * sizeof(WCHAR); /* Add the image name to the command line */ RtlAppendUnicodeToString(&ProcessParams->CommandLine, diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index c03dc5dff1d..85970d59892 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -103,6 +103,11 @@ #define PtrOffset(B,O) ((ULONG)((ULONG_PTR)(O) - (ULONG_PTR)(B))) #endif +/* MAX_PATH is a Win32 concept, it doesn't belong in the kernel */ +#define MAX_WIN32_PATH 260 +C_ASSERT(MAX_WIN32_PATH == MAX_PATH); +#undef MAX_PATH + // // Switch for enabling global page support //

4 years, 7 months

[reactos] 04/04: [NTOS:PNP] Directly accept a UNICODE_STRING in LocateChildDevice. CORE-15882

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c60d25fb264d0b1295792… commit c60d25fb264d0b12957921bf29d43b40eee7e5b1 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat May 2 17:57:46 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun May 17 20:56:16 2020 +0200 [NTOS:PNP] Directly accept a UNICODE_STRING in LocateChildDevice. CORE-15882 --- ntoskrnl/io/pnpmgr/pnproot.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnproot.c b/ntoskrnl/io/pnpmgr/pnproot.c index e89426acb00..02e580e9e71 100644 --- a/ntoskrnl/io/pnpmgr/pnproot.c +++ b/ntoskrnl/io/pnpmgr/pnproot.c @@ -92,16 +92,15 @@ static PDEVICE_OBJECT PnpRootDeviceObject = NULL; static NTSTATUS LocateChildDevice( IN PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension, - IN PCWSTR DeviceId, + IN PCUNICODE_STRING DeviceId, IN PCWSTR InstanceId, OUT PPNPROOT_DEVICE* ChildDevice) { PPNPROOT_DEVICE Device; - UNICODE_STRING DeviceIdU, InstanceIdU; + UNICODE_STRING InstanceIdU; PLIST_ENTRY NextEntry; - /* Initialize the strings to compare */ - RtlInitUnicodeString(&DeviceIdU, DeviceId); + /* Initialize the string to compare */ RtlInitUnicodeString(&InstanceIdU, InstanceId); /* Start looping */ @@ -113,7 +112,7 @@ LocateChildDevice( Device = CONTAINING_RECORD(NextEntry, PNPROOT_DEVICE, ListEntry); /* See if the strings match */ - if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) && + if (RtlEqualUnicodeString(DeviceId, &Device->DeviceID, TRUE) && RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) { /* They do, so set the pointer and return success */ @@ -267,7 +266,7 @@ tryagain: for (NextInstance = 0; NextInstance <= 9999; NextInstance++) { _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); - Status = LocateChildDevice(DeviceExtension, Device->DeviceID.Buffer, InstancePath, &Device); + Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, &Device); if (Status == STATUS_NO_SUCH_DEVICE) break; } @@ -281,7 +280,7 @@ tryagain: } _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); - Status = LocateChildDevice(DeviceExtension, Device->DeviceID.Buffer, InstancePath, &Device); + Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, &Device); if (Status != STATUS_NO_SUCH_DEVICE || NextInstance > 9999) { DPRINT1("NextInstance value is corrupt! (%lu)\n", NextInstance); @@ -460,8 +459,7 @@ CreateDeviceFromRegistry( BUFFER Buffer1, Buffer2; /* If the device already exists, there's nothing to do */ - NT_ASSERT(DevicePath->Buffer[DevicePath->Length / sizeof(WCHAR)] == UNICODE_NULL); - Status = LocateChildDevice(DeviceExtension, DevicePath->Buffer, InstanceId, &Device); + Status = LocateChildDevice(DeviceExtension, DevicePath, InstanceId, &Device); if (Status != STATUS_NO_SUCH_DEVICE) { return STATUS_SUCCESS;

4 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
20
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 May 2020