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

Nikolay Sivov : winhttp: Fix return code check (PVS-Studio).
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 8fb0fd77e54024b477be5fd0260bca993252cbf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb0fd77e54024b477be5fd02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 23:12:51 2014 +0400 winhttp: Fix return code check (PVS-Studio). --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f45141b..1f9b4aa 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3352,7 +3352,7 @@ static HRESULT request_send( struct winhttp_request *request ) { sa = V_ARRAY( &data ); if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; - if ((hr = SafeArrayGetUBound( sa, 1, &size ) != S_OK)) + if ((hr = SafeArrayGetUBound( sa, 1, &size )) != S_OK) { SafeArrayUnaccessData( sa ); return hr;

1 0

Bernhard Reiter : imagehlp/tests: Add test for BindImageEx with NULL as StatusRoutine.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 0b2e7de7b48554698c3c757356da9362b3c3cdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2e7de7b48554698c3c75735… Author: Bernhard Reiter <ockham(a)raz.or.at> Date: Sat Aug 16 21:31:44 2014 +0200 imagehlp/tests: Add test for BindImageEx with NULL as StatusRoutine. --- dlls/imagehlp/tests/image.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 1f1862b..48443f5 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -405,7 +405,12 @@ static void test_bind_image_ex(void) WriteFile(file, &bin, sizeof(bin), &count, NULL); CloseHandle(file); - /* call with a proper PE file */ + /* call with a proper PE file, but with StatusRoutine set to NULL */ + ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, + NULL); + ok(ret, "BindImageEx failed: %d\n", GetLastError()); + + /* call with a proper PE file and StatusRoutine */ ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES, temp_file, 0, 0, testing_status_routine); ok(ret, "BindImageEx failed: %d\n", GetLastError());

1 0

