November 2013 - Wine-commits

Henri Verbeet : ddraw: Move the display mode related surface desc fixups from CreateSurface() to ddraw_surface_create_texture().
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 9443c95a895a530fdbbb607758f674467e2010c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9443c95a895a530fdbbb60775… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:30 2013 +0100 ddraw: Move the display mode related surface desc fixups from CreateSurface() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 87 ----------------------------------------- dlls/ddraw/surface.c | 104 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9443c95a895a530fdbbb6…

1 0

Henri Verbeet : wined3d: Create surfaces inside wined3d.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: afc3d2ab708f4fb645c28347b61f73d26abff267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc3d2ab708f4fb645c28347b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:31 2013 +0100 wined3d: Create surfaces inside wined3d. --- dlls/d3d10core/device.c | 19 +++++----- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 29 +++++----------- dlls/d3d8/surface.c | 30 +++-------------- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 29 +++++----------- dlls/d3d9/surface.c | 32 ++++------------- dlls/ddraw/ddraw.c | 72 +++++++++++++++------------------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 42 ++++++++++------------- dlls/wined3d/surface.c | 36 +++++++++++++------- dlls/wined3d/texture.c | 15 ++++---- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 4 ++ include/wine/wined3d.h | 9 +---- 15 files changed, 129 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afc3d2ab708f4fb645c28…

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to surface_init().
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: bb00811d60225848437ca1d0c6eb4842f63a1d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb00811d60225848437ca1d0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:32 2013 +0100 wined3d: Pass a wined3d_resource_desc structure to surface_init(). --- dlls/wined3d/surface.c | 52 ++++++++++++++++++--------------------- dlls/wined3d/texture.c | 8 +---- dlls/wined3d/wined3d_private.h | 6 +--- 3 files changed, 28 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb00811d60225848437ca…

1 0

