November 2007 - Wine-commits

James Hawkins : msi: A feature' s requested action does not depend on its installed state.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 07c3f4411e5e1658c579e8bb36cf2b90160011ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c3f4411e5e1658c579e8bb3… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 1 03:15:22 2007 -0500 msi: A feature's requested action does not depend on its installed state. --- dlls/msi/helpers.c | 3 --- dlls/msi/tests/install.c | 10 ++-------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index d314699..172f516 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -831,9 +831,6 @@ BOOL ACTION_VerifyFeatureForAction( const MSIFEATURE* feature, INSTALLSTATE chec if (!feature) return FALSE; - if (feature->Installed == check) - return FALSE; - if (feature->ActionRequest == check) return TRUE; else diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6ac44f1..a9c9a0f 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2189,16 +2189,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);

1 0

James Hawkins : msi: Implement the MoveFiles standard action.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: c3df74e24f311b3a33c1f143bd4f4b3829112012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3df74e24f311b3a33c1f143b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 1 03:09:02 2007 -0500 msi: Implement the MoveFiles standard action. --- dlls/msi/action.c | 315 +++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/install.c | 48 ++++---- include/msidefs.h | 5 + 3 files changed, 338 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3df74e24f311b3a33c1f…

1 0

James Hawkins : msi: Remove a duplicated function.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: eec9bbb12d0c92a53747298d19663187ae9204c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec9bbb12d0c92a53747298d1… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 1 03:10:47 2007 -0500 msi: Remove a duplicated function. --- dlls/msi/action.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f79f9a4..05bb4f1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4441,19 +4441,6 @@ static LPCWSTR *msi_service_args_to_vector(LPCWSTR name, LPWSTR args, DWORD *num return vector; } -static MSICOMPONENT *msi_find_component( MSIPACKAGE *package, LPCWSTR component ) -{ - MSICOMPONENT *comp; - - LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) - { - if (!lstrcmpW(comp->Component, component)) - return comp; - } - - return NULL; -} - static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = (MSIPACKAGE *)param; @@ -4464,7 +4451,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) DWORD event, numargs; UINT r = ERROR_FUNCTION_FAILED; - comp = msi_find_component(package, MSI_RecordGetString(rec, 6)); + comp = get_loaded_component(package, MSI_RecordGetString(rec, 6)); if (!comp || comp->Action == INSTALLSTATE_UNKNOWN || comp->Action == INSTALLSTATE_ABSENT) return ERROR_SUCCESS;

1 0

