Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [CMAKE] Support file lists in add_cd_file for all cases Addendum to 6b48d54
by Victor Perevertkin 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4e37f936347fef84ff2d… commit f4e37f936347fef84ff2df4599892bc5ad14402d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri May 1 02:39:59 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 1 02:39:59 2020 +0300 [CMAKE] Support file lists in add_cd_file for all cases Addendum to 6b48d54 --- sdk/cmake/CMakeMacros.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 9107de4645d..1f3043667f0 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -363,15 +363,19 @@ function(add_cd_file) add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() - # add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n") + foreach(item ${_CD_FILE}) + # add it in reactos.cab + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n") + + # manage dependency - file level + set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item}) + endforeach() + # manage dependency - target level if(_CD_TARGET) add_dependencies(reactos_cab_inf ${_CD_TARGET}) endif() - # manage dependency - file level - set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${_CD_FILE}) endif() endif() #end bootcd

1 0

[reactos] 01/01: [CMAKE] Fix driver inf files generation for livecd CORE-16975
by Victor Perevertkin 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b48d54c393a7a3873023… commit 6b48d54c393a7a38730235a609f5cfc0a8987893 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri May 1 01:23:51 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 1 01:23:51 2020 +0300 [CMAKE] Fix driver inf files generation for livecd CORE-16975 --- sdk/cmake/CMakeMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index d29b95afd82..9107de4645d 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -916,11 +916,11 @@ function(add_driver_inf _module) add_custom_command(OUTPUT "${_converted_item}" COMMAND native-utf16le "${_source_item}" "${_converted_item}" DEPENDS native-utf16le "${_source_item}") - add_cd_file(FILE ${_converted_item} DESTINATION reactos/inf FOR all) list(APPEND _converted_inf_files ${_converted_item}) endforeach() add_custom_target(${_module}_inf_files DEPENDS ${_converted_inf_files}) + add_cd_file(FILE ${_converted_inf_files} TARGET ${_module}_inf_files DESTINATION reactos/inf FOR all) endfunction() if(KDBG)

1 0

