March 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Look at the requested action when moving files, not the action taken.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: ff3ed5f05145b708c04a4ebc7e54bca36f2dc824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3ed5f05145b708c04a4ebc7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:57:14 2010 +0100 msi: Look at the requested action when moving files, not the action taken. --- dlls/msi/action.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 278d479..879a013 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6115,7 +6115,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; - LPCWSTR sourcename; + LPCWSTR sourcename, component; LPWSTR destname = NULL; LPWSTR sourcedir = NULL, destdir = NULL; LPWSTR source = NULL, dest = NULL; @@ -6123,13 +6123,18 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) DWORD size; BOOL ret, wildcards; - comp = get_loaded_component(package, MSI_RecordGetString(rec, 2)); - if (!comp || !comp->Enabled || - !(comp->Action & (INSTALLSTATE_LOCAL | INSTALLSTATE_SOURCE))) + component = MSI_RecordGetString(rec, 2); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL && comp->ActionRequest != INSTALLSTATE_SOURCE) { - TRACE("Component not set for install, not moving file\n"); + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + comp->Action = comp->Installed; return ERROR_SUCCESS; } + comp->Action = comp->ActionRequest; sourcename = MSI_RecordGetString(rec, 3); options = MSI_RecordGetInteger(rec, 7);

1 0

