August 2011 - Wine-commits - list.winehq.org

Jacek Caban : oleaut32: Correctly test VARIANT_BOOL value in VarCat.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 6ee95c77381791299ae040248897ac58c74f49f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee95c77381791299ae040248… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 23 15:49:07 2011 +0200 oleaut32: Correctly test VARIANT_BOOL value in VarCat. --- dlls/oleaut32/tests/vartest.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 4 ++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 3032a9e..c52e3ce 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -345,6 +345,20 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT VariantClear( &result ); } +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + return lstrcmpW(strw, buf); +} + +#define test_bstr_var(a,b) _test_bstr_var(__LINE__,a,b) +static void _test_bstr_var(unsigned line, const VARIANT *v, const char *str) +{ + ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "unexpected vt=%d\n", V_VT(v)); + if(V_VT(v) == VT_BSTR) + ok(!strcmp_wa(V_BSTR(v), str), "v=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), str); +} static void test_VariantInit(void) { @@ -5645,6 +5659,30 @@ static void test_VarCat(void) VariantClear(&right); VariantClear(&result); VariantClear(&expected); + + /* Test boolean conversion */ + V_VT(&left) = VT_BOOL; + V_BOOL(&left) = VARIANT_TRUE; + V_VT(&right) = VT_BSTR; + V_BSTR(&right) = SysAllocStringLen(NULL,0); + hres = VarCat(&left, &right, &result); + ok(hres == S_OK, "VarCat failed: %08x\n", hres); + if(!strcmp_wa(V_BSTR(&result), "True")) { + V_VT(&right) = VT_BOOL; + V_BOOL(&right) = 100; + hres = VarCat(&left, &right, &result); + ok(hres == S_OK, "VarCat failed: %08x\n", hres); + test_bstr_var(&result, "TrueTrue"); + VariantClear(&result); + + V_BOOL(&right) = VARIANT_FALSE; + hres = VarCat(&left, &right, &result); + ok(hres == S_OK, "VarCat failed: %08x\n", hres); + test_bstr_var(&result, "TrueFalse"); + VariantClear(&result); + }else { + skip("Got %s as True, assuming non-English locale\n", wine_dbgstr_w(V_BSTR(&result))); + } } static HRESULT (WINAPI *pVarAnd)(LPVARIANT,LPVARIANT,LPVARIANT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 60407d5..0d1f2cc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2624,7 +2624,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ V_VT(&bstrvar_left) = VT_BSTR; - if (V_BOOL(left) == TRUE) + if (V_BOOL(left)) V_BSTR(&bstrvar_left) = SysAllocString(str_true); else V_BSTR(&bstrvar_left) = SysAllocString(str_false); @@ -2664,7 +2664,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ V_VT(&bstrvar_right) = VT_BSTR; - if (V_BOOL(right) == TRUE) + if (V_BOOL(right)) V_BSTR(&bstrvar_right) = SysAllocString(str_true); else V_BSTR(&bstrvar_right) = SysAllocString(str_false);

1 0