[reactos] 02/02: [ERRCODES.MC] Change some occurrences of "Windows" to "ReactOS" where it makes the most sense.
by Hermès Bélusca-Maïto 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=478dbe3e234c370458a4d… commit 478dbe3e234c370458a4db6e8b21330d95fb7a42 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri May 1 00:05:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri May 1 00:06:41 2020 +0200 [ERRCODES.MC] Change some occurrences of "Windows" to "ReactOS" where it makes the most sense. --- sdk/include/reactos/mc/errcodes.mc | 164 ++++++++++++++++++------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/sdk/include/reactos/mc/errcodes.mc b/sdk/include/reactos/mc/errcodes.mc index 7da8ea5c576..cd835d260f0 100644 --- a/sdk/include/reactos/mc/errcodes.mc +++ b/sdk/include/reactos/mc/errcodes.mc @@ -4382,16 +4382,16 @@ Severity=Success Facility=System SymbolicName=ERROR_LOST_WRITEBEHIND_DATA Language=English -Windows was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere. +ReactOS was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere. . Language=Russian -Windows was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere. +ReactOS was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere. . Language=Polish -System Windows nie mógł zapisać wszystkich danych dla pliku %hs. Dane zostały utracone. Powodem tego błędu mogła być awaria sprzętu komputerowego lub połączenia sieciowego. Spróbuj zapisać ten plik w innym miejscu. +System ReactOS nie mógł zapisać wszystkich danych dla pliku %hs. Dane zostały utracone. Powodem tego błędu mogła być awaria sprzętu komputerowego lub połączenia sieciowego. Spróbuj zapisać ten plik w innym miejscu. . Language=Romanian -Windows was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere. +ReactOS was unable to save all the data for the file %hs. The data has been lost. This error may be caused by a failure of your computer hardware or network connection. Please try to save this file elsewhere. . MessageId=597 @@ -4841,16 +4841,16 @@ Severity=Success Facility=System SymbolicName=ERROR_ILLEGAL_DLL_RELOCATION Language=English -The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for Windows system DLLs. The vendor supplying the DLL should be contacted for a new DLL. +The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for ReactOS system DLLs. The vendor supplying the DLL should be contacted for a new DLL. . Language=Russian -The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for Windows system DLLs. The vendor supplying the DLL should be contacted for a new DLL. +The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for ReactOS system DLLs. The vendor supplying the DLL should be contacted for a new DLL. . Language=Polish -Biblioteka systemowa DLL %hs została zrelokowana w pamięci. Aplikacja nie będzie działać prawidłowo. Powodem relokacji było to, że biblioteka DLL %hs zajmowała zakres adresów zarezerwowany dla systemowej biblioteki DLL. Należy skontaktować się z dostawcą w sprawie nowej biblioteki DLL. +Biblioteka systemowa DLL %hs została zrelokowana w pamięci. Aplikacja nie będzie działać prawidłowo. Powodem relokacji było to, że biblioteka DLL %hs zajmowała zakres adresów zarezerwowany dla ReactOS systemowej biblioteki DLL. Należy skontaktować się z dostawcą w sprawie nowej biblioteki DLL. . Language=Romanian -The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for Windows system DLLs. The vendor supplying the DLL should be contacted for a new DLL. +The system DLL %hs was relocated in memory. The application will not run properly. The relocation occurred because the DLL %hs occupied an address range reserved for ReactOS system DLLs. The vendor supplying the DLL should be contacted for a new DLL. . MessageId=624 @@ -5045,16 +5045,16 @@ Severity=Success Facility=System SymbolicName=ERROR_COMMITMENT_MINIMUM Language=English -Your system is low on virtual memory. Windows is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help. +Your system is low on virtual memory. ReactOS is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help. . Language=Russian -Your system is low on virtual memory. Windows is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help. +Your system is low on virtual memory. ReactOS is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help. . Language=Polish -System ma za mało pamięci wirtualnej. System Windows zwiększa rozmiar pliku stronicowania pamięci wirtualnej. W czasie trwania tego procesu, może wystąpić odmowa na żądania pamięci niektórych aplikacji. Więcej informacji możesz znaleźć w Pomocy. +System ma za mało pamięci wirtualnej. System ReactOS zwiększa rozmiar pliku stronicowania pamięci wirtualnej. W czasie trwania tego procesu, może wystąpić odmowa na żądania pamięci niektórych aplikacji. Więcej informacji możesz znaleźć w Pomocy. . Language=Romanian -Your system is low on virtual memory. Windows is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help. +Your system is low on virtual memory. ReactOS is increasing the size of your virtual memory paging file. During this process, memory requests for some applications may be denied. For more information, see Help. . MessageId=636 @@ -5164,16 +5164,16 @@ Severity=Success Facility=System SymbolicName=ERROR_DS_VERSION_CHECK_FAILURE Language=English -This version of Windows is not compatible with the behavior version of directory forest, domain or domain controller. +This version of ReactOS is not compatible with the behavior version of directory forest, domain or domain controller. . Language=Russian -This version of Windows is not compatible with the behavior version of directory forest, domain or domain controller. +This version of ReactOS is not compatible with the behavior version of directory forest, domain or domain controller. . Language=Polish -Ta wersja systemu Windows jest niezgodna z wersją zachowania lasu katalogów, domeny lub kontrolera domeny. +Ta wersja systemu ReactOS jest niezgodna z wersją zachowania lasu katalogów, domeny lub kontrolera domeny. . Language=Romanian -This version of Windows is not compatible with the behavior version of directory forest, domain or domain controller. +This version of ReactOS is not compatible with the behavior version of directory forest, domain or domain controller. . MessageId=644 @@ -6371,16 +6371,16 @@ Severity=Success Facility=System SymbolicName=ERROR_FIRMWARE_UPDATED Language=English -Windows has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3]. +ReactOS has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3]. . Language=Russian -Windows has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3]. +ReactOS has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3]. . Language=Polish -System Windows wykrył, że oprogramowanie układowe systemu (BIOS) zostało zaktualizowane [poprzednia data oprogramowania układowego = %2, bieżąca data oprogramowania układowego %3]. +System ReactOS wykrył, że oprogramowanie układowe systemu (BIOS) zostało zaktualizowane [poprzednia data oprogramowania układowego = %2, bieżąca data oprogramowania układowego %3]. . Language=Romanian -Windows has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3]. +ReactOS has detected that the system firmware (BIOS) was updated [previous firmware date = %2, current firmware date %3]. . MessageId=729 @@ -8734,16 +8734,16 @@ Severity=Success Facility=System SymbolicName=ERROR_OLD_WIN_VERSION Language=English -The specified program requires a newer version of Windows. +The specified program requires a newer version of ReactOS. . Language=Russian -The specified program requires a newer version of Windows. +The specified program requires a newer version of ReactOS. . Language=Polish -Określony program wymaga nowszej wersji systemu Windows. +Określony program wymaga nowszej wersji systemu ReactOS. . Language=Romanian -The specified program requires a newer version of Windows. +The specified program requires a newer version of ReactOS. . MessageId=1151 @@ -8785,16 +8785,16 @@ Severity=Success Facility=System SymbolicName=ERROR_RMODE_APP Language=English -The specified program was written for an earlier version of Windows. +The specified program was written for an earlier version of ReactOS. . Language=Russian -The specified program was written for an earlier version of Windows. +The specified program was written for an earlier version of ReactOS. . Language=Polish -Określony program został napisany dla starszej wersji systemu Windows. +Określony program został napisany dla starszej wersji systemu ReactOS. . Language=Romanian -The specified program was written for an earlier version of Windows. +The specified program was written for an earlier version of ReactOS. . MessageId=1154 @@ -9788,16 +9788,16 @@ Severity=Success Facility=System SymbolicName=ERROR_NETWORK_UNREACHABLE Language=English -The network location cannot be reached. For information about network troubleshooting, see Windows Help. +The network location cannot be reached. For information about network troubleshooting, see ReactOS Help. . Language=Russian -Сетевая папка недоступна. За информацией о разрешении проблем в сети обратитесь к справочной системе Windows. +Сетевая папка недоступна. За информацией о разрешении проблем в сети обратитесь к справочной системе ReactOS. . Language=Polish -Lokalizacja sieciowa jest nieosiągalna. Informacje na temat rozwiązywania problemów z siecią można znaleźć w Pomocy systemu Windows. +Lokalizacja sieciowa jest nieosiągalna. Informacje na temat rozwiązywania problemów z siecią można znaleźć w Pomocy systemu ReactOS. . Language=Romanian -The network location cannot be reached. For information about network troubleshooting, see Windows Help. +The network location cannot be reached. For information about network troubleshooting, see ReactOS Help. . MessageId=1232 @@ -9805,16 +9805,16 @@ Severity=Success Facility=System SymbolicName=ERROR_HOST_UNREACHABLE Language=English -The network location cannot be reached. For information about network troubleshooting, see Windows Help. +The network location cannot be reached. For information about network troubleshooting, see ReactOS Help. . Language=Russian -Сетевая папка недоступна. За информацией о разрешении проблем в сети обратитесь к справочной системе Windows. +Сетевая папка недоступна. За информацией о разрешении проблем в сети обратитесь к справочной системе ReactOS. . Language=Polish -Lokalizacja sieciowa jest nieosiągalna. Informacje na temat rozwiązywania problemów z siecią można znaleźć w Pomocy systemu Windows. +Lokalizacja sieciowa jest nieosiągalna. Informacje na temat rozwiązywania problemów z siecią można znaleźć w Pomocy systemu ReactOS. . Language=Romanian -The network location cannot be reached. For information about network troubleshooting, see Windows Help. +The network location cannot be reached. For information about network troubleshooting, see ReactOS Help. . MessageId=1233 @@ -9822,16 +9822,16 @@ Severity=Success Facility=System SymbolicName=ERROR_PROTOCOL_UNREACHABLE Language=English -The network location cannot be reached. For information about network troubleshooting, see Windows Help. +The network location cannot be reached. For information about network troubleshooting, see ReactOS Help. . Language=Russian -Сетевая папка недоступна. За информацией о разрешении проблем в сети обратитесь к справочной системе Windows. +Сетевая папка недоступна. За информацией о разрешении проблем в сети обратитесь к справочной системе ReactOS. . Language=Polish -Lokalizacja sieciowa jest nieosiągalna. Informacje na temat rozwiązywania problemów z siecią można znaleźć w Pomocy systemu Windows. +Lokalizacja sieciowa jest nieosiągalna. Informacje na temat rozwiązywania problemów z siecią można znaleźć w Pomocy systemu ReactOS. . Language=Romanian -The network location cannot be reached. For information about network troubleshooting, see Windows Help. +The network location cannot be reached. For information about network troubleshooting, see ReactOS Help. . MessageId=1234 @@ -10213,16 +10213,16 @@ Severity=Success Facility=System SymbolicName=ERROR_HOST_DOWN Language=English -The remote system is not available. For information about network troubleshooting, see Windows Help. +The remote system is not available. For information about network troubleshooting, see ReactOS Help. . Language=Russian -Удаленная система недоступна. За информацией о разрешении проблем в сети, обратитесь к справочной системе Windows. +Удаленная система недоступна. За информацией о разрешении проблем в сети, обратитесь к справочной системе ReactOS. . Language=Polish -System zdalny jest niedostępny. Aby uzyskać informacje dotyczące rozwiązywania problemów z siecią, zobacz Pomoc systemu Windows. +System zdalny jest niedostępny. Aby uzyskać informacje dotyczące rozwiązywania problemów z siecią, zobacz Pomoc systemu ReactOS. . Language=Romanian -The remote system is not available. For information about network troubleshooting, see Windows Help. +The remote system is not available. For information about network troubleshooting, see ReactOS Help. . MessageId=1257 @@ -10281,7 +10281,7 @@ Severity=Success Facility=System SymbolicName=ERROR_ACCESS_DISABLED_BY_POLICY Language=English -Windows cannot open this program because it has been prevented by a software restriction policy. For more information, open Event Viewer or contact your system administrator. +ReactOS cannot open this program because it has been prevented by a software restriction policy. For more information, open Event Viewer or contact your system administrator. . Language=Russian Эта программа заблокирована групповой политикой. За дополнительными сведениями обращайтесь к системному администратору. @@ -10290,7 +10290,7 @@ Language=Polish Ten program jest blokowany przez zasady grupy. Aby uzyskać więcej informacji, otwórz Podgląd zdarzeń lub skontaktuj się z administratorem systemu. . Language=Romanian -Windows cannot open this program because it has been prevented by a software restriction policy. For more information, open Event Viewer or contact your system administrator. +ReactOS cannot open this program because it has been prevented by a software restriction policy. For more information, open Event Viewer or contact your system administrator. . MessageId=1261 @@ -10553,16 +10553,16 @@ Severity=Success Facility=System SymbolicName=ERROR_ACCESS_DISABLED_WEBBLADE Language=English -Windows cannot open this program since it has been disabled. +ReactOS cannot open this program since it has been disabled. . Language=Russian -Windows не удается запустить эту программу, так как она отключена. +ReactOS не удается запустить эту программу, так как она отключена. . Language=Polish -System Windows nie może otworzyć tego programu, ponieważ został on wyłączony. +System ReactOS nie może otworzyć tego programu, ponieważ został on wyłączony. . Language=Romanian -Windows cannot open this program since it has been disabled. +ReactOS cannot open this program since it has been disabled. . MessageId=1278 @@ -10570,16 +10570,16 @@ Severity=Success Facility=System SymbolicName=ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER Language=English -Windows cannot open this program because the license enforcement system has been tampered with or become corrupted. +ReactOS cannot open this program because the license enforcement system has been tampered with or become corrupted. . Language=Russian -Windows не удается открыть эту программу, так как система учета лицензий изменена или повреждена. +ReactOS не удается открыть эту программу, так как система учета лицензий изменена или повреждена. . Language=Polish -System Windows nie może otworzyć tego programu, ponieważ system wymuszania licencji został zmieniony lub uszkodzony. +System ReactOS nie może otworzyć tego programu, ponieważ system wymuszania licencji został zmieniony lub uszkodzony. . Language=Romanian -Windows cannot open this program because the license enforcement system has been tampered with or become corrupted. +ReactOS cannot open this program because the license enforcement system has been tampered with or become corrupted. . MessageId=1279 @@ -13732,16 +13732,16 @@ Severity=Success Facility=System SymbolicName=ERROR_INSTALL_SERVICE_FAILURE Language=English -The Windows Installer service could not be accessed. This can occur if you are running Windows in safe mode, or if the Windows Installer is not correctly installed. Contact your support personnel for assistance. +The ReactOS Installer service could not be accessed. This can occur if you are running ReactOS in safe mode, or if the ReactOS Installer is not correctly installed. Contact your support personnel for assistance. . Language=Russian -The Windows Installer service could not be accessed. This can occur if you are running Windows in safe mode, or if the Windows Installer is not correctly installed. Contact your support personnel for assistance. +The ReactOS Installer service could not be accessed. This can occur if you are running ReactOS in safe mode, or if the ReactOS Installer is not correctly installed. Contact your support personnel for assistance. . Language=Polish -Nie można uzyskać dostępu do usługi Instalator Windows. Może mieć to miejsce, jeśli system Windows jest uruchomiony w trybie awaryjnym lub Instalator Windows jest niepoprawnie zainstalowany. Skontaktuj się z pomocą techniczną, aby uzyskać pomoc. +Nie można uzyskać dostępu do usługi Instalator ReactOS. Może mieć to miejsce, jeśli system ReactOS jest uruchomiony w trybie awaryjnym lub Instalator ReactOS jest niepoprawnie zainstalowany. Skontaktuj się z pomocą techniczną, aby uzyskać pomoc. . Language=Romanian -The Windows Installer service could not be accessed. This can occur if you are running Windows in safe mode, or if the Windows Installer is not correctly installed. Contact your support personnel for assistance. +The ReactOS Installer service could not be accessed. This can occur if you are running ReactOS in safe mode, or if the ReactOS Installer is not correctly installed. Contact your support personnel for assistance. . MessageId=1602 @@ -13936,16 +13936,16 @@ Severity=Success Facility=System SymbolicName=ERROR_INSTALL_PACKAGE_VERSION Language=English -This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service. +This installation package cannot be installed by the ReactOS Installer service. You must install a ReactOS service pack that contains a newer version of the ReactOS Installer service. . Language=Russian -This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service. +This installation package cannot be installed by the ReactOS Installer service. You must install a ReactOS service pack that contains a newer version of the ReactOS Installer service. . Language=Polish -Usługa Instalator Windows nie może zainstalować tego pakietu instalacyjnego. Musisz zainstalować dodatek Windows Service Pack, zawierający nowszą wersję usługi Instalator Windows. +Usługa Instalator ReactOS nie może zainstalować tego pakietu instalacyjnego. Musisz zainstalować dodatek ReactOS Service Pack, zawierający nowszą wersję usługi Instalator ReactOS. . Language=Romanian -This installation package cannot be installed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service. +This installation package cannot be installed by the ReactOS Installer service. You must install a ReactOS service pack that contains a newer version of the ReactOS Installer service. . MessageId=1614 @@ -14072,16 +14072,16 @@ Severity=Success Facility=System SymbolicName=ERROR_INSTALL_UI_FAILURE Language=English -There was an error starting the Windows Installer service user interface. Contact your support personnel. +There was an error starting the ReactOS Installer service user interface. Contact your support personnel. . Language=Russian -There was an error starting the Windows Installer service user interface. Contact your support personnel. +There was an error starting the ReactOS Installer service user interface. Contact your support personnel. . Language=Polish -Podczas uruchamiania interfejsu użytkownika usługi Instalator Windows wystąpił błąd. Skontaktuj się z personelem technicznym. +Podczas uruchamiania interfejsu użytkownika usługi Instalator ReactOS wystąpił błąd. Skontaktuj się z personelem technicznym. . Language=Romanian -There was an error starting the Windows Installer service user interface. Contact your support personnel. +There was an error starting the ReactOS Installer service user interface. Contact your support personnel. . MessageId=1622 @@ -14242,16 +14242,16 @@ Severity=Success Facility=System SymbolicName=ERROR_CREATE_FAILED Language=English -The Windows Installer service failed to start. Contact your support personnel. +The ReactOS Installer service failed to start. Contact your support personnel. . Language=Russian -The Windows Installer service failed to start. Contact your support personnel. +The ReactOS Installer service failed to start. Contact your support personnel. . Language=Polish -Nie można uruchomić usługi Instalator Windows. Skontaktuj się z działem Pomocy technicznej. +Nie można uruchomić usługi Instalator ReactOS. Skontaktuj się z działem Pomocy technicznej. . Language=Romanian -The Windows Installer service failed to start. Contact your support personnel. +The ReactOS Installer service failed to start. Contact your support personnel. . MessageId=1632 @@ -14344,16 +14344,16 @@ Severity=Success Facility=System SymbolicName=ERROR_PATCH_PACKAGE_UNSUPPORTED Language=English -This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service. +This patch package cannot be processed by the ReactOS Installer service. You must install a ReactOS service pack that contains a newer version of the ReactOS Installer service. . Language=Russian -This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service. +This patch package cannot be processed by the ReactOS Installer service. You must install a ReactOS service pack that contains a newer version of the ReactOS Installer service. . Language=Polish -Usługa Instalator Windows nie może przetworzyć tego pakietu aktualizacji. Musisz zainstalować dodatek Windows Service Pack, zawierający nowszą wersję usługi Instalator Windows. +Usługa Instalator ReactOS nie może przetworzyć tego pakietu aktualizacji. Musisz zainstalować dodatek ReactOS Service Pack, zawierający nowszą wersję usługi Instalator ReactOS. . Language=Romanian -This patch package cannot be processed by the Windows Installer service. You must install a Windows service pack that contains a newer version of the Windows Installer service. +This patch package cannot be processed by the ReactOS Installer service. You must install a ReactOS service pack that contains a newer version of the ReactOS Installer service. . MessageId=1638 @@ -14429,16 +14429,16 @@ Severity=Success Facility=System SymbolicName=ERROR_PATCH_TARGET_NOT_FOUND Language=English -The upgrade patch cannot be installed by the Windows Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch. +The upgrade patch cannot be installed by the ReactOS Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch. . Language=Russian -The upgrade patch cannot be installed by the Windows Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch. +The upgrade patch cannot be installed by the ReactOS Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch. . Language=Polish -Uaktualnienia nie można zainstalować przez usługę Instalator Windows, ponieważ nie ma programu do uaktualnienia albo uaktualnienie jest przeznaczone do innej wersji tego programu. Sprawdź, czy program, który ma być uaktualniony, znajduje się na dysku i czy masz prawidłowe uaktualnienie. +Uaktualnienia nie można zainstalować przez usługę Instalator ReactOS, ponieważ nie ma programu do uaktualnienia albo uaktualnienie jest przeznaczone do innej wersji tego programu. Sprawdź, czy program, który ma być uaktualniony, znajduje się na dysku i czy masz prawidłowe uaktualnienie. . Language=Romanian -The upgrade patch cannot be installed by the Windows Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch. +The upgrade patch cannot be installed by the ReactOS Installer service because the program to be upgraded may be missing, or the upgrade patch may update a different version of the program. Verify that the program to be upgraded exists on your computer and that you have the correct upgrade patch. . MessageId=1643 @@ -14480,16 +14480,16 @@ Severity=Success Facility=System SymbolicName=ERROR_INSTALL_REMOTE_PROHIBITED Language=English -The Windows Installer does not permit installation from a Remote Desktop Connection. +The ReactOS Installer does not permit installation from a Remote Desktop Connection. . Language=Russian -The Windows Installer does not permit installation from a Remote Desktop Connection. +The ReactOS Installer does not permit installation from a Remote Desktop Connection. . Language=Polish -Instalator Windows nie zezwala na instalację przy użyciu podłączania pulpitu zdalnego. +Instalator ReactOS nie zezwala na instalację przy użyciu podłączania pulpitu zdalnego. . Language=Romanian -The Windows Installer does not permit installation from a Remote Desktop Connection. +The ReactOS Installer does not permit installation from a Remote Desktop Connection. . MessageId=1700