Hans Leidekker : msi: Look at the requested action when publishing assemblies, not the action taken.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 6c6b2a7a18e0b50ee19a5f3af51006a39eb2dc28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6b2a7a18e0b50ee19a5f3af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:57:37 2010 +0100 msi: Look at the requested action when publishing assemblies, not the action taken. --- dlls/msi/action.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 879a013..eec7b2b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6481,20 +6481,25 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) { ASSEMBLY_LIST *list = param; MSIASSEMBLY *assembly; + LPCWSTR component; assembly = msi_alloc_zero(sizeof(MSIASSEMBLY)); if (!assembly) return ERROR_OUTOFMEMORY; - assembly->component = get_loaded_component(list->package, MSI_RecordGetString(rec, 1)); + component = MSI_RecordGetString(rec, 1); + assembly->component = get_loaded_component(list->package, component); + if (!assembly->component) + return ERROR_SUCCESS; - if (!assembly->component || !assembly->component->Enabled || - !(assembly->component->Action & (INSTALLSTATE_LOCAL | INSTALLSTATE_SOURCE))) + if (assembly->component->ActionRequest != INSTALLSTATE_LOCAL && + assembly->component->ActionRequest != INSTALLSTATE_SOURCE) { - TRACE("Component not set for install, not publishing assembly\n"); - msi_free(assembly); + TRACE("Component not scheduled for installation: %s\n", debugstr_w(component)); + assembly->component->Action = assembly->component->Installed; return ERROR_SUCCESS; } + assembly->component->Action = assembly->component->ActionRequest; assembly->feature = find_feature_by_name(list->package, MSI_RecordGetString(rec, 2)); assembly->file = msi_find_file(list->package, assembly->component->KeyPath);

1 0

Hans Leidekker : msi: Improve a trace.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: e637839a839c6001fc1c2a6ffbdc95162ccb4eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e637839a839c6001fc1c2a6ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:58:02 2010 +0100 msi: Improve a trace. --- dlls/msi/helpers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 2c472dd..c45ba23 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -713,7 +713,7 @@ UINT register_unique_action(MSIPACKAGE *package, LPCWSTR action) if (!package->script) return FALSE; - TRACE("Registering Action %s as having fun\n",debugstr_w(action)); + TRACE("Registering %s as unique action\n", debugstr_w(action)); count = package->script->UniqueActionsCount; package->script->UniqueActionsCount++;

1 0

Hans Leidekker : msi: Skip the FindRelatedProducts action when product is already installed.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 1fe30e0015eccc3753e884d8f663066a6f855823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe30e0015eccc3753e884d8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:58:27 2010 +0100 msi: Skip the FindRelatedProducts action when product is already installed. --- dlls/msi/tests/install.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/upgrade.c | 6 +++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a3d3936..db1b154 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1552,6 +1552,55 @@ static const CHAR rrv_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR frp_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "product.txt\tproduct\tproduct.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR frp_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "product\t\t\tproduct feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR frp_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "product\tproduct\n"; + +static const CHAR frp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "product\t{44725EE0-EEA8-40BD-8162-A48224A2FEA1}\tMSITESTDIR\t0\t\tproduct.txt\n"; + +static const CHAR frp_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestProp\t19\t\t\tPROP set\n"; + +static const CHAR frp_upgrade_dat[] = "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n" + "s38\tS20\tS20\tS255\ti4\tS255\ts72\n" + "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n" + "{4C0EAA15-0264-4E5A-8758-609EF142B92D}\t1.1.1\t2.2.2\t\t768\t\tPROP\n"; + +static const CHAR frp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "FindRelatedProducts\t\t50\n" + "TestProp\tPROP AND NOT REMOVE\t51\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2429,6 +2478,20 @@ static const msi_table rrv_tables[] = ADD_TABLE(property) }; +static const msi_table frp_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(frp_component), + ADD_TABLE(frp_feature), + ADD_TABLE(frp_feature_comp), + ADD_TABLE(frp_file), + ADD_TABLE(frp_upgrade), + ADD_TABLE(frp_custom_action), + ADD_TABLE(frp_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8503,6 +8566,31 @@ static void test_remove_registry_values(void) delete_test_files(); } +static void test_find_related_products(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\product.txt", 1000); + create_database(msifile, frp_tables, sizeof(frp_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* install again, so it finds the upgrade code */ + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\product.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8607,6 +8695,7 @@ START_TEST(install) test_publish_components(); test_remove_duplicate_files(); test_remove_registry_values(); + test_find_related_products(); DeleteFileA(log_file); diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 6d5f4cf..21b677d 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -202,6 +202,12 @@ UINT ACTION_FindRelatedProducts(MSIPACKAGE *package) UINT rc = ERROR_SUCCESS; MSIQUERY *view; + if (msi_get_property_int(package, szInstalled, 0)) + { + TRACE("Skipping FindRelatedProducts action: product already installed\n"); + return ERROR_SUCCESS; + } + if (check_unique_action(package,szFindRelatedProducts)) { TRACE("Skipping FindRelatedProducts action: already done on client side\n");

1 0

Hans Leidekker : msi: Implement the RemoveIniValues standard action.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: b891d0888a6d7c30376cfa936ba94c5669be6e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b891d0888a6d7c30376cfa936… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:58:55 2010 +0100 msi: Implement the RemoveIniValues standard action. --- dlls/msi/action.c | 234 +++++++++++++++++++++++++++++++++++++++++++--------- dlls/msi/msipriv.h | 1 + include/msidefs.h | 9 ++ 3 files changed, 205 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b891d0888a6d7c30376cf…

1 0

Hans Leidekker : msi: Add tests for removing values from .ini files.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 75ec82bbafa4f6f1566dac8a161d6039790aa529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ec82bbafa4f6f1566dac8a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 2 14:59:19 2010 +0100 msi: Add tests for removing values from .ini files. --- dlls/msi/tests/install.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index db1b154..722e427 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1601,6 +1601,54 @@ static const CHAR frp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR riv_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "inifile.txt\tinifile\tinifile.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR riv_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "inifile\t\t\tinifile feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR riv_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "inifile\tinifile\n"; + +static const CHAR riv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "inifile\t{A0F15705-4F57-4437-88C4-6C8B37ACC6DE}\tMSITESTDIR\t0\t\tinifile.txt\n"; + +static const CHAR riv_ini_file_dat[] = "IniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n" + "s72\tl255\tS72\tl96\tl128\tl255\ti2\ts72\n" + "IniFile\tIniFile\n" + "inifile1\ttest.ini\tMSITESTDIR\tsection1\tkey1\tvalue1\t0\tinifile\n"; + +static const CHAR riv_remove_ini_file_dat[] = "RemoveIniFile\tFileName\tDirProperty\tSection\tKey\tValue\tAction\tComponent_\n" + "s72\tl255\tS72\tl96\tl128\tL255\ti2\ts72\n" + "RemoveIniFile\tRemoveIniFile\n" + "inifile1\ttest.ini\tMSITESTDIR\tsectionA\tkeyA\tvalueA\t2\tinifile\n"; + +static const CHAR riv_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RemoveIniValues\t\t3000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2492,6 +2540,20 @@ static const msi_table frp_tables[] = ADD_TABLE(property) }; +static const msi_table riv_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(riv_component), + ADD_TABLE(riv_feature), + ADD_TABLE(riv_feature_comp), + ADD_TABLE(riv_file), + ADD_TABLE(riv_ini_file), + ADD_TABLE(riv_remove_ini_file), + ADD_TABLE(riv_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8591,6 +8653,57 @@ static void test_find_related_products(void) delete_test_files(); } +static void test_remove_ini_values(void) +{ + UINT r; + DWORD len; + char inifile[MAX_PATH], buf[0x10]; + HANDLE file; + BOOL ret; + + create_test_files(); + create_file("msitest\\inifile.txt", 1000); + create_database(msifile, riv_tables, sizeof(riv_tables) / sizeof(msi_table)); + + lstrcpyA(inifile, PROG_FILES_DIR); + lstrcatA(inifile, "\\msitest"); + CreateDirectoryA(inifile, NULL); + lstrcatA(inifile, "\\test.ini"); + file = CreateFileA(inifile, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, 0, NULL); + CloseHandle(file); + + ret = WritePrivateProfileStringA("section1", "key1", "value1", inifile); + ok(ret, "failed to write profile string %u\n", GetLastError()); + + ret = WritePrivateProfileStringA("sectionA", "keyA", "valueA", inifile); + ok(ret, "failed to write profile string %u\n", GetLastError()); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile); + ok(len == 6, "got %u expected 6\n", len); + + len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile); + ok(!len, "got %u expected 0\n", len); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile); + ok(!len, "got %u expected 0\n", len); + + len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile); + ok(!len, "got %u expected 0\n", len); + + todo_wine ok(!delete_pf("msitest\\test.ini", TRUE), "file removed\n"); + ok(!delete_pf("msitest\\inifile.txt", TRUE), "file not removed\n"); + ok(delete_pf("msitest", FALSE), "directory removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8696,6 +8809,7 @@ START_TEST(install) test_remove_duplicate_files(); test_remove_registry_values(); test_find_related_products(); + test_remove_ini_values(); DeleteFileA(log_file);

1 0

Huw Davies : oleaut32: Add a test for non-oleautomation error handling.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: dba91c064357a79e253a4bf47cd944bc92758941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba91c064357a79e253a4bf47… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 2 14:49:47 2010 +0000 oleaut32: Add a test for non-oleautomation error handling. --- dlls/oleaut32/tests/tmarshal.c | 19 +++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index ae4f2aa..33adf3c 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -895,12 +895,18 @@ static BSTR WINAPI NonOleAutomation_BstrRet(INonOleAutomation *iface) return SysAllocString(wszTestString); } +static HRESULT WINAPI NonOleAutomation_Error(INonOleAutomation *iface) +{ + return E_NOTIMPL; +} + static INonOleAutomationVtbl NonOleAutomation_VTable = { NonOleAutomation_QueryInterface, NonOleAutomation_AddRef, NonOleAutomation_Release, NonOleAutomation_BstrRet, + NonOleAutomation_Error }; static INonOleAutomation NonOleAutomation = { &NonOleAutomation_VTable }; @@ -1239,6 +1245,19 @@ static void test_typelibmarshal(void) ok(V_BSTR(&varresult) != NULL, "V_BSTR(&varresult) should not be NULL\n"); VariantClear(&varresult); + + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); + ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult)); + ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); + VariantClear(&varresult); + ITypeInfo_Release(pTypeInfo); /* tests call put_Name without named arg */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 41079d0..5dc3a12 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -184,6 +184,9 @@ library TestTypelib { [id(DISPID_NOA_BSTRRET)] BSTR BstrRet(); + + [id(DISPID_NOA_ERROR)] + HRESULT Error(); } diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 1cfd87b..ad8ba1b 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -40,3 +40,4 @@ #define DISPID_TM_BYREF_UINT 21 #define DISPID_NOA_BSTRRET 1 +#define DISPID_NOA_ERROR 2