Nikolay Sivov : dwrite: Implement ranges merging.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: baedef728c325125f8617508a256a94a3cabc767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baedef728c325125f8617508a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 15 07:10:58 2014 +0400 dwrite: Implement ranges merging. --- dlls/dwrite/layout.c | 55 +++++++++++++++++++++++++++++++++++----------- dlls/dwrite/tests/layout.c | 28 +++++++++++++++++++---- 2 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1ed0a87..aed6652 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -155,7 +155,7 @@ static inline BOOL validate_text_range(struct dwrite_textlayout *layout, DWRITE_ return TRUE; } -static BOOL is_same_layout_range(struct layout_range const *range, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) +static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) { switch (attr) { case LAYOUT_RANGE_ATTR_WEIGHT: @@ -177,6 +177,16 @@ static BOOL is_same_layout_range(struct layout_range const *range, enum layout_r return FALSE; } +static inline BOOL is_same_layout_attributes(struct layout_range const *left, struct layout_range const *right) +{ + return left->weight == right->weight && + left->style == right->style && + left->object == right->object && + left->effect == right->effect && + left->underline == right->underline && + left->strikethrough == right->strikethrough; +} + static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right) { return left->startPosition == right->startPosition && left->length == right->length; @@ -325,19 +335,20 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo { struct layout_range *outer, *right, *left, *cur; struct list *ranges = &layout->ranges; + BOOL changed = FALSE; DWRITE_TEXT_RANGE r; /* If new range is completely within existing range, split existing range in two */ if ((outer = find_outer_range(ranges, &value->range))) { /* no need to add same range */ - if (is_same_layout_range(outer, attr, value)) + if (is_same_layout_attrvalue(outer, attr, value)) return S_OK; /* for matching range bounds just replace data */ if (is_same_text_range(&outer->range, &value->range)) { - set_layout_range_attrval(outer, attr, value); - return S_OK; + changed = set_layout_range_attrval(outer, attr, value); + goto done; } /* add new range to the left */ @@ -345,11 +356,11 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo left = alloc_layout_range_from(outer, &value->range); if (!left) return E_OUTOFMEMORY; - set_layout_range_attrval(left, attr, value); + changed = set_layout_range_attrval(left, attr, value); list_add_before(&outer->entry, &left->entry); outer->range.startPosition += value->range.length; outer->range.length -= value->range.length; - return S_OK; + goto done; } /* add new range to the right */ @@ -357,10 +368,10 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo right = alloc_layout_range_from(outer, &value->range); if (!right) return E_OUTOFMEMORY; - set_layout_range_attrval(right, attr, value); + changed = set_layout_range_attrval(right, attr, value); list_add_after(&outer->entry, &right->entry); outer->range.length -= value->range.length; - return S_OK; + goto done; } r.startPosition = value->range.startPosition + value->range.length; @@ -392,20 +403,20 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo Update all of them. */ left = get_layout_range_by_pos(ranges, value->range.startPosition); if (left->range.startPosition == value->range.startPosition) - set_layout_range_attrval(left, attr, value); + changed = set_layout_range_attrval(left, attr, value); else /* need to split */ { r.startPosition = value->range.startPosition; r.length = left->range.length - value->range.startPosition + left->range.startPosition; left->range.length -= r.length; cur = alloc_layout_range_from(left, &r); - set_layout_range_attrval(cur, attr, value); + changed = set_layout_range_attrval(cur, attr, value); list_add_after(&left->entry, &cur->entry); } cur = LIST_ENTRY(list_next(ranges, &left->entry), struct layout_range, entry); /* for all existing ranges covered by new one update value */ while (is_in_layout_range(&value->range, &cur->range)) { - set_layout_range_attrval(cur, attr, value); + changed = set_layout_range_attrval(cur, attr, value); cur = LIST_ENTRY(list_next(ranges, &cur->entry), struct layout_range, entry); } @@ -414,13 +425,31 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo r.startPosition = cur->range.startPosition; r.length = value->range.startPosition + value->range.length - cur->range.startPosition; left = alloc_layout_range_from(cur, &r); - set_layout_range_attrval(left, attr, value); + changed = set_layout_range_attrval(left, attr, value); cur->range.startPosition += left->range.length; cur->range.length -= left->range.length; list_add_before(&cur->entry, &left->entry); } - /* TODO: compact adjacent ranges if needed */ +done: + if (changed) { + struct list *next, *i; + + i = list_head(ranges); + while ((next = list_next(ranges, i))) { + struct layout_range *next_range = LIST_ENTRY(next, struct layout_range, entry); + + cur = LIST_ENTRY(i, struct layout_range, entry); + if (is_same_layout_attributes(cur, next_range)) { + /* remove similar range */ + cur->range.length += next_range->range.length; + list_remove(next); + free_layout_range(next_range); + } + else + i = list_next(ranges, i); + } + } return S_OK; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 336cc0b..236c34b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -591,7 +591,7 @@ static void test_SetInlineObject(void) IDWriteInlineObject *inlineobj, *inlineobj2, *inlinetest; IDWriteTextFormat *format; IDWriteTextLayout *layout; - DWRITE_TEXT_RANGE range; + DWRITE_TEXT_RANGE range, r2; HRESULT hr; hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, @@ -623,9 +623,11 @@ static void test_SetInlineObject(void) ok(inlinetest == NULL, "got %p\n", inlinetest); inlinetest = NULL; - hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); range.startPosition = 1; @@ -634,15 +636,19 @@ static void test_SetInlineObject(void) ok(hr == S_OK, "got 0x%08x\n", hr); inlinetest = NULL; - hr = IDWriteTextLayout_GetInlineObject(layout, 1, &inlinetest, NULL); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 1, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(inlinetest == inlineobj2, "got %p\n", inlinetest); + ok(r2.startPosition == 1 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); inlinetest = NULL; - hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); range.startPosition = 1; @@ -650,11 +656,25 @@ static void test_SetInlineObject(void) hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); + IDWriteInlineObject_Release(inlinetest); + range.startPosition = 1; range.length = 2; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + r2.startPosition = r2.length = 100; + hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inlinetest == inlineobj, "got %p\n", inlinetest); + ok(r2.startPosition == 0 && r2.length == 3, "got %d, %d\n", r2.startPosition, r2.length); + IDWriteInlineObject_Release(inlinetest); + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); }

1 0

