September 2014 - Wine-commits

Jacek Caban : wininet: Fixed buffer size rising in get_cookie.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 55e3ec650e43dcd01cbc5c9f87c7e8be829980ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e3ec650e43dcd01cbc5c9f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 13:05:34 2014 +0200 wininet: Fixed buffer size rising in get_cookie. --- dlls/wininet/cookie.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index d98a127..57e5424 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -635,17 +635,18 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) continue; - if(res->size) { + + if(!res->size) { + res->cookies = heap_alloc(4*sizeof(*res->cookies)); + if(!res->cookies) + continue; + res->size = 4; + }else if(res->cnt == res->size) { cookie_t **new_cookies = heap_realloc(res->cookies, res->size*2*sizeof(*res->cookies)); if(!new_cookies) continue; res->cookies = new_cookies; res->size *= 2; - }else { - res->cookies = heap_alloc(4*sizeof(*res->cookies)); - if(!res->cookies) - continue; - res->size = 4; } if(res->cnt)

1 0

Jonathan Vollebregt : reg.exe: Fix stack overflow on large registry keys.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: b823337f65213889e7b1e27e6fa5a8afc4e0f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b823337f65213889e7b1e27e6… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Mon Sep 1 15:05:30 2014 +0200 reg.exe: Fix stack overflow on large registry keys. --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 1b46661..d299cbf 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -28,7 +28,7 @@ static int reg_printfW(const WCHAR *msg, ...) WCHAR msg_buffer[8192]; va_start(va_args, msg); - vsprintfW(msg_buffer, msg, va_args); + vsnprintfW(msg_buffer, 8192, msg, va_args); va_end(va_args); wlen = lstrlenW(msg_buffer);

1 0

Jactry Zeng : mshtml: Add IHTMLStyle5::minWidth property implementation.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 47f26eb9c0766cbc4b2597fdef846181bcf28935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f26eb9c0766cbc4b2597fde… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 2 10:20:01 2014 +0800 mshtml: Add IHTMLStyle5::minWidth property implementation. --- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++---- dlls/mshtml/tests/style.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aa19da7..f098cb0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -146,6 +146,8 @@ static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; +static const WCHAR attrMinWidth[] = + {'m','i','n','-','w','i','d','t','h',0}; static const WCHAR attrOutline[] = {'o','u','t','l','i','n','e',0}; static const WCHAR attrOverflow[] = @@ -263,6 +265,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, + {attrMinWidth, DISPID_IHTMLSTYLE5_MINWIDTH}, {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 3c6bb6c..1ae8d8c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -88,6 +88,7 @@ typedef enum { STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, + STYLEID_MIN_WIDTH, STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 1cff71b..c704f08 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -544,15 +544,19 @@ static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_WIDTH, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle5_get_minWidth(IHTMLStyle5 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle5(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle5_put_maxWidth(IHTMLStyle5 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 5297246..2204c5a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -499,6 +499,57 @@ static void test_style4(IHTMLStyle4 *style4) VariantClear(&vdefault); } +static void test_style5(IHTMLStyle5 *style5) +{ + HRESULT hres; + VARIANT v; + VARIANT vdefault; + + /* minWidth */ + hres = IHTMLStyle5_get_minWidth(style5, &vdefault); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("12px"); + hres = IHTMLStyle5_put_minWidth(style5, v); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_minWidth(style5, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "12px"), "expect 12px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10%"); + hres = IHTMLStyle5_put_minWidth(style5, v); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_minWidth(style5, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "10%"), "expect 10%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle5_put_minWidth(style5, v); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle5_get_minWidth(style5, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expect 10px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle5_put_minWidth(style5, vdefault); + ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + VariantClear(&vdefault); +} + static void test_style6(IHTMLStyle6 *style) { BSTR str; @@ -544,6 +595,7 @@ static void test_body_style(IHTMLStyle *style) IHTMLStyle2 *style2; IHTMLStyle3 *style3; IHTMLStyle4 *style4; + IHTMLStyle5 *style5; IHTMLStyle6 *style6; VARIANT_BOOL b; VARIANT v; @@ -2249,6 +2301,14 @@ static void test_body_style(IHTMLStyle *style) IHTMLStyle4_Release(style4); } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle5, (void**)&style5); + if(SUCCEEDED(hres)) { + test_style5(style5); + IHTMLStyle5_Release(style5); + }else { + win_skip("IHTMLStyle5 not available\n"); + } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle6, (void**)&style6); if(SUCCEEDED(hres)) { test_style6(style6);

1 0

Piotr Caban : msvcr80: Throw bad_alloc exception when operator new fails.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 43be238331ba8cebd4c8bf93eb2d7be0e1339184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43be238331ba8cebd4c8bf93e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 2 17:06:06 2014 +0200 msvcr80: Throw bad_alloc exception when operator new fails. --- dlls/msvcrt/cpp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/heap.c | 3 +++ dlls/msvcrt/msvcrt.h | 5 ++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index db48dcb..de9a9b4 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -696,6 +696,47 @@ DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) +#if _MSVCR_VER >= 80 +typedef exception bad_alloc; +extern const vtable_ptr MSVCRT_bad_alloc_vtable; + +static void bad_alloc_ctor(bad_alloc *this, const char **name) +{ + MSVCRT_exception_ctor(this, name); + this->vtable = &MSVCRT_bad_alloc_vtable; +} + +/* bad_alloc class implementation */ +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_copy_ctor,8) +bad_alloc * __thiscall MSVCRT_bad_alloc_copy_ctor(bad_alloc * _this, const bad_alloc * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + MSVCRT_exception_copy_ctor(_this, rhs); + _this->vtable = &MSVCRT_bad_alloc_vtable; + return _this; +} + +DEFINE_THISCALL_WRAPPER(MSVCRT_bad_alloc_dtor,4) +void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) +{ + TRACE("(%p)\n", _this); + MSVCRT_exception_dtor(_this); +} + +__ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCRT_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCRT_what_exception)); +DEFINE_RTTI_DATA1( bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@" ) +DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL ) + +void throw_bad_alloc(const char *str) +{ + bad_alloc e; + bad_alloc_ctor(&e, &str); + _CxxThrowException(&e, &bad_alloc_exception_type); +} +#endif + void msvcrt_init_exception(void *base) { #ifdef __x86_64__ @@ -703,6 +744,7 @@ void msvcrt_init_exception(void *base) init_exception_rtti(base); #if _MSVCR_VER >= 80 init_exception_old_rtti(base); + init_bad_alloc_rtti(base); #endif init_bad_typeid_rtti(base); init_bad_cast_rtti(base); @@ -712,6 +754,9 @@ void msvcrt_init_exception(void *base) init_bad_typeid_cxx(base); init_bad_cast_cxx(base); init___non_rtti_object_cxx(base); +#if _MSVCR_VER >= 80 + init_bad_alloc_cxx(base); +#endif #endif } diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 432df86..bb265bf 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -150,6 +150,9 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) } while(freed); TRACE("(%ld) out of memory\n", size); +#if _MSVCR_VER >= 80 + throw_bad_alloc("bad allocation"); +#endif return NULL; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c4e763..54cd11a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -234,7 +234,10 @@ extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +void msvcrt_set_errno(int) DECLSPEC_HIDDEN; +#if _MSVCR_VER >= 80 +void throw_bad_alloc(const char*) DECLSPEC_HIDDEN; +#endif void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum);

1 0

Francois Gouget : winewrapper: In 64 bit trees the loader is called wine64.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 12aa347e129b431001a2c5318db6bf50acb36179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12aa347e129b431001a2c5318… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 2 16:52:37 2014 +0200 winewrapper: In 64 bit trees the loader is called wine64. --- tools/winewrapper | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winewrapper b/tools/winewrapper index b324daa..2206d7c 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -88,6 +88,8 @@ if [ -x "$topdir/loader/$name" ] then WINELOADER="$topdir/loader/$name" elif [ -x "$topdir/loader/wine" ] then WINELOADER="$topdir/loader/wine" +elif [ -x "$topdir/loader/wine64" ] +then WINELOADER="$topdir/loader/wine64" else echo "$name: could not find the Wine loader in $topdir" exit 1

1 0

Hans Leidekker : msi/tests: Make tests pass when running from the root directory.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 90f023a6355103c2f85fdd91615b22862fba9df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f023a6355103c2f85fdd916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:03:20 2014 +0200 msi/tests: Make tests pass when running from the root directory. --- dlls/msi/tests/package.c | 205 ++++++++++++++++++++++++++--------------------- 1 file changed, 115 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90f023a6355103c2f85fd…

1 0

Hans Leidekker : msi: Set the OutOfNoRbDiskSpace property.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 04f9058a2897b03544ad59545d0b9c9e1ee43ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f9058a2897b03544ad59545… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:03:56 2014 +0200 msi: Set the OutOfNoRbDiskSpace property. --- dlls/msi/action.c | 3 +++ dlls/msi/tests/package.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 41f367b..7ebdcc8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2355,6 +2355,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) static const WCHAR szPrimaryVolumeSpaceAvailable[] = {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', 'A','v','a','i','l','a','b','l','e',0}; + static const WCHAR szOutOfNoRbDiskSpace[] = + {'O','u','t','O','f','N','o','R','b','D','i','s','k','S','p','a','c','e',0}; MSICOMPONENT *comp; MSIQUERY *view; WCHAR *level, *primary_key, *primary_folder; @@ -2431,6 +2433,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) /* FIXME: check volume disk space */ msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); + msi_set_property( package->db, szOutOfNoRbDiskSpace, szZero, -1 ); return MSI_SetFeatureStates(package); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9705827..1a5935d 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1145,6 +1145,12 @@ static void test_settargetpath(void) r = MsiDoActionA( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + buffer[0] = 0; + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "OutOfNoRbDiskSpace", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + trace( "OutOfNoRbDiskSpace = \"%s\"\n", buffer ); + r = MsiSetTargetPathA( 0, NULL, NULL ); ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n");

1 0

Hans Leidekker : msi: Return an error from MSI_GetComponentPath if the buffer is too small.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 5709249986bb40c4c39a1baf4b420713446f2708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5709249986bb40c4c39a1baf4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:04:19 2014 +0200 msi: Return an error from MSI_GetComponentPath if the buffer is too small. --- dlls/msi/msi.c | 14 ++++++++++---- dlls/msi/tests/msi.c | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 5b344ca..70a8134 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2865,7 +2865,9 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, if (state == INSTALLSTATE_LOCAL && !*path) state = INSTALLSTATE_NOTUSED; - msi_strcpy_to_awstring(path, -1, lpPathBuf, pcchBuf); + if (msi_strcpy_to_awstring(path, -1, lpPathBuf, pcchBuf) == ERROR_MORE_DATA) + state = INSTALLSTATE_MOREDATA; + msi_free(path); return state; } @@ -3379,6 +3381,7 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, HKEY hkey; DWORD sz; UINT rc; + INSTALLSTATE state; rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); if (rc != ERROR_SUCCESS) @@ -3393,13 +3396,16 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, MsiDecomposeDescriptorW(info, product, feature, component, &sz); if (!szProduct) - rc = MSI_GetComponentPath(product, component, lpPathBuf, pcchPathBuf); + state = MSI_GetComponentPath(product, component, lpPathBuf, pcchPathBuf); else - rc = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); + state = MSI_GetComponentPath(szProduct, component, lpPathBuf, pcchPathBuf); msi_free( info ); - if (rc != INSTALLSTATE_LOCAL) + if (state == INSTALLSTATE_MOREDATA) + return ERROR_MORE_DATA; + + if (state != INSTALLSTATE_LOCAL) return ERROR_FILE_NOT_FOUND; return ERROR_SUCCESS; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3897c24..c517fcf 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -3008,6 +3008,13 @@ static void test_MsiGetComponentPath(void) create_file("C:\\imapath", "C:\\imapath", 11); /* file exists */ + path[0] = 'a'; + size = 0; + state = MsiGetComponentPathA(prodcode, component, path, &size); + ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state); + ok(path[0] == 'a', "got %s\n", path); + ok(size == 10, "Expected 10, got %d\n", size); + path[0] = 0; size = MAX_PATH; state = MsiGetComponentPathA(prodcode, component, path, &size); @@ -3015,6 +3022,13 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); + size = 0; + path[0] = 'a'; + state = MsiLocateComponentA(component, path, &size); + ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state); + ok(path[0] == 'a', "got %s\n", path); + ok(size == 10, "Expected 10, got %d\n", size); + path[0] = 0; size = MAX_PATH; state = MsiLocateComponentA(component, path, &size);

