Ros-diffs December 2019

ros-diffs@reactos.org

18 participants
225 discussions

[reactos] 01/01: [VIDEOPRT] Complete dispatch IOCTL with IO_VIDEO_INCREMENT priority boost.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fe71544d2334719562e4… commit 0fe71544d2334719562e41fb532591cf66e20682 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 24 18:34:19 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 24 18:34:19 2019 +0100 [VIDEOPRT] Complete dispatch IOCTL with IO_VIDEO_INCREMENT priority boost. --- win32ss/drivers/videoprt/dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index b116cf1100b..7b900517fa8 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -827,7 +827,7 @@ IntVideoPortDispatchDeviceControl( INFO_(VIDEOPRT, "- Returned status: 0x%x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_VIDEO_INCREMENT); return Status; }

5 years

[reactos] 02/02: [SHELL32] Improve the displayed error on file copy / displacement + simplify code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16f64a95337854a3db4ab… commit 16f64a95337854a3db4aba60e94bcc04689cd751 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 24 18:28:05 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 24 18:30:54 2019 +0100 [SHELL32] Improve the displayed error on file copy / displacement + simplify code. Also update the corresponding french translations, see CORE-16572. And fix a regression introduced in 257e7307 that allowed again copying or moving a directory into its sub-tree... I also personally think that these checks must also be done within the copy_files() / move_files() helpers instead? --- dll/win32/shell32/lang/bg-BG.rc | 8 ++++--- dll/win32/shell32/lang/ca-ES.rc | 8 ++++--- dll/win32/shell32/lang/cs-CZ.rc | 8 ++++--- dll/win32/shell32/lang/da-DK.rc | 8 ++++--- dll/win32/shell32/lang/de-DE.rc | 8 ++++--- dll/win32/shell32/lang/el-GR.rc | 8 ++++--- dll/win32/shell32/lang/en-GB.rc | 8 ++++--- dll/win32/shell32/lang/en-US.rc | 8 ++++--- dll/win32/shell32/lang/es-ES.rc | 8 ++++--- dll/win32/shell32/lang/et-EE.rc | 8 ++++--- dll/win32/shell32/lang/fi-FI.rc | 8 ++++--- dll/win32/shell32/lang/fr-FR.rc | 20 +++++++++-------- dll/win32/shell32/lang/he-IL.rc | 8 ++++--- dll/win32/shell32/lang/hi-IN.rc | 8 ++++--- dll/win32/shell32/lang/hu-HU.rc | 8 ++++--- dll/win32/shell32/lang/id-ID.rc | 8 ++++--- dll/win32/shell32/lang/it-IT.rc | 8 ++++--- dll/win32/shell32/lang/ja-JP.rc | 8 ++++--- dll/win32/shell32/lang/ko-KR.rc | 8 ++++--- dll/win32/shell32/lang/nl-NL.rc | 8 ++++--- dll/win32/shell32/lang/no-NO.rc | 8 ++++--- dll/win32/shell32/lang/pl-PL.rc | 8 ++++--- dll/win32/shell32/lang/pt-BR.rc | 8 ++++--- dll/win32/shell32/lang/pt-PT.rc | 8 ++++--- dll/win32/shell32/lang/ro-RO.rc | 8 ++++--- dll/win32/shell32/lang/ru-RU.rc | 8 ++++--- dll/win32/shell32/lang/sk-SK.rc | 8 ++++--- dll/win32/shell32/lang/sl-SI.rc | 8 ++++--- dll/win32/shell32/lang/sq-AL.rc | 8 ++++--- dll/win32/shell32/lang/sv-SE.rc | 8 ++++--- dll/win32/shell32/lang/tr-TR.rc | 8 ++++--- dll/win32/shell32/lang/uk-UA.rc | 8 ++++--- dll/win32/shell32/lang/zh-CN.rc | 8 ++++--- dll/win32/shell32/lang/zh-TW.rc | 8 ++++--- dll/win32/shell32/shlfileop.cpp | 49 ++++++++++++++++------------------------- dll/win32/shell32/shresdef.h | 12 +++++----- 36 files changed, 202 insertions(+), 143 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 979da9dc353..81c88858464 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -773,12 +773,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 58c2455943a..5b7e3d51ed0 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index e437182022d..0999bd245f3 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -778,12 +778,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit" IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 6233431c38e..12a3f90cf48 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -778,12 +778,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 38d75a4297e..39495e5d7ec 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -773,12 +773,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED " Der Ordner kann nicht erstellt werden '%1'" IDS_CREATEFOLDER_CAPTION " Der Ordner kann nicht erstellt werden." diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index ca57c93f42c..2699d7fd27c 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 5073c9866ef..1f0e069167a 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index ed821b399eb..163a9a4ba3b 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index ba2623d97f0..971f303c0ec 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -780,12 +780,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "No se pudo crear la carpeta '%1'" IDS_CREATEFOLDER_CAPTION "No se pudo crear la carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index e188b6ae007..6e1459df8e1 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -779,12 +779,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Ei saa luua kausta '%1'" IDS_CREATEFOLDER_CAPTION "Ei saa kausta luua" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 15a8dc3e0d8..634905f20b5 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 532827de319..f97fb3a98de 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -769,15 +769,17 @@ BEGIN IDS_PASTE "Insérer" IDS_EJECT "Éjecter" IDS_DISCONNECT "Déconnecter" - 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source folder." - IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." - IDS_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_OPENFILELOCATION "Ouvrir l'empla&cement du fichier" + IDS_DESKLINK "Bureau (Créer un raccourci)" + IDS_SENDTO_MENU "Envo&yer vers" + + IDS_MOVEERRORTITLE "Erreur lors du déplacement du fichier ou du dossier" + IDS_COPYERRORTITLE "Erreur lors de la copie du fichier ou du dossier" + IDS_MOVEERRORSAMEFOLDER "Impossible de déplacer '%s' : Le dossier de destination est identique au dossier source." + IDS_MOVEERRORSAME "Impossible de déplacer '%s' : Les noms des fichiers source et destination sont identiques." + IDS_COPYERRORSAME "Impossible de copier '%s' : Les noms des fichiers source et destination sont identiques." + IDS_MOVEERRORSUBFOLDER "Impossible de déplacer '%s' : Le dossier de destination est un sous-dossier du dossier source." + IDS_COPYERRORSUBFOLDER "Impossible de copier '%s' : Le dossier de destination est un sous-dossier du dossier source." IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier '%1'" IDS_CREATEFOLDER_CAPTION "Impossible de créer un dossier" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index a4ecdec500e..7addbf0983e 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -774,12 +774,14 @@ BEGIN IDS_OPENFILELOCATION "&פתח מיקום קובץ" IDS_DESKLINK "שולחן העבודה (צור קיצור דרך)" IDS_SENDTO_MENU "&שלח אל" + IDS_MOVEERRORTITLE "Error Moving File or Folder" IDS_COPYERRORTITLE "Error Copying File or Folder" - IDS_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index e711c7295f3..108557a5dec 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "फ़ोल्डर '%1' बनाने में असमर्थ" IDS_CREATEFOLDER_CAPTION "फ़ोल्डर बनाने में असमर्थ" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index d9fe252d6cc..ba97317bb44 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 9e0e8d4cc3b..21935963686 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Tidak bisa membuat folder folder '%1'" IDS_CREATEFOLDER_CAPTION "Tidak bisa membuat folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index bc6a7e40b75..96bd078aa86 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 7913f783df1..75e36307eda 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -769,12 +769,14 @@ BEGIN IDS_OPENFILELOCATION "ファイルの場所を開く(&I)" IDS_DESKLINK "デスクトップ (ショートカットの作成)" IDS_SENDTO_MENU "送る(&N)" + IDS_MOVEERRORTITLE "ファイルまたはフォルダの移動のエラー" IDS_COPYERRORTITLE "ファイルまたはフォルダのコピーのエラー" - IDS_MOVEERRORSAME "移動できません '%s': 移動先のフォルダは移動元のフォルダと同じです。" + IDS_MOVEERRORSAMEFOLDER "移動できません '%s': 移動先のフォルダは移動元のフォルダと同じです。" + IDS_MOVEERRORSAME "移動できません '%s': コピー元とコピー先のファイル名が同じです。" IDS_COPYERRORSAME "コピーできません '%s': コピー元とコピー先のファイル名が同じです。" - IDS_MOVEERRORSUBF "移動できません '%s': 移動先のフォルダは移動元のフォルダのサブフォルダです。" - IDS_COPYERRORSUBF "コピーできません '%s': コピー先のフォルダはコピー元のフォルダのサブフォルダです。" + IDS_MOVEERRORSUBFOLDER "移動できません '%s': 移動先のフォルダは移動元のフォルダのサブフォルダです。" + IDS_COPYERRORSUBFOLDER "コピーできません '%s': コピー先のフォルダはコピー元のフォルダのサブフォルダです。" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 77bc592ee41..2b8848cd76c 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index a50fe1aac5e..937b14b02e7 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 32e80b4bf92..6e76a278a23 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index d69f49ebd59..a509fe820b6 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -777,12 +777,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 91c816306e9..cc2aa88bc95 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index a50a08f91c1..55442632492 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -772,12 +772,14 @@ BEGIN IDS_OPENFILELOCATION "Abrir localização do f&icheiro" IDS_DESKLINK "Área de trabalho (Criar atalho)" IDS_SENDTO_MENU "&Enviar para" + IDS_MOVEERRORTITLE "Erro ao mover pasta ou ficheiro" IDS_COPYERRORTITLE "Erro ao copiar pasta ou ficheiro" - IDS_MOVEERRORSAME "Impossivel mover '%s': A paste de destino é a mesma da origem." + IDS_MOVEERRORSAMEFOLDER "Impossivel mover '%s': A paste de destino é a mesma da origem." + IDS_MOVEERRORSAME "Impossivel mover '%s': Os nomes dos arquivos de origem e de destino são os mesmos." IDS_COPYERRORSAME "Impossivel copiar '%s': Os nomes dos arquivos de origem e de destino são os mesmos." - IDS_MOVEERRORSUBF "Impossivel mover '%s': A pasta de destino é uma subpasta da pasta de origem." - IDS_COPYERRORSUBF "Impossivel copiar '%s': A pasta de destino é uma subpasta da pasta de origem." + IDS_MOVEERRORSUBFOLDER "Impossivel mover '%s': A pasta de destino é uma subpasta da pasta de origem." + IDS_COPYERRORSUBFOLDER "Impossivel copiar '%s': A pasta de destino é uma subpasta da pasta de origem." IDS_CREATEFOLDER_DENIED "Impossivel criar pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel criar pasta" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3e1b6861b82..3bdc4e3d49b 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -774,12 +774,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Nu poate fi creat un dosar cu numele „%1”" IDS_CREATEFOLDER_CAPTION "Nu poate fi creat dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 8da35e1e9bf..e8df7f4febc 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -779,12 +779,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 0f7e2ba41e8..5760c756886 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 8823dd6c82b..44ef2b84db4 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 6546f0f5342..ee82a9cffa4 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -776,12 +776,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Unable to create the folder '%1'" IDS_CREATEFOLDER_CAPTION "Unable to create folder" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 71cc07adae6..4414618e9fb 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index e80b864b735..50e0ff1b785 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -774,12 +774,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED """%1"" dizini oluşturulamıyor." IDS_CREATEFOLDER_CAPTION "Dizin Oluşturulamıyor" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index f0049c6aba0..4f70b6f5456 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -772,12 +772,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "Не вдалося створити папку '%1'" IDS_CREATEFOLDER_CAPTION "Не вдалося створити папку" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 5f90351692b..ce65a180c8d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -780,12 +780,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "无法创建文件夹 '%1'" IDS_CREATEFOLDER_CAPTION "无法创建文件夹" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index c05bc04534e..7402ad10e2b 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -781,12 +781,14 @@ BEGIN 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_MOVEERRORSAME "Cannot move '%s': The destination folder is the same as the source 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_MOVEERRORSUBF "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBF "Cannot copy '%s': The destination folder is a subfolder of the source folder." + 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_CREATEFOLDER_DENIED "無法建立資料夾 '%1'" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 9c20be4a6c1..c9e7400bed2 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1812,22 +1812,12 @@ static void check_flags(FILEOP_FLAGS fFlags) #ifdef __REACTOS__ -/* Error codes could be pre-Win32 */ -#define DE_SAMEFILE 0x71 -#define DE_MANYSRC1DEST 0x72 -#define DE_DIFFDIR 0x73 -#define DE_OPCANCELLED 0x75 -#define DE_DESTSUBTREE 0x76 -#define DE_INVALIDFILES 0x7C -#define DE_DESTSAMETREE 0x7D -#define DE_FLDDESTISFILE 0x7E -#define DE_FILEDESTISFLD 0x80 - static DWORD validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flTo) { DWORD i, k, dwNumDest; - WCHAR szFrom[MAX_PATH], szTo[MAX_PATH], szText[MAX_PATH]; + WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; + CStringW strTitle, strText; const FILE_ENTRY *feFrom; const FILE_ENTRY *feTo; UINT wFunc = lpFileOp->wFunc; @@ -1845,7 +1835,6 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT { feFrom = &flFrom->feFiles[i]; StringCbCopyW(szFrom, sizeof(szFrom), feFrom->szFullPath); - StringCbCopyW(szTo, sizeof(szTo), feTo->szFullPath); if (IsAttribDir(feTo->attributes)) { @@ -1860,18 +1849,20 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT { if (wFunc == FO_MOVE) { - CStringW strTitle(MAKEINTRESOURCEW(IDS_MOVEERRORTITLE)); - CStringW strText(MAKEINTRESOURCEW(IDS_MOVEERRORSAME)); - StringCchPrintfW(szText, sizeof(szText), strText, feFrom->szFilename); - MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); + strTitle.LoadStringW(IDS_MOVEERRORTITLE); + if (IsAttribDir(feFrom->attributes)) + strText.Format(IDS_MOVEERRORSAMEFOLDER, feFrom->szFilename); + else + strText.Format(IDS_MOVEERRORSAME, feFrom->szFilename); } else { - CStringW strTitle(MAKEINTRESOURCEW(IDS_COPYERRORTITLE)); - CStringW strText(MAKEINTRESOURCEW(IDS_COPYERRORSAME)); - StringCchPrintfW(szText, sizeof(szText), strText, feFrom->szFilename); - MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); + strTitle.LoadStringW(IDS_COPYERRORTITLE); + strText.Format(IDS_COPYERRORSAME, feFrom->szFilename); + return ERROR_SUCCESS; } + MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR); + return DE_SAMEFILE; } return DE_OPCANCELLED; } @@ -1894,20 +1885,18 @@ validate_operation(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom, FILE_LIST *flT { if (wFunc == FO_MOVE) { - CStringW strTitle(MAKEINTRESOURCEW(IDS_MOVEERRORTITLE)); - CStringW strText(MAKEINTRESOURCEW(IDS_MOVEERRORSUBF)); - StringCchPrintfW(szText, sizeof(szText), strText, feFrom->szFilename); - MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); + strTitle.LoadStringW(IDS_MOVEERRORTITLE); + strText.Format(IDS_MOVEERRORSUBFOLDER, feFrom->szFilename); } else { - CStringW strTitle(MAKEINTRESOURCEW(IDS_COPYERRORTITLE)); - CStringW strText(MAKEINTRESOURCEW(IDS_COPYERRORSUBF)); - StringCchPrintfW(szText, sizeof(szText), strText, feFrom->szFilename); - MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); + strTitle.LoadStringW(IDS_COPYERRORTITLE); + strText.Format(IDS_COPYERRORSUBFOLDER, feFrom->szFilename); } + MessageBoxW(hwnd, strText, strTitle, MB_ICONERROR); + return DE_DESTSUBTREE; } - return ERROR_SUCCESS; + return DE_OPCANCELLED; } } } diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 9f18d8d4b4f..166068a756c 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -217,7 +217,7 @@ #define IDS_DESCRIPTION 331 #define IDS_COPY_OF 332 -/* Strings for file operations*/ +/* Strings for file operations */ #define IDS_FILEOOP_COPYING 333 #define IDS_FILEOOP_MOVING 334 #define IDS_FILEOOP_DELETING 335 @@ -231,12 +231,14 @@ #define IDS_OPENFILELOCATION 341 #define IDS_DESKLINK 342 #define IDS_SENDTO_MENU 343 + #define IDS_MOVEERRORTITLE 344 #define IDS_COPYERRORTITLE 345 -#define IDS_MOVEERRORSAME 346 -#define IDS_COPYERRORSAME 347 -#define IDS_MOVEERRORSUBF 348 -#define IDS_COPYERRORSUBF 349 +#define IDS_MOVEERRORSAMEFOLDER 346 +#define IDS_MOVEERRORSAME 347 +#define IDS_COPYERRORSAME 348 +#define IDS_MOVEERRORSUBFOLDER 349 +#define IDS_COPYERRORSUBFOLDER 350 #define IDS_MENU_EMPTY 34561

5 years

[reactos] 01/02: [SDK] Complete the list of DE_*** error codes for SHFileOperationA/W().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2828ea2e06fdee0e29959… commit 2828ea2e06fdee0e29959d2f9fefc6ad72464a7f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 24 18:04:55 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 24 18:05:09 2019 +0100 [SDK] Complete the list of DE_*** error codes for SHFileOperationA/W(). Documentation from https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shf… --- sdk/include/reactos/undocshell.h | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 570c69d806d..1757a055734 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -462,19 +462,33 @@ BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2); BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); /**************************************************************************** - * Shell File Operations error codes + * Shell File Operations error codes - SHFileOperationA/W */ /* Error codes could be pre-Win32 */ -#define DE_SAMEFILE 0x71 -#define DE_MANYSRC1DEST 0x72 -#define DE_DIFFDIR 0x73 -#define DE_OPCANCELLED 0x75 -#define DE_DESTSUBTREE 0x76 -#define DE_INVALIDFILES 0x7C -#define DE_DESTSAMETREE 0x7D -#define DE_FLDDESTISFILE 0x7E -#define DE_FILEDESTISFLD 0x80 +#define DE_SAMEFILE 0x71 +#define DE_MANYSRC1DEST 0x72 +#define DE_DIFFDIR 0x73 +#define DE_ROOTDIR 0x74 +#define DE_OPCANCELLED 0x75 +#define DE_DESTSUBTREE 0x76 +#define DE_ACCESSDENIEDSRC 0x78 +#define DE_PATHTOODEEP 0x79 +#define DE_MANYDEST 0x7A +#define DE_INVALIDFILES 0x7C +#define DE_DESTSAMETREE 0x7D +#define DE_FLDDESTISFILE 0x7E +#define DE_FILEDESTISFLD 0x80 +#define DE_FILENAMETOOLONG 0x81 +#define DE_DEST_IS_CDROM 0x82 +#define DE_DEST_IS_DVD 0x83 +#define DE_DEST_IS_CDRECORD 0x84 +#define DE_FILE_TOO_LARGE 0x85 +#define DE_SRC_IS_CDROM 0x86 +#define DE_SRC_IS_DVD 0x87 +#define DE_SRC_IS_CDRECORD 0x88 +// #define DE_ERROR_MAX +#define ERRORONDEST 0x10000 /**************************************************************************** * Shell Namespace Routines