Francois Gouget : shdoclc: Convert some unneeded popup menu labels to comments.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 7ae341e2ce0908a4a2e8bfcb270e6a78749ba0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae341e2ce0908a4a2e8bfcb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 23 14:38:06 2011 +0200 shdoclc: Convert some unneeded popup menu labels to comments. --- dlls/shdoclc/shdoclc.rc | 24 ++++++++++---------- po/ar.po | 48 ------------------------------------------ po/bg.po | 48 ------------------------------------------ po/ca.po | 48 ------------------------------------------ po/cs.po | 48 ------------------------------------------ po/da.po | 53 ----------------------------------------------- po/de.po | 48 ------------------------------------------ po/el.po | 48 ------------------------------------------ po/en.po | 48 ------------------------------------------ po/en_US.po | 48 ------------------------------------------ po/eo.po | 48 ------------------------------------------ po/es.po | 53 ----------------------------------------------- po/fa.po | 48 ------------------------------------------ po/fi.po | 53 ----------------------------------------------- po/fr.po | 48 ------------------------------------------ po/he.po | 48 ------------------------------------------ po/hi.po | 48 ------------------------------------------ po/hu.po | 48 ------------------------------------------ po/it.po | 48 ------------------------------------------ po/ja.po | 48 ------------------------------------------ po/ko.po | 48 ------------------------------------------ po/lt.po | 48 ------------------------------------------ po/ml.po | 48 ------------------------------------------ po/nb_NO.po | 48 ------------------------------------------ po/nl.po | 48 ------------------------------------------ po/or.po | 48 ------------------------------------------ po/pa.po | 48 ------------------------------------------ po/pl.po | 48 ------------------------------------------ po/pt_BR.po | 48 ------------------------------------------ po/pt_PT.po | 53 ----------------------------------------------- po/rm.po | 48 ------------------------------------------ po/ro.po | 48 ------------------------------------------ po/ru.po | 48 ------------------------------------------ po/sk.po | 48 ------------------------------------------ po/sl.po | 48 ------------------------------------------ po/sr_RS(a)cyrillic.po | 48 ------------------------------------------ po/sr_RS(a)latin.po | 53 ----------------------------------------------- po/sv.po | 48 ------------------------------------------ po/te.po | 48 ------------------------------------------ po/th.po | 48 ------------------------------------------ po/tr.po | 48 ------------------------------------------ po/uk.po | 48 ------------------------------------------ po/wa.po | 48 ------------------------------------------ po/wine.pot | 48 ------------------------------------------ po/zh_CN.po | 48 ------------------------------------------ po/zh_TW.po | 48 ------------------------------------------ 46 files changed, 12 insertions(+), 2197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ae341e2ce0908a4a2e8b…

1 0

Francois Gouget : notepad: Tweak an error message for consistency.
by Alexandre Julliard 23 Aug '11

23 Aug '11

1 0

Francois Gouget : oleview: Replace the CLSCTX_XXX strings with proper English sentences.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: b1d171262ffd2456f5a490906932684ef1c437b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d171262ffd2456f5a490906… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 23 14:33:45 2011 +0200 oleview: Replace the CLSCTX_XXX strings with proper English sentences. --- po/ar.po | 16 ++++++++-------- po/bg.po | 22 ++++++++++++---------- po/ca.po | 16 ++++++++-------- po/cs.po | 22 ++++++++++++---------- po/da.po | 34 +++++++++++++++++++--------------- po/de.po | 34 +++++++++++++++++++--------------- po/el.po | 19 ++++++++++--------- po/en.po | 20 ++++++++++---------- po/en_US.po | 32 ++++++++++++++++---------------- po/eo.po | 22 ++++++++++++---------- po/es.po | 22 ++++++++++++---------- po/fa.po | 16 ++++++++-------- po/fi.po | 22 ++++++++++++---------- po/fr.po | 34 +++++++++++++++++++--------------- po/he.po | 34 +++++++++++++++++++--------------- po/hi.po | 16 ++++++++-------- po/hu.po | 22 ++++++++++++---------- po/it.po | 34 +++++++++++++++++++--------------- po/ja.po | 34 +++++++++++++++++++--------------- po/ko.po | 34 +++++++++++++++++++--------------- po/lt.po | 34 +++++++++++++++++++--------------- po/ml.po | 16 ++++++++-------- po/nb_NO.po | 34 +++++++++++++++++++--------------- po/nl.po | 34 +++++++++++++++++++--------------- po/or.po | 16 ++++++++-------- po/pa.po | 16 ++++++++-------- po/pl.po | 34 +++++++++++++++++++--------------- po/pt_BR.po | 34 +++++++++++++++++++--------------- po/pt_PT.po | 34 +++++++++++++++++++--------------- po/rm.po | 19 ++++++++++--------- po/ro.po | 34 +++++++++++++++++++--------------- po/ru.po | 34 +++++++++++++++++++--------------- po/sk.po | 22 ++++++++++++---------- po/sl.po | 34 +++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 22 ++++++++++++---------- po/sr_RS(a)latin.po | 22 ++++++++++++---------- po/sv.po | 34 +++++++++++++++++++--------------- po/te.po | 16 ++++++++-------- po/th.po | 19 ++++++++++--------- po/tr.po | 22 ++++++++++++---------- po/uk.po | 34 +++++++++++++++++++--------------- po/wa.po | 19 ++++++++++--------- po/wine.pot | 16 ++++++++-------- po/zh_CN.po | 34 +++++++++++++++++++--------------- po/zh_TW.po | 34 +++++++++++++++++++--------------- programs/oleview/oleview.rc | 16 ++++++++-------- 46 files changed, 646 insertions(+), 542 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d171262ffd2456f5a49…

1 0

Francois Gouget : hhctrl.ocx: Convert an unneeded popup menu label to a comment.
by Alexandre Julliard 23 Aug '11

23 Aug '11

1 0

Hans Leidekker : msi: Remove local patch packages when the product is removed.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 70e3790707cd8ba40167e443fe8a415904bd0677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e3790707cd8ba40167e443f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:03 2011 +0200 msi: Remove local patch packages when the product is removed. --- dlls/msi/action.c | 5 +++++ dlls/msi/msipriv.h | 3 +++ dlls/msi/package.c | 24 ++++++++++++------------ dlls/msi/patch.c | 31 +++++++++++++++++++++---------- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2c9c989..bea3052 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4938,6 +4938,11 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) LIST_FOR_EACH_ENTRY(patch, &package->patches, MSIPATCHINFO, entry) { MSIREG_DeleteUserDataPatchKey(patch->patchcode, package->Context); + if (!strcmpW( package->ProductCode, patch->products )) + { + TRACE("removing local patch package %s\n", debugstr_w(patch->localfile)); + patch->delete_on_close = TRUE; + } /* FIXME: remove local patch package if this is the last product */ } TRACE("removing local package %s\n", debugstr_w(package->localfile)); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7fb2d65..2524752 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -170,10 +170,12 @@ typedef struct tagMSIPATCHINFO { struct list entry; LPWSTR patchcode; + LPWSTR products; LPWSTR transforms; LPWSTR filename; LPWSTR localfile; MSIPATCHSTATE state; + BOOL delete_on_close; } MSIPATCHINFO; typedef struct tagMSIBINARY @@ -770,6 +772,7 @@ extern UINT msi_apply_transforms( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) DECLSPEC_HIDDEN; extern UINT msi_apply_patches( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) DECLSPEC_HIDDEN; +extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c9cbad1..e635886 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -293,18 +293,6 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( package->script ); } - LIST_FOR_EACH_SAFE( item, cursor, &package->patches ) - { - MSIPATCHINFO *patch = LIST_ENTRY( item, MSIPATCHINFO, entry ); - - list_remove( &patch->entry ); - msi_free( patch->patchcode ); - msi_free( patch->transforms ); - msi_free( patch->localfile ); - msi_free( patch->filename ); - msi_free( patch ); - } - LIST_FOR_EACH_SAFE( item, cursor, &package->binaries ) { MSIBINARY *binary = LIST_ENTRY( item, MSIBINARY, entry ); @@ -329,6 +317,18 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( cab ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->patches ) + { + MSIPATCHINFO *patch = LIST_ENTRY( item, MSIPATCHINFO, entry ); + + list_remove( &patch->entry ); + if (patch->delete_on_close && !DeleteFileW( patch->localfile )) + { + ERR("failed to delete %s (%u)\n", debugstr_w(patch->localfile), GetLastError()); + } + msi_free_patchinfo( patch ); + } + msi_free( package->BaseURL ); msi_free( package->PackagePath ); msi_free( package->ProductCode ); diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index c2660ad..4801872 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -184,10 +184,16 @@ static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) p[1] = 0; } TRACE("patch code %s\n", debugstr_w(pi->patchcode)); - + if (!(pi->products = msi_suminfo_dup_string( si, PID_TEMPLATE ))) + { + msi_free( pi->patchcode ); + msi_free( pi ); + return ERROR_OUTOFMEMORY; + } if (!(pi->transforms = msi_suminfo_dup_string( si, PID_LASTAUTHOR ))) { msi_free( pi->patchcode ); + msi_free( pi->products ); msi_free( pi ); return ERROR_OUTOFMEMORY; } @@ -597,6 +603,16 @@ static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIP return ERROR_SUCCESS; } +void msi_free_patchinfo( MSIPATCHINFO *patch ) +{ + msi_free( patch->patchcode ); + msi_free( patch->products ); + msi_free( patch->transforms ); + msi_free( patch->filename ); + msi_free( patch->localfile ); + msi_free( patch ); +} + static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) { static const WCHAR dotmsp[] = {'.','m','s','p',0}; @@ -646,11 +662,8 @@ done: msiobj_release( &patch_db->hdr ); if (patch && r != ERROR_SUCCESS) { - msi_free( patch->patchcode ); - msi_free( patch->transforms ); - msi_free( patch->filename ); - msi_free( patch->localfile ); - msi_free( patch ); + DeleteFileW( patch->localfile ); + msi_free_patchinfo( patch ); } return r; } @@ -756,6 +769,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) if (!patch_info->localfile) { msiobj_release( &patch_db->hdr ); + msi_free_patchinfo( patch_info ); return ERROR_OUTOFMEMORY; } r = msi_apply_patch_db( package, patch_db, patch_info ); @@ -763,10 +777,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) if (r != ERROR_SUCCESS) { ERR("failed to apply patch %u\n", r); - msi_free( patch_info->patchcode ); - msi_free( patch_info->transforms ); - msi_free( patch_info->localfile ); - msi_free( patch_info ); + msi_free_patchinfo( patch_info ); } return r; }

1 0

Hans Leidekker : msi: Initialize the installation context from the registry if the product is installed .
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: db6dbcf2a2f44715052e8efba824a624d24eb295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6dbcf2a2f44715052e8efba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:15 2011 +0200 msi: Initialize the installation context from the registry if the product is installed. --- dlls/msi/action.c | 17 +++++++++-------- dlls/msi/msi.c | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bea3052..71f4f6a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -488,14 +488,15 @@ static BOOL needs_ui_sequence(MSIPACKAGE *package) UINT msi_set_context(MSIPACKAGE *package) { - int num; - - package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; - - num = msi_get_property_int(package->db, szAllUsers, 0); - if (num == 1 || num == 2) - package->Context = MSIINSTALLCONTEXT_MACHINE; - + UINT r = msi_locate_product( package->ProductCode, &package->Context ); + if (r != ERROR_SUCCESS) + { + int num = msi_get_property_int( package->db, szAllUsers, 0 ); + if (num == 1 || num == 2) + package->Context = MSIINSTALLCONTEXT_MACHINE; + else + package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; + } return ERROR_SUCCESS; } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2a8fa72..7506338 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -54,6 +54,7 @@ UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) HKEY hkey = NULL; *context = MSIINSTALLCONTEXT_NONE; + if (!szProduct) return ERROR_UNKNOWN_PRODUCT; if (MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hkey, FALSE) == ERROR_SUCCESS)

1 0