Nikolay Sivov : dwrite: Implement layout getters derived from text format.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: c8ec6918c74cdda8389ae11e9418e6409b885495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ec6918c74cdda8389ae11e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 15 07:27:30 2014 +0400 dwrite: Implement layout getters derived from text format. --- dlls/dwrite/layout.c | 74 +++++++++++++++++++++++++++++----------------- dlls/dwrite/tests/layout.c | 2 -- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index aed6652..7a4ac18 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -560,36 +560,36 @@ static HRESULT WINAPI dwritetextlayout_SetLineSpacing(IDWriteTextLayout *iface, static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_TEXT_ALIGNMENT_LEADING; + TRACE("(%p)\n", This); + return This->format.textalignment; } static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextlayout_GetParagraphAlignment(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_PARAGRAPH_ALIGNMENT_NEAR; + TRACE("(%p)\n", This); + return This->format.paralign; } static DWRITE_WORD_WRAPPING WINAPI dwritetextlayout_GetWordWrapping(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); FIXME("(%p): stub\n", This); - return DWRITE_WORD_WRAPPING_NO_WRAP; + return This->format.wrapping; } static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_GetReadingDirection(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; + TRACE("(%p)\n", This); + return This->format.readingdir; } static DWRITE_FLOW_DIRECTION WINAPI dwritetextlayout_GetFlowDirection(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM; + TRACE("(%p)\n", This); + return This->format.flow; } static FLOAT WINAPI dwritetextlayout_GetIncrementalTabStop(IDWriteTextLayout *iface) @@ -603,65 +603,85 @@ static HRESULT WINAPI dwritetextlayout_GetTrimming(IDWriteTextLayout *iface, DWR IDWriteInlineObject **trimming_sign) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %p): stub\n", This, options, trimming_sign); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, options, trimming_sign); + + *options = This->format.trimming; + *trimming_sign = This->format.trimmingsign; + if (*trimming_sign) + IDWriteInlineObject_AddRef(*trimming_sign); + return S_OK; } static HRESULT WINAPI dwritetextlayout_GetLineSpacing(IDWriteTextLayout *iface, DWRITE_LINE_SPACING_METHOD *method, FLOAT *spacing, FLOAT *baseline) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %p %p): stub\n", This, method, spacing, baseline); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, method, spacing, baseline); + + *method = This->format.spacingmethod; + *spacing = This->format.spacing; + *baseline = This->format.baseline; + return S_OK; } static HRESULT WINAPI dwritetextlayout_GetFontCollection(IDWriteTextLayout *iface, IDWriteFontCollection **collection) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p): stub\n", This, collection); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, collection); + + *collection = This->format.collection; + if (*collection) + IDWriteFontCollection_AddRef(*collection); + return S_OK; } static UINT32 WINAPI dwritetextlayout_GetFontFamilyNameLength(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.family_len; } static HRESULT WINAPI dwritetextlayout_GetFontFamilyName(IDWriteTextLayout *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.family_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.family_name); + return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritetextlayout_GetFontWeight(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_WEIGHT_NORMAL; + TRACE("(%p)\n", This); + return This->format.weight; } static DWRITE_FONT_STYLE WINAPI dwritetextlayout_GetFontStyle(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STYLE_NORMAL; + TRACE("(%p)\n", This); + return This->format.style; } static DWRITE_FONT_STRETCH WINAPI dwritetextlayout_GetFontStretch(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STRETCH_NORMAL; + TRACE("(%p)\n", This); + return This->format.stretch; } static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->format.size; } static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout *iface) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 236c34b..019a8f7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -558,7 +558,6 @@ static void test_fontweight(void) ok(hr == S_OK, "got 0x%08x\n", hr); weight = IDWriteTextFormat_GetFontWeight(fmt2); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_BOLD, "got %u\n", weight); range.startPosition = 0; @@ -568,7 +567,6 @@ todo_wine /* IDWriteTextFormat methods output doesn't reflect layout changes */ weight = IDWriteTextFormat_GetFontWeight(fmt2); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_BOLD, "got %u\n", weight); range.length = 0;

1 0