5 years

[reactos] 01/01: [BLUE] Fix a visual regression introduced in bfd8a848: Don't touch INBV when resetting internal screen state during driver loading.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1928e170f269cd300ff86… commit 1928e170f269cd300ff86f022d03c356251f1f57 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 24 16:13:10 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 24 16:13:10 2019 +0100 [BLUE] Fix a visual regression introduced in bfd8a848: Don't touch INBV when resetting internal screen state during driver loading. --- drivers/setup/blue/blue.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index e9accab60e8..2558506fb53 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -279,9 +279,12 @@ ScrInbvCleanup(VOID) // HANDLE ThreadHandle; // ResetDisplayParametersDeviceExtension = NULL; - InbvNotifyDisplayOwnershipLost(NULL); - ScrResetDisplayParametersEx(80, 50, FALSE); - // or InbvAcquireDisplayOwnership(); ? + if (ResetDisplayParametersDeviceExtension) + { + InbvNotifyDisplayOwnershipLost(NULL); + ScrResetDisplayParametersEx(80, 50, FALSE); + // or InbvAcquireDisplayOwnership(); ? + } #if 0 // TODO: Find the best way to communicate the request. @@ -1323,9 +1326,10 @@ DriverEntry( Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); if (NT_SUCCESS(Status)) { - /* By default disable the screen */ - ResetDisplayParametersDeviceExtension = DeviceObject->DeviceExtension; + /* By default disable the screen (but don't touch INBV: ResetDisplayParametersDeviceExtension is still NULL) */ ScrResetScreen(DeviceObject->DeviceExtension, TRUE, FALSE); + /* Now set ResetDisplayParametersDeviceExtension to enable synchronizing with INBV */ + ResetDisplayParametersDeviceExtension = DeviceObject->DeviceExtension; DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } else

