February 2010 - Wine-Commits

Justin Chevrier : msctf: Add TF_LangBarMgr registration.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: b6da8233546e39326cfb09dca12855bc68fd09de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6da8233546e39326cfb09dca… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Tue Feb 16 21:31:04 2010 -0500 msctf: Add TF_LangBarMgr registration. --- dlls/msctf/regsvr.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/regsvr.c b/dlls/msctf/regsvr.c index aa050ed..2af1f24 100644 --- a/dlls/msctf/regsvr.c +++ b/dlls/msctf/regsvr.c @@ -462,6 +462,13 @@ static struct regsvr_coclass const coclass_list[] = { "msctf.dll", "Apartment" }, + { + &CLSID_TF_LangBarMgr, + "TF_LangBarMgr", + NULL, + "msctf.dll", + "Apartment" + }, { NULL } /* list terminator */ };

1 0

Justin Chevrier : msctf: Implement stubbed out TF_CreateLangBarMgr.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 4e1c8767f914ba30a91c44ca00b2e4a67f8c89f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1c8767f914ba30a91c44ca0… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Tue Feb 16 21:31:05 2010 -0500 msctf: Implement stubbed out TF_CreateLangBarMgr. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/langbarmgr.c | 193 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.c | 10 ++ dlls/msctf/msctf.spec | 2 +- dlls/msctf/msctf_internal.h | 1 + 5 files changed, 206 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 2c319f1..22b1730 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ context.c \ documentmgr.c \ inputprocessor.c \ + langbarmgr.c \ msctf.c \ range.c \ regsvr.c \ diff --git a/dlls/msctf/langbarmgr.c b/dlls/msctf/langbarmgr.c new file mode 100644 index 0000000..272a816 --- /dev/null +++ b/dlls/msctf/langbarmgr.c @@ -0,0 +1,193 @@ +/* + * ITfLangBarMgr implementation + * + * Copyright 2010 Justin Chevrier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagLangBarMgr { + const ITfLangBarMgrVtbl *LangBarMgrVtbl; + + LONG refCount; + +} LangBarMgr; + +static void LangBarMgr_Destructor(LangBarMgr *This) +{ + TRACE("destroying %p\n", This); + + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI LangBarMgr_QueryInterface(ITfLangBarMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + LangBarMgr *This = (LangBarMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfLangBarMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI LangBarMgr_AddRef(ITfLangBarMgr *iface) +{ + LangBarMgr *This = (LangBarMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI LangBarMgr_Release(ITfLangBarMgr *iface) +{ + LangBarMgr *This = (LangBarMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + LangBarMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfLangBarMgr functions + *****************************************************/ + +static HRESULT WINAPI LangBarMgr_AdviseEventSink( ITfLangBarMgr* iface, ITfLangBarEventSink *pSink, HWND hwnd, DWORD dwflags, DWORD *pdwCookie) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_UnAdviseEventSink( ITfLangBarMgr* iface, DWORD dwCookie) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetThreadMarshalInterface( ITfLangBarMgr* iface, DWORD dwThreadId, DWORD dwType, REFIID riid, IUnknown **ppunk) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetThreadLangBarItemMgr( ITfLangBarMgr* iface, DWORD dwThreadId, ITfLangBarItemMgr **pplbi, DWORD *pdwThreadid) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetInputProcessorProfiles( ITfLangBarMgr* iface, DWORD dwThreadId, ITfInputProcessorProfiles **ppaip, DWORD *pdwThreadid) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_RestoreLastFocus( ITfLangBarMgr* iface, DWORD *dwThreadId, BOOL fPrev) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_SetModalInput( ITfLangBarMgr* iface, ITfLangBarEventSink *pSink, DWORD dwThreadId, DWORD dwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_ShowFloating( ITfLangBarMgr* iface, DWORD dwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetShowFloatingStatus( ITfLangBarMgr* iface, DWORD *pdwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfLangBarMgrVtbl LangBarMgr_LangBarMgrVtbl = +{ + LangBarMgr_QueryInterface, + LangBarMgr_AddRef, + LangBarMgr_Release, + + LangBarMgr_AdviseEventSink, + LangBarMgr_UnAdviseEventSink, + LangBarMgr_GetThreadMarshalInterface, + LangBarMgr_GetThreadLangBarItemMgr, + LangBarMgr_GetInputProcessorProfiles, + LangBarMgr_RestoreLastFocus, + LangBarMgr_SetModalInput, + LangBarMgr_ShowFloating, + LangBarMgr_GetShowFloatingStatus +}; + +HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + LangBarMgr *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),0,sizeof(LangBarMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->LangBarMgrVtbl= &LangBarMgr_LangBarMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 24b3b64..62d1ff2 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -87,6 +87,7 @@ static const struct { {&CLSID_TF_ThreadMgr, ThreadMgr_Constructor}, {&CLSID_TF_InputProcessorProfiles, InputProcessorProfiles_Constructor}, {&CLSID_TF_CategoryMgr, CategoryMgr_Constructor}, + {&CLSID_TF_LangBarMgr, LangBarMgr_Constructor}, {NULL, NULL} }; @@ -617,3 +618,12 @@ HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void) FIXME("Stub\n"); return S_OK; } + +/*********************************************************************** + * TF_CreateLangBarMgr (MSCTF.@) + */ +HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm) +{ + TRACE("\n"); + return LangBarMgr_Constructor(NULL,(IUnknown**)pppbm); +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index c0cb829..387af57 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -13,7 +13,7 @@ @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) @ stub TF_CreateLangBarItemMgr -@ stub TF_CreateLangBarMgr +@ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther @ stub TF_GetGlobalCompartment diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 3bb0baa..57423e9 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -40,6 +40,7 @@ extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); +extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt);