Henri Verbeet : d3d9: The "forwardReference" field in struct d3d9_surface is always a texture, if set.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: d1d48d31947f172eb8371345ddeefc8d3847cdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d48d31947f172eb8371345d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:16 2014 +0200 d3d9: The "forwardReference" field in struct d3d9_surface is always a texture, if set. --- dlls/d3d9/d3d9_private.h | 6 +++--- dlls/d3d9/device.c | 12 +----------- dlls/d3d9/surface.c | 50 ++++++++++++++++++++---------------------------- 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6e64b8e..bde8583 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -216,12 +216,12 @@ struct d3d9_surface struct wined3d_surface *wined3d_surface; IDirect3DDevice9Ex *parent_device; IUnknown *container; - IUnknown *forwardReference; + struct d3d9_texture *texture; BOOL getdc_supported; }; -void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; struct d3d9_vertexbuffer diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e6fe631..1117138 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1026,7 +1026,6 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width sub_resource = wined3d_texture_get_sub_resource(texture, 0); surface_impl = wined3d_resource_get_parent(sub_resource); - surface_impl->forwardReference = NULL; surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface; *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); @@ -3461,7 +3460,6 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) { - struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", @@ -3470,17 +3468,10 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface)))) return E_OUTOFMEMORY; - surface_init(d3d_surface, surface, device, parent_ops); + surface_init(d3d_surface, container_parent, surface, parent_ops); *parent = d3d_surface; TRACE("Created surface %p.\n", d3d_surface); - d3d_surface->container = container_parent; - IDirect3DDevice9Ex_Release(d3d_surface->parent_device); - d3d_surface->parent_device = NULL; - - IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); - d3d_surface->forwardReference = container_parent; - return D3D_OK; } @@ -3532,7 +3523,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic wined3d_texture_decref(texture); d3d_surface = wined3d_surface_get_parent(*surface); - d3d_surface->forwardReference = NULL; d3d_surface->parent_device = &device->IDirect3DDevice9Ex_iface; return hr; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ef5f648..17f2ace 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -55,10 +55,10 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); - if (surface->forwardReference) + if (surface->texture) { - TRACE("Forwarding to %p.\n", surface->forwardReference); - return IUnknown_AddRef(surface->forwardReference); + TRACE("Forwarding to %p.\n", surface->texture); + return IDirect3DBaseTexture9_AddRef(&surface->texture->IDirect3DBaseTexture9_iface); } refcount = InterlockedIncrement(&surface->resource.refcount); @@ -83,10 +83,10 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); - if (surface->forwardReference) + if (surface->texture) { - TRACE("Forwarding to %p.\n", surface->forwardReference); - return IUnknown_Release(surface->forwardReference); + TRACE("Forwarding to %p.\n", surface->texture); + return IDirect3DBaseTexture9_Release(&surface->texture->IDirect3DBaseTexture9_iface); } refcount = InterlockedDecrement(&surface->resource.refcount); @@ -114,22 +114,8 @@ static HRESULT WINAPI d3d9_surface_GetDevice(IDirect3DSurface9 *iface, IDirect3D TRACE("iface %p, device %p.\n", iface, device); - if (surface->forwardReference) - { - IDirect3DResource9 *resource; - HRESULT hr; - - hr = IUnknown_QueryInterface(surface->forwardReference, &IID_IDirect3DResource9, (void **)&resource); - if (SUCCEEDED(hr)) - { - hr = IDirect3DResource9_GetDevice(resource, device); - IDirect3DResource9_Release(resource); - - TRACE("Returning device %p.\n", *device); - } - - return hr; - } + if (surface->texture) + return IDirect3DBaseTexture9_GetDevice(&surface->texture->IDirect3DBaseTexture9_iface, device); *device = (IDirect3DDevice9 *)surface->parent_device; IDirect3DDevice9_AddRef(*device); @@ -355,13 +341,24 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) +void surface_init(struct d3d9_surface *surface, IUnknown *container_parent, + struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { struct wined3d_resource_desc desc; + IDirect3DBaseTexture9 *texture; surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl; d3d9_resource_init(&surface->resource); + surface->resource.refcount = 0; + surface->wined3d_surface = wined3d_surface; + surface->container = container_parent; + + if (container_parent && SUCCEEDED(IUnknown_QueryInterface(container_parent, + &IID_IDirect3DBaseTexture9, (void **)&texture))) + { + surface->texture = unsafe_impl_from_IDirect3DBaseTexture9(texture); + IDirect3DBaseTexture9_Release(texture); + } wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &desc); switch (d3dformat_from_wined3dformat(desc.format)) @@ -380,11 +377,6 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_ break; } - wined3d_surface_incref(wined3d_surface); - surface->wined3d_surface = wined3d_surface; - surface->parent_device = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(surface->parent_device); - *parent_ops = &d3d9_surface_wined3d_parent_ops; }

1 0

Henri Verbeet : ddraw: Clamp video memory to UINT_MAX in ddraw7_GetAvailableVidMem().
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 1fb7ccdc1351d00ea64f20e1d5f914bd4848bdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb7ccdc1351d00ea64f20e1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:17 2014 +0200 ddraw: Clamp video memory to UINT_MAX in ddraw7_GetAvailableVidMem(). --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df74122..5f0070a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1926,7 +1926,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C struct wined3d_adapter_identifier desc = {0}; hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); - *total = desc.video_memory; + *total = min(UINT_MAX, desc.video_memory); } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f5248cc..374c273 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -20,6 +20,7 @@ #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #include <assert.h> +#include <limits.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION

1 0

Henri Verbeet : d3d8: wined3d_device_get_available_texture_mem() returns a UINT.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 8fe8495908e416fea8222fae2d93e7af4c5db21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe8495908e416fea8222fae2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:18 2014 +0200 d3d8: wined3d_device_get_available_texture_mem() returns a UINT. --- dlls/d3d8/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3ee43f0..8458583 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -400,15 +400,15 @@ static HRESULT WINAPI d3d8_device_TestCooperativeLevel(IDirect3DDevice8 *iface) static UINT WINAPI d3d8_device_GetAvailableTextureMem(IDirect3DDevice8 *iface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + UINT ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_get_available_texture_mem(device->wined3d_device); + ret = wined3d_device_get_available_texture_mem(device->wined3d_device); wined3d_mutex_unlock(); - return hr; + return ret; } static HRESULT WINAPI d3d8_device_ResourceManagerDiscardBytes(IDirect3DDevice8 *iface, DWORD byte_count)

1 0

Henri Verbeet : d3d9: wined3d_device_get_available_texture_mem() returns a UINT.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 888b278096cd773241cad9a107314c22addaa53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=888b278096cd773241cad9a10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:19 2014 +0200 d3d9: wined3d_device_get_available_texture_mem() returns a UINT. --- dlls/d3d9/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1117138..7d41e4e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -343,15 +343,15 @@ static HRESULT WINAPI d3d9_device_TestCooperativeLevel(IDirect3DDevice9Ex *iface static UINT WINAPI d3d9_device_GetAvailableTextureMem(IDirect3DDevice9Ex *iface) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + UINT ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_get_available_texture_mem(device->wined3d_device); + ret = wined3d_device_get_available_texture_mem(device->wined3d_device); wined3d_mutex_unlock(); - return hr; + return ret; } static HRESULT WINAPI d3d9_device_EvictManagedResources(IDirect3DDevice9Ex *iface)

1 0