James Hawkins : msi: Properly register and unregister components.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: fc6b9dd4e4ff2674ebeda31ef4c8ced4bafa7d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6b9dd4e4ff2674ebeda31ef… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 1 03:12:41 2007 -0500 msi: Properly register and unregister components. --- dlls/msi/action.c | 24 +++++++++++++++++++++- dlls/msi/msipriv.h | 2 + dlls/msi/registry.c | 24 ++++++++++++++++++++++ dlls/msi/tests/install.c | 49 +++++++++++++-------------------------------- 4 files changed, 63 insertions(+), 36 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 05bb4f1..83f3d84 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1845,6 +1845,9 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) switch (feature->Action) { + case INSTALLSTATE_ABSENT: + component->anyAbsent = 1; + break; case INSTALLSTATE_ADVERTISED: component->hasAdvertiseFeature = 1; break; @@ -1906,6 +1909,8 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } TRACE("nobody wants component %s\n", debugstr_w(component->Component)); + if (component->anyAbsent) + msi_component_set_state(component, INSTALLSTATE_ABSENT); } LIST_FOR_EACH_ENTRY( component, &package->components, MSICOMPONENT, entry ) @@ -2767,6 +2772,8 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) MSICOMPONENT *comp; HKEY hkey=0,hkey2=0; + TRACE("\n"); + /* writes the Component and Features values to the registry */ rc = MSIREG_OpenComponents(&hkey); @@ -2823,6 +2830,13 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } RegCloseKey(hkey2); + + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, &hkey2, TRUE); + if (rc != ERROR_SUCCESS) + continue; + + msi_reg_set_val_str(hkey2, squished_pc, comp->FullKeypath); + RegCloseKey(hkey2); } else if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT)) { @@ -2840,6 +2854,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (res == ERROR_NO_MORE_ITEMS) RegDeleteKeyW(hkey,squished_cc); + MSIREG_DeleteUserDataComponentKey(comp->ComponentId); } /* UI stuff */ @@ -3785,6 +3800,7 @@ static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; WCHAR packagefile[MAX_PATH]; LPWSTR msiFilePath; + HKEY props; UINT r; r = msi_get_local_package_name( packagefile ); @@ -3805,8 +3821,14 @@ static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) } msi_free( msiFilePath ); - /* FIXME: maybe set this key in ACTION_RegisterProduct instead */ msi_reg_set_val_str( hkey, INSTALLPROPERTY_LOCALPACKAGEW, packagefile ); + + r = MSIREG_OpenInstallPropertiesKey(package->ProductCode, &props, TRUE); + if (r != ERROR_SUCCESS) + return r; + + msi_reg_set_val_str(props, INSTALLPROPERTY_LOCALPACKAGEW, packagefile); + RegCloseKey(props); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index d85ac55..91249e1 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -359,6 +359,7 @@ typedef struct tagMSICOMPONENT LPWSTR FullKeypath; LPWSTR AdvertiseString; + unsigned int anyAbsent:1; unsigned int hasAdvertiseFeature:1; unsigned int hasLocalFeature:1; unsigned int hasSourceFeature:1; @@ -752,6 +753,7 @@ extern UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, B extern UINT MSIREG_OpenLocalClassesProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create); extern UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create); extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); +extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent); extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 1163111..9a88aea 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -729,6 +729,30 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create return rc; } +UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) +{ + UINT rc; + WCHAR comp[GUID_SIZE]; + WCHAR keypath[0x200]; + LPWSTR usersid; + + TRACE("%s\n", debugstr_w(szComponent)); + if (!squash_guid(szComponent, comp)) + return ERROR_FUNCTION_FAILED; + TRACE("squished (%s)\n", debugstr_w(comp)); + + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } + + sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); +} + UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) { UINT rc; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3d5458a..5f54609 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2030,11 +2030,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); @@ -2079,11 +2076,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); @@ -2131,11 +2125,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* no UnpublishFeatures */ r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -2183,11 +2174,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* UnpublishFeatures, only feature removed. Only works when entire product is removed */ r = MsiInstallProductA(msifile, "UNPUBLISH_FEATURES=1 REMOVE=feature"); @@ -2212,11 +2200,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* complete install */ r = MsiInstallProductA(msifile, "FULL=1"); @@ -2241,11 +2226,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* UnpublishFeatures, both features removed */ r = MsiInstallProductA(msifile, "UNPUBLISH_FEATURES=1 REMOVE=feature,montecristo"); @@ -2293,11 +2275,8 @@ static void test_publish(void) r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL");

1 0

James Hawkins : msi: Properly register features.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 9f11a5a8782270cd26273ca8d198535dcd7297fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f11a5a8782270cd26273ca8d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 1 03:13:28 2007 -0500 msi: Properly register features. --- dlls/msi/action.c | 7 +++++++ dlls/msi/tests/install.c | 40 ++++++++-------------------------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 83f3d84..ca46448 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3625,6 +3625,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) UINT rc; HKEY hkey=0; HKEY hukey=0; + HKEY userdata=0; if (!msi_check_publish(package)) return ERROR_SUCCESS; @@ -3637,6 +3638,10 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; + rc = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, &userdata, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + /* here the guids are base 85 encoded */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -3678,6 +3683,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) strcatW(data,buf); } } + if (feature->Feature_Parent) { static const WCHAR sep[] = {'\2',0}; @@ -3686,6 +3692,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) } msi_reg_set_val_str( hkey, feature->Feature, data ); + msi_reg_set_val_str( userdata, feature->Feature, data ); msi_free(data); size = 0; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5f54609..a93b66b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2063,16 +2063,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); @@ -2112,16 +2106,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); @@ -2161,16 +2149,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); @@ -2262,16 +2244,10 @@ static void test_publish(void) ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state);

