Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [XCOPY_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21c5ece5da9a60783448e… commit 21c5ece5da9a60783448e86fb75c448099f24237 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:17:02 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:17:02 2018 +0100 [XCOPY_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/xcopy/xcopy.c | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/modules/rostests/winetests/xcopy/xcopy.c b/modules/rostests/winetests/xcopy/xcopy.c index ec7683aecc..17b4406b74 100644 --- a/modules/rostests/winetests/xcopy/xcopy.c +++ b/modules/rostests/winetests/xcopy/xcopy.c @@ -73,6 +73,65 @@ static void test_date_format(void) DeleteFileA("xcopytest\\xcopy1"); } +static void test_parms_syntax(void) +{ + DWORD rc; + + rc = runcmd("xcopy /H/D:20-01-2000 xcopy1 xcopytest"); + ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, + "xcopy should not have created xcopytest\\xcopy1\n"); + + rc = runcmd("xcopy /D:01-20-2000/H xcopy1 xcopytest"); + ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); + + /* The following test is commented out as under wine it generates + a recursively deep directory tree (todo_wine) + rc = runcmd("xcopy /D:1-20-2000/E xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y/E test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); */ + + rc = runcmd("xcopy /D/S xcopytest xcopytest2\\"); + ok(rc == 0, "xcopy /D/S test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES, + "xcopy copied empty directory incorrectly\n"); + + rc = runcmd("xcopy /D/S/E xcopytest xcopytest2\\"); + ok(rc == 0, "xcopy /D/S/E test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES, + "xcopy failed to copy empty directory\n"); + RemoveDirectoryA("xcopytest2"); +} + +static void test_keep_attributes(void) +{ + DWORD rc; + + SetFileAttributesA("xcopy1", FILE_ATTRIBUTE_READONLY); + + rc = runcmd("xcopy xcopy1 xcopytest"); + ok(rc == 0, "xcopy failed to copy read only file\n"); + ok((GetFileAttributesA("xcopytest\\xcopy1") & FILE_ATTRIBUTE_READONLY) != FILE_ATTRIBUTE_READONLY, + "xcopy should not have copied file permissions\n"); + SetFileAttributesA("xcopytest\\xcopy1", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("xcopytest\\xcopy1"); + + rc = runcmd("xcopy /K xcopy1 xcopytest"); + ok(rc == 0, "xcopy failed to copy read only file with /k\n"); + ok((GetFileAttributesA("xcopytest\\xcopy1") & FILE_ATTRIBUTE_READONLY) == FILE_ATTRIBUTE_READONLY, + "xcopy did not keep file permissions\n"); + SetFileAttributesA("xcopytest\\xcopy1", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("xcopytest\\xcopy1"); + + SetFileAttributesA("xcopy1", FILE_ATTRIBUTE_NORMAL); + + } + START_TEST(xcopy) { char tmpdir[MAX_PATH]; @@ -94,6 +153,8 @@ START_TEST(xcopy) CloseHandle(hfile); test_date_format(); + test_parms_syntax(); + test_keep_attributes(); DeleteFileA("xcopy1"); RemoveDirectoryA("xcopytest");

1 0

01/01: [XCOPY] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19eb7a62f98ec5aac53a2… commit 19eb7a62f98ec5aac53a28c472bf7947f5e50cde Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:16:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:16:20 2018 +0100 [XCOPY] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/xcopy/CMakeLists.txt | 1 + base/applications/cmdutils/xcopy/lang/da-DK.rc | 1 + base/applications/cmdutils/xcopy/lang/de-DE.rc | 1 + base/applications/cmdutils/xcopy/lang/en-US.rc | 1 + base/applications/cmdutils/xcopy/lang/es-ES.rc | 1 + base/applications/cmdutils/xcopy/lang/fr-FR.rc | 1 + base/applications/cmdutils/xcopy/lang/it-IT.rc | 1 + base/applications/cmdutils/xcopy/lang/ja-JP.rc | 1 + base/applications/cmdutils/xcopy/lang/ko-KR.rc | 1 + base/applications/cmdutils/xcopy/lang/lt-LT.rc | 1 + base/applications/cmdutils/xcopy/lang/nl-NL.rc | 1 + base/applications/cmdutils/xcopy/lang/no-NO.rc | 1 + base/applications/cmdutils/xcopy/lang/pl-PL.rc | 1 + base/applications/cmdutils/xcopy/lang/pt-BR.rc | 1 + base/applications/cmdutils/xcopy/lang/pt-PT.rc | 1 + base/applications/cmdutils/xcopy/lang/ro-RO.rc | 1 + base/applications/cmdutils/xcopy/lang/ru-RU.rc | 1 + base/applications/cmdutils/xcopy/lang/sl-SI.rc | 1 + base/applications/cmdutils/xcopy/lang/sq-AL.rc | 1 + base/applications/cmdutils/xcopy/lang/sr-SP.rc | 2 + base/applications/cmdutils/xcopy/lang/sv-SE.rc | 1 + base/applications/cmdutils/xcopy/lang/tr-TR.rc | 1 + base/applications/cmdutils/xcopy/lang/uk-UA.rc | 1 + base/applications/cmdutils/xcopy/lang/zh-CN.rc | 1 + base/applications/cmdutils/xcopy/lang/zh-TW.rc | 1 + base/applications/cmdutils/xcopy/xcopy.c | 259 ++++++++++++++---------- base/applications/cmdutils/xcopy/xcopy.h | 1 + media/doc/README.WINE | 2 +- 28 files changed, 180 insertions(+), 108 deletions(-) diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt index 5cc5e81ce2..f2fa0cf0ad 100644 --- a/base/applications/cmdutils/xcopy/CMakeLists.txt +++ b/base/applications/cmdutils/xcopy/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) add_executable(xcopy xcopy.c xcopy.rc) target_link_libraries(xcopy wine) set_module_type(xcopy win32cui UNICODE) diff --git a/base/applications/cmdutils/xcopy/lang/da-DK.rc b/base/applications/cmdutils/xcopy/lang/da-DK.rc index 8918785163..6fda70a96a 100644 --- a/base/applications/cmdutils/xcopy/lang/da-DK.rc +++ b/base/applications/cmdutils/xcopy/lang/da-DK.rc @@ -49,6 +49,7 @@ hvor:\n\ [/C] Fortsæt selv om det opstår fejl under kopieringen\n\ [/A] Kopier ikke filer som er markeret som arkiv\n\ [/M] Kopier kun filer som er markeret som akriv; fjerner denne markering\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ \t\tden opgivne dato.\n\ \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ diff --git a/base/applications/cmdutils/xcopy/lang/de-DE.rc b/base/applications/cmdutils/xcopy/lang/de-DE.rc index b149d8b746..4e4e711eae 100644 --- a/base/applications/cmdutils/xcopy/lang/de-DE.rc +++ b/base/applications/cmdutils/xcopy/lang/de-DE.rc @@ -49,6 +49,7 @@ Mit:\n\ [/C] Nach Fehlern den Kopiervorgang fortsetzen\n\ [/A] Nur Dateien mit Archivbit kopieren\n\ [/M] Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:M-T-J] Kopiere neue Dateien und Dateien, die neuer als das\n\ \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/en-US.rc b/base/applications/cmdutils/xcopy/lang/en-US.rc index 615a244f0c..a63c83829c 100644 --- a/base/applications/cmdutils/xcopy/lang/en-US.rc +++ b/base/applications/cmdutils/xcopy/lang/en-US.rc @@ -50,6 +50,7 @@ Where:\n\ [/A] Only copy files with archive attribute set.\n\ [/M] Only copy files with archive attribute set, removes the\n\ \tarchive attribute.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source.\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/es-ES.rc b/base/applications/cmdutils/xcopy/lang/es-ES.rc index e0997c2503..1a1358e2e3 100644 --- a/base/applications/cmdutils/xcopy/lang/es-ES.rc +++ b/base/applications/cmdutils/xcopy/lang/es-ES.rc @@ -50,6 +50,7 @@ En la cual:\n\ [/A] Copia solamente archivos con el attributo de archivo definido\n\ [/M] Copia solamente archivos con el attributo de archivo definido, supprime\n\ \tl'attributo de archivo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copia los nuevos archivos or los que fueront modificado despues la fecha especificada.\n\ \t\tSi la fecha no esta especificada, copia unicamente cuando el archivo de destino est mas viejo\n\ \t\tque el archivo fuente\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/fr-FR.rc b/base/applications/cmdutils/xcopy/lang/fr-FR.rc index eccb0a65ef..de5ee1f9f9 100644 --- a/base/applications/cmdutils/xcopy/lang/fr-FR.rc +++ b/base/applications/cmdutils/xcopy/lang/fr-FR.rc @@ -50,6 +50,7 @@ où :\n\ [/A] Copie uniquement les fichiers qui ont l'attribut archive défini\n\ [/M] Copie uniquement les fichiers qui ont l'attribut archive défini ; supprime\n\ \tensuite l'attribut\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, ou ceux modifiés après la date spécifiée.\n\ \t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus ancien\n\ \t\tque le fichier source\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/it-IT.rc b/base/applications/cmdutils/xcopy/lang/it-IT.rc index 3b518ba39c..4ffdf5444b 100644 --- a/base/applications/cmdutils/xcopy/lang/it-IT.rc +++ b/base/applications/cmdutils/xcopy/lang/it-IT.rc @@ -50,6 +50,7 @@ Dove:\n\ [/A] Copia solo i file che abbiano l'attributo Archivio\n\ [/M] Copia solo i file che abbiano l'attributo Archivio, rimuovendo\n\ \tl'attributo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-g-a] Copia i nuovi file o quelli modificati dopo la data fornita.\n\ \t\tSe nessuna data è stata fornita, copia solo se la destinazione è più vecchia\n\ \t\tdella sorgente\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/ja-JP.rc b/base/applications/cmdutils/xcopy/lang/ja-JP.rc index 7ead13b86a..2eec6791e0 100644 --- a/base/applications/cmdutils/xcopy/lang/ja-JP.rc +++ b/base/applications/cmdutils/xcopy/lang/ja-JP.rc @@ -50,6 +50,7 @@ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] アーカイブ属性のファイルだけコピーします。\n\ [/M] アーカイブ属性のファイルだけコピーし、アーカイブ属性を\n\ \t取り除きます。\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:月-日-年] 新しいファイルや指定された日付以降に変更された\n\ \t\tファイルをコピーします。日付が指定されない場合は、\n\ \t\tコピー先がコピー元より古いファイルだけコピーします。\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/ko-KR.rc b/base/applications/cmdutils/xcopy/lang/ko-KR.rc index f18c6030bb..7b7f506665 100644 --- a/base/applications/cmdutils/xcopy/lang/ko-KR.rc +++ b/base/applications/cmdutils/xcopy/lang/ko-KR.rc @@ -50,6 +50,7 @@ Where:\n\ [/A] 오직 압축 속성이 설정되어있는 파일만 복사\n\ [/M] 오직 압축 속성을 제거하면서 압축 속성이 설정되어있는\n\ \t파일만 복사\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] 지정된 날짜 후에 수정되거나 새로운 파일 복사.\n\ \t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다\n\ \t\t대상이 오래된 것만 복사\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/lt-LT.rc b/base/applications/cmdutils/xcopy/lang/lt-LT.rc index 96c9a386dd..0be2b44860 100644 --- a/base/applications/cmdutils/xcopy/lang/lt-LT.rc +++ b/base/applications/cmdutils/xcopy/lang/lt-LT.rc @@ -50,6 +50,7 @@ Kur:\n\ [/A] Kopijuoti tik failus su nustatytu archyvavimo požymiu\n\ [/M] Kopijuoti tik failus su nustatytu archyvavimo požymiu, pašalinti\n\ \tarchyvavimo požymį\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos datos.\n\ \t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n\ \t\tsenesnis už šaltinio failą\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/nl-NL.rc b/base/applications/cmdutils/xcopy/lang/nl-NL.rc index 4c1620efc1..db714d14b3 100644 --- a/base/applications/cmdutils/xcopy/lang/nl-NL.rc +++ b/base/applications/cmdutils/xcopy/lang/nl-NL.rc @@ -50,6 +50,7 @@ Parameters:\n\ [/A] Kopieer alleen bestanden met archiveringsattribuut aan\n\ [/M] Kopieer alleen bestanden met archiveringsattribuut aan, verwijdert\n\ \tdit archiveringsattribuut\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopieer bestanden die nieuw zijn of gewijzigd zijn na de opgegeven\n\ \t\tdatum. Als geen datum wordt gegeven, kopieer alleen als bron nieuwer is.\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/no-NO.rc b/base/applications/cmdutils/xcopy/lang/no-NO.rc index e85c45bde9..e051212d89 100644 --- a/base/applications/cmdutils/xcopy/lang/no-NO.rc +++ b/base/applications/cmdutils/xcopy/lang/no-NO.rc @@ -49,6 +49,7 @@ Where:\n\ [/C] Fortsett selv om det oppstår feil under kopieringen\n\ [/A] Ikke kopier filer som er markert som arkiv\n\ [/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ \t\tden oppgitte datoen.\n\ \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ diff --git a/base/applications/cmdutils/xcopy/lang/pl-PL.rc b/base/applications/cmdutils/xcopy/lang/pl-PL.rc index aec972924f..f6f30597b4 100644 --- a/base/applications/cmdutils/xcopy/lang/pl-PL.rc +++ b/base/applications/cmdutils/xcopy/lang/pl-PL.rc @@ -49,6 +49,7 @@ Gdzie:\n\ [/C] Kontynuuje nawet jeżeli podczas kopiowania wystąpiły błędy\n\ [/A] Kopiuje tylko pliki z atrybutem archiwalny\n\ [/M] Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ \t\tJeżeli nie podano żadnej daty, to kopiowane są pliki, które są\n\ \t\tnowsze niż w katalogu docelowym\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/pt-BR.rc b/base/applications/cmdutils/xcopy/lang/pt-BR.rc index e02e0f35cb..3ed93b06c9 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-BR.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-BR.rc @@ -50,6 +50,7 @@ Onde:\n\ [/A] Copiar apenas arquivos com atributo de arquivo\n\ [/M] Copiar apenas arquivos com atributo de arquivo, removendo\n\ \to atributo de arquivo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data fornecida\n\ \t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ \t\tfor mais antigo que a fonte\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/pt-PT.rc b/base/applications/cmdutils/xcopy/lang/pt-PT.rc index 4a47ee2a8b..db3fd7eb9a 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-PT.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-PT.rc @@ -50,6 +50,7 @@ Onde:\n\ [/A] Copiar apenas ficheiros com atributo de arquivo\n\ [/M] Copiar apenas ficheiros com atributo de arquivo, removendo\n\ \to atributo de arquivo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copiar novos ficheiros ou os alterados após a data fornecida\n\ \t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ \t\tfor mais antigo que a fonte\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/ro-RO.rc b/base/applications/cmdutils/xcopy/lang/ro-RO.rc index 5dfe61d061..777e09f385 100644 --- a/base/applications/cmdutils/xcopy/lang/ro-RO.rc +++ b/base/applications/cmdutils/xcopy/lang/ro-RO.rc @@ -49,6 +49,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] Copiază numai fișierele cu atributul de arhivă activat.\n\ [/M] Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\ \tapoi atributul.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\ \t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\ \t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\ diff --git a/base/applications/cmdutils/xcopy/lang/ru-RU.rc b/base/applications/cmdutils/xcopy/lang/ru-RU.rc index 9e18b8a49c..72e5965135 100644 --- a/base/applications/cmdutils/xcopy/lang/ru-RU.rc +++ b/base/applications/cmdutils/xcopy/lang/ru-RU.rc @@ -52,6 +52,7 @@ XCOPY источник [целевой_объект] [/I] [/S] [/Q] [/F] [/L] [/ /A Копирует только те файлы, для которых установлен атрибут ""архивный"".\n\ /M Копирует только те файлы, для которых установлен атрибут ""архивный"",\n\ при этом атрибут удаляется.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ /D | /D:m-d-y Копирование файлов, измененных не ранее указанной даты.\n\ Если дата не указана, заменяются только конечные файлы,\n\ более старые, чем исходные.\n" diff --git a/base/applications/cmdutils/xcopy/lang/sl-SI.rc b/base/applications/cmdutils/xcopy/lang/sl-SI.rc index 4673100b28..4759f1d6bf 100644 --- a/base/applications/cmdutils/xcopy/lang/sl-SI.rc +++ b/base/applications/cmdutils/xcopy/lang/sl-SI.rc @@ -50,6 +50,7 @@ Where:\n\ [/A] Kopiraj samo datoteke, ki imajo atribut arhiva\n\ [/M] Kopiraj samo datoteke, ki imajo atribut arhiva ter odstrani atribut\n\ \tarhiva\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem datumu.\n\ \t\tČe datum ni podan, gre za kopiranje datotek, katerih obstoječi cilj je\n\ \t\tod izvora\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/sq-AL.rc b/base/applications/cmdutils/xcopy/lang/sq-AL.rc index 57bef2bf69..ce020c199d 100644 --- a/base/applications/cmdutils/xcopy/lang/sq-AL.rc +++ b/base/applications/cmdutils/xcopy/lang/sq-AL.rc @@ -54,6 +54,7 @@ Where:\n\ [/A] Kopjo vetëm dokumenta me arkiva me atribjute te përcaktuar\n\ [/M] Kopjo vetëm dokumente me arkiva dhe atribjute te caktuar, hiqnt\n\ \tarkivat te atribuara\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopjo dokumentët e ri ose modifiko ato pas datës së furnizuar.\n\ \t\tNëse asnjë datë është paraqitur, vetëm kopjoni nëse destinacioni është i vjetër\n\ \t\tse burimi\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/sr-SP.rc b/base/applications/cmdutils/xcopy/lang/sr-SP.rc index e8116bf588..0ba72eedc9 100644 --- a/base/applications/cmdutils/xcopy/lang/sr-SP.rc +++ b/base/applications/cmdutils/xcopy/lang/sr-SP.rc @@ -50,6 +50,7 @@ XCOPY извор [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] Умножи само архивиране датотеке\n\ [/M] Умножи само архивиране датотеке и уклони\n\ \tособине архиве\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Умножи нове или измењене датотеке након одређеног датума.\n\ \t\tАко датум није унесен, умножи само ако је одредиште старије\n\ \t\tод извора\n\n" @@ -108,6 +109,7 @@ Gde:\n\ [/A] Umnoži samo arhivirane datoteke\n\ [/M] Umnoži samo arhivirane datoteke i ukloni\n\ \tosobine arhive\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Umnoži nove ili izmenjene datoteke nakon određenog datuma.\n\ \t\tAko datum nije unesen, umnoži samo ako je odredište starije\n\ \t\tod izvora\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/sv-SE.rc b/base/applications/cmdutils/xcopy/lang/sv-SE.rc index ee929d52cd..015a6a0a6f 100644 --- a/base/applications/cmdutils/xcopy/lang/sv-SE.rc +++ b/base/applications/cmdutils/xcopy/lang/sv-SE.rc @@ -48,6 +48,7 @@ Där:\n\ [/A] Kopiera enbart filer markerade som arkiv\n\ [/M] Kopiera enbart filer markerade som arkiv, ta bort\n\ markeringen\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopiera nya filer eller de ändrade efter angivet datum.\n\ \t\tOm inget datum angivits utförs endast kopiering om målet är\n\ \t\täldre än källan\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/tr-TR.rc b/base/applications/cmdutils/xcopy/lang/tr-TR.rc index 132e9d8751..2f5be379b6 100644 --- a/base/applications/cmdutils/xcopy/lang/tr-TR.rc +++ b/base/applications/cmdutils/xcopy/lang/tr-TR.rc @@ -52,6 +52,7 @@ Nereye:\n\ [/A] Yalnızca belgelik öz niteliği ayarlı kütükleri çoğalt.\n\ [/M] Yalnızca belgelik öz niteliği ayarlı kütükleri çoğalt,\n\ \tbelgelik öz niteliğini siler.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Yeni kütükleri veyâ onların verilen târihten sonra değiştirilmişlerini çoğalt.\n\ \t\tBir târih verilmemişse yalnızca varış kaynaktan eskiyse çoğalt.\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/uk-UA.rc b/base/applications/cmdutils/xcopy/lang/uk-UA.rc index 22403e4416..fed492272d 100644 --- a/base/applications/cmdutils/xcopy/lang/uk-UA.rc +++ b/base/applications/cmdutils/xcopy/lang/uk-UA.rc @@ -49,6 +49,7 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] Копіює лише файли з властивістю АРХІВНИЙ\n\ [/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\ \tвластивість АРХІВНИЙ\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної\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 a3c4d702f6..e779337165 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-CN.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-CN.rc @@ -52,6 +52,7 @@ XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] 仅复制具有存档属性设置的文件。\n\ [/M] 仅复制具有存档属性设置的文件，并删除\n\ \t存档属性。\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] 复制指定日期后的新文件或新修改的文件。\n\ \t\t如果指定没有日期，则只复制目标中比源中旧的文件。\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/zh-TW.rc b/base/applications/cmdutils/xcopy/lang/zh-TW.rc index f86f6692b9..c7f44937ed 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-TW.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-TW.rc @@ -52,6 +52,7 @@ XCOPY 源 [目標] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] 僅複製具有存檔屬性設定的檔案。\n\ [/M] 僅複製檔案的存檔屬性設定，刪除\n\ \t存檔屬性。\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] 複製新檔案或那些修改後所提供的日期。\n\ \t\t如果提供沒有日期，則只複製如果目的地\n\ \t\t比源。\n\n" diff --git a/base/applications/cmdutils/xcopy/xcopy.c b/base/applications/cmdutils/xcopy/xcopy.c index a173cc14c7..eb8c3f04ef 100644 --- a/base/applications/cmdutils/xcopy/xcopy.c +++ b/base/applications/cmdutils/xcopy/xcopy.c @@ -31,12 +31,14 @@ /* * Notes: - * Apparently, valid return codes are: + * Documented valid return codes are: * 0 - OK - * 1 - No files found to copy + * 1 - No files found to copy (*1) * 2 - CTRL+C during copy * 4 - Initialization error, or invalid source specification * 5 - Disk write error + * + * (*1) Testing shows return code 1 is never returned */ @@ -82,7 +84,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); lstrcpyW(msg, failedMsg); } @@ -267,7 +269,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { } /* Process line by line */ - while (fgetws(buffer, sizeof(buffer)/sizeof(WCHAR), inFile) != NULL) { + while (fgetws(buffer, ARRAY_SIZE(buffer), inFile) != NULL) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); @@ -568,15 +570,25 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, ret = RC_WRITEERROR; goto cleanup; } - } + } else { - /* If /M supplied, remove the archive bit after successful copy */ - if (!skipFile) { - if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && - (flags & OPT_REMOVEARCH)) { - SetFileAttributesW(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + if (!skipFile) { + /* If keeping attributes, update the destination attributes + otherwise remove the read only attribute */ + if (flags & OPT_KEEPATTRS) { + SetFileAttributesW(copyTo, srcAttribs | FILE_ATTRIBUTE_ARCHIVE); + } else { + SetFileAttributesW(copyTo, + (GetFileAttributesW(copyTo) & ~FILE_ATTRIBUTE_READONLY)); + } + + /* If /M supplied, remove the archive bit after successful copy */ + if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && + (flags & OPT_REMOVEARCH)) { + SetFileAttributesW(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + } + filesCopied++; } - filesCopied++; } } } @@ -588,6 +600,13 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Search 2 - do subdirs */ if (flags & OPT_RECURSIVE) { + + /* If /E is supplied, create the directory now */ + if ((flags & OPT_EMPTYDIR) && + !(flags & OPT_SIMULATE)) { + XCOPY_CreateDirectory(deststem); + } + lstrcpyW(inputpath, srcstem); lstrcatW(inputpath, wchr_star); findres = TRUE; @@ -611,12 +630,6 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, lstrcpyW(outputpath, deststem); if (*destspec == 0x00) { lstrcatW(outputpath, finddata->cFileName); - - /* If /E is supplied, create the directory now */ - if ((flags & OPT_EMPTYDIR) && - !(flags & OPT_SIMULATE)) - XCOPY_CreateDirectory(outputpath); - lstrcatW(outputpath, wchr_slash); } @@ -743,101 +756,134 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, Note: Windows docs say /P prompts when dest is created but tests show it is done for each src file regardless of the destination */ - switch (toupper(word[1])) { - case 'I': flags |= OPT_ASSUMEDIR; break; - case 'S': flags |= OPT_RECURSIVE; break; - case 'Q': flags |= OPT_QUIET; break; - case 'F': flags |= OPT_FULL; break; - case 'L': flags |= OPT_SIMULATE; break; - case 'W': flags |= OPT_PAUSE; break; - case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; - case 'Y': flags |= OPT_NOPROMPT; break; - case 'N': flags |= OPT_SHORTNAME; break; - case 'U': flags |= OPT_MUSTEXIST; break; - case 'R': flags |= OPT_REPLACEREAD; break; - case 'H': flags |= OPT_COPYHIDSYS; break; - case 'C': flags |= OPT_IGNOREERRORS; break; - case 'P': flags |= OPT_SRCPROMPT; break; - case 'A': flags |= OPT_ARCHIVEONLY; break; - case 'M': flags |= OPT_ARCHIVEONLY | - OPT_REMOVEARCH; break; - - /* E can be /E or /EXCLUDE */ - case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - &word[1], 8, - EXCLUDE, -1) == CSTR_EQUAL) { - if (XCOPY_ProcessExcludeList(&word[9])) { - XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - goto out; - } else flags |= OPT_EXCLUDELIST; - } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; - break; - - /* D can be /D or /D: */ - case 'D': if (word[2]==':' && is_digit(word[3])) { - SYSTEMTIME st; - WCHAR *pos = &word[3]; - BOOL isError = FALSE; - memset(&st, 0x00, sizeof(st)); - - /* Microsoft xcopy's usage message implies that the date - * format depends on the locale, but that is false. - * It is hardcoded to month-day-year. - */ - st.wMonth = _wtol(pos); - while (*pos && is_digit(*pos)) pos++; - if (*pos++ != '-') isError = TRUE; - - if (!isError) { - st.wDay = _wtol(pos); - while (*pos && is_digit(*pos)) pos++; - if (*pos++ != '-') isError = TRUE; - } + int skip=0; + WCHAR *rest; + + while (word[0]) { + rest = NULL; + + switch (toupper(word[1])) { + case 'I': flags |= OPT_ASSUMEDIR; break; + case 'S': flags |= OPT_RECURSIVE; break; + case 'Q': flags |= OPT_QUIET; break; + case 'F': flags |= OPT_FULL; break; + case 'L': flags |= OPT_SIMULATE; break; + case 'W': flags |= OPT_PAUSE; break; + case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; + case 'Y': flags |= OPT_NOPROMPT; break; + case 'N': flags |= OPT_SHORTNAME; break; + case 'U': flags |= OPT_MUSTEXIST; break; + case 'R': flags |= OPT_REPLACEREAD; break; + case 'K': flags |= OPT_KEEPATTRS; break; + case 'H': flags |= OPT_COPYHIDSYS; break; + case 'C': flags |= OPT_IGNOREERRORS; break; + case 'P': flags |= OPT_SRCPROMPT; break; + case 'A': flags |= OPT_ARCHIVEONLY; break; + case 'M': flags |= OPT_ARCHIVEONLY | + OPT_REMOVEARCH; break; + + /* E can be /E or /EXCLUDE */ + case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + &word[1], 8, + EXCLUDE, -1) == CSTR_EQUAL) { + if (XCOPY_ProcessExcludeList(&word[9])) { + XCOPY_FailMessage(ERROR_INVALID_PARAMETER); + goto out; + } else { + flags |= OPT_EXCLUDELIST; - if (!isError) { - st.wYear = _wtol(pos); - while (*pos && is_digit(*pos)) pos++; - if (st.wYear < 100) st.wYear+=2000; + /* Do not support concatenated switches onto exclude lists yet */ + rest = end; + } + } else { + flags |= OPT_EMPTYDIR | OPT_RECURSIVE; } + break; - if (!isError && SystemTimeToFileTime(&st, &dateRange)) { + /* D can be /D or /D: */ + case 'D': if (word[2]==':' && is_digit(word[3])) { SYSTEMTIME st; - WCHAR datestring[32], timestring[32]; - - flags |= OPT_DATERANGE; - - /* Debug info: */ - FileTimeToSystemTime (&dateRange, &st); - GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)/sizeof(WCHAR)); - GetTimeFormatW(0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); + WCHAR *pos = &word[3]; + BOOL isError = FALSE; + memset(&st, 0x00, sizeof(st)); + + /* Microsoft xcopy's usage message implies that the date + * format depends on the locale, but that is false. + * It is hardcoded to month-day-year. + */ + st.wMonth = _wtol(pos); + while (*pos && is_digit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; - WINE_TRACE("Date being used is: %s %s\n", - wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); + if (!isError) { + st.wDay = _wtol(pos); + while (*pos && is_digit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; + } + + if (!isError) { + st.wYear = _wtol(pos); + while (*pos && is_digit(*pos)) pos++; + if (st.wYear < 100) st.wYear+=2000; + } + + /* Handle switches straight after the supplied date */ + rest = pos; + + if (!isError && SystemTimeToFileTime(&st, &dateRange)) { + SYSTEMTIME st; + WCHAR datestring[32], timestring[32]; + + flags |= OPT_DATERANGE; + + /* Debug info: */ + FileTimeToSystemTime (&dateRange, &st); + GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, + ARRAY_SIZE(datestring)); + GetTimeFormatW(0, TIME_NOSECONDS, &st, + NULL, timestring, ARRAY_SIZE(timestring)); + + WINE_TRACE("Date being used is: %s %s\n", + wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); + } else { + XCOPY_FailMessage(ERROR_INVALID_PARAMETER); + goto out; + } } else { - XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - goto out; + flags |= OPT_DATENEWER; } - } else { - flags |= OPT_DATENEWER; - } - break; - - case '-': if (toupper(word[2])=='Y') - flags &= ~OPT_NOPROMPT; - break; - case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); - rc = RC_HELP; - goto out; - case 'V': - WINE_FIXME("ignoring /V\n"); - break; - default: - WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); - goto out; + break; + + case '-': if (toupper(word[2])=='Y') { + flags &= ~OPT_NOPROMPT; + rest = &word[3]; /* Skip over 3 characters */ + } + break; + case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); + rc = RC_HELP; + goto out; + case 'V': + WINE_FIXME("ignoring /V\n"); + break; + default: + WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); + goto out; + } + + /* Unless overridden above, skip over the '/' and the first character */ + if (rest == NULL) rest = &word[2]; + + /* By now, rest should point either to the null after the + switch, or the beginning of the next switch if there + was no whitespace between them */ + if (!skip && *rest && *rest != '/') { + WINE_FIXME("Unexpected characters found and ignored '%s'\n", wine_dbgstr_w(rest)); + skip=1; + } else { + word = rest; + } } } word = next; @@ -941,7 +987,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, lstrcpyW(spec, suppliedsource+2); } else { WCHAR curdir[MAXSTRING]; - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); stem[0] = curdir[0]; stem[1] = curdir[1]; stem[2] = 0x00; @@ -1133,7 +1179,6 @@ int wmain (int argc, WCHAR *argvW[]) } else if (!(flags & OPT_NOCOPY)) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); } - if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; return rc; } diff --git a/base/applications/cmdutils/xcopy/xcopy.h b/base/applications/cmdutils/xcopy/xcopy.h index d18f52ca66..8e41bb7ae4 100644 --- a/base/applications/cmdutils/xcopy/xcopy.h +++ b/base/applications/cmdutils/xcopy/xcopy.h @@ -50,6 +50,7 @@ #define OPT_EXCLUDELIST 0x00020000 #define OPT_DATERANGE 0x00040000 #define OPT_DATENEWER 0x00080000 +#define OPT_KEEPATTRS 0x00100000 #define MAXSTRING 8192 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 487a21882a..3cc9cffedf 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -232,7 +232,7 @@ reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.17 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-3.3 reactos/base/applications/iexplore # Synced to WineStaging-3.3

