Ros-diffs January 2019

ros-diffs@reactos.org

31 participants
300 discussions

[reactos] 02/04: [WINSRV] consrv: Implement terminating console processes on shutdown Also stub handling non-console, non-gui processes.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bef6f59138941e0766c3… commit 4bef6f59138941e0766c3a4b3d24d70d4a60e432 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 3 14:26:57 2019 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Fri Jan 4 13:29:26 2019 +0200 [WINSRV] consrv: Implement terminating console processes on shutdown Also stub handling non-console, non-gui processes. --- win32ss/user/winsrv/consrv/console.c | 2 +- win32ss/user/winsrv/consrv/console.h | 5 +++ win32ss/user/winsrv/consrv/shutdown.c | 73 ++++++++++++++++++++++++++++++----- 3 files changed, 70 insertions(+), 10 deletions(-) diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index a6e687b3a3..e28c8a2a52 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -805,7 +805,7 @@ ConSrvDeleteConsole(PCONSRV_CONSOLE Console) -static NTSTATUS +NTSTATUS ConSrvConsoleCtrlEventTimeout(IN ULONG CtrlEvent, IN PCONSOLE_PROCESS_DATA ProcessData, IN ULONG Timeout) diff --git a/win32ss/user/winsrv/consrv/console.h b/win32ss/user/winsrv/consrv/console.h index 07741638c2..cac1eab36d 100644 --- a/win32ss/user/winsrv/consrv/console.h +++ b/win32ss/user/winsrv/consrv/console.h @@ -47,3 +47,8 @@ ConSrvValidateConsole(OUT struct _CONSRV_CONSOLE** /* PCONSRV_CONSOLE* */ Consol IN HANDLE ConsoleHandle, IN CONSOLE_STATE ExpectedState, IN BOOLEAN LockConsole); + +NTSTATUS +ConSrvConsoleCtrlEventTimeout(IN ULONG CtrlEvent, + IN PCONSOLE_PROCESS_DATA ProcessData, + IN ULONG Timeout); diff --git a/win32ss/user/winsrv/consrv/shutdown.c b/win32ss/user/winsrv/consrv/shutdown.c index bbe25daf7c..4bfa41d450 100644 --- a/win32ss/user/winsrv/consrv/shutdown.c +++ b/win32ss/user/winsrv/consrv/shutdown.c @@ -9,12 +9,64 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" +#include <psapi.h> #define NDEBUG #include <debug.h> /* FUNCTIONS ******************************************************************/ +static void +NotifyConsoleProcessForShutdown(IN PCSR_PROCESS CsrProcess, + IN PCONSOLE_PROCESS_DATA ProcessData, + IN ULONG Flags) +{ + DPRINT1("ConsoleClientShutdown(0x%p, 0x%x) - Console process [0x%x, 0x%x]\n", + CsrProcess, Flags, CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); + + /* Send a log-off event. In reality this should be way more complex */ + ConSrvConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData, + ShutdownSettings.WaitToKillAppTimeout); +} + +static BOOL +NotifyGenericProcessForShutdown(IN PCSR_PROCESS CsrProcess, + IN ULONG Flags) +{ + /* FIXME: Implement the generic process shutdown handler */ + UNIMPLEMENTED_ONCE; + + return TRUE; +} + +ULONG +NTAPI +NonConsoleProcessShutdown(IN PCSR_PROCESS Process, + IN ULONG Flags) +{ + if (NotifyGenericProcessForShutdown(Process, Flags)) + { + /* Terminate this process */ +#if DBG + WCHAR buffer[MAX_PATH]; + if (!GetProcessImageFileNameW(Process->ProcessHandle, buffer, MAX_PATH)) + { + DPRINT1("Terminating process %x\n", Process->ClientId.UniqueProcess); + } + else + { + DPRINT1("Terminating process %x (%S)\n", Process->ClientId.UniqueProcess, buffer); + } +#endif + + NtTerminateProcess(Process->ProcessHandle, 0); + WaitForSingleObject(Process->ProcessHandle, ShutdownSettings.ProcessTerminateTimeout); + } + + CsrDereferenceProcess(Process); + return CsrShutdownCsrProcess; +} + // NOTE: See http://blogs.msdn.com/b/ntdebugging/archive/2007/06/09/how-windows-shuts-do… ULONG NTAPI @@ -24,14 +76,19 @@ ConsoleClientShutdown(IN PCSR_PROCESS CsrProcess, { PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); - //FIXME: UNIMPLEMENTED! + /* Do not kill system processes when a user is logging off */ + if ((Flags & EWX_SHUTDOWN) == EWX_LOGOFF && + (CsrProcess->ShutdownFlags & (CsrShutdownSystem | CsrShutdownOther))) + { + DPRINT("Do not kill a system process in a logoff request!\n"); + return CsrShutdownNonCsrProcess; + } + /* Is it a console process? */ if ( ProcessData->ConsoleHandle != NULL || ProcessData->HandleTable != NULL ) { - DPRINT("ConsoleClientShutdown(0x%p, 0x%x, %s) - Console process [0x%x, 0x%x]\n", - CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", - CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); + NotifyConsoleProcessForShutdown(CsrProcess, ProcessData, Flags); /* We are done with the process itself */ CsrDereferenceProcess(CsrProcess); @@ -43,13 +100,11 @@ ConsoleClientShutdown(IN PCSR_PROCESS CsrProcess, CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase", CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread); - /* On first pass, ignore the process since the GUI server should take it... */ + /* On first pass, let the gui server terminate all the processes that it owns */ if (FirstPhase) return CsrShutdownNonCsrProcess; - /* ... otherwise, call the generic handler */ - // FIXME: Should call a generic shutdown handler!! - CsrDereferenceProcess(CsrProcess); - return CsrShutdownCsrProcess; + /* Use the generic handler since this isn't a gui process */ + return NonConsoleProcessShutdown(CsrProcess, Flags); } return CsrShutdownNonCsrProcess;

5 years, 8 months

[reactos] 01/04: [WINSRV] usersrv: Simplify sanity checks in UserClientShutdown UserClientShutdown will never be called for csrss so we don't need to have a check for that. The existing check was broken and wasn't doing anything anyway. Handle processing winlogon by doing nothing so that consrv won't be bothered about it.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a80b77e766964e84e38a… commit 0a80b77e766964e84e38a4559956ffc30d32786b Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Jan 4 01:22:44 2019 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Fri Jan 4 13:29:26 2019 +0200 [WINSRV] usersrv: Simplify sanity checks in UserClientShutdown UserClientShutdown will never be called for csrss so we don't need to have a check for that. The existing check was broken and wasn't doing anything anyway. Handle processing winlogon by doing nothing so that consrv won't be bothered about it. --- win32ss/user/winsrv/usersrv/shutdown.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/shutdown.c b/win32ss/user/winsrv/usersrv/shutdown.c index c73a535ffb..539ef2a932 100644 --- a/win32ss/user/winsrv/usersrv/shutdown.c +++ b/win32ss/user/winsrv/usersrv/shutdown.c @@ -770,15 +770,17 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess, return CsrShutdownNonCsrProcess; } - /* Do not kill Winlogon or CSRSS */ - if (CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() || - CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId)) + /* Do not kill Winlogon */ + if (CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId)) { DPRINT("Not killing %s; CsrProcess->ShutdownFlags = %lu\n", CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() ? "CSRSS" : "Winlogon", CsrProcess->ShutdownFlags); - return CsrShutdownNonCsrProcess; + /* Returning CsrShutdownCsrProcess means that we handled this process by doing nothing */ + /* This will mark winlogon as processed so consrv won't be notified again for it */ + CsrDereferenceProcess(CsrProcess); + return CsrShutdownCsrProcess; } /* Notify the process for shutdown if needed */

