Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[akhaldi] 73340: [MSI_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 22 12:26:43 2016 New Revision: 73340 URL: http://svn.reactos.org/svn/reactos?rev=73340&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… ============================================================================== --- trunk/rostests/winetests/msi/action.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/action.c [iso-8859-1] Tue Nov 22 12:26:43 2016 @@ -227,7 +227,7 @@ "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" - "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; + "TestService2\t[SERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription\n"; static const char service_install2_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t" @@ -5427,28 +5427,23 @@ DeleteFileA(msifile); } -static void delete_TestService(void) +static void delete_test_service(const char *name) { BOOL ret; SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(manager != NULL, "can't open service manager\n"); - if (!manager) - return; - - service = OpenServiceA(manager, "TestService", GENERIC_ALL); - ok(service != NULL, "TestService doesn't exist\n"); - + if (!manager) return; + + service = OpenServiceA(manager, name, GENERIC_ALL); if (service) { ret = DeleteService( service ); ok( ret, "failed to delete service %u\n", GetLastError() ); - CloseServiceHandle(service); } CloseServiceHandle(manager); - } static void test_delete_services(void) @@ -5473,7 +5468,7 @@ ok(service != NULL, "can't create service %u\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); - if (!service) goto error; + if (!service) return; create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table)); @@ -5516,7 +5511,9 @@ ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_TestService(); + delete_test_service("TestService"); + delete_test_service("TestService2"); + delete_test_service("TestService3"); delete_test_files(); DeleteFileA(msifile); } @@ -5558,7 +5555,6 @@ service = OpenServiceA(manager, "TestService4", GENERIC_ALL); ok(service == NULL, "TestService4 installed\n"); - CloseServiceHandle(manager); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -5575,6 +5571,11 @@ r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + service = OpenServiceA(manager, "TestService", GENERIC_ALL); + ok(service != NULL, "TestService deleted\n"); + CloseServiceHandle(service); + CloseServiceHandle(manager); ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); @@ -5591,7 +5592,7 @@ ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_TestService(); + delete_test_service("TestService"); delete_test_files(); DeleteFileA(msifile); } Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=73… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Tue Nov 22 12:26:43 2016 @@ -470,6 +470,7 @@ /* test a valid feature descriptor */ desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit>3w2x^IGfe?CxI5heAvk."; len = 0; + prod[0] = feature[0] = comp[0] = 0; r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_SUCCESS, "returned an error\n"); ok(len == strlen(desc), "length was wrong\n"); @@ -484,6 +485,28 @@ len = 0; r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_INVALID_PARAMETER, "returned wrong error\n"); + + /* test a feature descriptor with < instead of > */ + desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit<3w2x^IGfe?CxI5heAvk."; + len = 0; + prod[0] = feature[0] = 0; + comp[0] = 0x55; + r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); + ok(r == ERROR_SUCCESS, "returned an error\n"); + ok(len == 41, "got %u\n", len); + ok(!strcmp(prod,"{90110409-6000-11D3-8CFE-0150048383C9}"), "got '%s'\n", prod); + ok(!strcmp(feature,"FollowTheWhiteRabbit"), "got '%s'\n", feature); + ok(!comp[0], "got '%s'\n", comp); + + len = 0; + prod[0] = feature[0] = 0; + comp[0] = 0x55; + r = pMsiDecomposeDescriptorA("yh1BVN)8A$!!!!!MKKSkAlwaysInstalledIntl_1033<", prod, feature, comp, &len); + ok(r == ERROR_SUCCESS, "got %u\n", r); + ok(len == 45, "got %u\n", len); + ok(!strcmp(prod, "{90150000-006E-0409-0000-0000000FF1CE}"), "got '%s'\n", prod); + ok(!strcmp(feature, "AlwaysInstalledIntl_1033"), "got '%s'\n", feature); + ok(!comp[0], "got '%s'\n", comp); /* * Test a valid feature descriptor with the Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Tue Nov 22 12:26:43 2016 @@ -5886,6 +5886,57 @@ DeleteFileA(msifile2); } +static void test_remove_upgrade_code(void) +{ + UINT r; + LONG res; + HKEY hkey; + REGSAM access = KEY_ALL_ACCESS; + DWORD type, size; + char buf[1]; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + if (is_wow64) access |= KEY_WOW64_64KEY; + + create_test_files(); + create_database( msifile, icon_base_tables, sizeof(icon_base_tables)/sizeof(icon_base_tables[0]) ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, "FULL=1" ); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", + 0, access, &hkey ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + type = 0xdeadbeef; + buf[0] = 0x55; + size = sizeof(buf); + res = RegQueryValueExA( hkey, "94A88FD7F6998CE40A22FB59F6B9C2BB", NULL, &type, (BYTE *)buf, &size ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + ok( type == REG_SZ, "got %u\n", type ); + ok( size == 1, "got %u\n", size ); + ok( !buf[0], "wrong data\n" ); + RegCloseKey( hkey ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", + 0, access, &hkey ); + ok( res == ERROR_FILE_NOT_FOUND, "got %d\n", res ); + + RemoveDirectoryA( "msitest" ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -5972,6 +6023,7 @@ test_mixed_package(); test_volume_props(); test_shared_component(); + test_remove_upgrade_code(); DeleteFileA(log_file); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=7… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Tue Nov 22 12:26:43 2016 @@ -555,6 +555,18 @@ "ProductName\tMSITEST\n" "ProductVersion\t1.1.1\n" "UpgradeCode\t{9574448F-9B86-4E07-B6F6-8D199DA12127}\n" + "MSIFASTINSTALL\t1\n"; + +static const char ci2_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "INSTALLLEVEL\t3\n" + "Manufacturer\tWine\n" + "ProductCode\t{FF4AFE9C-6AC2-44F9-A060-9EA6BD16C75E}\n" + "ProductName\tMSITEST2\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{6B60C3CA-B8CA-4FB7-A395-092D98FF5D2A}\n" "MSIFASTINSTALL\t1\n"; static const char mcp_component_dat[] = @@ -828,22 +840,26 @@ "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "RunInstall\tnot Installed\t1550\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "RunInstall\t\t1600\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n"; static const char ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; + "RunInstall\t23\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; static const char ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -1009,7 +1025,7 @@ ADD_TABLE(ci2_file), ADD_TABLE(install_exec_seq), ADD_TABLE(lus0_media), - ADD_TABLE(property), + ADD_TABLE(ci2_property), }; static const msi_table cl_tables[] = @@ -3503,6 +3519,146 @@ DeleteFileA("msitest\\sourcedir.txt"); delete_test_files(); DeleteFileA(msifile); +} + +static void test_MsiProvideQualifiedComponentEx(void) +{ + UINT r; + INSTALLSTATE state; + char comp[39], comp_squashed[33], comp2[39], comp2_base85[21], comp2_squashed[33]; + char prod[39], prod_base85[21], prod_squashed[33]; + char desc[MAX_PATH], buf[MAX_PATH], keypath[MAX_PATH], path[MAX_PATH]; + DWORD len = sizeof(buf); + REGSAM access = KEY_ALL_ACCESS; + HKEY hkey, hkey2, hkey3, hkey4, hkey5; + LONG res; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + + create_test_guid( comp, comp_squashed ); + compose_base85_guid( comp2, comp2_base85, comp2_squashed ); + compose_base85_guid( prod, prod_base85, prod_squashed ); + + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len ); + ok( r == ERROR_UNKNOWN_COMPONENT, "got %u\n", r ); + + lstrcpyA( keypath, "Software\\Classes\\Installer\\Components\\" ); + lstrcatA( keypath, comp_squashed ); + + if (is_wow64) access |= KEY_WOW64_64KEY; + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + lstrcpyA( desc, prod_base85 ); + memcpy( desc + lstrlenA(desc), "feature<\0", sizeof("feature<\0") ); + res = RegSetValueExA( hkey, "qualifier", 0, REG_MULTI_SZ, (const BYTE *)desc, + lstrlenA(prod_base85) + sizeof("feature<\0") ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len ); + ok( r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r ); + + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, NULL, 0, 0, buf, &len ); + ok( r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r ); + + state = MsiQueryProductStateA( prod ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + + lstrcpyA( keypath, "Software\\Classes\\Installer\\Products\\" ); + lstrcatA( keypath, prod_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey2, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + state = MsiQueryProductStateA( prod ); + ok( state == INSTALLSTATE_ADVERTISED, "got %d\n", state ); + + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len ); + todo_wine ok( r == ERROR_UNKNOWN_FEATURE, "got %u\n", r ); + + lstrcpyA( keypath, "Software\\Classes\\Installer\\Features\\" ); + lstrcatA( keypath, prod_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey3, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + state = MsiQueryFeatureStateA( prod, "feature" ); + ok( state == INSTALLSTATE_UNKNOWN, "got %d\n", state ); + + res = RegSetValueExA( hkey3, "feature", 0, REG_SZ, (const BYTE *)"", 1 ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + state = MsiQueryFeatureStateA( prod, "feature" ); + ok( state == INSTALLSTATE_ADVERTISED, "got %d\n", state ); + + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len ); + ok( r == ERROR_FILE_NOT_FOUND, "got %u\n", r ); + + len = sizeof(buf); + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, NULL, 0, 0, buf, &len ); + ok( r == ERROR_FILE_NOT_FOUND, "got %u\n", r ); + + lstrcpyA( keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Products\\" ); + lstrcatA( keypath, prod_squashed ); + lstrcatA( keypath, "\\Features" ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey4, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + res = RegSetValueExA( hkey4, "feature", 0, REG_SZ, (const BYTE *)comp2_base85, sizeof(comp2_base85) ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + state = MsiQueryFeatureStateA( prod, "feature" ); + ok( state == INSTALLSTATE_ADVERTISED, "got %d\n", state ); + + lstrcpyA( keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\" ); + lstrcatA( keypath, comp2_squashed ); + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &hkey5, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)"c:\\nosuchfile", sizeof("c:\\nosuchfile") ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + state = MsiQueryFeatureStateA( prod, "feature" ); + ok( state == INSTALLSTATE_LOCAL, "got %d\n", state ); + + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len ); + ok( r == ERROR_FILE_NOT_FOUND, "got %u\n", r ); + + GetCurrentDirectoryA( MAX_PATH, path ); + lstrcatA( path, "\\msitest" ); + CreateDirectoryA( path, NULL ); + lstrcatA( path, "\\test.txt" ); + create_file( path, "test", 100 ); + + res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1 ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + buf[0] = 0; + len = sizeof(buf); + r = MsiProvideQualifiedComponentExA( comp, "qualifier", INSTALLMODE_EXISTING, prod, 0, 0, buf, &len ); + ok( r == ERROR_SUCCESS, "got %u\n", r ); + ok( len == lstrlenA(path), "got %u\n", len ); + ok( !lstrcmpA( path, buf ), "got '%s'\n", buf ); + + DeleteFileA( "msitest\\text.txt" ); + RemoveDirectoryA( "msitest" ); + + delete_key( hkey5, "", access & KEY_WOW64_64KEY ); + RegCloseKey( hkey5 ); + delete_key( hkey4, "", access & KEY_WOW64_64KEY ); + RegCloseKey( hkey4 ); + delete_key( hkey3, "", access & KEY_WOW64_64KEY ); + RegCloseKey( hkey3 ); + delete_key( hkey2, "", access & KEY_WOW64_64KEY ); + RegCloseKey( hkey2 ); + delete_key( hkey, "", access & KEY_WOW64_64KEY ); + RegCloseKey( hkey ); } static void test_MsiGetProductCode(void) @@ -14181,22 +14337,23 @@ if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); - DeleteFileA(path); goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (!delete_pf("msitest\\augustus", TRUE)) - trace("concurrent installs not supported\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); r = MsiConfigureProductA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - + ok(r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiConfigureProductA("{FF4AFE9C-6AC2-44F9-A060-9EA6BD16C75E}", INSTALLLEVEL_DEFAULT, + INSTALLSTATE_ABSENT); + ok(r == ERROR_SUCCESS, "got %u\n", r); + +error: DeleteFileA(path); - -error: DeleteFileA(msifile); DeleteFileA("msitest\\msitest\\augustus"); DeleteFileA("msitest\\maximus"); @@ -14437,6 +14594,7 @@ if (pMsiGetComponentPathExA) test_concurrentinstall(); test_command_line_parsing(); + test_MsiProvideQualifiedComponentEx(); SetCurrentDirectoryA(prev_path); }

8 years, 1 month

[akhaldi] 73339: [MSI] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 22 12:25:27 2016 New Revision: 73339 URL: http://svn.reactos.org/svn/reactos?rev=73339&view=rev Log: [MSI] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/source.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/upgrade.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -129,6 +129,8 @@ {'U','n','p','u','b','l','i','s','h', 'C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szUnpublishFeatures[] = {'U','n','p','u','b','l','i','s','h','F','e','a','t','u','r','e','s',0}; +static const WCHAR szUnpublishProduct[] = + {'U','n','p','u','b','l','i','s','h','P','r','o','d','u','c','t',0}; static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; static const WCHAR szUnregisterTypeLibraries[] = @@ -3490,14 +3492,14 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) { - WCHAR squished_pc[GUID_SIZE], squished_cc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE], squashed_cc[SQUASHED_GUID_SIZE]; UINT rc; MSICOMPONENT *comp; HKEY hkey; TRACE("\n"); - squash_guid(package->ProductCode,squished_pc); + squash_guid( package->ProductCode, squashed_pc ); msi_set_sourcedir_props(package, FALSE); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) @@ -3509,7 +3511,7 @@ if (!comp->ComponentId) continue; - squash_guid( comp->ComponentId, squished_cc ); + squash_guid( comp->ComponentId, squashed_cc ); msi_free( comp->FullKeypath ); comp->FullKeypath = build_full_keypath( package, comp ); @@ -3519,7 +3521,7 @@ else action = comp->ActionRequest; TRACE("Component %s (%s) Keypath=%s RefCount=%u Clients=%u Action=%u\n", - debugstr_w(comp->Component), debugstr_w(squished_cc), + debugstr_w(comp->Component), debugstr_w(squashed_cc), debugstr_w(comp->FullKeypath), comp->RefCount, comp->num_clients, action); if (action == INSTALLSTATE_LOCAL || action == INSTALLSTATE_SOURCE) @@ -3542,7 +3544,7 @@ msi_reg_set_val_str(hkey, szPermKey, comp->FullKeypath); } if (action == INSTALLSTATE_LOCAL) - msi_reg_set_val_str(hkey, squished_pc, comp->FullKeypath); + msi_reg_set_val_str( hkey, squashed_pc, comp->FullKeypath ); else { MSIFILE *file; @@ -3579,7 +3581,7 @@ lstrcpyW(ptr2, ptr); msi_free(sourcepath); - msi_reg_set_val_str(hkey, squished_pc, source); + msi_reg_set_val_str( hkey, squashed_pc, source ); } RegCloseKey(hkey); } @@ -3608,7 +3610,7 @@ WARN( "failed to open component key %u\n", rc ); continue; } - res = RegDeleteValueW( hkey, squished_pc ); + res = RegDeleteValueW( hkey, squashed_pc ); RegCloseKey(hkey); if (res) WARN( "failed to delete component value %d\n", res ); } @@ -4206,15 +4208,6 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) { - MSIHANDLE hdb, suminfo; - WCHAR guids[MAX_PATH]; - WCHAR packcode[SQUISH_GUID_SIZE]; - LPWSTR buffer; - LPWSTR ptr; - DWORD langid; - DWORD size; - UINT r; - static const WCHAR szARPProductIcon[] = {'A','R','P','P','R','O','D','U','C','T','I','C','O','N',0}; static const WCHAR szAssignment[] = @@ -4224,6 +4217,10 @@ static const WCHAR szClients[] = {'C','l','i','e','n','t','s',0}; static const WCHAR szColon[] = {':',0}; + MSIHANDLE hdb, suminfo; + WCHAR *buffer, *ptr, guids[MAX_PATH], packcode[SQUASHED_GUID_SIZE]; + DWORD langid, size; + UINT r; buffer = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTNAMEW, buffer); @@ -4286,8 +4283,7 @@ { UINT r; HKEY hkey; - LPWSTR upgrade; - WCHAR squashed_pc[SQUISH_GUID_SIZE]; + WCHAR *upgrade, squashed_pc[SQUASHED_GUID_SIZE]; upgrade = msi_dup_property(package->db, szUpgradeCode); if (!upgrade) @@ -5186,9 +5182,8 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) { - WCHAR squashed_pc[SQUISH_GUID_SIZE]; + WCHAR *upgrade_code, squashed_pc[SQUASHED_GUID_SIZE]; MSIRECORD *uirow; - LPWSTR upgrade_code; HKEY hkey, props, upgrade_key; UINT rc; @@ -5281,31 +5276,50 @@ return ERROR_SUCCESS; } -static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) -{ - static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; - WCHAR *upgrade, **features; - BOOL full_uninstall = TRUE; - MSIFEATURE *feature; +static void remove_product_upgrade_code( MSIPACKAGE *package ) +{ + WCHAR *code, product[SQUASHED_GUID_SIZE]; + HKEY hkey; + LONG res; + DWORD count; + + squash_guid( package->ProductCode, product ); + if (!(code = msi_dup_property( package->db, szUpgradeCode ))) + { + WARN( "upgrade code not found\n" ); + return; + } + if (!MSIREG_OpenUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteUpgradeCodesKey( code ); + } + if (!MSIREG_OpenUserUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteUserUpgradeCodesKey( code ); + } + if (!MSIREG_OpenClassesUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteClassesUpgradeCodesKey( code ); + } + + msi_free( code ); +} + +static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) +{ MSIPATCHINFO *patch; - UINT i; - - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Action == INSTALLSTATE_LOCAL) full_uninstall = FALSE; - } - features = msi_split_string( remove, ',' ); - for (i = 0; features && features[i]; i++) - { - if (!strcmpW( features[i], szAll )) full_uninstall = TRUE; - } - msi_free(features); - - if (!full_uninstall) - return ERROR_SUCCESS; MSIREG_DeleteProductKey(package->ProductCode); - MSIREG_DeleteUserDataProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); MSIREG_DeleteUninstallKey(package->ProductCode, package->platform); MSIREG_DeleteLocalClassesProductKey(package->ProductCode); @@ -5313,13 +5327,7 @@ MSIREG_DeleteUserProductKey(package->ProductCode); MSIREG_DeleteUserFeaturesKey(package->ProductCode); - upgrade = msi_dup_property(package->db, szUpgradeCode); - if (upgrade) - { - MSIREG_DeleteUserUpgradeCodesKey(upgrade); - MSIREG_DeleteClassesUpgradeCodesKey(upgrade); - msi_free(upgrade); - } + remove_product_upgrade_code( package ); LIST_FOR_EACH_ENTRY(patch, &package->patches, MSIPATCHINFO, entry) { @@ -5338,10 +5346,32 @@ return ERROR_SUCCESS; } +static BOOL is_full_uninstall( MSIPACKAGE *package ) +{ + WCHAR **features, *remove = msi_dup_property( package->db, szRemove ); + MSIFEATURE *feature; + BOOL ret = TRUE; + UINT i; + + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Action == INSTALLSTATE_LOCAL) ret = FALSE; + } + + features = msi_split_string( remove, ',' ); + for (i = 0; features && features[i]; i++) + { + if (!strcmpW( features[i], szAll )) ret = TRUE; + } + + msi_free(features); + msi_free(remove); + return ret; +} + static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; - WCHAR *remove; /* first do the same as an InstallExecute */ rc = execute_script(package, SCRIPT_INSTALL); @@ -5353,9 +5383,9 @@ if (rc != ERROR_SUCCESS) return rc; - remove = msi_dup_property(package->db, szRemove); - rc = msi_unpublish_product(package, remove); - msi_free(remove); + if (is_full_uninstall(package)) + rc = ACTION_UnpublishProduct(package); + return rc; } @@ -5383,26 +5413,24 @@ '/','I',' ','\"','%','s','\"',' ', 'A','F','T','E','R','R','E','B','O','O','T','=','1',' ', 'R','U','N','O','N','C','E','E','N','T','R','Y','=','\"','%','s','\"',0}; - WCHAR buffer[256], sysdir[MAX_PATH]; + WCHAR buffer[256], sysdir[MAX_PATH], squashed_pc[SQUASHED_GUID_SIZE]; HKEY hkey; - WCHAR squished_pc[100]; - - squash_guid(package->ProductCode,squished_pc); + + squash_guid( package->ProductCode, squashed_pc ); GetSystemDirectoryW(sysdir, sizeof(sysdir)/sizeof(sysdir[0])); RegCreateKeyW(HKEY_LOCAL_MACHINE,RunOnce,&hkey); - snprintfW(buffer,sizeof(buffer)/sizeof(buffer[0]),msiexec_fmt,sysdir, - squished_pc); - - msi_reg_set_val_str( hkey, squished_pc, buffer ); + snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), msiexec_fmt, sysdir, squashed_pc ); + + msi_reg_set_val_str( hkey, squashed_pc, buffer ); RegCloseKey(hkey); TRACE("Reboot command %s\n",debugstr_w(buffer)); RegCreateKeyW(HKEY_LOCAL_MACHINE,InstallRunOnce,&hkey); - sprintfW(buffer,install_fmt,package->ProductCode,squished_pc); - - msi_reg_set_val_str( hkey, squished_pc, buffer ); + sprintfW( buffer, install_fmt, package->ProductCode, squashed_pc ); + + msi_reg_set_val_str( hkey, squashed_pc, buffer ); RegCloseKey(hkey); return ERROR_INSTALL_SUSPEND; @@ -5524,7 +5552,7 @@ if (msi_check_unpublish(package)) { - MSIREG_DeleteUserDataProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); goto end; } @@ -7391,7 +7419,8 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { static const WCHAR fmtW[] = - {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; + {'m','s','i','e','x','e','c',' ','/','q','n',' ','/','i',' ','%','s',' ', + 'R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 ); @@ -7672,7 +7701,7 @@ { szProcessComponents, ACTION_ProcessComponents, szProcessComponents }, { szPublishComponents, ACTION_PublishComponents, szUnpublishComponents }, { szPublishFeatures, ACTION_PublishFeatures, szUnpublishFeatures }, - { szPublishProduct, ACTION_PublishProduct, NULL }, + { szPublishProduct, ACTION_PublishProduct, szUnpublishProduct }, { szRegisterClassInfo, ACTION_RegisterClassInfo, szUnregisterClassInfo }, { szRegisterComPlus, ACTION_RegisterComPlus, szUnregisterComPlus }, { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo, szUnregisterExtensionInfo }, @@ -7701,6 +7730,7 @@ { szStopServices, ACTION_StopServices, szStartServices }, { szUnpublishComponents, ACTION_UnpublishComponents, szPublishComponents }, { szUnpublishFeatures, ACTION_UnpublishFeatures, szPublishFeatures }, + { szUnpublishProduct, ACTION_UnpublishProduct, NULL }, /* for rollback only */ { szUnregisterClassInfo, ACTION_UnregisterClassInfo, szRegisterClassInfo }, { szUnregisterComPlus, ACTION_UnregisterComPlus, szRegisterComPlus }, { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo }, Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… ============================================================================== --- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -273,7 +273,8 @@ ITypeInfo *ti; HRESULT hr; - TRACE("(%p/%p)->(%p,%p,%d,%d,%p)\n", iface, This, riid, rgszNames, cNames, lcid, rgDispId); + TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", iface, This, + debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) return E_INVALIDARG; @@ -316,7 +317,9 @@ BSTR bstrName = NULL; ITypeInfo *ti; - TRACE("(%p/%p)->(%d,%p,%d,%d,%p,%p,%p,%p)\n", iface, This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p/%p)->(%d, %s, %d, %d, %p, %p, %p, %p)\n", iface, This, + dispIdMember, debugstr_guid(riid), lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); if (!IsEqualIID(riid, &IID_NULL)) { @@ -1012,7 +1015,7 @@ EXCEPINFO* pExcepInfo, UINT* puArgErr) { - ListObject *list = (ListObject*)This; + ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); IUnknown *pUnk = NULL; HRESULT hr; @@ -1060,7 +1063,7 @@ static void list_free(AutomationObject *This) { - ListObject *list = (ListObject*)This; + ListObject *list = CONTAINING_RECORD(This, ListObject, autoobj); int i; for (i = 0; i < list->count; i++) @@ -1348,7 +1351,7 @@ EXCEPINFO* pExcepInfo, UINT* puArgErr) { - SessionObject *session = (SessionObject*)This; + SessionObject *session = CONTAINING_RECORD(This, SessionObject, autoobj); WCHAR *szString; DWORD dwLen = 0; MSIHANDLE msiHandle; Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -549,7 +549,7 @@ static LPWSTR msi_build_createsql_postlude(LPWSTR *primary_keys, DWORD num_keys) { LPWSTR postlude, keys, ptr; - DWORD size, key_size, i; + DWORD size, i; static const WCHAR key_fmt[] = {'`','%','s','`',',',' ',0}; static const WCHAR postlude_fmt[] = {'P','R','I','M','A','R','Y',' ','K','E','Y',' ','%','s',')',0}; @@ -563,9 +563,7 @@ for (i = 0, ptr = keys; i < num_keys; i++) { - key_size = lstrlenW(key_fmt) + lstrlenW(primary_keys[i]) -2; - sprintfW(ptr, key_fmt, primary_keys[i]); - ptr += key_size; + ptr += sprintfW(ptr, key_fmt, primary_keys[i]); } /* remove final ', ' */ Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=73… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -123,10 +123,10 @@ UINT WINAPI MsiOpenProductW(LPCWSTR szProduct, MSIHANDLE *phProduct) { MSIPACKAGE *package = NULL; - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; UINT r; - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (!phProduct) @@ -987,16 +987,15 @@ { UINT rc, index; HKEY compkey, prodkey; - WCHAR squished_comp[GUID_SIZE]; - WCHAR squished_prod[GUID_SIZE]; - DWORD sz = GUID_SIZE; + WCHAR squashed_comp[SQUASHED_GUID_SIZE], squashed_prod[SQUASHED_GUID_SIZE]; + DWORD sz = sizeof(squashed_prod)/sizeof(squashed_prod[0]); TRACE("%s %p\n", debugstr_w(szComponent), szBuffer); if (!szComponent || !*szComponent) return ERROR_INVALID_PARAMETER; - if (!squash_guid(szComponent, squished_comp)) + if (!squash_guid( szComponent, squashed_comp )) return ERROR_INVALID_PARAMETER; if (MSIREG_OpenUserDataComponentKey(szComponent, NULL, &compkey, FALSE) != ERROR_SUCCESS && @@ -1005,7 +1004,7 @@ return ERROR_UNKNOWN_COMPONENT; } - rc = RegEnumValueW(compkey, 0, squished_prod, &sz, NULL, NULL, NULL, NULL); + rc = RegEnumValueW( compkey, 0, squashed_prod, &sz, NULL, NULL, NULL, NULL ); if (rc != ERROR_SUCCESS) { RegCloseKey(compkey); @@ -1013,7 +1012,7 @@ } /* check simple case, only one product */ - rc = RegEnumValueW(compkey, 1, squished_prod, &sz, NULL, NULL, NULL, NULL); + rc = RegEnumValueW( compkey, 1, squashed_prod, &sz, NULL, NULL, NULL, NULL ); if (rc == ERROR_NO_MORE_ITEMS) { rc = ERROR_SUCCESS; @@ -1021,12 +1020,12 @@ } index = 0; - while ((rc = RegEnumValueW(compkey, index, squished_prod, &sz, - NULL, NULL, NULL, NULL)) != ERROR_NO_MORE_ITEMS) + while ((rc = RegEnumValueW( compkey, index, squashed_prod, &sz, NULL, NULL, NULL, NULL )) != + ERROR_NO_MORE_ITEMS) { index++; sz = GUID_SIZE; - unsquash_guid(squished_prod, szBuffer); + unsquash_guid( squashed_prod, szBuffer ); if (MSIREG_OpenProductKey(szBuffer, NULL, MSIINSTALLCONTEXT_USERMANAGED, @@ -1048,7 +1047,7 @@ done: RegCloseKey(compkey); - unsquash_guid(squished_prod, szBuffer); + unsquash_guid( squashed_prod, szBuffer ); return rc; } @@ -1085,9 +1084,7 @@ MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; - LPWSTR val = NULL; - WCHAR squished_pc[GUID_SIZE]; - WCHAR packagecode[GUID_SIZE]; + WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[SQUASHED_GUID_SIZE]; BOOL badconfig = FALSE; LONG res; DWORD type = REG_NONE; @@ -1098,7 +1095,7 @@ if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szAttribute) return ERROR_INVALID_PARAMETER; - if (!squash_guid(szProduct, squished_pc)) + if (!squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if ((r = MSIREG_OpenProductKey(szProduct, NULL, @@ -1197,7 +1194,7 @@ if (val != empty && type != REG_DWORD && !strcmpW( szAttribute, INSTALLPROPERTY_PACKAGECODEW )) { - if (lstrlenW(val) != SQUISH_GUID_SIZE - 1) + if (lstrlenW( val ) != SQUASHED_GUID_SIZE - 1) badconfig = TRUE; else { @@ -1387,15 +1384,6 @@ MSIINSTALLCONTEXT dwContext, LPCWSTR szProperty, LPWSTR szValue, LPDWORD pcchValue) { - WCHAR squished_pc[GUID_SIZE]; - LPWSTR val = NULL; - LPCWSTR package = NULL; - HKEY props = NULL, prod; - HKEY classes = NULL, managed; - HKEY hkey = NULL; - DWORD type; - UINT r = ERROR_UNKNOWN_PRODUCT; - static const WCHAR five[] = {'5',0}; static const WCHAR displayname[] = { 'D','i','s','p','l','a','y','N','a','m','e',0}; @@ -1404,12 +1392,17 @@ static const WCHAR managed_local_package[] = { 'M','a','n','a','g','e','d','L','o','c','a','l', 'P','a','c','k','a','g','e',0}; + WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE]; + LPCWSTR package = NULL; + HKEY props = NULL, prod, classes = NULL, managed, hkey = NULL; + DWORD type; + UINT r = ERROR_UNKNOWN_PRODUCT; TRACE("(%s, %s, %d, %s, %p, %p)\n", debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, debugstr_w(szProperty), szValue, pcchValue); - if (!szProductCode || !squash_guid(szProductCode, squished_pc)) + if (!szProductCode || !squash_guid( szProductCode, squashed_pc )) return ERROR_INVALID_PARAMETER; if (szValue && !pcchValue) @@ -1649,28 +1642,25 @@ LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCWSTR szProperty, LPWSTR lpValue, DWORD *pcchValue) { - WCHAR squished_pc[GUID_SIZE]; - WCHAR squished_patch[GUID_SIZE]; + static const WCHAR szManagedPackage[] = + {'M','a','n','a','g','e','d','L','o','c','a','l','P','a','c','k','a','g','e',0}; + WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], squashed_patch[SQUASHED_GUID_SIZE]; HKEY udprod = 0, prod = 0, props = 0; HKEY patch = 0, patches = 0; HKEY udpatch = 0, datakey = 0; HKEY prodpatches = 0; - LPWSTR val = NULL; UINT r = ERROR_UNKNOWN_PRODUCT; DWORD len; LONG res; - static const WCHAR szManagedPackage[] = {'M','a','n','a','g','e','d', - 'L','o','c','a','l','P','a','c','k','a','g','e',0}; - TRACE("(%s, %s, %s, %d, %s, %p, %p)\n", debugstr_w(szPatchCode), debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, debugstr_w(szProperty), lpValue, pcchValue); - if (!szProductCode || !squash_guid(szProductCode, squished_pc)) - return ERROR_INVALID_PARAMETER; - - if (!szPatchCode || !squash_guid(szPatchCode, squished_patch)) + if (!szProductCode || !squash_guid( szProductCode, squashed_pc )) + return ERROR_INVALID_PARAMETER; + + if (!szPatchCode || !squash_guid( szPatchCode, squashed_patch )) return ERROR_INVALID_PARAMETER; if (!szProperty) @@ -1704,7 +1694,7 @@ if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(patches, squished_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch); + res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch ); if (res != ERROR_SUCCESS) goto done; @@ -1719,7 +1709,7 @@ goto done; datakey = prodpatches; - szProperty = squished_patch; + szProperty = squashed_patch; } else { @@ -2115,7 +2105,7 @@ return (res == ERROR_SUCCESS); } -static UINT msi_comp_find_prodcode(LPWSTR squished_pc, +static UINT msi_comp_find_prodcode(WCHAR *squashed_pc, MSIINSTALLCONTEXT context, LPCWSTR comp, LPWSTR val, DWORD *sz) { @@ -2131,7 +2121,7 @@ if (r != ERROR_SUCCESS) return r; - res = RegQueryValueExW(hkey, squished_pc, NULL, NULL, (BYTE *)val, sz); + res = RegQueryValueExW( hkey, squashed_pc, NULL, NULL, (BYTE *)val, sz ); if (res != ERROR_SUCCESS) return res; @@ -2143,7 +2133,7 @@ LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCWSTR szComponent, INSTALLSTATE *pdwState) { - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; BOOL found; DWORD sz; @@ -2156,7 +2146,7 @@ if (!szProductCode || !*szProductCode || lstrlenW(szProductCode) != GUID_SIZE - 1) return ERROR_INVALID_PARAMETER; - if (!squash_guid(szProductCode, squished_pc)) + if (!squash_guid( szProductCode, squashed_pc )) return ERROR_INVALID_PARAMETER; found = msi_comp_find_prod_key(szProductCode, dwContext); @@ -2175,7 +2165,7 @@ *pdwState = INSTALLSTATE_UNKNOWN; sz = 0; - if (msi_comp_find_prodcode(squished_pc, dwContext, szComponent, NULL, &sz)) + if (msi_comp_find_prodcode( squashed_pc, dwContext, szComponent, NULL, &sz )) return ERROR_UNKNOWN_COMPONENT; if (sz == 0) @@ -2186,7 +2176,7 @@ UINT r; if (!(val = msi_alloc( sz ))) return ERROR_OUTOFMEMORY; - if ((r = msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz))) + if ((r = msi_comp_find_prodcode( squashed_pc, dwContext, szComponent, val, &sz ))) { msi_free(val); return r; @@ -2519,7 +2509,7 @@ TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen); - if (path && !(pathW = strdupAtoW( path ))) return ERROR_OUTOFMEMORY; + if (path && !(pathW = strdupAtoW( path ))) return E_OUTOFMEMORY; r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen ); msi_free( pathW ); return r; @@ -2769,10 +2759,8 @@ { static const WCHAR wininstaller[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; - WCHAR squished_pc[GUID_SIZE]; - WCHAR squished_comp[GUID_SIZE]; + WCHAR *path = NULL, squashed_pc[SQUASHED_GUID_SIZE], squashed_comp[SQUASHED_GUID_SIZE]; HKEY hkey; - LPWSTR path = NULL; INSTALLSTATE state; DWORD version; @@ -2782,8 +2770,7 @@ if (lpPathBuf->str.w && !pcchBuf) return INSTALLSTATE_INVALIDARG; - if (!squash_guid(szProduct, squished_pc) || - !squash_guid(szComponent, squished_comp)) + if (!squash_guid( szProduct, squashed_pc ) || !squash_guid( szComponent, squashed_comp )) return INSTALLSTATE_INVALIDARG; state = INSTALLSTATE_UNKNOWN; @@ -2791,7 +2778,7 @@ if (MSIREG_OpenUserDataComponentKey(szComponent, szLocalSid, &hkey, FALSE) == ERROR_SUCCESS || MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) { - path = msi_reg_get_val_str(hkey, squished_pc); + path = msi_reg_get_val_str( hkey, squashed_pc ); RegCloseKey(hkey); state = INSTALLSTATE_ABSENT; @@ -2821,7 +2808,7 @@ MSIREG_OpenUserDataComponentKey(szComponent, NULL, &hkey, FALSE) == ERROR_SUCCESS) { msi_free(path); - path = msi_reg_get_val_str(hkey, squished_pc); + path = msi_reg_get_val_str( hkey, squashed_pc ); RegCloseKey(hkey); state = INSTALLSTATE_ABSENT; @@ -3339,6 +3326,26 @@ return MsiUseFeatureExA(szProduct, szFeature, 0, 0); } +WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) +{ + WCHAR *ret; + DWORD len, type; + if (RegQueryValueExW( hkey, name, NULL, &type, NULL, &len ) || type != REG_MULTI_SZ) return NULL; + if ((ret = msi_alloc( len ))) RegQueryValueExW( hkey, name, NULL, NULL, (BYTE *)ret, &len ); + return ret; +} + +WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) +{ + WCHAR *ret; + DWORD len, type; + if (RegQueryValueExW( hkey, name, NULL, &type, NULL, &len ) || type != REG_SZ) return NULL; + if ((ret = msi_alloc( len ))) RegQueryValueExW( hkey, name, NULL, NULL, (BYTE *)ret, &len ); + return ret; +} + +#define BASE85_SIZE 20 + /*********************************************************************** * MSI_ProvideQualifiedComponentEx [internal] */ @@ -3347,39 +3354,54 @@ DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, LPDWORD pcchPathBuf) { - WCHAR product[MAX_FEATURE_CHARS+1], component[MAX_FEATURE_CHARS+1], - feature[MAX_FEATURE_CHARS+1]; - LPWSTR info; + WCHAR product[MAX_FEATURE_CHARS+1], comp[MAX_FEATURE_CHARS+1], feature[MAX_FEATURE_CHARS+1]; + WCHAR *desc; HKEY hkey; - DWORD sz; - UINT rc; + DWORD size; + UINT ret; INSTALLSTATE state; - rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); - if (rc != ERROR_SUCCESS) - return ERROR_INDEX_ABSENT; - - info = msi_reg_get_val_str( hkey, szQualifier ); + if (MSIREG_OpenUserComponentsKey( szComponent, &hkey, FALSE )) return ERROR_UNKNOWN_COMPONENT; + + desc = reg_get_multisz( hkey, szQualifier ); RegCloseKey(hkey); - - if (!info) - return ERROR_INDEX_ABSENT; - - MsiDecomposeDescriptorW(info, product, feature, component, &sz); - - if (!szProduct) - state = MSI_GetComponentPath(product, component, lpPathBuf, pcchPathBuf); - else - state = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); - - msi_free( info ); - - if (state == INSTALLSTATE_MOREDATA) - return ERROR_MORE_DATA; - - if (state != INSTALLSTATE_LOCAL) - return ERROR_FILE_NOT_FOUND; - + if (!desc) return ERROR_INDEX_ABSENT; + + /* FIXME: handle multiple descriptors */ + ret = MsiDecomposeDescriptorW( desc, product, feature, comp, &size ); + msi_free( desc ); + if (ret != ERROR_SUCCESS) return ret; + + if (!szProduct) szProduct = product; + if (!comp[0]) + { + MSIINSTALLCONTEXT ctx; + WCHAR *components; + GUID guid; + + /* use the first component of the feature if the descriptor component is empty */ + if ((ret = msi_locate_product( szProduct, &ctx ))) return ret; + if ((ret = MSIREG_OpenUserDataFeaturesKey( szProduct, NULL, ctx, &hkey, FALSE ))) + { + return ERROR_FILE_NOT_FOUND; + } + components = reg_get_sz( hkey, feature ); + RegCloseKey( hkey ); + if (!components) return ERROR_FILE_NOT_FOUND; + + if (strlenW( components ) < BASE85_SIZE || !decode_base85_guid( components, &guid )) + { + msi_free( components ); + return ERROR_FILE_NOT_FOUND; + } + msi_free( components ); + StringFromGUID2( &guid, comp, sizeof(comp)/sizeof(comp[0]) ); + } + + state = MSI_GetComponentPath( szProduct, comp, lpPathBuf, pcchPathBuf ); + + if (state == INSTALLSTATE_MOREDATA) return ERROR_MORE_DATA; + if (state != INSTALLSTATE_LOCAL) return ERROR_FILE_NOT_FOUND; return ERROR_SUCCESS; } @@ -3476,8 +3498,7 @@ awstring *lpOrgNameBuf, LPDWORD pcchOrgNameBuf, awstring *lpSerialBuf, LPDWORD pcchSerialBuf) { - WCHAR squished_pc[SQUISH_GUID_SIZE]; - LPWSTR user, org, serial; + WCHAR *user, *org, *serial, squashed_pc[SQUASHED_GUID_SIZE]; USERINFOSTATE state; HKEY hkey, props; LPCWSTR orgptr; @@ -3487,7 +3508,7 @@ pcchUserNameBuf, lpOrgNameBuf, pcchOrgNameBuf, lpSerialBuf, pcchSerialBuf); - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return USERINFOSTATE_INVALIDARG; if (MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -727,7 +727,7 @@ #define MSI_BUILDNUMBER 6001 #define GUID_SIZE 39 -#define SQUISH_GUID_SIZE 33 +#define SQUASHED_GUID_SIZE 33 #define MSIHANDLE_MAGIC 0x4d434923 @@ -929,10 +929,11 @@ extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataPatchKey(LPCWSTR patch, MSIINSTALLCONTEXT context) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; +extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; +extern UINT MSIREG_DeleteUpgradeCodesKey(const WCHAR *) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; @@ -969,7 +970,6 @@ extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN; -extern enum platform parse_platform( const WCHAR *str ) DECLSPEC_HIDDEN; extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN; /* undocumented functions */ Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -1170,7 +1170,7 @@ return ERROR_SUCCESS; } -enum platform parse_platform( const WCHAR *str ) +static enum platform parse_platform( const WCHAR *str ) { if (!str[0] || !strcmpW( str, szIntel )) return PLATFORM_INTEL; else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64; Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/record.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/record.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -707,7 +707,8 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; - HRESULT r; + HRESULT hr; + UINT ret; if( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; @@ -726,16 +727,16 @@ return ERROR_INVALID_FIELD; ofs.QuadPart = 0; - r = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); - if( FAILED( r ) ) + hr = IStream_Seek( stm, ofs, STREAM_SEEK_SET, &cur ); + if (FAILED( hr )) return ERROR_FUNCTION_FAILED; } else { /* read the file into a stream and save the stream in the record */ - r = RECORD_StreamFromFile(szFilename, &stm); - if( r != ERROR_SUCCESS ) - return r; + ret = RECORD_StreamFromFile(szFilename, &stm); + if (ret != ERROR_SUCCESS) + return ret; /* if all's good, store it in the record */ MSI_RecordSetStream(rec, iField, stm); Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -475,24 +475,23 @@ UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) { - LPWSTR usersid = NULL; HKEY root = HKEY_LOCAL_MACHINE; REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[MAX_PATH]; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR *usersid = NULL, squashed_pc[SQUASHED_GUID_SIZE], keypath[MAX_PATH]; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); if (context == MSIINSTALLCONTEXT_MACHINE) { strcpyW(keypath, szInstaller_LocalClassesProd); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); } else if (context == MSIINSTALLCONTEXT_USERUNMANAGED) { root = HKEY_CURRENT_USER; strcpyW(keypath, szUserProducts); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); } else { @@ -505,7 +504,7 @@ } szUserSid = usersid; } - sprintfW(keypath, szInstaller_LocalManagedProd_fmt, szUserSid, squished_pc); + sprintfW( keypath, szInstaller_LocalManagedProd_fmt, szUserSid, squashed_pc ); LocalFree(usersid); } if (create) return RegCreateKeyExW(root, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -514,25 +513,25 @@ UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) { - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); strcpyW(keypath, szUserProducts); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } UINT MSIREG_OpenUserPatchesKey(LPCWSTR szPatch, HKEY *key, BOOL create) { - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szPatch, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szPatch), debugstr_w(squished_pc)); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szPatch, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szPatch), debugstr_w(squashed_pc)); strcpyW(keypath, szUserPatches); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); if (create) return RegCreateKeyW(HKEY_CURRENT_USER, keypath, key); return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); @@ -543,21 +542,21 @@ { HKEY root = HKEY_LOCAL_MACHINE; REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[MAX_PATH], *usersid = NULL; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[MAX_PATH], *usersid = NULL; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); if (context == MSIINSTALLCONTEXT_MACHINE) { strcpyW(keypath, szInstaller_LocalClassesFeat); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); } else if (context == MSIINSTALLCONTEXT_USERUNMANAGED) { root = HKEY_CURRENT_USER; strcpyW(keypath, szUserFeatures); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); } else { @@ -570,7 +569,7 @@ } szUserSid = usersid; } - sprintfW(keypath, szInstaller_LocalManagedFeat_fmt, szUserSid, squished_pc); + sprintfW( keypath, szInstaller_LocalManagedFeat_fmt, szUserSid, squashed_pc ); LocalFree(usersid); } if (create) return RegCreateKeyExW(root, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -579,26 +578,26 @@ UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) { - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); strcpyW(keypath, szUserFeatures); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } static UINT MSIREG_OpenInstallerFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); strcpyW(keypath, szInstaller_Features); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_pc ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); @@ -608,14 +607,14 @@ HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200], *usersid = NULL; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200], *usersid = NULL; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); if (context == MSIINSTALLCONTEXT_MACHINE) { - sprintfW(keypath, szUserDataFeatures_fmt, szLocalSid, squished_pc); + sprintfW( keypath, szUserDataFeatures_fmt, szLocalSid, squashed_pc ); } else { @@ -628,7 +627,7 @@ } szUserSid = usersid; } - sprintfW(keypath, szUserDataFeatures_fmt, szUserSid, squished_pc); + sprintfW( keypath, szUserDataFeatures_fmt, szUserSid, squashed_pc ); LocalFree(usersid); } if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -637,32 +636,31 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) { - WCHAR squished_cc[GUID_SIZE], keypath[0x200]; + WCHAR squashed_cc[SQUASHED_GUID_SIZE], keypath[0x200]; UINT ret; - if (!squash_guid(szComponent, squished_cc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szComponent), debugstr_w(squished_cc)); + if (!squash_guid( szComponent, squashed_cc)) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szComponent), debugstr_w(squashed_cc)); strcpyW(keypath, szUserComponents); - strcatW(keypath, squished_cc); + strcatW( keypath, squashed_cc ); if (create) return RegCreateKeyW(HKEY_CURRENT_USER, keypath, key); ret = RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); if (ret != ERROR_FILE_NOT_FOUND) return ret; strcpyW(keypath, szInstaller_Components); - strcatW(keypath, squished_cc); + strcatW( keypath, squashed_cc ); return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR comp[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; - - if (!squash_guid(szComponent, comp)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szComponent), debugstr_w(comp)); + WCHAR *usersid, squashed_comp[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szComponent, squashed_comp )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szComponent), debugstr_w(squashed_comp)); if (!szUserSid) { @@ -671,11 +669,11 @@ ERR("Failed to retrieve user SID\n"); return ERROR_FUNCTION_FAILED; } - sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + sprintfW( keypath, szUserDataComp_fmt, usersid, squashed_comp ); LocalFree(usersid); } else - sprintfW(keypath, szUserDataComp_fmt, szUserSid, comp); + sprintfW( keypath, szUserDataComp_fmt, szUserSid, squashed_comp ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); @@ -684,13 +682,12 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR comp[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; + WCHAR *usersid, squashed_comp[SQUASHED_GUID_SIZE], keypath[0x200]; HKEY hkey; LONG r; - if (!squash_guid(szComponent, comp)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szComponent), debugstr_w(comp)); + if (!squash_guid( szComponent, squashed_comp )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szComponent), debugstr_w(squashed_comp)); if (!szUserSid) { @@ -706,7 +703,7 @@ sprintfW(keypath, szUserDataComponents_fmt, szUserSid); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, comp); + r = RegDeleteTreeW( hkey, squashed_comp ); RegCloseKey(hkey); return r; } @@ -714,16 +711,15 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, LPCWSTR szUserSid, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR *usersid, squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); if (dwContext == MSIINSTALLCONTEXT_MACHINE) - sprintfW(keypath, szUserDataProd_fmt, szLocalSid, squished_pc); + sprintfW( keypath, szUserDataProd_fmt, szLocalSid, squashed_pc ); else if (szUserSid) - sprintfW(keypath, szUserDataProd_fmt, szUserSid, squished_pc); + sprintfW( keypath, szUserDataProd_fmt, szUserSid, squashed_pc ); else { if (!(usersid = get_user_sid())) @@ -731,7 +727,7 @@ ERR("Failed to retrieve user SID\n"); return ERROR_FUNCTION_FAILED; } - sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); + sprintfW( keypath, szUserDataProd_fmt, usersid, squashed_pc ); LocalFree(usersid); } if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -741,14 +737,13 @@ UINT MSIREG_OpenUserDataPatchKey(LPCWSTR szPatch, MSIINSTALLCONTEXT dwContext, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_patch[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; - - if (!squash_guid(szPatch, squished_patch)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szPatch), debugstr_w(squished_patch)); + WCHAR *usersid, squashed_patch[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szPatch, squashed_patch )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szPatch), debugstr_w(squashed_patch)); if (dwContext == MSIINSTALLCONTEXT_MACHINE) - sprintfW(keypath, szUserDataPatch_fmt, szLocalSid, squished_patch); + sprintfW( keypath, szUserDataPatch_fmt, szLocalSid, squashed_patch ); else { if (!(usersid = get_user_sid())) @@ -756,7 +751,7 @@ ERR("Failed to retrieve user SID\n"); return ERROR_FUNCTION_FAILED; } - sprintfW(keypath, szUserDataPatch_fmt, usersid, squished_patch); + sprintfW( keypath, szUserDataPatch_fmt, usersid, squashed_patch ); LocalFree(usersid); } if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -766,13 +761,12 @@ UINT MSIREG_DeleteUserDataPatchKey(LPCWSTR patch, MSIINSTALLCONTEXT context) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_patch[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; + WCHAR *usersid, squashed_patch[SQUASHED_GUID_SIZE], keypath[0x200]; HKEY hkey; LONG r; - if (!squash_guid(patch, squished_patch)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(patch), debugstr_w(squished_patch)); + if (!squash_guid( patch, squashed_patch )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(patch), debugstr_w(squashed_patch)); if (context == MSIINSTALLCONTEXT_MACHINE) sprintfW(keypath, szUserDataPatches_fmt, szLocalSid); @@ -787,7 +781,7 @@ LocalFree(usersid); } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, squished_patch); + r = RegDeleteTreeW( hkey, squashed_patch ); RegCloseKey(hkey); return r; } @@ -795,14 +789,13 @@ UINT MSIREG_OpenUserDataProductPatchesKey(LPCWSTR product, MSIINSTALLCONTEXT context, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_product[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; - - if (!squash_guid(product, squished_product)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(product), debugstr_w(squished_product)); + WCHAR *usersid, squashed_product[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( product, squashed_product )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(product), debugstr_w(squashed_product)); if (context == MSIINSTALLCONTEXT_MACHINE) - sprintfW(keypath, szUserDataProductPatches_fmt, szLocalSid, squished_product); + sprintfW( keypath, szUserDataProductPatches_fmt, szLocalSid, squashed_product ); else { if (!(usersid = get_user_sid())) @@ -810,7 +803,7 @@ ERR("Failed to retrieve user SID\n"); return ERROR_FUNCTION_FAILED; } - sprintfW(keypath, szUserDataProductPatches_fmt, usersid, squished_product); + sprintfW( keypath, szUserDataProductPatches_fmt, usersid, squashed_product ); LocalFree(usersid); } if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); @@ -819,17 +812,16 @@ UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, LPCWSTR szUserSid, HKEY *key, BOOL create) { - LPWSTR usersid; REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + WCHAR *usersid, squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); if (dwContext == MSIINSTALLCONTEXT_MACHINE) - sprintfW(keypath, szInstallProperties_fmt, szLocalSid, squished_pc); + sprintfW( keypath, szInstallProperties_fmt, szLocalSid, squashed_pc ); else if (szUserSid) - sprintfW(keypath, szInstallProperties_fmt, szUserSid, squished_pc); + sprintfW( keypath, szInstallProperties_fmt, szUserSid, squashed_pc ); else { if (!(usersid = get_user_sid())) @@ -837,34 +829,38 @@ ERR("Failed to retrieve user SID\n"); return ERROR_FUNCTION_FAILED; } - sprintfW(keypath, szInstallProperties_fmt, usersid, squished_pc); + sprintfW( keypath, szInstallProperties_fmt, usersid, squashed_pc ); LocalFree(usersid); } if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } -UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) +UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - LPWSTR usersid; + WCHAR *usersid, squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; HKEY hkey; LONG r; - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); - - if (!(usersid = get_user_sid())) - { - ERR("Failed to retrieve user SID\n"); - return ERROR_FUNCTION_FAILED; - } - sprintfW(keypath, szUserDataProducts_fmt, usersid); - LocalFree(usersid); + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); + + if (context == MSIINSTALLCONTEXT_MACHINE) + sprintfW(keypath, szUserDataProducts_fmt, szLocalSid); + else + { + if (!(usersid = get_user_sid())) + { + ERR("Failed to retrieve user SID\n"); + return ERROR_FUNCTION_FAILED; + } + sprintfW(keypath, szUserDataProducts_fmt, usersid); + LocalFree(usersid); + } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, squished_pc); + r = RegDeleteTreeW( hkey, squashed_pc ); RegCloseKey(hkey); return r; } @@ -872,15 +868,15 @@ UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; HKEY hkey; LONG r; - if (!squash_guid(szProduct, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProduct), debugstr_w(squished_pc)); + if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_Products, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, squished_pc); + r = RegDeleteTreeW( hkey, squashed_pc ); RegCloseKey(hkey); return r; } @@ -888,12 +884,12 @@ UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szPatch, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szPatch), debugstr_w(squished_pc)); - - sprintfW(keypath, szInstaller_Patches, squished_pc); + WCHAR squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szPatch, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szPatch), debugstr_w(squashed_pc)); + + sprintfW( keypath, szInstaller_Patches, squashed_pc ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); @@ -902,13 +898,13 @@ UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); + WCHAR squashed_uc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szUpgradeCode, squashed_uc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szUpgradeCode), debugstr_w(squashed_uc)); strcpyW(keypath, szInstaller_UpgradeCodes); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_uc ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); @@ -916,42 +912,54 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) { - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); + WCHAR squashed_uc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szUpgradeCode, squashed_uc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szUpgradeCode), debugstr_w(squashed_uc)); strcpyW(keypath, szInstaller_UserUpgradeCodes); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_uc ); if (create) return RegCreateKeyW(HKEY_CURRENT_USER, keypath, key); return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); } +UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) +{ + WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; + TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); + + strcpyW( keypath, szInstaller_UpgradeCodes ); + strcatW( keypath, squashed_code ); + return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); +} + UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) { - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); + WCHAR squashed_uc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szUpgradeCode, squashed_uc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szUpgradeCode), debugstr_w(squashed_uc)); strcpyW(keypath, szInstaller_UserUpgradeCodes); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_uc ); return RegDeleteTreeW(HKEY_CURRENT_USER, keypath); } UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; HKEY hkey; LONG r; - if (!squash_guid(szProductCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProductCode), debugstr_w(squished_pc)); + if (!squash_guid( szProductCode, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProductCode), debugstr_w(squashed_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesProducts, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, squished_pc); + r = RegDeleteTreeW( hkey, squashed_pc ); RegCloseKey(hkey); return r; } @@ -959,15 +967,15 @@ UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; HKEY hkey; LONG r; - if (!squash_guid(szProductCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szProductCode), debugstr_w(squished_pc)); + if (!squash_guid( szProductCode, squashed_pc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szProductCode), debugstr_w(squashed_pc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_LocalClassesFeatures, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, squished_pc); + r = RegDeleteTreeW( hkey, squashed_pc ); RegCloseKey(hkey); return r; } @@ -975,13 +983,13 @@ UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY *key, BOOL create) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE], keypath[0x200]; - - if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); + WCHAR squashed_uc[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( szUpgradeCode, squashed_uc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szUpgradeCode), debugstr_w(squashed_uc)); strcpyW(keypath, szInstaller_ClassesUpgradeCode); - strcatW(keypath, squished_pc); + strcatW( keypath, squashed_uc ); if (create) return RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, key, NULL); return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); @@ -990,15 +998,15 @@ UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_uc[SQUASHED_GUID_SIZE]; HKEY hkey; LONG r; - if (!squash_guid(szUpgradeCode, squished_pc)) return ERROR_FUNCTION_FAILED; - TRACE("%s squished %s\n", debugstr_w(szUpgradeCode), debugstr_w(squished_pc)); + if (!squash_guid( szUpgradeCode, squashed_uc )) return ERROR_FUNCTION_FAILED; + TRACE("%s squashed %s\n", debugstr_w(szUpgradeCode), debugstr_w(squashed_uc)); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szInstaller_ClassesUpgradeCodes, 0, access, &hkey)) return ERROR_SUCCESS; - r = RegDeleteTreeW(hkey, squished_pc); + r = RegDeleteTreeW( hkey, squashed_uc ); RegCloseKey(hkey); return r; } @@ -1008,7 +1016,8 @@ * * Decomposes an MSI descriptor into product, feature and component parts. * An MSI descriptor is a string of the form: - * [base 85 guid] [feature code] '>' [base 85 guid] + * [base 85 guid] [feature code] '>' [base 85 guid] or + * [base 85 guid] [feature code] '<' * * PARAMS * szDescriptor [I] the descriptor to decompose @@ -1025,21 +1034,21 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct, LPWSTR szFeature, LPWSTR szComponent, LPDWORD pUsed ) { - UINT r, len; - LPWSTR p; + UINT len; + const WCHAR *p; GUID product, component; TRACE("%s %p %p %p %p\n", debugstr_w(szDescriptor), szProduct, szFeature, szComponent, pUsed); - r = decode_base85_guid( szDescriptor, &product ); - if( !r ) + if (!decode_base85_guid( szDescriptor, &product )) return ERROR_INVALID_PARAMETER; TRACE("product %s\n", debugstr_guid( &product )); - p = strchrW(&szDescriptor[20],'>'); - if( !p ) + if (!(p = strchrW( &szDescriptor[20], '>' ))) + p = strchrW( &szDescriptor[20], '<' ); + if (!p) return ERROR_INVALID_PARAMETER; len = (p - &szDescriptor[20]); @@ -1048,22 +1057,30 @@ TRACE("feature %s\n", debugstr_wn( &szDescriptor[20], len )); - r = decode_base85_guid( p+1, &component ); - if( !r ) - return ERROR_INVALID_PARAMETER; - - TRACE("component %s\n", debugstr_guid( &component )); + if (*p == '>') + { + if (!decode_base85_guid( p+1, &component )) + return ERROR_INVALID_PARAMETER; + TRACE( "component %s\n", debugstr_guid(&component) ); + } if (szProduct) StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 ); if (szComponent) - StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); + { + if (*p == '>') + StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); + else + szComponent[0] = 0; + } if (szFeature) { memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) ); szFeature[len] = 0; } - len = ( &p[21] - szDescriptor ); + + len = p - szDescriptor + 1; + if (*p == '>') len += 20; TRACE("length = %d\n", len); if (pUsed) *pUsed = len; @@ -1251,7 +1268,7 @@ 'I','n','s','t','a','l','l','e','r','\\','U','s','e','r','D','a','t','a','\\', 'S','-','1','-','5','-','1','8','\\','C','o','m','p','o','n','e','n','t','s',0}; UINT r = ERROR_SUCCESS; - WCHAR component[GUID_SIZE]; + WCHAR component[SQUASHED_GUID_SIZE]; DWORD i = 0, len_component; REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; HKEY key_components; @@ -1300,7 +1317,7 @@ 'I','n','s','t','a','l','l','e','r','\\','U','s','e','r','D','a','t','a',0}; static const WCHAR componentsW[] = {'\\','C','o','m','p','o','n','e','n','t','s',0}; UINT r = ERROR_SUCCESS; - WCHAR path[MAX_PATH], component[GUID_SIZE], user[128]; + WCHAR path[MAX_PATH], component[SQUASHED_GUID_SIZE], user[128]; DWORD i = 0, j = 0, len_component, len_user; REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; HKEY key_users, key_components; @@ -1461,7 +1478,7 @@ { HKEY hkeyComp = 0; DWORD r, sz; - WCHAR szValName[SQUISH_GUID_SIZE]; + WCHAR szValName[SQUASHED_GUID_SIZE]; TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct); @@ -1473,7 +1490,7 @@ return ERROR_UNKNOWN_COMPONENT; /* see if there are any products at all */ - sz = SQUISH_GUID_SIZE; + sz = SQUASHED_GUID_SIZE; r = RegEnumValueW(hkeyComp, 0, szValName, &sz, NULL, NULL, NULL, NULL); if (r != ERROR_SUCCESS) { @@ -1485,7 +1502,7 @@ return ERROR_UNKNOWN_COMPONENT; } - sz = SQUISH_GUID_SIZE; + sz = SQUASHED_GUID_SIZE; r = RegEnumValueW(hkeyComp, index, szValName, &sz, NULL, NULL, NULL, NULL); if( r == ERROR_SUCCESS ) { @@ -1670,8 +1687,8 @@ { UINT r; HKEY hkey; - DWORD dwSize = SQUISH_GUID_SIZE; - WCHAR szKeyName[SQUISH_GUID_SIZE]; + WCHAR szKeyName[SQUASHED_GUID_SIZE]; + DWORD dwSize = sizeof(szKeyName)/sizeof(szKeyName[0]); TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf); @@ -2082,7 +2099,7 @@ LPWSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid) { - WCHAR squished_pc[GUID_SIZE]; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; DWORD idx = 0; UINT r; @@ -2093,7 +2110,7 @@ dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid, pcchTargetUserSid); - if (!szProductCode || !squash_guid(szProductCode, squished_pc)) + if (!szProductCode || !squash_guid( szProductCode, squashed_pc )) return ERROR_INVALID_PARAMETER; if (szUserSid && !strcmpW( szUserSid, szLocalSid )) @@ -2189,8 +2206,7 @@ UINT WINAPI MsiEnumPatchesW(LPCWSTR szProduct, DWORD iPatchIndex, LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, LPDWORD pcchTransformsBuf) { - WCHAR squished_pc[GUID_SIZE]; - LPWSTR transforms = NULL; + WCHAR *transforms = NULL, squashed_pc[SQUASHED_GUID_SIZE]; HKEY prod; DWORD idx = 0; UINT r; @@ -2198,7 +2214,7 @@ TRACE("(%s %d %p %p %p)\n", debugstr_w(szProduct), iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (!lpPatchBuf || !lpTransformsBuf || !pcchTransformsBuf) @@ -2279,7 +2295,7 @@ {'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0}; UINT r; - WCHAR product[GUID_SIZE]; + WCHAR product[SQUASHED_GUID_SIZE]; DWORD i = 0, len; REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; HKEY key; @@ -2340,7 +2356,7 @@ 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0}; UINT r; const WCHAR *subkey; - WCHAR path[MAX_PATH], product[GUID_SIZE], user[128]; + WCHAR path[MAX_PATH], product[SQUASHED_GUID_SIZE], user[128]; DWORD i = 0, j = 0, len_product, len_user; REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; HKEY key_users, key_products; Modified: trunk/reactos/dll/win32/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/source.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/source.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/source.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -191,27 +191,20 @@ LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel, LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt) { - WCHAR squished_pc[GUID_SIZE]; - WCHAR convert[11]; - LPWSTR value = NULL; - LPWSTR data = NULL; - LPWSTR ptr, ptr2; + static const WCHAR fmt[] = {'#','%','d',0}; + WCHAR squashed_pc[SQUASHED_GUID_SIZE], convert[11]; + WCHAR *value = NULL, *data = NULL, *ptr, *ptr2; HKEY source, media; - DWORD valuesz, datasz = 0; - DWORD type; - DWORD numvals, size; + DWORD valuesz, datasz = 0, type, numvals, size; LONG res; UINT r; static DWORD index = 0; - static const WCHAR fmt[] = {'#','%','d',0}; - TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p)\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel, pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt); - if (!szProductCodeOrPatchCode || - !squash_guid(szProductCodeOrPatchCode, squished_pc)) + if (!szProductCodeOrPatchCode || !squash_guid( szProductCodeOrPatchCode, squashed_pc )) return ERROR_INVALID_PARAMETER; if (dwContext == MSIINSTALLCONTEXT_MACHINE && szUserSid) @@ -229,8 +222,7 @@ if (dwIndex != index) return ERROR_INVALID_PARAMETER; - r = OpenSourceKey(szProductCodeOrPatchCode, &source, - dwOptions, dwContext, FALSE); + r = OpenSourceKey(szProductCodeOrPatchCode, &source, dwOptions, dwContext, FALSE); if (r != ERROR_SUCCESS) return r; @@ -403,23 +395,20 @@ DWORD dwOptions, DWORD dwIndex, LPWSTR szSource, LPDWORD pcchSource) { - WCHAR squished_pc[GUID_SIZE]; - WCHAR name[32]; - HKEY source = NULL; - HKEY subkey = NULL; + static const WCHAR format[] = {'%','d',0}; + WCHAR squashed_pc[SQUASHED_GUID_SIZE], name[32]; + HKEY source = NULL, subkey = NULL; LONG res; UINT r = ERROR_INVALID_PARAMETER; static DWORD index = 0; - static const WCHAR format[] = {'%','d',0}; - TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_w(szProductCodeOrPatch), debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource); if (dwIndex == 0) index = 0; - if (!szProductCodeOrPatch || !squash_guid(szProductCodeOrPatch, squished_pc)) + if (!szProductCodeOrPatch || !squash_guid( szProductCodeOrPatch, squashed_pc )) goto done; if (szSource && !pcchSource) @@ -437,8 +426,7 @@ if (dwIndex != index) goto done; - r = OpenSourceKey(szProductCodeOrPatch, &source, - dwOptions, dwContext, FALSE); + r = OpenSourceKey( szProductCodeOrPatch, &source, dwOptions, dwContext, FALSE ); if (r != ERROR_SUCCESS) goto done; @@ -534,18 +522,15 @@ LPCWSTR szProperty, LPWSTR szValue, LPDWORD pcchValue) { - WCHAR squished_pc[GUID_SIZE]; + static const WCHAR mediapack[] = {'M','e','d','i','a','P','a','c','k','a','g','e',0}; + WCHAR *source, *ptr, squashed_pc[SQUASHED_GUID_SIZE]; HKEY sourcekey, media; - LPWSTR source, ptr; DWORD size; UINT rc; - static const WCHAR mediapack[] = { - 'M','e','d','i','a','P','a','c','k','a','g','e',0}; - TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szProperty)); - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (szValue && !pcchValue) @@ -761,19 +746,16 @@ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szProperty, LPCWSTR szValue) { - WCHAR squished_pc[GUID_SIZE]; + static const WCHAR media_package[] = {'M','e','d','i','a','P','a','c','k','a','g','e',0}; + WCHAR squashed_pc[SQUASHED_GUID_SIZE]; HKEY sourcekey, media; LPCWSTR property; UINT rc; - static const WCHAR media_package[] = { - 'M','e','d','i','a','P','a','c','k','a','g','e',0 - }; - TRACE("%s %s %x %x %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, debugstr_w(szProperty), debugstr_w(szValue)); - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (!szProperty) @@ -845,12 +827,9 @@ UINT WINAPI MsiSourceListAddSourceW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD dwReserved, LPCWSTR szSource) { - WCHAR squished_pc[GUID_SIZE]; + WCHAR *sidstr = NULL, squashed_pc[SQUASHED_GUID_SIZE]; INT ret; - LPWSTR sidstr = NULL; - DWORD sidsize = 0; - DWORD domsize = 0; - DWORD context; + DWORD sidsize = 0, domsize = 0, context; HKEY hkey = 0; UINT r; @@ -862,7 +841,7 @@ if (dwReserved != 0) return ERROR_INVALID_PARAMETER; - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (!szUserName || !*szUserName) @@ -1056,24 +1035,19 @@ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szSource, DWORD dwIndex) { - HKEY sourcekey; - HKEY typekey; + static const WCHAR fmt[] = {'%','i',0}; + HKEY sourcekey, typekey; UINT rc; struct list sourcelist; media_info *info; - WCHAR squished_pc[GUID_SIZE]; - WCHAR name[10]; - LPWSTR source; + WCHAR *source, squashed_pc[SQUASHED_GUID_SIZE], name[10]; LPCWSTR postfix; - DWORD size, count; - DWORD index; - - static const WCHAR fmt[] = {'%','i',0}; + DWORD size, count, index; TRACE("%s %s %x %x %s %i\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, debugstr_w(szSource), dwIndex); - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (!szSource || !*szSource) @@ -1215,21 +1189,17 @@ MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwDiskId, LPCWSTR szVolumeLabel, LPCWSTR szDiskPrompt) { - HKEY sourcekey; - HKEY mediakey; + static const WCHAR fmt[] = {'%','i',0}; + HKEY sourcekey, mediakey; UINT rc; - WCHAR szIndex[10]; - WCHAR squished_pc[GUID_SIZE]; - LPWSTR buffer; + WCHAR *buffer, squashed_pc[SQUASHED_GUID_SIZE], szIndex[10]; DWORD size; - - static const WCHAR fmt[] = {'%','i',0}; TRACE("%s %s %x %x %i %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId, debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt)); - if (!szProduct || !squash_guid(szProduct, squished_pc)) + if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; if (dwOptions != MSICODE_PRODUCT && dwOptions != MSICODE_PATCH) Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -2721,7 +2721,7 @@ IEnumSTATSTG *stgenum = NULL; TRANSFORMDATA *transform; TRANSFORMDATA *tables = NULL, *columns = NULL; - HRESULT r; + HRESULT hr; STATSTG stat; string_table *strings; UINT ret = ERROR_FUNCTION_FAILED; @@ -2734,8 +2734,8 @@ if( !strings ) goto end; - r = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); - if( FAILED( r ) ) + hr = IStorage_EnumElements( stg, 0, NULL, 0, &stgenum ); + if (FAILED( hr )) goto end; list_init(&transforms); @@ -2746,8 +2746,8 @@ WCHAR name[0x40]; ULONG count = 0; - r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); - if ( FAILED( r ) || !count ) + hr = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); + if (FAILED( hr ) || !count) break; decode_streamname( stat.pwcsName, name ); @@ -2777,12 +2777,10 @@ TRACE("transform contains stream %s\n", debugstr_w(name)); /* load the table */ - r = TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ); - if( r != ERROR_SUCCESS ) + if (TABLE_CreateView( db, transform->name, (MSIVIEW**) &tv ) != ERROR_SUCCESS) continue; - r = tv->view.ops->execute( &tv->view, NULL ); - if( r != ERROR_SUCCESS ) + if (tv->view.ops->execute( &tv->view, NULL ) != ERROR_SUCCESS) { tv->view.ops->delete( &tv->view ); continue; Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/upgrade.c [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -92,10 +92,8 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; - WCHAR product[GUID_SIZE]; - DWORD index = 0; - DWORD attributes = 0; - DWORD sz = GUID_SIZE; + WCHAR product[SQUASHED_GUID_SIZE]; + DWORD index = 0, attributes = 0, sz = sizeof(product)/sizeof(product[0]); LPCWSTR upgrade_code; HKEY hkey = 0; UINT rc = ERROR_SUCCESS; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 22 12:25:27 2016 @@ -112,7 +112,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-1.9.16 +reactos/dll/win32/msi # Synced to WineStaging-1.9.23 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msimtf # Synced to WineStaging-1.9.23 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11

8 years, 1 month

[akhaldi] 73338: [COMDLG32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 22 12:17:19 2016 New Revision: 73338 URL: http://svn.reactos.org/svn/reactos?rev=73338&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/comdlg32/filedlg.c Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Tue Nov 22 12:17:19 2016 @@ -1234,6 +1234,46 @@ ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension); } +static void test_directory_filename(void) +{ + OPENFILENAMEA ofnA = {0}; + OPENFILENAMEW ofnW = {0}; + WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0', + 'A','l','l','\0','*','\0','\0'}; + char szInitialDir[MAX_PATH] = {0}; + WCHAR szInitialDirW[MAX_PATH] = {0}; + DWORD ret; + + GetWindowsDirectoryA(szInitialDir, MAX_PATH); + GetWindowsDirectoryW(szInitialDirW, MAX_PATH); + + szInitialDir[strlen(szInitialDir)] = '\\'; + szInitialDirW[lstrlenW(szInitialDirW)] = '\\'; + + ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofnA.lpstrFile = szInitialDir; + ofnA.nMaxFile = MAX_PATH; + ofnA.lpfnHook = test_null_wndproc; + ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnA.hInstance = GetModuleHandleA(NULL); + ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0"; + ofnA.lpstrDefExt = NULL; + ret = GetOpenFileNameA(&ofnA); + todo_wine ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + /* unicode tests */ + ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W; + ofnW.lpstrFile = szInitialDirW; + ofnW.nMaxFile = MAX_PATH; + ofnW.lpfnHook = test_null_wndproc; + ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofnW.hInstance = GetModuleHandleW(NULL); + ofnW.lpstrFilter = filterW; + ofnW.lpstrDefExt = NULL; + ret = GetOpenFileNameW(&ofnW); + todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1247,4 +1287,5 @@ if( resizesupported) test_resizable2(); test_extension(); test_null_filename(); -} + test_directory_filename(); +}

8 years, 1 month

[akhaldi] 73337: [COMDLG32] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 22 12:15:51 2016 New Revision: 73337 URL: http://svn.reactos.org/svn/reactos?rev=73337&view=rev Log: [COMDLG32] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/colordlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/colordlg.c [iso-8859-1] Tue Nov 22 12:15:51 2016 @@ -661,15 +661,11 @@ int r = GetRValue(cr); int g = GetGValue(cr); int b = GetBValue(cr); - char buffer[10]; infoPtr->updating = TRUE; - sprintf(buffer, "%d", r); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_R), buffer); - sprintf(buffer, "%d", g); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_G), buffer); - sprintf( buffer, "%d", b ); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_B), buffer); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_R, r, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_G, g, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_B, b, TRUE); infoPtr->updating = FALSE; } } @@ -681,15 +677,10 @@ { if (IsWindowVisible( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_GRAPH) )) /* if full size */ { - char buffer[10]; - infoPtr->updating = TRUE; - sprintf(buffer, "%d", infoPtr->h); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_H), buffer); - sprintf(buffer, "%d", infoPtr->s); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_S), buffer); - sprintf(buffer, "%d", infoPtr->l); - SetWindowTextA( GetDlgItem(infoPtr->hwndSelf, IDC_COLOR_EDIT_L), buffer); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_H, infoPtr->h, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_S, infoPtr->s, TRUE); + SetDlgItemInt(infoPtr->hwndSelf, IDC_COLOR_EDIT_L, infoPtr->l, TRUE); infoPtr->updating = FALSE; } CC_PaintLumBar(infoPtr); Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff [iso-8859-1] Tue Nov 22 12:15:51 2016 @@ -1,7 +1,7 @@ diff -pudN e:\wine\dlls\comdlg32/cdlg32.c e:\reactos\dll\win32\comdlg32/cdlg32.c ---- e:\wine\dlls\comdlg32/cdlg32.c 2015-02-21 17:13:08.621542200 +0100 -+++ e:\reactos\dll\win32\comdlg32/cdlg32.c 2015-07-21 09:48:05.584922500 +0100 -@@ -174,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void) +--- e:\wine\dlls\comdlg32/cdlg32.c 2016-11-16 17:28:42 +0100 ++++ e:\reactos\dll\win32\comdlg32/cdlg32.c 2015-08-27 22:02:19 +0100 +@@ -157,6 +157,8 @@ DWORD WINAPI CommDlgExtendedError(void) return 0; /* we never set an error, so there isn't one */ } @@ -10,7 +10,7 @@ /************************************************************************* * Implement the CommDlg32 class factory * -@@ -283,7 +268,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSI +@@ -266,7 +268,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSI */ HRESULT WINAPI DllRegisterServer(void) { @@ -22,7 +22,7 @@ } /*********************************************************************** -@@ -291,5 +280,11 @@ HRESULT WINAPI DllRegisterServer(void) +@@ -274,5 +280,11 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { @@ -34,27 +34,10 @@ } + +#endif /* Win 7 */ - -diff -pudN e:\wine\dlls\comdlg32/comdlg32.spec e:\reactos\dll\win32\comdlg32/comdlg32.spec ---- e:\wine\dlls\comdlg32/comdlg32.spec 2015-02-21 17:13:08.621542200 +0100 -+++ e:\reactos\dll\win32\comdlg32/comdlg32.spec 2012-02-15 22:32:22.456422900 +0100 -@@ -3,9 +3,9 @@ - @ stdcall ChooseFontA(ptr) - @ stdcall ChooseFontW(ptr) - @ stdcall CommDlgExtendedError() --@ stdcall -private DllGetClassObject(ptr ptr ptr) --@ stdcall -private DllRegisterServer() --@ stdcall -private DllUnregisterServer() -+;@ stdcall -private DllGetClassObject(ptr ptr ptr) ; Win 7 -+;@ stdcall -private DllRegisterServer() ; Win 7 -+;@ stdcall -private DllUnregisterServer() ; Win 7 - @ stdcall FindTextA(ptr) - @ stdcall FindTextW(ptr) - @ stdcall GetFileTitleA(str ptr long) diff -pudN e:\wine\dlls\comdlg32/itemdlg.c e:\reactos\dll\win32\comdlg32/itemdlg.c ---- e:\wine\dlls\comdlg32/itemdlg.c 2015-04-05 20:44:56.807083800 +0100 -+++ e:\reactos\dll\win32\comdlg32/itemdlg.c 2015-07-21 09:56:34.329021000 +0100 -@@ -18,10 +18,13 @@ +--- e:\wine\dlls\comdlg32/itemdlg.c 2016-08-14 19:11:13 +0100 ++++ e:\reactos\dll\win32\comdlg32/itemdlg.c 2016-08-15 16:16:18 +0100 +@@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ @@ -63,12 +46,7 @@ #include <stdarg.h> #define COBJMACROS - #define NONAMELESSUNION -+#define NONAMELESSSTRUCT - - #include "windef.h" - #include "winbase.h" -@@ -3847,3 +3850,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn +@@ -4659,3 +4661,5 @@ HRESULT FileSaveDialog_Constructor(IUnkn { return FileDialog_constructor(pUnkOuter, riid, ppv, ITEMDLG_TYPE_SAVE); } Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Tue Nov 22 12:15:51 2016 @@ -1550,10 +1550,16 @@ result = GetFullPathNameW(fodInfos->filename, MAX_PATH, tmpBuf, &nameBit); if (result) { - /* nameBit is always shorter than the original filename */ - lstrcpyW(fodInfos->filename,nameBit); - - *nameBit = 0x00; + /* nameBit is always shorter than the original filename. It may be NULL + * when the filename contains only a drive name instead of file name */ + if (nameBit) + { + lstrcpyW(fodInfos->filename,nameBit); + *nameBit = 0x00; + } + else + *fodInfos->filename = '\0'; + MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR)); lstrcpyW(fodInfos->initdir, tmpBuf); @@ -2526,6 +2532,7 @@ && fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); + SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_SETTEXT, 0, (LPARAM)""); } } else if( nOpenAction == ONOPEN_SEARCH ) @@ -2536,6 +2543,13 @@ COMDLG32_SHFree(pidlCurrent); if (filename_is_edit( fodInfos )) SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); + else + { + HWND hwnd; + + hwnd = (HWND)SendMessageA(fodInfos->DlgInfos.hwndFileName, CBEM_GETEDITCONTROL, 0, 0); + SendMessageW(hwnd, EM_SETSEL, 0, -1); + } } } ret = FALSE; Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c [iso-8859-1] Tue Nov 22 12:15:51 2016 @@ -517,7 +517,6 @@ static void CFn_FitFontSize( HWND hDlg, int points) { - WCHAR buffW[16]; int i,n; /* look for fitting font size in combobox3 */ @@ -536,8 +535,7 @@ } /* no default matching size, set text manually */ - sprintfW(buffW, fontsizefmtW, points); - SetDlgItemTextW(hDlg, cmb3, buffW); + SetDlgItemInt(hDlg, cmb3, points, TRUE); } static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle ) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 22 12:15:51 2016 @@ -55,7 +55,7 @@ reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.23 -reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.16 +reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.23 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 reactos/dll/win32/credui # Synced to WineStaging-1.9.16 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.16

8 years, 1 month

[akhaldi] 73336: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 22 12:11:38 2016 New Revision: 73336 URL: http://svn.reactos.org/svn/reactos?rev=73336&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/status.c trunk/rostests/winetests/comctl32/syslink.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/treeview.c Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… ============================================================================== --- trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] Tue Nov 22 12:11:38 2016 @@ -5785,6 +5785,7 @@ HWND hwnd, fg; RECT rect; INT r; + POINT orig_pos; hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); @@ -5811,6 +5812,7 @@ ok(r == 0, "should not fail\n"); GetWindowRect(hwnd, &rect); + GetCursorPos(&orig_pos); SetCursorPos(rect.left+5, rect.top+5); flush_events(); r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0); @@ -5830,6 +5832,7 @@ expect(1, r); DestroyWindow(hwnd); + SetCursorPos(orig_pos.x, orig_pos.y); } static void test_callback_mask(void) Modified: trunk/rostests/winetests/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/status… ============================================================================== --- trunk/rostests/winetests/comctl32/status.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/status.c [iso-8859-1] Tue Nov 22 12:11:38 2016 @@ -291,7 +291,7 @@ expect(5,LOWORD(r)); expect(SBT_POPOUT,HIWORD(r)); r = SendMessageW(hWndStatus, WM_GETTEXTLENGTH, 0, 0); - ok(r == 5 || broken(0x02000005 /* NT4 */), "Expected 5, got %d\n", r); + ok(r == 5, "Expected 5, got %d\n", r); r = SendMessageA(hWndStatus, SB_GETTEXTLENGTHA, 1, 0); expect(0,LOWORD(r)); expect(SBT_OWNERDRAW,HIWORD(r)); Modified: trunk/rostests/winetests/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/syslin… ============================================================================== --- trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] Tue Nov 22 12:11:38 2016 @@ -195,6 +195,7 @@ BOOL rc; HWND hWndSysLink; LONG oldstyle; + POINT orig_pos; if (!load_v6_module(&ctx_cookie, &hCtx)) return; @@ -216,6 +217,10 @@ skip("Could not register ICC_LINK_CLASS\n"); return; } + + /* Move the cursor off the parent window */ + GetCursorPos(&orig_pos); + SetCursorPos(400, 400); init_msg_sequences(sequences, NUM_MSG_SEQUENCE); @@ -254,4 +259,5 @@ DestroyWindow(hWndSysLink); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx); -} + SetCursorPos(orig_pos.x, orig_pos.y); +} Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Tue Nov 22 12:11:38 2016 @@ -1235,11 +1235,8 @@ EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ - } else if (!(mask&1)) { \ + } else todo_wine_if(mask&1) \ check_rect("button = %d, tbsize_numtests = %d", rc, res->prcButtons[i], i, tbsize_numtests); \ - } else {\ - todo_wine { check_rect("button = %d, tbsize_numtests = %d", rc, res->prcButtons[i], i, tbsize_numtests); } \ - } \ mask >>= 1; \ } \ tbsize_numtests++; \ Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… ============================================================================== --- trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] Tue Nov 22 12:11:38 2016 @@ -156,6 +156,7 @@ DWORD iterationNumber; WNDCLASSA wc; LRESULT lResult; + POINT orig_pos; /* Create a class to use the custom draw wndproc */ wc.style = CS_HREDRAW | CS_VREDRAW; @@ -170,6 +171,8 @@ wc.lpfnWndProc = custom_draw_wnd_proc; RegisterClassA(&wc); + GetCursorPos(&orig_pos); + for (iterationNumber = 0; iterationNumber < sizeof(expectedResults)/sizeof(expectedResults[0]); iterationNumber++) { @@ -242,7 +245,7 @@ DestroyWindow(parent); } - + SetCursorPos(orig_pos.x, orig_pos.y); } static const CHAR testcallbackA[] = "callback"; Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… ============================================================================== --- trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] Tue Nov 22 12:11:38 2016 @@ -2369,6 +2369,30 @@ DestroyWindow(hwnd); } +static void test_TVS_FULLROWSELECT(void) +{ + DWORD style; + HWND hwnd; + + /* try to create both with TVS_HASLINES and TVS_FULLROWSELECT */ + hwnd = create_treeview_control(TVS_FULLROWSELECT); + + style = GetWindowLongA(hwnd, GWL_STYLE); + ok((style & (TVS_FULLROWSELECT | TVS_HASLINES)) == (TVS_FULLROWSELECT | TVS_HASLINES), "got style 0x%08x\n", style); + + DestroyWindow(hwnd); + + /* create just with TVS_HASLINES, try to enable TVS_FULLROWSELECT later */ + hwnd = create_treeview_control(0); + + style = GetWindowLongA(hwnd, GWL_STYLE); + SetWindowLongA(hwnd, GWL_STYLE, style | TVS_FULLROWSELECT); + style = GetWindowLongA(hwnd, GWL_STYLE); + ok(style & TVS_FULLROWSELECT, "got style 0x%08x\n", style); + + DestroyWindow(hwnd); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -2444,6 +2468,7 @@ test_WM_GETDLGCODE(); test_customdraw(); test_WM_KEYDOWN(); + test_TVS_FULLROWSELECT(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

8 years, 1 month

[akhaldi] 73335: [COMCTL32] Sync with Wine Staging 1.9.23. CORE-12409

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 22 12:10:28 2016 New Revision: 73335 URL: http://svn.reactos.org/svn/reactos?rev=73335&view=rev Log: [COMCTL32] Sync with Wine Staging 1.9.23. CORE-12409 Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/hotkey.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Tue Nov 22 12:10:28 2016 @@ -1,5 +1,5 @@ diff -pudN e:\wine\dlls\comctl32/comctl32.h e:\reactos\dll\win32\comctl32/comctl32.h ---- e:\wine\dlls\comctl32/comctl32.h 2016-08-14 19:11:25 +0100 +--- e:\wine\dlls\comctl32/comctl32.h 2016-11-16 17:28:41 +0100 +++ e:\reactos\dll\win32\comctl32/comctl32.h 2014-03-05 11:47:40 +0100 @@ -53,67 +53,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; @@ -79,8 +79,8 @@ typedef struct _SUBCLASSPROCS { SUBCLASSPROC subproc; diff -pudN e:\wine\dlls\comctl32/commctrl.c e:\reactos\dll\win32\comctl32/commctrl.c ---- e:\wine\dlls\comctl32/commctrl.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/commctrl.c 2016-03-01 20:00:53 +0100 +--- e:\wine\dlls\comctl32/commctrl.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/commctrl.c 2016-02-26 11:19:35 +0100 @@ -60,6 +60,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); @@ -333,8 +333,8 @@ + return TRUE; +} diff -pudN e:\wine\dlls\comctl32/imagelist.c e:\reactos\dll\win32\comctl32/imagelist.c ---- e:\wine\dlls\comctl32/imagelist.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/imagelist.c 2016-08-18 12:03:13 +0100 +--- e:\wine\dlls\comctl32/imagelist.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/imagelist.c 2016-08-15 16:07:59 +0100 @@ -33,7 +33,7 @@ * * TODO: @@ -504,8 +504,8 @@ Common subdirectories: e:\wine\dlls\comctl32/lang and e:\reactos\dll\win32\comctl32/lang diff -pudN e:\wine\dlls\comctl32/listview.c e:\reactos\dll\win32\comctl32/listview.c ---- e:\wine\dlls\comctl32/listview.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/listview.c 2016-08-18 12:03:13 +0100 +--- e:\wine\dlls\comctl32/listview.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/listview.c 2016-08-15 16:09:30 +0100 @@ -287,6 +287,9 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; @@ -623,8 +623,8 @@ /* case WM_TIMER: */ diff -pudN e:\wine\dlls\comctl32/monthcal.c e:\reactos\dll\win32\comctl32/monthcal.c ---- e:\wine\dlls\comctl32/monthcal.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/monthcal.c 2016-08-18 12:03:13 +0100 +--- e:\wine\dlls\comctl32/monthcal.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/monthcal.c 2016-08-17 13:29:31 +0100 @@ -43,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); @@ -636,8 +636,8 @@ #define MC_SEL_LBUTDOWN 2 /* Left button pressed in calendar */ #define MC_PREVPRESSED 4 /* Prev month button pressed */ diff -pudN e:\wine\dlls\comctl32/propsheet.c e:\reactos\dll\win32\comctl32/propsheet.c ---- e:\wine\dlls\comctl32/propsheet.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/propsheet.c 2016-08-18 12:03:14 +0100 +--- e:\wine\dlls\comctl32/propsheet.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/propsheet.c 2016-08-15 16:10:02 +0100 @@ -2355,12 +2355,19 @@ static void PROPSHEET_SetWizButtons(HWND HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); @@ -693,8 +693,8 @@ /****************************************************************************** diff -pudN e:\wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c ---- e:\wine\dlls\comctl32/rebar.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/rebar.c 2016-08-18 12:03:14 +0100 +--- e:\wine\dlls\comctl32/rebar.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/rebar.c 2016-08-15 16:11:05 +0100 @@ -50,7 +50,6 @@ * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN @@ -908,8 +908,8 @@ /* case WM_VKEYTOITEM: supported according to ControlSpy */ diff -pudN e:\wine\dlls\comctl32/toolbar.c e:\reactos\dll\win32\comctl32/toolbar.c ---- e:\wine\dlls\comctl32/toolbar.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/toolbar.c 2016-08-18 12:03:14 +0100 +--- e:\wine\dlls\comctl32/toolbar.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/toolbar.c 2016-08-15 16:13:17 +0100 @@ -33,11 +33,9 @@ * - TBSTYLE_REGISTERDROP * - TBSTYLE_EX_DOUBLEBUFFER @@ -1301,8 +1301,8 @@ /* case WM_WININICHANGE: */ diff -pudN e:\wine\dlls\comctl32/tooltips.c e:\reactos\dll\win32\comctl32/tooltips.c ---- e:\wine\dlls\comctl32/tooltips.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/tooltips.c 2016-08-18 12:03:14 +0100 +--- e:\wine\dlls\comctl32/tooltips.c 2016-11-16 17:28:41 +0100 ++++ e:\reactos\dll\win32\comctl32/tooltips.c 2016-08-15 16:13:43 +0100 @@ -2009,7 +2009,36 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO static LRESULT TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) @@ -1341,9 +1341,9 @@ return 0; } diff -pudN e:\wine\dlls\comctl32/treeview.c e:\reactos\dll\win32\comctl32/treeview.c ---- e:\wine\dlls\comctl32/treeview.c 2016-08-14 19:11:25 +0100 -+++ e:\reactos\dll\win32\comctl32/treeview.c 2016-08-18 12:03:14 +0100 -@@ -2888,7 +2888,14 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, +--- e:\wine\dlls\comctl32/treeview.c 2016-11-16 17:28:42 +0100 ++++ e:\reactos\dll\win32\comctl32/treeview.c 2016-11-16 18:29:47 +0100 +@@ -2909,7 +2909,14 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, } } Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Tue Nov 22 12:10:28 2016 @@ -312,6 +312,48 @@ } } +/* Create a region for the sort arrow with its bounding rect's top-left + co-ord x,y and its height h. */ +static HRGN create_sort_arrow( INT x, INT y, INT h, BOOL is_up ) +{ + char buffer[256]; + RGNDATA *data = (RGNDATA *)buffer; + DWORD size = FIELD_OFFSET(RGNDATA, Buffer[h * sizeof(RECT)]); + INT i, yinc = 1; + HRGN rgn; + + if (size > sizeof(buffer)) + { + data = HeapAlloc( GetProcessHeap(), 0, size ); + if (!data) return NULL; + } + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = 0; + data->rdh.nRgnSize = h * sizeof(RECT); + + if (!is_up) + { + y += h - 1; + yinc = -1; + } + + x += h - 1; /* set x to the centre */ + + for (i = 0; i < h; i++, y += yinc) + { + RECT *rect = (RECT *)data->Buffer + data->rdh.nCount; + rect->left = x - i; + rect->top = y; + rect->right = x + i + 1; + rect->bottom = y + 1; + data->rdh.nCount++; + } + rgn = ExtCreateRegion( NULL, size, data ); + if (data != (RGNDATA *)buffer) HeapFree( GetProcessHeap(), 0, data ); + return rgn; +} + static INT HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESULT lCDFlags) { @@ -392,16 +434,18 @@ /* Now text and image */ { - UINT rw, rh, /* width and height of r */ - *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ + INT rw, rh; /* width and height of r */ + INT *x = NULL; /* x and ... */ + UINT *w = NULL; /* ... width of the pic (bmp or img) which is part of cnt */ /* cnt,txt,img,bmp */ - UINT cx, tx, ix, bx, - cw, tw, iw, bw; + INT cx, tx, ix, bx; + UINT cw, tw, iw, bw; INT img_cx, img_cy; + INT sort_w, sort_x, sort_h; BITMAP bmp; HEADER_PrepareCallbackItems(infoPtr, iItem, HDI_TEXT|HDI_IMAGE); - cw = iw = bw = 0; + cw = iw = bw = sort_w = sort_h = 0; rw = r.right - r.left; rh = r.bottom - r.top; @@ -420,23 +464,28 @@ cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; } - if ((phdi->fmt & HDF_IMAGE) && ImageList_GetIconSize( infoPtr->himl, &img_cx, &img_cy )) { - iw = img_cx + 2 * infoPtr->iMargin; - x = &ix; - w = &iw; - } - - if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { - GetObjectW (phdi->hbm, sizeof(BITMAP), &bmp); - bw = bmp.bmWidth + 2 * infoPtr->iMargin; - if (!iw) { - x = &bx; - w = &bw; - } - } - - if (bw || iw) - cw += *w; + if (phdi->fmt & (HDF_SORTUP | HDF_SORTDOWN)) { + sort_h = MulDiv( infoPtr->nHeight - VERT_BORDER, 4, 13 ); + sort_w = 2 * sort_h - 1 + infoPtr->iMargin * 2; + cw += sort_w; + } else { /* sort arrows take precedent over images/bitmaps */ + if ((phdi->fmt & HDF_IMAGE) && ImageList_GetIconSize( infoPtr->himl, &img_cx, &img_cy )) { + iw = img_cx + 2 * infoPtr->iMargin; + x = &ix; + w = &iw; + } + + if ((phdi->fmt & HDF_BITMAP) && (phdi->hbm)) { + GetObjectW (phdi->hbm, sizeof(BITMAP), &bmp); + bw = bmp.bmWidth + 2 * infoPtr->iMargin; + if (!iw) { + x = &bx; + w = &bw; + } + } + if (bw || iw) + cw += *w; + } /* align cx using the unclipped cw */ if ((phdi->fmt & HDF_JUSTIFYMASK) == HDF_LEFT) @@ -455,7 +504,10 @@ tx = cx + infoPtr->iMargin; /* since cw might have changed we have to recalculate tw */ tw = cw - infoPtr->iMargin * 2; - + + tw -= sort_w; + sort_x = cx + tw + infoPtr->iMargin * 3; + if (iw || bw) { tw -= *w; if (phdi->fmt & HDF_BITMAP_ON_RIGHT) { @@ -479,22 +531,31 @@ bx = cx + cw + infoPtr->iMargin; } - if (iw || bw) { + if (sort_w || iw || bw) { HDC hClipDC = GetDC(infoPtr->hwndSelf); HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom); SelectClipRgn(hClipDC, hClipRgn); + if (sort_w) { + HRGN arrow = create_sort_arrow( sort_x, r.top + (rh - sort_h) / 2, + sort_h, phdi->fmt & HDF_SORTUP ); + if (arrow) { + FillRgn( hClipDC, arrow, GetSysColorBrush( COLOR_GRAYTEXT ) ); + DeleteObject( arrow ); + } + } + if (bw) { HDC hdcBitmap = CreateCompatibleDC (hClipDC); SelectObject (hdcBitmap, phdi->hbm); - BitBlt (hClipDC, bx, r.top + ((INT)rh - bmp.bmHeight) / 2, + BitBlt (hClipDC, bx, r.top + (rh - bmp.bmHeight) / 2, bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); DeleteDC (hdcBitmap); } if (iw) { ImageList_DrawEx (infoPtr->himl, phdi->iImage, hClipDC, - ix, r.top + ((INT)rh - img_cy) / 2, + ix, r.top + (rh - img_cy) / 2, img_cx, img_cy, CLR_DEFAULT, CLR_DEFAULT, 0); } Modified: trunk/reactos/dll/win32/comctl32/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/hotkey.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/hotkey.c [iso-8859-1] Tue Nov 22 12:10:28 2016 @@ -131,7 +131,7 @@ TRACE("(infoPtr=%p hdc=%p)\n", infoPtr, hdc); if(!infoPtr->CurrMod && !infoPtr->HotKey) { - HOTKEY_DrawHotKey (infoPtr, hdc, infoPtr->strNone, 4); + HOTKEY_DrawHotKey (infoPtr, hdc, infoPtr->strNone, lstrlenW(infoPtr->strNone)); return; } Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Tue Nov 22 12:10:28 2016 @@ -31,7 +31,7 @@ * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, * TVN_SETDISPINFO * - * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, + * missing styles: TVS_INFOTIP, TVS_RTLREADING, * * missing item styles: TVIS_EXPANDPARTIAL, TVIS_EX_FLAT, * TVIS_EX_DISABLED @@ -332,6 +332,20 @@ return FALSE; } +static BOOL +TREEVIEW_IsFullRowSelect(const TREEVIEW_INFO *infoPtr) +{ + return !(infoPtr->dwStyle & TVS_HASLINES) && (infoPtr->dwStyle & TVS_FULLROWSELECT); +} + +static BOOL +TREEVIEW_IsItemHit(const TREEVIEW_INFO *infoPtr, const TVHITTESTINFO *ht) +{ + if (TREEVIEW_IsFullRowSelect(infoPtr)) + return ht->flags & (TVHT_ONITEMINDENT | TVHT_ONITEMBUTTON | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + return ht->flags & TVHT_ONITEM; +} /* Tree Traversal *******************************************************/ @@ -2542,6 +2556,13 @@ if (cditem & CDRF_NEWFONT) TREEVIEW_ComputeTextWidth(infoPtr, item, hdc); + if (TREEVIEW_IsFullRowSelect(infoPtr)) + { + HBRUSH brush = CreateSolidBrush(nmcdhdr.clrTextBk); + FillRect(hdc, &item->rect, brush); + DeleteObject(brush); + } + TREEVIEW_DrawItemLines(infoPtr, hdc, item); /* Set colors. Custom draw handler can change these so we do this after it. */ @@ -4169,9 +4190,9 @@ static LRESULT TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) { + BOOL do_track, do_select, bDoLabelEdit; HWND hwnd = infoPtr->hwnd; TVHITTESTINFO ht; - BOOL bTrack, bDoLabelEdit; /* If Edit control is active - kill it and return. * The best way to do it is to set focus to itself. @@ -4191,15 +4212,32 @@ TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem)); /* update focusedItem and redraw both items */ - if(ht.hItem && (ht.flags & TVHT_ONITEM)) - { - infoPtr->focusedItem = ht.hItem; - TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); - TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); - } - - bTrack = (ht.flags & TVHT_ONITEM) - && !(infoPtr->dwStyle & TVS_DISABLEDRAGDROP); + if (ht.hItem) + { + BOOL do_focus; + + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_focus = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_focus = ht.flags & TVHT_ONITEM; + + if (do_focus) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } + } + + if (!(infoPtr->dwStyle & TVS_DISABLEDRAGDROP)) + { + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_track = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_track = ht.flags & TVHT_ONITEM; + } + else + do_track = FALSE; /* * If the style allows editing and the node is already selected @@ -4209,16 +4247,15 @@ (ht.flags & TVHT_ONITEMLABEL) && (infoPtr->selectedItem == ht.hItem); /* Send NM_CLICK right away */ - if (!bTrack) - if (TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) - goto setfocus; + if (!do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + goto setfocus; if (ht.flags & TVHT_ONITEMBUTTON) { TREEVIEW_Toggle(infoPtr, ht.hItem, TRUE); goto setfocus; } - else if (bTrack) + else if (do_track) { /* if TREEVIEW_TrackMouse == 1 dragging occurred and the cursor left the dragged item's rectangle */ if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4240,8 +4277,13 @@ } } - if (bTrack && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + if (do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) goto setfocus; + + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_select = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMRIGHT); + else + do_select = ht.flags & (TVHT_ONITEMICON | TVHT_ONITEMLABEL); if (bDoLabelEdit) { @@ -4251,7 +4293,7 @@ SetTimer(hwnd, TV_EDIT_TIMER, GetDoubleClickTime(), 0); infoPtr->Timer |= TV_EDIT_TIMER_SET; } - else if (ht.flags & (TVHT_ONITEMICON|TVHT_ONITEMLABEL)) /* select the item if the hit was inside of the icon or text */ + else if (do_select) { TREEVIEW_ITEM *selection = infoPtr->selectedItem; @@ -4392,7 +4434,7 @@ assert(newSelect == NULL || TREEVIEW_ValidItem(infoPtr, newSelect)); - TRACE("Entering item %p (%s), flag 0x%x, cause 0x%x, state %d\n", + TRACE("Entering item %p (%s), flag 0x%x, cause 0x%x, state 0x%x\n", newSelect, TREEVIEW_ItemName(newSelect), action, cause, newSelect ? newSelect->state : 0); @@ -4467,7 +4509,7 @@ break; } - TRACE("Leaving state %d\n", newSelect ? newSelect->state : 0); + TRACE("Leaving state 0x%x\n", newSelect ? newSelect->state : 0); return TRUE; } @@ -5320,6 +5362,7 @@ TRACKMOUSEEVENT trackinfo; TREEVIEW_ITEM * item; TVHITTESTINFO ht; + BOOL item_hit; if (!(infoPtr->dwStyle & TVS_TRACKSELECT)) return 0; @@ -5348,12 +5391,13 @@ ht.pt.y = (short)HIWORD(lParam); item = TREEVIEW_HitTest(infoPtr, &ht); - if ((item != infoPtr->hotItem) || !(ht.flags & TVHT_ONITEM)) + item_hit = TREEVIEW_IsItemHit(infoPtr, &ht); + if ((item != infoPtr->hotItem) || !item_hit) { /* redraw old hot item */ TREEVIEW_InvalidateItem(infoPtr, infoPtr->hotItem); infoPtr->hotItem = NULL; - if (item && (ht.flags & TVHT_ONITEM)) + if (item && item_hit) { infoPtr->hotItem = item; /* redraw new hot item */ @@ -5518,7 +5562,7 @@ if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; - if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && (ht.flags & TVHT_ONITEM)) + if (item && (infoPtr->dwStyle & TVS_TRACKSELECT) && TREEVIEW_IsItemHit(infoPtr, &ht)) { SetCursor(infoPtr->hcurHand); return 0; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 22 12:10:28 2016 @@ -54,7 +54,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-1.9.23 reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 -reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.16 +reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.23 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.16 reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 reactos/dll/win32/credui # Synced to WineStaging-1.9.16

8 years, 1 month

[jimtabor] 73334: [Win32SS] - Patch by Katayama Hirofumi MZ : Improves NC_IconForWindow function. See CORE-12129.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 22 04:46:58 2016 New Revision: 73334 URL: http://svn.reactos.org/svn/reactos?rev=73334&view=rev Log: [Win32SS] - Patch by Katayama Hirofumi MZ : Improves NC_IconForWindow function. See CORE-12129. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Tue Nov 22 04:46:58 2016 @@ -613,11 +613,6 @@ PCURICON_OBJECT pIcon = NULL; HICON hIcon; - //FIXME: Some callers use this function as if it returns a boolean saying "this window has an icon". - //FIXME: Hence we must return a pointer with no reference count. - //FIXME: This is bad and we should feel bad. - //FIXME: Stop whining over wine code. - hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); @@ -636,11 +631,9 @@ } if (hIcon) { - pIcon = UserGetCurIconObject(hIcon); - if (pIcon) - { - UserDereferenceObject(pIcon); - } + pIcon = (PCURICON_OBJECT)UserGetObjectNoErr(gHandleTable, + hIcon, + TYPE_CURSOR); } return pIcon; }

8 years, 1 month

[jimtabor] 73333: [User32] - Fix dialog pop up crash due to loop. - Sync/Port from wine head, not sure about Staging.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 22 03:57:48 2016 New Revision: 73333 URL: http://svn.reactos.org/svn/reactos?rev=73333&view=rev Log: [User32] - Fix dialog pop up crash due to loop. - Sync/Port from wine head, not sure about Staging. Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Tue Nov 22 03:57:48 2016 @@ -847,10 +847,7 @@ /* Create dialog main window */ - rect.left = rect.top = 0; - rect.right = MulDiv(template.cx, xBaseUnit, 4); - rect.bottom = MulDiv(template.cy, yBaseUnit, 8); - + SetRect(&rect, 0, 0, MulDiv(template.cx, xBaseUnit, 4), MulDiv(template.cy, yBaseUnit, 8)); if (template.style & DS_CONTROL) template.style &= ~(WS_CAPTION|WS_SYSMENU); template.style |= DS_3DLOOK; @@ -926,24 +923,13 @@ * even if dialog has WS_CHILD, but only for modal dialogs, which matched what * Windows does. */ - + while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( owner ); + if (!parent || parent == GetDesktopWindow()) break; + owner = parent; + } ////// Wine'ie babies need to fix your code!!!! CORE-11633 - if ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) - { - parent = owner; - while ((GetWindowLongW( parent, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) - { - parent = GetParent( owner ); - if (!parent || parent == GetDesktopWindow()) - { - parent = NULL; - break; - } - } - } - else - parent = GetAncestor( owner, GA_ROOT ); - if (parent) { owner = parent; @@ -2488,6 +2474,9 @@ LPMSG lpMsg) { INT dlgCode = 0; + + if (!IsWindow( hDlg )) + return FALSE; if (CallMsgFilterW( lpMsg, MSGF_DIALOGBOX )) return TRUE;

8 years, 1 month

[jimtabor] 73332: [User32] - Patch by Katayama Hirofumi MZ : Improve task switcher's appearance. - Debugged Alt+Esc - Pixel perfect - Implemented "Display Item Shifting" - Added comments.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Nov 22 03:54:55 2016 New Revision: 73332 URL: http://svn.reactos.org/svn/reactos?rev=73332&view=rev Log: [User32] - Patch by Katayama Hirofumi MZ : Improve task switcher's appearance. - Debugged Alt+Esc - Pixel perfect - Implemented "Display Item Shifting" - Added comments. Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c Modified: trunk/reactos/win32ss/user/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/appswitch.c [iso-8859-1] Tue Nov 22 03:54:55 2016 @@ -5,12 +5,36 @@ * PURPOSE: app switching functionality * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) * David Quintana (gigaherz(a)gmail.com) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ + +// +// TODO: +// Move to Win32k. +// Add registry support. +// +// + #include <user32.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + +#define DIALOG_MARGIN 8 // margin of dialog contents + +#define CX_ICON 32 // width of icon +#define CY_ICON 32 // height of icon +#define ICON_MARGIN 4 // margin width around an icon + +#define CX_ITEM (CX_ICON + 2 * ICON_MARGIN) +#define CY_ITEM (CY_ICON + 2 * ICON_MARGIN) +#define ITEM_MARGIN 4 // margin width around an item + +#define CX_ITEM_SPACE (CX_ITEM + 2 * ITEM_MARGIN) +#define CY_ITEM_SPACE (CY_ITEM + 2 * ITEM_MARGIN) + +#define CY_TEXT_MARGIN 4 // margin height around text // limit the number of windows shown in the alt-tab window // 120 windows results in (12*40) by (10*40) pixels worth of icons. @@ -35,28 +59,74 @@ int itemsW, itemsH; int totalW, totalH; int xOffset, yOffset; -POINT pt; +POINT ptStart; + +int nShift = 0; + +BOOL Esc = FALSE; + +BOOL CoolSwitch = TRUE; +int CoolSwitchRows = 3; +int CoolSwitchColumns = 7; + +// window style +const DWORD Style = WS_POPUP | WS_BORDER | WS_DISABLED; +const DWORD ExStyle = WS_EX_TOPMOST | WS_EX_DLGMODALFRAME | WS_EX_TOOLWINDOW; + +DWORD wtodw(const WCHAR *psz) +{ + const WCHAR *pch = psz; + DWORD Value = 0; + while ('0' <= *pch && *pch <= '9') + { + Value *= 10; + Value += *pch - L'0'; + } + return Value; +} + +BOOL LoadCoolSwitchSettings(void) +{ + CoolSwitch = TRUE; + CoolSwitchRows = 3; + CoolSwitchColumns = 7; + + // FIXME: load the settings from registry + + TRACE("CoolSwitch: %d\n", CoolSwitch); + TRACE("CoolSwitchRows: %d\n", CoolSwitchRows); + TRACE("CoolSwitchColumns: %d\n", CoolSwitchColumns); + + return TRUE; +} void ResizeAndCenter(HWND hwnd, int width, int height) { + int x, y; + RECT Rect; + int screenwidth = GetSystemMetrics(SM_CXSCREEN); int screenheight = GetSystemMetrics(SM_CYSCREEN); - pt.x = (screenwidth - width) / 2; - pt.y = (screenheight - height) / 2; - - MoveWindow(hwnd, pt.x, pt.y, width, height, FALSE); + x = (screenwidth - width) / 2; + y = (screenheight - height) / 2; + + SetRect(&Rect, x, y, x + width, y + height); + AdjustWindowRectEx(&Rect, Style, FALSE, ExStyle); + + x = Rect.left; + y = Rect.top; + width = Rect.right - Rect.left; + height = Rect.bottom - Rect.top; + MoveWindow(hwnd, x, y, width, height, FALSE); + + ptStart.x = x; + ptStart.y = y; } void MakeWindowActive(HWND hwnd) { - WINDOWPLACEMENT wpl; - - wpl.length = sizeof(WINDOWPLACEMENT); - GetWindowPlacement(hwnd, &wpl); - - TRACE("GetWindowPlacement wpl.showCmd %d\n",wpl.showCmd); - if (wpl.showCmd == SW_SHOWMINIMIZED) + if (IsIconic(hwnd)) ShowWindowAsync(hwnd, SW_RESTORE); BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ? @@ -139,7 +209,7 @@ // If we got to the max number of windows, // we won't be able to add any more - if(windowCount == MAX_WINDOWS) + if(windowCount >= MAX_WINDOWS) return FALSE; return TRUE; @@ -164,17 +234,14 @@ int xPos = LOWORD(lParam); int yPos = HIWORD(lParam); - int xIndex = (xPos - xOffset)/40; - int xOff = (xPos - xOffset)%40; - - int yIndex = (yPos - yOffset)/40; - int yOff = (yPos - yOffset)%40; - - if(xOff > 32 || xIndex > nItems) - return; - - if(yOff > 32 || yIndex > nRows) - return; + int xIndex = (xPos - DIALOG_MARGIN) / CX_ITEM_SPACE; + int yIndex = (yPos - DIALOG_MARGIN) / CY_ITEM_SPACE; + + if (xIndex < 0 || nCols <= xIndex || + yIndex < 0 || nRows <= yIndex) + { + return; + } selectedWindow = (yIndex*nCols) + xIndex; if (message == WM_MOUSEMOVE) @@ -191,63 +258,95 @@ void OnPaint(HWND hWnd) { - HDC dialogDC; - PAINTSTRUCT paint; - RECT cRC, textRC; - int i; - HBRUSH hBrush; - HPEN hPen; - HFONT dcFont; - COLORREF cr; - int nch = GetWindowTextW(windowList[selectedWindow], windowText, _countof(windowText)); - - dialogDC = BeginPaint(hWnd, &paint); - { - GetClientRect(hWnd, &cRC); - FillRect(dialogDC, &cRC, GetSysColorBrush(COLOR_MENU)); - - for(i=0; i< windowCount; i++) - { - HICON hIcon = iconList[i]; - - int xpos = xOffset + 40 * (i % nCols); - int ypos = yOffset + 40 * (i / nCols); - - if (selectedWindow == i) - { - hBrush = GetSysColorBrush(COLOR_HIGHLIGHT); - } - else - { - hBrush = GetSysColorBrush(COLOR_MENU); - } -#if TRUE - cr = GetSysColor(COLOR_BTNTEXT); // doesn't look right! >_< - hPen = CreatePen(PS_DOT, 1, cr); - SelectObject(dialogDC, hPen); - SelectObject(dialogDC, hBrush); - Rectangle(dialogDC, xpos-2, ypos-2, xpos+32+2, ypos+32+2); - DeleteObject(hPen); - // Must NOT destroy the system brush! -#else - RECT rc = { xpos-2, ypos-2, xpos+32+2, ypos+32+2 }; - FillRect(dialogDC, &rc, hBrush); -#endif - DrawIcon(dialogDC, xpos, ypos, hIcon); - } - - dcFont = SelectObject(dialogDC, dialogFont); - SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); - SetBkMode(dialogDC, TRANSPARENT); - - textRC.top = itemsH; - textRC.left = 8; - textRC.right = totalW - 8; - textRC.bottom = totalH - 8; - DrawTextW(dialogDC, windowText, nch, &textRC, DT_CENTER|DT_END_ELLIPSIS); - SelectObject(dialogDC, dcFont); - } - EndPaint(hWnd, &paint); + HDC dialogDC; + PAINTSTRUCT paint; + RECT cRC, textRC; + int i, xPos, yPos, CharCount; + HFONT dcFont; + HICON hIcon; + HPEN hPen; + COLORREF Color; + + // check + if (nCols == 0 || nItems == 0) + return; + + // begin painting + dialogDC = BeginPaint(hWnd, &paint); + if (dialogDC == NULL) + return; + + // fill the client area + GetClientRect(hWnd, &cRC); + FillRect(dialogDC, &cRC, (HBRUSH)(COLOR_3DFACE + 1)); + + // if the selection index exceeded the display items, then + // do display item shifting + if (selectedWindow >= nItems) + nShift = selectedWindow - nItems + 1; + else + nShift = 0; + + for (i = 0; i < nItems; ++i) + { + // get the icon to display + hIcon = iconList[i + nShift]; + + // calculate the position where we start drawing + xPos = DIALOG_MARGIN + CX_ITEM_SPACE * (i % nCols) + ITEM_MARGIN; + yPos = DIALOG_MARGIN + CY_ITEM_SPACE * (i / nCols) + ITEM_MARGIN; + + // centering + if (nItems < CoolSwitchColumns) + { + xPos += (itemsW - nItems * CX_ITEM_SPACE) / 2; + } + + // if this position is selected, + if (selectedWindow == i + nShift) + { + // create a solid pen + Color = GetSysColor(COLOR_HIGHLIGHT); + hPen = CreatePen(PS_SOLID, 1, Color); + + // draw a rectangle with using the pen + SelectObject(dialogDC, hPen); + SelectObject(dialogDC, GetStockObject(NULL_BRUSH)); + Rectangle(dialogDC, xPos, yPos, xPos + CX_ITEM, yPos + CY_ITEM); + Rectangle(dialogDC, xPos + 1, yPos + 1, + xPos + CX_ITEM - 1, yPos + CY_ITEM - 1); + + // delete the pen + DeleteObject(hPen); + } + + // draw icon + DrawIconEx(dialogDC, xPos + ICON_MARGIN, yPos + ICON_MARGIN, + hIcon, CX_ICON, CY_ICON, 0, NULL, DI_NORMAL); + } + + // set the text rectangle + SetRect(&textRC, DIALOG_MARGIN, DIALOG_MARGIN + itemsH, + totalW - DIALOG_MARGIN, totalH - DIALOG_MARGIN); + + // draw the sunken button around text + DrawFrameControl(dialogDC, &textRC, DFC_BUTTON, + DFCS_BUTTONPUSH | DFCS_PUSHED); + + // get text + CharCount = GetWindowTextW(windowList[selectedWindow], windowText, + _countof(windowText)); + + // draw text + dcFont = SelectObject(dialogDC, dialogFont); + SetTextColor(dialogDC, GetSysColor(COLOR_BTNTEXT)); + SetBkMode(dialogDC, TRANSPARENT); + DrawTextW(dialogDC, windowText, CharCount, &textRC, + DT_CENTER | DT_VCENTER | DT_END_ELLIPSIS | DT_SINGLELINE); + SelectObject(dialogDC, dcFont); + + // end painting + EndPaint(hWnd, &paint); } DWORD CreateSwitcherWindow(HINSTANCE hInstance) @@ -288,27 +387,23 @@ void PrepareWindow(VOID) { - cxBorder = GetSystemMetrics(SM_CXBORDER); - cyBorder = GetSystemMetrics(SM_CYBORDER); - nItems = windowCount; - nCols = min(max(nItems,8),12); - nRows = (nItems+nCols-1)/nCols; - - itemsW = nCols*32 + (nCols+1)*8; - itemsH = nRows*32 + (nRows+1)*8; - - totalW = itemsW + 2*cxBorder + 4; - totalH = itemsH + 2*cyBorder + fontHeight + 8; // give extra pixels for the window title - - xOffset = 8; - yOffset = 8; - - if (nItems < nCols) - { - int w2 = nItems*32 + (nItems-1)*8; - xOffset = (itemsW-w2)/2; - } + + nCols = CoolSwitchColumns; + nRows = (nItems + CoolSwitchColumns - 1) / CoolSwitchColumns; + if (nRows > CoolSwitchRows) + { + nRows = CoolSwitchRows; + nItems = nRows * nCols; + } + + itemsW = nCols * CX_ITEM_SPACE; + itemsH = nRows * CY_ITEM_SPACE; + + totalW = itemsW + 2 * DIALOG_MARGIN; + totalH = itemsH + 2 * DIALOG_MARGIN; + totalH += fontHeight + 2 * CY_TEXT_MARGIN; + ResizeAndCenter(switchdialog, totalW, totalH); } @@ -338,20 +433,95 @@ return TRUE; } +void RotateTasks(BOOL bShift) +{ + HWND hwndFirst, hwndLast; + DWORD Size; + + if (windowCount < 2 || !Esc) + return; + + hwndFirst = windowList[0]; + hwndLast = windowList[windowCount - 1]; + + if (bShift) + { + SetWindowPos(hwndLast, HWND_TOP, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOOWNERZORDER | SWP_NOREPOSITION); + + MakeWindowActive(hwndLast); + + Size = (windowCount - 1) * sizeof(HWND); + MoveMemory(&windowList[1], &windowList[0], Size); + windowList[0] = hwndLast; + } + else + { + SetWindowPos(hwndFirst, hwndLast, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOOWNERZORDER | SWP_NOREPOSITION); + + MakeWindowActive(windowList[1]); + + Size = (windowCount - 1) * sizeof(HWND); + MoveMemory(&windowList[0], &windowList[1], Size); + windowList[windowCount - 1] = hwndFirst; + } +} + +VOID +DestroyAppWindows(VOID) +{ + // for every item of the icon list: + INT i; + for (i = 0; i < windowCount; ++i) + { + // destroy the icon + DestroyIcon(iconList[i]); + iconList[i] = NULL; + } +} + LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam ) { - HWND hwnd, hwndActive; + HWND hwndActive; MSG msg; - BOOL Esc = FALSE; - INT Count = 0; - WCHAR Text[1024]; + + // FIXME: Is loading timing OK? + LoadCoolSwitchSettings(); + + if (!CoolSwitch) + return 0; // Already in the loop. - if (switchdialog) return 0; + if (switchdialog || Esc) return 0; hwndActive = GetActiveWindow(); // Nothing is active so exit. if (!hwndActive) return 0; + + if (lParam == VK_ESCAPE) + { + Esc = TRUE; + + windowCount = 0; + EnumWindowsZOrder(EnumerateCallback, 0); + + if (windowCount < 2) + return 0; + + RotateTasks(GetAsyncKeyState(VK_SHIFT) < 0); + + hwndActive = GetActiveWindow(); + + if (hwndActive == NULL) + { + Esc = FALSE; + return 0; + } + } + // Capture current active window. SetCapture( hwndActive ); @@ -364,25 +534,6 @@ break; case VK_ESCAPE: - windowCount = 0; - Count = 0; - EnumWindowsZOrder(EnumerateCallback, 0); - if (windowCount < 2) goto Exit; - if (wParam == SC_NEXTWINDOW) - Count = 1; - else - { - if (windowCount == 2) - Count = 0; - else - Count = windowCount - 1; - } - TRACE("DoAppSwitch VK_ESCAPE 1 Count %d windowCount %d\n",Count,windowCount); - hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, _countof(Text)); - TRACE("[ATbot] Switching to 0x%08x (%ls)\n", hwnd, Text); - MakeWindowActive(hwnd); - Esc = TRUE; break; default: @@ -429,41 +580,25 @@ PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); if (HIWORD(msg.lParam) & KF_ALTDOWN) { - INT Shift; if ( msg.wParam == VK_TAB ) { if (Esc) break; - Shift = GetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW; - if (Shift == SC_NEXTWINDOW) - { - selectedWindow = (selectedWindow + 1)%windowCount; - } - else + if (GetKeyState(VK_SHIFT) < 0) { selectedWindow = selectedWindow - 1; if (selectedWindow < 0) selectedWindow = windowCount - 1; + } + else + { + selectedWindow = (selectedWindow + 1)%windowCount; } InvalidateRect(switchdialog, NULL, TRUE); } else if ( msg.wParam == VK_ESCAPE ) { if (!Esc) break; - if (windowCount < 2) - goto Exit; - if (wParam == SC_NEXTWINDOW) - { - Count = (Count + 1)%windowCount; - } - else - { - Count--; - if (Count < 0) - Count = windowCount - 1; - } - hwnd = windowList[Count]; - GetWindowTextW(hwnd, Text, _countof(Text)); - MakeWindowActive(hwnd); + RotateTasks(GetKeyState(VK_SHIFT) < 0); } } break; @@ -486,21 +621,12 @@ Exit: ReleaseCapture(); if (switchdialog) DestroyWindow(switchdialog); + if (Esc) DestroyAppWindows(); switchdialog = NULL; selectedWindow = 0; windowCount = 0; + Esc = FALSE; return 0; -} - -VOID -DestroyAppWindows(VOID) -{ - INT i; - for (i=0; i< windowCount; i++) - { - HICON hIcon = iconList[i]; - DestroyIcon(hIcon); - } } // @@ -532,10 +658,23 @@ { PrepareWindow(); ati = (PALTTABINFO)GetWindowLongPtrW(hWnd, 0); + ati->cbSize = sizeof(ALTTABINFO); ati->cItems = nItems; - ati->cxItem = ati->cyItem = 43; + ati->cColumns = nCols; ati->cRows = nRows; - ati->cColumns = nCols; + if (nCols) + { + ati->iColFocus = (selectedWindow - nShift) % nCols; + ati->iRowFocus = (selectedWindow - nShift) / nCols; + } + else + { + ati->iColFocus = 0; + ati->iRowFocus = 0; + } + ati->cxItem = CX_ITEM_SPACE; + ati->cyItem = CY_ITEM_SPACE; + ati->ptStart = ptStart; } return 0;

8 years, 1 month

[hbelusca] 73331: [LSASRV]: Use LsapAllocateHeapZero to initialize the AllocateLsaHeap member of the LSA auth DispatchTable. Should fix login (this means some of the code calling DispatchTable->All...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Nov 21 14:42:14 2016 New Revision: 73331 URL: http://svn.reactos.org/svn/reactos?rev=73331&view=rev Log: [LSASRV]: Use LsapAllocateHeapZero to initialize the AllocateLsaHeap member of the LSA auth DispatchTable. Should fix login (this means some of the code calling DispatchTable->AllocateLsaHeap expect zero-initialized memory). Addendum to r73330. CORE-12432 Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Mon Nov 21 14:42:14 2016 @@ -488,7 +488,7 @@ DispatchTable.AddCredential = &LsapAddCredential; DispatchTable.GetCredentials = &LsapGetCredentials; DispatchTable.DeleteCredential = &LsapDeleteCredential; - DispatchTable.AllocateLsaHeap = &LsapAllocateHeap; + DispatchTable.AllocateLsaHeap = &LsapAllocateHeapZero; DispatchTable.FreeLsaHeap = &LsapFreeHeap; DispatchTable.AllocateClientBuffer = &LsapAllocateClientBuffer; DispatchTable.FreeClientBuffer = &LsapFreeClientBuffer;

8 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2016