1 0

Vincent Povirk : ole32: Clear the sibling links when reinserting a renamed element.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 24ff70483519c22b201027a9c758d318d92a1ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ff70483519c22b201027a9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 26 10:02:17 2010 -0600 ole32: Clear the sibling links when reinserting a renamed element. --- dlls/ole32/storage32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 88e0524..837365b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -797,6 +797,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* Change the name of the element */ strcpyW(currentEntry.name, pwcsNewName); + /* Delete any sibling links */ + currentEntry.leftChild = DIRENTRY_NULL; + currentEntry.rightChild = DIRENTRY_NULL; + StorageBaseImpl_WriteDirEntry(This, currentEntryRef, &currentEntry);

1 0

Alexandre Julliard : server: Initial support for Wow64 registry redirection .
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: ac08b038f00ede310543d102dfeba18d34c9b566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac08b038f00ede310543d102d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:03:17 2010 +0100 server: Initial support for Wow64 registry redirection. --- dlls/ntdll/tests/reg.c | 3 ++- server/registry.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- server/thread.c | 7 +++++++ server/thread.h | 1 + 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d534240..4480bbf 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1157,7 +1157,8 @@ static void test_redirection(void) dw = get_key_value( key, "Winetest", 0 ); ok( dw == 64 || broken(dw == 32) /* xp64 */, "wrong value %u\n", dw ); check_key_value( key, "Winetest", KEY_WOW64_64KEY, 64 ); - check_key_value( key, "Winetest", KEY_WOW64_32KEY, 32 ); + dw = get_key_value( key, "Winetest", KEY_WOW64_32KEY ); + todo_wine ok( dw == 32, "wrong value %u\n", dw ); pNtClose( key ); status = pNtCreateKey( &key, KEY_WOW64_32KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); diff --git a/server/registry.c b/server/registry.c index ea7ea20..ad57bd2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -84,6 +84,7 @@ struct key #define KEY_DELETED 0x0002 /* key has been deleted */ #define KEY_DIRTY 0x0004 /* key has been modified */ #define KEY_SYMLINK 0x0008 /* key is a symbolic link */ +#define KEY_WOW64 0x0010 /* key contains a Wow6432Node subkey */ /* a key value */ struct key_value @@ -109,6 +110,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -166,6 +168,12 @@ static const struct object_ops key_ops = }; +static inline int is_wow6432node( const WCHAR *name, unsigned int len ) +{ + return (len == sizeof(wow6432node) && + !memicmpW( name, wow6432node, sizeof(wow6432node)/sizeof(WCHAR) )); +} + /* * The registry text file format v2 used by this code is similar to the one * used by REGEDIT import/export functionality, with the following differences: @@ -528,6 +536,7 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n for (i = ++parent->last_subkey; i > index; i--) parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; + if (is_wow6432node( key->name, key->namelen )) parent->flags |= KEY_WOW64; } return key; } @@ -546,6 +555,7 @@ static void free_subkey( struct key *parent, int index ) parent->last_subkey--; key->flags |= KEY_DELETED; key->parent = NULL; + if (is_wow6432node( key->name, key->namelen )) parent->flags &= ~KEY_WOW64; release_object( key ); /* try to shrink the array */ @@ -587,6 +597,22 @@ static struct key *find_subkey( const struct key *key, const struct unicode_str return NULL; } +/* return the wow64 variant of the key, or the key itself if none */ +static struct key *find_wow64_subkey( struct key *key, const struct unicode_str *name ) +{ + static const struct unicode_str wow6432node_str = { wow6432node, sizeof(wow6432node) }; + int index; + + if (!(key->flags & KEY_WOW64)) return key; + if (!is_wow6432node( name->str, name->len )) + { + key = find_subkey( key, &wow6432node_str, &index ); + assert( key ); /* if KEY_WOW64 is set we must find it */ + } + return key; +} + + /* follow a symlink and return the resolved key */ static struct key *follow_symlink( struct key *key, int iteration ) { @@ -618,13 +644,15 @@ static struct key *follow_symlink( struct key *key, int iteration ) } /* open a subkey */ -static struct key *open_key( struct key *key, const struct unicode_str *name, unsigned int attributes ) +static struct key *open_key( struct key *key, const struct unicode_str *name, unsigned int access, + unsigned int attributes ) { int index; struct unicode_str token; token.str = NULL; if (!get_path_token( name, &token )) return NULL; + if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, &token ); while (token.len) { if (!(key = find_subkey( key, &token, &index ))) @@ -634,6 +662,7 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un } get_path_token( name, &token ); if (!token.len) break; + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); @@ -641,6 +670,7 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un } } + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(attributes & OBJ_OPENLINK) && !(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); @@ -654,7 +684,7 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un /* create a subkey */ static struct key *create_key( struct key *key, const struct unicode_str *name, const struct unicode_str *class, unsigned int options, - unsigned int attributes, int *created ) + unsigned int access, unsigned int attributes, int *created ) { int index; struct unicode_str token, next; @@ -668,6 +698,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, token.str = NULL; if (!get_path_token( name, &token )) return NULL; *created = 0; + if (access & KEY_WOW64_32KEY) key = find_wow64_subkey( key, &token ); while (token.len) { struct key *subkey; @@ -675,6 +706,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, key = subkey; get_path_token( name, &token ); if (!token.len) break; + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (!(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); @@ -684,6 +716,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, if (!token.len) /* the key already exists */ { + if (!(access & KEY_WOW64_64KEY)) key = find_wow64_subkey( key, &token ); if (options & REG_OPTION_CREATE_LINK) { set_error( STATUS_OBJECT_NAME_COLLISION ); @@ -1786,6 +1819,8 @@ DECL_HANDLER(create_key) struct unicode_str name, class; unsigned int access = req->access; + if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; + reply->hkey = 0; if (req->namelen > get_req_data_size()) @@ -1806,7 +1841,8 @@ DECL_HANDLER(create_key) /* NOTE: no access rights are required from the parent handle to create a key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - if ((key = create_key( parent, &name, &class, req->options, req->attributes, &reply->created ))) + if ((key = create_key( parent, &name, &class, req->options, access, + req->attributes, &reply->created ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); @@ -1822,12 +1858,14 @@ DECL_HANDLER(open_key) struct unicode_str name; unsigned int access = req->access; + if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; + reply->hkey = 0; /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) { get_req_path( &name, !req->parent ); - if ((key = open_key( parent, &name, req->attributes ))) + if ((key = open_key( parent, &name, access, req->attributes ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); @@ -1961,7 +1999,7 @@ DECL_HANDLER(load_registry) { int dummy; get_req_path( &name, !req->hkey ); - if ((key = create_key( parent, &name, NULL, 0, 0, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, &dummy ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/thread.c b/server/thread.c index bdb6c3c..a6bc55a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -67,6 +67,7 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); #else #error Unsupported CPU #endif +#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64) /* thread queues */ @@ -408,6 +409,12 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } +/* determine if the thread is wow64 (32-bit client running on 64-bit server) */ +int is_wow64_thread( struct thread *thread ) +{ + return (supported_cpus & CPU_64BIT_MASK) && !(CPU_FLAG(thread->process->cpu) & CPU_64BIT_MASK); +} + int set_thread_affinity( struct thread *thread, affinity_t affinity ) { int ret = 0; diff --git a/server/thread.h b/server/thread.h index 1e95732..045a43c 100644 --- a/server/thread.h +++ b/server/thread.h @@ -118,6 +118,7 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); +extern int is_wow64_thread( struct thread *thread ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