1 0

[reactos] 01/01: [SHELL32] Fix "Open With..." spamming registry MRU keys. (#2685)
by Kyle Katarn 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd6e1c73c040d73308b3a… commit cd6e1c73c040d73308b3aeb7b06b33614d40ecf4 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Thu Apr 30 23:03:10 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 30 23:03:10 2020 +0200 [SHELL32] Fix "Open With..." spamming registry MRU keys. (#2685) CORE-16981 The problem: ============ - When opening "Open With..." dialog for a given file format, multiple MRU items are appended to registry : 2 items written, even if dialog is closed "cancel". - Expected behavior : 1 MRU item if execute is selected and 0 MRU if cancel is selected. Fix: ==== - MRU item to be added when "Execute" is selected only. - Once added, set the presence flag to avoid multiple MRU items being added later. --- dll/win32/shell32/COpenWithMenu.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index e9dd8018e35..2ad593bc559 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -534,8 +534,6 @@ VOID COpenWithList::LoadFromProgIdKey(HKEY hKey, LPCWSTR pwszExt) { StringCbCopyW(pApp->wszCmd, sizeof(pApp->wszCmd), wszCmd); SetRecommended(pApp); - if (!pApp->bMRUList) - AddAppToMRUList(pApp, pwszExt); } } } @@ -653,6 +651,9 @@ BOOL COpenWithList::AddAppToMRUList(SApp *pApp, LPCWSTR pwszFilename) /* Insert the entry */ AddMRUStringW(hList, pApp->wszFilename); + /* Set MRU presence */ + pApp->bMRUList = TRUE; + /* Close MRU list */ FreeMRUList(hList); }

1 0

[reactos] 04/04: [ZIPFLDR_APITEST] Add test enumerating over zip folder's parent Disable tests for unimplemented features
by Mark Jansen 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cd5598ea97aa20d6b143… commit 5cd5598ea97aa20d6b143a7f1c45169fe9895bdd Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Apr 22 20:47:00 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 30 20:38:43 2020 +0200 [ZIPFLDR_APITEST] Add test enumerating over zip folder's parent Disable tests for unimplemented features --- modules/rostests/apitests/zipfldr/CMakeLists.txt | 1 + modules/rostests/apitests/zipfldr/EnumObjects.cpp | 30 +-- .../rostests/apitests/zipfldr/EnumParentDir.cpp | 218 +++++++++++++++++++++ modules/rostests/apitests/zipfldr/IDataObject.cpp | 22 ++- modules/rostests/apitests/zipfldr/precomp.h | 4 +- modules/rostests/apitests/zipfldr/testlist.c | 2 + 6 files changed, 260 insertions(+), 17 deletions(-) diff --git a/modules/rostests/apitests/zipfldr/CMakeLists.txt b/modules/rostests/apitests/zipfldr/CMakeLists.txt index 20a7abf8dc8..a53bbfd1bfd 100644 --- a/modules/rostests/apitests/zipfldr/CMakeLists.txt +++ b/modules/rostests/apitests/zipfldr/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE EnumObjects.cpp + EnumParentDir.cpp IDataObject.cpp precomp.h resource.h) diff --git a/modules/rostests/apitests/zipfldr/EnumObjects.cpp b/modules/rostests/apitests/zipfldr/EnumObjects.cpp index a7c1749c481..66bc90e182e 100644 --- a/modules/rostests/apitests/zipfldr/EnumObjects.cpp +++ b/modules/rostests/apitests/zipfldr/EnumObjects.cpp @@ -9,17 +9,19 @@ static bool g_bOldZipfldr = false; -#define ok_displayname(pFolder, pidl, Flags, Name) ok_displayname_(__FILE__, __LINE__, pFolder, pidl, Flags, Name) -static void ok_displayname_(const char* file, int line, IShellFolder* pFolder, PCUITEMID_CHILD pidl, SHGDNF Flags, LPCWSTR Name) +void ok_displayname_(const char* file, int line, IShellFolder* pFolder, PCUITEMID_CHILD pidl, SHGDNF Flags, LPCWSTR Name) { STRRET NameRet; HRESULT hr; - ok_hr_(file, line, (hr = pFolder->GetDisplayNameOf(pidl, Flags, &NameRet)), S_OK); + + hr = pFolder->GetDisplayNameOf(pidl, Flags, &NameRet); + ok_hr_(file, line, hr, S_OK); if (!SUCCEEDED(hr)) return; WCHAR DisplayName[MAX_PATH]; - ok_hr_(file, line, (hr = StrRetToBufW(&NameRet, pidl, DisplayName, ARRAYSIZE(DisplayName))), S_OK); + hr = StrRetToBufW(&NameRet, pidl, DisplayName, RTL_NUMBER_OF(DisplayName)); + ok_hr_(file, line, hr, S_OK); if (!SUCCEEDED(hr)) return; @@ -61,8 +63,8 @@ static void test_EnumObjects_Files(const WCHAR* Filename, IShellFolder* pFolder) if (celtFetched != 1) break; - LPCWSTR ExpectedName = totalFetched < ARRAYSIZE(ExpectedFiles) ? ExpectedFiles[totalFetched].Name : L"<TOO MANY FILES>"; - SFGAOF ExpectedAttributes = totalFetched < ARRAYSIZE(ExpectedFiles) ? ExpectedFiles[totalFetched].Attributes : 0xdeaddead; + LPCWSTR ExpectedName = totalFetched < RTL_NUMBER_OF(ExpectedFiles) ? ExpectedFiles[totalFetched].Name : L"<TOO MANY FILES>"; + SFGAOF ExpectedAttributes = totalFetched < RTL_NUMBER_OF(ExpectedFiles) ? ExpectedFiles[totalFetched].Attributes : 0xdeaddead; totalFetched++; @@ -117,7 +119,7 @@ static void test_EnumObjects_Files(const WCHAR* Filename, IShellFolder* pFolder) ReleaseStgMedium(&medium); } while (true); - ok_int(totalFetched, ARRAYSIZE(ExpectedFiles)); + ok_int(totalFetched, RTL_NUMBER_OF(ExpectedFiles)); ok_hr(hr, S_FALSE); } @@ -163,9 +165,9 @@ static void test_EnumObjects_Folders(const WCHAR* Filename, IShellFolder* pFolde if (celtFetched != 1) break; - LPCWSTR ExpectedName = totalFetched < ARRAYSIZE(ExpectedFolders) ? ExpectedFolders[totalFetched].Name : L"<TOO MANY FILES>"; - SFGAOF ExpectedAttributes = totalFetched < ARRAYSIZE(ExpectedFolders) ? ExpectedFolders[totalFetched].Attributes : 0xdeaddead; - LPCWSTR* ExtraFiles = totalFetched < ARRAYSIZE(ExpectedExtraFiles) ? ExpectedExtraFiles[totalFetched] : ExpectedExtraFiles[0]; + LPCWSTR ExpectedName = totalFetched < RTL_NUMBER_OF(ExpectedFolders) ? ExpectedFolders[totalFetched].Name : L"<TOO MANY FILES>"; + SFGAOF ExpectedAttributes = totalFetched < RTL_NUMBER_OF(ExpectedFolders) ? ExpectedFolders[totalFetched].Attributes : 0xdeaddead; + LPCWSTR* ExtraFiles = totalFetched < RTL_NUMBER_OF(ExpectedExtraFiles) ? ExpectedExtraFiles[totalFetched] : ExpectedExtraFiles[0]; totalFetched++; @@ -216,7 +218,7 @@ static void test_EnumObjects_Folders(const WCHAR* Filename, IShellFolder* pFolde ReleaseStgMedium(&medium); } while (true); - ok_int(totalFetched, ARRAYSIZE(ExpectedFolders)); + ok_int(totalFetched, RTL_NUMBER_OF(ExpectedFolders)); ok_hr(hr, S_FALSE); } @@ -252,6 +254,9 @@ static void test_EnumObjects(const WCHAR* Filename) START_TEST(EnumObjects) { + skip("Code in zipfldr not implemented yet\n"); + return; + HRESULT hr = CoInitialize(NULL); ok_hr(hr, S_OK); @@ -259,8 +264,9 @@ START_TEST(EnumObjects) return; WCHAR ZipTestFile[MAX_PATH]; - if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_ENUM))) + if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_ENUM), NULL)) return; test_EnumObjects(ZipTestFile); DeleteFileW(ZipTestFile); + CoUninitialize(); } diff --git a/modules/rostests/apitests/zipfldr/EnumParentDir.cpp b/modules/rostests/apitests/zipfldr/EnumParentDir.cpp new file mode 100644 index 00000000000..8eec80e3436 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/EnumParentDir.cpp @@ -0,0 +1,218 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test the result of enumerating over a folder with a zip in it + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +struct FileInfo +{ + LPCWSTR Name; + SFGAOF Attributes; + bool Found; +}; + +int zipfldr_loaded() +{ + return GetModuleHandleA("zipfldr.dll") ? TRUE : FALSE; +} + +void FindExpectedFile(FileInfo* Array, size_t len, IShellFolder* pFolder, PCUITEMID_CHILD pidl, LPCWSTR& ExpectedName, SFGAOF& ExpectedAttributes) +{ + ExpectedName = L"<WRONG FILE>"; + ExpectedAttributes = (SFGAOF)~0; + + STRRET NameRet; + HRESULT hr; + + hr = pFolder->GetDisplayNameOf(pidl, SHGDN_NORMAL, &NameRet); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR DisplayName[MAX_PATH]; + hr = StrRetToBufW(&NameRet, pidl, DisplayName, RTL_NUMBER_OF(DisplayName)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + for (size_t n = 0; n < len; ++n) + { + if (!wcsicmp(Array[n].Name, DisplayName) && !Array[n].Found) + { + Array[n].Found = true; + ExpectedName = Array[n].Name; + ExpectedAttributes = Array[n].Attributes; + return; + } + } +} + +static void test_EnumDirFiles(const WCHAR* TestFolder) +{ + CComPtr<IShellFolder> spFolder; + if (!InitializeShellFolder(TestFolder, spFolder)) + return; + + CComPtr<IEnumIDList> spEnum; + ok_int(zipfldr_loaded(), FALSE); + HRESULT hr = spFolder->EnumObjects(NULL, SHCONTF_NONFOLDERS, &spEnum); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + ok_int(zipfldr_loaded(), FALSE); + + SFGAOF BaseAttributes = SFGAO_FILESYSTEM; + FileInfo ExpectedFiles[] = { + { L"test.txt", BaseAttributes, false }, + }; + + ULONG totalFetched = 0; + do + { + CComHeapPtr<ITEMID_CHILD> child; + ULONG celtFetched = 0; + hr = spEnum->Next(1, &child, &celtFetched); + if (hr != S_OK) + break; + ok_int(celtFetched, 1); + if (celtFetched != 1) + break; + + LPCWSTR ExpectedName; + SFGAOF ExpectedAttributes; + FindExpectedFile(ExpectedFiles, RTL_NUMBER_OF(ExpectedFiles), spFolder, child, ExpectedName, ExpectedAttributes); + + totalFetched++; + + ok_displayname(spFolder, child, SHGDN_NORMAL, ExpectedName); + + SFGAOF Attributes = SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + hr = spFolder->GetAttributesOf(1, &child, &Attributes); + /* Just keep the ones we are interested in */ + Attributes &= (SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR); + ok_hr(hr, S_OK); + ok_hex(Attributes, ExpectedAttributes); + } while (true); + + ok_int(totalFetched, RTL_NUMBER_OF(ExpectedFiles)); + ok_hr(hr, S_FALSE); + ok_int(zipfldr_loaded(), FALSE); +} + +static void test_EnumDirDirs(const WCHAR* TestFolder) +{ + CComPtr<IShellFolder> spFolder; + if (!InitializeShellFolder(TestFolder, spFolder)) + return; + + CComPtr<IEnumIDList> spEnum; + ok_int(zipfldr_loaded(), FALSE); + HRESULT hr = spFolder->EnumObjects(NULL, SHCONTF_FOLDERS, &spEnum); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_int(zipfldr_loaded(), FALSE); + + SFGAOF BaseAttributes = SFGAO_FILESYSTEM | SFGAO_FOLDER; + FileInfo ExpectedFiles[] = { + { L"TMP0.zip", BaseAttributes, false}, + { L"ASUBFLD", BaseAttributes | SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR, false }, + }; + + bool bFoundZipfldr = false; + + ULONG totalFetched = 0; + do + { + CComHeapPtr<ITEMID_CHILD> child; + ULONG celtFetched = 0; + ok_int(zipfldr_loaded(), bFoundZipfldr ? TRUE : FALSE); + hr = spEnum->Next(1, &child, &celtFetched); + if (hr != S_OK) + break; + ok_int(celtFetched, 1); + if (celtFetched != 1) + break; + + ok_int(zipfldr_loaded(), bFoundZipfldr ? TRUE : FALSE); + + LPCWSTR ExpectedName; + SFGAOF ExpectedAttributes; + FindExpectedFile(ExpectedFiles, RTL_NUMBER_OF(ExpectedFiles), spFolder, child, ExpectedName, ExpectedAttributes); + + totalFetched++; + + ok_displayname(spFolder, child, SHGDN_NORMAL, ExpectedName); + trace("Current: %S\n", ExpectedName); + + SFGAOF Attributes = SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + hr = spFolder->GetAttributesOf(1, &child, &Attributes); + if ((ExpectedAttributes & SFGAO_FILESYSANCESTOR)) + { + ok_int(zipfldr_loaded(), bFoundZipfldr ? TRUE : FALSE); + } + else + { + ok_int(zipfldr_loaded(), TRUE); + bFoundZipfldr = true; + } + /* Just keep the ones we are interested in */ + Attributes &= (SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | SFGAO_STORAGEANCESTOR); + ok_hr(hr, S_OK); + ok_hex(Attributes, ExpectedAttributes); + } while (true); + + ok_int(totalFetched, RTL_NUMBER_OF(ExpectedFiles)); + ok_hr(hr, S_FALSE); +} + + +START_TEST(EnumParentDir) +{ + HRESULT hr = CoInitialize(NULL); + + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR TestFolder[MAX_PATH], TestFile[MAX_PATH], SubFolder[MAX_PATH]; + GetTempPathW(_countof(TestFolder), TestFolder); + PathAppendW(TestFolder, L"ZipDir"); + PathAddBackslashW(TestFolder); + + CreateDirectoryW(TestFolder, NULL); + + WCHAR ZipTestFile[MAX_PATH]; + if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_FILE), TestFolder)) + { + RemoveDirectoryW(TestFolder); + return; + } + + StringCchPrintfW(TestFile, _countof(TestFile), L"%stest.txt", TestFolder); + + HANDLE hFile = CreateFileW(TestFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + + ok(hFile != INVALID_HANDLE_VALUE, "Error creating %S\n", TestFile); + if (hFile != INVALID_HANDLE_VALUE) + { + StringCchPrintfW(SubFolder, _countof(SubFolder), L"%sASUBFLD", TestFolder); + + CreateDirectoryW(SubFolder, NULL); + + test_EnumDirFiles(TestFolder); + test_EnumDirDirs(TestFolder); + + RemoveDirectoryW(SubFolder); + + CloseHandle(hFile); + } + + DeleteFileW(ZipTestFile); + RemoveDirectoryW(TestFolder); + CoUninitialize(); +} diff --git a/modules/rostests/apitests/zipfldr/IDataObject.cpp b/modules/rostests/apitests/zipfldr/IDataObject.cpp index ac2a7dfe4bc..b27730f6f50 100644 --- a/modules/rostests/apitests/zipfldr/IDataObject.cpp +++ b/modules/rostests/apitests/zipfldr/IDataObject.cpp @@ -36,11 +36,21 @@ static BOOL write_raw_file(const WCHAR* FileName, const void* Data, DWORD Size) return Success && (dwWritten == Size); } -BOOL extract_resource(WCHAR* Filename, LPCWSTR ResourceName) +BOOL extract_resource(WCHAR* Filename, LPCWSTR ResourceName, WCHAR* ParentFolder) { WCHAR workdir[MAX_PATH]; - GetTempPathW(_countof(workdir), workdir); - StringCchPrintfW(Filename, MAX_PATH, L"%sTMP%u.zip", workdir, GetTickCount() & 0xffff); + UINT TickMask = 0xffff; + if (!ParentFolder) + { + GetTempPathW(_countof(workdir), workdir); + ParentFolder = workdir; + } + else + { + // Fixed filename + TickMask = 0; + } + StringCchPrintfW(Filename, MAX_PATH, L"%sTMP%u.zip", ParentFolder, GetTickCount() & TickMask); HMODULE hMod = GetModuleHandleW(NULL); HRSRC hRsrc = FindResourceW(hMod, ResourceName, MAKEINTRESOURCEW(RT_RCDATA)); @@ -554,6 +564,9 @@ static void test_DataObject(const WCHAR* Filename) START_TEST(IDataObject) { + skip("Code in zipfldr not implemented yet\n"); + return; + HRESULT hr = CoInitialize(NULL); ok_hr(hr, S_OK); @@ -561,8 +574,9 @@ START_TEST(IDataObject) return; WCHAR ZipTestFile[MAX_PATH]; - if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_FILE))) + if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_FILE), NULL)) return; test_DataObject(ZipTestFile); DeleteFileW(ZipTestFile); + CoUninitialize(); } diff --git a/modules/rostests/apitests/zipfldr/precomp.h b/modules/rostests/apitests/zipfldr/precomp.h index 6af5f674709..62a683bb604 100644 --- a/modules/rostests/apitests/zipfldr/precomp.h +++ b/modules/rostests/apitests/zipfldr/precomp.h @@ -21,12 +21,14 @@ #include "resource.h" -BOOL extract_resource(WCHAR* Filename, LPCWSTR ResourceName); +BOOL extract_resource(WCHAR* Filename, LPCWSTR ResourceName, WCHAR* ParentFolder); #define InitializeShellFolder(Filename, pFolder) InitializeShellFolder_(__FILE__, __LINE__, Filename, pFolder) bool InitializeShellFolder_(const char* file, int line, const WCHAR* Filename, CComPtr<IShellFolder>& spFolder); #define IsFormatAdvertised(pDataObj, cfFormat, tymed) IsFormatAdvertised_(__FILE__, __LINE__, pDataObj, cfFormat, tymed) bool IsFormatAdvertised_(const char* file, int line, IDataObject* pDataObj, CLIPFORMAT cfFormat, TYMED tymed); +#define ok_displayname(pFolder, pidl, Flags, Name) ok_displayname_(__FILE__, __LINE__, pFolder, pidl, Flags, Name) +void ok_displayname_(const char* file, int line, IShellFolder* pFolder, PCUITEMID_CHILD pidl, SHGDNF Flags, LPCWSTR Name); #endif /* _ZIPFLDR_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/apitests/zipfldr/testlist.c b/modules/rostests/apitests/zipfldr/testlist.c index ecd1bb9d700..5f67cf4af85 100644 --- a/modules/rostests/apitests/zipfldr/testlist.c +++ b/modules/rostests/apitests/zipfldr/testlist.c @@ -2,11 +2,13 @@ #include <apitest.h> extern void func_EnumObjects(void); +extern void func_EnumParentDir(void); extern void func_IDataObject(void); const struct test winetest_testlist[] = { { "EnumObjects", func_EnumObjects }, + { "EnumParentDir", func_EnumParentDir }, { "IDataObject", func_IDataObject }, { 0, 0 } };

1 0

[reactos] 03/04: [ZIPFLDR] Set correct access time on file extraction
by Mark Jansen 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=190c1b86ec3374fd83e0f… commit 190c1b86ec3374fd83e0f6cc397f8f9aedcb0505 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 5 02:25:05 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 30 20:38:43 2020 +0200 [ZIPFLDR] Set correct access time on file extraction --- dll/shellext/zipfldr/CZipExtract.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index f4d76898d76..883bce731aa 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -533,13 +533,11 @@ public: } while (err > 0); /* Update Filetime */ - FILETIME LastAccessTime; - GetFileTime(hFile, NULL, &LastAccessTime, NULL); FILETIME LocalFileTime; DosDateTimeToFileTime((WORD)(Info.dosDate >> 16), (WORD)Info.dosDate, &LocalFileTime); FILETIME FileTime; LocalFileTimeToFileTime(&LocalFileTime, &FileTime); - SetFileTime(hFile, &FileTime, &LastAccessTime, &FileTime); + SetFileTime(hFile, &FileTime, &FileTime, &FileTime); /* Done */ CloseHandle(hFile);

1 0

[reactos] 02/04: [ATL] Add CAtlArray::GetData
by Mark Jansen 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c37a7255ec4d87fd2ff1… commit 6c37a7255ec4d87fd2ff181d3cbcde3fe41a396f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 20 20:10:40 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 30 20:38:43 2020 +0200 [ATL] Add CAtlArray::GetData --- sdk/lib/atl/atlcoll.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sdk/lib/atl/atlcoll.h b/sdk/lib/atl/atlcoll.h index 32b9b46362d..8750def4c19 100644 --- a/sdk/lib/atl/atlcoll.h +++ b/sdk/lib/atl/atlcoll.h @@ -261,6 +261,10 @@ public: E& GetAt(size_t iElement); const E& GetAt(size_t iElement) const; + E* GetData(); + const E* GetData() const; + + //FIXME: Most of this class is missing! }; @@ -403,6 +407,17 @@ const E& CAtlArray<E, ETraits>::GetAt(size_t iElement) const return m_pData[iElement]; } +template<typename E, class ETraits> +E* CAtlArray<E, ETraits>::GetData() +{ + return m_pData; +} + +template<typename E, class ETraits> +const E* CAtlArray<E, ETraits>::GetData() const +{ + return m_pData; +} template<typename E, class ETraits = CElementTraits<E> >

1 0

[reactos] 01/04: [ZIPFLDR_APITEST] Add some basic IDataObject tests CORE-16241
by Mark Jansen 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0340c5188c62077b6a2a5… commit 0340c5188c62077b6a2a55ee4bdea24e23d2dab3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jan 4 17:49:02 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 30 20:38:28 2020 +0200 [ZIPFLDR_APITEST] Add some basic IDataObject tests CORE-16241 --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/include/apitest.h | 3 + modules/rostests/apitests/zipfldr/CMakeLists.txt | 22 + modules/rostests/apitests/zipfldr/EnumObjects.cpp | 266 ++++++++++ modules/rostests/apitests/zipfldr/IDataObject.cpp | 568 +++++++++++++++++++++ modules/rostests/apitests/zipfldr/precomp.h | 32 ++ modules/rostests/apitests/zipfldr/resource.h | 3 + modules/rostests/apitests/zipfldr/testlist.c | 12 + .../rostests/apitests/zipfldr/zipfldr_apitest.rc | 8 + .../apitests/zipfldr/zipfldr_test_enum.zip | Bin 0 -> 1634 bytes .../apitests/zipfldr/zipfldr_test_file.zip | Bin 0 -> 600 bytes 11 files changed, 915 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 2662835eeeb..59bdeb46832 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -56,3 +56,4 @@ add_subdirectory(winprint) add_subdirectory(winspool) add_subdirectory(wlanapi) add_subdirectory(ws2_32) +add_subdirectory(zipfldr) diff --git a/modules/rostests/apitests/include/apitest.h b/modules/rostests/apitests/include/apitest.h index da2430e929e..27777f7a730 100644 --- a/modules/rostests/apitests/include/apitest.h +++ b/modules/rostests/apitests/include/apitest.h @@ -32,4 +32,7 @@ ExceptionStatus, (ExpectedStatus)); \ } +#define ok_hr(status, expected) ok_hex(status, expected) +#define ok_hr_(file, line, status, expected) ok_hex_(file, line, status, expected) + #endif /* _APITEST_H */ diff --git a/modules/rostests/apitests/zipfldr/CMakeLists.txt b/modules/rostests/apitests/zipfldr/CMakeLists.txt new file mode 100644 index 00000000000..20a7abf8dc8 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/CMakeLists.txt @@ -0,0 +1,22 @@ + +add_definitions(-DINITGUID -DWINETEST_USE_DBGSTR_LONGLONG) +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) + +list(APPEND SOURCE + EnumObjects.cpp + IDataObject.cpp + precomp.h + resource.h) + +add_executable(zipfldr_apitest + ${SOURCE} + testlist.c + zipfldr_apitest.rc) + +target_link_libraries(zipfldr_apitest wine uuid) +set_module_type(zipfldr_apitest win32cui) +add_importlibs(zipfldr_apitest shlwapi ole32 shell32 user32 msvcrt kernel32 ntdll) +add_pch(zipfldr_apitest precomp.h SOURCE) +add_rostests_file(TARGET zipfldr_apitest) diff --git a/modules/rostests/apitests/zipfldr/EnumObjects.cpp b/modules/rostests/apitests/zipfldr/EnumObjects.cpp new file mode 100644 index 00000000000..a7c1749c481 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/EnumObjects.cpp @@ -0,0 +1,266 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for zipfldr + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +static bool g_bOldZipfldr = false; + +#define ok_displayname(pFolder, pidl, Flags, Name) ok_displayname_(__FILE__, __LINE__, pFolder, pidl, Flags, Name) +static void ok_displayname_(const char* file, int line, IShellFolder* pFolder, PCUITEMID_CHILD pidl, SHGDNF Flags, LPCWSTR Name) +{ + STRRET NameRet; + HRESULT hr; + ok_hr_(file, line, (hr = pFolder->GetDisplayNameOf(pidl, Flags, &NameRet)), S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR DisplayName[MAX_PATH]; + ok_hr_(file, line, (hr = StrRetToBufW(&NameRet, pidl, DisplayName, ARRAYSIZE(DisplayName))), S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_wstr_(file, line, DisplayName, Name); +} + +struct ZipFiles +{ + LPCWSTR Name; + SFGAOF Attributes; +}; + +static CLIPFORMAT cfHIDA = RegisterClipboardFormatA(CFSTR_SHELLIDLISTA); +static CLIPFORMAT cfFileDescriptor = RegisterClipboardFormatW(CFSTR_FILEDESCRIPTORW); + +static void test_EnumObjects_Files(const WCHAR* Filename, IShellFolder* pFolder) +{ + CComPtr<IEnumIDList> spEnum; + HRESULT hr = pFolder->EnumObjects(NULL, SHCONTF_NONFOLDERS, &spEnum); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + SFGAOF BaseAttributes = SFGAO_STREAM | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | SFGAO_CANCOPY | SFGAO_CANMOVE; + ZipFiles ExpectedFiles[] = { + { L"cccc.txt", BaseAttributes }, + { L"bbbb.txt", BaseAttributes }, + }; + + ULONG totalFetched = 0; + do + { + CComHeapPtr<ITEMID_CHILD> child; + ULONG celtFetched = 0; + hr = spEnum->Next(1, &child, &celtFetched); + if (hr != S_OK) + break; + ok_int(celtFetched, 1); + if (celtFetched != 1) + break; + + LPCWSTR ExpectedName = totalFetched < ARRAYSIZE(ExpectedFiles) ? ExpectedFiles[totalFetched].Name : L"<TOO MANY FILES>"; + SFGAOF ExpectedAttributes = totalFetched < ARRAYSIZE(ExpectedFiles) ? ExpectedFiles[totalFetched].Attributes : 0xdeaddead; + + totalFetched++; + + + CComPtr<IDataObject> spDataObj; + hr = pFolder->GetUIObjectOf(NULL, 1, &child, IID_IDataObject, NULL, reinterpret_cast<LPVOID*>(&spDataObj)); + ok_hr(hr, S_OK); + + if (!g_bOldZipfldr && !IsFormatAdvertised(spDataObj, cfHIDA, TYMED_HGLOBAL)) + { + trace("Pre-Vista zipfldr\n"); + // No seconds in filetimes, less functional IStream* implementation + g_bOldZipfldr = true; + } + + ok_displayname(pFolder, child, SHGDN_NORMAL, ExpectedName); + if (g_bOldZipfldr) + { + ok_displayname(pFolder, child, SHGDN_FORPARSING, ExpectedName); + } + else + { + WCHAR Buffer[MAX_PATH]; + StringCchPrintfW(Buffer, _countof(Buffer), L"%s\\%s", Filename, ExpectedName); + ok_displayname(pFolder, child, SHGDN_FORPARSING, Buffer); + } + ok_displayname(pFolder, child, SHGDN_FORPARSING | SHGDN_INFOLDER, ExpectedName); + ok_displayname(pFolder, child, SHGDN_FOREDITING , ExpectedName); + ok_displayname(pFolder, child, SHGDN_FOREDITING | SHGDN_INFOLDER, ExpectedName); + ok_displayname(pFolder, child, SHGDN_FORADDRESSBAR , ExpectedName); + ok_displayname(pFolder, child, SHGDN_FORADDRESSBAR | SHGDN_INFOLDER, ExpectedName); + + SFGAOF Attributes = 0; + hr = pFolder->GetAttributesOf(1, &child, &Attributes); + ok_hr(hr, S_OK); + ok_hex(Attributes, ExpectedAttributes); + + STGMEDIUM medium = {0}; + FORMATETC etc = { cfFileDescriptor, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + HRESULT hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + continue; + + ok_hex(medium.tymed, TYMED_HGLOBAL); + PVOID pData = GlobalLock(medium.hGlobal); + FILEGROUPDESCRIPTORW* Descriptor = static_cast<FILEGROUPDESCRIPTORW*>(pData); + ok_hex(Descriptor->cItems, 1); + if (Descriptor->cItems == 1) + ok_wstr(Descriptor->fgd[0].cFileName, ExpectedName); + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + } while (true); + + ok_int(totalFetched, ARRAYSIZE(ExpectedFiles)); + ok_hr(hr, S_FALSE); +} + +static void test_EnumObjects_Folders(const WCHAR* Filename, IShellFolder* pFolder) +{ + CComPtr<IEnumIDList> spEnum; + HRESULT hr = pFolder->EnumObjects(NULL, SHCONTF_FOLDERS, &spEnum); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + SFGAOF BaseAttributes = SFGAO_FOLDER | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | SFGAO_CANCOPY | SFGAO_CANMOVE; + ZipFiles ExpectedFolders[] = { + { L"aaaa", BaseAttributes | (g_bOldZipfldr ? 0 : SFGAO_STORAGE) }, + { L"cccc", BaseAttributes | (g_bOldZipfldr ? 0 : SFGAO_STORAGE) }, + }; + + LPCWSTR ExpectedExtraFiles[2][4] = + { + { + L"aaaa\\a_aaaa", + L"aaaa\\a_cccc", + L"aaaa\\a_bbbb.txt", + L"aaaa\\a_cccc.txt", + }, + { + L"cccc\\c_cccc", + L"cccc\\c_bbbb.txt", + L"cccc\\c_cccc.txt", + L"cccc\\c_aaaa", + }, + }; + + ULONG totalFetched = 0; + do + { + CComHeapPtr<ITEMID_CHILD> child; + ULONG celtFetched = 0; + hr = spEnum->Next(1, &child, &celtFetched); + if (hr != S_OK) + break; + ok_int(celtFetched, 1); + if (celtFetched != 1) + break; + + LPCWSTR ExpectedName = totalFetched < ARRAYSIZE(ExpectedFolders) ? ExpectedFolders[totalFetched].Name : L"<TOO MANY FILES>"; + SFGAOF ExpectedAttributes = totalFetched < ARRAYSIZE(ExpectedFolders) ? ExpectedFolders[totalFetched].Attributes : 0xdeaddead; + LPCWSTR* ExtraFiles = totalFetched < ARRAYSIZE(ExpectedExtraFiles) ? ExpectedExtraFiles[totalFetched] : ExpectedExtraFiles[0]; + + totalFetched++; + + ok_displayname(pFolder, child, SHGDN_NORMAL, ExpectedName); + if (g_bOldZipfldr) + { + ok_displayname(pFolder, child, SHGDN_FORPARSING, ExpectedName); + } + else + { + WCHAR Buffer[MAX_PATH]; + StringCchPrintfW(Buffer, _countof(Buffer), L"%s\\%s", Filename, ExpectedName); + ok_displayname(pFolder, child, SHGDN_FORPARSING, Buffer); + } + ok_displayname(pFolder, child, SHGDN_FORPARSING | SHGDN_INFOLDER, ExpectedName); + ok_displayname(pFolder, child, SHGDN_FOREDITING , ExpectedName); + ok_displayname(pFolder, child, SHGDN_FOREDITING | SHGDN_INFOLDER, ExpectedName); + + SFGAOF Attributes = 0; + hr = pFolder->GetAttributesOf(1, &child, &Attributes); + ok_hr(hr, S_OK); + ok_hex(Attributes, ExpectedAttributes); + + CComPtr<IDataObject> spData; + hr = pFolder->GetUIObjectOf(NULL, 1, &child, IID_IDataObject, NULL, reinterpret_cast<LPVOID*>(&spData)); + ok_hr(hr, S_OK); + + STGMEDIUM medium = {0}; + FORMATETC etc = { cfFileDescriptor, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + HRESULT hr = spData->GetData(&etc, &medium); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + continue; + + ok_hex(medium.tymed, TYMED_HGLOBAL); + PVOID pData = GlobalLock(medium.hGlobal); + FILEGROUPDESCRIPTORW* Descriptor = static_cast<FILEGROUPDESCRIPTORW*>(pData); + ok_hex(Descriptor->cItems, 5); + if (Descriptor->cItems == 5) + { + ok_wstr(Descriptor->fgd[0].cFileName, ExpectedName); + ok_wstr(Descriptor->fgd[1].cFileName, ExtraFiles[0]); + ok_wstr(Descriptor->fgd[2].cFileName, ExtraFiles[1]); + ok_wstr(Descriptor->fgd[3].cFileName, ExtraFiles[2]); + ok_wstr(Descriptor->fgd[4].cFileName, ExtraFiles[3]); + } + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + } while (true); + + ok_int(totalFetched, ARRAYSIZE(ExpectedFolders)); + ok_hr(hr, S_FALSE); +} + +static void test_EnumObjects(const WCHAR* Filename) +{ + CComPtr<IShellFolder> spFolder; + if (!InitializeShellFolder(Filename, spFolder)) + return; + + // Let's ask the shell how it wants to display the full path to our zip file + WCHAR ZipFilename[MAX_PATH] = L"<Failed to query zip path>"; + { + CComPtr<IPersistFolder2> spPersistFolder; + HRESULT hr = spFolder->QueryInterface(IID_PPV_ARG(IPersistFolder2, &spPersistFolder)); + ok_hr(hr, S_OK); + if (SUCCEEDED(hr)) + { + CComHeapPtr<ITEMIDLIST_ABSOLUTE> zipPidl; + hr = spPersistFolder->GetCurFolder(&zipPidl); + ok_hr(hr, S_OK); + if (SUCCEEDED(hr)) + { + BOOL bHasPath = SHGetPathFromIDListW(zipPidl, ZipFilename); + ok_int(bHasPath, TRUE); + } + } + } + + + test_EnumObjects_Files(ZipFilename, spFolder); + test_EnumObjects_Folders(ZipFilename, spFolder); +} + +START_TEST(EnumObjects) +{ + HRESULT hr = CoInitialize(NULL); + + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR ZipTestFile[MAX_PATH]; + if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_ENUM))) + return; + test_EnumObjects(ZipTestFile); + DeleteFileW(ZipTestFile); +} diff --git a/modules/rostests/apitests/zipfldr/IDataObject.cpp b/modules/rostests/apitests/zipfldr/IDataObject.cpp new file mode 100644 index 00000000000..ac2a7dfe4bc --- /dev/null +++ b/modules/rostests/apitests/zipfldr/IDataObject.cpp @@ -0,0 +1,568 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for zipfldr + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +#ifndef FILE_ATTRIBUTE_VIRTUAL +#define FILE_ATTRIBUTE_VIRTUAL 0x10000 +#endif + +DEFINE_GUID(CLSID_ZipFolderContextMenu, 0xb8cdcb65, 0xb1bf, 0x4b42, 0x94, 0x28, 0x1d, 0xfd, 0xb7, 0xee, 0x92, 0xaf); + + +static bool g_bOldZipfldr; +const char test_file_1_contents[] = "Some generic text in the root file.\r\nMore text on a new line."; +const char test_file_2_contents[] = "Some generic text in the file in folder_1.\r\nMore text on a new line."; + +static BOOL write_raw_file(const WCHAR* FileName, const void* Data, DWORD Size) +{ + BOOL Success; + DWORD dwWritten; + HANDLE Handle = CreateFileW(FileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (Handle == INVALID_HANDLE_VALUE) + { + skip("Failed to create temp file %ls, error %lu\n", FileName, GetLastError()); + return FALSE; + } + Success = WriteFile(Handle, Data, Size, &dwWritten, NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(dwWritten == Size, "WriteFile wrote %lu bytes instead of %lu\n", dwWritten, Size); + CloseHandle(Handle); + return Success && (dwWritten == Size); +} + +BOOL extract_resource(WCHAR* Filename, LPCWSTR ResourceName) +{ + WCHAR workdir[MAX_PATH]; + GetTempPathW(_countof(workdir), workdir); + StringCchPrintfW(Filename, MAX_PATH, L"%sTMP%u.zip", workdir, GetTickCount() & 0xffff); + + HMODULE hMod = GetModuleHandleW(NULL); + HRSRC hRsrc = FindResourceW(hMod, ResourceName, MAKEINTRESOURCEW(RT_RCDATA)); + ok(!!hRsrc, "Unable to find %s\n", wine_dbgstr_w(ResourceName)); + if (!hRsrc) + return FALSE; + + HGLOBAL hGlobal = LoadResource(hMod, hRsrc); + DWORD Size = SizeofResource(hMod, hRsrc); + LPVOID pData = LockResource(hGlobal); + + ok(Size && !!pData, "Unable to load %s\n", wine_dbgstr_w(ResourceName)); + if (!Size || !pData) + return FALSE; + + BOOL Written = write_raw_file(Filename, pData, Size); + UnlockResource(pData); + return Written; +} + +bool InitializeShellFolder_(const char* file, int line, const WCHAR* Filename, CComPtr<IShellFolder>& spFolder) +{ + CComHeapPtr<ITEMIDLIST_ABSOLUTE> pidl; + HRESULT hr; + ok_hr_(file, line, (hr = SHParseDisplayName(Filename, NULL, &pidl, 0, NULL)), S_OK); + if (!SUCCEEDED(hr)) + return false; + + CComPtr<IShellFolder> spParent; + PCUIDLIST_RELATIVE pidlLast; + ok_hr_(file, line, (hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &spParent), &pidlLast)), S_OK); + if (!SUCCEEDED(hr)) + return false; + + ok_hr_(file, line, (hr = spParent->BindToObject(pidlLast, 0, IID_PPV_ARG(IShellFolder, &spFolder))), S_OK); + + return SUCCEEDED(hr); +} + +#define GetFirstDataObject(spFolder, grfFlags, spData) GetFirstDataObject_(__FILE__, __LINE__, spFolder, grfFlags, spData) +static bool GetFirstDataObject_(const char* file, int line, IShellFolder* spFolder, SHCONTF grfFlags, CComPtr<IDataObject>& spData) +{ + CComPtr<IEnumIDList> spEnum; + HRESULT hr; + ok_hr_(file, line, (hr = spFolder->EnumObjects(NULL, grfFlags, &spEnum)), S_OK); + if (!SUCCEEDED(hr)) + return false; + + CComHeapPtr<ITEMID_CHILD> child; + ULONG celtFetched = 0; + ok_hr_(file, line, (hr = spEnum->Next(1, &child, &celtFetched)), S_OK); + ok_int_(file, line, celtFetched, 1); + if (!SUCCEEDED(hr)) + return false; + + // This call fails without the extension being '.zip' + ok_hr_(file, line, (hr = spFolder->GetUIObjectOf(NULL, 1, &child, IID_IDataObject, NULL, reinterpret_cast<LPVOID*>(&spData))), S_OK); + return SUCCEEDED(hr); +} + +bool IsFormatAdvertised_(const char* file, int line, IDataObject* pDataObj, CLIPFORMAT cfFormat, TYMED tymed) +{ + CComPtr<IEnumFORMATETC> pEnumFmt; + HRESULT hr = pDataObj->EnumFormatEtc(DATADIR_GET, &pEnumFmt); + + ok_hex_(file, line, hr, S_OK); + if (!SUCCEEDED(hr)) + return false; + + FORMATETC fmt; + while (S_OK == (hr = pEnumFmt->Next(1, &fmt, NULL))) + { + if (fmt.cfFormat == cfFormat) + { + ok_hex_(file, line, fmt.lindex, -1); + if (tymed) + ok_hex_(file, line, fmt.tymed, tymed); + return true; + } + } + ok_hex_(file, line, hr, S_FALSE); + return false; +} + +#if 0 +#define DumpDataObjectFormats(pDataObj) DumpDataObjectFormats_(__FILE__, __LINE__, pDataObj) +static inline void DumpDataObjectFormats_(const char* file, int line, IDataObject* pDataObj) +{ + CComPtr<IEnumFORMATETC> pEnumFmt; + HRESULT hr = pDataObj->EnumFormatEtc(DATADIR_GET, &pEnumFmt); + + if (FAILED_UNEXPECTEDLY(hr)) + return; + + FORMATETC fmt; + while (S_OK == pEnumFmt->Next(1, &fmt, NULL)) + { + char szBuf[512]; + GetClipboardFormatNameA(fmt.cfFormat, szBuf, sizeof(szBuf)); + trace_(file, line)("Format: %s\n", szBuf); + trace_(file, line)(" Tymed: %u\n", fmt.tymed); + if (fmt.tymed & TYMED_HGLOBAL) + { + trace_(file, line)(" TYMED_HGLOBAL supported\n"); + } + } +} +#endif + +static void test_FileDescriptor(FILEGROUPDESCRIPTORW* Descriptor) +{ + ok_int(Descriptor->cItems, 1u); + if (Descriptor->cItems > 0) + { + FILETIME LocalFileTime, FileTime; + WORD Mask = g_bOldZipfldr ? 0xffe0 : (0xffff); // bits 0-4 are the seconds + DosDateTimeToFileTime(0x5024, (0xa5f2 & Mask), &LocalFileTime); + LocalFileTimeToFileTime(&LocalFileTime, &FileTime); + + FILEDESCRIPTORW* FileDescriptor = Descriptor->fgd; + ok_hex(FileDescriptor->dwFlags, FD_ATTRIBUTES | FD_WRITESTIME | FD_FILESIZE | FD_PROGRESSUI); + ok_hex(FileDescriptor->dwFileAttributes, FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_VIRTUAL); + ok_hex(FileDescriptor->ftLastWriteTime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(FileDescriptor->ftLastWriteTime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(FileDescriptor->nFileSizeHigh, 0); + ok_hex(FileDescriptor->nFileSizeLow, strlen(test_file_1_contents)); + ok_wstr(FileDescriptor->cFileName, L"test_file_for_zip.txt"); + } +} + +static void test_FileDescriptor_Folder(FILEGROUPDESCRIPTORW* Descriptor) +{ + ok_int(Descriptor->cItems, 2u); + if (Descriptor->cItems > 0) + { + FILETIME LocalFileTime, FileTime; + WORD Mask = g_bOldZipfldr ? 0xffe0 : (0xffff); // bits 0-4 are the seconds + DosDateTimeToFileTime(0x5024, (0xa5fc & Mask), &LocalFileTime); + LocalFileTimeToFileTime(&LocalFileTime, &FileTime); + + FILEDESCRIPTORW* FileDescriptor = Descriptor->fgd; + ok_hex(FileDescriptor->dwFlags, FD_ATTRIBUTES | FD_WRITESTIME | FD_FILESIZE | FD_PROGRESSUI); + ok(FileDescriptor->dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY || + FileDescriptor->dwFileAttributes == (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_VIRTUAL), "Got attr: 0x%lx\n", FileDescriptor->dwFileAttributes); + //ok_hex(FileDescriptor->dwFileAttributes, FILE_ATTRIBUTE_DIRECTORY); + ok_hex(FileDescriptor->ftLastWriteTime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(FileDescriptor->ftLastWriteTime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(FileDescriptor->nFileSizeHigh, 0); + ok_hex(FileDescriptor->nFileSizeLow, 0); + ok_wstr(FileDescriptor->cFileName, L"folder_1"); + + if (Descriptor->cItems > 1) + { + DosDateTimeToFileTime(0x5024, (0xa60d & Mask), &LocalFileTime); + LocalFileTimeToFileTime(&LocalFileTime, &FileTime); + + FileDescriptor = Descriptor->fgd + 1; + ok_hex(FileDescriptor->dwFlags, FD_ATTRIBUTES | FD_WRITESTIME | FD_FILESIZE | FD_PROGRESSUI); + ok_hex(FileDescriptor->dwFileAttributes, FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_VIRTUAL); + ok_hex(FileDescriptor->ftLastWriteTime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(FileDescriptor->ftLastWriteTime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(FileDescriptor->nFileSizeHigh, 0); + ok_hex(FileDescriptor->nFileSizeLow, strlen(test_file_2_contents)); + ok_wstr(FileDescriptor->cFileName, L"folder_1\\test_file_for_zip.txt"); + } + } +} + +static GUID GUID_NULL_; +static void test_FileContents1(IStream* Stream) +{ + STATSTG statstg = {0}; + HRESULT hr = Stream->Stat(&statstg, STATFLAG_DEFAULT); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + if (SUCCEEDED(hr)) + { + FILETIME LocalFileTime, FileTime; + WORD Mask = g_bOldZipfldr ? 0xffe0 : (0xffff); // bits 0-4 are the seconds + DosDateTimeToFileTime(0x5024, (0xa5f2 & Mask), &LocalFileTime); + LocalFileTimeToFileTime(&LocalFileTime, &FileTime); + + ok_wstr(statstg.pwcsName, L"test_file_for_zip.txt"); + ok_hex(statstg.type, STGTY_STREAM); + ok_int(statstg.cbSize.LowPart, strlen(test_file_1_contents)); + ok_hex(statstg.cbSize.HighPart, 0); + ok_hex(statstg.mtime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(statstg.mtime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(statstg.ctime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(statstg.ctime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(statstg.atime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(statstg.atime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(statstg.grfMode, STGM_SHARE_DENY_WRITE); + ok_hex(statstg.grfLocksSupported, 0); + ok(!memcmp(&statstg.clsid, &GUID_NULL_, sizeof(GUID_NULL_)), "Expected GUID_NULL, got %s\n", wine_dbgstr_guid(&statstg.clsid)); + ok_hex(statstg.grfStateBits, 0); + CoTaskMemFree(statstg.pwcsName); + } + + LARGE_INTEGER Offset = { {0} }; + ULARGE_INTEGER NewPosition = { {0} }; + hr = Stream->Seek(Offset, STREAM_SEEK_CUR, &NewPosition); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + ok_int(NewPosition.HighPart, 0); + ok_int(NewPosition.LowPart, 0); + + char buf[100] = { 0 }; + ULONG cbRead; + hr = Stream->Read(buf, sizeof(buf)-1, &cbRead); + ok_hex(hr, S_FALSE); + ok_int(cbRead, strlen(test_file_1_contents)); + ok_str(buf, test_file_1_contents); + + hr = Stream->Seek(Offset, STREAM_SEEK_CUR, &NewPosition); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + ok_int(NewPosition.HighPart, 0); + if (SUCCEEDED(hr)) + ok_int(NewPosition.LowPart, strlen(test_file_1_contents)); + + ULONG cbWritten; + hr = Stream->Write("DUMMY", 5, &cbWritten); + if (!g_bOldZipfldr) + { + ok_hex(hr, STG_E_ACCESSDENIED); + } + else + { + // Write succeeds, but is not reflected in the file on disk + ok_hex(hr, S_OK); + } + + // Can increase the size... + NewPosition.LowPart = statstg.cbSize.LowPart + 1; + hr = Stream->SetSize(NewPosition); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + + // But is not reflected in the Stat result + hr = Stream->Stat(&statstg, STATFLAG_DEFAULT); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + if (SUCCEEDED(hr)) + { + ok_int(statstg.cbSize.LowPart, strlen(test_file_1_contents)); + CoTaskMemFree(statstg.pwcsName); + } + + // Old zipfldr does not support seek, so we can not read it again + if (!g_bOldZipfldr) + { + Offset.QuadPart = 0; + hr = Stream->Seek(Offset, STREAM_SEEK_SET, &NewPosition); + ok_hex(hr, S_OK); + + memset(buf, 0, sizeof(buf)); + hr = Stream->Read(buf, sizeof(buf)-1, &cbRead); + ok_hex(hr, S_FALSE); + ok_int(cbRead, strlen(test_file_1_contents)); + } +} + + +static void test_FileContents2(IStream* Stream) +{ + STATSTG statstg = {0}; + HRESULT hr = Stream->Stat(&statstg, STATFLAG_DEFAULT); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + if (SUCCEEDED(hr)) + { + FILETIME LocalFileTime, FileTime; + WORD Mask = g_bOldZipfldr ? 0xffe0 : (0xffff); // bits 0-4 are the seconds + DosDateTimeToFileTime(0x5024, (0xa60d & Mask), &LocalFileTime); + LocalFileTimeToFileTime(&LocalFileTime, &FileTime); + + ok_wstr(statstg.pwcsName, L"test_file_for_zip.txt"); + ok_hex(statstg.type, STGTY_STREAM); + ok_int(statstg.cbSize.LowPart, strlen(test_file_2_contents)); + ok_hex(statstg.cbSize.HighPart, 0); + ok_hex(statstg.mtime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(statstg.mtime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(statstg.ctime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(statstg.ctime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(statstg.atime.dwHighDateTime, FileTime.dwHighDateTime); + ok_hex(statstg.atime.dwLowDateTime, FileTime.dwLowDateTime); + ok_hex(statstg.grfMode, STGM_SHARE_DENY_WRITE); + ok_hex(statstg.grfLocksSupported, 0); + ok(!memcmp(&statstg.clsid, &GUID_NULL_, sizeof(GUID_NULL_)), "Expected GUID_NULL, got %s\n", wine_dbgstr_guid(&statstg.clsid)); + ok_hex(statstg.grfStateBits, 0); + CoTaskMemFree(statstg.pwcsName); + } + + LARGE_INTEGER Offset = { {0} }; + ULARGE_INTEGER NewPosition = { {0} }; + hr = Stream->Seek(Offset, STREAM_SEEK_CUR, &NewPosition); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + ok_int(NewPosition.HighPart, 0); + ok_int(NewPosition.LowPart, 0); + + char buf[100] = { 0 }; + ULONG cbRead; + hr = Stream->Read(buf, sizeof(buf)-1, &cbRead); + ok_hex(hr, S_FALSE); + ok_int(cbRead, strlen(test_file_2_contents)); + ok_str(buf, test_file_2_contents); + + hr = Stream->Seek(Offset, STREAM_SEEK_CUR, &NewPosition); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + ok_int(NewPosition.HighPart, 0); + if (SUCCEEDED(hr)) + ok_int(NewPosition.LowPart, strlen(test_file_2_contents)); + + ULONG cbWritten; + hr = Stream->Write("DUMMY", 5, &cbWritten); + if (!g_bOldZipfldr) + { + ok_hex(hr, STG_E_ACCESSDENIED); + } + else + { + // Write succeeds, but is not reflected in the file on disk + ok_hex(hr, S_OK); + } + + // Can increase the size... + NewPosition.LowPart = statstg.cbSize.LowPart + 1; + hr = Stream->SetSize(NewPosition); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + + // But is not reflected in the Stat result + hr = Stream->Stat(&statstg, STATFLAG_DEFAULT); + ok_hex(hr, g_bOldZipfldr ? E_NOTIMPL : S_OK); + if (SUCCEEDED(hr)) + { + ok_int(statstg.cbSize.LowPart, strlen(test_file_2_contents)); + CoTaskMemFree(statstg.pwcsName); + } + + // Old zipfldr does not support seek, so we can not read it again + if (!g_bOldZipfldr) + { + Offset.QuadPart = 0; + hr = Stream->Seek(Offset, STREAM_SEEK_SET, &NewPosition); + ok_hex(hr, S_OK); + + memset(buf, 0, sizeof(buf)); + hr = Stream->Read(buf, sizeof(buf)-1, &cbRead); + ok_hex(hr, S_FALSE); + ok_int(cbRead, strlen(test_file_2_contents)); + ok_str(buf, test_file_2_contents); + } +} + + + +static CLIPFORMAT cfHIDA = RegisterClipboardFormatA(CFSTR_SHELLIDLISTA); +static CLIPFORMAT cfFileDescriptor = RegisterClipboardFormatW(CFSTR_FILEDESCRIPTORW); +static CLIPFORMAT cfFileContents = RegisterClipboardFormatW(CFSTR_FILECONTENTSW); + +static void test_DataObject_FirstFile(IShellFolder* pFolder) +{ + CComPtr<IDataObject> spDataObj; + if (!GetFirstDataObject(pFolder, SHCONTF_NONFOLDERS, spDataObj)) + return; + + if (!IsFormatAdvertised(spDataObj, cfHIDA, TYMED_HGLOBAL)) + { + trace("Pre-Vista zipfldr\n"); + // No seconds in filetimes, less functional IStream* implementation + g_bOldZipfldr = true; + } + + ok(!IsFormatAdvertised(spDataObj, CF_HDROP, TYMED_NULL), "Expected CF_HDROP to be absent\n"); + ok(IsFormatAdvertised(spDataObj, cfFileDescriptor, TYMED_HGLOBAL), "Expected FileDescriptorW to be supported\n"); + ok(IsFormatAdvertised(spDataObj, cfFileContents, TYMED_ISTREAM), "Expected FileContents to be supported\n"); + + STGMEDIUM medium = {0}; + FORMATETC etc = { cfFileDescriptor, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + HRESULT hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hex(medium.tymed, TYMED_HGLOBAL); + PVOID pData = GlobalLock(medium.hGlobal); + test_FileDescriptor(static_cast<FILEGROUPDESCRIPTORW*>(pData)); + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + + // Invalid index + etc.cfFormat = cfFileContents; + etc.ptd = NULL; + etc.dwAspect = DVASPECT_CONTENT; + etc.lindex = -1; + etc.tymed = TYMED_ISTREAM; + memset(&medium, 0xcc, sizeof(medium)); + hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, E_INVALIDARG); + ok_hex(medium.tymed, TYMED_NULL); + ok_ptr(medium.hGlobal, NULL); + ok_ptr(medium.pUnkForRelease, NULL); + if (SUCCEEDED(hr)) + ReleaseStgMedium(&medium); + + // Correct index + etc.cfFormat = cfFileContents; + etc.ptd = NULL; + etc.dwAspect = DVASPECT_CONTENT; + etc.lindex = 0; + etc.tymed = TYMED_ISTREAM; + memset(&medium, 0xcc, sizeof(medium)); + // During this call a temp file is created: %TMP%\Temp%u_%s\test_file_for_zip.txt + // Or for the 2k3 version: %TMP%\Temporary Directory %u for %s\test_file_for_zip.txt + hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, S_OK); + ok_hex(medium.tymed, TYMED_ISTREAM); + if (SUCCEEDED(hr)) + { + test_FileContents1(medium.pstm); + ReleaseStgMedium(&medium); + } + + //if (winetest_get_failures()) + // DumpDataObjectFormats(spDataObj); +} + +static void test_DataObject_FirstFolder(IShellFolder* pFolder) +{ + CComPtr<IDataObject> spDataObj; + if (!GetFirstDataObject(pFolder, SHCONTF_FOLDERS, spDataObj)) + return; + + ok(!IsFormatAdvertised(spDataObj, CF_HDROP, TYMED_NULL), "Expected CF_HDROP to be absent\n"); + ok(IsFormatAdvertised(spDataObj, cfFileDescriptor, TYMED_HGLOBAL), "Expected FileDescriptorW to be supported\n"); + ok(IsFormatAdvertised(spDataObj, cfFileContents, TYMED_ISTREAM), "Expected FileContents to be supported\n"); + // 7+ + ok(!!IsFormatAdvertised(spDataObj, cfHIDA, TYMED_HGLOBAL) != g_bOldZipfldr, "Expected HIDA to be %s\n", g_bOldZipfldr ? "absent" : "supported"); + + STGMEDIUM medium = {0}; + FORMATETC etc = { cfFileDescriptor, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + HRESULT hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + ok_hex(medium.tymed, TYMED_HGLOBAL); + PVOID pData = GlobalLock(medium.hGlobal); + test_FileDescriptor_Folder(static_cast<FILEGROUPDESCRIPTORW*>(pData)); + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + + // Invalid index + etc.cfFormat = cfFileContents; + etc.ptd = NULL; + etc.dwAspect = DVASPECT_CONTENT; + etc.lindex = -1; + etc.tymed = TYMED_ISTREAM; + memset(&medium, 0xcc, sizeof(medium)); + hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, E_INVALIDARG); + ok_hex(medium.tymed, TYMED_NULL); + ok_ptr(medium.hGlobal, NULL); + ok_ptr(medium.pUnkForRelease, NULL); + if (SUCCEEDED(hr)) + ReleaseStgMedium(&medium); + + // Not a file (first index is the folder) + etc.cfFormat = cfFileContents; + etc.ptd = NULL; + etc.dwAspect = DVASPECT_CONTENT; + etc.lindex = 0; + etc.tymed = TYMED_ISTREAM; + memset(&medium, 0xcc, sizeof(medium)); + hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, E_FAIL); + ok_hex(medium.tymed, TYMED_NULL); + ok_ptr(medium.hGlobal, NULL); + ok_ptr(medium.pUnkForRelease, NULL); + if (SUCCEEDED(hr)) + ReleaseStgMedium(&medium); + + // The file (content of the folder) + etc.cfFormat = cfFileContents; + etc.ptd = NULL; + etc.dwAspect = DVASPECT_CONTENT; + etc.lindex = 1; + etc.tymed = TYMED_ISTREAM; + memset(&medium, 0xcc, sizeof(medium)); + // During this call a temp file is created: %TMP%\Temp%u_%s\folder1\test_file_for_zip.txt + // Or for the 2k3 version: %TMP%\Temporary Directory %u for %s\folder1\test_file_for_zip.txt + hr = spDataObj->GetData(&etc, &medium); + ok_hex(hr, S_OK); + ok_hex(medium.tymed, TYMED_ISTREAM); + if (SUCCEEDED(hr)) + { + test_FileContents2(medium.pstm); + ReleaseStgMedium(&medium); + } + + //if (winetest_get_failures()) + // DumpDataObjectFormats(spDataObj); +} + + +static void test_DataObject(const WCHAR* Filename) +{ + CComPtr<IShellFolder> spFolder; + if (!InitializeShellFolder(Filename, spFolder)) + return; + + test_DataObject_FirstFile(spFolder); + test_DataObject_FirstFolder(spFolder); +} + + +START_TEST(IDataObject) +{ + HRESULT hr = CoInitialize(NULL); + + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + WCHAR ZipTestFile[MAX_PATH]; + if (!extract_resource(ZipTestFile, MAKEINTRESOURCEW(IDR_ZIP_TEST_FILE))) + return; + test_DataObject(ZipTestFile); + DeleteFileW(ZipTestFile); +} diff --git a/modules/rostests/apitests/zipfldr/precomp.h b/modules/rostests/apitests/zipfldr/precomp.h new file mode 100644 index 00000000000..6af5f674709 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/precomp.h @@ -0,0 +1,32 @@ +#ifndef _ZIPFLDR_APITEST_PRECOMP_H_ +#define _ZIPFLDR_APITEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + + +#include <windef.h> +#include <winbase.h> +#include <shlobj.h> +#include <atlbase.h> +#include <atlcom.h> // gcc needs to resolve unused template content +#include <shellapi.h> +#include <shlwapi.h> +#include <strsafe.h> + +#include <shellutils.h> + +#include <apitest.h> + +#include "resource.h" + +BOOL extract_resource(WCHAR* Filename, LPCWSTR ResourceName); +#define InitializeShellFolder(Filename, pFolder) InitializeShellFolder_(__FILE__, __LINE__, Filename, pFolder) +bool InitializeShellFolder_(const char* file, int line, const WCHAR* Filename, CComPtr<IShellFolder>& spFolder); + +#define IsFormatAdvertised(pDataObj, cfFormat, tymed) IsFormatAdvertised_(__FILE__, __LINE__, pDataObj, cfFormat, tymed) +bool IsFormatAdvertised_(const char* file, int line, IDataObject* pDataObj, CLIPFORMAT cfFormat, TYMED tymed); + + +#endif /* _ZIPFLDR_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/apitests/zipfldr/resource.h b/modules/rostests/apitests/zipfldr/resource.h new file mode 100644 index 00000000000..78f26aa9ae2 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/resource.h @@ -0,0 +1,3 @@ + +#define IDR_ZIP_TEST_FILE 1 +#define IDR_ZIP_TEST_ENUM 2 diff --git a/modules/rostests/apitests/zipfldr/testlist.c b/modules/rostests/apitests/zipfldr/testlist.c new file mode 100644 index 00000000000..ecd1bb9d700 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/testlist.c @@ -0,0 +1,12 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_EnumObjects(void); +extern void func_IDataObject(void); + +const struct test winetest_testlist[] = +{ + { "EnumObjects", func_EnumObjects }, + { "IDataObject", func_IDataObject }, + { 0, 0 } +}; diff --git a/modules/rostests/apitests/zipfldr/zipfldr_apitest.rc b/modules/rostests/apitests/zipfldr/zipfldr_apitest.rc new file mode 100644 index 00000000000..6fd9ef852c0 --- /dev/null +++ b/modules/rostests/apitests/zipfldr/zipfldr_apitest.rc @@ -0,0 +1,8 @@ +#include <windef.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 RCDATA "zipfldr_test_file.zip" +2 RCDATA "zipfldr_test_enum.zip" + diff --git a/modules/rostests/apitests/zipfldr/zipfldr_test_enum.zip b/modules/rostests/apitests/zipfldr/zipfldr_test_enum.zip new file mode 100644 index 00000000000..3e674ebf592 Binary files /dev/null and b/modules/rostests/apitests/zipfldr/zipfldr_test_enum.zip differ diff --git a/modules/rostests/apitests/zipfldr/zipfldr_test_file.zip b/modules/rostests/apitests/zipfldr/zipfldr_test_file.zip new file mode 100644 index 00000000000..cc9766718de Binary files /dev/null and b/modules/rostests/apitests/zipfldr/zipfldr_test_file.zip differ

