Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [SHELL32] Validate file operation (#2085)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e2bb5b0b80edac9e1078… commit 0e2bb5b0b80edac9e1078388c9d0b60fba4a55e1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 30 15:36:16 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 30 15:36:16 2019 +0900 [SHELL32] Validate file operation (#2085) - Support FOF_RENAMEONCOLLISION flag of SHFileOperationW. - Add validate_operation function and use it in SHFileOperationW. CORE-10225 --- dll/win32/shell32/lang/bg-BG.rc | 6 ++ dll/win32/shell32/lang/ca-ES.rc | 6 ++ dll/win32/shell32/lang/cs-CZ.rc | 6 ++ dll/win32/shell32/lang/da-DK.rc | 6 ++ dll/win32/shell32/lang/de-DE.rc | 6 ++ dll/win32/shell32/lang/el-GR.rc | 6 ++ dll/win32/shell32/lang/en-GB.rc | 6 ++ dll/win32/shell32/lang/en-US.rc | 6 ++ dll/win32/shell32/lang/es-ES.rc | 6 ++ dll/win32/shell32/lang/et-EE.rc | 6 ++ dll/win32/shell32/lang/fi-FI.rc | 6 ++ dll/win32/shell32/lang/fr-FR.rc | 6 ++ dll/win32/shell32/lang/he-IL.rc | 6 ++ dll/win32/shell32/lang/hi-IN.rc | 6 ++ dll/win32/shell32/lang/hu-HU.rc | 6 ++ dll/win32/shell32/lang/id-ID.rc | 6 ++ dll/win32/shell32/lang/it-IT.rc | 6 ++ dll/win32/shell32/lang/ja-JP.rc | 6 ++ dll/win32/shell32/lang/ko-KR.rc | 6 ++ dll/win32/shell32/lang/nl-NL.rc | 6 ++ dll/win32/shell32/lang/no-NO.rc | 6 ++ dll/win32/shell32/lang/pl-PL.rc | 6 ++ dll/win32/shell32/lang/pt-BR.rc | 6 ++ dll/win32/shell32/lang/pt-PT.rc | 6 ++ dll/win32/shell32/lang/ro-RO.rc | 6 ++ dll/win32/shell32/lang/ru-RU.rc | 6 ++ dll/win32/shell32/lang/sk-SK.rc | 6 ++ dll/win32/shell32/lang/sl-SI.rc | 6 ++ dll/win32/shell32/lang/sq-AL.rc | 6 ++ dll/win32/shell32/lang/sv-SE.rc | 6 ++ dll/win32/shell32/lang/tr-TR.rc | 6 ++ dll/win32/shell32/lang/uk-UA.rc | 6 ++ dll/win32/shell32/lang/zh-CN.rc | 6 ++ dll/win32/shell32/lang/zh-TW.rc | 6 ++ dll/win32/shell32/shlfileop.cpp | 136 ++++++++++++++++++++++++++++++++++++++++ dll/win32/shell32/shresdef.h | 6 ++ 36 files changed, 346 insertions(+) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index f04caa795dc..979da9dc353 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -773,6 +773,12 @@ 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_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_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 0a844310342..58c2455943a 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -772,6 +772,12 @@ 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_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_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 4a22af175e6..e437182022d 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -778,6 +778,12 @@ 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_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_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 22fc8626ab9..6233431c38e 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -778,6 +778,12 @@ 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_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_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 624d2d8ce88..38d75a4297e 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -773,6 +773,12 @@ 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_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_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 4ace3aa836e..ca57c93f42c 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -772,6 +772,12 @@ 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_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_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 767c0bb8ce8..5073c9866ef 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -772,6 +772,12 @@ 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_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_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 3abbaa21a45..ed821b399eb 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -772,6 +772,12 @@ 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_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_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 45eeb3fba71..ba2623d97f0 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -780,6 +780,12 @@ 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_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_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 644a1bc77ff..e188b6ae007 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -779,6 +779,12 @@ 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_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_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 3f37a24fcb8..15a8dc3e0d8 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -772,6 +772,12 @@ 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_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_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 d8856c9bbb8..532827de319 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -772,6 +772,12 @@ 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_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_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 3b4f96d8213..bcd51f00d61 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -774,6 +774,12 @@ 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_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_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 4051fa022d8..e711c7295f3 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -772,6 +772,12 @@ 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_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_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 3d0cd95cea6..d9fe252d6cc 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -772,6 +772,12 @@ 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_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_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 659f15172c4..9e0e8d4cc3b 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -772,6 +772,12 @@ 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_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_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 a8d1a685984..bc6a7e40b75 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -772,6 +772,12 @@ 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_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_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 dd114ce8cd2..4428f130b5b 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -769,6 +769,12 @@ 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_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_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 44e14519876..77bc592ee41 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -772,6 +772,12 @@ 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_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_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 556f77549e7..a50fe1aac5e 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -772,6 +772,12 @@ 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_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_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 ef7139eb566..32e80b4bf92 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -772,6 +772,12 @@ 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_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_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 c74d513f98a..d69f49ebd59 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -777,6 +777,12 @@ 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_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_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 ac3d16a51a9..91c816306e9 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -772,6 +772,12 @@ 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_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_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 fb8fd3f93f9..a01bebdd281 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -772,6 +772,12 @@ 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_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_CREATEFOLDER_DENIED "Impossivel de criar pasta '%1'" IDS_CREATEFOLDER_CAPTION "Impossivel de criar pasta" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 7b6691343fa..3e1b6861b82 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -774,6 +774,12 @@ 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_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_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 d0a826765b4..8da35e1e9bf 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -779,6 +779,12 @@ 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_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_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 3b6425e9f50..0f7e2ba41e8 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -772,6 +772,12 @@ 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_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_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 7156fc59143..8823dd6c82b 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -772,6 +772,12 @@ 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_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_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 25e327389f7..6546f0f5342 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -776,6 +776,12 @@ 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_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_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 a8a041b0612..71cc07adae6 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -772,6 +772,12 @@ 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_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_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 137f26b50c6..e80b864b735 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -774,6 +774,12 @@ 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_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_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 3a36763d514..f0049c6aba0 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -772,6 +772,12 @@ 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_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_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 23253b17f70..5f90351692b 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -780,6 +780,12 @@ 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_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_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 e5388754625..c05bc04534e 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -781,6 +781,12 @@ 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_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_CREATEFOLDER_DENIED "無法建立資料夾 '%1'" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 499f4d3079e..e7f53fcd448 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1273,6 +1273,19 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST else lstrcpyW(szTo, szDestPath); +#ifdef __REACTOS__ + if (PathFileExistsW(szTo)) + { + if (op->req->fFlags & FOF_RENAMEONCOLLISION) + { + CStringW newPath = try_find_new_name(szTo); + if (!newPath.IsEmpty()) + { + StringCchCopyW(szTo, _countof(szTo), newPath); + } + } + else if (!(op->req->fFlags & FOF_NOCONFIRMATION)) +#else if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { CStringW newPath; @@ -1281,6 +1294,7 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST StringCchCopyW(szTo, _countof(szTo), newPath); } else +#endif { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) { @@ -1311,6 +1325,23 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCHAR *szTo) { +#ifdef __REACTOS__ + if (PathFileExistsW(szTo)) + { + if (op->req->fFlags & FOF_RENAMEONCOLLISION) + { + CStringW newPath = try_find_new_name(szTo); + if (!newPath.IsEmpty()) + { + return SHNotifyCopyFileW(op, szFrom, newPath, FALSE) == 0; + } + } + else if (!(op->req->fFlags & FOF_NOCONFIRMATION)) + { + if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) + return FALSE; + } +#else if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { CStringW newPath; @@ -1321,6 +1352,7 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) return FALSE; +#endif } return SHNotifyCopyFileW(op, szFrom, szTo, FALSE) == 0; @@ -1768,12 +1800,111 @@ static void check_flags(FILEOP_FLAGS fFlags) { WORD wUnsupportedFlags = FOF_NO_CONNECTED_ELEMENTS | FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE | +#ifdef __REACTOS__ + FOF_WANTMAPPINGHANDLE; +#else FOF_RENAMEONCOLLISION | FOF_WANTMAPPINGHANDLE; +#endif if (fFlags & wUnsupportedFlags) FIXME("Unsupported flags: %04x\n", fFlags); } +#ifdef __REACTOS__ +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]; + const FILE_ENTRY *feFrom; + const FILE_ENTRY *feTo; + UINT wFunc = lpFileOp->wFunc; + HWND hwnd = lpFileOp->hwnd; + + dwNumDest = ((lpFileOp->fFlags & FOF_MULTIDESTFILES) ? flTo->dwNumFiles : 1); + + if (wFunc != FO_COPY && wFunc != FO_MOVE) + return ERROR_SUCCESS; + + for (k = 0; k < dwNumDest; ++k) + { + feTo = &flTo->feFiles[k]; + for (i = 0; i < flFrom->dwNumFiles; ++i) + { + feFrom = &flFrom->feFiles[i]; + StringCbCopyW(szFrom, sizeof(szFrom), feFrom->szFullPath); + + StringCbCopyW(szTo, sizeof(szTo), feTo->szFullPath); + if (IsAttribDir(feTo->attributes)) + { + PathAppendW(szTo, feFrom->szFilename); + } + + // same path? + if (lstrcmpiW(szFrom, szTo) == 0 && + (wFunc == FO_MOVE || !(lpFileOp->fFlags & FOF_RENAMEONCOLLISION))) + { + if (!(lpFileOp->fFlags & FOF_SILENT)) + { + 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); + } + else + { + CStringW strTitle(MAKEINTRESOURCEW(IDS_COPYERRORTITLE)); + CStringW strText(MAKEINTRESOURCEW(IDS_COPYERRORSAME)); + StringCchPrintfW(szText, sizeof(szText), strText, feFrom->szFilename); + MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); + } + } + return ERROR_SHARING_VIOLATION; + } + + // subfolder? + if (IsAttribDir(feFrom->attributes)) + { + size_t cchFrom = PathAddBackslashW(szFrom) - szFrom; + size_t cchTo = PathAddBackslashW(szTo) - szTo; + if (cchFrom <= cchTo) + { + WCHAR ch = szTo[cchFrom]; + szTo[cchFrom] = 0; + int compare = lstrcmpiW(szFrom, szTo); + szTo[cchFrom] = ch; + + if (compare == 0) + { + if (!(lpFileOp->fFlags & FOF_SILENT)) + { + 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); + } + else + { + CStringW strTitle(MAKEINTRESOURCEW(IDS_COPYERRORTITLE)); + CStringW strText(MAKEINTRESOURCEW(IDS_COPYERRORSUBF)); + StringCchPrintfW(szText, sizeof(szText), strText, feFrom->szFilename); + MessageBoxW(hwnd, szText, strTitle, MB_ICONERROR); + } + } + return ERROR_SHARING_VIOLATION; + } + } + } + } + } + + return ERROR_SUCCESS; +} +#endif /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -1810,6 +1941,11 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) op.completedSize.QuadPart = 0ull; op.bManyItems = (flFrom.dwNumFiles > 1); +#ifdef __REACTOS__ + ret = validate_operation(lpFileOp, &flFrom, &flTo); + if (ret) + goto cleanup; +#endif if (lpFileOp->wFunc != FO_RENAME && !(lpFileOp->fFlags & FOF_SILENT)) { ret = CoCreateInstance(CLSID_ProgressDialog, NULL, diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 875401a23f4..9f18d8d4b4f 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -231,6 +231,12 @@ #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_MENU_EMPTY 34561

5 years

[reactos] 01/01: [KERNEL32] Fix multibyte conversion in default char (#2111)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccc52d2e5b6c5c3037942… commit ccc52d2e5b6c5c303794216fa578eebb83589fd3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 30 15:10:10 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 30 15:10:10 2019 +0900 [KERNEL32] Fix multibyte conversion in default char (#2111) Fix kernel32!MultiByteToWideChar function. The default character was wrong. CORE-16468 --- dll/win32/kernel32/winnls/string/nls.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/nls.c b/dll/win32/kernel32/winnls/string/nls.c index c6d5372dc38..712545f6da4 100644 --- a/dll/win32/kernel32/winnls/string/nls.c +++ b/dll/win32/kernel32/winnls/string/nls.c @@ -654,14 +654,9 @@ IntMultiByteToWideCharCP(UINT CodePage, continue; } - if (MultiByteString == MbsEnd) + if (MultiByteString == MbsEnd || *MultiByteString == 0) { - *WideCharString++ = MultiByteTable[Char]; - } - else if (*MultiByteString == 0) - { - *WideCharString++ = UNICODE_NULL; - MultiByteString++; + *WideCharString++ = CodePageTable->UniDefaultChar; } else {

5 years

[reactos] 01/01: [USERENV] Fix Japanese profile info

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ad16a37f20f5ee36e278… commit 1ad16a37f20f5ee36e27807e16a74bd9a3741613 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 30 14:55:45 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 30 14:55:45 2019 +0900 [USERENV] Fix Japanese profile info Probably we shouldn't localize IDS_APPDATA and IDS_LOCALSETTINGS resource strings of userenv module until localization complete. CORE-16539 --- dll/win32/userenv/lang/ja-JP.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/userenv/lang/ja-JP.rc b/dll/win32/userenv/lang/ja-JP.rc index a95bcdc216a..c2b5f2120d7 100644 --- a/dll/win32/userenv/lang/ja-JP.rc +++ b/dll/win32/userenv/lang/ja-JP.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" - IDS_APPDATA "アプリのデータ" + IDS_APPDATA "Application Data" IDS_DESKTOP "デスクトップ" IDS_FAVORITES "お気に入り" IDS_MYDOCUMENTS "マイドキュメント" @@ -15,10 +15,10 @@ BEGIN IDS_STARTMENU "スタートメニュー" IDS_PROGRAMS "スタートメニュー\\プログラム" IDS_STARTUP "スタートメニュー\\プログラム\\スタートアップ" - IDS_LOCALSETTINGS "ローカル設定" - IDS_LOCALAPPDATA "ローカル設定\\アプリのデータ" - IDS_TEMP "ローカル設定\\Temp" - IDS_CACHE "ローカル設定\\インターネット一時ファイル" - IDS_HISTORY "ローカル設定\\履歴" + IDS_LOCALSETTINGS "Local Settings" + IDS_LOCALAPPDATA "Local Settings\\Application Data" + IDS_TEMP "Local Settings\\Temp" + IDS_CACHE "Local Settings\\Temporary Internet Files" + IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" END

5 years

[reactos] 01/01: [MEDIA][NLS] Fix c_932.nls header (#2110)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00fb9053f943a77495a97… commit 00fb9053f943a77495a977234c28c737be95f741 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 30 12:57:29 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 30 12:57:29 2019 +0900 [MEDIA][NLS] Fix c_932.nls header (#2110) Modify and fix file c_932.nls that is codepage 932 information of NLS (National Language Support). CORE-16468 --- media/nls/c_932.nls | Bin 162850 -> 162850 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/nls/c_932.nls b/media/nls/c_932.nls index 79b4a431c57..67da2ab613f 100644 Binary files a/media/nls/c_932.nls and b/media/nls/c_932.nls differ

5 years

[reactos] 01/01: [WINSTA] Export WinStationRedirectErrorMessage (#2072)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=965e17dbc4d472e157471… commit 965e17dbc4d472e157471599edfb520c6364f8f1 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Nov 29 15:51:04 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:51:04 2019 +0100 [WINSTA] Export WinStationRedirectErrorMessage (#2072) Add export for WinStationRedirectErrorMessage() function in Winsta. We already have a stub for this function in dll/win32/winsta/logon.c, but for some reason it is not exported. Required by MS Winlogon with Win32SS and some other needed dlls replaced. Now it fails due to missing WinStationCanLogonProceed, for which we currently haven't a stub. This function has been introduced with Win2k3 SP1 (and exists in SP2 as well), see http://blog.airesoft.co.uk/apichanges/changes-Server2003%20SP0-To-Server200… JIRA issue: CORE-16458 --- dll/win32/winsta/winsta.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/winsta/winsta.spec b/dll/win32/winsta/winsta.spec index b41c693b980..df10cfee4b9 100644 --- a/dll/win32/winsta/winsta.spec +++ b/dll/win32/winsta/winsta.spec @@ -69,6 +69,7 @@ @ stdcall WinStationQueryLicense(ptr ptr ptr) @ stdcall WinStationQueryLogonCredentialsW(ptr) @ stdcall WinStationQueryUpdateRequired(ptr ptr) +@ stdcall WinStationRedirectErrorMessage(ptr ptr) @ stdcall WinStationRegisterConsoleNotification(ptr ptr ptr) @ stdcall WinStationRegisterConsoleNotificationEx(ptr ptr ptr ptr) @ stdcall WinStationRegisterNotificationEvent(ptr ptr ptr ptr)

5 years

[reactos] 01/01: [RPCRT4] Stub RpcGetAuthorizationContextForClient (#2042)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be460fe03f67e86e9abdd… commit be460fe03f67e86e9abddc22b7a3faeb21539243 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Nov 29 15:19:56 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:19:56 2019 +0100 [RPCRT4] Stub RpcGetAuthorizationContextForClient (#2042) ## Purpose Add a stub for RpcGetAuthorizationContextForClient function into rpcrt4, according to https://docs.microsoft.com/en-us/windows/win32/api/rpcasync/nf-rpcasync-rpc… (but with Wine-specific diffs in the syntax, according to the code guidelines: https://wiki.winehq.org/Submitting_Patches#Code_guidelines, since we're syncing rpcrt4 with Wine). Required by MS Winlogon with also Win32 subsystem and some other dlls replaced (aka ROS-Frankenstein), so after my ch [...] I think I also need to submit a patch in Wine, but it is a bit problematically to reproduce this error there, since Wine has no even winlogon.exe, and launching MS Winlogon in pair with profmap.dll, causes the crash due to unimplemented RtlSetProcessIsCritical function in ntdll (which is completely different than our). Ftr, our ntdll already has it implemented: https://git.reactos.org/?p=reactos.git;a=blob;f=sdk/lib/rtl/process.c;hb=67… But wi [...] JIRA issue: CORE-16458 Although this PR doesn't fix that shutdown issue, it at least improves the situation with replaced system files and allows to investigate it more. ## Proposed changes - Add a stub for the function in `dll/win32/rpcrt4/rpc_async.c`; - Properly call it in `dll/win32/rpcrt4/rpcrt4.spec`. --- dll/win32/rpcrt4/rpc_async.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dll/win32/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dll/win32/rpcrt4/rpc_async.c b/dll/win32/rpcrt4/rpc_async.c index 00c2d6bede8..40628b4b4ef 100644 --- a/dll/win32/rpcrt4/rpc_async.c +++ b/dll/win32/rpcrt4/rpc_async.c @@ -166,3 +166,50 @@ RPC_STATUS WINAPI RpcAsyncCancelCall(PRPC_ASYNC_STATE pAsync, BOOL fAbortCall) FIXME("(%p, %s): stub\n", pAsync, fAbortCall ? "TRUE" : "FALSE"); return RPC_S_INVALID_ASYNC_HANDLE; } + +#ifdef __REACTOS__ +/*********************************************************************** + * RpcGetAuthorizationContextForClient [RPCRT4.@] + * + * Called by RpcFreeAuthorizationContext to return the Authz context. + * + * PARAMS + * ClientBinding [I] Binding handle, represents a binding to a client on the server. + * ImpersonateOnReturn [I] Directs this function to be represented the client on return. + * Reserved1 [I] Reserved, equal to null. + * expiration_time [I] Points to the exact date and time when the token expires. + * Reserved2 [I] Reserved, equal to a LUID structure which has a members, + * each of them is set to zero. + * Reserved3 [I] Reserved, equal to zero. + * Reserved4 [I] Reserved, equal to null. + * authz_client_context [I] Points to an AUTHZ_CLIENT_CONTEXT_HANDLE structure + * that has direct pass to Authz functions. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS +WINAPI +RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE ClientBinding, + BOOL ImpersonateOnReturn, + void * Reserved1, + PLARGE_INTEGER expiration_time, + LUID Reserved2, + DWORD Reserved3, + PVOID Reserved4, + PVOID *authz_client_context) +{ + FIXME("(%p, %d, %p, %p, (%d, %u), %u, %p, %p): stub\n", + ClientBinding, + ImpersonateOnReturn, + Reserved1, + expiration_time, + Reserved2.HighPart, + Reserved2.LowPart, + Reserved3, + Reserved4, + authz_client_context); + return RPC_S_NO_CONTEXT_AVAILABLE; +} +#endif diff --git a/dll/win32/rpcrt4/rpcrt4.spec b/dll/win32/rpcrt4/rpcrt4.spec index 7bc8f6f85f1..38bdfd310ee 100644 --- a/dll/win32/rpcrt4/rpcrt4.spec +++ b/dll/win32/rpcrt4/rpcrt4.spec @@ -378,7 +378,7 @@ 378 stdcall RpcErrorStartEnumeration(ptr) 379 stub RpcFreeAuthorizationContext 380 stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus -# RpcGetAuthorizationContextForClient +381 stdcall RpcGetAuthorizationContextForClient(ptr long ptr ptr int64 long ptr ptr) 382 stub RpcIfIdVectorFree 383 stub RpcIfInqId 384 stdcall RpcImpersonateClient(ptr)

5 years

[reactos] 01/01: [BOOTDATA] Restore "CMD here" 'Extended' key, but commented out (#2093)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e1338eac2aecc8b09708… commit 7e1338eac2aecc8b09708443a2d1568883bce6ab Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 29 14:13:59 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:13:59 2019 +0100 [BOOTDATA] Restore "CMD here" 'Extended' key, but commented out (#2093) Addendum to db5a2fff CORE-16519 --- boot/bootdata/hivecls.inf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index d81e9565f6d..0d8f8bd83ea 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -32,12 +32,16 @@ HKCR,"Directory","",0x00000000,"File Folder" HKCR,"Directory","AlwaysShowExt",0x00000000,"" HKCR,"Directory","NoRecentDocs",0x00000000,"" HKCR,"Directory\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" +; Uncomment 'Extended' key to restore default (Shift-Right-Click) display of 'Command Prompt here'. (See CORE-16519.) +; HKCR,"Directory\shell\cmd","Extended",0x00000000,"" HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Drive HKCR,"Drive","",0x00000000,"Drive" ;HKCR,"Drive\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Drive\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" +; Uncomment 'Extended' key to restore default (Shift-Right-Click) display of 'Command Prompt here'. (See CORE-16519.) +; HKCR,"Drive\shell\cmd","Extended",0x00000000,"" HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Clipboard Element

5 years

[reactos] 01/01: [DEVMGR] CClassNode::SetupNode(): Properly use Type (#2100)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad6f1ac72b4c5d863bfc8… commit ad6f1ac72b4c5d863bfc83975174f24e130292ad Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 29 14:13:13 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:13:13 2019 +0100 [DEVMGR] CClassNode::SetupNode(): Properly use Type (#2100) --- dll/win32/devmgr/devmgmt/ClassNode.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/ClassNode.cpp b/dll/win32/devmgr/devmgmt/ClassNode.cpp index bba78cf13e6..17cb7edaae0 100644 --- a/dll/win32/devmgr/devmgmt/ClassNode.cpp +++ b/dll/win32/devmgr/devmgmt/ClassNode.cpp @@ -42,8 +42,6 @@ CClassNode::SetupNode() 0); if (hKey != INVALID_HANDLE_VALUE) { - Type = REG_SZ; - // Lookup the class description (win7+) Size = sizeof(m_DisplayName); Success = RegQueryValueExW(hKey, @@ -54,8 +52,12 @@ CClassNode::SetupNode() &Size); if (Success == ERROR_SUCCESS) { + if (Type != REG_SZ) + { + Success = ERROR_INVALID_DATA; + } // Check if the string starts with an @ - if (m_DisplayName[0] == L'@') + else if (m_DisplayName[0] == L'@') { // The description is located in a module resource Success = ConvertResourceDescriptorToString(m_DisplayName, sizeof(m_DisplayName)); @@ -71,6 +73,10 @@ CClassNode::SetupNode() &Type, (LPBYTE)m_DisplayName, &Size); + if (Success == ERROR_SUCCESS && Type != REG_SZ) + { + Success = ERROR_INVALID_DATA; + } } // Close the registry key

5 years

[reactos] 01/01: [ATTRIB] Delete unused variable 'szText'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf099a662e9ee83b714b… commit 6bf099a662e9ee83b714bff5bc16c62ae375abd6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 20:08:46 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 29 20:08:46 2019 +0900 [ATTRIB] Delete unused variable 'szText' --- base/applications/cmdutils/attrib/attrib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 3d35fa403c0..4691821c3c6 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -283,7 +283,6 @@ int wmain(int argc, WCHAR *argv[]) DWORD dwAttrib = 0; DWORD dwMask = 0; LPWSTR p; - WCHAR szText[MAX_PATH]; /* Initialize the Console Standard Streams */ ConInitStdStreams();

5 years

[reactos] 01/01: [CMDUTILS][ATTRIB] Support folder attributes (#2103)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=189f6485841eb6b600069… commit 189f6485841eb6b600069a7f938979cc44318743 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 20:03:19 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 29 20:03:19 2019 +0900 [CMDUTILS][ATTRIB] Support folder attributes (#2103) CORE-16538 --- base/applications/cmdutils/attrib/attrib.c | 165 ++++++++++++++---------- base/applications/cmdutils/attrib/lang/cs-CZ.rc | 1 + base/applications/cmdutils/attrib/lang/de-DE.rc | 1 + base/applications/cmdutils/attrib/lang/el-GR.rc | 1 + base/applications/cmdutils/attrib/lang/en-US.rc | 1 + base/applications/cmdutils/attrib/lang/es-ES.rc | 1 + base/applications/cmdutils/attrib/lang/fr-FR.rc | 1 + base/applications/cmdutils/attrib/lang/hu-HU.rc | 1 + base/applications/cmdutils/attrib/lang/id-ID.rc | 1 + base/applications/cmdutils/attrib/lang/it-IT.rc | 1 + base/applications/cmdutils/attrib/lang/ja-JP.rc | 1 + base/applications/cmdutils/attrib/lang/no-NO.rc | 1 + base/applications/cmdutils/attrib/lang/pl-PL.rc | 1 + base/applications/cmdutils/attrib/lang/ro-RO.rc | 1 + base/applications/cmdutils/attrib/lang/ru-RU.rc | 1 + base/applications/cmdutils/attrib/lang/sk-SK.rc | 1 + base/applications/cmdutils/attrib/lang/sq-AL.rc | 1 + base/applications/cmdutils/attrib/lang/sv-SE.rc | 1 + base/applications/cmdutils/attrib/lang/tr-TR.rc | 1 + base/applications/cmdutils/attrib/lang/uk-UA.rc | 1 + base/applications/cmdutils/attrib/lang/zh-CN.rc | 1 + base/applications/cmdutils/attrib/lang/zh-TW.rc | 1 + base/applications/cmdutils/attrib/resource.h | 1 + 23 files changed, 118 insertions(+), 69 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 141ad497285..3d35fa403c0 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -72,7 +72,7 @@ ErrorMessage( NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&szError, 0, NULL)) { - ConPrintf(StdErr, L"%s %s\n", szError, szMessage); + ConPrintf(StdOut, L"%s %s\n", szError, szMessage); if (szError) LocalFree(szError); return; @@ -81,9 +81,9 @@ ErrorMessage( /* Fall back just in case the error is not defined */ LoadStringW(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); if (szFormat) - ConPrintf(StdErr, L"%s -- %s\n", szMsg, szMessage); + ConPrintf(StdOut, L"%s -- %s\n", szMsg, szMessage); else - ConPrintf(StdErr, L"%s\n", szMsg); + ConPrintf(StdOut, L"%s\n", szMsg); } static @@ -145,9 +145,6 @@ PrintAttribute( do { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - wcscpy(pszFileName, findData.cFileName); ConPrintf(StdOut, @@ -166,7 +163,7 @@ PrintAttribute( static -INT +BOOL ChangeAttribute( LPWSTR pszPath, LPWSTR pszFile, @@ -180,75 +177,102 @@ ChangeAttribute( DWORD dwAttribute; WCHAR szFullName[MAX_PATH]; LPWSTR pszFileName; + BOOL bWildcard = (wcschr(pszFile, L'*') || wcschr(pszFile, L'?')); /* prepare full file name buffer */ wcscpy(szFullName, pszPath); pszFileName = szFullName + wcslen(szFullName); - /* change all subdirectories */ - if (bRecurse) - { - /* append file name */ - wcscpy(pszFileName, L"*.*"); + /* append file name */ + wcscpy(pszFileName, pszFile); - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) + hFind = FindFirstFileW(szFullName, &findData); + if (hFind == INVALID_HANDLE_VALUE) + return FALSE; + + dwAttribute = findData.dwFileAttributes; + + if (!bWildcard) + { + FindClose(hFind); + if (dwAttribute & FILE_ATTRIBUTE_DIRECTORY) { - ErrorMessage(GetLastError(), pszFile); - return 1; + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + if (bRecurse) + { + if (bDirectories) + { + ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, + bRecurse, bDirectories); + } + else + { + if (!ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, + bRecurse, FALSE)) + { + return FALSE; + } + } + } + else + { + if (!bDirectories) + { + ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, + bRecurse, FALSE); + } + } + return TRUE; + } + else + { + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + return TRUE; } + } + else + { + if ((dwAttribute & FILE_ATTRIBUTE_DIRECTORY) && (!bRecurse || !bDirectories)) + return FALSE; do { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + dwAttribute = findData.dwFileAttributes; + if (dwAttribute & FILE_ATTRIBUTE_DIRECTORY) { + if (!bDirectories) + continue; + if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) continue; wcscpy(pszFileName, findData.cFileName); - wcscat(pszFileName, L"\\"); - - ChangeAttribute(szFullName, pszFile, dwMask, - dwAttrib, bRecurse, bDirectories); + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + + if (bRecurse) + { + ChangeAttribute(szFullName, findData.cFileName, dwMask, + dwAttrib, bRecurse, FALSE); + } } - } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); - } - - /* append file name */ - wcscpy(pszFileName, pszFile); - - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - ErrorMessage(GetLastError(), pszFile); - return 1; - } - - do - { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - wcscpy(pszFileName, findData.cFileName); - - dwAttribute = GetFileAttributes (szFullName); + else + { + wcscpy(pszFileName, findData.cFileName); + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + } + } while (FindNextFileW(hFind, &findData)); - if (dwAttribute != 0xFFFFFFFF) - { - dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; - SetFileAttributes(szFullName, dwAttribute); - } + FindClose(hFind); } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); - return 0; + return TRUE; } - int wmain(int argc, WCHAR *argv[]) { INT i; @@ -258,6 +282,8 @@ int wmain(int argc, WCHAR *argv[]) BOOL bDirectories = FALSE; DWORD dwAttrib = 0; DWORD dwMask = 0; + LPWSTR p; + WCHAR szText[MAX_PATH]; /* Initialize the Console Standard Streams */ ConInitStdStreams(); @@ -285,7 +311,7 @@ int wmain(int argc, WCHAR *argv[]) { if (wcslen(argv[i]) != 2) { - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } @@ -312,7 +338,7 @@ int wmain(int argc, WCHAR *argv[]) break; default: - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } } @@ -320,7 +346,7 @@ int wmain(int argc, WCHAR *argv[]) { if (wcslen(argv[i]) != 2) { - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } @@ -347,7 +373,7 @@ int wmain(int argc, WCHAR *argv[]) break; default: - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } } @@ -371,20 +397,21 @@ int wmain(int argc, WCHAR *argv[]) /* get full file name */ for (i = 1; i < argc; i++) { - if ((*argv[i] != L'+') && (*argv[i] != L'-') && (*argv[i] != L'/')) - { - LPWSTR p; + if (*argv[i] == L'+' || *argv[i] == L'-' || *argv[i] == L'/') + continue; - GetFullPathName(argv[i], MAX_PATH, szPath, NULL); - p = wcsrchr(szPath, L'\\') + 1; - wcscpy(szFileName, p); - *p = L'\0'; + GetFullPathNameW(argv[i], MAX_PATH, szPath, &p); + wcscpy(szFileName, p); + *p = 0; - if (dwMask == 0) - PrintAttribute(szPath, szFileName, bRecurse); - else - ChangeAttribute(szPath, szFileName, dwMask, - dwAttrib, bRecurse, bDirectories); + if (dwMask == 0) + { + PrintAttribute(szPath, szFileName, bRecurse); + } + else if (!ChangeAttribute(szPath, szFileName, dwMask, + dwAttrib, bRecurse, bDirectories)) + { + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); } } diff --git a/base/applications/cmdutils/attrib/lang/cs-CZ.rc b/base/applications/cmdutils/attrib/lang/cs-CZ.rc index d67fffd3dfb..5798313832c 100644 --- a/base/applications/cmdutils/attrib/lang/cs-CZ.rc +++ b/base/applications/cmdutils/attrib/lang/cs-CZ.rc @@ -7,6 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/de-DE.rc b/base/applications/cmdutils/attrib/lang/de-DE.rc index 44791186be6..934496e3b75 100644 --- a/base/applications/cmdutils/attrib/lang/de-DE.rc +++ b/base/applications/cmdutils/attrib/lang/de-DE.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Zeigt Dateiattribute an oder ändert sie.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/el-GR.rc b/base/applications/cmdutils/attrib/lang/el-GR.rc index dcfc19fb746..61b9646ccf8 100644 --- a/base/applications/cmdutils/attrib/lang/el-GR.rc +++ b/base/applications/cmdutils/attrib/lang/el-GR.rc @@ -7,6 +7,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Προβολή ή αλλαγή των χαρακτηριστικών των αρχείων.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/en-US.rc b/base/applications/cmdutils/attrib/lang/en-US.rc index 692b04c013c..340a3db2b19 100644 --- a/base/applications/cmdutils/attrib/lang/en-US.rc +++ b/base/applications/cmdutils/attrib/lang/en-US.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/es-ES.rc b/base/applications/cmdutils/attrib/lang/es-ES.rc index 8271d4784cb..a84e1753e23 100644 --- a/base/applications/cmdutils/attrib/lang/es-ES.rc +++ b/base/applications/cmdutils/attrib/lang/es-ES.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Muestra o cambia los atributos de los archivos.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/fr-FR.rc b/base/applications/cmdutils/attrib/lang/fr-FR.rc index d330ba51f3b..99c22f35ae9 100644 --- a/base/applications/cmdutils/attrib/lang/fr-FR.rc +++ b/base/applications/cmdutils/attrib/lang/fr-FR.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Affiche ou change des attributs de fichiers.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/hu-HU.rc b/base/applications/cmdutils/attrib/lang/hu-HU.rc index 37d8d22ad96..8e5e3d0ff7b 100644 --- a/base/applications/cmdutils/attrib/lang/hu-HU.rc +++ b/base/applications/cmdutils/attrib/lang/hu-HU.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Állományok attribútumok megjelenítése vagy beállításai.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/id-ID.rc b/base/applications/cmdutils/attrib/lang/id-ID.rc index 74ac009a952..31ed914c8aa 100644 --- a/base/applications/cmdutils/attrib/lang/id-ID.rc +++ b/base/applications/cmdutils/attrib/lang/id-ID.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Menampilkan atau mengubah atribut file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/it-IT.rc b/base/applications/cmdutils/attrib/lang/it-IT.rc index 70d47fc74c4..a4f6a2a1c21 100644 --- a/base/applications/cmdutils/attrib/lang/it-IT.rc +++ b/base/applications/cmdutils/attrib/lang/it-IT.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Visualizza o modifica gli attributi dei file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/ja-JP.rc b/base/applications/cmdutils/attrib/lang/ja-JP.rc index 79e2c7652fd..9125d067cb7 100644 --- a/base/applications/cmdutils/attrib/lang/ja-JP.rc +++ b/base/applications/cmdutils/attrib/lang/ja-JP.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "ファイル属性を表示または変更します。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ファイル] ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/no-NO.rc b/base/applications/cmdutils/attrib/lang/no-NO.rc index 095e18be0b2..fdc13654108 100644 --- a/base/applications/cmdutils/attrib/lang/no-NO.rc +++ b/base/applications/cmdutils/attrib/lang/no-NO.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Viser eller endrer filattributtene.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/pl-PL.rc b/base/applications/cmdutils/attrib/lang/pl-PL.rc index 42543e60b3a..3776b95160e 100644 --- a/base/applications/cmdutils/attrib/lang/pl-PL.rc +++ b/base/applications/cmdutils/attrib/lang/pl-PL.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Wyświetla lub zmienia atrybuty plików.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/ro-RO.rc b/base/applications/cmdutils/attrib/lang/ro-RO.rc index 73eed7eaf11..05f858aae75 100644 --- a/base/applications/cmdutils/attrib/lang/ro-RO.rc +++ b/base/applications/cmdutils/attrib/lang/ro-RO.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Afișează sau modifică atributele de fișiere.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/ru-RU.rc b/base/applications/cmdutils/attrib/lang/ru-RU.rc index 8cea9affee4..c2390e95f35 100644 --- a/base/applications/cmdutils/attrib/lang/ru-RU.rc +++ b/base/applications/cmdutils/attrib/lang/ru-RU.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Вывод и изменение атрибутов файлов.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/sk-SK.rc b/base/applications/cmdutils/attrib/lang/sk-SK.rc index 281a003325b..e883b13c2e3 100644 --- a/base/applications/cmdutils/attrib/lang/sk-SK.rc +++ b/base/applications/cmdutils/attrib/lang/sk-SK.rc @@ -8,6 +8,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/sq-AL.rc b/base/applications/cmdutils/attrib/lang/sq-AL.rc index ca39be06934..cddde01e7c5 100644 --- a/base/applications/cmdutils/attrib/lang/sq-AL.rc +++ b/base/applications/cmdutils/attrib/lang/sq-AL.rc @@ -6,6 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Shfaq ose ndryshu atributet e dokumentave.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/sv-SE.rc b/base/applications/cmdutils/attrib/lang/sv-SE.rc index 236baf7c6a2..2406f5316b1 100644 --- a/base/applications/cmdutils/attrib/lang/sv-SE.rc +++ b/base/applications/cmdutils/attrib/lang/sv-SE.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Visar eller ändrar filattributen.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/tr-TR.rc b/base/applications/cmdutils/attrib/lang/tr-TR.rc index d96c764e2e6..7bfd8c3e1ae 100644 --- a/base/applications/cmdutils/attrib/lang/tr-TR.rc +++ b/base/applications/cmdutils/attrib/lang/tr-TR.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Kütük öz niteliklerini görüntüler ya da değiştirir.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] kütük ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/uk-UA.rc b/base/applications/cmdutils/attrib/lang/uk-UA.rc index 6591e433459..957e589f2d1 100644 --- a/base/applications/cmdutils/attrib/lang/uk-UA.rc +++ b/base/applications/cmdutils/attrib/lang/uk-UA.rc @@ -10,6 +10,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Відображення або зміна атрибутів файлу.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/zh-CN.rc b/base/applications/cmdutils/attrib/lang/zh-CN.rc index a4d10f23bff..c3184d47eb8 100644 --- a/base/applications/cmdutils/attrib/lang/zh-CN.rc +++ b/base/applications/cmdutils/attrib/lang/zh-CN.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "显示或更改文件属性。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 文件 ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/zh-TW.rc b/base/applications/cmdutils/attrib/lang/zh-TW.rc index c1fb32005c0..8b61dd6c714 100644 --- a/base/applications/cmdutils/attrib/lang/zh-TW.rc +++ b/base/applications/cmdutils/attrib/lang/zh-TW.rc @@ -5,6 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "顯示或更改檔案屬性。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 檔案 ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/resource.h b/base/applications/cmdutils/attrib/resource.h index 3b44432714c..e55a2ed845a 100644 --- a/base/applications/cmdutils/attrib/resource.h +++ b/base/applications/cmdutils/attrib/resource.h @@ -5,3 +5,4 @@ #define STRING_ERROR_INVALID_PARAM_FORMAT 107 #define STRING_CONSOLE_ERROR 316 #define STRING_ATTRIB_HELP 600 +#define STRING_FILE_NOT_FOUND 100

5 years

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 November 2019