5 years

[reactos] 01/01: [VIDEOPRT][WIN32K] Use a Windows-compatible way of communicating the 'BaseVideo' state from VIDEOPRT to WIN32K.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18a51dc7f5f66108fc805… commit 18a51dc7f5f66108fc8050e604debaa53ab587cb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Dec 24 13:51:20 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 24 13:51:20 2019 +0100 [VIDEOPRT][WIN32K] Use a Windows-compatible way of communicating the 'BaseVideo' state from VIDEOPRT to WIN32K. This is done by creating the volatile key \Registry\Machine\System\CurrentControlSet\Control\GraphicsDrivers\BaseVideo . Also cache during first initialization of VIDEOPRT the state of the boot options BASEVIDEO and NOVESA, so that they can be readily retrieved later (for example, in VideoPortIsNoVesa()). --- win32ss/drivers/videoprt/registry.c | 3 +- win32ss/drivers/videoprt/videoprt.c | 222 +++++++++++++++++++++--------------- win32ss/user/ntuser/display.c | 23 +--- 3 files changed, 137 insertions(+), 111 deletions(-) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index 1527fb6cc8c..362c251d21a 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -20,7 +20,6 @@ */ #include "videoprt.h" - #include <ndk/obfuncs.h> #define NDEBUG @@ -122,7 +121,7 @@ IntCopyRegistryKey( &ObjectAttributes, 0, NULL, - 0, + REG_OPTION_NON_VOLATILE, NULL); if (!NT_SUCCESS(Status)) { diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index b4207309e93..0c80c7fbfb4 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <ndk/exfuncs.h> +#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #define NDEBUG @@ -30,6 +31,9 @@ /* GLOBAL VARIABLES ***********************************************************/ +BOOLEAN VpBaseVideo = FALSE; +BOOLEAN VpNoVesa = FALSE; + PKPROCESS CsrProcess = NULL; ULONG VideoPortDeviceNumber = 0; KMUTEX VideoPortInt10Mutex; @@ -455,6 +459,125 @@ IntDetachFromCSRSS( } } +VOID +FASTCALL +IntLoadRegistryParameters(VOID) +{ + NTSTATUS Status; + HANDLE KeyHandle; + UNICODE_STRING Path = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SystemStartOptions"); + OBJECT_ATTRIBUTES ObjectAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; + ULONG Length, NewLength; + + /* Initialize object attributes with the path we want */ + InitializeObjectAttributes(&ObjectAttributes, + &Path, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Open the key */ + Status = ZwOpenKey(&KeyHandle, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + VideoPortDebugPrint(Error, "ZwOpenKey failed (0x%x)\n", Status); + return; + } + + /* Find out how large our buffer should be */ + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + NULL, + 0, + &Length); + if (Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_BUFFER_TOO_SMALL) + { + VideoPortDebugPrint(Error, "ZwQueryValueKey failed (0x%x)\n", Status); + ObCloseHandle(KeyHandle, KernelMode); + return; + } + + /* Allocate it */ + KeyInfo = ExAllocatePoolWithTag(PagedPool, Length, TAG_VIDEO_PORT); + if (!KeyInfo) + { + VideoPortDebugPrint(Error, "Out of memory\n"); + ObCloseHandle(KeyHandle, KernelMode); + return; + } + + /* Now for real this time */ + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + KeyInfo, + Length, + &NewLength); + ObCloseHandle(KeyHandle, KernelMode); + + if (!NT_SUCCESS(Status)) + { + VideoPortDebugPrint(Error, "ZwQueryValueKey failed (0x%x)\n", Status); + ExFreePoolWithTag(KeyInfo, TAG_VIDEO_PORT); + return; + } + + /* Sanity check */ + if (KeyInfo->Type != REG_SZ) + { + VideoPortDebugPrint(Error, "Invalid type for SystemStartOptions\n"); + ExFreePoolWithTag(KeyInfo, TAG_VIDEO_PORT); + return; + } + + /* Check if BASEVIDEO or NOVESA is present in the start options */ + if (wcsstr((PWCHAR)KeyInfo->Data, L"BASEVIDEO")) + VpBaseVideo = TRUE; + if (wcsstr((PWCHAR)KeyInfo->Data, L"NOVESA")) + VpNoVesa = TRUE; + + ExFreePoolWithTag(KeyInfo, TAG_VIDEO_PORT); + + /* FIXME: Old ReactOS-compatibility... */ + if (VpBaseVideo) VpNoVesa = TRUE; + + if (VpNoVesa) + VideoPortDebugPrint(Info, "VESA mode disabled\n"); + else + VideoPortDebugPrint(Info, "VESA mode enabled\n"); + + /* If we are in BASEVIDEO, create the volatile registry key for Win32k */ + if (VpBaseVideo) + { + RtlInitUnicodeString(&Path, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\GraphicsDrivers\\BaseVideo"); + + InitializeObjectAttributes(&ObjectAttributes, + &Path, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwCreateKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (NT_SUCCESS(Status)) + ObCloseHandle(KeyHandle, KernelMode); + else + ERR_(VIDEOPRT, "Failed to create the BaseVideo key (0x%x)\n", Status); + } + + return; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -479,9 +602,10 @@ VideoPortInitialize( if (!FirstInitialization) { + FirstInitialization = TRUE; KeInitializeMutex(&VideoPortInt10Mutex, 0); KeInitializeSpinLock(&HwResetAdaptersLock); - FirstInitialization = TRUE; + IntLoadRegistryParameters(); } /* As a first thing do parameter checks. */ @@ -1344,7 +1468,8 @@ VideoPortAcquireDeviceLock( { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - (void)Status; + + UNREFERENCED_LOCAL_VARIABLE(Status); TRACE_(VIDEOPRT, "VideoPortAcquireDeviceLock\n"); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); @@ -1363,7 +1488,8 @@ VideoPortReleaseDeviceLock( { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; LONG Status; - (void)Status; + + UNREFERENCED_LOCAL_VARIABLE(Status); TRACE_(VIDEOPRT, "VideoPortReleaseDeviceLock\n"); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); @@ -1394,7 +1520,6 @@ VideoPortAllocateContiguousMemory( IN PHYSICAL_ADDRESS HighestAcceptableAddress ) { - return MmAllocateContiguousMemory(NumberOfBytes, HighestAcceptableAddress); } @@ -1405,92 +1530,5 @@ BOOLEAN NTAPI VideoPortIsNoVesa(VOID) { - NTSTATUS Status; - HANDLE KeyHandle; - UNICODE_STRING Path = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control"); - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SystemStartOptions"); - OBJECT_ATTRIBUTES ObjectAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; - ULONG Length, NewLength; - - /* Initialize object attributes with the path we want */ - InitializeObjectAttributes(&ObjectAttributes, - &Path, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, - NULL); - - /* Open the key */ - Status = ZwOpenKey(&KeyHandle, - KEY_QUERY_VALUE, - &ObjectAttributes); - - if (!NT_SUCCESS(Status)) - { - VideoPortDebugPrint(Error, "ZwOpenKey failed (0x%x)\n", Status); - return FALSE; - } - - /* Find out how large our buffer should be */ - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - NULL, - 0, - &Length); - if (Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_BUFFER_TOO_SMALL) - { - VideoPortDebugPrint(Error, "ZwQueryValueKey failed (0x%x)\n", Status); - ZwClose(KeyHandle); - return FALSE; - } - - /* Allocate it */ - KeyInfo = ExAllocatePool(PagedPool, Length); - if (!KeyInfo) - { - VideoPortDebugPrint(Error, "Out of memory\n"); - ZwClose(KeyHandle); - return FALSE; - } - - /* Now for real this time */ - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - KeyInfo, - Length, - &NewLength); - - ZwClose(KeyHandle); - - if (!NT_SUCCESS(Status)) - { - VideoPortDebugPrint(Error, "ZwQueryValueKey failed (0x%x)\n", Status); - ExFreePool(KeyInfo); - return FALSE; - } - - /* Sanity check */ - if (KeyInfo->Type != REG_SZ) - { - VideoPortDebugPrint(Error, "Invalid type for SystemStartOptions\n"); - ExFreePool(KeyInfo); - return FALSE; - } - - /* Check if NOVESA or BASEVIDEO is present in the start options */ - if (wcsstr((PWCHAR)KeyInfo->Data, L"NOVESA") || - wcsstr((PWCHAR)KeyInfo->Data, L"BASEVIDEO")) - { - VideoPortDebugPrint(Info, "VESA mode disabled\n"); - ExFreePool(KeyInfo); - return TRUE; - } - - ExFreePool(KeyInfo); - - VideoPortDebugPrint(Info, "VESA mode enabled\n"); - - return FALSE; + return VpNoVesa; } diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index be0335c52da..a23d19590d3 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -9,7 +9,7 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserDisplay); -BOOL gbBaseVideo = 0; +BOOL gbBaseVideo = FALSE; static PPROCESSINFO gpFullscreen = NULL; static const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO"; @@ -165,24 +165,13 @@ InitVideo(VOID) TRACE("----------------------------- InitVideo() -------------------------------\n"); - /* Open the key for the boot command line */ - Status = RegOpenKey(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control", &hkey); + /* Check if VGA mode is requested, by finding the special volatile key created by VIDEOPRT */ + Status = RegOpenKey(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\GraphicsDrivers\\BaseVideo", &hkey); if (NT_SUCCESS(Status)) - { - cbValue = sizeof(awcBuffer); - Status = RegQueryValue(hkey, L"SystemStartOptions", REG_SZ, awcBuffer, &cbValue); - if (NT_SUCCESS(Status)) - { - /* Check if VGA mode is requested. */ - if (wcsstr(awcBuffer, L"BASEVIDEO") != 0) - { - ERR("VGA mode requested.\n"); - gbBaseVideo = TRUE; - } - } - ZwClose(hkey); - } + gbBaseVideo = NT_SUCCESS(Status); + if (gbBaseVideo) + ERR("VGA mode requested.\n"); /* Open the key for the adapters */ Status = RegOpenKey(KEY_VIDEO, &hkey);

