wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Sebastian Lackner : mfplat: Implement stubs for MFStartup and MFShutdown.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: 46d06eb431c21b64c8c7f2de3742c736efa1ead1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d06eb431c21b64c8c7f2de3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 12 00:56:54 2014 +0100 mfplat: Implement stubs for MFStartup and MFShutdown. --- dlls/mfplat/main.c | 23 +++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a72f634..5608644 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -22,6 +22,11 @@ #include "windef.h" #include "winbase.h" +#include "mferror.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -36,3 +41,21 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * MFStartup (mfplat.@) + */ +HRESULT WINAPI MFStartup(ULONG version, DWORD flags) +{ + FIXME("(%u, %u): stub\n", version, flags); + return MF_E_BAD_STARTUP_VERSION; +} + +/*********************************************************************** + * MFShutdown (mfplat.@) + */ +HRESULT WINAPI MFShutdown(void) +{ + FIXME("(): stub\n"); + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 98a7147..7100dfd 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -131,8 +131,8 @@ @ stub MFSerializeMediaTypeToStream @ stub MFSerializePresentationDescriptor @ stub MFSetSockaddrAny -@ stub MFShutdown -@ stub MFStartup +@ stdcall MFShutdown() +@ stdcall MFStartup(long long) @ stub MFStreamDescriptorProtectMediaType @ stub MFTEnum @ stub MFTEnumEx

1 0