Henri Verbeet : wined3d: Set the surface container in surface_init().
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 42f6ca821ce4bbdd474f29703673a3bb47a73428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f6ca821ce4bbdd474f29703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 15 08:24:33 2013 +0100 wined3d: Set the surface container in surface_init(). --- dlls/ddraw/surface.c | 15 +++------------ dlls/wined3d/surface.c | 24 +++++++++++++----------- dlls/wined3d/texture.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 60f7dad..958abd7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -484,8 +484,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); } - if (surface->wined3d_texture - && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + if (surface->wined3d_texture) wined3d_texture_decref(surface->wined3d_texture); if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); @@ -508,11 +507,7 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) wined3d_mutex_unlock(); return iface_count; } - /* If it's a texture, destroy the wined3d texture. */ - if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - wined3d_texture_decref(This->wined3d_texture); - else - ddraw_surface_cleanup(This); + ddraw_surface_cleanup(This); wined3d_mutex_unlock(); if (release_iface) @@ -5579,12 +5574,8 @@ static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) { - struct ddraw_texture *texture = parent; - - TRACE("texture %p.\n", texture); + TRACE("parent %p.\n", parent); - if (texture->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - ddraw_surface_cleanup(texture->root); HeapFree(GetProcessHeap(), 0, parent); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3c45780..e30d6b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6766,9 +6766,10 @@ cpu: return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } -static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3d_resource_desc *desc, - struct wined3d_device *device, DWORD flags) +static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, DWORD flags) { + struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); UINT multisample_quality = desc->multisample_quality; @@ -6830,9 +6831,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3 return hr; } - /* "Standalone" surface. */ - surface_set_container(surface, NULL); - + surface_set_container(surface, container); list_init(&surface->overlays); /* Flags */ @@ -6866,6 +6865,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3 if (FAILED(hr)) { ERR("Private setup failed, returning %#x\n", hr); + surface_set_container(surface, NULL); surface_cleanup(surface); return hr; } @@ -6883,34 +6883,36 @@ static HRESULT surface_init(struct wined3d_surface *surface, const struct wined3 return hr; } -HRESULT CDECL wined3d_surface_create(struct wined3d_device *device, void *container_parent, +HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) { + struct wined3d_device_parent *device_parent = container->resource.device->device_parent; const struct wined3d_parent_ops *parent_ops; struct wined3d_surface *object; void *parent; HRESULT hr; - TRACE("device %p, container_parent %p, width %u, height %u, format %s, usage %s (%#x), " + TRACE("container %p, width %u, height %u, format %s, usage %s (%#x), " "pool %s, multisample_type %#x, multisample_quality %u, flags %#x, surface %p.\n", - device, container_parent, desc->width, desc->height, debug_d3dformat(desc->format), + container, desc->width, desc->height, debug_d3dformat(desc->format), debug_d3dusage(desc->usage), desc->usage, debug_d3dpool(desc->pool), desc->multisample_type, desc->multisample_quality, flags, surface); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = surface_init(object, desc, device, flags))) + if (FAILED(hr = surface_init(object, container, desc, flags))) { WARN("Failed to initialize surface, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - if (FAILED(hr = device->device_parent->ops->surface_created(device->device_parent, - container_parent, object, &parent, &parent_ops))) + if (FAILED(hr = device_parent->ops->surface_created(device_parent, + wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); + surface_set_container(object, NULL); wined3d_surface_decref(object); return hr; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da48100..a6a9dbf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -860,14 +860,13 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = wined3d_surface_create(device, parent, &surface_desc, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) { WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_container(surface, texture); surface_set_texture_target(surface, cube_targets[j], i); texture->sub_resources[idx] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); @@ -1015,14 +1014,13 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_surface *surface; - if (FAILED(hr = wined3d_surface_create(device, parent, &surface_desc, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) { WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_container(surface, texture); surface_set_texture_target(surface, texture->target, i); texture->sub_resources[i] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8a11f30..3c39ee1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,7 +2273,7 @@ void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDE HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; -HRESULT CDECL wined3d_surface_create(struct wined3d_device *device, void *container_parent, +HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3d10/tests: Remove some device creation traces.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 3b13f08537bae7bf93f8bc8a8f6fe010c19c825b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b13f08537bae7bf93f8bc8a8… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 15 09:46:02 2013 +0100 d3d10/tests: Remove some device creation traces. --- dlls/d3d10/tests/device.c | 6 ------ dlls/d3d10/tests/effect.c | 6 ------ 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 9ad742f..d5393a9 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -26,17 +26,11 @@ static ID3D10Device *create_device(void) ID3D10Device *device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a HW device\n"); return device; - } trace("Failed to create a HW device, trying REF\n"); if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a REF device\n"); return device; - } trace("Failed to create a device, returning NULL\n"); return NULL; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index fa24596..e16d458 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -28,17 +28,11 @@ static ID3D10Device *create_device(void) ID3D10Device *device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a HW device\n"); return device; - } trace("Failed to create a HW device, trying REF\n"); if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) - { - trace("Created a REF device\n"); return device; - } trace("Failed to create a device, returning NULL\n"); return NULL;

1 0