1 0

[reactos] 01/01: [SHELLEXT] Fixed some typos in Portuguese translation
by Jose Carlos Jesus 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=534710a6d59ee6aeb3d37… commit 534710a6d59ee6aeb3d37168b3defb43c4847bd5 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Apr 29 19:55:30 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 30 20:29:21 2020 +0200 [SHELLEXT] Fixed some typos in Portuguese translation --- dll/shellext/netshell/lang/pt-PT.rc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc index c288d3f621c..d6194732e60 100644 --- a/dll/shellext/netshell/lang/pt-PT.rc +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -6,17 +6,17 @@ CAPTION "Geral" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 - LTEXT "Ligar usando:", -1, 9, 9, 217, 8 + LTEXT "Ligar com:", -1, 9, 9, 217, 8 EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY PUSHBUTTON "Con&figurar", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Esta ligação utiliza os seguintes items:", -1, 9, 59, 217, 8 PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 + PUSHBUTTON "&Propriedades", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Descrição ", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "A descrição dos componentes...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - AUTOCHECKBOX "Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP - AUTOCHECKBOX "Notificar-me quando a conectividade esta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP + AUTOCHECKBOX "&Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 206, 230, 12, WS_TABSTOP + AUTOCHECKBOX "&Notificar-me quando a conectividade desta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 20, BS_MULTILINE | BS_TOP | WS_TABSTOP END IDD_STATUS DIALOGEX 0, 0, 200, 280 @@ -59,7 +59,7 @@ BEGIN LTEXT "Endereço IP:", -1, 22, 34, 80, 8 LTEXT "Máscara de sub-rede:", -1, 22, 48, 80, 8 LTEXT "Gateway predefinido:", -1, 22, 62, 80, 8 - RTEXT "Não disponivel", IDC_DETAILSTYPE, 110, 20, 80, 8 + RTEXT "Não disponível", IDC_DETAILSTYPE, 110, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 110, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 110, 48, 80, 8 RTEXT "", IDC_DETAILSGATEWAY, 110, 62, 80, 8 @@ -83,9 +83,9 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 LTEXT "Seleccione configuração típica ou personalizada:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Configuração típica", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Configuração personalizada", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Cria ligações de rede utilizando Cliente para Redes de ReactOS, Arquivos e Impresoras partilhadas para Redes de ReactOS, e o protocolo TCP/IP com endereçamento automático.", IDC_STATIC, 65, 45, 240, 30 + AUTORADIOBUTTON "Configuração &típica", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Configuração &personalizada", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "Cria ligações de rede utilizando Cliente para Redes ReactOS, Arquivos e Impresoras partilhadas para Redes ReactOS, e o protocolo TCP/IP com endereçamento automático.", IDC_STATIC, 65, 45, 240, 30 LTEXT "Permite configurar manualmente componentes de rede.", IDC_STATIC, 65, 90, 243, 20 END @@ -106,13 +106,13 @@ END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Instalador de ReactOS" +CAPTION "Instalador do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Deseja que este computador faça parte de um domínio?\n\ -(Pode obter máis informações do seu administrador de rede.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "Este computador faz parte de um grupo de trabalho.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Este computador é parte de um domínio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP +(Pode obter mais informações do seu administrador de rede.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Este computador faz parte de um grupo de &trabalho.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Este computador é parte de um &domínio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Nome do domínio ou grupo de trabalho:", IDC_STATIC, 33, 72, 152, 20 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "NOTE: Se este computador não fizer parte de uma rede, não terá privilégios suficientes para se juntar a um domínio, ou se simplesmente não sabe que escolher, então seleccione ""Grupo de trabalho"" por agora. Ésta opção pode ser alterada mais tarde.", IDC_STATIC, 33, 107, 263, 50 @@ -136,12 +136,12 @@ BEGIN IDS_SHV_COLUMN_TYPE "Tipo" IDS_SHV_COLUMN_STATE "Estado" IDS_SHV_COLUMN_DEVNAME "Nome do dispositivo" - IDS_SHV_COLUMN_PHONE "Número de telefone ou endereço do host" - IDS_SHV_COLUMN_OWNER "Proprietário" + IDS_SHV_COLUMN_PHONE "Número de telefone ou endereço do hospedeiro" + IDS_SHV_COLUMN_OWNER "Administrador" IDS_TYPE_ETHERNET "LAN ou Internet de alta velocidade" IDS_STATUS_NON_OPERATIONAL "Desabilitado" IDS_STATUS_UNREACHABLE "Desligado" - IDS_STATUS_DISCONNECTED "Cabo de redo desligado" + IDS_STATUS_DISCONNECTED "Cabo de rede desligado" IDS_STATUS_CONNECTING "A obter endereço de rede" IDS_STATUS_CONNECTED "Ligado" IDS_STATUS_OPERATIONAL "Ligado" @@ -171,6 +171,6 @@ BEGIN IDS_NETWORKCOMPONENTSUBTITLE "Determina quais os componentes de rede a utilizar no seu equipamento. Para adicionar novos componentes, clice em Instalar." IDS_NETWORKDOMAINTITLE "Grupo de trabalho ou domínio" IDS_NETWORKDOMAINSUBTITLE "Um domínio é um grupo de computadores gerido por um administrador de rede. Um grupo de trabalho é um grupo de computadores que partilham o mesmo nome." - IDS_REACTOS_SETUP "Instalador de ReactOS" + IDS_REACTOS_SETUP "Instalador do ReactOS" IDS_WZD_DOMAIN_NAME "A instalação não pode continuar\naté que digite o nome do\n domínio ou grupo de trabalho." END

1 0

[reactos] 01/01: [UTILMAN] Fix build
by Stanislav Motylkov 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3846bd87d9277dda99ae2… commit 3846bd87d9277dda99ae2f4414da30c4ba1c6adf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 30 21:18:14 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 30 21:18:14 2020 +0300 [UTILMAN] Fix build Addendum to ac87614. --- base/applications/utilman/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/utilman/lang/ru-RU.rc b/base/applications/utilman/lang/ru-RU.rc index 8c5fe35c3cf..585850dc4bc 100644 --- a/base/applications/utilman/lang/ru-RU.rc +++ b/base/applications/utilman/lang/ru-RU.rc @@ -5,7 +5,7 @@ * COPYRIGHT: Copyright 2020 Stanislav Motylkov (binarymaster(a)mail.ru) */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020