Sebastian Lackner : include: Add mferror.h header.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: d64bb04764e16a82bc4d0fc14be5313e467f0570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64bb04764e16a82bc4d0fc14… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 12 00:56:28 2014 +0100 include: Add mferror.h header. --- include/Makefile.in | 1 + include/mferror.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c9f683a..b05fa29 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -396,6 +396,7 @@ SRCDIR_INCLUDES = \ mciavi.h \ mcx.h \ mediaerr.h \ + mferror.h \ midles.h \ minmax.h \ mmddk.h \ diff --git a/include/mferror.h b/include/mferror.h new file mode 100644 index 0000000..1f5ae98 --- /dev/null +++ b/include/mferror.h @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2014 Sebastian Lackner + * + * 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 + */ + +#ifndef __WINE_MFERROR_H +#define __WINE_MFERROR_H + +#define MF_E_PLATFORM_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b0) +#define MF_E_BUFFERTOOSMALL _HRESULT_TYPEDEF_(0xc00d36b1) +#define MF_E_INVALIDREQUEST _HRESULT_TYPEDEF_(0xc00d36b2) +#define MF_E_INVALIDSTREAMNUMBER _HRESULT_TYPEDEF_(0xc00d36b3) +#define MF_E_INVALIDMEDIATYPE _HRESULT_TYPEDEF_(0xc00d36b4) +#define MF_E_NOTACCEPTING _HRESULT_TYPEDEF_(0xc00d36b5) +#define MF_E_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b6) +#define MF_E_UNSUPPORTED_REPRESENTATION _HRESULT_TYPEDEF_(0xc00d36b7) +#define MF_E_NO_MORE_TYPES _HRESULT_TYPEDEF_(0xc00d36b9) +#define MF_E_UNSUPPORTED_SERVICE _HRESULT_TYPEDEF_(0xc00d36ba) +#define MF_E_UNEXPECTED _HRESULT_TYPEDEF_(0xc00d36bb) +#define MF_E_INVALIDNAME _HRESULT_TYPEDEF_(0xc00d36bc) +#define MF_E_INVALIDTYPE _HRESULT_TYPEDEF_(0xc00d36bd) +#define MF_E_INVALID_FILE_FORMAT _HRESULT_TYPEDEF_(0xc00d36be) +#define MF_E_INVALIDINDEX _HRESULT_TYPEDEF_(0xc00d36bf) +#define MF_E_INVALID_TIMESTAMP _HRESULT_TYPEDEF_(0xc00d36c0) +#define MF_E_UNSUPPORTED_SCHEME _HRESULT_TYPEDEF_(0xc00d36c3) +#define MF_E_UNSUPPORTED_BYTESTREAM_TYPE _HRESULT_TYPEDEF_(0xc00d36c4) +#define MF_E_UNSUPPORTED_TIME_FORMAT _HRESULT_TYPEDEF_(0xc00d36c5) +#define MF_E_NO_SAMPLE_TIMESTAMP _HRESULT_TYPEDEF_(0xc00d36c8) +#define MF_E_NO_SAMPLE_DURATION _HRESULT_TYPEDEF_(0xc00d36c9) +#define MF_E_INVALID_STREAM_DATA _HRESULT_TYPEDEF_(0xc00d36cb) +#define MF_E_RT_UNAVAILABLE _HRESULT_TYPEDEF_(0xc00d36cf) +#define MF_E_UNSUPPORTED_RATE _HRESULT_TYPEDEF_(0xc00d36d0) +#define MF_E_THINNING_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d36d1) +#define MF_E_REVERSE_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d36d2) +#define MF_E_UNSUPPORTED_RATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d36d3) +#define MF_E_RATE_CHANGE_PREEMPTED _HRESULT_TYPEDEF_(0xc00d36d4) +#define MF_E_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d36d5) +#define MF_E_NOT_AVAILABLE _HRESULT_TYPEDEF_(0xc00d36d6) +#define MF_E_NO_CLOCK _HRESULT_TYPEDEF_(0xc00d36d7) +#define MF_S_MULTIPLE_BEGIN _HRESULT_TYPEDEF_(0x000d36d8) +#define MF_E_MULTIPLE_BEGIN _HRESULT_TYPEDEF_(0xc00d36d9) +#define MF_E_MULTIPLE_SUBSCRIBERS _HRESULT_TYPEDEF_(0xc00d36da) +#define MF_E_TIMER_ORPHANED _HRESULT_TYPEDEF_(0xc00d36db) +#define MF_E_STATE_TRANSITION_PENDING _HRESULT_TYPEDEF_(0xc00d36dc) +#define MF_E_UNSUPPORTED_STATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d36dd) +#define MF_E_UNRECOVERABLE_ERROR_OCCURRED _HRESULT_TYPEDEF_(0xc00d36de) +#define MF_E_SAMPLE_HAS_TOO_MANY_BUFFERS _HRESULT_TYPEDEF_(0xc00d36df) +#define MF_E_SAMPLE_NOT_WRITABLE _HRESULT_TYPEDEF_(0xc00d36e0) +#define MF_E_INVALID_KEY _HRESULT_TYPEDEF_(0xc00d36e2) +#define MF_E_BAD_STARTUP_VERSION _HRESULT_TYPEDEF_(0xc00d36e3) +#define MF_E_UNSUPPORTED_CAPTION _HRESULT_TYPEDEF_(0xc00d36e4) +#define MF_E_INVALID_POSITION _HRESULT_TYPEDEF_(0xc00d36e5) +#define MF_E_ATTRIBUTENOTFOUND _HRESULT_TYPEDEF_(0xc00d36e6) +#define MF_E_PROPERTY_TYPE_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d36e7) + +#define MF_E_TOPO_INVALID_OPTIONAL_NODE _HRESULT_TYPEDEF_(0xc00d520e) +#define MF_E_TOPO_CANNOT_FIND_DECRYPTOR _HRESULT_TYPEDEF_(0xc00d5211) +#define MF_E_TOPO_CODEC_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d5212) +#define MF_E_TOPO_CANNOT_CONNECT _HRESULT_TYPEDEF_(0xc00d5213) +#define MF_E_TOPO_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d5214) +#define MF_E_TOPO_INVALID_TIME_ATTRIBUTES _HRESULT_TYPEDEF_(0xc00d5215) +#define MF_E_TOPO_LOOPS_IN_TOPOLOGY _HRESULT_TYPEDEF_(0xC00d5216) +#define MF_E_TOPO_MISSING_PRESENTATION_DESCRIPTOR _HRESULT_TYPEDEF_(0xc00d5217) +#define MF_E_TOPO_MISSING_STREAM_DESCRIPTOR _HRESULT_TYPEDEF_(0xc00d5218) +#define MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED _HRESULT_TYPEDEF_(0xc00d5219) +#define MF_E_TOPO_MISSING_SOURCE _HRESULT_TYPEDEF_(0xc00d521a) +#define MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d521b) + +#endif /* __WINE_MFERROR_H */

