December 2014 - Wine-Commits

Nikolay Sivov : dwrite: Release system collection pointer after using it, not before.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 8dfe0ff251cfe7a098c456e3d6c2e6643f6ed5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfe0ff251cfe7a098c456e3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 16 17:59:44 2014 +0300 dwrite: Release system collection pointer after using it, not before. --- dlls/dwrite/main.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c960b1e..eeb8728 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -921,18 +921,22 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory2 *iface, WCH DWRITE_FONT_STRETCH stretch, FLOAT size, WCHAR const *locale, IDWriteTextFormat **format) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); + IDWriteFontCollection *syscollection = NULL; + HRESULT hr; + TRACE("(%p)->(%s %p %d %d %d %f %s %p)\n", This, debugstr_w(family_name), collection, weight, style, stretch, size, debugstr_w(locale), format); - if (!collection) - { - HRESULT hr = IDWriteFactory2_GetSystemFontCollection(iface, &collection, FALSE); - if (hr != S_OK) + if (!collection) { + hr = IDWriteFactory2_GetSystemFontCollection(iface, &syscollection, FALSE); + if (FAILED(hr)) return hr; - /* Our ref count is 1 too many, since we will add ref in create_textformat */ - IDWriteFontCollection_Release(This->system_collection); } - return create_textformat(family_name, collection, weight, style, stretch, size, locale, format); + + hr = create_textformat(family_name, collection ? collection : syscollection, weight, style, stretch, size, locale, format); + if (syscollection) + IDWriteFontCollection_Release(syscollection); + return hr; } static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory2 *iface, IDWriteTypography **typography)

1 0

Dmitry Kozliuk : winecfg: Fix title reset when removing application from the list.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: b4e261480daa3e371826284d3f792897ddf29be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e261480daa3e371826284d3… Author: Dmitry Kozliuk <dmitry.kozliuk(a)gmail.com> Date: Tue Dec 16 01:42:37 2014 +0300 winecfg: Fix title reset when removing application from the list. --- programs/winecfg/appdefaults.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 7dd3900..66085f4 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -394,7 +394,7 @@ static void on_remove_app_click(HWND dialog) item.mask = LVIF_STATE; item.state = LVIS_SELECTED | LVIS_FOCUSED; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; - SendMessageW(listview, LVM_SETITEMSTATE, -1, (LPARAM)&item); + SendMessageW(listview, LVM_SETITEMSTATE, 0, (LPARAM)&item); SetFocus(listview); SendMessageW(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0);

1 0

