Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32] Show error message if move or copy operation failed (#4155)
by Denis Malikov 15 Dec '21

15 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ef8e41cc9483f7665666… commit 8ef8e41cc9483f7665666641cfdd48f5d71a1a7c Author: Denis Malikov <Getequ(a)users.noreply.github.com> AuthorDate: Wed Dec 15 21:42:47 2021 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 15 17:42:47 2021 +0300 [SHELL32] Show error message if move or copy operation failed (#4155) This allows user to know when there is not enough space on the target media, when there is no permissions for the operation, or some other error. CORE-9239 --- dll/win32/shell32/lang/bg-BG.rc | 2 ++ dll/win32/shell32/lang/ca-ES.rc | 2 ++ dll/win32/shell32/lang/cs-CZ.rc | 2 ++ dll/win32/shell32/lang/da-DK.rc | 2 ++ dll/win32/shell32/lang/de-DE.rc | 2 ++ dll/win32/shell32/lang/el-GR.rc | 2 ++ dll/win32/shell32/lang/en-GB.rc | 2 ++ dll/win32/shell32/lang/en-US.rc | 2 ++ dll/win32/shell32/lang/es-ES.rc | 2 ++ dll/win32/shell32/lang/et-EE.rc | 2 ++ dll/win32/shell32/lang/fi-FI.rc | 2 ++ dll/win32/shell32/lang/fr-FR.rc | 2 ++ dll/win32/shell32/lang/he-IL.rc | 2 ++ dll/win32/shell32/lang/hi-IN.rc | 2 ++ dll/win32/shell32/lang/hu-HU.rc | 2 ++ dll/win32/shell32/lang/id-ID.rc | 2 ++ dll/win32/shell32/lang/it-IT.rc | 2 ++ dll/win32/shell32/lang/ja-JP.rc | 2 ++ dll/win32/shell32/lang/ko-KR.rc | 2 ++ dll/win32/shell32/lang/nl-NL.rc | 2 ++ dll/win32/shell32/lang/no-NO.rc | 2 ++ dll/win32/shell32/lang/pl-PL.rc | 2 ++ dll/win32/shell32/lang/pt-BR.rc | 2 ++ dll/win32/shell32/lang/pt-PT.rc | 2 ++ dll/win32/shell32/lang/ro-RO.rc | 2 ++ dll/win32/shell32/lang/ru-RU.rc | 6 +++-- dll/win32/shell32/lang/sk-SK.rc | 2 ++ dll/win32/shell32/lang/sl-SI.rc | 2 ++ dll/win32/shell32/lang/sq-AL.rc | 2 ++ dll/win32/shell32/lang/sv-SE.rc | 2 ++ dll/win32/shell32/lang/tr-TR.rc | 2 ++ dll/win32/shell32/lang/uk-UA.rc | 2 ++ dll/win32/shell32/lang/zh-CN.rc | 2 ++ dll/win32/shell32/lang/zh-TW.rc | 2 ++ dll/win32/shell32/shlfileop.cpp | 51 +++++++++++++++++++++++++++++++++++++++++ dll/win32/shell32/shresdef.h | 2 ++ 36 files changed, 123 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 29053c2ddcd..703d1837dad 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -806,6 +806,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 6262d5a19ee..12063262bc3 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 dafe2216d03..187c0c2c892 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -811,6 +811,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 3e6baa9b2ae..6f41e1b47df 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -811,6 +811,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 f176b284e9b..e9aa547ecff 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -806,6 +806,8 @@ BEGIN IDS_COPYERRORSAME "'%s' kann nicht kopiert werden: Quell- und Zieldatei sind identisch." IDS_MOVEERRORSUBFOLDER "'%s' kann nicht verschoben werden: Der Zielorder ist ein Unterordner des Quellordners." IDS_COPYERRORSUBFOLDER "'%s' kann nicht kopiert werden: Der Zielorder ist ein Unterordner des Quellordners." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 813d78e3989..3aaa46cf184 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 e8400de4545..cc4dad3cbe3 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 5d36961e0cd..757e4ea2bc3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 596203601f0..30437706199 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -814,6 +814,8 @@ BEGIN IDS_COPYERRORSAME "Imposible copiar '%s': El archivo de origen y el de destino son el mismo." IDS_MOVEERRORSUBFOLDER "Imposible mover '%s': La carpeta de destino es un subdirectorio de la de origen." IDS_COPYERRORSUBFOLDER "Imposible copiar '%s': La carpeta de destino es un subdirectorio de la de origen." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 e36e88aabc4..d77888fa7bb 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -812,6 +812,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 c37618c3af9..a20594097ed 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 86b1b69717e..fdcb8e66a01 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -805,6 +805,8 @@ BEGIN 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 b8e3ce71d08..f086b8abb10 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -807,6 +807,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 cb6ad494f48..3096d6999a3 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 c2ec4d550d6..45febcd796d 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -804,6 +804,8 @@ BEGIN IDS_COPYERRORSAME "'%s' nem másolható: a forrás- és célfájl ugyanaz." IDS_MOVEERRORSUBFOLDER "'%s' nem mozgatható: a célmappa a forrásmappa egyik almappája." IDS_COPYERRORSUBFOLDER "'%s' nem másolható: a célmappa a forrásmappa egyik almappája." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "Nem sikerült a(z) '%1' mappa létrehozása." IDS_CREATEFOLDER_CAPTION "Nem sikerült létrehozni a mappát" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 4c8e9a72e04..03a6d9a123e 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -802,6 +802,8 @@ BEGIN IDS_COPYERRORSAME "Tidak bisa menyalin '%s': Nama berkas asal dan tujuan sama." IDS_MOVEERRORSUBFOLDER "Tidak bisa memindahkan '%s': Folder tujuan merupakan subfolder dari folder asal." IDS_COPYERRORSUBFOLDER "Tidak bisa menyalin '%s': Folder tujuan merupakan subfolder dari folder asal." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 6f1093cd913..615ff750298 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 763f17f4779..ff6eb6994a1 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -802,6 +802,8 @@ BEGIN IDS_COPYERRORSAME "コピーできません '%s': コピー元とコピー先のファイル名が同じです。" IDS_MOVEERRORSUBFOLDER "移動できません '%s': 移動先のフォルダは移動元のフォルダのサブフォルダです。" IDS_COPYERRORSUBFOLDER "コピーできません '%s': コピー先のフォルダはコピー元のフォルダのサブフォルダです。" + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %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 8939d0e7947..8f77796c636 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 16cf100515b..d86abbe3566 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 086d403e6da..7eaca4b45e9 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 9214d71d909..dec9704c99b 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -811,6 +811,8 @@ BEGIN IDS_COPYERRORSAME "Nie można skopiować '%s': Nazwy plików źródłowego i docelowego są takie same." IDS_MOVEERRORSUBFOLDER "Nie można przenieść '%s': Folder docelowy jest podfolderem folderu źródłowego." IDS_COPYERRORSUBFOLDER "Nie można skopiować '%s': Folder docelowy jest podfolderem folderu źródłowego." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 614f1ef8dc0..922a741bb01 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 2d58a03cd79..84ce916ffa8 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Impossivel copiar '%s': Os nomes dos arquivos de origem e de destino são os mesmos." 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_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 1de40d0d214..52262c0e66e 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -807,6 +807,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 8c8fdcdc7b7..fd4b752c8b8 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -805,13 +805,15 @@ BEGIN IDS_OPENFILELOCATION "Открыть &расположение объекта" IDS_SENDTO_MENU "Отправит&ь" - IDS_MOVEERRORTITLE "Error Moving File or Folder" - IDS_COPYERRORTITLE "Error Copying File or Folder" + IDS_MOVEERRORTITLE "Ошибка при перемещении папки или файла" + IDS_COPYERRORTITLE "Ошибка при копировании папки или файла" IDS_MOVEERRORSAMEFOLDER "Cannot move '%s': The destination folder is the same as the source folder." IDS_MOVEERRORSAME "Cannot move '%s': The source and destination file names are the same." IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Не удаётся переместить '%s': %s" + IDS_COPYERROR "Не удаётся скопировать '%s': %s" 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 2bfb217380d..f880a915846 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 a7f42e94382..d2a99c525e6 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 32c275cc326..bb63c6f5f8c 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -809,6 +809,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 915ef081f52..5fd6a37ceac 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 52d060c06d9..aaaf53eabd4 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -807,6 +807,8 @@ BEGIN IDS_COPYERRORSAME "'%s' kopyalanamıyor: Kaynak ve hedef dosya adları aynı." IDS_MOVEERRORSUBFOLDER "'%s' taşınamıyor: Hedef dizin, kaynak dizinin bir alt dizinidir." IDS_COPYERRORSUBFOLDER "'%s' kopyalanamıyor: Hedef dizin, kaynak dizinin bir alt dizinidir." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 6a465c79edf..e03599d3be3 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -805,6 +805,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 cafd0a4dff4..42ae713d7ef 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -813,6 +813,8 @@ BEGIN IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" 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 064076cd7a5..8e1e75b9d01 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -813,6 +813,8 @@ BEGIN IDS_COPYERRORSAME "無法複製「%s」：來源及目的地的檔案名稱相同。" IDS_MOVEERRORSUBFOLDER "無法移動「%s」：目的資料夾是來源資料夾的子資料夾。" IDS_COPYERRORSUBFOLDER "無法複製「%s」：目的資料夾是來源資料夾的子資料夾。" + IDS_MOVEERROR "Cannot move '%s': %s" + IDS_COPYERROR "Cannot copy '%s': %s" IDS_CREATEFOLDER_DENIED "無法建立資料夾「%1」" IDS_CREATEFOLDER_CAPTION "無法建立資料夾" diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index 8fd4179ba93..59aa0cf2b09 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -663,6 +663,48 @@ EXTERN_C DWORD WINAPI Win32DeleteFileW(LPCWSTR path) return (SHNotifyDeleteFileW(NULL, path) == ERROR_SUCCESS); } +#ifdef __REACTOS__ +/************************************************************************ + * CheckForError [internal] + * + * Show message box if operation failed + * + * PARAMS + * op [I] File Operation context + * error [I] Error code + * src [I] Source file full name + * + */ +static DWORD CheckForError(FILE_OPERATION *op, DWORD error, LPCWSTR src) +{ + CStringW strTitle, strMask, strText; + LPWSTR lpMsgBuffer; + + if (error == ERROR_SUCCESS || (op->req->fFlags & (FOF_NOERRORUI | FOF_SILENT))) + goto exit; + + strTitle.LoadStringW(op->req->wFunc == FO_COPY ? IDS_COPYERRORTITLE : IDS_MOVEERRORTITLE); + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMsgBuffer, + 0, + NULL); + + strText.Format(op->req->wFunc == FO_COPY ? IDS_COPYERROR : IDS_MOVEERROR, + PathFindFileNameW(src), + lpMsgBuffer); + + MessageBoxW(op->req->hwnd, strText, strTitle, MB_ICONERROR); + LocalFree(lpMsgBuffer); + +exit: + return error; +} +#endif + /************************************************************************ * SHNotifyMoveFile [internal] * @@ -710,7 +752,12 @@ static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BO SHChangeNotify(isdir ? SHCNE_RMDIR : SHCNE_DELETE, SHCNF_PATHW, src, NULL); return ERROR_SUCCESS; } + +#ifdef __REACTOS__ + return CheckForError(op, GetLastError(), src); +#else return GetLastError(); +#endif } /************************************************************************ @@ -757,7 +804,11 @@ static DWORD SHNotifyCopyFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BO return ERROR_SUCCESS; } +#ifdef __REACTOS__ + return CheckForError(op, GetLastError(), src); +#else return GetLastError(); +#endif } /************************************************************************* diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index dcad860d37f..b6bb348d2ba 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -250,6 +250,8 @@ #define IDS_COPYERRORSAME 348 #define IDS_MOVEERRORSUBFOLDER 349 #define IDS_COPYERRORSUBFOLDER 350 +#define IDS_MOVEERROR 351 +#define IDS_COPYERROR 352 #define IDS_MENU_EMPTY 34561

1 0

[reactos] 01/01: [EXPLORER] Use ShowWindowAsync in CTrayWindow::RestoreAll()
by Katayama Hirofumi MZ 14 Dec '21

14 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e055b0623c94bfad785e6… commit e055b0623c94bfad785e67c5a913d544e569ec32 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 14 23:12:01 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 14 23:12:01 2021 +0900 [EXPLORER] Use ShowWindowAsync in CTrayWindow::RestoreAll() Here, ShowWindowAsync is better than ShowWindow. CORE-17894 --- base/shell/explorer/traywnd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 2b69e48bb02..b052b856404 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2905,7 +2905,7 @@ HandleTrayContextMenu: HWND hwnd = g_MinimizedAll[i]; if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd)) { - ::ShowWindow(hwnd, SW_RESTORE); + ::ShowWindowAsync(hwnd, SW_RESTORE); } } g_MinimizedAll.RemoveAll();