1 0

Michael Stefaniuc : d3d9: Don't assert for shaders with the wrong vtbl.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: 51406b471aa81a56dc38e4b266b51e09646987c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51406b471aa81a56dc38e4b26… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 16 09:57:09 2014 +0100 d3d9: Don't assert for shaders with the wrong vtbl. --- dlls/d3d9/shader.c | 6 ++++-- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 0c2c881..9430afd 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -167,7 +167,8 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d9_vertexshader_vtbl); + if (iface->lpVtbl != &d3d9_vertexshader_vtbl) + WARN("Vertex shader %p with the wrong vtbl %p\n", iface, iface->lpVtbl); return impl_from_IDirect3DVertexShader9(iface); } @@ -317,7 +318,8 @@ struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelSh { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d9_pixelshader_vtbl); + if (iface->lpVtbl != &d3d9_pixelshader_vtbl) + WARN("Pixel shader %p with the wrong vtbl %p\n", iface, iface->lpVtbl); return impl_from_IDirect3DPixelShader9(iface); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3206e57..ffd3c11 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5518,6 +5518,7 @@ static void test_get_set_vertex_shader(void) { IDirect3DVertexShader9 *current_shader = NULL; IDirect3DVertexShader9 *shader = NULL; + const IDirect3DVertexShader9Vtbl *shader_vtbl; IDirect3DDevice9 *device; ULONG refcount, i; IDirect3D9 *d3d; @@ -5568,6 +5569,16 @@ static void test_get_set_vertex_shader(void) ok(current_shader == shader, "Got unexpected shader %p, expected %p.\n", current_shader, shader); IDirect3DVertexShader9_Release(current_shader); + /* SetVertexShader() with a bogus shader vtbl */ + shader_vtbl = shader->lpVtbl; + shader->lpVtbl = (IDirect3DVertexShader9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + shader->lpVtbl = NULL; + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + shader->lpVtbl = shader_vtbl; + IDirect3DVertexShader9_Release(shader); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -5640,6 +5651,7 @@ static void test_get_set_pixel_shader(void) { IDirect3DPixelShader9 *current_shader = NULL; IDirect3DPixelShader9 *shader = NULL; + const IDirect3DPixelShader9Vtbl *shader_vtbl; IDirect3DDevice9 *device; ULONG refcount, i; IDirect3D9 *d3d; @@ -5690,6 +5702,16 @@ static void test_get_set_pixel_shader(void) ok(current_shader == shader, "Got unexpected shader %p, expected %p.\n", current_shader, shader); IDirect3DPixelShader9_Release(current_shader); + /* SetPixelShader() with a bogus shader vtbl */ + shader_vtbl = shader->lpVtbl; + shader->lpVtbl = (IDirect3DPixelShader9Vtbl *)0xdeadbeef; + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + shader->lpVtbl = NULL; + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + shader->lpVtbl = shader_vtbl; + IDirect3DPixelShader9_Release(shader); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Jacek Caban : mshtml: Improved IHTMLStyle3::zoom stub.
by Alexandre Julliard 15 Dec '14

15 Dec '14

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

Jacek Caban : mshtml: Added IHTMLStyle:: styleFloat attribute implementation.
by Alexandre Julliard 15 Dec '14

15 Dec '14

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

Andrew Eikum : winmm: Allow larger MMTIME sizes.
by Alexandre Julliard 15 Dec '14

15 Dec '14

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

Martin Storsjo : combase: Implement functions for HSTRING_BUFFER.
by Alexandre Julliard 15 Dec '14

15 Dec '14

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 15 Dec '14

15 Dec '14

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 15 Dec '14

15 Dec '14

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

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

15 Dec '14

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

← Newer
1
...
8
9
10
11
12
13
14
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014