1 0

01/01: [WMIC] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a217e3a6fc26be54ea2d… commit 5a217e3a6fc26be54ea2dc087cf293be1f87ac10 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:15:34 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:15:34 2018 +0100 [WMIC] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/wmic/CMakeLists.txt | 1 + base/applications/cmdutils/wmic/main.c | 6 +++--- media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/wmic/CMakeLists.txt b/base/applications/cmdutils/wmic/CMakeLists.txt index 8da30f4ec1..0add8850c2 100644 --- a/base/applications/cmdutils/wmic/CMakeLists.txt +++ b/base/applications/cmdutils/wmic/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) add_executable(wmic main.c wmic.rc) target_link_libraries(wmic wine) set_module_type(wmic win32cui UNICODE) diff --git a/base/applications/cmdutils/wmic/main.c b/base/applications/cmdutils/wmic/main.c index ddd2aecd53..f4a5bc74f1 100644 --- a/base/applications/cmdutils/wmic/main.c +++ b/base/applications/cmdutils/wmic/main.c @@ -82,7 +82,7 @@ static const WCHAR *find_class( const WCHAR *alias ) { unsigned int i; - for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(alias_map); i++) { if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; } @@ -158,7 +158,7 @@ static int output_message( int msg ) static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; - LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) ); + LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); return output_string( fmtW, buffer ); } @@ -193,7 +193,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]); + len = strlenW( class ) + ARRAY_SIZE(select_allW); if (!(query = SysAllocStringLen( NULL, len ))) goto done; strcpyW( query, select_allW ); strcatW( query, class ); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d5c5983ad4..487a21882a 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -230,7 +230,7 @@ reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources.

