Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 01/01: [SHELL32] Run Dialog Text Fix

by Shy Zedaka

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3944563c34ed5b2b6aa5… commit a3944563c34ed5b2b6aa56507017afc6d53a99e5 Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Sun Aug 4 23:54:51 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 20:03:55 2019 +0200 [SHELL32] Run Dialog Text Fix --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index f0e31d51e3f..66935c43133 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -169,7 +169,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Напишете името на приложение, папка, документ или интернет източник и РеактОС ще го отвори.", 12289, 36, 11, 182, 18 + LTEXT "Напишете името на приложение, папка, документ или интернет източник и РеактОС ще го отвори.", 12289, 36, 11, 185, 18 LTEXT "&Отваряне:", 12305, 7, 39, 40, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 46, 37, 174, 100 DEFPUSHBUTTON "Добре", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 2153e26e6a7..a8df7f1d04c 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 545c5e972b7..7df419e9e25 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -174,7 +174,7 @@ CAPTION "Spustit" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet a ReactOS jej pro vás otevře.", 12289, 36, 11, 182, 18 + LTEXT "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet a ReactOS jej pro vás otevře.", 12289, 36, 11, 185, 18 LTEXT "&Otevřít:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index a56235c52bf..58cb3d542cf 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -174,7 +174,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal åbne for dig.", 12289, 36, 4, 182, 26 + LTEXT "Indtast navnet på det program, mappe, dokument, eller Internet Ressourcer, du vil have at ReactOS skal åbne for dig.", 12289, 36, 4, 185, 26 LTEXT "&Åbn:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index b7ce728a5d8..c27ddcc3605 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -168,7 +168,7 @@ CAPTION "Ausführen" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 182, 18 + LTEXT "Geben Sie den Namen eines Programms, eines Ordners, eines Dokuments oder einer Internetressource an.", 12289, 36, 11, 185, 18 LTEXT "&Öffnen:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index a876002dbb9..2f54284ad72 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Πληκτρολογήστε το όνομα ενός προγράμματος, φακέλου, εγγράφου, ή πόρου του διαδυκτίου, και το ReactOS θα το ανοίξει.", 12289, 36, 4, 182, 25 + LTEXT "Πληκτρολογήστε το όνομα ενός προγράμματος, φακέλου, εγγράφου, ή πόρου του διαδυκτίου, και το ReactOS θα το ανοίξει.", 12289, 36, 4, 185, 25 LTEXT "Ά&νοιγμα:", 12305, 5, 39, 31, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index f131e8b1bc9..bd6f5bf13f0 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c6e44d96579..ab0e99822f0 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 7cf3a777112..99a3f9fe8fc 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -176,7 +176,7 @@ CAPTION "Ejecutar" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 182, 24 + LTEXT "Escriba el nombre de un programa, carpeta, documento o recurso de Internet y ReactOS lo abrirá para usted.", 12289, 36, 11, 185, 24 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "Aceptar", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index db90fb67e79..e3f70243acc 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -175,7 +175,7 @@ CAPTION "Käivitus" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 182, 18 + LTEXT "Kirjuta programmi, kausta, dokumendi või Interneti-ressursi nimi ja ReactOS avab selle.", 12289, 36, 11, 185, 18 LTEXT "&Ava:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index aeff7c4c89b..d45b70b30b4 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 182, 18 + LTEXT "Anna ohjelma, dokumentti, tai Internet -ressurssi, ja ReactOS avaa sen Sinulle.", 12289, 36, 11, 185, 18 LTEXT "&Avaa:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index c735210e0e5..50cbedfd9a0 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -168,7 +168,7 @@ CAPTION "Exécuter" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 4, 182, 26 + LTEXT "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource Internet, et ReactOS l'ouvrira pour vous.", 12289, 36, 4, 185, 26 LTEXT "&Ouvrir :", 12305, 7, 39, 26, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 41202f52043..10d651995c6 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -168,7 +168,7 @@ CAPTION "रन" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "किसी भी प्रोग्राम, फ़ोल्डर, दस्तावेज़ या इंटरनेट संसाधन का नाम टाइप करें, और रिऐक्ट ओएस इसे आपके लिए खोल देगा।", 12289, 36, 11, 182, 18 + LTEXT "किसी भी प्रोग्राम, फ़ोल्डर, दस्तावेज़ या इंटरनेट संसाधन का नाम टाइप करें, और रिऐक्ट ओएस इसे आपके लिए खोल देगा।", 12289, 36, 11, 185, 18 LTEXT "&खोलो:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "ओके", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 517757aa5e8..c53607bca99 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Írd be a program nevét, egy mappáét, dokumentumét, vagy egy Internet címet, és a ReactOS megnyitja.", 12289, 36, 11, 182, 18 + LTEXT "Írd be a program nevét, egy mappáét, dokumentumét, vagy egy Internet címet, és a ReactOS megnyitja.", 12289, 36, 11, 185, 18 LTEXT "&Megnyitás:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 9554b6e5160..8816f1b0d4d 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 182, 18 + LTEXT "Digitare il nome del programma, della cartella, del documento o della risorsa Internet, e ReactOS la aprirà.", 12289, 36, 11, 185, 18 LTEXT "&Apri:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index e2dc4a5b2f2..c6e8f3fb974 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -168,7 +168,7 @@ CAPTION "実行" FONT 9, "MS UI Gothic" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "実行するプログラム名、または開くフォルダや文書名、インターネットリソース名を入力してください。", 12289, 36, 11, 182, 18 + LTEXT "実行するプログラム名、または開くフォルダや文書名、インターネットリソース名を入力してください。", 12289, 36, 11, 185, 18 LTEXT "名前(&O):", 12305, 7, 39, 27, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 731b8530e74..1f959484194 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 9, "굴림" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 + LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 185, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 0adeadbeb4a..2253aa474c7 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 182, 18 + LTEXT "Geef de naam van een programma, map, document, of Internet-adres op. ReactOS zal het vervolgens openen.", 12289, 36, 11, 185, 18 LTEXT "&Openen:", 12305, 7, 39, 28, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 405d41ca157..befbb8ec170 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -168,7 +168,7 @@ CAPTION "Kjør" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 182, 18 + LTEXT "Skriv inn navnet på programmet, mappen, dokumentet etter Internett-ressursen du ønsker å åpne.", 12289, 36, 11, 185, 18 LTEXT "&Åpne:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 81471353f59..ca4888efba8 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -173,7 +173,7 @@ CAPTION "Uruchamianie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Wpisz nazwę programu, folderu, katalogu lub zasobu internetowego a zostanie on otwarty przez system ReactOS.", 12289, 36, 11, 182, 18 + LTEXT "Wpisz nazwę programu, folderu, katalogu lub zasobu internetowego a zostanie on otwarty przez system ReactOS.", 12289, 36, 11, 185, 18 LTEXT "&Otwórz:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 2cf3ca3d91b..75de4889eae 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo para você.", 12289, 36, 11, 182, 18 + LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo para você.", 12289, 36, 11, 185, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 75217661774..e3101314a54 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo.", 12289, 36, 11, 182, 18 + LTEXT "Digite o nome do programa, pasta, documento, ou endereço Internet, que o ReactOS irá abrí-lo.", 12289, 36, 11, 185, 18 LTEXT "&Abrir:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index c240a1ffc43..b38c1cdb31e 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -170,7 +170,7 @@ CAPTION "Executare" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Tastați numele unui program, dosar, document, sau a unei resurse de Internet, în vederea deschiderii în ReactOS.", 12289, 36, 4, 182, 26 + LTEXT "Tastați numele unui program, dosar, document, sau a unei resurse de Internet, în vederea deschiderii în ReactOS.", 12289, 36, 4, 185, 26 LTEXT "&Deschide:", 12305, 7, 39, 33, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 41, 37, 179, 100 DEFPUSHBUTTON "Con&firmă", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index bb4c4739f5c..cb72c7e7da1 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -175,7 +175,7 @@ CAPTION "Выполнить" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Введите имя программы, папки, документа или ресурс Интернета, и ReactOS откроет их.", 12289, 36, 11, 182, 18 + LTEXT "Введите имя программы, папки, документа или ресурс Интернета, и ReactOS откроет их.", 12289, 36, 11, 185, 18 LTEXT "&Открыть:", 12305, 7, 39, 34, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 177, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index cbf72b27f09..4801c057129 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -168,7 +168,7 @@ CAPTION "Spustenie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Zadajte názov programu, priečinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí.", 12289, 36, 11, 182, 18 + LTEXT "Zadajte názov programu, priečinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí.", 12289, 36, 11, 185, 18 LTEXT "&Otvoriť:", 12305, 7, 39, 28, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 39, 37, 181, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 9ae2492e694..8865ff95873 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -168,7 +168,7 @@ CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 182, 18 + LTEXT "Vnesite ime programa, mape, dokumenta ali spletne strani, in ReactOS ga (jo) bo odprl.", 12289, 36, 11, 185, 18 LTEXT "&Odpri:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "V redu", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 894df616f8e..6bd6e06a641 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -172,7 +172,7 @@ CAPTION "Ekzekuto" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Shkruaj emrin e një programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do të hap atë për ju.", 12289, 36, 11, 182, 18 + LTEXT "Shkruaj emrin e një programi, dosje, dokumenti, apo burim interneti, dhe ReactOS do të hap atë për ju.", 12289, 36, 11, 185, 18 LTEXT "&Hap:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 36, 70, 59, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 5bd672219da..21d140c3078 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -168,7 +168,7 @@ CAPTION "Kör" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet på ett program, en mapp, ett dokument eller en internetresurs som du vill öppna.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet på ett program, en mapp, ett dokument eller en internetresurs som du vill öppna.", 12289, 36, 11, 185, 18 LTEXT "&Öppna:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 707daa2bb5b..672d522488d 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -170,7 +170,7 @@ CAPTION "Çalıştır" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Bir izlencenin, dizinin, belgenin veyâ Umûmî Ağ kaynağının adını yazınız, ReactOS onu sizin için açacaktır.", 12289, 36, 11, 182, 18 + LTEXT "Bir izlencenin, dizinin, belgenin veyâ Umûmî Ağ kaynağının adını yazınız, ReactOS onu sizin için açacaktır.", 12289, 36, 11, 185, 18 LTEXT "&Aç:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "Tamam", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 44bf966633b..7c1de4f9dcd 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -168,7 +168,7 @@ CAPTION "Виконати" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Введіть ім'я програми, папки, документа або ресурсу Інтернету, і ReactOS відкриє їх.", 12289, 36, 11, 182, 18 + LTEXT "Введіть ім'я програми, папки, документа або ресурсу Інтернету, і ReactOS відкриє їх.", 12289, 36, 11, 185, 18 LTEXT "&Відкрити:", 12305, 7, 39, 32, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 43, 37, 177, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 8dc96b14aa9..c8422233f31 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -178,7 +178,7 @@ CAPTION "运行" FONT 9, "宋体" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "请输入程序、目录、文件或 Internet 资源名，ReactOS 将为您打开它。", 12289, 36, 11, 182, 18 + LTEXT "请输入程序、目录、文件或 Internet 资源名，ReactOS 将为您打开它。", 12289, 36, 11, 185, 18 LTEXT "打开(&O):", 12305, 7, 39, 32, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 42, 37, 178, 100 DEFPUSHBUTTON "确定", IDOK, 62, 70, 50, 14, WS_TABSTOP diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index c0318181a0c..23d31c02a43 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -177,7 +177,7 @@ CAPTION "執行" FONT 9, "新細明體" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "請輸入程式、資料夾、文件或網際網路的资源名稱，ReactOS 將幫助您開啟。", 12289, 36, 11, 182, 18 + LTEXT "請輸入程式、資料夾、文件或網際網路的资源名稱，ReactOS 將幫助您開啟。", 12289, 36, 11, 185, 18 LTEXT "開啟(&O):", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 184, 100 DEFPUSHBUTTON "確定", IDOK, 36, 70, 59, 14, WS_TABSTOP