1 0

Hans Leidekker : msi: PublishComponents must look at the requested install state of the feature, not the component.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: d95e3eb4d2a89ef52e764069d0a5a167daa496d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95e3eb4d2a89ef52e764069d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:55:03 2010 +0100 msi: PublishComponents must look at the requested install state of the feature, not the component. --- dlls/msi/action.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2c036b8..e12e014 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4490,33 +4490,34 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; - LPCWSTR compgroupid=NULL; - LPCWSTR feature=NULL; - LPCWSTR text = NULL; - LPCWSTR qualifier = NULL; - LPCWSTR component = NULL; - LPWSTR advertise = NULL; - LPWSTR output = NULL; + LPCWSTR compgroupid, component, feature, qualifier, text; + LPWSTR advertise = NULL, output = NULL; HKEY hkey; - UINT rc = ERROR_SUCCESS; + UINT rc; MSICOMPONENT *comp; - DWORD sz = 0; + MSIFEATURE *feat; + DWORD sz; MSIRECORD *uirow; - component = MSI_RecordGetString(rec,3); - comp = get_loaded_component(package,component); - if (!comp) + feature = MSI_RecordGetString(rec, 5); + feat = get_loaded_feature(package, feature); + if (!feat) return ERROR_SUCCESS; - if (comp->ActionRequest != INSTALLSTATE_LOCAL && - comp->ActionRequest != INSTALLSTATE_SOURCE && - comp->ActionRequest != INSTALLSTATE_ADVERTISED) + if (feat->ActionRequest != INSTALLSTATE_LOCAL && + feat->ActionRequest != INSTALLSTATE_SOURCE && + feat->ActionRequest != INSTALLSTATE_ADVERTISED) { - TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("Feature %s not scheduled for installation\n", debugstr_w(feature)); + feat->Action = feat->Installed; return ERROR_SUCCESS; } + component = MSI_RecordGetString(rec, 3); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + compgroupid = MSI_RecordGetString(rec,1); qualifier = MSI_RecordGetString(rec,2); @@ -4525,8 +4526,6 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) goto end; text = MSI_RecordGetString(rec,4); - feature = MSI_RecordGetString(rec,5); - advertise = create_component_advertise_string(package, comp, feature); sz = strlenW(advertise);