5 years, 8 months

[reactos] 01/01: [MOUNTMGR] Fix buffer length checking

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d84ab9ec7c513eb0917bc… commit d84ab9ec7c513eb0917bc9f24f6dc97b70e8485b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jan 3 23:10:31 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Jan 3 23:12:16 2019 +0100 [MOUNTMGR] Fix buffer length checking Found by Vadim Galiant. CORE-15549 --- drivers/filters/mountmgr/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index 08b386daed..17d720e346 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -265,7 +265,7 @@ MountMgrCreatePoint(IN PDEVICE_EXTENSION DeviceExtension, MaxLength = MAX((Point->DeviceNameOffset + Point->DeviceNameLength), (Point->SymbolicLinkNameLength + Point->SymbolicLinkNameOffset)); - if (MaxLength >= Stack->Parameters.DeviceIoControl.InputBufferLength) + if (MaxLength > Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; }

5 years, 8 months

[reactos] 04/04: [LDR] Ensure we start with a valid pointer

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d89d19f396041e91f627… commit 6d89d19f396041e91f627f16573b37f8e6d4c70f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 28 19:27:32 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jan 3 22:52:18 2019 +0100 [LDR] Ensure we start with a valid pointer --- dll/ntdll/ldr/ldrutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 4aa1cfb1c1..6058a70335 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -1851,6 +1851,7 @@ LdrpSearchPath(IN PWCHAR *SearchPath, /* FIXME: Setup TestName here */ Status = STATUS_NOT_FOUND; + BufEnd = Buffer; /* Start loop */ do

5 years, 8 months

[reactos] 03/04: [LDR] Actually allocate what is asked for

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa912422e5c5ca4e7c396… commit aa912422e5c5ca4e7c396429d719101f8a08ea09 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 28 19:27:09 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jan 3 22:52:18 2019 +0100 [LDR] Actually allocate what is asked for --- dll/ntdll/ldr/ldrutils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 5b6e26abd9..4aa1cfb1c1 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -52,7 +52,7 @@ LdrpAllocateUnicodeString(IN OUT PUNICODE_STRING StringOut, /* Allocate the string*/ StringOut->Buffer = RtlAllocateHeap(LdrpHeap, 0, - StringOut->Length + sizeof(WCHAR)); + Length + sizeof(WCHAR)); if (!StringOut->Buffer) { /* Fail */ @@ -61,13 +61,13 @@ LdrpAllocateUnicodeString(IN OUT PUNICODE_STRING StringOut, } /* Null-terminate it */ - StringOut->Buffer[StringOut->Length / sizeof(WCHAR)] = UNICODE_NULL; + StringOut->Buffer[Length / sizeof(WCHAR)] = UNICODE_NULL; /* Check if this is a maximum-sized string */ - if (StringOut->Length != UNICODE_STRING_MAX_BYTES) + if (Length != UNICODE_STRING_MAX_BYTES) { /* It's not, so set the maximum length to be one char more */ - StringOut->MaximumLength = StringOut->Length + sizeof(UNICODE_NULL); + StringOut->MaximumLength = Length + sizeof(UNICODE_NULL); } else {

5 years, 8 months

[reactos] 02/04: [LDR] Don't dereference a possible nullptr on a malformed forwarded import

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e9cf62470c4b8cd5f721… commit 3e9cf62470c4b8cd5f7212c6bfe05d45bcaea4a2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 28 19:26:32 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jan 3 22:52:18 2019 +0100 [LDR] Don't dereference a possible nullptr on a malformed forwarded import --- dll/ntdll/ldr/ldrpe.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrpe.c b/dll/ntdll/ldr/ldrpe.c index d8d235b34b..1f7fa31236 100644 --- a/dll/ntdll/ldr/ldrpe.c +++ b/dll/ntdll/ldr/ldrpe.c @@ -962,7 +962,7 @@ LdrpSnapThunk(IN PVOID ExportBase, PIMAGE_IMPORT_BY_NAME AddressOfData; PULONG NameTable; PUSHORT OrdinalTable; - LPSTR ImportName = NULL; + LPSTR ImportName = NULL, DotPosition; USHORT Hint; NTSTATUS Status; ULONG_PTR HardErrorParameters[3]; @@ -1117,8 +1117,14 @@ FailurePath: { /* Get the Import and Forwarder Names */ ImportName = (LPSTR)Thunk->u1.Function; + + DotPosition = strchr(ImportName, '.'); + ASSERT(DotPosition != NULL); + if (!DotPosition) + goto FailurePath; + ForwarderName.Buffer = ImportName; - ForwarderName.Length = (USHORT)(strchr(ImportName, '.') - ImportName); + ForwarderName.Length = (USHORT)(DotPosition - ImportName); ForwarderName.MaximumLength = ForwarderName.Length; Status = RtlAnsiStringToUnicodeString(&TempUString, &ForwarderName,

5 years, 8 months

[reactos] 01/04: [LDR] Don't dereference a possible nullptr

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97d0595bf6810713b4a74… commit 97d0595bf6810713b4a74b2337e98d63496f2d81 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Dec 28 19:25:43 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jan 3 22:52:06 2019 +0100 [LDR] Don't dereference a possible nullptr --- dll/ntdll/ldr/ldrinit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index bc72c952cd..d28cb6e8a1 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -2135,8 +2135,10 @@ LdrpInitializeProcess(IN PCONTEXT Context, if (FreeCurDir) RtlFreeUnicodeString(&CurrentDirectory); } - /* Check if we should look for a .local file */ - if (ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_LOCAL_DLL_PATH) + /* Check if we should look for a .local file + FIXME: Thomas suggested that this check might actually be reversed, we should check this file + if the flag is NOT set. */ + if (ProcessParameters && (ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_LOCAL_DLL_PATH)) { /* FIXME */ DPRINT1("We don't support .local overrides yet\n");

5 years, 8 months

[reactos] 01/01: [OSK] Update translation files (#1189)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=760027783a6c8d5c8e23f… commit 760027783a6c8d5c8e23fb49addef4c694b8e672 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Jan 3 22:28:03 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 3 22:28:03 2019 +0100 [OSK] Update translation files (#1189) Translate the welcome dialog resource for Italian and Romanian. --- base/applications/osk/lang/it-IT.rc | 8 ++++---- base/applications/osk/lang/ro-RO.rc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 6448871909..e63092de54 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Tastiera visivo" +CAPTION "Tastiera a schermo" FONT 8, "MS Shell Dlg" STYLE WS_SYSMENU | WS_MINIMIZEBOX EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW @@ -129,13 +129,13 @@ END IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "On-Screen Keyboard" +CAPTION "Tastiera a schermo" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 - LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 - CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + LTEXT "La tastiera virtuale fornisce un livello minimo di funzionalità per gli utenti con mobilità ridotta. Gli utenti con mobilità ridotta hanno bisogno di questa programma con maggiore funzionalità per un uso giornaliero.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Non visualizzare più questo messaggio", IDC_SHOWWARNINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index d02d41f5e9..9b3d080aaa 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -129,13 +129,13 @@ END IDD_WARNINGDIALOG_OSK DIALOGEX 0, 0, 250, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "On-Screen Keyboard" +CAPTION "Tastatură virtuală" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 193, 76, 50, 14 ICON IDI_OSK, IDC_STATIC, 7, 17, 20, 20 - LTEXT "On-Screen Keyboard provides a minimum level of functionality for mobility-impaired users. Mobility-impaired users will need a utility program with higher functionality for daily use.", IDC_STATIC, 36, 7, 207, 33 - CONTROL "Do not show this message again", IDC_SHOWWARNINGCHECK, "Button", + LTEXT "Tastatura virtuală asigură un nivel minim de funcționalitate pentru utilizatori cu dizabilități. Utilizatori cu dizabilități au nevoie de un program cu o mai mare funcționalitate pentru un uz zilnic.", IDC_STATIC, 36, 7, 207, 33 + CONTROL "Nu mai afișa acest mesaj", IDC_SHOWWARNINGCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 43, 80, 137, 10 END

5 years, 8 months

[reactos] 01/01: [APPWIZ] Russian and Ukrainian Translations Update (#1215)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f759dddb4b2e75548c110… commit f759dddb4b2e75548c11005ed25c3b43cd0e49e8 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Thu Jan 3 23:20:40 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 3 22:20:40 2019 +0100 [APPWIZ] Russian and Ukrainian Translations Update (#1215) --- dll/cpl/appwiz/lang/ru-RU.rc | 6 +++--- dll/cpl/appwiz/lang/uk-UA.rc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 59b6710f9d..94a9bc76c3 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -82,7 +82,7 @@ BEGIN IDS_DWL_FAILED "Не удалось скачать пакет установки Gecko, проверьте ваше подключение к сети интернет. Установка будет продолжена без включения пакета Gecko." IDS_CANTMAKEINETSHORTCUT "Не удалось создать ярлык интернета." IDS_CANTMAKESHORTCUT "Не удалось создать ярлык." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" + IDS_NO_MEMORY "Невозможно выделить память." + IDS_NO_DIRECTORY "Не указано ни одного каталога!" + IDS_INVALID_PATH "Указанный путь неверен!" END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 4b5fef4fc2..c3ec10ceea 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -90,7 +90,7 @@ BEGIN IDS_DWL_FAILED "Не вдалося завантажити пакет встановки Gecko. Перевірте ваше підключення до мережі інтернет. Встановка буде продовжена без включення пакета Gecko." IDS_CANTMAKEINETSHORTCUT "Не вдалося створити ярлик інтернету." IDS_CANTMAKESHORTCUT "Не вдалося створити ярлик." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" + IDS_NO_MEMORY "Неможливо виділити пам'ять." + IDS_NO_DIRECTORY "Не вказано жодного каталогу!" + IDS_INVALID_PATH "Вказаний шлях недійсний!" END

5 years, 8 months

[reactos] 01/01: Addendum to 60f018ae: Remove obsolete DPRINTs and fix a DPRINT.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8be4a871b11c7df90c0ca… commit 8be4a871b11c7df90c0ca640ce3ad7c497902fcb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jan 3 20:59:20 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jan 3 21:32:33 2019 +0100 Addendum to 60f018ae: Remove obsolete DPRINTs and fix a DPRINT. --- drivers/bus/acpi/eval.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/bus/acpi/eval.c b/drivers/bus/acpi/eval.c index 2d338272e7..57aba36c68 100644 --- a/drivers/bus/acpi/eval.c +++ b/drivers/bus/acpi/eval.c @@ -19,7 +19,7 @@ GetPackageSize(ACPI_OBJECT *Package, { case ACPI_TYPE_INTEGER: Length = sizeof(ACPI_METHOD_ARGUMENT); - DPRINT("Integer %lu -> %lu: %lu (0x%lx)\n", sizeof(ULONG), Length, Package->Package.Elements[i].Integer.Value); + DPRINT("Integer %lu -> %lu: %lu\n", sizeof(ULONG), Length, Package->Package.Elements[i].Integer.Value); TotalLength += Length; break; @@ -186,7 +186,6 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, break; case ACPI_TYPE_PACKAGE: - DPRINT1("ACPI_TYPE_PACKAGE not supported yet!\n"); Status = GetPackageSize(Obj, &Count, &ExtraParamLength); if (!NT_SUCCESS(Status)) return Status; @@ -223,7 +222,6 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, break; case ACPI_TYPE_PACKAGE: - DPRINT1("ACPI_TYPE_PACKAGE not supported yet!\n"); Status = ConvertPackageArguments(OutputBuf->Argument, Obj); if (!NT_SUCCESS(Status)) return Status;

5 years, 8 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 January 2019