Sebastian Lackner : kernel32: Return proper char count in get_registry_locale_info.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 8826ba1bc86fefa22c543608585ae8f3b4310a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8826ba1bc86fefa22c5436085… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Dec 16 04:10:34 2014 +0100 kernel32: Return proper char count in get_registry_locale_info. --- dlls/kernel32/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5fee723..1460f7a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1206,7 +1206,9 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS { if (status == STATUS_BUFFER_OVERFLOW && !buffer) { - ret = (size - info_size) / sizeof(WCHAR) + 1; + ret = (size - info_size) / sizeof(WCHAR); + if (!ret || ((WCHAR *)&info->Data)[ret-1]) + ret++; } else if (status == STATUS_OBJECT_NAME_NOT_FOUND) {

1 0

Jacek Caban : mshtml: Improved IHTMLStyle3::zoom stub.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: f95e7a4ed38b8c94ae6443db0b72a61a67496201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95e7a4ed38b8c94ae6443db0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 15 19:13:23 2014 +0100 mshtml: Improved IHTMLStyle3::zoom stub. --- dlls/mshtml/htmlstyle3.c | 32 ++++++++++++++++++++++++++------ dlls/mshtml/tests/style.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 6532bf4..9355bd0 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -103,26 +103,46 @@ static HRESULT WINAPI HTMLStyle3_get_layoutFlow(IHTMLStyle3 *iface, BSTR *p) return E_NOTIMPL; } +static const WCHAR zoomW[] = {'z','o','o','m',0}; + static HRESULT WINAPI HTMLStyle3_put_zoom(IHTMLStyle3 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle3(iface); + VARIANT *var; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. * The value is set to 1 then. We can safely ignore setting zoom to 1. */ - if(V_VT(&v) == VT_I4 && V_I4(&v) == 1) - return S_OK; + if(V_VT(&v) != VT_I4 || V_I4(&v) != 1) + WARN("stub for %s\n", debugstr_variant(&v)); - FIXME("stub for %s\n", debugstr_variant(&v)); - return E_NOTIMPL; + hres = dispex_get_dprop_ref(&This->dispex, zoomW, TRUE, &var); + if(FAILED(hres)) + return hres; + + return VariantChangeType(var, &v, 0, VT_BSTR); } static HRESULT WINAPI HTMLStyle3_get_zoom(IHTMLStyle3 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + VARIANT *var; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = dispex_get_dprop_ref(&This->dispex, zoomW, FALSE, &var); + if(hres == DISP_E_UNKNOWNNAME) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = NULL; + return S_OK; + } + if(FAILED(hres)) + return hres; + + return VariantCopy(p, var); } static HRESULT WINAPI HTMLStyle3_put_wordWrap(IHTMLStyle3 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 1cdd1c7..fffade0 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -453,6 +453,7 @@ static void test_style2(IHTMLStyle2 *style2) static void test_style3(IHTMLStyle3 *style3) { + VARIANT v; BSTR str; HRESULT hres; @@ -471,6 +472,37 @@ static void test_style3(IHTMLStyle3 *style3) ok(hres == S_OK, "get_wordWrap failed: %08x\n", hres); ok(!strcmp_wa(str, "break-word"), "get_wordWrap returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + V_VT(&v) = VT_ERROR; + hres = IHTMLStyle3_get_zoom(style3, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("100%"); + hres = IHTMLStyle3_put_zoom(style3, v); + ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLStyle3_get_zoom(style3, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100%"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + hres = IHTMLStyle3_put_zoom(style3, v); + ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + + V_VT(&v) = VT_ERROR; + hres = IHTMLStyle3_get_zoom(style3, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "1"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); } static void test_style4(IHTMLStyle4 *style4)

1 0

Andrew Eikum : winmm: Allow larger MMTIME sizes.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: cba322d71d317bc52e9de5a057723bf5d6dc1e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba322d71d317bc52e9de5a05… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 15 10:21:52 2014 -0600 winmm: Allow larger MMTIME sizes. --- dlls/winmm/tests/wave.c | 7 ++++++- dlls/winmm/waveform.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d370461..4dcc577 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -487,7 +487,12 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, DWORD returned; mmtime.wType = TIME_BYTES; - rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); + rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime) - 1); + ok(rc==MMSYSERR_ERROR, + "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + + mmtime.wType = TIME_BYTES; + rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime) + 1); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); if (mmtime.wType != TIME_BYTES && winetest_debug > 1) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 32083b8..f381c16 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2981,9 +2981,12 @@ UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, LPMMTIME lpTime, { TRACE("(%p, %p, %u)\n", hWaveOut, lpTime, uSize); - if(!uSize || !lpTime || uSize != sizeof(MMTIME)) + if(!uSize || !lpTime) return MMSYSERR_INVALPARAM; + if(uSize < sizeof(MMTIME)) + return MMSYSERR_ERROR; + return WINMM_GetPosition((HWAVE)hWaveOut, lpTime); } @@ -3602,9 +3605,12 @@ UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, LPMMTIME lpTime, { TRACE("(%p, %p, %u)\n", hWaveIn, lpTime, uSize); - if(!uSize || !lpTime || uSize != sizeof(MMTIME)) + if(!uSize || !lpTime) return MMSYSERR_INVALPARAM; + if(uSize < sizeof(MMTIME)) + return MMSYSERR_ERROR; + return WINMM_GetPosition((HWAVE)hWaveIn, lpTime); }

1 0

Michael Stefaniuc : oleaut32/tests: Remove duplicated subexpressions ( PVS-Studio).
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: e85db0891be3c00771b1834d11adb12fcf634c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85db0891be3c00771b1834d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 15 13:30:10 2014 +0100 oleaut32/tests: Remove duplicated subexpressions (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 28983ff..d15adcb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6051,7 +6051,6 @@ static void test_VarAnd(void) else if (leftvt == VT_I4 || rightvt == VT_I4 || leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_INT || rightvt == VT_INT || - leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_CY || rightvt == VT_CY ||

1 0

Jacek Caban : mshtml: Added IHTMLStyle:: styleFloat attribute implementation.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 76f7be04c78c841177780fefca24ea8b88d372e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f7be04c78c841177780fefc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 15 19:13:13 2014 +0100 mshtml: Added IHTMLStyle::styleFloat attribute implementation. --- dlls/mshtml/htmlstyle.c | 17 +++++++++++++---- dlls/mshtml/htmlstyle.h | 4 +++- dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 730ae2d..33318ff 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -110,6 +110,8 @@ static const WCHAR attrDisplay[] = {'d','i','s','p','l','a','y',0}; static const WCHAR attrFilter[] = {'f','i','l','e','t','e','r',0}; +static const WCHAR attrFloat[] = + {'f','l','o','a','t',0}; static const WCHAR attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; static const WCHAR attrFontSize[] = @@ -251,6 +253,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrDirection, DISPID_IHTMLSTYLE2_DIRECTION}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, {attrFilter, DISPID_IHTMLSTYLE_FILTER}, + {attrFloat, DISPID_IHTMLSTYLE_STYLEFLOAT}, {attrFontFamily, DISPID_IHTMLSTYLE_FONTFAMILY}, {attrFontSize, DISPID_IHTMLSTYLE_FONTSIZE}, {attrFontStyle, DISPID_IHTMLSTYLE_FONTSTYLE}, @@ -300,6 +303,8 @@ static const style_tbl_entry_t style_tbl[] = { {attrZIndex, DISPID_IHTMLSTYLE_ZINDEX} }; +C_ASSERT(sizeof(style_tbl)/sizeof(*style_tbl) == STYLEID_MAX_VALUE); + static const WCHAR valLineThrough[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; static const WCHAR valUnderline[] = @@ -2132,15 +2137,19 @@ static HRESULT WINAPI HTMLStyle_get_height(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_styleFloat(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_FLOAT, v, 0); } static HRESULT WINAPI HTMLStyle_get_styleFloat(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_FLOAT, p); } static HRESULT WINAPI HTMLStyle_put_clear(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index de6f37e..6fbbea2 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -70,6 +70,7 @@ typedef enum { STYLEID_DIRECTION, STYLEID_DISPLAY, STYLEID_FILTER, + STYLEID_FLOAT, STYLEID_FONT_FAMILY, STYLEID_FONT_SIZE, STYLEID_FONT_STYLE, @@ -116,7 +117,8 @@ typedef enum { STYLEID_WIDTH, STYLEID_WORD_SPACING, STYLEID_WORD_WRAP, - STYLEID_Z_INDEX + STYLEID_Z_INDEX, + STYLEID_MAX_VALUE } styleid_t; HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 0eea1c5..1cdd1c7 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2446,6 +2446,21 @@ static void test_body_style(IHTMLStyle *style) win_skip("IHTMLStyle_put_listStyle already failed\n"); } + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_styleFloat(style, &str); + ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(!str, "styleFloat = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("left"); + hres = IHTMLStyle_put_styleFloat(style, str); + ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle_get_styleFloat(style, &str); + ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Martin Storsjo : combase: Implement functions for HSTRING_BUFFER.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 0d490f3a49653ec3e4d9f797fd74b2aeb679c9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d490f3a49653ec3e4d9f797f… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 15 10:24:50 2014 +0200 combase: Implement functions for HSTRING_BUFFER. --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 6 +-- dlls/combase/combase.spec | 6 +-- dlls/combase/string.c | 57 ++++++++++++++++++++++ dlls/combase/tests/string.c | 56 +++++++++++++++++++++ 4 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index cb6bb5e..2361a1d 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -11,14 +11,14 @@ @ stdcall WindowsCreateString(ptr long ptr) combase.WindowsCreateString @ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference @ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString -@ stub WindowsDeleteStringBuffer +@ stdcall WindowsDeleteStringBuffer(ptr) combase.WindowsDeleteStringBuffer @ stdcall WindowsDuplicateString(ptr ptr) combase.WindowsDuplicateString @ stdcall WindowsGetStringLen(ptr) combase.WindowsGetStringLen @ stdcall WindowsGetStringRawBuffer(ptr ptr) combase.WindowsGetStringRawBuffer @ stub WindowsInspectString @ stdcall WindowsIsStringEmpty(ptr) combase.WindowsIsStringEmpty -@ stub WindowsPreallocateStringBuffer -@ stub WindowsPromoteStringBuffer +@ stdcall WindowsPreallocateStringBuffer(long ptr ptr) combase.WindowsPreallocateStringBuffer +@ stdcall WindowsPromoteStringBuffer(ptr ptr) combase.WindowsPromoteStringBuffer @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull @ stub WindowsSubstring diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e0136f0..ac095ce 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -292,14 +292,14 @@ @ stdcall WindowsCreateString(ptr long ptr) @ stdcall WindowsCreateStringReference(wstr long ptr ptr) @ stdcall WindowsDeleteString(ptr) -@ stub WindowsDeleteStringBuffer +@ stdcall WindowsDeleteStringBuffer(ptr) @ stdcall WindowsDuplicateString(ptr ptr) @ stdcall WindowsGetStringLen(ptr) @ stdcall WindowsGetStringRawBuffer(ptr ptr) @ stub WindowsInspectString @ stdcall WindowsIsStringEmpty(ptr) -@ stub WindowsPreallocateStringBuffer -@ stub WindowsPromoteStringBuffer +@ stdcall WindowsPreallocateStringBuffer(long ptr ptr) +@ stdcall WindowsPromoteStringBuffer(ptr ptr) @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) @ stub WindowsSubstring diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 09519a1..5fe4321 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -47,6 +47,11 @@ static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *h return (struct hstring_private *)header; } +static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) +{ + return (struct hstring_private *)buffer; +} + static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; @@ -146,6 +151,58 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) } /*********************************************************************** + * WindowsPreallocateStringBuffer (combase.@) + */ +HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, + HSTRING_BUFFER *out) +{ + struct hstring_private *priv; + HSTRING str; + if (outptr == NULL || out == NULL) + return E_POINTER; + if (len == 0) + { + *outptr = (LPWSTR)empty; + *out = NULL; + return S_OK; + } + + if (!alloc_string(len, &str)) + return E_OUTOFMEMORY; + priv = impl_from_HSTRING(str); + *outptr = priv->buffer; + *out = (HSTRING_BUFFER)str; + return S_OK; +} + +/*********************************************************************** + * WindowsDeleteStringBuffer (combase.@) + */ +HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) +{ + return WindowsDeleteString((HSTRING)buf); +} + +/*********************************************************************** + * WindowsPromoteStringBuffer (combase.@) + */ +HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) +{ + struct hstring_private *priv = impl_from_HSTRING_BUFFER(buf); + if (out == NULL) + return E_POINTER; + if (buf == NULL) + { + *out = NULL; + return S_OK; + } + if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + return E_INVALIDARG; + *out = (HSTRING)buf; + return S_OK; +} + +/*********************************************************************** * WindowsGetStringLen (combase.@) */ UINT32 WINAPI WindowsGetStringLen(HSTRING str) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index ec5e517..72eaa84 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -30,10 +30,13 @@ static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *); static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); +static HRESULT (WINAPI *pWindowsDeleteStringBuffer)(HSTRING_BUFFER); static HRESULT (WINAPI *pWindowsDuplicateString)(HSTRING, HSTRING *); static UINT32 (WINAPI *pWindowsGetStringLen)(HSTRING); static LPCWSTR (WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING); +static HRESULT (WINAPI *pWindowsPreallocateStringBuffer)(UINT32, WCHAR **, HSTRING_BUFFER *); +static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *); static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -49,10 +52,13 @@ static BOOL init_functions(void) SET(WindowsCreateString); SET(WindowsCreateStringReference); SET(WindowsDeleteString); + SET(WindowsDeleteStringBuffer); SET(WindowsDuplicateString); SET(WindowsGetStringLen); SET(WindowsGetStringRawBuffer); SET(WindowsIsStringEmpty); + SET(WindowsPreallocateStringBuffer); + SET(WindowsPromoteStringBuffer); SET(WindowsStringHasEmbeddedNull); return TRUE; } @@ -181,6 +187,55 @@ static void test_access(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); } +static void test_string_buffer(void) +{ + /* Initialize ptr to NULL to make sure it actually is set in the first + * test below. */ + HSTRING_BUFFER buf = NULL; + WCHAR *ptr = NULL; + HSTRING str; + + /* Test creation of an empty buffer */ + ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ok(buf == NULL, "Empty string buffer isn't a null string\n"); + ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); + ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); + ok(str == NULL, "Empty string isn't a null string\n"); + check_string(str, input_empty_string, 0, FALSE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n"); + + /* Test creation and deletion of string buffers */ + ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ok(pWindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n"); + + /* Test creation and promotion of string buffers */ + ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ok(ptr[6] == '\0', "Preallocated string buffer didn't have null termination\n"); + memcpy(ptr, input_string, 6 * sizeof(*input_string)); + ok(pWindowsPromoteStringBuffer(buf, NULL) == E_POINTER, "Incorrect error handling\n"); + ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); + check_string(str, input_string, 6, FALSE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test error handling in preallocation */ + ok(pWindowsPreallocateStringBuffer(6, NULL, &buf) == E_POINTER, "Incorrect error handling\n"); + ok(pWindowsPreallocateStringBuffer(6, &ptr, NULL) == E_POINTER, "Incorrect error handling\n"); + + ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ptr[6] = 'a'; /* Overwrite the buffer's null termination, promotion should fail */ + ok(pWindowsPromoteStringBuffer(buf, &str) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n"); + + /* Test strings with trailing null chars */ + ok(pWindowsPreallocateStringBuffer(7, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + memcpy(ptr, input_string, 7 * sizeof(*input_string)); + ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); + check_string(str, input_string, 7, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); +} + START_TEST(string) { if (!init_functions()) @@ -188,4 +243,5 @@ START_TEST(string) test_create_delete(); test_duplicate(); test_access(); + test_string_buffer(); }

1 0

Martin Storsjo : combase: Implement functions for accessing HSTRING objects.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: 998006e41d5cdcbee1396b7985d79d0fc16e5af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998006e41d5cdcbee1396b798… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 15 10:24:49 2014 +0200 combase: Implement functions for accessing HSTRING objects. --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 8 +-- dlls/combase/combase.spec | 8 +-- dlls/combase/string.c | 67 ++++++++++++++++++++++ dlls/combase/tests/string.c | 65 ++++++++++++++++++++- 4 files changed, 139 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index 7658867..cb6bb5e 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -13,14 +13,14 @@ @ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString @ stub WindowsDeleteStringBuffer @ stdcall WindowsDuplicateString(ptr ptr) combase.WindowsDuplicateString -@ stub WindowsGetStringLen -@ stub WindowsGetStringRawBuffer +@ stdcall WindowsGetStringLen(ptr) combase.WindowsGetStringLen +@ stdcall WindowsGetStringRawBuffer(ptr ptr) combase.WindowsGetStringRawBuffer @ stub WindowsInspectString -@ stub WindowsIsStringEmpty +@ stdcall WindowsIsStringEmpty(ptr) combase.WindowsIsStringEmpty @ stub WindowsPreallocateStringBuffer @ stub WindowsPromoteStringBuffer @ stub WindowsReplaceString -@ stub WindowsStringHasEmbeddedNull +@ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull @ stub WindowsSubstring @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f399d25..e0136f0 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -294,14 +294,14 @@ @ stdcall WindowsDeleteString(ptr) @ stub WindowsDeleteStringBuffer @ stdcall WindowsDuplicateString(ptr ptr) -@ stub WindowsGetStringLen -@ stub WindowsGetStringRawBuffer +@ stdcall WindowsGetStringLen(ptr) +@ stdcall WindowsGetStringRawBuffer(ptr ptr) @ stub WindowsInspectString -@ stub WindowsIsStringEmpty +@ stdcall WindowsIsStringEmpty(ptr) @ stub WindowsPreallocateStringBuffer @ stub WindowsPromoteStringBuffer @ stub WindowsReplaceString -@ stub WindowsStringHasEmbeddedNull +@ stdcall WindowsStringHasEmbeddedNull(ptr ptr) @ stub WindowsSubstring @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 4eefc6c..09519a1 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -33,6 +33,8 @@ struct hstring_private LONG refcount; }; +static const WCHAR empty[1]; + C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) @@ -142,3 +144,68 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = str; return S_OK; } + +/*********************************************************************** + * WindowsGetStringLen (combase.@) + */ +UINT32 WINAPI WindowsGetStringLen(HSTRING str) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + if (str == NULL) + return 0; + return priv->length; +} + +/*********************************************************************** + * WindowsGetStringRawBuffer (combase.@) + */ +LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + if (str == NULL) + { + if (len) + *len = 0; + return empty; + } + if (len) + *len = priv->length; + return priv->buffer; +} + +/*********************************************************************** + * WindowsStringHasEmbeddedNull (combase.@) + */ +HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) +{ + UINT32 i; + struct hstring_private *priv = impl_from_HSTRING(str); + if (out == NULL) + return E_INVALIDARG; + if (str == NULL) + { + *out = FALSE; + return S_OK; + } + for (i = 0; i < priv->length; i++) + { + if (priv->buffer[i] == '\0') + { + *out = TRUE; + return S_OK; + } + } + *out = FALSE; + return S_OK; +} + +/*********************************************************************** + * WindowsIsStringEmpty (combase.@) + */ +BOOL WINAPI WindowsIsStringEmpty(HSTRING str) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + if (str == NULL) + return TRUE; + return priv->length == 0; +} diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 01a63f7..ec5e517 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -31,6 +31,10 @@ static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *); static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); static HRESULT (WINAPI *pWindowsDuplicateString)(HSTRING, HSTRING *); +static UINT32 (WINAPI *pWindowsGetStringLen)(HSTRING); +static LPCWSTR (WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); +static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING); +static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -46,14 +50,42 @@ static BOOL init_functions(void) SET(WindowsCreateStringReference); SET(WindowsDeleteString); SET(WindowsDuplicateString); + SET(WindowsGetStringLen); + SET(WindowsGetStringRawBuffer); + SET(WindowsIsStringEmpty); + SET(WindowsStringHasEmbeddedNull); return TRUE; } #undef SET -static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0' }; +#define check_string(str, content, length, has_null) _check_string(__LINE__, str, content, length, has_null) +static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, BOOL has_null) +{ + BOOL out_null; + BOOL empty = length == 0; + UINT32 out_length; + LPCWSTR ptr; + + ok_(__FILE__, line)(pWindowsIsStringEmpty(str) == empty, "WindowsIsStringEmpty failed\n"); + ok_(__FILE__, line)(pWindowsStringHasEmbeddedNull(str, &out_null) == S_OK, "pWindowsStringHasEmbeddedNull failed\n"); + ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed\n"); + ok_(__FILE__, line)(pWindowsGetStringLen(str) == length, "WindowsGetStringLen failed\n"); + ptr = pWindowsGetStringRawBuffer(str, &out_length); + /* WindowsGetStringRawBuffer should return a non-null, null terminated empty string + * even if str is NULL. */ + ok_(__FILE__, line)(ptr != NULL, "WindowsGetStringRawBuffer returned null\n"); + ok_(__FILE__, line)(out_length == length, "WindowsGetStringRawBuffer returned incorrect length\n"); + ptr = pWindowsGetStringRawBuffer(str, NULL); + ok_(__FILE__, line)(ptr != NULL, "WindowsGetStringRawBuffer returned null\n"); + ok_(__FILE__, line)(ptr[length] == '\0', "WindowsGetStringRawBuffer doesn't return a null terminated buffer\n"); + ok_(__FILE__, line)(memcmp(ptr, content, sizeof(*content) * length) == 0, "Incorrect string content\n"); +} + +static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; static const WCHAR input_empty_string[] = { '\0' }; +static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; static void test_create_delete(void) { @@ -62,6 +94,7 @@ static void test_create_delete(void) /* Test normal creation of a string */ ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_string, 6, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test error handling in WindowsCreateString */ ok(pWindowsCreateString(input_string, 6, NULL) == E_INVALIDARG, "Incorrect error handling\n"); @@ -72,6 +105,7 @@ static void test_create_delete(void) /* Test creation of a string reference */ ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + check_string(str, input_string, 6, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); /* Test error handling in WindowsCreateStringReference */ @@ -85,6 +119,7 @@ static void test_create_delete(void) /* Test creating a string without a null-termination at the specified length */ ok(pWindowsCreateString(input_string, 3, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_string, 3, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test an empty string */ @@ -119,10 +154,38 @@ static void test_duplicate(void) ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n"); } +static void test_access(void) +{ + HSTRING str; + HSTRING_HEADER header; + + /* Test handling of a NULL string */ + check_string(NULL, NULL, 0, FALSE); + + /* Test strings with embedded null chars */ + ok(pWindowsCreateString(input_embed_null, 6, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_embed_null, 6, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsCreateStringReference(input_embed_null, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + check_string(str, input_embed_null, 6, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); + + /* Test normal creation of a string with trailing null */ + ok(pWindowsCreateString(input_string, 7, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_string, 7, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsCreateStringReference(input_string, 7, &header, &str) == S_OK, "Failed to create string ref\n"); + check_string(str, input_string, 7, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); +} + START_TEST(string) { if (!init_functions()) return; test_create_delete(); test_duplicate(); + test_access(); }

1 0

Martin Storsjo : combase: Implement creation and deletion of HSTRING objects.
by Alexandre Julliard Dec. 15, 2014

Dec. 15, 2014

Module: wine Branch: master Commit: e79460cd5c1a3cb47b06cae0542accc301bf00ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79460cd5c1a3cb47b06cae05… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 15 10:24:48 2014 +0200 combase: Implement creation and deletion of HSTRING objects. --- configure | 1 + configure.ac | 1 + .../api-ms-win-core-winrt-string-l1-1-0.spec | 8 +- dlls/combase/Makefile.in | 3 +- dlls/combase/combase.spec | 8 +- dlls/combase/string.c | 144 +++++++++++++++++++++ dlls/combase/tests/Makefile.in | 4 + dlls/combase/tests/string.c | 128 ++++++++++++++++++ tools/make_specfiles | 1 + 9 files changed, 289 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79460cd5c1a3cb47b06c…

1 0