1 0

01/01: [TASKKILL] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb0f46bddf30b568b3123… commit cb0f46bddf30b568b3123e405c12d40b91d5f663 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:14:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:14:52 2018 +0100 [TASKKILL] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/taskkill/CMakeLists.txt | 1 + base/applications/cmdutils/taskkill/taskkill.c | 8 +++----- media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/base/applications/cmdutils/taskkill/CMakeLists.txt b/base/applications/cmdutils/taskkill/CMakeLists.txt index 4b5e3498c8..5006fb3b6f 100644 --- a/base/applications/cmdutils/taskkill/CMakeLists.txt +++ b/base/applications/cmdutils/taskkill/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) add_executable(taskkill taskkill.c taskkill.rc) target_link_libraries(taskkill wine) set_module_type(taskkill win32cui UNICODE) diff --git a/base/applications/cmdutils/taskkill/taskkill.c b/base/applications/cmdutils/taskkill/taskkill.c index 6e4e1eb55a..59ce98dc6d 100644 --- a/base/applications/cmdutils/taskkill/taskkill.c +++ b/base/applications/cmdutils/taskkill/taskkill.c @@ -47,7 +47,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) WCHAR msg_buffer[8192]; wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, - sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); + ARRAY_SIZE(msg_buffer), &va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -92,8 +92,7 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) WCHAR msg_buffer[8192]; int len; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); __ms_va_start(va_args, msg); len = taskkill_vprintfW(msg_buffer, va_args); @@ -107,8 +106,7 @@ static int taskkill_message(int msg) static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return taskkill_printfW(formatW, msg_buffer); } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 518cef18c2..d5c5983ad4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3