1 0

Hans Leidekker : msi: Implement the UnpublishComponents standard action.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 0f0e81d14a3cc8a9bb127edffca6bbb36b9fb651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0e81d14a3cc8a9bb127edff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:55:31 2010 +0100 msi: Implement the UnpublishComponents standard action. --- dlls/msi/action.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e12e014..20929c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4583,6 +4583,80 @@ static UINT ACTION_PublishComponents(MSIPACKAGE *package) return rc; } +static UINT ITERATE_UnpublishComponent( MSIRECORD *rec, LPVOID param ) +{ + static const WCHAR szInstallerComponents[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','s','t','a','l','l','e','r','\\', + 'C','o','m','p','o','n','e','n','t','s','\\',0}; + + MSIPACKAGE *package = param; + LPCWSTR compgroupid, component, feature, qualifier; + MSICOMPONENT *comp; + MSIFEATURE *feat; + MSIRECORD *uirow; + WCHAR squashed[GUID_SIZE], keypath[MAX_PATH]; + LONG res; + + feature = MSI_RecordGetString( rec, 5 ); + feat = get_loaded_feature( package, feature ); + if (!feat) + return ERROR_SUCCESS; + + if (feat->ActionRequest != INSTALLSTATE_ABSENT) + { + TRACE("Feature %s not scheduled for removal\n", debugstr_w(feature)); + feat->Action = feat->Installed; + return ERROR_SUCCESS; + } + + component = MSI_RecordGetString( rec, 3 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + compgroupid = MSI_RecordGetString( rec, 1 ); + qualifier = MSI_RecordGetString( rec, 2 ); + + squash_guid( compgroupid, squashed ); + strcpyW( keypath, szInstallerComponents ); + strcatW( keypath, squashed ); + + res = RegDeleteKeyW( HKEY_CURRENT_USER, keypath ); + if (res != ERROR_SUCCESS) + { + WARN("Unable to delete component key %d\n", res); + } + + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, compgroupid ); + MSI_RecordSetStringW( uirow, 2, qualifier ); + ui_actiondata( package, szUnpublishComponents, uirow ); + msiobj_release( &uirow->hdr ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','P','u','b','l','i','s','h', + 'C','o','m','p','o','n','e','n','t','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_UnpublishComponent, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; @@ -6550,12 +6624,6 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "SetODBCFolders", table ); } -static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'P','u','b','l','i','s','h','C','o','m','p','o','n','e','n','t',0 }; - return msi_unimplemented_action_stub( package, "UnpublishComponents", table ); -} - static UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR table[] = { 'A','p','p','I','d',0 };

1 0

Hans Leidekker : msi: Add tests for publishing and unpublishing components.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 7b660bb3d8fbb94b7067be07656cf7c0c7b7bb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b660bb3d8fbb94b7067be076… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:55:54 2010 +0100 msi: Add tests for publishing and unpublishing components. --- dlls/msi/tests/install.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 44eec8e..70013e5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1408,6 +1408,50 @@ static const CHAR crs_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR pub_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "english.txt\tpublish\tenglish.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR pub_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "publish\t\t\tpublish feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR pub_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "publish\tpublish\n"; + +static const CHAR pub_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "publish\t{B4EA0ACF-6238-426E-9C6D-7869F0F9C768}\tMSITESTDIR\t0\t\tenglish.txt\n"; + +static const CHAR pub_publish_component_dat[] = "ComponentId\tQualifier\tComponent_\tAppData\tFeature_\n" + "s38\ts255\ts72\tL255\ts38\n" + "PublishComponent\tComponentId\tQualifier\tComponent_\n" + "{92AFCBC0-9CA6-4270-8454-47C5EE2B8FAA}\tenglish.txt\tpublish\t\tpublish\n"; + +static const CHAR pub_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" + "PublishComponents\t\t3000\n" + "UnpublishComponents\t\t3100\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2245,6 +2289,19 @@ static const msi_table crs_tables[] = ADD_TABLE(property) }; +static const msi_table pub_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(pub_component), + ADD_TABLE(pub_feature), + ADD_TABLE(pub_feature_comp), + ADD_TABLE(pub_file), + ADD_TABLE(pub_publish_component), + ADD_TABLE(pub_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8209,6 +8266,42 @@ static void test_create_remove_shortcut(void) delete_test_files(); } +static void test_publish_components(void) +{ + static char keypath[] = + "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; + + UINT r; + LONG res; + HKEY key; + + create_test_files(); + create_file("msitest\\english.txt", 1000); + create_database(msifile, pub_tables, sizeof(pub_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); + ok(res == ERROR_SUCCESS, "components key not created %d\n", res); + + res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); + ok(res == ERROR_SUCCESS, "value not found %d\n", res); + RegCloseKey(key); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); + ok(res == ERROR_FILE_NOT_FOUND, "unexpected result %d\n", res); + + ok(!delete_pf("msitest\\english.txt", TRUE), "file not removed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8310,6 +8403,7 @@ START_TEST(install) test_install_remove_odbc(); test_register_typelib(); test_create_remove_shortcut(); + test_publish_components(); DeleteFileA(log_file);

1 0

Hans Leidekker : winhttp/tests: Wait for a handle closing notification.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 33e522eec677ab4101ccd4b7c99fc3e3e229845a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e522eec677ab4101ccd4b7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:56:19 2010 +0100 winhttp/tests: Wait for a handle closing notification. Fixes a Valgrind warning. --- dlls/winhttp/tests/notification.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 60e1595..bd6db58 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -88,7 +88,10 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW } } if (status_ok) info->index++; - if (status & WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS) SetEvent( info->wait ); + if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) + { + SetEvent( info->wait ); + } } static const struct notification cache_test[] = @@ -380,6 +383,8 @@ static void test_async( void ) WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); + + WaitForSingleObject( info.wait, INFINITE ); CloseHandle( info.wait ); }