1 0

[reactos] 01/01: [XCOPY] Add missing Syntax parameter in STRING_HELP string (#4161)
by Chan Chilung 14 Dec '21

14 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10c7145cc690ab60e53b0… commit 10c7145cc690ab60e53b0a5cdf95d1a1298471ed Author: Chan Chilung <eason066(a)gmail.com> AuthorDate: Tue Dec 14 08:34:06 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 14 03:34:06 2021 +0300 [XCOPY] Add missing Syntax parameter in STRING_HELP string (#4161) --- base/applications/cmdutils/xcopy/lang/da-DK.rc | 2 +- base/applications/cmdutils/xcopy/lang/de-DE.rc | 2 +- base/applications/cmdutils/xcopy/lang/en-US.rc | 2 +- base/applications/cmdutils/xcopy/lang/es-ES.rc | 2 +- base/applications/cmdutils/xcopy/lang/fr-FR.rc | 2 +- base/applications/cmdutils/xcopy/lang/it-IT.rc | 2 +- base/applications/cmdutils/xcopy/lang/ja-JP.rc | 2 +- base/applications/cmdutils/xcopy/lang/ko-KR.rc | 2 +- base/applications/cmdutils/xcopy/lang/lt-LT.rc | 2 +- base/applications/cmdutils/xcopy/lang/nl-NL.rc | 2 +- base/applications/cmdutils/xcopy/lang/no-NO.rc | 2 +- base/applications/cmdutils/xcopy/lang/pl-PL.rc | 2 +- base/applications/cmdutils/xcopy/lang/pt-BR.rc | 2 +- base/applications/cmdutils/xcopy/lang/pt-PT.rc | 2 +- base/applications/cmdutils/xcopy/lang/ro-RO.rc | 2 +- base/applications/cmdutils/xcopy/lang/ru-RU.rc | 2 +- base/applications/cmdutils/xcopy/lang/sl-SI.rc | 2 +- base/applications/cmdutils/xcopy/lang/sq-AL.rc | 2 +- base/applications/cmdutils/xcopy/lang/sr-SP.rc | 2 +- base/applications/cmdutils/xcopy/lang/sv-SE.rc | 2 +- base/applications/cmdutils/xcopy/lang/tr-TR.rc | 2 +- base/applications/cmdutils/xcopy/lang/uk-UA.rc | 2 +- base/applications/cmdutils/xcopy/lang/zh-CN.rc | 2 +- base/applications/cmdutils/xcopy/lang/zh-TW.rc | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/applications/cmdutils/xcopy/lang/da-DK.rc b/base/applications/cmdutils/xcopy/lang/da-DK.rc index 6fda70a96ae..36b82c21c5f 100644 --- a/base/applications/cmdutils/xcopy/lang/da-DK.rc +++ b/base/applications/cmdutils/xcopy/lang/da-DK.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntaks:\n\ XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ hvor:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/de-DE.rc b/base/applications/cmdutils/xcopy/lang/de-DE.rc index 4e4e711eae9..05dc76719ac 100644 --- a/base/applications/cmdutils/xcopy/lang/de-DE.rc +++ b/base/applications/cmdutils/xcopy/lang/de-DE.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Mit:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/en-US.rc b/base/applications/cmdutils/xcopy/lang/en-US.rc index a63c83829c7..0d15eedff53 100644 --- a/base/applications/cmdutils/xcopy/lang/en-US.rc +++ b/base/applications/cmdutils/xcopy/lang/en-US.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/es-ES.rc b/base/applications/cmdutils/xcopy/lang/es-ES.rc index 3845af2ca5f..4de47407651 100644 --- a/base/applications/cmdutils/xcopy/lang/es-ES.rc +++ b/base/applications/cmdutils/xcopy/lang/es-ES.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxis:\n\ XCOPY fuente [destino] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ En la cual:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/fr-FR.rc b/base/applications/cmdutils/xcopy/lang/fr-FR.rc index de5ee1f9f99..fd97858751c 100644 --- a/base/applications/cmdutils/xcopy/lang/fr-FR.rc +++ b/base/applications/cmdutils/xcopy/lang/fr-FR.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntaxe :\n\ XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ où :\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/it-IT.rc b/base/applications/cmdutils/xcopy/lang/it-IT.rc index 4ffdf5444bc..99fcdc0bb5f 100644 --- a/base/applications/cmdutils/xcopy/lang/it-IT.rc +++ b/base/applications/cmdutils/xcopy/lang/it-IT.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintassi:\n\ XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Dove:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/ja-JP.rc b/base/applications/cmdutils/xcopy/lang/ja-JP.rc index 2eec6791e0b..22b28129629 100644 --- a/base/applications/cmdutils/xcopy/lang/ja-JP.rc +++ b/base/applications/cmdutils/xcopy/lang/ja-JP.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ 構文:\n\ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ オプション:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/ko-KR.rc b/base/applications/cmdutils/xcopy/lang/ko-KR.rc index 7b7f5066659..45d913ca017 100644 --- a/base/applications/cmdutils/xcopy/lang/ko-KR.rc +++ b/base/applications/cmdutils/xcopy/lang/ko-KR.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ 문법:\n\ XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/lt-LT.rc b/base/applications/cmdutils/xcopy/lang/lt-LT.rc index 0be2b448606..ff0e1f608ea 100644 --- a/base/applications/cmdutils/xcopy/lang/lt-LT.rc +++ b/base/applications/cmdutils/xcopy/lang/lt-LT.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaksė:\n\ XCOPY šaltinis [paskirtis] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Kur:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/nl-NL.rc b/base/applications/cmdutils/xcopy/lang/nl-NL.rc index db714d14b34..54c43d97662 100644 --- a/base/applications/cmdutils/xcopy/lang/nl-NL.rc +++ b/base/applications/cmdutils/xcopy/lang/nl-NL.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Gebruik:\n\ XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Parameters:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/no-NO.rc b/base/applications/cmdutils/xcopy/lang/no-NO.rc index e051212d899..ca959535282 100644 --- a/base/applications/cmdutils/xcopy/lang/no-NO.rc +++ b/base/applications/cmdutils/xcopy/lang/no-NO.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/pl-PL.rc b/base/applications/cmdutils/xcopy/lang/pl-PL.rc index f6f30597b4c..e967982f695 100644 --- a/base/applications/cmdutils/xcopy/lang/pl-PL.rc +++ b/base/applications/cmdutils/xcopy/lang/pl-PL.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Składnia:\n\ XCOPY źródło [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Gdzie:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/pt-BR.rc b/base/applications/cmdutils/xcopy/lang/pt-BR.rc index 3ed93b06c9b..da77856c889 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-BR.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-BR.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxe:\n\ XCOPY fonte [destino] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Onde:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/pt-PT.rc b/base/applications/cmdutils/xcopy/lang/pt-PT.rc index db3fd7eb9a4..a24e0c8b52a 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-PT.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-PT.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxe:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Onde:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/ro-RO.rc b/base/applications/cmdutils/xcopy/lang/ro-RO.rc index 66d0b852cfd..ae6d267ed9d 100644 --- a/base/applications/cmdutils/xcopy/lang/ro-RO.rc +++ b/base/applications/cmdutils/xcopy/lang/ro-RO.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaxă:\n\ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \nCu:\n\ \n\ [/I] Creează director dacă destinația nu există și copiază două sau\n\ diff --git a/base/applications/cmdutils/xcopy/lang/ru-RU.rc b/base/applications/cmdutils/xcopy/lang/ru-RU.rc index 72e59651354..7c24552802d 100644 --- a/base/applications/cmdutils/xcopy/lang/ru-RU.rc +++ b/base/applications/cmdutils/xcopy/lang/ru-RU.rc @@ -27,7 +27,7 @@ STRINGTABLE \n\ Синтаксис:\n\ XCOPY источник [целевой_объект] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ \n\ источник Копируемые файлы.\n\ diff --git a/base/applications/cmdutils/xcopy/lang/sl-SI.rc b/base/applications/cmdutils/xcopy/lang/sl-SI.rc index 4759f1d6bf3..aa169456ce8 100644 --- a/base/applications/cmdutils/xcopy/lang/sl-SI.rc +++ b/base/applications/cmdutils/xcopy/lang/sl-SI.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Sintaksa:\n\ XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/sq-AL.rc b/base/applications/cmdutils/xcopy/lang/sq-AL.rc index 98ebebb2e80..632ade15945 100644 --- a/base/applications/cmdutils/xcopy/lang/sq-AL.rc +++ b/base/applications/cmdutils/xcopy/lang/sq-AL.rc @@ -30,7 +30,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Where:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/sr-SP.rc b/base/applications/cmdutils/xcopy/lang/sr-SP.rc index 0ba72eedc91..28c4798ee7c 100644 --- a/base/applications/cmdutils/xcopy/lang/sr-SP.rc +++ b/base/applications/cmdutils/xcopy/lang/sr-SP.rc @@ -26,7 +26,7 @@ STRINGTABLE \n\ Синтакса:\n\ XCOPY извор [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Где:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/sv-SE.rc b/base/applications/cmdutils/xcopy/lang/sv-SE.rc index 015a6a0a6f0..1537287fde1 100644 --- a/base/applications/cmdutils/xcopy/lang/sv-SE.rc +++ b/base/applications/cmdutils/xcopy/lang/sv-SE.rc @@ -24,7 +24,7 @@ STRINGTABLE \n\ Syntax:\n\ XCOPY källa [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Där:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/tr-TR.rc b/base/applications/cmdutils/xcopy/lang/tr-TR.rc index 95ec8039da5..7925e9667de 100644 --- a/base/applications/cmdutils/xcopy/lang/tr-TR.rc +++ b/base/applications/cmdutils/xcopy/lang/tr-TR.rc @@ -28,7 +28,7 @@ STRINGTABLE \n\ Yazım:\n\ XCOPY kaynak [hedef] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Nereye:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/uk-UA.rc b/base/applications/cmdutils/xcopy/lang/uk-UA.rc index fed492272d6..7716742b7d7 100644 --- a/base/applications/cmdutils/xcopy/lang/uk-UA.rc +++ b/base/applications/cmdutils/xcopy/lang/uk-UA.rc @@ -25,7 +25,7 @@ STRINGTABLE \n\ Синтаксис:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ Де:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/zh-CN.rc b/base/applications/cmdutils/xcopy/lang/zh-CN.rc index e7793371651..e529f19b772 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-CN.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-CN.rc @@ -28,7 +28,7 @@ STRINGTABLE \n\ 语法:\n\ XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ 地点:\n\ \n\ diff --git a/base/applications/cmdutils/xcopy/lang/zh-TW.rc b/base/applications/cmdutils/xcopy/lang/zh-TW.rc index c7f44937edb..b1023e3a281 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-TW.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-TW.rc @@ -28,7 +28,7 @@ STRINGTABLE \n\ 語法:\n\ XCOPY 源 [目標] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ -\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n\ \n\ 地點:\n\ \n\

1 0

[reactos] 01/01: [HELP] Fix (tr-TR) rc sporadic compilation error on VS (#4162)
by Rubén Mendoza Luna 14 Dec '21

14 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7fa746172844f23856b1… commit b7fa746172844f23856b12cb57087902134815a2 Author: Rubén Mendoza Luna <rbm3ndozal(a)gmail.com> AuthorDate: Mon Dec 13 15:11:27 2021 -0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Dec 14 03:22:44 2021 +0300 [HELP] Fix (tr-TR) rc sporadic compilation error on VS (#4162) Fix (tr-TR) resource file compilation error RC2102 on VS2015 and 2017. Based on the work done at CORE-7405, moves the string split location so the first part of the message isn't too long anymore. CORE-17910 --- base/applications/cmdutils/help/lang/tr-TR.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/help/lang/tr-TR.rc b/base/applications/cmdutils/help/lang/tr-TR.rc index 9479d5c91cc..ead3370d2ec 100644 --- a/base/applications/cmdutils/help/lang/tr-TR.rc +++ b/base/applications/cmdutils/help/lang/tr-TR.rc @@ -44,8 +44,8 @@ IF Toplu iş dosyalarında şartlı eşleşmeyi gerçekleştirir.\n\ LABEL Bir diskin birim etiketini oluşturur, değiştirir ya da siler.\n\ MD Bir dizin oluşturur.\n\ MKDIR Bir dizin oluşturur.\n\ -MKLINK Bir dosya dizisi bağlantı nesnesi oluşturur.\n\ -MOVE Bir dizinden bir ya da daha çok dosyayı başka bir dizine taşır.\n\ +MKLINK Bir dosya dizisi bağlantı nesnesi oluşturur.\n" + IDS_HELP2 "MOVE Bir dizinden bir ya da daha çok dosyayı başka bir dizine taşır.\n\ PATH Çalıştırılabilir dosyalar için varsayılan arama yolunu görüntüler ya da\n\ yeni bir arama yolu oluşturur.\n\ PAUSE Bir toplu iş dosyasında işlemeyi askıya alır ve bir ileti görüntüler.\n\ @@ -62,8 +62,8 @@ RMDIR Bir dizin siler.\n\ SCREEN İmleci taşır ve isteğe bağlı olarak olarak metin yazdır.\n\ SET ReactOS çevresel değişkenlerini görüntüler, ayarlar ya da kaldırır.\n\ SHIFT Toplu iş dosyalarındaki yerine konulabilir değişkenlerin konumunu\n\ - değiştirir.\n" - IDS_HELP2 "START Belirtilen bir programı ya da komutu çalıştırmak için ayrı bir\n\ + değiştirir.\n\ +START Belirtilen bir programı ya da komutu çalıştırmak için ayrı bir\n\ pencere başlatır.\n\ Komut çalıştırır.\n\ TIME Sistem saatini görüntüler ya da ayarlar.\n\

1 0

[reactos] 01/01: [E1000] Minor improvements (#3904)
by Dmitry Borisov 13 Dec '21

13 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f97671319509df175dd5… commit 3f97671319509df175dd5702d670aaa2ff8ea99a Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Dec 14 04:57:33 2021 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 14 01:57:33 2021 +0300 [E1000] Minor improvements (#3904) - Add support for 64-bit counters (Intel gigabit NICs) - Properly handle OIDs - Check that the packet filter is not 0 - Performance increase --- drivers/network/dd/e1000/CMakeLists.txt | 3 +- drivers/network/dd/e1000/hardware.c | 107 +-------------------- drivers/network/dd/e1000/info.c | 158 +++++++++++++++++++++----------- drivers/network/dd/e1000/interrupt.c | 29 ++++-- drivers/network/dd/e1000/ndis.c | 45 +-------- drivers/network/dd/e1000/nic.h | 93 ++++++++++++------- drivers/network/dd/e1000/send.c | 85 +++++++++++++++++ 7 files changed, 274 insertions(+), 246 deletions(-) diff --git a/drivers/network/dd/e1000/CMakeLists.txt b/drivers/network/dd/e1000/CMakeLists.txt index 8bb4aa25ccf..cd67a525a9d 100644 --- a/drivers/network/dd/e1000/CMakeLists.txt +++ b/drivers/network/dd/e1000/CMakeLists.txt @@ -12,7 +12,8 @@ list(APPEND SOURCE nic.h e1000hw.h debug.c - debug.h) + debug.h + send.c) add_library(e1000 MODULE ${SOURCE} e1000.rc) add_pch(e1000 nic.h SOURCE) diff --git a/drivers/network/dd/e1000/hardware.c b/drivers/network/dd/e1000/hardware.c index aa5fc26896b..c0c41ce9403 100644 --- a/drivers/network/dd/e1000/hardware.c +++ b/drivers/network/dd/e1000/hardware.c @@ -53,32 +53,6 @@ static USHORT SupportedDevices[] = 0x10B5, // Intel 82546GB Quad Copper KSP3 }; - -static ULONG E1000WriteFlush(IN PE1000_ADAPTER Adapter) -{ - volatile ULONG Value; - - NdisReadRegisterUlong(Adapter->IoBase + E1000_REG_STATUS, &Value); - return Value; -} - -VOID NTAPI E1000WriteUlong(IN PE1000_ADAPTER Adapter, IN ULONG Address, IN ULONG Value) -{ - NdisWriteRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); -} - -VOID NTAPI E1000ReadUlong(IN PE1000_ADAPTER Adapter, IN ULONG Address, OUT PULONG Value) -{ - NdisReadRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); -} - -static VOID E1000WriteIoUlong(IN PE1000_ADAPTER Adapter, IN ULONG Address, IN ULONG Value) -{ - NdisRawWritePortUlong((PULONG)(Adapter->IoPort), Address); - E1000WriteFlush(Adapter); - NdisRawWritePortUlong((PULONG)(Adapter->IoPort + 4), Value); -} - static ULONG PacketFilterToMask(ULONG PacketFilter) { ULONG FilterMask = 0; @@ -145,16 +119,11 @@ static BOOLEAN E1000ReadMdic(IN PE1000_ADAPTER Adapter, IN ULONG Address, USHORT ULONG Mdic; UINT n; - if (Address > MAX_PHY_REG_ADDRESS) - { - NDIS_DbgPrint(MIN_TRACE, ("PHY Address %d is invalid\n", Address)); - return 1; - } + ASSERT(Address <= MAX_PHY_REG_ADDRESS) Mdic = (Address << E1000_MDIC_REGADD_SHIFT); Mdic |= (E1000_MDIC_PHYADD_GIGABIT << E1000_MDIC_PHYADD_SHIFT); Mdic |= E1000_MDIC_OP_READ; - E1000WriteUlong(Adapter, E1000_REG_MDIC, Mdic); for (n = 0; n < MAX_PHY_READ_ATTEMPTS; n++) @@ -725,6 +694,7 @@ NICUpdateMulticastList( UINT n; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + // FIXME: Use 'Adapter->MulticastListSize'? Check the datasheet for (n = 0; n < MAXIMUM_MULTICAST_ADDRESSES; ++n) { ULONG Ral = *(ULONG *)Adapter->MulticastList[n].MacAddress; @@ -763,46 +733,6 @@ NICApplyPacketFilter( return NDIS_STATUS_SUCCESS; } -NDIS_STATUS -NTAPI -NICApplyInterruptMask( - IN PE1000_ADAPTER Adapter) -{ - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - E1000WriteUlong(Adapter, E1000_REG_IMS, Adapter->InterruptMask /*| 0x1F6DC*/); - return NDIS_STATUS_SUCCESS; -} - -NDIS_STATUS -NTAPI -NICDisableInterrupts( - IN PE1000_ADAPTER Adapter) -{ - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - E1000WriteUlong(Adapter, E1000_REG_IMC, ~0); - return NDIS_STATUS_SUCCESS; -} - -ULONG -NTAPI -NICInterruptRecognized( - IN PE1000_ADAPTER Adapter, - OUT PBOOLEAN InterruptRecognized) -{ - ULONG Value; - - /* Reading the interrupt acknowledges them */ - E1000ReadUlong(Adapter, E1000_REG_ICR, &Value); - - *InterruptRecognized = (Value & Adapter->InterruptMask) != 0; - - NDIS_DbgPrint(MAX_TRACE, ("NICInterruptRecognized(0x%x, 0x%x).\n", Value, *InterruptRecognized)); - - return (Value & Adapter->InterruptMask); -} - VOID NTAPI NICUpdateLinkStatus( @@ -819,36 +749,3 @@ NICUpdateLinkStatus( SpeedIndex = (DeviceStatus & E1000_STATUS_SPEEDMASK) >> E1000_STATUS_SPEEDSHIFT; Adapter->LinkSpeedMbps = SpeedValues[SpeedIndex]; } - -NDIS_STATUS -NTAPI -NICTransmitPacket( - IN PE1000_ADAPTER Adapter, - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG Length) -{ - volatile PE1000_TRANSMIT_DESCRIPTOR TransmitDescriptor; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - TransmitDescriptor = Adapter->TransmitDescriptors + Adapter->CurrentTxDesc; - TransmitDescriptor->Address = PhysicalAddress.QuadPart; - TransmitDescriptor->Length = Length; - TransmitDescriptor->ChecksumOffset = 0; - TransmitDescriptor->Command = E1000_TDESC_CMD_RS | E1000_TDESC_CMD_IFCS | E1000_TDESC_CMD_EOP | E1000_TDESC_CMD_IDE; - TransmitDescriptor->Status = 0; - TransmitDescriptor->ChecksumStartField = 0; - TransmitDescriptor->Special = 0; - - Adapter->CurrentTxDesc = (Adapter->CurrentTxDesc + 1) % NUM_TRANSMIT_DESCRIPTORS; - - E1000WriteUlong(Adapter, E1000_REG_TDT, Adapter->CurrentTxDesc); - - if (Adapter->CurrentTxDesc == Adapter->LastTxDesc) - { - NDIS_DbgPrint(MID_TRACE, ("All TX descriptors are full now\n")); - Adapter->TxFull = TRUE; - } - - return NDIS_STATUS_SUCCESS; -} diff --git a/drivers/network/dd/e1000/info.c b/drivers/network/dd/e1000/info.c index 42b7fe8f2c8..9a5b632d56c 100644 --- a/drivers/network/dd/e1000/info.c +++ b/drivers/network/dd/e1000/info.c @@ -10,7 +10,7 @@ #include <debug.h> -static ULONG SupportedOidList[] = +static NDIS_OID SupportedOidList[] = { OID_GEN_SUPPORTED_LIST, OID_GEN_CURRENT_PACKET_FILTER, @@ -37,14 +37,36 @@ static ULONG SupportedOidList[] = OID_802_3_PERMANENT_ADDRESS, OID_802_3_CURRENT_ADDRESS, OID_802_3_MAXIMUM_LIST_SIZE, + /* Statistics */ OID_GEN_XMIT_OK, OID_GEN_RCV_OK, OID_GEN_XMIT_ERROR, OID_GEN_RCV_ERROR, OID_GEN_RCV_NO_BUFFER, + + OID_PNP_CAPABILITIES, }; +static +ULONG64 +NICQueryStatisticCounter( + _In_ PE1000_ADAPTER Adapter, + _In_ NDIS_OID Oid) +{ + /* TODO */ + return 0; +} + +static +NDIS_STATUS +NICFillPowerManagementCapabilities( + _In_ PE1000_ADAPTER Adapter, + _Out_ PNDIS_PNP_CAPABILITIES Capabilities) +{ + /* TODO */ + return NDIS_STATUS_NOT_SUPPORTED; +} NDIS_STATUS NTAPI @@ -57,13 +79,20 @@ MiniportQueryInformation( OUT PULONG BytesNeeded) { PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; - ULONG genericUlong; ULONG copyLength; PVOID copySource; NDIS_STATUS status; + union _GENERIC_INFORMATION + { + USHORT Ushort; + ULONG Ulong; + ULONG64 Ulong64; + NDIS_MEDIUM Medium; + NDIS_PNP_CAPABILITIES PmCapabilities; + } GenericInfo; status = NDIS_STATUS_SUCCESS; - copySource = &genericUlong; + copySource = &GenericInfo; copyLength = sizeof(ULONG); switch (Oid) @@ -74,20 +103,19 @@ MiniportQueryInformation( break; case OID_GEN_CURRENT_PACKET_FILTER: - genericUlong = Adapter->PacketFilter; + GenericInfo.Ulong = Adapter->PacketFilter; break; case OID_GEN_HARDWARE_STATUS: UNIMPLEMENTED_DBGBREAK(); - genericUlong = (ULONG)NdisHardwareStatusReady; //FIXME + GenericInfo.Ulong = (ULONG)NdisHardwareStatusReady; //FIXME break; case OID_GEN_MEDIA_SUPPORTED: case OID_GEN_MEDIA_IN_USE: { - static const NDIS_MEDIUM medium = NdisMedium802_3; - copySource = (PVOID)&medium; - copyLength = sizeof(medium); + GenericInfo.Medium = NdisMedium802_3; + copyLength = sizeof(NDIS_MEDIUM); break; } @@ -96,31 +124,36 @@ MiniportQueryInformation( case OID_GEN_CURRENT_LOOKAHEAD: case OID_GEN_MAXIMUM_LOOKAHEAD: case OID_GEN_MAXIMUM_FRAME_SIZE: - genericUlong = MAXIMUM_FRAME_SIZE - sizeof(ETH_HEADER); + GenericInfo.Ulong = MAXIMUM_FRAME_SIZE - sizeof(ETH_HEADER); + break; + + case OID_802_3_MULTICAST_LIST: + copySource = Adapter->MulticastList; + copyLength = Adapter->MulticastListSize * IEEE_802_ADDR_LENGTH; break; case OID_802_3_MAXIMUM_LIST_SIZE: - genericUlong = MAXIMUM_MULTICAST_ADDRESSES; + GenericInfo.Ulong = MAXIMUM_MULTICAST_ADDRESSES; break; case OID_GEN_LINK_SPEED: - genericUlong = Adapter->LinkSpeedMbps * 10000; + GenericInfo.Ulong = Adapter->LinkSpeedMbps * 10000; break; case OID_GEN_TRANSMIT_BUFFER_SPACE: - genericUlong = MAXIMUM_FRAME_SIZE; + GenericInfo.Ulong = MAXIMUM_FRAME_SIZE; break; case OID_GEN_RECEIVE_BUFFER_SPACE: - genericUlong = RECEIVE_BUFFER_SIZE; + GenericInfo.Ulong = RECEIVE_BUFFER_SIZE; break; case OID_GEN_VENDOR_ID: /* The 3 bytes of the MAC address is the vendor ID */ - genericUlong = 0; - genericUlong |= (Adapter->PermanentMacAddress[0] << 16); - genericUlong |= (Adapter->PermanentMacAddress[1] << 8); - genericUlong |= (Adapter->PermanentMacAddress[2] & 0xFF); + GenericInfo.Ulong = 0; + GenericInfo.Ulong |= (Adapter->PermanentMacAddress[0] << 16); + GenericInfo.Ulong |= (Adapter->PermanentMacAddress[1] << 8); + GenericInfo.Ulong |= (Adapter->PermanentMacAddress[2] & 0xFF); break; case OID_GEN_VENDOR_DESCRIPTION: @@ -132,38 +165,35 @@ MiniportQueryInformation( } case OID_GEN_VENDOR_DRIVER_VERSION: - genericUlong = DRIVER_VERSION; + GenericInfo.Ulong = DRIVER_VERSION; break; case OID_GEN_DRIVER_VERSION: { - static const USHORT driverVersion = - (NDIS_MINIPORT_MAJOR_VERSION << 8) + NDIS_MINIPORT_MINOR_VERSION; - copySource = (PVOID)&driverVersion; - copyLength = sizeof(driverVersion); + copyLength = sizeof(USHORT); + GenericInfo.Ushort = (NDIS_MINIPORT_MAJOR_VERSION << 8) + NDIS_MINIPORT_MINOR_VERSION; break; } case OID_GEN_MAXIMUM_TOTAL_SIZE: - genericUlong = MAXIMUM_FRAME_SIZE; + GenericInfo.Ulong = MAXIMUM_FRAME_SIZE; break; case OID_GEN_MAXIMUM_SEND_PACKETS: - genericUlong = 1; + GenericInfo.Ulong = 1; break; case OID_GEN_MAC_OPTIONS: - genericUlong = NDIS_MAC_OPTION_RECEIVE_SERIALIZED | + GenericInfo.Ulong = NDIS_MAC_OPTION_RECEIVE_SERIALIZED | NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA | NDIS_MAC_OPTION_TRANSFERS_NOT_PEND | NDIS_MAC_OPTION_NO_LOOPBACK; break; case OID_GEN_MEDIA_CONNECT_STATUS: - genericUlong = Adapter->MediaState; + GenericInfo.Ulong = Adapter->MediaState; break; - case OID_802_3_CURRENT_ADDRESS: copySource = Adapter->MulticastList[0].MacAddress; copyLength = IEEE_802_ADDR_LENGTH; @@ -175,20 +205,39 @@ MiniportQueryInformation( break; case OID_GEN_XMIT_OK: - genericUlong = 0; - break; case OID_GEN_RCV_OK: - genericUlong = 0; - break; case OID_GEN_XMIT_ERROR: - genericUlong = 0; - break; case OID_GEN_RCV_ERROR: - genericUlong = 0; - break; case OID_GEN_RCV_NO_BUFFER: - genericUlong = 0; + { + GenericInfo.Ulong64 = NICQueryStatisticCounter(Adapter, Oid); + + *BytesNeeded = sizeof(ULONG64); + if (InformationBufferLength >= sizeof(ULONG64)) + { + *BytesWritten = sizeof(ULONG64); + NdisMoveMemory(InformationBuffer, copySource, sizeof(ULONG64)); + } + else if (InformationBufferLength >= sizeof(ULONG)) + { + *BytesWritten = sizeof(ULONG); + NdisMoveMemory(InformationBuffer, copySource, sizeof(ULONG)); + } + else + { + *BytesWritten = 0; + return NDIS_STATUS_BUFFER_TOO_SHORT; + } + return NDIS_STATUS_SUCCESS; + } + + case OID_PNP_CAPABILITIES: + { + copyLength = sizeof(NDIS_PNP_CAPABILITIES); + + status = NICFillPowerManagementCapabilities(Adapter, &GenericInfo.PmCapabilities); break; + } default: NDIS_DbgPrint(MIN_TRACE, ("Unknown OID 0x%x(%s)\n", Oid, Oid2Str(Oid))); @@ -202,7 +251,7 @@ MiniportQueryInformation( { *BytesNeeded = copyLength; *BytesWritten = 0; - status = NDIS_STATUS_INVALID_LENGTH; + status = NDIS_STATUS_BUFFER_TOO_SHORT; } else { @@ -217,13 +266,8 @@ MiniportQueryInformation( *BytesNeeded = 0; } - /* XMIT_ERROR and RCV_ERROR are really noisy, so do not log those. */ - if (Oid != OID_GEN_XMIT_ERROR && Oid != OID_GEN_RCV_ERROR) - { - NDIS_DbgPrint(MAX_TRACE, ("Query OID 0x%x(%s): Completed with status 0x%x (%d, %d)\n", - Oid, Oid2Str(Oid), status, *BytesWritten, *BytesNeeded)); - } - + NDIS_DbgPrint(MAX_TRACE, ("Query OID 0x%x(%s): Completed with status 0x%x (%d, %d)\n", + Oid, Oid2Str(Oid), status, *BytesWritten, *BytesNeeded)); return status; } @@ -257,12 +301,12 @@ MiniportSetInformation( NdisMoveMemory(&genericUlong, InformationBuffer, sizeof(ULONG)); if (genericUlong & - (NDIS_PACKET_TYPE_SOURCE_ROUTING | - NDIS_PACKET_TYPE_SMT | - NDIS_PACKET_TYPE_ALL_LOCAL | - NDIS_PACKET_TYPE_GROUP | - NDIS_PACKET_TYPE_ALL_FUNCTIONAL | - NDIS_PACKET_TYPE_FUNCTIONAL)) + ~(NDIS_PACKET_TYPE_DIRECTED | + NDIS_PACKET_TYPE_MULTICAST | + NDIS_PACKET_TYPE_ALL_MULTICAST | + NDIS_PACKET_TYPE_BROADCAST | + NDIS_PACKET_TYPE_PROMISCUOUS | + NDIS_PACKET_TYPE_MAC_FRAME)) { *BytesRead = sizeof(ULONG); *BytesNeeded = sizeof(ULONG); @@ -270,6 +314,11 @@ MiniportSetInformation( break; } + if (Adapter->PacketFilter == genericUlong) + { + break; + } + Adapter->PacketFilter = genericUlong; status = NICApplyPacketFilter(Adapter); @@ -312,15 +361,18 @@ MiniportSetInformation( break; } - if (InformationBufferLength / 6 > MAXIMUM_MULTICAST_ADDRESSES) + if (InformationBufferLength > sizeof(Adapter->MulticastList)) { - *BytesNeeded = MAXIMUM_MULTICAST_ADDRESSES * IEEE_802_ADDR_LENGTH; + *BytesNeeded = sizeof(Adapter->MulticastList); *BytesRead = 0; - status = NDIS_STATUS_INVALID_LENGTH; + status = NDIS_STATUS_MULTICAST_FULL; break; } NdisMoveMemory(Adapter->MulticastList, InformationBuffer, InformationBufferLength); + + Adapter->MulticastListSize = InformationBufferLength / IEEE_802_ADDR_LENGTH; + NICUpdateMulticastList(Adapter); break; diff --git a/drivers/network/dd/e1000/interrupt.c b/drivers/network/dd/e1000/interrupt.c index e3f1b83da98..e4ab64d353f 100644 --- a/drivers/network/dd/e1000/interrupt.c +++ b/drivers/network/dd/e1000/interrupt.c @@ -21,18 +21,24 @@ MiniportISR( ULONG Value; PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; - Value = NICInterruptRecognized(Adapter, InterruptRecognized); - InterlockedOr(&Adapter->InterruptPending, Value); + /* Reading the interrupt acknowledges them */ + E1000ReadUlong(Adapter, E1000_REG_ICR, &Value); - if (!(*InterruptRecognized)) + Value &= Adapter->InterruptMask; + _InterlockedOr(&Adapter->InterruptPending, Value); + + if (Value) + { + *InterruptRecognized = TRUE; + /* Mark the events pending service */ + *QueueMiniportHandleInterrupt = TRUE; + } + else { /* This is not ours. */ + *InterruptRecognized = FALSE; *QueueMiniportHandleInterrupt = FALSE; - return; } - - /* Mark the events pending service */ - *QueueMiniportHandleInterrupt = TRUE; } VOID @@ -46,7 +52,7 @@ MiniportHandleInterrupt( NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - InterruptPending = InterlockedExchange(&Adapter->InterruptPending, 0); + InterruptPending = _InterlockedExchange(&Adapter->InterruptPending, 0); /* Link State Changed */ @@ -101,6 +107,12 @@ MiniportHandleInterrupt( NDIS_DbgPrint(MIN_TRACE, ("Unrecognized ReceiveDescriptor status flag: %u\n", ReceiveDescriptor->Status)); } + /* Make sure the receive indications are enabled */ + if (!Adapter->PacketFilter) + { + goto NextReceiveDescriptor; + } + if (ReceiveDescriptor->Length != 0 && ReceiveDescriptor->Address != 0) { EthHeader = (PETH_HEADER)(Adapter->ReceiveBuffer + BufferOffset); @@ -120,6 +132,7 @@ MiniportHandleInterrupt( NDIS_DbgPrint(MIN_TRACE, ("Got a NULL descriptor")); } +NextReceiveDescriptor: /* Give the descriptor back */ ReceiveDescriptor->Status = 0; diff --git a/drivers/network/dd/e1000/ndis.c b/drivers/network/dd/e1000/ndis.c index d6074cb5a2c..fedbd8ec4bb 100644 --- a/drivers/network/dd/e1000/ndis.c +++ b/drivers/network/dd/e1000/ndis.c @@ -23,44 +23,6 @@ MiniportReset( return NDIS_STATUS_FAILURE; } -NDIS_STATUS -NTAPI -MiniportSend( - IN NDIS_HANDLE MiniportAdapterContext, - IN PNDIS_PACKET Packet, - IN UINT Flags) -{ - PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; - PSCATTER_GATHER_LIST sgList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo); - ULONG TransmitLength; - PHYSICAL_ADDRESS TransmitBuffer; - NDIS_STATUS Status; - - ASSERT(sgList != NULL); - ASSERT(sgList->NumberOfElements == 1); - ASSERT((sgList->Elements[0].Address.LowPart & 3) == 0); - ASSERT(sgList->Elements[0].Length <= MAXIMUM_FRAME_SIZE); - - if (Adapter->TxFull) - { - NDIS_DbgPrint(MIN_TRACE, ("All TX descriptors are full\n")); - return NDIS_STATUS_RESOURCES; - } - - TransmitLength = sgList->Elements[0].Length; - TransmitBuffer = sgList->Elements[0].Address; - Adapter->TransmitPackets[Adapter->CurrentTxDesc] = Packet; - - Status = NICTransmitPacket(Adapter, TransmitBuffer, TransmitLength); - if (Status != NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Transmit packet failed\n")); - return Status; - } - - return NDIS_STATUS_PENDING; -} - VOID NTAPI MiniportHalt( @@ -264,12 +226,7 @@ MiniportInitialize( /* Enable interrupts on the NIC */ Adapter->InterruptMask = DEFAULT_INTERRUPT_MASK; - Status = NICApplyInterruptMask(Adapter); - if (Status != NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to apply interrupt mask (0x%x)\n", Status)); - goto Cleanup; - } + NICApplyInterruptMask(Adapter); /* Turn on TX and RX now */ Status = NICEnableTxRx(Adapter); diff --git a/drivers/network/dd/e1000/nic.h b/drivers/network/dd/e1000/nic.h index c1bd82997fc..32b1c888b7f 100644 --- a/drivers/network/dd/e1000/nic.h +++ b/drivers/network/dd/e1000/nic.h @@ -26,6 +26,11 @@ typedef struct _E1000_ADAPTER { + /* NIC Memory */ + volatile PUCHAR IoBase; + NDIS_PHYSICAL_ADDRESS IoAddress; + ULONG IoLength; + // NDIS_SPIN_LOCK AdapterLock; NDIS_HANDLE AdapterHandle; @@ -35,9 +40,11 @@ typedef struct _E1000_ADAPTER USHORT SubsystemVendorID; UCHAR PermanentMacAddress[IEEE_802_ADDR_LENGTH]; + struct { UCHAR MacAddress[IEEE_802_ADDR_LENGTH]; } MulticastList[MAXIMUM_MULTICAST_ADDRESSES]; + ULONG MulticastListSize; ULONG LinkSpeedMbps; ULONG MediaState; @@ -48,11 +55,6 @@ typedef struct _E1000_ADAPTER ULONG IoPortLength; volatile PUCHAR IoPort; - /* NIC Memory */ - NDIS_PHYSICAL_ADDRESS IoAddress; - ULONG IoLength; - volatile PUCHAR IoBase; - /* Interrupt */ ULONG InterruptVector; ULONG InterruptLevel; @@ -63,7 +65,9 @@ typedef struct _E1000_ADAPTER BOOLEAN InterruptRegistered; LONG InterruptMask; - LONG InterruptPending; + + _Interlocked_ + volatile LONG InterruptPending; /* Transmit */ @@ -156,22 +160,6 @@ NTAPI NICApplyPacketFilter( IN PE1000_ADAPTER Adapter); -NDIS_STATUS -NTAPI -NICApplyInterruptMask( - IN PE1000_ADAPTER Adapter); - -NDIS_STATUS -NTAPI -NICDisableInterrupts( - IN PE1000_ADAPTER Adapter); - -ULONG -NTAPI -NICInterruptRecognized( - IN PE1000_ADAPTER Adapter, - OUT PBOOLEAN InterruptRecognized); - VOID NTAPI NICUpdateLinkStatus( @@ -179,10 +167,10 @@ NICUpdateLinkStatus( NDIS_STATUS NTAPI -NICTransmitPacket( - IN PE1000_ADAPTER Adapter, - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG Length); +MiniportSend( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PNDIS_PACKET Packet, + _In_ UINT Flags); NDIS_STATUS NTAPI @@ -216,19 +204,54 @@ NTAPI MiniportHandleInterrupt( IN NDIS_HANDLE MiniportAdapterContext); - +FORCEINLINE VOID -NTAPI E1000ReadUlong( - IN PE1000_ADAPTER Adapter, - IN ULONG Address, - OUT PULONG Value); + _In_ PE1000_ADAPTER Adapter, + _In_ ULONG Address, + _Out_ PULONG Value) +{ + NdisReadRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); +} +FORCEINLINE VOID -NTAPI E1000WriteUlong( - IN PE1000_ADAPTER Adapter, - IN ULONG Address, - IN ULONG Value); + _In_ PE1000_ADAPTER Adapter, + _In_ ULONG Address, + _In_ ULONG Value) +{ + NdisWriteRegisterUlong((PULONG)(Adapter->IoBase + Address), Value); +} + +FORCEINLINE +VOID +E1000WriteIoUlong( + _In_ PE1000_ADAPTER Adapter, + _In_ ULONG Address, + _In_ ULONG Value) +{ + volatile ULONG Dummy; + + NdisRawWritePortUlong((PULONG)(Adapter->IoPort), Address); + NdisReadRegisterUlong(Adapter->IoBase + E1000_REG_STATUS, &Dummy); + NdisRawWritePortUlong((PULONG)(Adapter->IoPort + 4), Value); +} + +FORCEINLINE +VOID +NICApplyInterruptMask( + _In_ PE1000_ADAPTER Adapter) +{ + E1000WriteUlong(Adapter, E1000_REG_IMS, Adapter->InterruptMask /*| 0x1F6DC*/); +} + +FORCEINLINE +VOID +NICDisableInterrupts( + _In_ PE1000_ADAPTER Adapter) +{ + E1000WriteUlong(Adapter, E1000_REG_IMC, ~0); +} #endif /* _E1000_PCH_ */ diff --git a/drivers/network/dd/e1000/send.c b/drivers/network/dd/e1000/send.c new file mode 100644 index 00000000000..990e8b313d2 --- /dev/null +++ b/drivers/network/dd/e1000/send.c @@ -0,0 +1,85 @@ +/* + * PROJECT: ReactOS Intel PRO/1000 Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) + * PURPOSE: Sending packets + * COPYRIGHT: Copyright 2018 Mark Jansen <mark.jansen(a)reactos.org> + * Copyright 2019 Victor Perevertkin <victor.perevertkin(a)reactos.org> + */ + +#include "nic.h" + +#include <debug.h> + +static +NDIS_STATUS +NICTransmitPacket( + _In_ PE1000_ADAPTER Adapter, + _In_ PHYSICAL_ADDRESS PhysicalAddress, + _In_ ULONG Length) +{ + volatile PE1000_TRANSMIT_DESCRIPTOR TransmitDescriptor; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + TransmitDescriptor = Adapter->TransmitDescriptors + Adapter->CurrentTxDesc; + TransmitDescriptor->Address = PhysicalAddress.QuadPart; + TransmitDescriptor->Length = Length; + TransmitDescriptor->ChecksumOffset = 0; + TransmitDescriptor->Command = E1000_TDESC_CMD_RS | E1000_TDESC_CMD_IFCS | + E1000_TDESC_CMD_EOP | E1000_TDESC_CMD_IDE; + TransmitDescriptor->Status = 0; + TransmitDescriptor->ChecksumStartField = 0; + TransmitDescriptor->Special = 0; + + Adapter->CurrentTxDesc = (Adapter->CurrentTxDesc + 1) % NUM_TRANSMIT_DESCRIPTORS; + + E1000WriteUlong(Adapter, E1000_REG_TDT, Adapter->CurrentTxDesc); + + if (Adapter->CurrentTxDesc == Adapter->LastTxDesc) + { + NDIS_DbgPrint(MID_TRACE, ("All TX descriptors are full now\n")); + Adapter->TxFull = TRUE; + } + + return NDIS_STATUS_SUCCESS; +} + +NDIS_STATUS +NTAPI +MiniportSend( + _In_ NDIS_HANDLE MiniportAdapterContext, + _In_ PNDIS_PACKET Packet, + _In_ UINT Flags) +{ + PE1000_ADAPTER Adapter = (PE1000_ADAPTER)MiniportAdapterContext; + PSCATTER_GATHER_LIST sgList; + ULONG TransmitLength; + PHYSICAL_ADDRESS TransmitBuffer; + NDIS_STATUS Status; + + sgList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo); + + ASSERT(sgList != NULL); + ASSERT(sgList->NumberOfElements == 1); + ASSERT((sgList->Elements[0].Address.LowPart & 3) == 0); + ASSERT(sgList->Elements[0].Length <= MAXIMUM_FRAME_SIZE); + + if (Adapter->TxFull) + { + NDIS_DbgPrint(MIN_TRACE, ("All TX descriptors are full\n")); + return NDIS_STATUS_RESOURCES; + } + + TransmitLength = sgList->Elements[0].Length; + TransmitBuffer = sgList->Elements[0].Address; + Adapter->TransmitPackets[Adapter->CurrentTxDesc] = Packet; + + Status = NICTransmitPacket(Adapter, TransmitBuffer, TransmitLength); + if (Status != NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Transmit packet failed\n")); + return Status; + } + + return NDIS_STATUS_PENDING; +}

1 0

[reactos] 01/01: [NTUSER][USER32] Simplify SwitchToThisWindow (#4153)
by Katayama Hirofumi MZ 12 Dec '21

12 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55a1c29341bf452377fa9… commit 55a1c29341bf452377fa9bab9b2773d813261c39 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 13 08:14:33 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 13 08:14:33 2021 +0900 [NTUSER][USER32] Simplify SwitchToThisWindow (#4153) CORE-17894 --- win32ss/user/ntuser/simplecall.c | 29 +++++++++++++---------------- win32ss/user/user32/controls/appswitch.c | 31 +++++-------------------------- 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index ce190357db1..2a2c92ac0ec 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -512,28 +512,25 @@ NtUserCallTwoParam( Ret = 0; Window = UserGetWindowObject(hwnd); if (!Window) - { break; - } - if (MsqIsHung(Window->head.pti, MSQ_HUNG)) - { - // TODO: Make the window ghosted and activate. - break; - } - if (fAltTab) + + if (gpqForeground && !fAltTab) { - if (Window->style & WS_MINIMIZE) + PWND pwndActive = gpqForeground->spwndActive; + if (pwndActive && !(pwndActive->ExStyle & WS_EX_TOPMOST)) { - UserPostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + co_WinPosSetWindowPos(pwndActive, HWND_BOTTOM, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOSENDCHANGING | SWP_ASYNCWINDOWPOS); } - /* bring window to top and activate */ - co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOSENDCHANGING | - SWP_NOOWNERZORDER | SWP_ASYNCWINDOWPOS); } - else + + UserSetActiveWindow(Window); + + if (fAltTab && (Window->style & WS_MINIMIZE)) { - UserSetActiveWindow(Window); + MSG msg = { Window->head.h, WM_SYSCOMMAND, SC_RESTORE, 0 }; + MsqPostMessage(Window->head.pti, &msg, FALSE, QS_POSTMESSAGE, 0, 0); } break; } diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index 61dff7ab6f5..fa522be1c01 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -71,18 +71,6 @@ int CoolSwitchColumns = 7; const DWORD Style = WS_POPUP | WS_BORDER | WS_DISABLED; const DWORD ExStyle = WS_EX_TOPMOST | WS_EX_DLGMODALFRAME | WS_EX_TOOLWINDOW; -DWORD wtodw(const WCHAR *psz) -{ - const WCHAR *pch = psz; - DWORD Value = 0; - while ('0' <= *pch && *pch <= '9') - { - Value *= 10; - Value += *pch - L'0'; - } - return Value; -} - BOOL LoadCoolSwitchSettings(void) { CoolSwitch = TRUE; @@ -122,15 +110,6 @@ void ResizeAndCenter(HWND hwnd, int width, int height) ptStart.y = y; } -void MakeWindowActive(HWND hwnd) -{ - if (IsIconic(hwnd)) - PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); - - // See also: https://microsoft.public.win32.programmer.ui.narkive.com/RqOdKqZ8/bringwind… - SwitchToThisWindow(hwnd, TRUE); -} - void CompleteSwitch(BOOL doSwitch) { if (!isOpen) @@ -155,7 +134,7 @@ void CompleteSwitch(BOOL doSwitch) TRACE("[ATbot] CompleteSwitch Switching to 0x%08x (%ls)\n", hwnd, windowText); - MakeWindowActive(hwnd); + SwitchToThisWindow(hwnd, TRUE); } } @@ -485,7 +464,7 @@ BOOL ProcessHotKey(VOID) if (windowCount == 1) { - MakeWindowActive(windowList[0]); + SwitchToThisWindow(windowList[0], TRUE); return FALSE; } @@ -496,7 +475,7 @@ BOOL ProcessHotKey(VOID) TRACE("[ATbot] HotKey Received. Opening window.\n"); ShowWindowAsync(switchdialog, SW_SHOWNORMAL); - MakeWindowActive(switchdialog); + SwitchToThisWindow(switchdialog, TRUE); isOpen = TRUE; } else @@ -525,7 +504,7 @@ void RotateTasks(BOOL bShift) SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS); - MakeWindowActive(hwndLast); + SwitchToThisWindow(hwndLast, TRUE); Size = (windowCount - 1) * sizeof(HWND); MoveMemory(&windowList[1], &windowList[0], Size); @@ -537,7 +516,7 @@ void RotateTasks(BOOL bShift) SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS); - MakeWindowActive(windowList[1]); + SwitchToThisWindow(windowList[1], TRUE); Size = (windowCount - 1) * sizeof(HWND); MoveMemory(&windowList[0], &windowList[1], Size);

1 0

[reactos] 01/01: [KERNEL32] SetComputerNameExW: Truncate the computer name
by Eric Kohl 12 Dec '21

12 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf8380100eb2221d53f03… commit cf8380100eb2221d53f03df08070121e92d5014e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 12 17:40:52 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 12 17:40:52 2021 +0100 [KERNEL32] SetComputerNameExW: Truncate the computer name This fixes the SetComputerNameExW api test. --- dll/win32/kernel32/client/compname.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/client/compname.c b/dll/win32/kernel32/client/compname.c index 2b4b335d4f7..8b9a5497fb3 100644 --- a/dll/win32/kernel32/client/compname.c +++ b/dll/win32/kernel32/client/compname.c @@ -648,6 +648,7 @@ WINAPI SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, LPCWSTR lpBuffer) { + WCHAR szShortName[MAX_COMPUTERNAME_LENGTH + 1]; BOOL ret1, ret2; if (!IsValidComputerName(NameType, lpBuffer)) @@ -670,17 +671,19 @@ SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, L"NV Hostname", lpBuffer); + RtlStringCchCopyNW(szShortName, ARRAYSIZE(szShortName), lpBuffer, MAX_COMPUTERNAME_LENGTH); ret2 = SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\ComputerName\\ComputerName", L"ComputerName", - lpBuffer); + szShortName); return (ret1 && ret2); case ComputerNamePhysicalNetBIOS: + RtlStringCchCopyNW(szShortName, ARRAYSIZE(szShortName), lpBuffer, MAX_COMPUTERNAME_LENGTH); return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Control\\ComputerName\\ComputerName", L"ComputerName", - lpBuffer); + szShortName); default: SetLastError(ERROR_INVALID_PARAMETER);

1 0

[reactos] 01/01: [USETUP] Improve Portuguese (pt-PT) translation (#4131)
by Jose Carlos Jesus 10 Dec '21

10 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=067c08c23fe20f2dfa874… commit 067c08c23fe20f2dfa874a0da7a48204e7a78683 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Dec 10 14:16:16 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 10 17:16:16 2021 +0300 [USETUP] Improve Portuguese (pt-PT) translation (#4131) --- base/setup/usetup/lang/pt-PT.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index ab895a038de..3338810b0ac 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1493,35 +1493,35 @@ static MUI_ENTRY ptPTBootLoaderEntries[] = { 6, 8, - "O instalador ir\240 configurar o gestor de inicializa\207\306o", + "O instalador ir\240 configurar o gestor de arranque.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 12, - "Instalar o gestor de inicializa\207\306o no disco r\241gido (MBR e VBR)", + "Instalar o gestor de arranque no disco r\241gido (MBR e VBR)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 13, - "Instalar o gestor de inicializa\207\306o no disco r\241gido (apenas VBR)", + "Instalar o gestor de arranque no disco r\241gido (apenas VBR)", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 14, - "Instalar o gestor de inicializa\207\306o numa disquete", + "Instalar o gestor de arranque numa disquete", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 8, 15, - "Saltar a instala\207\306o do gestor de inicializa\207\306o", + "Saltar a instala\207\306o do gestor de arranque", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

1 0

[reactos] 01/01: [USER32] Partially fix freezing of Task Switcher (#4148)
by Katayama Hirofumi MZ 10 Dec '21

10 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c9b6fdb5cb1fc111d39a… commit 8c9b6fdb5cb1fc111d39a66920fee5e4351e850f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 10 13:37:43 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 10 13:37:43 2021 +0900 [USER32] Partially fix freezing of Task Switcher (#4148) - Use SendMessageTimeout instead of SendMessage. - Use SwitchToThisWindow instead of BringWindowToTop. - Use ShowWindowAsync instead of ShowWindow. - Use SWP_ASYNCWINDOWPOS for SetWindowPos. CORE-17894 --- win32ss/user/user32/controls/appswitch.c | 80 +++++++++++++++++--------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/win32ss/user/user32/controls/appswitch.c b/win32ss/user/user32/controls/appswitch.c index 03531acfe85..61dff7ab6f5 100644 --- a/win32ss/user/user32/controls/appswitch.c +++ b/win32ss/user/user32/controls/appswitch.c @@ -127,8 +127,8 @@ void MakeWindowActive(HWND hwnd) if (IsIconic(hwnd)) PostMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); - BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ? - SetForegroundWindow(hwnd); + // See also: https://microsoft.public.win32.programmer.ui.narkive.com/RqOdKqZ8/bringwind… + SwitchToThisWindow(hwnd, TRUE); } void CompleteSwitch(BOOL doSwitch) @@ -139,7 +139,7 @@ void CompleteSwitch(BOOL doSwitch) isOpen = FALSE; TRACE("[ATbot] CompleteSwitch Hiding Window.\n"); - ShowWindow(switchdialog, SW_HIDE); + ShowWindowAsync(switchdialog, SW_HIDE); if(doSwitch) { @@ -164,45 +164,49 @@ void CompleteSwitch(BOOL doSwitch) BOOL CALLBACK EnumerateCallback(HWND window, LPARAM lParam) { - HICON hIcon; + HICON hIcon = NULL; + LRESULT bAlive; - UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(lParam); - // First try to get the big icon assigned to the window - hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_BIG, 0); - if (!hIcon) - { - // If no icon is assigned, try to get the icon assigned to the windows' class - hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON); - if (!hIcon) - { - // If we still don't have an icon, see if we can do with the small icon, - // or a default application icon - hIcon = (HICON)SendMessageW(window, WM_GETICON, ICON_SMALL2, 0); - if (!hIcon) - { - // using windows logo icon as default - hIcon = gpsi->hIconWindows; + // First try to get the big icon assigned to the window +#define ICON_TIMEOUT 100 // in milliseconds + bAlive = SendMessageTimeoutW(window, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG | SMTO_BLOCK, + ICON_TIMEOUT, (PDWORD_PTR)&hIcon); + if (!hIcon) + { + // If no icon is assigned, try to get the icon assigned to the windows' class + hIcon = (HICON)GetClassLongPtrW(window, GCL_HICON); + if (!hIcon) + { + // If we still don't have an icon, see if we can do with the small icon, + // or a default application icon + if (bAlive) + { + SendMessageTimeoutW(window, WM_GETICON, ICON_SMALL2, 0, + SMTO_ABORTIFHUNG | SMTO_BLOCK, ICON_TIMEOUT, + (PDWORD_PTR)&hIcon); + } +#undef ICON_TIMEOUT if (!hIcon) { - //if all attempts to get icon fails go to the next window - return TRUE; + // using windows logo icon as default + hIcon = gpsi->hIconWindows; + if (!hIcon) + { + //if all attempts to get icon fails go to the next window + return TRUE; + } } - } - } - } - - windowList[windowCount] = window; - iconList[windowCount] = CopyIcon(hIcon); - - windowCount++; + } + } - // If we got to the max number of windows, - // we won't be able to add any more - if(windowCount >= MAX_WINDOWS) - return FALSE; + windowList[windowCount] = window; + iconList[windowCount] = CopyIcon(hIcon); + windowCount++; - return TRUE; + // If we got to the max number of windows, we won't be able to add any more + return (windowCount < MAX_WINDOWS); } static HWND GetNiceRootOwner(HWND hwnd) @@ -491,7 +495,7 @@ BOOL ProcessHotKey(VOID) selectedWindow = 1; TRACE("[ATbot] HotKey Received. Opening window.\n"); - ShowWindow(switchdialog, SW_SHOWNORMAL); + ShowWindowAsync(switchdialog, SW_SHOWNORMAL); MakeWindowActive(switchdialog); isOpen = TRUE; } @@ -519,7 +523,7 @@ void RotateTasks(BOOL bShift) { SetWindowPos(hwndLast, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOOWNERZORDER | SWP_NOREPOSITION); + SWP_NOOWNERZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS); MakeWindowActive(hwndLast); @@ -531,7 +535,7 @@ void RotateTasks(BOOL bShift) { SetWindowPos(hwndFirst, hwndLast, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOOWNERZORDER | SWP_NOREPOSITION); + SWP_NOOWNERZORDER | SWP_NOREPOSITION | SWP_ASYNCWINDOWPOS); MakeWindowActive(windowList[1]);

1 0

[reactos] 01/01: [KERNEL32_APITEST] Improve MultiByteToWideChar testcase
by Katayama Hirofumi MZ 10 Dec '21

10 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=581757d8618c828c0ebba… commit 581757d8618c828c0ebbad479f10a625226c7e5c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 10 12:24:41 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 10 12:24:41 2021 +0900 [KERNEL32_APITEST] Improve MultiByteToWideChar testcase - Fix WinXP and ReactOS cases. CORE-13349 NOTE: We use Win10's MultiByteToWideChar behaviour due to security reason. --- dll/win32/kernel32/winnls/string/nls.c | 4 +- .../apitests/kernel32/MultiByteToWideChar.c | 66 +++++++++++----------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/nls.c b/dll/win32/kernel32/winnls/string/nls.c index 7264fa73cae..a1bad1b2271 100644 --- a/dll/win32/kernel32/winnls/string/nls.c +++ b/dll/win32/kernel32/winnls/string/nls.c @@ -356,9 +356,10 @@ IntGetCodePageEntry(UINT CodePage) * * Internal version of MultiByteToWideChar for UTF8. * + * @note We use Win10's behaviour due to security reason. + * * @see MultiByteToWideChar */ - static INT WINAPI @@ -1633,7 +1634,6 @@ static INT Utf7ToWideChar(const char *src, int srclen, WCHAR *dst, int dstlen) * * @implemented */ - INT WINAPI MultiByteToWideChar(UINT CodePage, diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index d0dbf864110..71fbd68d92a 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -7,12 +7,10 @@ */ #include "precomp.h" +#include <versionhelpers.h> static ULONG OsVersion; -/* NOTE: Tested on Win10. We follow Win10 in this function. - Win10 might alter its design in future. */ - /* TODO: Russian, French, Korean etc. codepages */ #define CP932 932 /* Japanese Shift_JIS (SJIS) codepage */ @@ -126,7 +124,7 @@ static const ENTRY Entries[] = { __LINE__, {0x600,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xC0\xC0\x80", 4, 1, {0xFFFD, 0x7F7F}, 2 }, { __LINE__, {0x000,0x502}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\xC0", 3, 1, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\xC0", 3, 1, {0xFFFD, 0x7F7F}, 2 }, - { __LINE__, {0x000,0x502}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\x20\xC0", 4, 1, {0x0020, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\x20\xC0", 4, 1, {0x0020, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\xE0\x20\xC0", 4, 1, {0xFFFD, 0x7F7F}, 2 }, { __LINE__, {0x000,0x502}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, "\x82\xA0\x82\xA2", -1, 1, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, "\x82\xA0\x82\xA2", -1, 1, {0xFFFD, 0x7F7F}, 2 }, @@ -142,9 +140,9 @@ static const ENTRY Entries[] = { __LINE__, {0x000,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, UTF8_Japanese, sizeof(UTF8_Japanese), 1, {0x65E5, 0x7F7F}, 2 }, { __LINE__, {0x000,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, sizeof(UTF8_Japanese), 1, {0x65E5, 0x7F7F}, 2 }, /* Japanese UTF-8 truncated source */ - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, UTF8_Japanese, 1, 4, {0x7F7F, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, UTF8_Japanese, 1, 4, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 1, 0xBEAF, CP_UTF8, 0, UTF8_Japanese, 1, 4, {0xFFFD, 0x7F7F}, 2 }, - { __LINE__, {0x000,0x502}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, 1, 4, {0x7F7F, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, 1, 4, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 0, ERROR_NO_UNICODE_TRANSLATION, CP_UTF8, MB_ERR_INVALID_CHARS, UTF8_Japanese, 1, 4, {0xFFFD, 0x7F7F}, 2 }, /* Japanese CP932 without buffer */ { __LINE__, {0x000,0xA00}, 4, 0xBEAF, CP932, 0, SJIS_Japanese, sizeof(SJIS_Japanese) }, @@ -160,66 +158,66 @@ static const ENTRY Entries[] = { __LINE__, {0x600,0xA00}, 1, 0xBEAF, CP932, 0, SJIS_Japanese, 1, 4, {0x30FB, 0x7F7F}, 2 }, { __LINE__, {0x000,0xA00}, 0, ERROR_NO_UNICODE_TRANSLATION, CP932, MB_ERR_INVALID_CHARS, SJIS_Japanese, 1, 4, {0x7F7F, 0x7F7F}, 2 }, /* invalid 5-byte UTF-8 sequences */ - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 1, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 1, 8, {0xFFFD, 0x7F7F}, 2 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, { __LINE__, {0x600,0xA00}, 2, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 2, 8, {0xFFFD, 0xFFFD, 0x7F7F}, 3 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, { __LINE__, {0x600,0xA00}, 3, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 3, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 4 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, { __LINE__, {0x600,0xA00}, 4, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 4, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 5 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, { __LINE__, {0x600,0xA00}, 5, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 5, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 6 }, { __LINE__, {0x000,0x502}, 1, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 6, 8, {0, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, { __LINE__, {0x600,0xA00}, 6, 0xBEAF, CP_UTF8, 0, "\xF8\xA3\xA3\xA3\xA3", 6, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0}, 6 }, /* invalid 6-byte UTF-8 sequences */ - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 1, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 1, 8, {0xFFFD, 0x7F7F}, 2 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, { __LINE__, {0x600,0xA00}, 2, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 2, 8, {0xFFFD, 0xFFFD, 0x7F7F}, 3 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, { __LINE__, {0x600,0xA00}, 3, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 3, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 4 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, { __LINE__, {0x600,0xA00}, 4, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 4, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 5 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, { __LINE__, {0x600,0xA00}, 5, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 5, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 6 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 6, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 6, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, { __LINE__, {0x600,0xA00}, 6, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 6, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 7 }, { __LINE__, {0x000,0x502}, 1, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 7, 8, {0, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, { __LINE__, {0x600,0xA00}, 7, 0xBEAF, CP_UTF8, 0, "\xFC\xA3\xA3\xA3\xA3\xA3", 7, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0}, 7 }, /* invalid 7-byte UTF-8 sequences */ - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 1, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 1, 8, {0xFFFD, 0x7F7F}, 2 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, { __LINE__, {0x600,0xA00}, 2, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 2, 8, {0xFFFD, 0xFFFD, 0x7F7F}, 3 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, { __LINE__, {0x600,0xA00}, 3, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 3, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 4 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, { __LINE__, {0x600,0xA00}, 4, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 4, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 5 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, { __LINE__, {0x600,0xA00}, 5, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 5, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 6 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 6, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 6, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, { __LINE__, {0x600,0xA00}, 6, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 6, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 7 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 7, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 8 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 7, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 8 }, { __LINE__, {0x600,0xA00}, 7, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 7, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 8 }, { __LINE__, {0x000,0x502}, 1, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 8, 8, {0, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 8 }, { __LINE__, {0x600,0xA00}, 8, 0xBEAF, CP_UTF8, 0, "\xFE\xA3\xA3\xA3\xA3\xA3\xA3", 8, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0}, 8 }, /* invalid UTF-8 sequences */ - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 1, 8, {0x7F7F, 0x7F7F}, 2 }, { __LINE__, {0x600,0xA00}, 1, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 1, 8, {0xFFFD, 0x7F7F}, 2 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 2, 8, {0x7F7F, 0x7F7F, 0x7F7F}, 3 }, { __LINE__, {0x600,0xA00}, 2, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 2, 8, {0xFFFD, 0xFFFD, 0x7F7F}, 3 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 3, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 4 }, { __LINE__, {0x600,0xA00}, 3, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 3, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 4 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 4, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 5 }, { __LINE__, {0x600,0xA00}, 4, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 4, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 5 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 5, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 6 }, { __LINE__, {0x600,0xA00}, 5, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 5, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 6 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 6, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 6, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 7 }, { __LINE__, {0x600,0xA00}, 6, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 6, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 7 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 7, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 8 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 7, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 8 }, { __LINE__, {0x600,0xA00}, 7, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 7, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 8 }, - { __LINE__, {0x000,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 8, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 9 }, + { __LINE__, {0x502,0x502}, 0, ERROR_SUCCESS, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 8, 8, {0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 9 }, { __LINE__, {0x600,0xA00}, 8, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 8, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 9 }, { __LINE__, {0x000,0x502}, 1, 0xBEAF, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 9, 8, {0, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F, 0x7F7F}, 9 }, { __LINE__, {0x600,0xA00}, 0, ERROR_INSUFFICIENT_BUFFER, CP_UTF8, 0, "\xFF\xA3\xA3\xA3\xA3\xA3\xA3\xA3", 9, 8, {0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x7F7F}, 9 }, @@ -308,6 +306,10 @@ START_TEST(MultiByteToWideChar) OsVersion = (vi.dwMajorVersion << 8) | vi.dwMinorVersion; + /* NOTE: We use Win10's MultiByteToWideChar behaviour due to security reason. */ + if (IsReactOS()) + OsVersion = 0xa00; + for (i = 0; i < _countof(Entries); ++i) { TestEntry(&Entries[i]);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs