Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 03/03: [MMIXER] Fix overzealous asserts. CORE-16611

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bbc94c6ac2ea062d16bf… commit 2bbc94c6ac2ea062d16bf9b1ee20ba05920d9ed4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 12:40:38 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:08:27 2020 +0100 [MMIXER] Fix overzealous asserts. CORE-16611 MAXPNAMELEN is the size of the array, so if wcslen returns MAXPNAMELEN-1, the null terminator fits and everything is okay. --- sdk/lib/drivers/sound/mmixer/midi.c | 2 +- sdk/lib/drivers/sound/mmixer/wave.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/drivers/sound/mmixer/midi.c b/sdk/lib/drivers/sound/mmixer/midi.c index d659381de0b..969f252773a 100644 --- a/sdk/lib/drivers/sound/mmixer/midi.c +++ b/sdk/lib/drivers/sound/mmixer/midi.c @@ -72,7 +72,7 @@ MMixerAddMidiPin( MidiInfo->PinId = PinId; /* sanity check */ - ASSERT(!DeviceName || (wcslen(DeviceName) + 1 < MAXPNAMELEN)); + ASSERT(!DeviceName || (wcslen(DeviceName) < MAXPNAMELEN)); /* copy device name */ if (bInput && DeviceName) diff --git a/sdk/lib/drivers/sound/mmixer/wave.c b/sdk/lib/drivers/sound/mmixer/wave.c index 962934b8d5c..6326e3227d7 100644 --- a/sdk/lib/drivers/sound/mmixer/wave.c +++ b/sdk/lib/drivers/sound/mmixer/wave.c @@ -357,7 +357,7 @@ MMixerInitializeWaveInfo( WaveInfo->PinId = Pins[0]; /* sanity check */ - ASSERT(wcslen(DeviceName) + 1 < MAXPNAMELEN); + ASSERT(wcslen(DeviceName) < MAXPNAMELEN); /* copy device name */ if (bWaveIn)

4 years, 8 months

[reactos] 02/03: [MMIXER] Safely handle MMixerGetDeviceNameWithComponentId failure in MMixerInitializeFilter. CORE-16611

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=355700f45a42db5d14d05… commit 355700f45a42db5d14d051a9266003c26525b1da Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 12:40:23 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:08:27 2020 +0100 [MMIXER] Safely handle MMixerGetDeviceNameWithComponentId failure in MMixerInitializeFilter. CORE-16611 --- sdk/lib/drivers/sound/mmixer/controls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/lib/drivers/sound/mmixer/controls.c b/sdk/lib/drivers/sound/mmixer/controls.c index 376a443a7a8..684a44b37ab 100644 --- a/sdk/lib/drivers/sound/mmixer/controls.c +++ b/sdk/lib/drivers/sound/mmixer/controls.c @@ -1559,6 +1559,10 @@ MMixerInitializeFilter( { /* try get name with component id */ Status = MMixerGetDeviceNameWithComponentId(MixerContext, MixerData->hDevice, MixerInfo->MixCaps.szPname); + if (Status != MM_STATUS_SUCCESS) + { + MixerInfo->MixCaps.szPname[0] = L'\0'; + } } /* initialize line list */

4 years, 8 months

[reactos] 01/03: [MMIXER] Fix memory leak in MMixerGetDeviceNameWithComponentId. CORE-16611

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=756aa270b1d0d51d4af68… commit 756aa270b1d0d51d4af68393a9d13a690ba5e3e3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 12:35:41 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:08:27 2020 +0100 [MMIXER] Fix memory leak in MMixerGetDeviceNameWithComponentId. CORE-16611 --- sdk/lib/drivers/sound/mmixer/sup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/drivers/sound/mmixer/sup.c b/sdk/lib/drivers/sound/mmixer/sup.c index 99e0eeba8cc..06f342b12e8 100644 --- a/sdk/lib/drivers/sound/mmixer/sup.c +++ b/sdk/lib/drivers/sound/mmixer/sup.c @@ -838,6 +838,7 @@ MMixerGetDeviceNameWithComponentId( if (Status == MM_STATUS_SUCCESS) { MixerContext->Copy(OutDeviceName, DeviceName, min(ResultLength, (MAXPNAMELEN-1)*2)); + MixerContext->Free(DeviceName); } MixerContext->CloseKey(hGuidKey);

4 years, 8 months

[reactos] 03/03: [PORTCLS] Handle failure return from QueryPowerChangeState. CORE-16611

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4e86c32e7f119a7cd10d… commit e4e86c32e7f119a7cd10d8dd44c7af889c35036e Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 13:09:11 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:07:34 2020 +0100 [PORTCLS] Handle failure return from QueryPowerChangeState. CORE-16611 --- drivers/wdm/audio/backpln/portcls/irp.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/irp.cpp b/drivers/wdm/audio/backpln/portcls/irp.cpp index be4f008e655..8d775bfe493 100644 --- a/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/drivers/wdm/audio/backpln/portcls/irp.cpp @@ -267,8 +267,14 @@ PortClsPower( PowerState = IoStack->Parameters.Power.State; Status = DeviceExtension->AdapterPowerManagement->QueryPowerChangeState(PowerState); - // sanity check - PC_ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + // fail the IRP if the adapter power manager failed + PoStartNextPowerIrp(Irp); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } } // only forward query requests

4 years, 8 months

[reactos] 02/03: [PORTCLS] Return STATUS_PENDING after calling IoMarkIrpPending. CORE-16611

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a43c52bbbe600063097a… commit 5a43c52bbbe600063097a84134785b227f61d260 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 13:06:15 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:07:34 2020 +0100 [PORTCLS] Return STATUS_PENDING after calling IoMarkIrpPending. CORE-16611 --- drivers/wdm/audio/backpln/portcls/irp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/irp.cpp b/drivers/wdm/audio/backpln/portcls/irp.cpp index c1708c416c6..be4f008e655 100644 --- a/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/drivers/wdm/audio/backpln/portcls/irp.cpp @@ -325,7 +325,7 @@ PortClsPower( IoCompleteRequest(Irp, IO_NO_INCREMENT); // done - return Status; + return STATUS_PENDING; } // setup power context @@ -344,7 +344,7 @@ PortClsPower( IoCompleteRequest(Irp, IO_NO_INCREMENT); // done - return Status; + return STATUS_PENDING; } // done

4 years, 8 months

[reactos] 01/03: [PORTCLS] Don't unnecessarily wait for lower drivers to complete power IRPs. CORE-16611

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=606c912aa45b84e346de1… commit 606c912aa45b84e346de14181e7fdd433d9db667 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 1 13:03:37 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:07:34 2020 +0100 [PORTCLS] Don't unnecessarily wait for lower drivers to complete power IRPs. CORE-16611 Also use PoCallDriver to forward power IRPs. --- drivers/wdm/audio/backpln/portcls/irp.cpp | 51 +++++++++---------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/drivers/wdm/audio/backpln/portcls/irp.cpp b/drivers/wdm/audio/backpln/portcls/irp.cpp index aab59ca31fc..c1708c416c6 100644 --- a/drivers/wdm/audio/backpln/portcls/irp.cpp +++ b/drivers/wdm/audio/backpln/portcls/irp.cpp @@ -221,26 +221,17 @@ PortClsPower( // get currrent stack location IoStack = IoGetCurrentIrpStackLocation(Irp); + // get device extension + DeviceExtension = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + if (IoStack->MinorFunction != IRP_MN_SET_POWER && IoStack->MinorFunction != IRP_MN_QUERY_POWER) { - // just forward the request - Status = PcForwardIrpSynchronous(DeviceObject, Irp); - - // start next power irp + // forward unknown requests down the stack and forget PoStartNextPowerIrp(Irp); - - // complete request - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - // done - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->PrevDeviceObject, Irp); } - - // get device extension - DeviceExtension = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - // get current request type if (IoStack->Parameters.Power.Type == DevicePowerState) { @@ -250,8 +241,10 @@ PortClsPower( // nothing has changed if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) { - // only forward query requests - Status = PcForwardIrpSynchronous(DeviceObject, Irp); + // only forward query requests; we can forget about them + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->PrevDeviceObject, Irp); } // start next power irp @@ -279,17 +272,9 @@ PortClsPower( } // only forward query requests - PcForwardIrpSynchronous(DeviceObject, Irp); - - // start next power irp PoStartNextPowerIrp(Irp); - - // complete request - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - // done - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->PrevDeviceObject, Irp); } else { @@ -371,17 +356,9 @@ PortClsPower( DeviceExtension->SystemPowerState = IoStack->Parameters.Power.State.SystemState; // only forward query requests - Status = PcForwardIrpSynchronous(DeviceObject, Irp); - - // start next power irp PoStartNextPowerIrp(Irp); - - // complete request - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - // done - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->PrevDeviceObject, Irp); } } }

4 years, 8 months

[reactos] 01/01: [CRT] Only write to the output buffer when necessary in _strupr. CORE-16667

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e884290d292bf7ef9f013… commit e884290d292bf7ef9f013a3e44cda1aa0bcf02d5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Sep 8 15:23:32 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:04:12 2020 +0100 [CRT] Only write to the output buffer when necessary in _strupr. CORE-16667 Fixes crash in msvcrt_winetest:string. This is a hack and is supposed to be specific to the C locale. --- sdk/lib/crt/string/strupr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/lib/crt/string/strupr.c b/sdk/lib/crt/string/strupr.c index 126f8f25c62..25d84bbf78c 100644 --- a/sdk/lib/crt/string/strupr.c +++ b/sdk/lib/crt/string/strupr.c @@ -16,9 +16,13 @@ char * CDECL _strupr(char *x) { char *y=x; + char ch, upper; while (*y) { - *y=toupper(*y); + ch = *y; + upper = toupper(ch); + if (ch != upper) + *y = upper; y++; } return x;

4 years, 8 months

[reactos] 01/01: [NTOS:MM] Use POOL_BILLED_PROCESS_INVALID constant.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=feb7275bc84d4cd5d4b0e… commit feb7275bc84d4cd5d4b0e266bb2ba419ce98ea91 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 5 10:23:22 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Feb 8 13:00:32 2020 +0100 [NTOS:MM] Use POOL_BILLED_PROCESS_INVALID constant. --- ntoskrnl/mm/ARM3/expool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index bccb0e9bbdd..e5c3bfe007f 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -1826,7 +1826,7 @@ ExReturnPoolQuota(IN PVOID P) DPRINT1("Object %p is not a process. Type %u, pool type 0x%x, block size %u\n", Process, Process->Pcb.Header.Type, Entry->PoolType, BlockSize); KeBugCheckEx(BAD_POOL_CALLER, - 0x0D, + POOL_BILLED_PROCESS_INVALID, (ULONG_PTR)P, Entry->PoolTag, (ULONG_PTR)Process); @@ -2659,7 +2659,7 @@ ExFreePoolWithTag(IN PVOID P, DPRINT1("Object %p is not a process. Type %u, pool type 0x%x, block size %u\n", Process, Process->Pcb.Header.Type, Entry->PoolType, BlockSize); KeBugCheckEx(BAD_POOL_CALLER, - 0x0D, + POOL_BILLED_PROCESS_INVALID, (ULONG_PTR)P, Tag, (ULONG_PTR)Process);

4 years, 8 months

[reactos] 01/01: Update german translation (#2291)

by Aaron Dewes

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5813c4644c5a49f5e662… commit e5813c4644c5a49f5e662b73c1e75e280eaa47ea Author: Aaron Dewes <45715353+RaspberryPiFan2(a)users.noreply.github.com> AuthorDate: Sat Feb 8 12:55:53 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 8 12:55:53 2020 +0100 Update german translation (#2291) * Update German translations * Update translation again * More translations * Some fixes in the german translation * Some more fixes * Little translation tweak * Updates to 2nd review * Little update * Add back keyboard accel for IDS_OPENFILELOCATION. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/shell/cmd/lang/de-DE.rc | 2 +- dll/win32/samsrv/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 38 +++++++++++----------- .../screensavers/mazescr/lang/de-DE.rc | 14 ++++---- .../applications/sysutils/systeminfo/lang/de-DE.rc | 18 +++++----- .../rosapps/templates/old_wordpad/lang/de-DE.rc | 4 +-- win32ss/user/user32/lang/de-DE.rc | 6 ++-- .../user/winsrv/consrv/frontends/gui/lang/de-DE.rc | 4 +-- win32ss/user/winsrv/usersrv/lang/de-DE.rc | 16 ++++----- 9 files changed, 52 insertions(+), 52 deletions(-) diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index b5decb1d027..9dcb66dd67c 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -52,7 +52,7 @@ ERRORLEVEL wird auf den Offset der Taste, welche der Benutzer gedrückt hat, ges STRING_CMD_HELP5 " [Bash Dateinamen-Vervollständigung]" STRING_CMD_HELP6 " [Verzeichnis-Stack]" STRING_CMD_HELP7 " [Weiterleitung und Piping]" - STRING_CMD_HELP8 "Startet eine neue Instanz der ReactOS-Eingabeaufforderung.\n\n\ + STRING_CMD_HELP8 "Startet eine neue Instanz der ReactOS Eingabeaufforderung.\n\n\ CMD [/[C|K] Befehl][/P][/Q][/T:bf]\n\n\ /C Befehl Führt den Befehl in der Zeichenfolge aus. Anschließend\n\ wird diese Instanz beendet.\n\ diff --git a/dll/win32/samsrv/lang/de-DE.rc b/dll/win32/samsrv/lang/de-DE.rc index 7b26ba226e0..f550e153aaf 100644 --- a/dll/win32/samsrv/lang/de-DE.rc +++ b/dll/win32/samsrv/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_DOMAIN_BUILTIN_NAME "Builtin" + IDS_DOMAIN_BUILTIN_NAME "Standard" IDS_GROUP_NONE_NAME "Kein" IDS_GROUP_NONE_COMMENT "Gewöhnliche Benutzer" IDS_ALIAS_ADMINISTRATORS_NAME "Administratoren" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 80217e1f372..fa6b96ee04a 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -155,7 +155,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS wurde Ihnen zur Verfügung gestellt von:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "ReactOS wird Ihnen zur Verfügung gestellt von:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -767,17 +767,17 @@ BEGIN IDS_PASTE "Einfügen" IDS_EJECT "Auswerfen" IDS_DISCONNECT "Trennen" - IDS_OPENFILELOCATION "Open f&ile location" - IDS_DESKLINK "Desktop (Create shortcut)" - IDS_SENDTO_MENU "Se&nd To" - - IDS_MOVEERRORTITLE "Error Moving File or Folder" - IDS_COPYERRORTITLE "Error Copying File or Folder" - IDS_MOVEERRORSAMEFOLDER "Cannot move '%s': The destination folder is the same as the source folder." - IDS_MOVEERRORSAME "Cannot move '%s': The source and destination file names are the same." - IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." - IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_OPENFILELOCATION "Date&ipfad öffnen" + IDS_DESKLINK "Desktop (Verknüpfung erstellen)" + IDS_SENDTO_MENU "S&enden an" + + IDS_MOVEERRORTITLE "Fehler beim Verschieben der Datei/des Ordners" + IDS_COPYERRORTITLE "Fehler beim Kopieren der Datei/des Ordners" + IDS_MOVEERRORSAMEFOLDER "'%s' kann nicht verschoben werden: Quell- und Zielordner sind identisch." + IDS_MOVEERRORSAME "'%s' kann nicht verschoben werden: Quell- und Zieldatei sind identisch." + IDS_COPYERRORSAME "'%s' kann nicht kopiert werden: Quell- und Zieldatei sind identisch." + IDS_MOVEERRORSUBFOLDER "'%s' kann nicht verschoben werden: Der Zielorder ist ein Unterordner des Quellordners." + IDS_COPYERRORSUBFOLDER "'%s' kann nicht kopiert werden: Der Zielorder ist ein Unterordner des Quellordners." IDS_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." @@ -808,9 +808,9 @@ BEGIN IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" /* Format Dialog Strings */ - IDS_FORMAT_TITLE "Format Local Disk" - IDS_FORMAT_WARNING "WARNING: Formatting will erase ALL data on this disk.\nTo format the disk, click OK. To quit, click CANCEL." - IDS_FORMAT_COMPLETE "Format Complete." + IDS_FORMAT_TITLE "Lokalen Datenträger formatieren" + IDS_FORMAT_WARNING "ACHTUNG: Das Formatieren löscht ALLE Daten auf dem Datenträger.\nKlicken Sie auf OK zum Formatieren. Klicken Sie auf ABBRECHEN zum Beenden." + IDS_FORMAT_COMPLETE "Formatieren abgeschlossen." /* Run File dialog */ IDS_RUNDLG_ERROR "Anzeigen der Datei Ausführen Dialogbox nicht möglich (interner Fehler)" @@ -887,15 +887,15 @@ BEGIN IDS_DIRECTORY "Dateiordner" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" IDS_CMD_FILE "ReactOS-Befehlsskript" - IDS_COM_FILE "DOS Anwendung" + IDS_COM_FILE "DOS-Anwendung" IDS_CPL_FILE "Systemsteuerungselement" IDS_CUR_FILE "Cursor" - IDS_DB__FILE "Database File" + IDS_DB__FILE "Datenbankdatei" IDS_DLL_FILE "Programmbibliothek" IDS_DRV_FILE "Gerätetreiber" IDS_EFI_FILE "Extensible Firmware Interface Executable" IDS_EXE_FILE "Anwendung" - IDS_NLS_FILE "National Language Support File" + IDS_NLS_FILE "Sprachenunterstützungsdatei" IDS_OCX_FILE "ActiveX Control" IDS_TLB_FILE "Type Library" IDS_FON_FILE "Schriftartendatei" @@ -905,7 +905,7 @@ BEGIN IDS_ICO_FILE "Icon" IDS_INI_FILE "Konfigurationseinstellungen" IDS_LNK_FILE "Verknüpfung" - IDS_NT__FILE "NT DOS32 Configuration File" + IDS_NT__FILE "NT DOS32 Konfigurationsdatei" IDS_PIF_FILE "NT VDM Programminformationsdatei" IDS_SCR_FILE "Bildschirmschoner" IDS_SYS_FILE "Systemdatei" diff --git a/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc b/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc index 4f6d582db6a..18044f0eed0 100644 --- a/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc +++ b/modules/rosapps/applications/screensavers/mazescr/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 276, 112 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Maze Bildschirmschoner Einstellungen" +CAPTION "Labyrinth Bildschirmschoner Einstellungen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Labyrinthgröße:",IDC_STATIC,7,7,90,12,SS_CENTERIMAGE @@ -27,19 +27,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Über" FONT 8, "MS Shell Dlg" BEGIN - CTEXT "Maze Bildschirmschoner 1.0",IDC_STATIC,7,7,215,9 - LTEXT "[06-21-85] Martin Weiss - Original Code",IDC_STATIC,7,20,215,8 + CTEXT "Labyrinth Bildschirmschoner 1.0",IDC_STATIC,7,7,215,9 + LTEXT "[06-21-85] Martin Weiss - Originalcode",IDC_STATIC,7,20,215,8 LTEXT "[01-29-88] Dave Lemke - Hacked für X11",IDC_STATIC,7,29,215,8 LTEXT "[10-04-88] Richard Hess - UnHacked für X11",IDC_STATIC,7,38,215,8 LTEXT "[03-03-93] Jim Randell - UnHacked für X11",IDC_STATIC,7,47,215,8 - LTEXT "[03-07-93] Jamie Zawinski - Bereinigung und Code Sauberkeit",IDC_STATIC,7,56,215,8 - LTEXT "[10-08-94] Ge van Geldorp - Portiert auf Windows",IDC_STATIC,7,65,215,8 - LTEXT "[08-15-03] Ge van Geldorp - Portiert auf ReactOS",IDC_STATIC,7,74,215,8 + LTEXT "[03-07-93] Jamie Zawinski - Bereinigung und Codesauberkeit",IDC_STATIC,7,56,215,8 + LTEXT "[10-08-94] Ge van Geldorp - Portierung auf Windows",IDC_STATIC,7,65,215,8 + LTEXT "[08-15-03] Ge van Geldorp - Portierung auf ReactOS",IDC_STATIC,7,74,215,8 CTEXT "R.I.P. Ge van Geldorp, wir vermissen dich!",IDC_STATIC,7,87,215,10,SS_SUNKEN DEFPUSHBUTTON "OK",IDOK,87,100,56,14 END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Maze Bildschirmschoner" + IDS_DESCRIPTION "Labyrinth Bildschirmschoner" END diff --git a/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc b/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc index 78616219ef1..d6d37a98fe8 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc +++ b/modules/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc @@ -40,10 +40,10 @@ IDS_REG_OWNER, "Registrierter Benutzer" IDS_REG_ORG, "Registrierte Organisation" IDS_PRODUCT_ID, "Produkt ID" IDS_INST_DATE, "Installationsdatum" -IDS_UP_TIME, "System Up Time" -IDS_UP_TIME_FORMAT, "%u Days, %u Hours, %u Minutes, %u Seconds" -IDS_SYS_MANUFACTURER, "System Manufacturer" -IDS_SYS_MODEL, "System Model" +IDS_UP_TIME, "Betriebszeit" +IDS_UP_TIME_FORMAT, "%u Tage, %u Stunden, %u Minuten, %u Sekunden" +IDS_SYS_MANUFACTURER, "Systemhersteller" +IDS_SYS_MODEL, "Systemmodell" IDS_SYS_TYPE, "Systemtyp" IDS_PROCESSORS, "Prozessor(en)" IDS_PROCESSORS_FORMAT, "%u Prozessor(en) Installiert." @@ -64,11 +64,11 @@ IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e): %s" IDS_DOMAIN, "Domain" IDS_NETWORK_CARDS, "Netzwerkkarte(n)" IDS_NETWORK_CARDS_FORMAT, "%u Installiert." -IDS_CONNECTION_NAME, "Connection Name" +IDS_CONNECTION_NAME, "Verbindungsname" IDS_STATUS, "Status" -IDS_MEDIA_DISCONNECTED, "Media disconnected" -IDS_DHCP_ENABLED, "DHCP Enabled" -IDS_NO, "No" -IDS_IP_ADDRESSES, "IP address(es)" +IDS_MEDIA_DISCONNECTED, "Medium getrennt" +IDS_DHCP_ENABLED, "DHCP Aktiviert" +IDS_NO, "Nein" +IDS_IP_ADDRESSES, "IP-Addresse(n)" END diff --git a/modules/rosapps/templates/old_wordpad/lang/de-DE.rc b/modules/rosapps/templates/old_wordpad/lang/de-DE.rc index 23c26a29f31..a2c21b9ee1f 100644 --- a/modules/rosapps/templates/old_wordpad/lang/de-DE.rc +++ b/modules/rosapps/templates/old_wordpad/lang/de-DE.rc @@ -146,7 +146,7 @@ BEGIN IDS_HINT_NEW " Erstellt iin neues Dokument." IDS_HINT_OPEN " Öffnet ein vorhandenes Dokument." IDS_HINT_CLOSE " Schließt dieses Fenster." - IDS_HINT_CLOSEALL " Schliueßt alle Fenster." + IDS_HINT_CLOSEALL " Schließt alle Fenster." IDS_HINT_SAVE " Speichert das aktive Dokument." IDS_HINT_SAVEAS " Speichert das aktive Dokument unter einem neuen Namen." IDS_HINT_PRINT " Druckt das aktive Dokument." @@ -161,7 +161,7 @@ BEGIN IDS_HINT_NEXT " Aktiviert das nächste Fenster." IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale Größe wiederherstellen." - IDS_HINT_SYS_MOVE " Dieses fenster bewegen." + IDS_HINT_SYS_MOVE " Dieses Fenster bewegen." IDS_HINT_SYS_SIZE " Größe dieses Fensters verändern." IDS_HINT_SYS_MINIMIZE " Dieses Fenster auf Symbolgröße verkleinern." IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Vollbildgröße vergrößern." diff --git a/win32ss/user/user32/lang/de-DE.rc b/win32ss/user/user32/lang/de-DE.rc index 1b666388a6a..d34af7fb04a 100644 --- a/win32ss/user/user32/lang/de-DE.rc +++ b/win32ss/user/user32/lang/de-DE.rc @@ -60,9 +60,9 @@ END STRINGTABLE BEGIN IDS_ERROR "Fehler" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" - IDS_HUNG_UP_TITLE "Hung up!" + IDS_NOT_RESPONDING " (Reagiert nicht)" + IDS_ASK_TERMINATE "Diese Anwendung reagiert nicht. Möchten Sie diesen Prozess beenden?" + IDS_HUNG_UP_TITLE "Abgestürzt!" IDS_OK "OK" IDS_CANCEL "Abbrechen" IDS_ABORT "&Abbrechen" diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc index 31ee03f3cd8..4283021d0ce 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc +++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc @@ -25,6 +25,6 @@ END STRINGTABLE BEGIN - IDS_MARK_TITLE "Mark" - IDS_SELECT_TITLE "Select" + IDS_MARK_TITLE "Markieren" + IDS_SELECT_TITLE "Auswählen" END diff --git a/win32ss/user/winsrv/usersrv/lang/de-DE.rc b/win32ss/user/winsrv/usersrv/lang/de-DE.rc index 8d854f06c36..7052cb7dcc9 100644 --- a/win32ss/user/winsrv/usersrv/lang/de-DE.rc +++ b/win32ss/user/winsrv/usersrv/lang/de-DE.rc @@ -26,16 +26,16 @@ END STRINGTABLE BEGIN - IDS_SEVERITY_SUCCESS "Success" - IDS_SEVERITY_INFORMATIONAL "System Information" - IDS_SEVERITY_WARNING "System Warning" - IDS_SEVERITY_ERROR "System Error" + IDS_SEVERITY_SUCCESS "Erfolgreich" + IDS_SEVERITY_INFORMATIONAL "Systeminformation" + IDS_SEVERITY_WARNING "Systemwarnung" + IDS_SEVERITY_ERROR "Systemfehler" END STRINGTABLE BEGIN - IDS_SYSTEM_PROCESS "System Process" - IDS_UNKNOWN_SOFTWARE_EXCEPT "unknown software exception" - IDS_OK_TERMINATE_PROGRAM "Click on OK to terminate the program." - IDS_CANCEL_DEBUG_PROGRAM "Click on CANCEL to debug the program." + IDS_SYSTEM_PROCESS "Systemprozess" + IDS_UNKNOWN_SOFTWARE_EXCEPT "Unbekannter Softwarefehler" + IDS_OK_TERMINATE_PROGRAM "Klicken Sie auf OK, um das Programm zu schließen." + IDS_CANCEL_DEBUG_PROGRAM "Klicken Sie auf ABBRECHEN, um das Programm zu debuggen." END

4 years, 8 months

[reactos] 01/01: [ISAPNP] Correctly calculate checksum

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40b2f65f0c8a2836bf958… commit 40b2f65f0c8a2836bf9589860d23377160eb3946 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Feb 7 23:48:22 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Feb 7 23:48:53 2020 +0100 [ISAPNP] Correctly calculate checksum See appendix B.2 of "Plug and Play ISA Specification 1.0a" --- drivers/bus/isapnp/hardware.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index c578270379b..0e735f10312 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -178,10 +178,10 @@ HwDelay(VOID) static inline -USHORT -NextLFSR(USHORT Lfsr, USHORT InputBit) +UCHAR +NextLFSR(UCHAR Lfsr, UCHAR InputBit) { - ULONG NextLfsr = Lfsr >> 1; + UCHAR NextLfsr = Lfsr >> 1; NextLfsr |= (((Lfsr ^ NextLfsr) ^ InputBit)) << 7; @@ -192,7 +192,7 @@ static VOID SendKey(VOID) { - USHORT i, Lfsr; + UCHAR i, Lfsr; HwDelay(); WriteAddress(0x00); @@ -241,7 +241,7 @@ static USHORT IsaPnpChecksum(PISAPNP_IDENTIFIER Identifier) { - USHORT i,j, Lfsr, Byte; + UCHAR i, j, Lfsr, Byte; Lfsr = ISAPNP_LFSR_SEED; for (i = 0; i < 8; i++)

4 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 February 2020