1 0

Dan Kegel : advapi32: Fix leak in test_symlinks.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: fed6738bc40b30b6abe729afab9c1b26e077f35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed6738bc40b30b6abe729afa… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 20:51:42 2010 -0800 advapi32: Fix leak in test_symlinks. --- dlls/advapi32/tests/registry.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 4601134..2ad9f89 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -39,6 +39,7 @@ static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDW static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); +static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); /* Debugging functions from wine/libs/wine/debug.c */ @@ -125,6 +126,7 @@ static void InitFunctionPtrs(void) ADVAPI32_GET_PROC(RegDeleteTreeA); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pNtDeleteKey = (void *)GetProcAddress( hntdll, "NtDeleteKey" ); } @@ -1633,6 +1635,7 @@ static void test_symlinks(void) RegCloseKey( link ); HeapFree( GetProcessHeap(), 0, target ); + pRtlFreeUnicodeString( &target_str ); } START_TEST(registry)

1 0

Vincent Povirk : comdlg32/tests: Rely on the Symbol font instead of Tahoma.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 3f3101138a3abd7c4e712624f0878fa8c76f4d6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3101138a3abd7c4e712624f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 16 13:55:05 2010 -0600 comdlg32/tests: Rely on the Symbol font instead of Tahoma. --- dlls/comdlg32/tests/fontdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index 422bf8d..885fb44 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -53,7 +53,7 @@ static void test_ChooseFontA(void) memset(&lfa, 0, sizeof(LOGFONTA)); lfa.lfHeight = -16; lfa.lfWeight = FW_NORMAL; - strcpy(lfa.lfFaceName, "Tahoma"); + strcpy(lfa.lfFaceName, "Symbol"); memset(&cfa, 0, sizeof(CHOOSEFONTA)); cfa.lStructSize = sizeof(cfa); @@ -66,7 +66,7 @@ static void test_ChooseFontA(void) ok(ret == TRUE, "ChooseFontA returned FALSE\n"); ok(lfa.lfHeight == -16, "Expected -16, got %i\n", lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); - ok(strcmp(lfa.lfFaceName, "Tahoma") == 0, "Expected Arial, got %s\n", lfa.lfFaceName); + ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); } START_TEST(fontdlg)