Henri Verbeet : user32: Also show dialogs right after a WM_TIMER message.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 6ee4a87ad6958dc2e00fff646a3bb2b50d188977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee4a87ad6958dc2e00fff646… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 2 11:51:52 2010 +0100 user32: Also show dialogs right after a WM_TIMER message. --- dlls/user32/dialog.c | 6 +++++ dlls/user32/tests/dialog.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 325d6e2..79f5182 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -815,6 +815,12 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DispatchMessageW( &msg ); } if (dlgInfo->flags & DF_END) break; + + if (bFirstEmpty && msg.message == WM_TIMER) + { + ShowWindow( hwnd, SW_SHOWNORMAL ); + bFirstEmpty = FALSE; + } } } if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index ef4d5dc..1b36c53 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1157,6 +1157,55 @@ static void test_SaveRestoreFocus(void) DestroyWindow(hDlg); } +static INT_PTR CALLBACK timer_message_dlg_proc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + static int count; + BOOL visible; + + switch (msg) + { + case WM_INITDIALOG: + visible = GetWindowLong(wnd, GWL_STYLE) & WS_VISIBLE; + ok(!visible, "Dialog should not be visible.\n"); + SetTimer(wnd, 1, 100, NULL); + Sleep(200); + return FALSE; + + case WM_COMMAND: + if (LOWORD(wparam) != IDCANCEL) return FALSE; + EndDialog(wnd, LOWORD(wparam)); + return TRUE; + + case WM_TIMER: + if (wparam != 1) return FALSE; + visible = GetWindowLong(wnd, GWL_STYLE) & WS_VISIBLE; + if (!count++) + { + ok(!visible, "Dialog should not be visible.\n"); + PostMessage(wnd, WM_USER, 0, 0); + } + else + { + ok(visible, "Dialog should be visible.\n"); + PostMessage(wnd, WM_COMMAND, IDCANCEL, 0); + } + return TRUE; + + case WM_USER: + visible = GetWindowLong(wnd, GWL_STYLE) & WS_VISIBLE; + ok(visible, "Dialog should be visible.\n"); + return TRUE; + + default: + return FALSE; + } +} + +static void test_timer_message(void) +{ + DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -1172,4 +1221,5 @@ START_TEST(dialog) test_DisabledDialogTest(); test_MessageBoxFontTest(); test_SaveRestoreFocus(); + test_timer_message(); }

1 0