wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Huw Davies : mmdevapi/tests: Link against advapi32.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 42cbc05e59d32228f4edd171ca66e4cbe5645d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cbc05e59d32228f4edd171c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 9 13:57:07 2015 +0100 mmdevapi/tests: Link against advapi32. --- dlls/mmdevapi/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 00c8aaf..0f17ea31 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mmdevapi.dll -IMPORTS = ole32 version user32 +IMPORTS = ole32 version user32 advapi32 C_SRCS = \ capture.c \

1 0

Piotr Caban : msvcp90: Fix off by one issue in basic_string::rfind.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: a0e8d62a8ebd24e4ae474c262ddbc7d1a42f0e80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e8d62a8ebd24e4ae474c262… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 9 13:49:54 2015 +0200 msvcp90: Fix off by one issue in basic_string::rfind. --- dlls/msvcp60/string.c | 8 ++++---- dlls/msvcp90/string.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 229c3ca..76a0e02 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -989,8 +989,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_char_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = this->ptr; for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_char_compare(p, find, len)) @@ -2512,8 +2512,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_wchar_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = this->ptr; for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_wchar_compare(p, find, len)) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3afb375..413e5ff 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1542,8 +1542,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_char_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = basic_string_char_const_ptr(this); for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_char_compare(p, find, len)) @@ -3392,8 +3392,8 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_rfind_cstr_substr( if(len > this->size) return MSVCP_basic_string_wchar_npos; - if(pos > this->size-len+1) - pos = this->size-len+1; + if(pos > this->size-len) + pos = this->size-len; end = basic_string_wchar_const_ptr(this); for(p=end+pos; p>=end; p--) { if(*p==*find && !MSVCP_char_traits_wchar_compare(p, find, len))

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address GetComponentByIndex.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 4f15cc4d1a41e81bcb146908fc04b4f6dd9ffa11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f15cc4d1a41e81bcb146908f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 27 15:57:44 2014 +1100 dpnet: Implement IDirectPlay8Address GetComponentByIndex. --- dlls/dpnet/address.c | 66 +++++++++++++++++++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 37 ++++++++++++++++++++------ 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7e10136..7a33f8a 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -405,9 +405,69 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Ad const DWORD dwComponentID, WCHAR *pwszName, DWORD *pdwNameLen, void *pvBuffer, DWORD *pdwBufferSize, DWORD *pdwDataType) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + struct component *entry; + int namesize; + + TRACE("(%p)->(%u %p %p %p %p %p)\n", This, dwComponentID, pwszName, pdwNameLen, pvBuffer, pdwBufferSize, pdwDataType); + + if(!pdwNameLen || !pdwBufferSize || !pdwDataType) + { + WARN("Invalid buffer (%p, %p, %p)\n", pdwNameLen, pdwBufferSize, pdwDataType); + return DPNERR_INVALIDPOINTER; + } + + if(dwComponentID > This->comp_count) + { + WARN("dwComponentID out of range\n"); + return DPNERR_DOESNOTEXIST; + } + + entry = This->components[dwComponentID]; + + namesize = strlenW(entry->name); + if(*pdwBufferSize < entry->size || *pdwNameLen < namesize) + { + WARN("Buffer too small\n"); + + *pdwNameLen = namesize + 1; + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + return DPNERR_BUFFERTOOSMALL; + } + + if(!pwszName || !pvBuffer) + { + WARN("Invalid buffer (%p, %p)\n", pwszName, pvBuffer); + return DPNERR_INVALIDPOINTER; + } + + lstrcpyW(pwszName, entry->name); + + *pdwNameLen = namesize + 1; + *pdwBufferSize = entry->size; + *pdwDataType = entry->type; + + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + *(DWORD*)pvBuffer = entry->data.value; + break; + case DPNA_DATATYPE_GUID: + *(GUID*)pvBuffer = entry->data.guid; + break; + case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, entry->data.string, entry->size); + break; + case DPNA_DATATYPE_STRING_ANSI: + memcpy(pvBuffer, entry->data.ansi, entry->size); + break; + case DPNA_DATATYPE_BINARY: + memcpy(pvBuffer, entry->data.binary, entry->size); + break; + } + + return S_OK; } static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address *iface, diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 077f99e..ee589f5 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -87,6 +87,7 @@ static void address_addcomponents(void) DWORD bufflen = 0; DWORD port = 8888; WCHAR buffer[256]; + WCHAR *name = NULL; /* We can add any Component to the Address interface not just the predefined ones. */ hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID), DPNA_DATATYPE_GUID); @@ -175,25 +176,45 @@ static void address_addcomponents(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 100, NULL, &namelen, NULL, &bufflen, &type); - todo_wine ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 1, NULL, &namelen, NULL, &bufflen, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 100; + namelen = 0; + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 1, name, &namelen, buffer, &bufflen, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + + namelen = 100; + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 1, NULL, &namelen, NULL, &bufflen, &type); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 100, NULL, NULL, NULL, &bufflen, &type); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 100, NULL, &namelen, NULL, NULL, &type); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + namelen = 0; + type = 0; + hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(namelen == 8, "namelen expected 8 got %d\n", namelen); + ok(bufflen == 16, "bufflen expected 16 got %d\n", bufflen); + ok(type == DPNA_DATATYPE_GUID, "type expected DPNA_DATATYPE_GUID got %d\n", type); trace("GetNumComponents=%d\n", components); for(i=0; i < components; i++) { - WCHAR *name; void *buffer; bufflen = 0; namelen = 0; hr = IDirectPlay8Address_GetComponentByIndex(localaddr, i, NULL, &namelen, NULL, &bufflen, &type); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, namelen * sizeof(WCHAR)); buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); @@ -258,14 +279,14 @@ static void address_setsp(void) ok(components == 1, "components=%d\n", components); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, namelen * sizeof(WCHAR)); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, name, &namelen, (void*)&guid, &bufflen, &type); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(type == DPNA_DATATYPE_GUID, "wrong datatype: %d\n", type); - todo_wine ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); + ok(type == DPNA_DATATYPE_GUID, "wrong datatype: %d\n", type); + ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); HeapFree(GetProcessHeap(), 0, name);