1 0

Nikolay Sivov : msxml3: Use common format for TRACE() in DOM objects.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: abe86a1ef9a8b3490fa492de902e70d6920d5cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe86a1ef9a8b3490fa492de9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 17 09:40:40 2010 +0300 msxml3: Use common format for TRACE() in DOM objects. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 20 +++++---- dlls/msxml3/comment.c | 18 +++++---- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 93 +++++++++++++++++++++++++++------------------ dlls/msxml3/domimpl.c | 4 +- dlls/msxml3/element.c | 19 +++++---- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/node.c | 75 +++++++++++++++++++----------------- dlls/msxml3/nodelist.c | 11 +++-- dlls/msxml3/nodemap.c | 25 +++++++----- dlls/msxml3/parseerror.c | 17 +++++--- dlls/msxml3/pi.c | 4 +- dlls/msxml3/queryresult.c | 11 +++-- dlls/msxml3/schema.c | 2 +- dlls/msxml3/text.c | 19 +++++---- 17 files changed, 184 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abe86a1ef9a8b3490fa49…

1 0

Alexandre Julliard : version: Improve detection of builtin libraries.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 2b1ff0100668df2c1e65cdc6693149168c1b75c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1ff0100668df2c1e65cdc66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 09:41:20 2010 +0100 version: Improve detection of builtin libraries. --- dlls/version/info.c | 26 +++++++++----------------- dlls/version/resource.c | 4 ++++ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 8db40bc..e7f7077 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -238,7 +238,7 @@ typedef struct */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { - DWORD len, offset, magic = 0; + DWORD len, offset, magic = 1; HFILE lzfd; HMODULE hModule; OFSTRUCT ofs; @@ -263,7 +263,8 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) magic = find_version_resource( lzfd, &len, &offset ); LZClose( lzfd ); } - else if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + + if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), MAKEINTRESOURCEW(VS_FILE_INFO) ); @@ -274,11 +275,6 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) } FreeLibrary( hModule ); } - else - { - SetLastError( ofs.nErrCode ); - return 0; - } switch (magic) { @@ -306,7 +302,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) return (len * 2) + 4; default: - SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); return 0; } } @@ -340,7 +336,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { static const char signature[4] = "FE2X"; - DWORD len, offset, magic = 0; + DWORD len, offset, magic = 1; HFILE lzfd; OFSTRUCT ofs; HMODULE hModule; @@ -357,14 +353,15 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - if ((magic = find_version_resource( lzfd, &len, &offset ))) + if ((magic = find_version_resource( lzfd, &len, &offset )) > 1) { LZSeek( lzfd, offset, 0 /* SEEK_SET */ ); len = LZRead( lzfd, data, min( len, datasize ) ); } LZClose( lzfd ); } - else if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + + if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), MAKEINTRESOURCEW(VS_FILE_INFO) ); @@ -378,11 +375,6 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, } FreeLibrary( hModule ); } - else - { - SetLastError( ofs.nErrCode ); - return FALSE; - } switch (magic) { @@ -407,7 +399,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, return TRUE; default: - SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND); + SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND ); return FALSE; } } diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 9af07fe..68cda3f 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -101,7 +101,11 @@ static int read_xx_header( HFILE lzfd ) if ( sizeof(mzh) != LZRead( lzfd, (LPSTR)&mzh, sizeof(mzh) ) ) return 0; if ( mzh.e_magic != IMAGE_DOS_SIGNATURE ) + { + if (!memcmp( &mzh, "\177ELF", 4 )) return 1; /* ELF */ + if (*(UINT *)&mzh == 0xfeedface || *(UINT *)&mzh == 0xcefaedfe) return 1; /* Mach-O */ return 0; + } LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); if ( 2 != LZRead( lzfd, magic, 2 ) )

1 0