1 0

Vitaliy Margolen : kernel32: Implement GetProcessHandleCount.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: eb31959ab957be075a9a14fe31717f981b33b2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb31959ab957be075a9a14fe3… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Nov 1 00:46:54 2007 -0600 kernel32: Implement GetProcessHandleCount. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fe98670..ff92b2e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -576,7 +576,7 @@ @ stdcall GetProcAddress(long str) @ stdcall GetProcessAffinityMask(long ptr ptr) @ stdcall GetProcessFlags(long) -# @ stub GetProcessHandleCount +@ stdcall GetProcessHandleCount(long ptr) @ stdcall GetProcessHeap() @ stdcall GetProcessHeaps(long ptr) @ stdcall GetProcessId(long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index a08235a..d770fd7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2784,6 +2784,19 @@ BOOL WINAPI GetProcessIoCounters(HANDLE hProcess, PIO_COUNTERS ioc) return !status; } +/****************************************************************** + * GetProcessHandleCount (KERNEL32.@) + */ +BOOL WINAPI GetProcessHandleCount(HANDLE hProcess, DWORD *cnt) +{ + NTSTATUS status; + + status = NtQueryInformationProcess(hProcess, ProcessHandleCount, + cnt, sizeof(*cnt), NULL); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + /*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000

1 0