1 0

01/01: [REG] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5260a37425b39a1b6eb8d… commit 5260a37425b39a1b6eb8dbeab9774d15be259dbc Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:13:56 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:13:56 2018 +0100 [REG] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/reg/CMakeLists.txt | 1 + base/applications/cmdutils/reg/reg.h | 1 - media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt index 53d1fa4c2f..ef04aaf9df 100644 --- a/base/applications/cmdutils/reg/CMakeLists.txt +++ b/base/applications/cmdutils/reg/CMakeLists.txt @@ -2,6 +2,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) add_executable(reg export.c import.c reg.c reg.rc) set_module_type(reg win32cui UNICODE) target_link_libraries(reg wine) diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h index dbce738ecd..a27399d06a 100644 --- a/base/applications/cmdutils/reg/reg.h +++ b/base/applications/cmdutils/reg/reg.h @@ -21,7 +21,6 @@ #include "resource.h" -#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) #define MAX_SUBKEY_LEN 257 /* reg.c */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 63027239d4..518cef18c2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -227,7 +227,7 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.9 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3

1 0

01/01: [WSCRIPT_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2df3bf079777d3ac3728… commit f2df3bf079777d3ac372834ca854730938cee011 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:13:11 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:13:11 2018 +0100 [WSCRIPT_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/wscript/run.c | 6 +++--- modules/rostests/winetests/wscript/run.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/wscript/run.c b/modules/rostests/winetests/wscript/run.c index 770fd8fd28..16d14ff79f 100644 --- a/modules/rostests/winetests/wscript/run.c +++ b/modules/rostests/winetests/wscript/run.c @@ -77,7 +77,7 @@ static HANDLE wscript_process; static int strcmp_wa(LPCWSTR strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -220,7 +220,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullName, ARRAY_SIZE(fullName)); if(res == 0) return E_FAIL; if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) @@ -237,7 +237,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath)); if(res == 0) return E_FAIL; pos = mystrrchr(fullPath, '\\'); diff --git a/modules/rostests/winetests/wscript/run.js b/modules/rostests/winetests/wscript/run.js index 5a5539b173..a812a85c9e 100644 --- a/modules/rostests/winetests/wscript/run.js +++ b/modules/rostests/winetests/wscript/run.js @@ -27,7 +27,7 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); -ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuildVersion) = " + typeof(WScript.BuildVersion)); ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName);