5 years, 1 month

[reactos] 01/01: [TASKMGR] Implement proper process tree ending

by Paweł Cholewa

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3276824586fefd531f447… commit 3276824586fefd531f4473046618fa2724442a53 Author: Paweł Cholewa <DaMcpg(a)protonmail.com> AuthorDate: Thu Aug 15 19:07:05 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 19:07:05 2019 +0200 [TASKMGR] Implement proper process tree ending * Implement ShutdownProcessTree in endproc.c which recursively kills process trees * Include tlhelp32.h in precomp.h * Check if the child process can be shut down --- base/applications/taskmgr/endproc.c | 53 ++++++++++++++++++++++++++++++++++++- base/applications/taskmgr/precomp.h | 1 + 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/base/applications/taskmgr/endproc.c b/base/applications/taskmgr/endproc.c index 04d194cafa2..74ce95f3480 100644 --- a/base/applications/taskmgr/endproc.c +++ b/base/applications/taskmgr/endproc.c @@ -107,6 +107,57 @@ BOOL IsCriticalProcess(HANDLE hProcess) return FALSE; } +BOOL ShutdownProcessTreeHelper(HANDLE hSnapshot, HANDLE hParentProcess, DWORD dwParentPID) +{ + HANDLE hChildHandle; + PROCESSENTRY32W ProcessEntry = {0}; + ProcessEntry.dwSize = sizeof(ProcessEntry); + + if (Process32FirstW(hSnapshot, &ProcessEntry)) + { + do + { + if (ProcessEntry.th32ParentProcessID == dwParentPID) + { + hChildHandle = OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION, + FALSE, + ProcessEntry.th32ProcessID); + if (!hChildHandle || IsCriticalProcess(hChildHandle)) + { + if (hChildHandle) + { + CloseHandle(hChildHandle); + } + continue; + } + if (!ShutdownProcessTreeHelper(hSnapshot, hChildHandle, ProcessEntry.th32ProcessID)) + { + CloseHandle(hChildHandle); + return FALSE; + } + CloseHandle(hChildHandle); + } + } while (Process32NextW(hSnapshot, &ProcessEntry)); + } + + return TerminateProcess(hParentProcess, 0); +} + +BOOL ShutdownProcessTree(HANDLE hParentProcess, DWORD dwParentPID) +{ + HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + BOOL bResult; + + if (!hSnapshot) + { + return FALSE; + } + + bResult = ShutdownProcessTreeHelper(hSnapshot, hParentProcess, dwParentPID); + CloseHandle(hSnapshot); + return bResult; +} + void ProcessPage_OnEndProcessTree(void) { DWORD dwProcessId; @@ -147,7 +198,7 @@ void ProcessPage_OnEndProcessTree(void) return; } - if (!TerminateProcess(hProcess, 0)) + if (!ShutdownProcessTree(hProcess, dwProcessId)) { GetLastErrorText(strErrorText, 260); LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index f6bc6813170..d929d4c33f6 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -18,6 +18,7 @@ #include <winreg.h> #include <commctrl.h> #include <shellapi.h> +#include <tlhelp32.h> #include "column.h" #include "taskmgr.h"

5 years, 1 month

[reactos] 01/01: [NTOSKRNL] Move DPRINT1("Thread wants too much stack\n") around

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66bf74d228c9d6443c840… commit 66bf74d228c9d6443c8408ae6d37ae7c43251f29 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Apr 25 03:22:16 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:18:59 2019 +0200 [NTOSKRNL] Move DPRINT1("Thread wants too much stack\n") around To KiUserModeCallout() from MmGrowKernelStackEx(). As suggested by Thomas Faber: "MmGrowKernelStackEx really shouldn't be DPRINT'ing." CORE-14494 --- ntoskrnl/ke/i386/usercall.c | 10 +++++++++- ntoskrnl/mm/ARM3/procsup.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/i386/usercall.c b/ntoskrnl/ke/i386/usercall.c index 8fbed380bb9..8f59f7dc103 100644 --- a/ntoskrnl/ke/i386/usercall.c +++ b/ntoskrnl/ke/i386/usercall.c @@ -282,7 +282,15 @@ KiUserModeCallout(PKCALLOUT_FRAME CalloutFrame) Status = MmGrowKernelStack((PVOID)InitialStack); /* Quit if we failed */ - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_STACK_OVERFLOW) + { + DPRINT1("Thread wants too much stack\n"); + } + + return Status; + } } /* Save the current callback stack and initial stack */ diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index cbc784066a0..6407b7896d0 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -405,7 +405,6 @@ MmGrowKernelStackEx(IN PVOID StackPointer, // // Sorry! // - DPRINT1("Thread wants too much stack\n"); return STATUS_STACK_OVERFLOW; }

5 years, 1 month

[reactos] 13/13: [FREELDR] Improve debug output

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbb7ad6f5b34b2d0f07a5… commit cbb7ad6f5b34b2d0f07a5ff9777cc0d97d8a117b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 27 09:58:38 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [FREELDR] Improve debug output --- boot/freeldr/freeldr/lib/peloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index cf90eb851e7..bd4e66573d9 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -287,7 +287,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - WARN("Error while opening '%s', Status: %u\n", FileName, Status); + ERR("ArcOpen(FileName: \"%s\", OpenReadOnly: %u) failed. Status %u\n", FileName, OpenReadOnly, Status); return FALSE; } @@ -295,7 +295,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { - WARN("Error while reading '%s', Status: %u\n", FileName, Status); + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); UiMessageBox("Error reading from file."); ArcClose(FileId); return FALSE; @@ -305,7 +305,7 @@ WinLdrLoadImage(IN PCHAR FileName, NtHeaders = RtlImageNtHeader(HeadersBuffer); if (!NtHeaders) { - // Print(L"Error - no NT header found in %s\n", FileName); + ERR("No NT header found in \"%s\"\n", FileName); UiMessageBox("Error - no NT header found."); ArcClose(FileId); return FALSE; @@ -314,7 +314,7 @@ WinLdrLoadImage(IN PCHAR FileName, /* Ensure this is executable image */ if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) { - // Print(L"Not an executable image %s\n", FileName); + ERR("Not an executable image \"%s\"\n", FileName); UiMessageBox("Not an executable image."); ArcClose(FileId); return FALSE; @@ -336,7 +336,7 @@ WinLdrLoadImage(IN PCHAR FileName, if (PhysicalBase == NULL) { - // Print(L"Failed to alloc pages for image %s\n", FileName); + ERR("Failed to alloc %lu bytes for image %s\n", NtHeaders->OptionalHeader.SizeOfImage, FileName); UiMessageBox("Failed to alloc pages for image."); ArcClose(FileId); return FALSE; @@ -353,7 +353,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcSeek(FileId, &Position, SeekAbsolute); if (Status != ESUCCESS) { - WARN("Error while seeking '%s', Status: %u\n", FileName, Status); + ERR("ArcSeek(File: '%s') failed. Status: 0x%lx\n", FileName, Status); UiMessageBox("Error seeking the start of a file."); ArcClose(FileId); return FALSE; @@ -362,7 +362,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); if (Status != ESUCCESS) { - WARN("Error while reading '%s', Status: %u\n", FileName, Status); + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); UiMessageBox("Error reading headers."); ArcClose(FileId); return FALSE;

5 years, 1 month

[reactos] 12/13: [NTOS:MM] MmSizeOfSystemCacheInPages is ULONG_PTR, not ULONG

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de679e8f334e565946f2c… commit de679e8f334e565946f2ce32390780b7c95ba5a2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 27 09:32:29 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:MM] MmSizeOfSystemCacheInPages is ULONG_PTR, not ULONG Fixes failed assertion on x64. --- ntoskrnl/mm/ARM3/mminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index 5e4bc303e01..f1d7c2b7e95 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -242,7 +242,7 @@ PMMPTE MiHighestUserPxe; /* These variables define the system cache address space */ PVOID MmSystemCacheStart = (PVOID)MI_SYSTEM_CACHE_START; PVOID MmSystemCacheEnd; -ULONG MmSizeOfSystemCacheInPages; +ULONG_PTR MmSizeOfSystemCacheInPages; MMSUPPORT MmSystemCacheWs; //

5 years, 1 month

[reactos] 11/13: [NTOS:KE:I386] Fix parameter description for KiSwapContext

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adcae016c5ef76ed03a3b… commit adcae016c5ef76ed03a3b0b1fa3afd7b16f393ac Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 27 18:05:55 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:KE:I386] Fix parameter description for KiSwapContext --- ntoskrnl/ke/i386/ctxswitch.S | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/ke/i386/ctxswitch.S b/ntoskrnl/ke/i386/ctxswitch.S index 1151a021b14..b680195d19d 100644 --- a/ntoskrnl/ke/i386/ctxswitch.S +++ b/ntoskrnl/ke/i386/ctxswitch.S @@ -29,13 +29,10 @@ EXTERN _KeI386FxsrPresent:DWORD * \brief * The KiSwapContextInternal routine switches context to another thread. * - * BOOLEAN USERCALL KiSwapContextInternal(); + * BOOLEAN USERCALL KiSwapContextInternal(ULONG_PTR OldThreadAndApcFlag@<edx>); * - * Params: - * ESI - Pointer to the KTHREAD to which the caller wishes to - * switch to. - * EDI - Pointer to the KTHREAD to which the caller wishes to - * switch from. + * \param OldThreadAndApcFlag@<edx> + * Pointer to the current thread with the lowest bit set to the current IRQL. * * \returns * APC state. @@ -59,14 +56,14 @@ PUBLIC @KiSwapContextInternal@0 * The KiSwapContext routine switches context to another thread. * * BOOLEAN FASTCALL - * KiSwapContext(PKTHREAD CurrentThread, PKTHREAD TargetThread); + * KiSwapContext(KIRQL WaitIrql@<cl>, PKTHREAD CurrentThread@<edx>); * - * \param CurrentThread + * \param WaitIrql@<cl> + * The IRQL at which the wait happens. + * + * \param CurrentThread@<edx> * Pointer to the KTHREAD of the current thread. * - * \param TargetThread - * Pointer to the KTHREAD to which the caller wishes to switch to. - * * \returns * The WaitStatus of the Target Thread. * @@ -90,13 +87,13 @@ PUBLIC @KiSwapContext@8 mov [esp+4], edi mov [esp+0], ebp - /* Get the wait IRQL */ + /* Combine current thread and the wait IRQL in edx */ or dl, cl /* Do the swap with the registers correctly setup */ call @KiSwapContextInternal@0 - /* Return the registers */ + /* Restore the registers */ mov ebp, [esp+0] mov edi, [esp+4] mov esi, [esp+8]