Hans Leidekker : msi: Remove icons when the product is uninstalled.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: eb7ae99ddbbcb181248a5a3aa459fe064e8fe37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7ae99ddbbcb181248a5a3aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:27 2011 +0200 msi: Remove icons when the product is uninstalled. --- dlls/msi/action.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 2 ++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 71f4f6a..d008777 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4896,6 +4896,45 @@ static UINT ACTION_InstallExecute(MSIPACKAGE *package) return execute_script(package,INSTALL_SCRIPT); } +static UINT ITERATE_UnpublishIcon( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + const WCHAR *icon = MSI_RecordGetString( row, 1 ); + WCHAR *p, *icon_path; + + if (!icon) return ERROR_SUCCESS; + if ((icon_path = msi_build_icon_path( package, icon ))) + { + TRACE("removing icon file %s\n", debugstr_w(icon_path)); + DeleteFileW( icon_path ); + if ((p = strrchrW( icon_path, '\\' ))) + { + *p = 0; + RemoveDirectoryW( icon_path ); + } + msi_free( icon_path ); + } + return ERROR_SUCCESS; +} + +static UINT msi_unpublish_icons( MSIPACKAGE *package ) +{ + static const WCHAR query[]= { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','I','c','o','n','`',0}; + MSIQUERY *view; + UINT r; + + r = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (r == ERROR_SUCCESS) + { + r = MSI_IterateRecords( view, NULL, ITERATE_UnpublishIcon, package ); + msiobj_release( &view->hdr ); + if (r != ERROR_SUCCESS) + return r; + } + return ERROR_SUCCESS; +} + static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) { static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; @@ -4948,6 +4987,8 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) } TRACE("removing local package %s\n", debugstr_w(package->localfile)); package->delete_on_close = TRUE; + + msi_unpublish_icons( package ); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1c550ae..a870353 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5980,6 +5980,7 @@ static void test_icon_table(void) res = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(res == ERROR_SUCCESS, "Failed to uninstall per-user\n"); + ok(!file_exists(path), "Per-user icon file not removed (%s)\n", path); /* system-wide */ res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1"); @@ -5994,6 +5995,7 @@ static void test_icon_table(void) res = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n"); + ok(!file_exists(path), "System-wide icon file not removed (%s)\n", path); delete_pfmsitest_files(); DeleteFile(msifile);

1 0

Hans Leidekker : msi/tests: Clean up local packages.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: fabfc5da78d27087abb75b21c544d78fdbdeb841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabfc5da78d27087abb75b21c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:38 2011 +0200 msi/tests: Clean up local packages. --- dlls/msi/tests/automation.c | 7 ++++++- dlls/msi/tests/install.c | 30 ++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index fff068f..3bbc037 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -47,6 +47,7 @@ static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-',' static const WCHAR szProductInfoException[] = { 'P','r','o','d','u','c','t','I','n','f','o',',','P','r','o','d','u','c','t',',','A','t','t','r','i','b','u','t','e',0 }; static const WCHAR WINE_INSTALLPROPERTY_PACKAGENAMEW[] = {'P','a','c','k','a','g','e','N','a','m','e',0}; static const WCHAR WINE_INSTALLPROPERTY_PRODUCTNAMEW[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; +static const WCHAR WINE_INSTALLPROPERTY_LOCALPACKAGEW[] = {'L','o','c','a','l','P','a','c','k','a','g','e',0}; static FILETIME systemtime; static CHAR CURR_DIR[MAX_PATH]; static EXCEPINFO excepinfo; @@ -2485,6 +2486,10 @@ static void test_Installer_InstallProduct(void) IDispatch_Release(pStringList); } + hr = Installer_ProductInfo(szProductCode, WINE_INSTALLPROPERTY_LOCALPACKAGEW, szString); + ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + DeleteFileW( szString ); + /* Check & clean up installed files & registry keys */ ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); @@ -2563,7 +2568,7 @@ static void test_Installer_InstallProduct(void) RegCloseKey(hkey); - /* Delete installation files we installed */ + /* Delete installation files we created */ delete_test_files(); } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a870353..3417d9a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4754,7 +4754,7 @@ static void test_MsiConfigureProductEx(void) LONG res; DWORD type, size; HKEY props, source; - CHAR keypath[MAX_PATH * 2], localpack[MAX_PATH]; + CHAR keypath[MAX_PATH * 2], localpackage[MAX_PATH], packagename[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS; if (is_process_limited()) @@ -4886,7 +4886,7 @@ static void test_MsiConfigureProductEx(void) DeleteFileA(msifile); - /* local msifile is removed */ + /* msifile is removed */ r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); @@ -4915,6 +4915,12 @@ static void test_MsiConfigureProductEx(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + type = REG_SZ; + size = MAX_PATH; + res = RegQueryValueExA(props, "LocalPackage", NULL, &type, + (LPBYTE)localpackage, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, (const BYTE *)"C:\\idontexist.msi", 18); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4933,7 +4939,7 @@ static void test_MsiConfigureProductEx(void) RegCloseKey(props); create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); - /* LastUsedSource (local msi package) can be used as a last resort */ + /* LastUsedSource can be used as a last resort */ r = MsiConfigureProductExA("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); @@ -4942,6 +4948,7 @@ static void test_MsiConfigureProductEx(void) ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "Directory not removed\n"); + DeleteFileA( localpackage ); /* install the product, machine */ r = MsiInstallProductA(msifile, "ALLUSERS=1 INSTALLLEVEL=10 PROPVAR=42"); @@ -4958,6 +4965,12 @@ static void test_MsiConfigureProductEx(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + type = REG_SZ; + size = MAX_PATH; + res = RegQueryValueExA(props, "LocalPackage", NULL, &type, + (LPBYTE)localpackage, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, (const BYTE *)"C:\\idontexist.msi", 18); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4971,7 +4984,7 @@ static void test_MsiConfigureProductEx(void) type = REG_SZ; size = MAX_PATH; res = RegQueryValueExA(source, "PackageName", NULL, &type, - (LPBYTE)localpack, &size); + (LPBYTE)packagename, &size); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegSetValueExA(source, "PackageName", 0, REG_SZ, @@ -4989,9 +5002,14 @@ static void test_MsiConfigureProductEx(void) ok(pf_exists("msitest\\lithium"), "File not installed\n"); ok(pf_exists("msitest"), "File not installed\n"); - /* restore the SourceList */ + /* restore PackageName */ res = RegSetValueExA(source, "PackageName", 0, REG_SZ, - (const BYTE *)localpack, lstrlenA(localpack) + 1); + (const BYTE *)packagename, lstrlenA(packagename) + 1); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + /* restore LocalPackage */ + res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, + (const BYTE *)localpackage, lstrlenA(localpackage) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); /* finally remove the product */

1 0

Francois Gouget : wineps.drv: Make PSDRV_WriteRGB() static.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 3704821417337a9bc3a6378fbf32e91e79afebb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3704821417337a9bc3a6378fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 23 14:11:37 2011 +0200 wineps.drv: Make PSDRV_WriteRGB() static. --- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index ab9d570..09b02ef 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -655,7 +655,7 @@ BOOL PSDRV_WriteIndexColorSpaceEnd(PHYSDEV dev) return PSDRV_WriteSpool(dev, buf, sizeof(buf) - 1); } -BOOL PSDRV_WriteRGB(PHYSDEV dev, COLORREF *map, int number) +static BOOL PSDRV_WriteRGB(PHYSDEV dev, COLORREF *map, int number) { char *buf = HeapAlloc(PSDRV_Heap, 0, number * 7 + 1), *ptr; int i; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 7b8185f..f4bb17d 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -519,7 +519,6 @@ extern BOOL PSDRV_WriteHatch(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRotate(PHYSDEV dev, float ang) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteIndexColorSpaceBegin(PHYSDEV dev, int size) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteIndexColorSpaceEnd(PHYSDEV dev) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteRGB(PHYSDEV dev, COLORREF *map, int number) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRGBQUAD(PHYSDEV dev, const RGBQUAD *rgb, int number) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, INT widthDst, INT heightDst, INT widthSrc,

1 0