5 years

[reactos] 01/01: [WIN32SS][FREETYPE][NTGDI] Clarify calculation precedence for '&' and '?'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dae1f8d716d85febace2a… commit dae1f8d716d85febace2ac81332e6f19d2637443 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 13:48:33 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 13:48:33 2019 +0900 [WIN32SS][FREETYPE][NTGDI] Clarify calculation precedence for '&' and '?' --- win32ss/gdi/ntgdi/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7ddf52fca1f..2a019dd70f8 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3411,7 +3411,7 @@ static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int b while (point <= outline->contours[contour]) { ppc = (TTPOLYCURVE *)(buf + needed); - type = outline->tags[point] & FT_Curve_Tag_On ? + type = (outline->tags[point] & FT_Curve_Tag_On) ? TT_PRIM_LINE : TT_PRIM_QSPLINE; cpfx = 0; do @@ -3494,7 +3494,7 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b while (point <= outline->contours[contour]) { ppc = (TTPOLYCURVE *)(buf + needed); - type = outline->tags[point] & FT_Curve_Tag_On ? + type = (outline->tags[point] & FT_Curve_Tag_On) ? TT_PRIM_LINE : TT_PRIM_CSPLINE; cpfx = 0; do @@ -6175,7 +6175,7 @@ IntExtTextOutW( /* * Process the horizontal alignment and modify XStart accordingly. */ - DxShift = fuOptions & ETO_PDY ? 1 : 0; + DxShift = (fuOptions & ETO_PDY) ? 1 : 0; if (pdcattr->flTextAlign & (TA_RIGHT | TA_CENTER)) { ULONGLONG TextWidth = 0; @@ -6768,7 +6768,7 @@ NtGdiExtTextOutW( if (UnsafeDx) { /* If ETO_PDY is specified, we have pairs of INTs */ - DxSize = (Count * sizeof(INT)) * (fuOptions & ETO_PDY ? 2 : 1); + DxSize = (Count * sizeof(INT)) * ((fuOptions & ETO_PDY) ? 2 : 1); BufSize += DxSize; }

5 years

[reactos] 01/01: [MSPAINT] Use '%ld x %ld' rather than '%d x %d'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ef878a87faae69f9e974… commit 8ef878a87faae69f9e974c1c1684a24edbbe042a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 13:29:29 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 13:29:29 2019 +0900 [MSPAINT] Use '%ld x %ld' rather than '%d x %d' --- base/applications/mspaint/selection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/selection.cpp b/base/applications/mspaint/selection.cpp index 368c71c71f8..45d72e8fb21 100644 --- a/base/applications/mspaint/selection.cpp +++ b/base/applications/mspaint/selection.cpp @@ -176,7 +176,7 @@ LRESULT CSelectionWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, B selectionModel.ModifyDestRect(m_ptDelta, m_iAction); CString strSize; - strSize.Format(_T("%d x %d"), selectionModel.GetDestRectWidth(), selectionModel.GetDestRectHeight()); + strSize.Format(_T("%ld x %ld"), selectionModel.GetDestRectWidth(), selectionModel.GetDestRectHeight()); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); if (toolsModel.GetActiveTool() == TOOL_TEXT)

5 years

[reactos] 01/01: [MSPAINT] Add const to SelectionModel::SetSrcAndDestRectFromPoints parameters

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9b2edcc59554353cb8ef… commit d9b2edcc59554353cb8ef5091242072dd7513b4d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 24 13:08:35 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 24 13:08:35 2019 +0900 [MSPAINT] Add const to SelectionModel::SetSrcAndDestRectFromPoints parameters --- base/applications/mspaint/selectionmodel.cpp | 2 +- base/applications/mspaint/selectionmodel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index d03f3b12922..a476594ccc0 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -221,7 +221,7 @@ void SelectionModel::DrawFramePoly(HDC hDCImage) Poly(hDCImage, m_ptStack, m_iPtSP, 0, 0, 2, 0, FALSE, TRUE); /* draw the freehand selection inverted/xored */ } -void SelectionModel::SetSrcAndDestRectFromPoints(POINT& ptFrom, POINT& ptTo) +void SelectionModel::SetSrcAndDestRectFromPoints(const POINT& ptFrom, const POINT& ptTo) { m_rcDest.left = m_rcSrc.left = min(ptFrom.x, ptTo.x); m_rcDest.top = m_rcSrc.top = min(ptFrom.y, ptTo.y); diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 073cef7ea15..297d70b161f 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -55,7 +55,7 @@ public: HBITMAP GetBitmap(); int PtStackSize(); void DrawFramePoly(HDC hDCImage); - void SetSrcAndDestRectFromPoints(POINT& ptFrom, POINT& ptTo); + void SetSrcAndDestRectFromPoints(const POINT& ptFrom, const POINT& ptTo); void SetSrcRectSizeToZero(); BOOL IsSrcRectSizeNonzero(); void ModifyDestRect(POINT& ptDelta, int iAction);

5 years

[reactos] 05/05: [BOOTVID] Correctly fix scrolling and printing when the scroll region contains the whole screen.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aca7ff54b0c908b431c05… commit aca7ff54b0c908b431c05dc52444707e439e1468 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 23 17:58:57 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 23 21:06:59 2019 +0100 [BOOTVID] Correctly fix scrolling and printing when the scroll region contains the whole screen. Addendum fixes to ca370b49 (r52239) and a965ca6b (r52409). - Fix the comments to explain what is really happening. - Fix the boundary calculations in VidDisplayString() so that we can correctly display a character in the very last column before going to the next line, and fix similarly the vertical boundary calculation. - Port the fixes to the ARM code. --- drivers/base/bootvid/arm/bootvid.c | 50 +++++++++++++++++++++----------------- drivers/base/bootvid/i386/vga.c | 40 +++++++++++++++--------------- 2 files changed, 49 insertions(+), 41 deletions(-) diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index 7a259885921..27e0e20af25 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -25,7 +25,7 @@ PUSHORT VgaArmBase; PHYSICAL_ADDRESS VgaPhysical; -BOOLEAN NextLine = FALSE; +BOOLEAN ClearRow = FALSE; UCHAR VidpTextColor = 0xF; ULONG VidpCurrentX = 0; ULONG VidpCurrentY = 0; @@ -192,20 +192,21 @@ VOID NTAPI PreserveRow(IN ULONG CurrentTop, IN ULONG TopDelta, - IN BOOLEAN Direction) + IN BOOLEAN Restore) { PUSHORT Position1, Position2; ULONG Count; - /* Check which way we're preserving */ /* Calculate the position in memory for the row */ - if (Direction) + if (Restore) { + /* Restore the row by copying back the contents saved off-screen */ Position1 = &VgaArmBase[CurrentTop * (SCREEN_WIDTH / 8)]; Position2 = &VgaArmBase[SCREEN_HEIGHT * (SCREEN_WIDTH / 8)]; } else { + /* Preserve the row by saving its contents off-screen */ Position1 = &VgaArmBase[SCREEN_HEIGHT * (SCREEN_WIDTH / 8)]; Position2 = &VgaArmBase[CurrentTop * (SCREEN_WIDTH / 8)]; } @@ -415,38 +416,40 @@ VidDisplayString(IN PUCHAR String) { /* Modify Y position */ VidpCurrentY += TopDelta; - if (VidpCurrentY >= VidpScrollRegion[3]) + if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) { - /* Scroll the view */ + /* Scroll the view and clear the current row */ VgaScroll(TopDelta); VidpCurrentY -= TopDelta; - - /* Preserve row */ PreserveRow(VidpCurrentY, TopDelta, TRUE); } + else + { + /* Preserve the current row */ + PreserveRow(VidpCurrentY, TopDelta, FALSE); + } /* Update current X */ VidpCurrentX = VidpScrollRegion[0]; - /* Preserve the current row */ - PreserveRow(VidpCurrentY, TopDelta, FALSE); + /* No need to clear this row */ + ClearRow = FALSE; } else if (*String == '\r') { /* Update current X */ VidpCurrentX = VidpScrollRegion[0]; - /* Check if we're being followed by a new line */ - if (String[1] != '\n') NextLine = TRUE; + /* If a new-line does not follow we will clear the current row */ + if (String[1] != '\n') ClearRow = TRUE; } else { - /* Check if we had a \n\r last time */ - if (NextLine) + /* Clear the current row if we had a return-carriage without a new-line */ + if (ClearRow) { - /* We did, preserve the current row */ PreserveRow(VidpCurrentY, TopDelta, TRUE); - NextLine = FALSE; + ClearRow = FALSE; } /* Display this character */ @@ -458,21 +461,24 @@ VidDisplayString(IN PUCHAR String) VidpCurrentX += 8; /* Check if we should scroll */ - if (VidpCurrentX > VidpScrollRegion[2]) + if (VidpCurrentX + 7 > VidpScrollRegion[2]) { /* Update Y position and check if we should scroll it */ VidpCurrentY += TopDelta; - if (VidpCurrentY > VidpScrollRegion[3]) + if (VidpCurrentY + TopDelta - 1 > VidpScrollRegion[3]) { - /* Do the scroll */ + /* Scroll the view and clear the current row */ VgaScroll(TopDelta); VidpCurrentY -= TopDelta; - - /* Save the row */ PreserveRow(VidpCurrentY, TopDelta, TRUE); } + else + { + /* Preserve the current row */ + PreserveRow(VidpCurrentY, TopDelta, FALSE); + } - /* Update X */ + /* Update current X */ VidpCurrentX = VidpScrollRegion[0]; } } diff --git a/drivers/base/bootvid/i386/vga.c b/drivers/base/bootvid/i386/vga.c index 2914200f246..99cd0dc7a9f 100644 --- a/drivers/base/bootvid/i386/vga.c +++ b/drivers/base/bootvid/i386/vga.c @@ -67,7 +67,7 @@ ULONG_PTR VgaBase = 0; ULONG curr_x = 0; ULONG curr_y = 0; static ULONG VidTextColor = 0xF; -static BOOLEAN CarriageReturn = FALSE; +static BOOLEAN ClearRow = FALSE; /* PRIVATE FUNCTIONS *********************************************************/ @@ -355,7 +355,7 @@ static VOID NTAPI PreserveRow(IN ULONG CurrentTop, IN ULONG TopDelta, - IN BOOLEAN Direction) + IN BOOLEAN Restore) { PUCHAR Position1, Position2; ULONG Count; @@ -369,15 +369,16 @@ PreserveRow(IN ULONG CurrentTop, /* Set Mode 1 */ ReadWriteMode(1); - /* Check which way we're preserving */ /* Calculate the position in memory for the row */ - if (Direction) + if (Restore) { + /* Restore the row by copying back the contents saved off-screen */ Position1 = (PUCHAR)(VgaBase + CurrentTop * (SCREEN_WIDTH / 8)); Position2 = (PUCHAR)(VgaBase + SCREEN_HEIGHT * (SCREEN_WIDTH / 8)); } else { + /* Preserve the row by saving its contents off-screen */ Position1 = (PUCHAR)(VgaBase + SCREEN_HEIGHT * (SCREEN_WIDTH / 8)); Position2 = (PUCHAR)(VgaBase + CurrentTop * (SCREEN_WIDTH / 8)); } @@ -760,40 +761,40 @@ VidDisplayString(IN PUCHAR String) { /* Modify Y position */ curr_y += TopDelta; - if (curr_y + TopDelta >= ScrollRegion[3]) + if (curr_y + TopDelta - 1 > ScrollRegion[3]) { - /* Scroll the view */ + /* Scroll the view and clear the current row */ VgaScroll(TopDelta); curr_y -= TopDelta; + PreserveRow(curr_y, TopDelta, TRUE); } else { - /* Preserve row */ + /* Preserve the current row */ PreserveRow(curr_y, TopDelta, FALSE); } /* Update current X */ curr_x = ScrollRegion[0]; - /* Do not clear line if "\r\n" is given */ - CarriageReturn = FALSE; + /* No need to clear this row */ + ClearRow = FALSE; } else if (*String == '\r') { /* Update current X */ curr_x = ScrollRegion[0]; - /* Check if we're being followed by a new line */ - CarriageReturn = TRUE; + /* If a new-line does not follow we will clear the current row */ + if (String[1] != '\n') ClearRow = TRUE; } else { - /* check if we had a '\r' last time */ - if (CarriageReturn) + /* Clear the current row if we had a return-carriage without a new-line */ + if (ClearRow) { - /* We did, clear the current row */ PreserveRow(curr_y, TopDelta, TRUE); - CarriageReturn = FALSE; + ClearRow = FALSE; } /* Display this character */ @@ -801,15 +802,16 @@ VidDisplayString(IN PUCHAR String) curr_x += 8; /* Check if we should scroll */ - if (curr_x + 8 > ScrollRegion[2]) + if (curr_x + 7 > ScrollRegion[2]) { /* Update Y position and check if we should scroll it */ curr_y += TopDelta; - if (curr_y + TopDelta > ScrollRegion[3]) + if (curr_y + TopDelta - 1 > ScrollRegion[3]) { - /* Do the scroll */ + /* Scroll the view and clear the current row */ VgaScroll(TopDelta); curr_y -= TopDelta; + PreserveRow(curr_y, TopDelta, TRUE); } else { @@ -817,7 +819,7 @@ VidDisplayString(IN PUCHAR String) PreserveRow(curr_y, TopDelta, FALSE); } - /* Update X */ + /* Update current X */ curr_x = ScrollRegion[0]; } }

5 years

[reactos] 04/05: [BOOTVID] Factor out the common code that is used before setting pixels.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93e98772255e043d3341a… commit 93e98772255e043d3341adcb6cb1e4f1463bc117 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 22 14:54:33 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 23 21:06:58 2019 +0100 [BOOTVID] Factor out the common code that is used before setting pixels. --- drivers/base/bootvid/i386/vga.c | 49 ++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/base/bootvid/i386/vga.c b/drivers/base/bootvid/i386/vga.c index 1c17c806cc1..2914200f246 100644 --- a/drivers/base/bootvid/i386/vga.c +++ b/drivers/base/bootvid/i386/vga.c @@ -87,6 +87,19 @@ ReadWriteMode(IN UCHAR Mode) __outpb(VGA_BASE_IO_PORT + GRAPH_DATA_PORT, Mode | Value); } +static VOID +PrepareForSetPixel(VOID) +{ + /* Switch to mode 10 */ + ReadWriteMode(10); + + /* Clear the 4 planes (we're already in unchained mode here) */ + __outpw(VGA_BASE_IO_PORT + SEQ_ADDRESS_PORT, 0x0F02); + + /* Select the color don't care register */ + __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); +} + FORCEINLINE VOID SetPixel(IN ULONG Left, @@ -133,14 +146,7 @@ DisplayCharacter(IN CHAR Character, ULONG Height; UCHAR Shift; - /* Switch to mode 10 */ - ReadWriteMode(10); - - /* Clear the 4 planes (we're already in unchained mode here) */ - __outpw(VGA_BASE_IO_PORT + SEQ_ADDRESS_PORT, 0x0F02); - - /* Select the color don't care register */ - __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); + PrepareForSetPixel(); /* Calculate shift */ Shift = Left & 7; @@ -427,14 +433,7 @@ BitBlt(IN ULONG Left, return; } - /* Switch to mode 10 */ - ReadWriteMode(10); - - /* Clear the 4 planes (we're already in unchained mode here) */ - __outpw(VGA_BASE_IO_PORT + SEQ_ADDRESS_PORT, 0x0F02); - - /* Select the color don't care register */ - __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); + PrepareForSetPixel(); /* 4bpp blitting */ for (dy = Top; dy < Bottom; ++dy) @@ -473,14 +472,7 @@ RleBitBlt(IN ULONG Left, ULONG i, j; ULONG Code; - /* Switch to mode 10 */ - ReadWriteMode(10); - - /* Clear the 4 planes (we're already in unchained mode here) */ - __outpw(VGA_BASE_IO_PORT + SEQ_ADDRESS_PORT, 0x0F02); - - /* Select the color don't care register */ - __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); + PrepareForSetPixel(); /* Set Y height and current X value and start loop */ YDelta = Top + Height - 1; @@ -1034,14 +1026,7 @@ VidSolidColorFill(IN ULONG Left, /* If there is no distance, then combine the right and left masks */ if (!Distance) lMask &= rMask; - /* Switch to mode 10 */ - ReadWriteMode(10); - - /* Clear the 4 planes (we're already in unchained mode here) */ - __outpw(VGA_BASE_IO_PORT + SEQ_ADDRESS_PORT, 0x0F02); - - /* Select the color don't care register */ - __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, 7); + PrepareForSetPixel(); /* Calculate pixel position for the read */ Offset = (PUCHAR)(VgaBase + (Top * (SCREEN_WIDTH / 8)) + LeftOffset);

5 years

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2019