1 0

Stefan Dösinger : wined3d: Downgrade the framebuffer attachment FIXMEs to WARNs.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 985c061ad3c14241e702930aa254202d831a559d URL: http://source.winehq.org/git/wine.git/?a=commit;h=985c061ad3c14241e702930aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:10 2015 +0200 wined3d: Downgrade the framebuffer attachment FIXMEs to WARNs. --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 62158a0..44ba7ad 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1608,7 +1608,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined { if (format->flags[type] & WINED3DFMT_FLAG_RENDERTARGET) { - FIXME("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," + WARN("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," " and no fallback specified.\n", debug_d3dformat(format->id), type); format->flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; } @@ -1642,7 +1642,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } else { - FIXME("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", + WARN("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", debug_d3dformat(format->id), type_string, type); format->flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; }

1 0

Stefan Dösinger : wined3d: Don' t use depth textures without ARB_depth_texture.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 733d4b5ecc2e5e5e7098f2f4b92b7c245ed3fc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=733d4b5ecc2e5e5e7098f2f4b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:09 2015 +0200 wined3d: Don't use depth textures without ARB_depth_texture. --- dlls/wined3d/utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 687d3d7..62158a0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2121,6 +2121,16 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write) format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); + + if (!gl_info->supported[ARB_DEPTH_TEXTURE] + && format_texture_info[i].flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + { + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTURE; + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTURE; + } } /* Texture conversion stuff */

1 0

Stefan Dösinger : wined3d: Require FBO attachability for render targets and depth stencils.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 28af7b407bb926953a73c373eb536449d1110e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28af7b407bb926953a73c373e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:08 2015 +0200 wined3d: Require FBO attachability for render targets and depth stencils. --- dlls/wined3d/resource.c | 7 +++++++ dlls/wined3d/utils.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7818deb..1891165 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -114,6 +114,13 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) + { + WARN("Render target or depth stencil is not FBO attachable.\n"); + continue; + } if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) { WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a3c3def..687d3d7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1282,7 +1282,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_FRAMEBUFFER_OBJECT, NULL}, {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE, ARB_FRAMEBUFFER_OBJECT, NULL}, };

1 0

Stefan Dösinger : wined3d: Set WINED3DFMT_FLAG_FBO_ATTACHABLE on depth stencil formats.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 04c3c970724cae9d16ddaa33732d594fb14a4542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c3c970724cae9d16ddaa337… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:07 2015 +0200 wined3d: Set WINED3DFMT_FLAG_FBO_ATTACHABLE on depth stencil formats. --- dlls/wined3d/utils.c | 92 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04c3c970724cae9d16dda…

1 0

Stefan Dösinger : wined3d: Use renderbuffers if the resource type is RB.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: e8ec01ad5190cc77767cf132a341d329bbf451a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ec01ad5190cc77767cf132a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:06 2015 +0200 wined3d: Use renderbuffers if the resource type is RB. --- dlls/wined3d/resource.c | 2 ++ dlls/wined3d/surface.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e9e586f..7818deb 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -402,6 +402,8 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) resource->draw_binding = WINED3D_LOCATION_DRAWABLE; else if (resource->multisample_type) resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) + resource->draw_binding = WINED3D_LOCATION_RB_RESOLVED; else resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 552a079..4df6ca8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3716,6 +3716,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co case WINED3D_LOCATION_RB_MULTISAMPLE: surface_prepare_rb(surface, gl_info, TRUE); break; + case WINED3D_LOCATION_RB_RESOLVED: + surface_prepare_rb(surface, gl_info, FALSE); + break; case WINED3D_LOCATION_DRAWABLE: /* Nothing to do */ break;

1 0