1 0

01/01: [CSCRIPT][WSCRIPT] Sync with Wine Staging 3.17. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd8ec79fd18919b88b2db… commit fd8ec79fd18919b88b2db5398e82b0fe2ed5db91 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:11:58 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:11:58 2018 +0100 [CSCRIPT][WSCRIPT] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/cscript/CMakeLists.txt | 2 +- base/applications/cmdutils/wscript/CMakeLists.txt | 2 ++ base/applications/cmdutils/wscript/host.c | 6 +++--- base/applications/cmdutils/wscript/main.c | 8 ++++---- media/doc/README.WINE | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/base/applications/cmdutils/cscript/CMakeLists.txt b/base/applications/cmdutils/cscript/CMakeLists.txt index 472f94b622..5e0b98d08c 100644 --- a/base/applications/cmdutils/cscript/CMakeLists.txt +++ b/base/applications/cmdutils/cscript/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-DCSCRIPT_BUILD) +add_definitions(-DCSCRIPT_BUILD -D__WINESRC__) set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript) include_directories(${wscript_folder}) diff --git a/base/applications/cmdutils/wscript/CMakeLists.txt b/base/applications/cmdutils/wscript/CMakeLists.txt index ef489fd10a..a574ff5fb5 100644 --- a/base/applications/cmdutils/wscript/CMakeLists.txt +++ b/base/applications/cmdutils/wscript/CMakeLists.txt @@ -1,4 +1,6 @@ +add_definitions(-D__WINESRC__) + list(APPEND SOURCE arguments.c host.c diff --git a/base/applications/cmdutils/wscript/host.c b/base/applications/cmdutils/wscript/host.c index 68013f8017..c6bc31c8bd 100644 --- a/base/applications/cmdutils/wscript/host.c +++ b/base/applications/cmdutils/wscript/host.c @@ -84,7 +84,7 @@ static void print_string(const WCHAR *string) ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), string, len, &count, NULL); if(ret) { static const WCHAR crnlW[] = {'\r','\n'}; - WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, sizeof(crnlW)/sizeof(*crnlW), &count, NULL); + WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), crnlW, ARRAY_SIZE(crnlW), &count, NULL); return; } @@ -183,7 +183,7 @@ static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, fullPath, ARRAY_SIZE(fullPath)) == 0) return E_FAIL; if(!(*out_Path = SysAllocString(fullPath))) return E_OUTOFMEMORY; @@ -198,7 +198,7 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) WINE_TRACE("(%p)\n", out_Path); - if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) + if(GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)) == 0) return E_FAIL; pos = strrchrW(path, '\\'); howMany = pos - path; diff --git a/base/applications/cmdutils/wscript/main.c b/base/applications/cmdutils/wscript/main.c index 0191b5ac28..e3ffe35ca3 100644 --- a/base/applications/cmdutils/wscript/main.c +++ b/base/applications/cmdutils/wscript/main.c @@ -256,7 +256,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(fileid)/sizeof(WCHAR); + size = ARRAY_SIZE(fileid); res = RegQueryValueW(hkey, NULL, fileid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -269,7 +269,7 @@ static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) if(res != ERROR_SUCCESS) return FALSE; - size = sizeof(progid)/sizeof(WCHAR); + size = ARRAY_SIZE(progid); res = RegQueryValueW(hkey, NULL, progid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) @@ -449,8 +449,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); - if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) + res = GetFullPathNameW(filename, ARRAY_SIZE(scriptFullName), scriptFullName, &filepart); + if(!res || res > ARRAY_SIZE(scriptFullName)) return 1; ext = strrchrW(filepart, '.'); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c71caf4196..63027239d4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -226,12 +226,12 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.9 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-3.3

1 0