Rico Schüller : d3d10/tests: Create a new device for each device test.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: db521d5cd109880d7cddb242e5b03204f4088f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db521d5cd109880d7cddb242e… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 15 09:46:12 2013 +0100 d3d10/tests: Create a new device for each device test. --- dlls/d3d10/tests/device.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index d5393a9..0d5e0b3 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -36,10 +36,19 @@ static ID3D10Device *create_device(void) return NULL; } -static void test_device_interfaces(ID3D10Device *device) +static void test_device_interfaces(void) { - HRESULT hr; + ID3D10Device *device; + ULONG refcount; IUnknown *obj; + HRESULT hr; + + device = create_device(); + if (!device) + { + skip("Failed to create device, skipping tests\n"); + return; + } if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) IUnknown_Release(obj); @@ -56,6 +65,9 @@ static void test_device_interfaces(ID3D10Device *device) if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice (%#x)\n", hr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left\n", refcount); } static void test_stateblock_mask(void) @@ -218,19 +230,6 @@ static void test_stateblock_mask(void) START_TEST(device) { - ID3D10Device *device; - ULONG refcount; - - device = create_device(); - if (!device) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - test_device_interfaces(device); + test_device_interfaces(); test_stateblock_mask(); - - refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); }

1 0

Dmitry Timoshkov : gdiplus: Slightly simplify write_path_types.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 4bca12c0db4c8ce56492afd1ed3ee64b77b8508c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bca12c0db4c8ce56492afd1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 15 18:04:32 2013 +0900 gdiplus: Slightly simplify write_path_types. --- dlls/gdiplus/region.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5d95fcd..759675a 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -702,14 +702,15 @@ static inline void write_packed_point(DWORD* location, INT* offset, static inline void write_path_types(DWORD* location, INT* offset, const GpPath* path) { + INT rounded_size = get_pathtypes_size(path); + memcpy(location + *offset, path->pathdata.Types, path->pathdata.Count); /* The unwritten parts of the DWORD (if any) must be cleared */ - if (path->pathdata.Count % sizeof(DWORD)) + if (rounded_size - path->pathdata.Count) ZeroMemory(((BYTE*)location) + (*offset * sizeof(DWORD)) + - path->pathdata.Count, - sizeof(DWORD) - path->pathdata.Count % sizeof(DWORD)); - *offset += (get_pathtypes_size(path) / sizeof(DWORD)); + path->pathdata.Count, rounded_size - path->pathdata.Count); + *offset += rounded_size / sizeof(DWORD); } static void write_element(const region_element* element, DWORD *buffer,

1 0

Dmitry Timoshkov : gdiplus: Use GdipFree instead of HeapFree to free memory allocated with GdipAlloc.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: dd545c3e3773fda5908493a88b323b8ebfa61fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd545c3e3773fda5908493a88… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 15 18:04:38 2013 +0900 gdiplus: Use GdipFree instead of HeapFree to free memory allocated with GdipAlloc. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 759675a..832ce69 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1297,7 +1297,7 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr { /* Steal the element from the created region. */ memcpy(element, &new_region->node, sizeof(region_element)); - HeapFree(GetProcessHeap(), 0, new_region); + GdipFree(new_region); } else return stat;

1 0

Patrick Rudolph : ddraw: Fill dwNumFourCCCodes in ddraw7_GetCaps.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 626a3c6a5feb715a2ef06dbd6bf2d205b6b79a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=626a3c6a5feb715a2ef06dbd6… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Thu Nov 14 19:39:05 2013 +0100 ddraw: Fill dwNumFourCCCodes in ddraw7_GetCaps. --- dlls/ddraw/ddraw.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d4b88ec..63dce96 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1474,9 +1474,18 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD } hr = IDirectDraw7_GetAvailableVidMem(iface, &ddscaps, &caps.dwVidMemTotal, &caps.dwVidMemFree); - wined3d_mutex_unlock(); - if(FAILED(hr)) { + if (FAILED(hr)) + { WARN("IDirectDraw7::GetAvailableVidMem failed\n"); + wined3d_mutex_unlock(); + return hr; + } + + hr = IDirectDraw7_GetFourCCCodes(iface, &caps.dwNumFourCCCodes, NULL); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("IDirectDraw7::GetFourCCCodes failed\n"); return hr; }

1 0

Jacek Caban : winhttp: Moved netconn_query_data_available calls to query_data_available.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: e894c897d52c3e5852498164e246b473e0c6a786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e894c897d52c3e5852498164e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 11:47:38 2013 +0100 winhttp: Moved netconn_query_data_available calls to query_data_available. --- dlls/winhttp/request.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index db69082..12f7722 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1955,7 +1955,7 @@ static BOOL start_next_chunk( request_t *request, BOOL notify ) static DWORD get_available_data( request_t *request ) { if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); - return request->read_size + netconn_query_data_available( &request->netconn ); + return request->read_size; } /* check if we have reached the end of the data to read */ @@ -2391,10 +2391,14 @@ static BOOL query_data_available( request_t *request, DWORD *available, BOOL asy { DWORD count = get_available_data( request ); + if (!request->read_chunked) + count += netconn_query_data_available( &request->netconn ); if (!count) { refill_buffer( request, async ); count = get_available_data( request ); + if (!request->read_chunked) + count += netconn_query_data_available( &request->netconn ); } if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) );

1 0