James Hawkins : msi: Test the MoveFiles standard action.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: b9a29e221f4e5dada5ac664e30812ae40a65c6e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a29e221f4e5dada5ac664e3… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Nov 1 03:07:50 2007 -0500 msi: Test the MoveFiles standard action. --- dlls/msi/tests/install.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 52de3db..46cc1ec 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -109,6 +109,8 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "CostFinalize\t\t1000\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" + "ResolveSource\t\t950\n" + "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" @@ -508,6 +510,27 @@ static const CHAR rem_remove_files_dat[] = "FileKey\tComponent_\tFileName\tDirPr "block\thelium\tblock\tMSITESTDIR\t3\n" "siriometer\tlithium\tsiriometer\tMSITESTDIR\t3\n"; +static const CHAR mov_move_file_dat[] = "FileKey\tComponent_\tSourceName\tDestName\tSourceFolder\tDestFolder\tOptions\n" + "s72\ts72\tS255\tS255\tS72\ts72\ti2\n" + "MoveFile\tFileKey\n" + "abkhazia\taugustus\tnonexistent\tdest\tSourceDir\tMSITESTDIR\t0\n" + "bahamas\taugustus\tnonexistent\tdest\tSourceDir\tMSITESTDIR\t1\n" + "cambodia\taugustus\tcameroon\tcanada\tSourceDir\tMSITESTDIR\t0\n" + "denmark\taugustus\tdjibouti\tdominica\tSourceDir\tMSITESTDIR\t1\n" + "ecuador\taugustus\tegypt\telsalvador\tNotAProp\tMSITESTDIR\t1\n" + "fiji\taugustus\tfinland\tfrance\tSourceDir\tNotAProp\t1\n" + "gabon\taugustus\tgambia\tgeorgia\tSOURCEFULL\tMSITESTDIR\t1\n" + "haiti\taugustus\thonduras\thungary\tSourceDir\tDESTFULL\t1\n" + "iceland\taugustus\tindia\tindonesia\tMSITESTDIR\tMSITESTDIR\t1\n" + "jamaica\taugustus\tjapan\tjordan\tFILEPATHBAD\tMSITESTDIR\t1\n" + "kazakhstan\taugustus\t\tkiribati\tFILEPATHGOOD\tMSITESTDIR\t1\n" + "laos\taugustus\tlatvia\tlebanon\tSourceDir\tMSITESTDIR\t1\n" + "namibia\taugustus\tnauru\tkiribati\tSourceDir\tMSITESTDIR\t1\n" + "wildcard\taugustus\tapp*\twildcard\tSourceDir\tMSITESTDIR\t1\n" + "single\taugustus\tf?o\tsingle\tSourceDir\tMSITESTDIR\t1\n" + "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" + "singlenodest\taugustus\tb?r\t\tSourceDir\tMSITESTDIR\t1\n"; + typedef struct _msi_table { const CHAR *filename; @@ -757,6 +780,20 @@ static const msi_table rem_tables[] = ADD_TABLE(rem_remove_files), }; +static const msi_table mov_tables[] = +{ + ADD_TABLE(cwd_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), + ADD_TABLE(mov_move_file), + ADD_TABLE(registry), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2896,6 +2933,108 @@ static void test_removefiles(void) RemoveDirectory("msitest"); } +static void test_movefiles(void) +{ + UINT r; + char props[MAX_PATH]; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 100); + create_file("cameroon", 100); + create_file("djibouti", 100); + create_file("egypt", 100); + create_file("finland", 100); + create_file("gambai", 100); + create_file("honduras", 100); + create_file("msitest\\india", 100); + create_file("japan", 100); + create_file("kenya", 100); + CreateDirectoryA("latvia", NULL); + create_file("nauru", 100); + create_file("apple", 100); + create_file("application", 100); + create_file("ape", 100); + create_file("foo", 100); + create_file("fao", 100); + create_file("fbod", 100); + create_file("budding", 100); + create_file("buddy", 100); + create_file("bud", 100); + create_file("bar", 100); + create_file("bur", 100); + create_file("bird", 100); + + create_database(msifile, mov_tables, sizeof(mov_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + MsiEnableLog(INSTALLLOGMODE_VERBOSE | INSTALLLOGMODE_EXTRADEBUG, "log.txt", 0); + + /* if the source or dest property is not a full path, + * windows tries to access it as a network resource + */ + + sprintf(props, "SOURCEFULL=\"%s\\\" DESTFULL=\"%s\\msitest\" " + "FILEPATHBAD=\"%s\\japan\" FILEPATHGOOD=\"%s\\kenya\"", + CURR_DIR, PROG_FILES_DIR, CURR_DIR, CURR_DIR); + + r = MsiInstallProductA(msifile, props); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\dest", TRUE), "File copied\n"); + todo_wine ok(delete_pf("msitest\\canada", TRUE), "File not copied\n"); + todo_wine ok(delete_pf("msitest\\dominica", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\elsalvador", TRUE), "File moved\n"); + ok(!delete_pf("msitest\\france", TRUE), "File moved\n"); + ok(!delete_pf("msitest\\georgia", TRUE), "File moved\n"); + todo_wine ok(delete_pf("msitest\\hungary", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\indonesia", TRUE), "File moved\n"); + ok(!delete_pf("msitest\\jordan", TRUE), "File moved\n"); + todo_wine ok(delete_pf("msitest\\kiribati", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\lebanon", TRUE), "File moved\n"); + ok(!delete_pf("msitest\\lebanon", FALSE), "Directory moved\n"); + ok(!delete_pf("msitest\\apple", TRUE), "File should not exist\n"); + todo_wine ok(delete_pf("msitest\\wildcard", TRUE), "File not moved\n"); + todo_wine ok(delete_pf("msitest\\application", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\ape", TRUE), "File moved\n"); + todo_wine ok(delete_pf("msitest\\foo", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\fao", TRUE), "File should not exist\n"); + todo_wine ok(delete_pf("msitest\\single", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\fbod", TRUE), "File moved\n"); + todo_wine ok(delete_pf("msitest\\budding", TRUE), "File not moved\n"); + todo_wine ok(delete_pf("msitest\\buddy", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\bud", TRUE), "File moved\n"); + todo_wine ok(delete_pf("msitest\\bar", TRUE), "File not moved\n"); + todo_wine ok(delete_pf("msitest\\bur", TRUE), "File not moved\n"); + ok(!delete_pf("msitest\\bird", TRUE), "File moved\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(DeleteFileA("cameroon"), "File moved\n"); + todo_wine ok(!DeleteFileA("djibouti"), "File not moved\n"); + ok(DeleteFileA("egypt"), "File moved\n"); + ok(DeleteFileA("finland"), "File moved\n"); + ok(DeleteFileA("gambai"), "File moved\n"); + todo_wine ok(!DeleteFileA("honduras"), "File not moved\n"); + ok(DeleteFileA("msitest\\india"), "File moved\n"); + ok(DeleteFileA("japan"), "File moved\n"); + todo_wine ok(!DeleteFileA("kenya"), "File not moved\n"); + ok(RemoveDirectoryA("latvia"), "Directory moved\n"); + todo_wine ok(!DeleteFileA("nauru"), "File not moved\n"); + todo_wine ok(!DeleteFileA("apple"), "File not moved\n"); + todo_wine ok(!DeleteFileA("application"), "File not moved\n"); + ok(DeleteFileA("ape"), "File moved\n"); + todo_wine ok(!DeleteFileA("foo"), "File not moved\n"); + todo_wine ok(!DeleteFileA("fao"), "File not moved\n"); + ok(DeleteFileA("fbod"), "File moved\n"); + todo_wine ok(!DeleteFileA("budding"), "File not moved\n"); + todo_wine ok(!DeleteFileA("buddy"), "File not moved\n"); + ok(DeleteFileA("bud"), "File moved\n"); + todo_wine ok(!DeleteFileA("bar"), "File not moved\n"); + todo_wine ok(!DeleteFileA("bur"), "File not moved\n"); + ok(DeleteFileA("bird"), "File moved\n"); + + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); + DeleteFile(msifile); +} START_TEST(install) { DWORD len; @@ -2935,6 +3074,7 @@ START_TEST(install) test_admin(); test_adminprops(); test_removefiles(); + test_movefiles(); SetCurrentDirectoryA(prev_path); }

1 0

Stefan Dösinger : d3d9: Silence a FIXME.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: aa7f9f0a72408a93e44dbf57c85ae844f67e3520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7f9f0a72408a93e44dbf57c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:45:36 2007 +0100 d3d9: Silence a FIXME. --- dlls/d3d9/vertexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 6238fdd..7716951 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -231,7 +231,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9 iface, if (hrc != D3D_OK) { /* free up object */ - FIXME("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); + WARN("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { IUnknown_AddRef(iface);

1 0

Dmitry Timoshkov : include: Synchronize DEVMODE layout with PSDK.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: d43fdc5ab0f294d99280f8a6d002b98dc0c2dba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43fdc5ab0f294d99280f8a6d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 1 14:22:11 2007 +0800 include: Synchronize DEVMODE layout with PSDK. --- dlls/comdlg32/printdlg.c | 26 +++++++++++++------------- dlls/comdlg32/printdlg16.c | 4 ++-- dlls/wineps.drv/driver.c | 22 +++++++++++----------- dlls/wineps.drv/init.c | 20 +++++++++++--------- dlls/wineps.drv/ps.c | 6 +++--- dlls/winspool.drv/info.c | 10 +++++----- include/wingdi.h | 38 ++++++++++++++++++++++++++------------ programs/cmdlgtst/cmdlgtst.c | 10 +++++----- 8 files changed, 76 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d43fdc5ab0f294d99280f…

1 0

Dmitry Timoshkov : user32: Initialize more fields in the DEVMODE structure.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 2712eb50b18128a41aea251119d969e461b06874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2712eb50b18128a41aea25111… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 1 14:22:41 2007 +0800 user32: Initialize more fields in the DEVMODE structure. --- dlls/user32/sysparams.c | 24 ++++++++++++++++-------- dlls/winex11.drv/settings.c | 18 ++++++++++++++++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a72108a..ad5704a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2985,7 +2985,6 @@ LONG WINAPI ChangeDisplaySettingsW( LPDEVMODEW devmode, DWORD flags ) LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - DEVMODEW devmodeW; LONG ret; UNICODE_STRING nameW; @@ -2994,13 +2993,11 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h if (devmode) { - devmodeW.dmBitsPerPel = devmode->dmBitsPerPel; - devmodeW.dmPelsHeight = devmode->dmPelsHeight; - devmodeW.dmPelsWidth = devmode->dmPelsWidth; - devmodeW.dmDisplayFlags = devmode->dmDisplayFlags; - devmodeW.dmDisplayFrequency = devmode->dmDisplayFrequency; - devmodeW.dmFields = devmode->dmFields; - ret = ChangeDisplaySettingsExW(nameW.Buffer, &devmodeW, hwnd, flags, lparam); + DEVMODEW *devmodeW; + + devmodeW = GdiConvertToDevmodeW(devmode); + ret = ChangeDisplaySettingsExW(nameW.Buffer, devmodeW, hwnd, flags, lparam); + HeapFree(GetProcessHeap(), 0, devmodeW); } else { @@ -3063,12 +3060,23 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, ret = EnumDisplaySettingsExW(nameW.Buffer,iModeNum,&devmodeW,dwFlags); if (ret) { + lpDevMode->dmSize = sizeof(*lpDevMode); + lpDevMode->dmSpecVersion = devmodeW.dmSpecVersion; + lpDevMode->dmDriverVersion = devmodeW.dmDriverVersion; + WideCharToMultiByte(CP_ACP, 0, devmodeW.dmDeviceName, -1, + (LPSTR)lpDevMode->dmDeviceName, CCHDEVICENAME, NULL, NULL); + lpDevMode->dmDriverExtra = 0; /* FIXME */ lpDevMode->dmBitsPerPel = devmodeW.dmBitsPerPel; lpDevMode->dmPelsHeight = devmodeW.dmPelsHeight; lpDevMode->dmPelsWidth = devmodeW.dmPelsWidth; lpDevMode->dmDisplayFlags = devmodeW.dmDisplayFlags; lpDevMode->dmDisplayFrequency = devmodeW.dmDisplayFrequency; lpDevMode->dmFields = devmodeW.dmFields; + + lpDevMode->dmPosition.x = devmodeW.dmPosition.x; + lpDevMode->dmPosition.y = devmodeW.dmPosition.y; + lpDevMode->dmDisplayOrientation = devmodeW.dmDisplayOrientation; + lpDevMode->dmDisplayFixedOutput = devmodeW.dmDisplayFixedOutput; } if (lpszDeviceName) RtlFreeUnicodeString(&nameW); return ret; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index cc6dd2c..908d61e 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -165,11 +165,25 @@ void X11DRV_Settings_Init(void) */ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) { - DWORD dwBpp = screen_depth; + static const WCHAR dev_name[CCHDEVICENAME] = + { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; + DWORD dwBpp; + + dwBpp = screen_depth; if (dwBpp == 24) dwBpp = 32; + + devmode->dmSize = sizeof(DEVMODEW); + devmode->dmSpecVersion = MAKEWORD(1,4); + devmode->dmDriverVersion = MAKEWORD(1,4); + memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); + devmode->dmDriverExtra = 0; devmode->dmDisplayFlags = 0; devmode->dmDisplayFrequency = 0; - devmode->dmSize = sizeof(DEVMODEW); + devmode->dmPosition.x = 0; + devmode->dmPosition.y = 0; + devmode->dmDisplayOrientation = 0; + devmode->dmDisplayFixedOutput = 0; + if (n == ENUM_CURRENT_SETTINGS) { TRACE("mode %d (current) -- getting current mode (%s)\n", n, handler_name);

1 0