01/01: [XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules. CORE-15127
by Amine Khaldi 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82faa151e52e235dc0beb… commit 82faa151e52e235dc0bebea2ecd49ef6b46847ad Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Sep 30 23:57:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Sep 30 23:57:08 2018 +0100 [XDK][PSDK][WINE] Unify ARRAY_SIZE definition for Wine modules. CORE-15127 --- dll/directx/wine/d3d9/d3d9_private.h | 2 -- dll/directx/wine/d3dx9_36/d3dx9_private.h | 2 -- dll/directx/wine/ddraw/ddraw_private.h | 2 -- dll/win32/avifil32/avifile_private.h | 2 -- dll/win32/comctl32/comctl32.h | 2 -- dll/win32/comdlg32/cdlg.h | 2 -- dll/win32/gdiplus/gdiplus_private.h | 2 -- dll/win32/msi/tokenize.c | 2 -- dll/win32/msxml3/msxml_private.h | 2 -- dll/win32/scrrun/scrrun_private.h | 2 -- dll/win32/wshom.ocx/wshom_private.h | 2 -- dll/win32/xmllite/xmllite_private.h | 2 -- sdk/include/xdk/winnt_old.h | 4 ++++ 13 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dll/directx/wine/d3d9/d3d9_private.h b/dll/directx/wine/d3d9/d3d9_private.h index c50aabf593..408661306a 100644 --- a/dll/directx/wine/d3d9/d3d9_private.h +++ b/dll/directx/wine/d3d9/d3d9_private.h @@ -47,8 +47,6 @@ #define D3D9_TEXTURE_MIPMAP_DIRTY 0x1 -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h index f5b2b4109c..7a4d882a8b 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_private.h +++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h @@ -32,8 +32,6 @@ #define ULONG64_MAX (~(ULONG64)0) -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) - struct vec4 { float x, y, z, w; diff --git a/dll/directx/wine/ddraw/ddraw_private.h b/dll/directx/wine/ddraw/ddraw_private.h index 9757008e92..1bba80cf26 100644 --- a/dll/directx/wine/ddraw/ddraw_private.h +++ b/dll/directx/wine/ddraw/ddraw_private.h @@ -39,8 +39,6 @@ #include "wine/list.h" #include "wine/wined3d.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; diff --git a/dll/win32/avifil32/avifile_private.h b/dll/win32/avifil32/avifile_private.h index 83e87ea989..4bf11f42a8 100644 --- a/dll/win32/avifil32/avifile_private.h +++ b/dll/win32/avifil32/avifile_private.h @@ -22,8 +22,6 @@ #include <windef.h> #include <winuser.h> -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #ifndef MAX_AVISTREAMS #define MAX_AVISTREAMS 8 #endif diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h index c529a96bb1..ee47772658 100644 --- a/dll/win32/comctl32/comctl32.h +++ b/dll/win32/comctl32/comctl32.h @@ -38,8 +38,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - /* Property sheet / Wizard */ #define IDD_PROPSHEET 1006 #define IDD_WIZARD 1020 diff --git a/dll/win32/comdlg32/cdlg.h b/dll/win32/comdlg32/cdlg.h index eebf1a9b2b..28bb7e7526 100644 --- a/dll/win32/comdlg32/cdlg.h +++ b/dll/win32/comdlg32/cdlg.h @@ -23,8 +23,6 @@ #include "dlgs.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - /* Common dialogs implementation globals */ #define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ diff --git a/dll/win32/gdiplus/gdiplus_private.h b/dll/win32/gdiplus/gdiplus_private.h index 25b269ba35..b2e4f1e93f 100644 --- a/dll/win32/gdiplus/gdiplus_private.h +++ b/dll/win32/gdiplus/gdiplus_private.h @@ -35,8 +35,6 @@ #include "gdiplus.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ diff --git a/dll/win32/msi/tokenize.c b/dll/win32/msi/tokenize.c index 1656fd8c3d..d1c2da9743 100644 --- a/dll/win32/msi/tokenize.c +++ b/dll/win32/msi/tokenize.c @@ -77,8 +77,6 @@ static const WCHAR updateW[] = {'U','P','D','A','T','E'}; static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - /* ** These are the keywords ** They MUST be in alphabetical order diff --git a/dll/win32/msxml3/msxml_private.h b/dll/win32/msxml3/msxml_private.h index d7039275ce..94ef66b23d 100644 --- a/dll/win32/msxml3/msxml_private.h +++ b/dll/win32/msxml3/msxml_private.h @@ -31,8 +31,6 @@ # error You must include config.h to use this header #endif -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - typedef enum { MSXML_DEFAULT = 0, MSXML2 = 20, diff --git a/dll/win32/scrrun/scrrun_private.h b/dll/win32/scrrun/scrrun_private.h index d9ff2416a5..5083d30a8e 100644 --- a/dll/win32/scrrun/scrrun_private.h +++ b/dll/win32/scrrun/scrrun_private.h @@ -18,8 +18,6 @@ #ifndef _SCRRUN_PRIVATE_H_ #define _SCRRUN_PRIVATE_H_ -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dll/win32/wshom.ocx/wshom_private.h b/dll/win32/wshom.ocx/wshom_private.h index a3fa3b0f88..951599fbdb 100644 --- a/dll/win32/wshom.ocx/wshom_private.h +++ b/dll/win32/wshom.ocx/wshom_private.h @@ -27,8 +27,6 @@ #include "ole2.h" #include "olectl.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - /* typelibs */ typedef enum tid_t { NULL_tid, diff --git a/dll/win32/xmllite/xmllite_private.h b/dll/win32/xmllite/xmllite_private.h index 381dec496c..7884e27453 100644 --- a/dll/win32/xmllite/xmllite_private.h +++ b/dll/win32/xmllite/xmllite_private.h @@ -23,8 +23,6 @@ #include "wine/heap.h" -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - static inline void *m_alloc(IMalloc *imalloc, size_t len) { if (imalloc) diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 59076df80d..07c811837f 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -4308,6 +4308,10 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 { } TP_CALLBACK_ENVIRON_V1, TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON; #endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN7) */ +#ifdef __WINESRC__ +# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif

1 0

02/02: [SHELL32] Fixes and improvements for PickIconDlg().
by Hermès Bélusca-Maïto 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccde12483fdfc1e6909ae… commit ccde12483fdfc1e6909aec14fb865c2df35b3804 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 30 21:22:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 30 21:48:34 2018 +0200 [SHELL32] Fixes and improvements for PickIconDlg(). - Deal with expanded paths only when loading icons. If the user specifies an unexpanded path to a module containing icons, this unexpanded path is returned to the caller! - Perform the dialog cleanup in WM_DESTROY message handler. - When pressing ENTER/OK in the dialog box, retrieve the selected icon and close the dialog *ONLY WHEN* the user actually has selected an icon. If the user modified manually the module path, pressing ENTER/OK instead reloads the icons list. --- dll/win32/shell32/dialogs/dialogs.cpp | 77 ++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 2d939ee11b..47b6f04d5a 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -48,7 +48,6 @@ typedef struct HMODULE hLibrary; HWND hDlgCtrl; WCHAR szPath[MAX_PATH]; - WCHAR szExpandedPath[MAX_PATH]; INT Index; INT nIcons; HICON *phIcons; @@ -90,19 +89,21 @@ DestroyIconList(HWND hDlgCtrl, PPICK_ICON_CONTEXT pIconContext) } static BOOL -DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) +DoLoadIcons(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext, LPCWSTR pszFile) { + WCHAR szExpandedPath[MAX_PATH]; + // Destroy previous icons DestroyIconList(pIconContext->hDlgCtrl, pIconContext); SendMessageW(pIconContext->hDlgCtrl, LB_RESETCONTENT, 0, 0); delete[] pIconContext->phIcons; - // Store the paths + // Store the path StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); - ExpandEnvironmentStringsW(pszFile, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + ExpandEnvironmentStringsW(pszFile, szExpandedPath, _countof(szExpandedPath)); // Load the module if possible - HMODULE hLibrary = LoadLibraryExW(pIconContext->szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); + HMODULE hLibrary = LoadLibraryExW(szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) FreeLibrary(pIconContext->hLibrary); pIconContext->hLibrary = hLibrary; @@ -110,10 +111,10 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) if (pIconContext->hLibrary) { // Load the icons from the module - pIconContext->nIcons = ExtractIconExW(pIconContext->szExpandedPath, -1, NULL, NULL, 0); + pIconContext->nIcons = ExtractIconExW(szExpandedPath, -1, NULL, NULL, 0); pIconContext->phIcons = new HICON[pIconContext->nIcons]; - if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + if (ExtractIconExW(szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) { EnumResourceNamesW(pIconContext->hLibrary, RT_GROUP_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); } @@ -128,7 +129,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) pIconContext->nIcons = 1; pIconContext->phIcons = new HICON[1]; - if (ExtractIconExW(pIconContext->szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) + if (ExtractIconExW(szExpandedPath, 0, pIconContext->phIcons, NULL, pIconContext->nIcons)) { SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, 0); } @@ -138,8 +139,9 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) } } - // Set the text + // Set the text and reset the edit control's modification flag SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); + SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0); if (pIconContext->nIcons == 0) { @@ -147,12 +149,12 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) pIconContext->phIcons = NULL; } - return pIconContext->nIcons > 0; + return (pIconContext->nIcons > 0); } static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; -static void NoIconsInFile(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext) +static void NoIconsInFile(HWND hwndDlg, PPICK_ICON_CONTEXT pIconContext) { // Show an error message CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); @@ -221,22 +223,45 @@ INT_PTR CALLBACK PickIconProc( return TRUE; } + case WM_DESTROY: + { + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; + + if (pIconContext->hLibrary) + FreeLibrary(pIconContext->hLibrary); + break; + } + case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: - index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - pIconContext->Index = index; + { + /* Check whether the path edit control has been modified; if so load the icons instead of validating */ + if (SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_GETMODIFY, 0, 0)) + { + /* Reset the edit control's modification flag and retrieve the text */ + SendDlgItemMessage(hwndDlg, IDC_EDIT_PATH, EM_SETMODIFY, FALSE, 0); + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText, _countof(szText)); + + // Load the icons + if (!DoLoadIcons(hwndDlg, pIconContext, szText)) + NoIconsInFile(hwndDlg, pIconContext); + + // Set the selection + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + break; + } + + /* The path edit control has not been modified, return the selection */ + pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, _countof(pIconContext->szPath)); - ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; EndDialog(hwndDlg, 1); break; + } case IDCANCEL: - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; EndDialog(hwndDlg, 0); break; @@ -293,9 +318,7 @@ INT_PTR CALLBACK PickIconProc( { lpdis = (LPDRAWITEMSTRUCT)lParam; if (lpdis->itemID == (UINT)-1) - { break; - } switch (lpdis->itemAction) { case ODA_SELECT: @@ -331,17 +354,18 @@ BOOL WINAPI PickIconDlg( INT* lpdwIconIndex) { int res; + WCHAR szExpandedPath[MAX_PATH]; // Initialize the dialog PICK_ICON_CONTEXT IconContext = { NULL }; IconContext.Index = *lpdwIconIndex; StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), lpstrFile); - ExpandEnvironmentStringsW(lpstrFile, IconContext.szExpandedPath, _countof(IconContext.szExpandedPath)); + ExpandEnvironmentStringsW(lpstrFile, szExpandedPath, _countof(szExpandedPath)); - if (!IconContext.szExpandedPath[0] || - GetFileAttributesW(IconContext.szExpandedPath) == INVALID_FILE_ATTRIBUTES) + if (!szExpandedPath[0] || + GetFileAttributesW(szExpandedPath) == INVALID_FILE_ATTRIBUTES) { - if (IconContext.szExpandedPath[0]) + if (szExpandedPath[0]) { // No such file CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); @@ -351,7 +375,6 @@ BOOL WINAPI PickIconDlg( // Set the default value StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); - ExpandEnvironmentStringsW(s_pszDefaultPath, IconContext.szPath, _countof(IconContext.szPath)); } // Show the dialog @@ -359,12 +382,10 @@ BOOL WINAPI PickIconDlg( if (res) { // Store the selected icon - StringCchCopyW(lpstrFile, nMaxFile, IconContext.szExpandedPath); + StringCchCopyW(lpstrFile, nMaxFile, IconContext.szPath); *lpdwIconIndex = IconContext.Index; } - if (IconContext.hLibrary) - FreeLibrary(IconContext.hLibrary); return res; }

1 0

01/02: [SHELL32] Code formatting only.
by Hermès Bélusca-Maïto 30 Sep '18

30 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae9ec94240962893ce88e… commit ae9ec94240962893ce88e9e85d29e141afa1f4ae Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 30 20:07:29 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 30 21:48:31 2018 +0200 [SHELL32] Code formatting only. --- dll/win32/shell32/CShellLink.cpp | 28 ++--- dll/win32/shell32/dialogs/dialogs.cpp | 200 +++++++++++++++++----------------- 2 files changed, 112 insertions(+), 116 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 5afc4b715e..d6d12efe0a 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -1200,7 +1200,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetArguments(LPCSTR pszArgs) if (!m_sArgs) return E_OUTOFMEMORY; } - m_bDirty = TRUE; return S_OK; @@ -1399,7 +1398,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::Resolve(HWND hwnd, DWORD fFlags) /* Clear the cached path */ HeapFree(GetProcessHeap(), 0, m_sPath); - m_sPath = NULL; m_sPath = shelllink_get_msi_component_path(component); if (!m_sPath) return E_FAIL; @@ -1553,15 +1551,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetDescription(LPCWSTR pszName) TRACE("(%p)->(desc=%s)\n", this, debugstr_w(pszName)); HeapFree(GetProcessHeap(), 0, m_sDescription); + m_sDescription = NULL; + if (pszName) { m_sDescription = strdupW(pszName); if (!m_sDescription) return E_OUTOFMEMORY; } - else - m_sDescription = NULL; - m_bDirty = TRUE; return S_OK; @@ -1585,15 +1582,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetWorkingDirectory(LPCWSTR pszDir) TRACE("(%p)->(dir=%s)\n", this, debugstr_w(pszDir)); HeapFree(GetProcessHeap(), 0, m_sWorkDir); + m_sWorkDir = NULL; + if (pszDir) { m_sWorkDir = strdupW(pszDir); if (!m_sWorkDir) return E_OUTOFMEMORY; } - else - m_sWorkDir = NULL; - m_bDirty = TRUE; return S_OK; @@ -1617,15 +1613,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetArguments(LPCWSTR pszArgs) TRACE("(%p)->(args=%s)\n", this, debugstr_w(pszArgs)); HeapFree(GetProcessHeap(), 0, m_sArgs); + m_sArgs = NULL; + if (pszArgs) { m_sArgs = strdupW(pszArgs); if (!m_sArgs) return E_OUTOFMEMORY; } - else - m_sArgs = NULL; - m_bDirty = TRUE; return S_OK; @@ -1650,11 +1645,10 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(LPWSTR pszIconPath, INT cc pInfo = (LPEXP_SZ_LINK)SHFindDataBlock(m_pDBList, EXP_SZ_ICON_SIG); if (pInfo && (pInfo->cbSize == sizeof(*pInfo))) { + SHExpandEnvironmentStringsW(pInfo->szwTarget, szPath, _countof(szPath)); + m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; HeapFree(GetProcessHeap(), 0, m_sIcoPath); - m_sIcoPath = NULL; - - SHExpandEnvironmentStringsW(pInfo->szwTarget, szPath, _countof(szPath)); m_sIcoPath = strdupW(szPath); if (!m_sIcoPath) @@ -1931,7 +1925,6 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetIconLocation(LPCWSTR pszIconPath, INT i { m_Header.dwFlags &= ~SLDF_HAS_ICONLOCATION; HeapFree(GetProcessHeap(), 0, m_sIcoPath); - m_sIcoPath = NULL; m_sIcoPath = strdupW(pszIconPath); if (!m_sIcoPath) @@ -1953,15 +1946,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::SetRelativePath(LPCWSTR pszPathRel, DWORD TRACE("(%p)->(path=%s %x)\n", this, debugstr_w(pszPathRel), dwReserved); HeapFree(GetProcessHeap(), 0, m_sPathRel); + m_sPathRel = NULL; + if (pszPathRel) { m_sPathRel = strdupW(pszPathRel); if (!m_sPathRel) return E_OUTOFMEMORY; } - else - m_sPathRel = NULL; - m_bDirty = TRUE; return ShellLink_UpdatePath(m_sPathRel, m_sPath, m_sWorkDir, &m_sPath); diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 77c1bdf5cc..2d939ee11b 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -92,17 +92,16 @@ DestroyIconList(HWND hDlgCtrl, PPICK_ICON_CONTEXT pIconContext) static BOOL DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) { - // destroy previous + // Destroy previous icons DestroyIconList(pIconContext->hDlgCtrl, pIconContext); SendMessageW(pIconContext->hDlgCtrl, LB_RESETCONTENT, 0, 0); delete[] pIconContext->phIcons; - // store paths - if (pIconContext->szPath != pszFile) - StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); + // Store the paths + StringCchCopyW(pIconContext->szPath, _countof(pIconContext->szPath), pszFile); ExpandEnvironmentStringsW(pszFile, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); - // load DLL if possible + // Load the module if possible HMODULE hLibrary = LoadLibraryExW(pIconContext->szExpandedPath, NULL, LOAD_LIBRARY_AS_DATAFILE); if (pIconContext->hLibrary) FreeLibrary(pIconContext->hLibrary); @@ -110,7 +109,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) if (pIconContext->hLibrary) { - // load icons from DLL + // Load the icons from the module pIconContext->nIcons = ExtractIconExW(pIconContext->szExpandedPath, -1, NULL, NULL, 0); pIconContext->phIcons = new HICON[pIconContext->nIcons]; @@ -125,7 +124,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) } else { - // *.ico + // .ico file pIconContext->nIcons = 1; pIconContext->phIcons = new HICON[1]; @@ -139,7 +138,7 @@ DoLoadIcons(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext, LPCWSTR pszFile) } } - // set text + // Set the text SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath); if (pIconContext->nIcons == 0) @@ -155,28 +154,28 @@ static const LPCWSTR s_pszDefaultPath = L"%SystemRoot%\\system32\\shell32.dll"; static void NoIconsInFile(HWND hwndDlg, PICK_ICON_CONTEXT *pIconContext) { - // show message + // Show an error message CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); strText.Format(IDS_NO_ICONS, pIconContext->szPath); MessageBoxW(hwndDlg, strText, strTitle, MB_ICONWARNING); - // load default icons + // Load the default icons DoLoadIcons(hwndDlg, pIconContext, s_pszDefaultPath); } -// icon size +// Icon size #define CX_ICON GetSystemMetrics(SM_CXICON) #define CY_ICON GetSystemMetrics(SM_CYICON) -// item size +// Item size #define CX_ITEM (CX_ICON + 4) #define CY_ITEM (CY_ICON + 12) -INT_PTR CALLBACK PickIconProc(HWND hwndDlg, +INT_PTR CALLBACK PickIconProc( + HWND hwndDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam -) + LPARAM lParam) { LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; @@ -190,105 +189,109 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, switch(uMsg) { - case WM_INITDIALOG: - pIconContext = (PPICK_ICON_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); - pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); + case WM_INITDIALOG: + { + pIconContext = (PPICK_ICON_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); + pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); - SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, CX_ITEM, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, CX_ITEM, 0); - // load icons - if (!DoLoadIcons(hwndDlg, pIconContext, pIconContext->szPath)) - { - NoIconsInFile(hwndDlg, pIconContext); - } + // Load the icons + if (!DoLoadIcons(hwndDlg, pIconContext, pIconContext->szPath)) + NoIconsInFile(hwndDlg, pIconContext); - // set selection - count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); - if (count != LB_ERR) - { - if (pIconContext->Index < 0) + // Set the selection + count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); + if (count != LB_ERR) { - // A negative value will be interpreted as a negated resource ID. - LPARAM lParam = -pIconContext->Index; - pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRINGEXACT, -1, lParam); - } + if (pIconContext->Index < 0) + { + // A negative value will be interpreted as a negated resource ID. + LPARAM lParam = -pIconContext->Index; + pIconContext->Index = (INT)SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRINGEXACT, -1, lParam); + } - if (pIconContext->Index < 0 || count <= pIconContext->Index) - pIconContext->Index = 0; + if (pIconContext->Index < 0 || count <= pIconContext->Index) + pIconContext->Index = 0; - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); - SendMessageW(pIconContext->hDlgCtrl, LB_SETTOPINDEX, pIconContext->Index, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); + SendMessageW(pIconContext->hDlgCtrl, LB_SETTOPINDEX, pIconContext->Index, 0); + } + return TRUE; } - return TRUE; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDOK: - index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - pIconContext->Index = index; - GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, MAX_PATH); - ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; - EndDialog(hwndDlg, 1); - break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); + pIconContext->Index = index; + GetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szPath, _countof(pIconContext->szPath)); + ExpandEnvironmentStringsW(pIconContext->szPath, pIconContext->szExpandedPath, _countof(pIconContext->szExpandedPath)); + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; + EndDialog(hwndDlg, 1); + break; - case IDCANCEL: - DestroyIconList(pIconContext->hDlgCtrl, pIconContext); - delete[] pIconContext->phIcons; - EndDialog(hwndDlg, 0); - break; + case IDCANCEL: + DestroyIconList(pIconContext->hDlgCtrl, pIconContext); + delete[] pIconContext->phIcons; + EndDialog(hwndDlg, 0); + break; + + case IDC_PICKICON_LIST: + switch (HIWORD(wParam)) + { + case LBN_SELCHANGE: + InvalidateRect((HWND)lParam, NULL, TRUE); + break; - case IDC_PICKICON_LIST: - switch (HIWORD(wParam)) + case LBN_DBLCLK: + SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDOK, 0), 0); + break; + } + break; + + case IDC_BUTTON_PATH: { - case LBN_SELCHANGE: - InvalidateRect((HWND)lParam, NULL, TRUE); + // Choose the module path + szText[0] = 0; + szFilter[0] = 0; + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFile = szText; + ofn.nMaxFile = _countof(szText); + strTitle.LoadString(IDS_PICK_ICON_TITLE); + ofn.lpstrTitle = strTitle; + LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter)); + ofn.lpstrFilter = szFilter; + if (!GetOpenFileNameW(&ofn)) break; - case LBN_DBLCLK: - SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDOK, 0), 0); - break; - } - break; + // Load the icons + if (!DoLoadIcons(hwndDlg, pIconContext, szText)) + NoIconsInFile(hwndDlg, pIconContext); - case IDC_BUTTON_PATH: - // choose DLL path - szText[0] = 0; - szFilter[0] = 0; - ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = hwndDlg; - ofn.lpstrFile = szText; - ofn.nMaxFile = MAX_PATH; - strTitle.LoadString(IDS_PICK_ICON_TITLE); - ofn.lpstrTitle = strTitle; - LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, _countof(szFilter)); - ofn.lpstrFilter = szFilter; - if (!GetOpenFileNameW(&ofn)) + // Set the selection + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); break; - - // load icons - if (!DoLoadIcons(hwndDlg, pIconContext, szText)) - { - NoIconsInFile(hwndDlg, pIconContext); } - // set selection - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + default: + break; + } break; - } - break; case WM_MEASUREITEM: - lpmis = (LPMEASUREITEMSTRUCT) lParam; + lpmis = (LPMEASUREITEMSTRUCT)lParam; lpmis->itemHeight = CY_ITEM; return TRUE; case WM_DRAWITEM: - lpdis = (LPDRAWITEMSTRUCT) lParam; + { + lpdis = (LPDRAWITEMSTRUCT)lParam; if (lpdis->itemID == (UINT)-1) { break; @@ -306,7 +309,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, else FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_WINDOW + 1)); - // centering + // Centering INT x = lpdis->rcItem.left + (CX_ITEM - CX_ICON) / 2; INT y = lpdis->rcItem.top + (CY_ITEM - CY_ICON) / 2; @@ -315,6 +318,7 @@ INT_PTR CALLBACK PickIconProc(HWND hwndDlg, } } return TRUE; + } } return FALSE; @@ -328,7 +332,7 @@ BOOL WINAPI PickIconDlg( { int res; - // initialize + // Initialize the dialog PICK_ICON_CONTEXT IconContext = { NULL }; IconContext.Index = *lpdwIconIndex; StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), lpstrFile); @@ -339,22 +343,22 @@ BOOL WINAPI PickIconDlg( { if (IconContext.szExpandedPath[0]) { - // no such file + // No such file CStringW strText, strTitle(MAKEINTRESOURCEW(IDS_PICK_ICON_TITLE)); strText.Format(IDS_FILE_NOT_FOUND, lpstrFile); MessageBoxW(hWndOwner, strText, strTitle, MB_ICONWARNING); } - // set default value + // Set the default value StringCchCopyW(IconContext.szPath, _countof(IconContext.szPath), s_pszDefaultPath); ExpandEnvironmentStringsW(s_pszDefaultPath, IconContext.szPath, _countof(IconContext.szPath)); } - // show dialog + // Show the dialog res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hWndOwner, PickIconProc, (LPARAM)&IconContext); if (res) { - // store + // Store the selected icon StringCchCopyW(lpstrFile, nMaxFile, IconContext.szExpandedPath); *lpdwIconIndex = IconContext.Index; } @@ -628,8 +632,8 @@ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARA WCHAR filter[MAX_PATH], szCaption[MAX_PATH]; OPENFILENAMEW ofn; - LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER, filter, MAX_PATH); - LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, MAX_PATH); + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_FILTER, filter, _countof(filter)); + LoadStringW(shell32_hInstance, IDS_RUNDLG_BROWSE_CAPTION, szCaption, _countof(szCaption)); ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn);

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