1 0

Hans Leidekker : msi: Update the cached product code when the property has changed.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 614cb7eac75a3eabc261821725f7f145fdf603a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=614cb7eac75a3eabc26182172… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 16:04:53 2014 +0200 msi: Update the cached product code when the property has changed. --- dlls/msi/action.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7ebdcc8..1fe6226 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7754,7 +7754,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; - WCHAR *reinstall, *remove, *patch; + WCHAR *reinstall, *remove, *patch, *productcode; BOOL ui_exists; UINT rc; @@ -7823,6 +7823,15 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_adjust_privilege_properties( package ); msi_set_context( package ); + productcode = msi_dup_property( package->db, szProductCode ); + if (strcmpiW( productcode, package->ProductCode )) + { + TRACE( "product code changed %s -> %s\n", debugstr_w(package->ProductCode), debugstr_w(productcode) ); + msi_free( package->ProductCode ); + package->ProductCode = productcode; + } + else msi_free( productcode ); + if (msi_get_property_int( package->db, szDisableRollback, 0 )) { TRACE("disabling rollback\n");

1 0

Akihiro Sagawa : winmm/tests: Add more tests for custom procedures.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 4df26eefe66fa7c88739d576a153c77443215496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df26eefe66fa7c88739d576a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 2 00:10:09 2014 +0900 winmm/tests: Add more tests for custom procedures. --- dlls/winmm/tests/mmio.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5e440b8..57dc166 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -608,6 +608,10 @@ static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM return MMSYSERR_NOERROR; case MMIOM_CLOSE: return MMSYSERR_NOERROR; + case MMIOM_SEEK: + lpInfo->adwInfo[1]++; + lpInfo->lDiskOffset = 0xdeadbeef; + return 0; default: return 0; } @@ -632,6 +636,10 @@ static void test_mmioOpen_fourcc(void) mmioGetInfo(hmmio, &mmio, 0); ok(hmmio && mmio.fccIOProc == FOURCC_XYZ, "mmioOpenA error %u, got %4.4s\n", mmio.wErrorRet, (LPCSTR)&mmio.fccIOProc); + todo_wine ok(mmio.adwInfo[1] == 0, "mmioOpenA sent MMIOM_SEEK, got %d\n", + mmio.adwInfo[1]); + todo_wine ok(mmio.lDiskOffset == 0, "mmioOpenA updated lDiskOffset, got %d\n", + mmio.lDiskOffset); mmioClose(hmmio, 0); mmioInstallIOProcA(FOURCC_XYZ, NULL, MMIO_REMOVEPROC);

1 0