Henri Verbeet : wined3d: Store the amount of video memory as a UINT64.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: 7cdaece711e696447b10ea9c0ab00b7ced799165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdaece711e696447b10ea9c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:20 2014 +0200 wined3d: Store the amount of video memory as a UINT64. --- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/directx.c | 28 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54273cd..b7d02bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1138,11 +1138,12 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device { TRACE("device %p.\n", device); - TRACE("Emulating %d MB, returning %d MB left.\n", - device->adapter->TextureRam / (1024 * 1024), - (device->adapter->TextureRam - device->adapter->UsedTextureRam) / (1024 * 1024)); + TRACE("Emulating 0x%s bytes. 0x%s used, returning 0x%s left.\n", + wine_dbgstr_longlong(device->adapter->vram_bytes), + wine_dbgstr_longlong(device->adapter->vram_bytes_used), + wine_dbgstr_longlong(device->adapter->vram_bytes - device->adapter->vram_bytes_used)); - return device->adapter->TextureRam - device->adapter->UsedTextureRam; + return min(UINT_MAX, device->adapter->vram_bytes - device->adapter->vram_bytes_used); } void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d1eeee8..f1ba7b5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -409,11 +409,13 @@ fail: } /* Adjust the amount of used texture memory */ -unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) +UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { - adapter->UsedTextureRam += amount; - TRACE("Adjusted adapter memory by %d to %d.\n", amount, adapter->UsedTextureRam); - return adapter->UsedTextureRam; + adapter->vram_bytes_used += amount; + TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n", + wine_dbgstr_longlong(amount), + wine_dbgstr_longlong(adapter->vram_bytes_used)); + return adapter->vram_bytes_used; } static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) @@ -1498,21 +1500,21 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if ((gpu_desc = get_gpu_description(driver_info->vendor, driver_info->device))) { driver_info->description = gpu_desc->description; - driver_info->vidmem = gpu_desc->vidmem * 1024 * 1024; + driver_info->vram_bytes = (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; } else { ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); driver_info->description = "Direct3D HAL"; - driver_info->vidmem = WINE_DEFAULT_VIDMEM; + driver_info->vram_bytes = WINE_DEFAULT_VIDMEM; driver = DRIVER_UNKNOWN; } if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with %u bytes.\n", wined3d_settings.emulated_textureram); - driver_info->vidmem = wined3d_settings.emulated_textureram; + driver_info->vram_bytes = wined3d_settings.emulated_textureram; } /* Try to obtain driver version information for the current Windows version. This fails in @@ -3401,7 +3403,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); - identifier->video_memory = adapter->TextureRam; + identifier->video_memory = min(~(SIZE_T)0, adapter->vram_bytes); return WINED3D_OK; } @@ -5104,9 +5106,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } - adapter->TextureRam = adapter->driver_info.vidmem; - adapter->UsedTextureRam = 0; - TRACE("Emulating %u MB of texture ram.\n", adapter->TextureRam / (1024 * 1024)); + adapter->vram_bytes = adapter->driver_info.vram_bytes; + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); @@ -5132,9 +5134,9 @@ static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordi adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; if (wined3d_settings.emulated_textureram) - adapter->TextureRam = wined3d_settings.emulated_textureram; + adapter->vram_bytes = wined3d_settings.emulated_textureram; else - adapter->TextureRam = 128 * 1024 * 1024; + adapter->vram_bytes = 128 * 1024 * 1024; initPixelFormatsNoGL(&adapter->gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9d81a5c..ebe0bf8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1634,7 +1634,7 @@ struct wined3d_driver_info enum wined3d_pci_device device; const char *name; const char *description; - unsigned int vidmem; + UINT64 vram_bytes; DWORD version_high; DWORD version_low; }; @@ -1683,8 +1683,8 @@ struct wined3d_adapter WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; - unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ - unsigned int UsedTextureRam; + UINT64 vram_bytes; + UINT64 vram_bytes_used; LUID luid; const struct wined3d_vertex_pipe_ops *vertex_pipe; @@ -1694,7 +1694,7 @@ struct wined3d_adapter }; BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; -unsigned int adapter_adjust_memory(struct wined3d_adapter *adapter, int amount) DECLSPEC_HIDDEN; +UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL initPixelFormatsNoGL(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

André Hentschel : wpcap: Fix spec file to not print empty buffers.
by Alexandre Julliard 18 Aug '14

18 Aug '14

Module: wine Branch: master Commit: d1e780f2d2dc7b2f64e1dae264676e2c63725760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e780f2d2dc7b2f64e1dae26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:52:27 2014 +0200 wpcap: Fix spec file to not print empty buffers. --- dlls/wpcap/wpcap.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 75a5bfd..c0ba15e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -24,7 +24,7 @@ @ stub pcap_dump_open @ stub pcap_file @ stub pcap_fileno -@ cdecl pcap_findalldevs(ptr str) wine_pcap_findalldevs +@ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs @ stub pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ stub pcap_freecode @@ -37,8 +37,8 @@ @ stub pcap_list_datalinks @ stub pcap_live_dump @ stub pcap_live_dump_ended -@ cdecl pcap_lookupdev(str) wine_pcap_lookupdev -@ cdecl pcap_lookupnet(str ptr ptr str) wine_pcap_lookupnet +@ cdecl pcap_lookupdev(ptr) wine_pcap_lookupdev +@ cdecl pcap_lookupnet(str ptr ptr ptr) wine_pcap_lookupnet @ stub pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @@ -49,7 +49,7 @@ @ stub pcap_offline_read @ stub pcap_open @ stub pcap_open_dead -@ cdecl pcap_open_live(str long long long str) wine_pcap_open_live +@ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline @ stub pcap_parsesrcstr @ stub pcap_perror

1 0