Nikolay Sivov : dwrite: Exit earlier when setting property for zero length range.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 1a2d520ee13cc126e303d797d56076c00128e871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2d520ee13cc126e303d797d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 21:12:54 2015 +0300 dwrite: Exit earlier when setting property for zero length range. --- dlls/dwrite/layout.c | 4 ++++ dlls/dwrite/tests/layout.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 96d4959..903e53d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1431,6 +1431,10 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo struct list *ranges; DWRITE_TEXT_RANGE r; + /* ignore zero length ranges */ + if (value->range.length == 0) + return S_OK; + /* select from ranges lists */ switch (attr) { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 4dd0ab1..dd574b2 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1879,6 +1879,12 @@ static void test_SetFontSize(void) hr = IDWriteTextLayout_SetFontSize(layout, 15.0, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontSize(layout, 123.0, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + size = 0.0; hr = IDWriteTextLayout_GetFontSize(layout, 1, &size, &r); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1963,6 +1969,12 @@ static void test_SetFontFamilyName(void) hr = IDWriteTextLayout_SetFontFamilyName(layout, taHomaW, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + r.startPosition = 0; r.length = 0; nameW[0] = 0; @@ -2034,6 +2046,12 @@ static void test_SetFontStyle(void) hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_NORMAL, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + style = DWRITE_FONT_STYLE_NORMAL; hr = IDWriteTextLayout_GetFontStyle(layout, 1, &style, &r); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2116,6 +2134,12 @@ static void test_SetFontStretch(void) hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_CONDENSED, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_NORMAL, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + stretch = DWRITE_FONT_STRETCH_UNDEFINED; hr = IDWriteTextLayout_GetFontStretch(layout, 1, &stretch, &r); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite: Use [0, ~0u) as initial range for strikethrough settings.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: ffeba2348a7f9e70eb3174c695cb88a1177940af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffeba2348a7f9e70eb3174c69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 20:55:51 2015 +0300 dwrite: Use [0,~0u) as initial range for strikethrough settings. --- dlls/dwrite/layout.c | 9 +---- dlls/dwrite/tests/layout.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 150e34b..96d4959 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2175,9 +2175,6 @@ static HRESULT WINAPI dwritetextlayout_GetStrikethrough(IDWriteTextLayout2 *ifac TRACE("(%p)->(%u %p %p)\n", This, position, strikethrough, r); - if (position >= This->len) - return S_OK; - range = (struct layout_range_bool*)get_layout_range_header_by_pos(&This->strike_ranges, position); *strikethrough = range->value; @@ -3252,7 +3249,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { struct layout_range_header *range, *strike; - DWRITE_TEXT_RANGE r; + DWRITE_TEXT_RANGE r = { 0, ~0u }; HRESULT hr; layout->IDWriteTextLayout2_iface.lpVtbl = &dwritetextlayoutvtbl; @@ -3296,11 +3293,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * if (FAILED(hr)) goto fail; - r.startPosition = 0; - r.length = ~0u; range = alloc_layout_range(layout, &r, LAYOUT_RANGE_REGULAR); - r.startPosition = 0; - r.length = len; strike = alloc_layout_range(layout, &r, LAYOUT_RANGE_STRIKETHROUGH); if (!range || !strike) { free_layout_range(range); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3ac716e..4dd0ab1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1174,6 +1174,10 @@ static const struct drawcall_entry draw_seq5[] = { { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_seq6[] = { + { DRAW_LAST_KIND } +}; + static void test_Draw(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -1274,6 +1278,16 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_seq5, "draw test 5", FALSE); IDWriteTextLayout_Release(layout); + /* empty string */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_seq6, "draw test 6", FALSE); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } @@ -1532,6 +1546,17 @@ todo_wine IDWriteTextLayout_Release(layout); + /* zero length string */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 1; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %u\n", count); + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); @@ -2141,6 +2166,67 @@ static void test_SetFontStretch(void) IDWriteTextFormat_Release(format); } +static void test_SetStrikethrough(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + DWRITE_TEXT_RANGE r; + BOOL value; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + r.startPosition = 1; + r.length = 0; + value = TRUE; + hr = IDWriteTextLayout_GetStrikethrough(layout, 0, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(r.startPosition == 0 && r.length == ~0u, "got %u, %u\n", r.startPosition, r.length); + ok(value == FALSE, "got %d\n", value); + + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = FALSE; + hr = IDWriteTextLayout_GetStrikethrough(layout, 1, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == TRUE, "got %d\n", value); + ok(r.startPosition == 1 && r.length == 1, "got %u, %u\n", r.startPosition, r.length); + + value = TRUE; + r.startPosition = r.length = 0; + hr = IDWriteTextLayout_GetStrikethrough(layout, 20, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(r.startPosition == 2 && r.length == ~0u-2, "got %u, %u\n", r.startPosition, r.length); + ok(value == FALSE, "got %d\n", value); + + r.startPosition = 100; + r.length = 4; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = FALSE; + r.startPosition = r.length = 0; + hr = IDWriteTextLayout_GetStrikethrough(layout, 100, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(r.startPosition == 100 && r.length == 4, "got %u, %u\n", r.startPosition, r.length); + ok(value == TRUE, "got %d\n", value); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2176,6 +2262,7 @@ START_TEST(layout) test_SetFontFamilyName(); test_SetFontStyle(); test_SetFontStretch(); + test_SetStrikethrough(); IDWriteFactory_Release(factory); }

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
61
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 June 2015