5 years, 1 month

[reactos] 10/13: [NTOS:IO] In IopSynchronousCall first check IrpStack->MajorFunction before checking minor

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98a8e8f862251844fa39f… commit 98a8e8f862251844fa39faa57822485feaf9d937 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 2 09:45:45 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [NTOS:IO] In IopSynchronousCall first check IrpStack->MajorFunction before checking minor Minor function indices are not unique, they are subfunctions, so without first checking the major function, they are ambiguous. --- ntoskrnl/io/pnpmgr/pnpmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index e5530c61714..f2048782af0 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -1441,7 +1441,8 @@ IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject, Irp->IoStatus.Information = IoStatusBlock.Information = 0; /* Special case for IRP_MN_FILTER_RESOURCE_REQUIREMENTS */ - if (IoStackLocation->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) + if ((IoStackLocation->MajorFunction == IRP_MJ_PNP) && + (IoStackLocation->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS)) { /* Copy the resource requirements list into the IOSB */ Irp->IoStatus.Information =

5 years, 1 month

[reactos] 09/13: [BROWSEUI] Try to "fix" IEThreadParamBlock structure for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05b37f63ea7987a3582bf… commit 05b37f63ea7987a3582bf4a6ebf2c3b07b167016 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 1 14:42:14 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [BROWSEUI] Try to "fix" IEThreadParamBlock structure for x64 --- sdk/include/reactos/browseui_undoc.h | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index 4cd00096c53..f90ac9ada1c 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -25,6 +25,45 @@ extern "C" { #endif /* defined(__cplusplus) */ +// Name is IETHREADPARAM according to symbols / mangled function names +#ifdef _WIN64 +typedef struct IEThreadParamBlock +{ + long offset0; // 0x00 + UCHAR gap4[4]; + DWORD dwFlags; // 0x08 + long offset8; // 0x0c + IUnknown* offsetC; // 0x10 + long offset10; // 0x18 + char padding1[4]; // 0x1c + IUnknown* offset14; // 0x20 + LPITEMIDLIST directoryPIDL; // 0x28 + WCHAR awsz_30[21]; // 0x30 + WCHAR awszEventName[21]; // 0x5A + char padding2[4]; // 0x84 + IUnknown* offset70; // 0x88 + long offset74; // 0x90 unknown contents + char padding3[4]; // 0x94 + IUnknown* offset78; // 0x98 + LPITEMIDLIST offset7C; // 0xa0 + LPITEMIDLIST offset80; // 0xa8 + LONG offset84; // 0xb0 + LONG offset88; // 0xb4 + LONG offset8C; // 0xb8 + LONG offset90; // 0xbc + LONG offset94; // 0xc0 + LONG offset98; // 0xc4 + LONG offset9C; // 0xc8 + LONG offsetA0; // 0xcc + char field_B4[52]; + LONG offsetD8; // 0x104 + UCHAR gap108[24]; + DWORD dword120; + DWORD dword124; + IUnknown* offsetF8; // 0x128 instance explorer + UCHAR byteflags_130; +} IE_THREAD_PARAM_BLOCK, * PIE_THREAD_PARAM_BLOCK; +#else typedef struct IEThreadParamBlock { long offset0; @@ -54,6 +93,7 @@ typedef struct IEThreadParamBlock IUnknown * offsetF8; // instance explorer LONG offsetFC; // unknown contents } IE_THREAD_PARAM_BLOCK, *PIE_THREAD_PARAM_BLOCK; +#endif typedef struct ExplorerCommandLineParseResults {

5 years, 1 month

[reactos] 08/13: [PSDK] dbghelp.h: Fix 64 bit version of LOADED_IMAGE

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede5ec65c2451bd060de2… commit ede5ec65c2451bd060de2fd6158ec14a67a3ea39 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 22 13:03:24 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [PSDK] dbghelp.h: Fix 64 bit version of LOADED_IMAGE --- sdk/include/psdk/dbghelp.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index b26908a6730..aa0cdff1c69 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -99,7 +99,11 @@ typedef struct _LOADED_IMAGE PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; +#ifdef _IMAGEHLP64 + PIMAGE_NT_HEADERS64 FileHeader; +#else + PIMAGE_NT_HEADERS32 FileHeader; +#endif PIMAGE_SECTION_HEADER LastRvaSection; ULONG NumberOfSections; PIMAGE_SECTION_HEADER Sections;

5 years, 1 month

[reactos] 07/13: [TDI] Improve spec file

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e8392beea3f6164755e1… commit 0e8392beea3f6164755e1dba7a5fe6a0e7fadcb3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 20 17:11:40 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 18:04:57 2019 +0200 [TDI] Improve spec file --- drivers/network/tdi/misc/tdi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/network/tdi/misc/tdi.spec b/drivers/network/tdi/misc/tdi.spec index 24b8c246958..a6b6b2bf202 100644 --- a/drivers/network/tdi/misc/tdi.spec +++ b/drivers/network/tdi/misc/tdi.spec @@ -1,6 +1,6 @@ @ stdcall CTEAllocateString(long long) @ stdcall CTEBlock(long) - @ stdcall CTEInitEvent(long long) + @ stdcall CTEInitEvent(ptr ptr) @ stdcall CTEInitString(long long) @ stdcall CTEInitTimer(long) @ stdcall CTEInitialize() @@ -34,7 +34,7 @@ @ stdcall TdiOpenNetbiosAddress(long long long long) @ stdcall TdiRegisterAddressChangeHandler(long long long) @ stdcall TdiRegisterDeviceObject(long long) - @ stdcall TdiRegisterNetAddress(long ptr ptr ptr) + @ stdcall TdiRegisterNetAddress(ptr ptr ptr ptr) @ stdcall TdiRegisterNotificationHandler(long long long) @ stdcall TdiRegisterPnPHandlers(ptr long ptr) @ stdcall TdiReturnChainedReceives(ptr long)

5 years, 1 month

← Newer
1
...
13
14
15
16
17
18
19
...
29
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 August 2019