wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Jacek Caban : urlmon: Improved BindToObject failure when MIME handler is not available.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: f8236c5ac3d1cfa807c12dd1cea9a27f388e32c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8236c5ac3d1cfa807c12dd1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:39:34 2013 +0200 urlmon: Improved BindToObject failure when MIME handler is not available. --- dlls/urlmon/binding.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 3cb49f1..306e9b3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -299,16 +299,18 @@ static void create_object(Binding *binding) return; } - if(!(clsid_str = get_mime_clsid(binding->mime, &clsid))) { - FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); - return; - } + if((clsid_str = get_mime_clsid(binding->mime, &clsid))) + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); - hres = create_mime_object(binding, &clsid, clsid_str); - heap_free(clsid_str); + if(clsid_str) { + hres = create_mime_object(binding, &clsid, clsid_str); + heap_free(clsid_str); + }else { + FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); + hres = REGDB_E_CLASSNOTREG; + } IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_ENDSYNCOPERATION, NULL); binding->clsid = CLSID_NULL;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMLIGHTARRAY.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: ee6734e848849230df334cb1b0ba8d457e7ad3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6734e848849230df334cb1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:48 2013 +0200 d3drm: Avoid LPDIRECT3DRMLIGHTARRAY. --- dlls/d3drm/frame.c | 12 +++++------- dlls/d3drm/tests/d3drm.c | 14 +++++++------- include/d3drmobj.h | 6 +++--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 88540f0..4b6eae8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -703,14 +703,13 @@ static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetColor(IDirect3DRMFrame2* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2* iface, - LPDIRECT3DRMLIGHTARRAY *lights) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2 *iface, IDirect3DRMLightArray **lights) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame2(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, lights); + TRACE("iface %p, lights %p.\n", iface, lights); - return IDirect3DRMFrame3_GetLights(&This->IDirect3DRMFrame3_iface, lights); + return IDirect3DRMFrame3_GetLights(&frame->IDirect3DRMFrame3_iface, lights); } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame2Impl_GetMaterialMode(IDirect3DRMFrame2* iface) @@ -1721,8 +1720,7 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetColor(IDirect3DRMFrame3* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3* iface, - LPDIRECT3DRMLIGHTARRAY *lights) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3 *iface, IDirect3DRMLightArray **lights) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); IDirect3DRMLightArrayImpl* obj; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 34b0fd0..7e59050 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -918,7 +918,7 @@ static void test_Frame(void) IDirect3DRMVisualArray *visual_array; IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; - LPDIRECT3DRMLIGHTARRAY pLightArray; + IDirect3DRMLightArray *light_array; D3DCOLOR color; DWORD count; CHAR cname[64] = {0}; @@ -1193,18 +1193,18 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); CHECK_REFCOUNT(light1, 2); - pLightArray = NULL; - hr = IDirect3DRMFrame_GetLights(pFrameP1, &pLightArray); + light_array = NULL; + hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array); ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); - if (pLightArray) + if (light_array) { - count = IDirect3DRMLightArray_GetSize(pLightArray); + count = IDirect3DRMLightArray_GetSize(light_array); ok(count == 1, "count = %u\n", count); - hr = IDirect3DRMLightArray_GetElement(pLightArray, 0, &light_tmp); + hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp); ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); ok(light_tmp == light1, "light_tmp = %p\n", light_tmp); IDirect3DRMLight_Release(light_tmp); - IDirect3DRMLightArray_Release(pLightArray); + IDirect3DRMLightArray_Release(light_array); } /* Delete Light */ diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7bae278..e1c2da9 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1106,7 +1106,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_position) PURE; @@ -1339,7 +1339,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_position) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(AddVisual)(THIS_ LPUNKNOWN) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame3 **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *return_position) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMPICKEDARRAY.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cf3053f504b0946791c61af4c79abcde6524177a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3053f504b0946791c61af4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:47 2013 +0200 d3drm: Avoid LPDIRECT3DRMPICKEDARRAY. --- dlls/d3drm/viewport.c | 16 ++++++---------- include/d3drmobj.h | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 49cceb0..ee4cbb3 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -341,12 +341,10 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_GetPlane(IDirect3DRMViewport* ifac return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewportImpl_Pick(IDirect3DRMViewport* iface, LONG x, LONG y, - LPDIRECT3DRMPICKEDARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMViewportImpl_Pick(IDirect3DRMViewport *iface, + LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - - FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, x, y, return_visuals); + FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); return E_NOTIMPL; } @@ -760,12 +758,10 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetPlane(IDirect3DRMViewport2* if return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_Pick(IDirect3DRMViewport2* iface, LONG x, LONG y, - LPDIRECT3DRMPICKEDARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMViewport2Impl_Pick(IDirect3DRMViewport2 *iface, + LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, x, y, return_visuals); + FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 0253b89..7bae278 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -826,7 +826,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD(GetCamera)(THIS_ struct IDirect3DRMFrame **camera) PURE; STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; - STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; + STDMETHOD(Pick)(THIS_ LONG x, LONG y, struct IDirect3DRMPickedArray **visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE; STDMETHOD_(LONG, GetX)(THIS) PURE; STDMETHOD_(LONG, GetY)(THIS) PURE; @@ -966,7 +966,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(GetCamera)(THIS_ struct IDirect3DRMFrame3 **camera) PURE; STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; - STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; + STDMETHOD(Pick)(THIS_ LONG x, LONG y, struct IDirect3DRMPickedArray **visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE; STDMETHOD_(LONG, GetX)(THIS) PURE; STDMETHOD_(LONG, GetY)(THIS) PURE;

1 0

Henri Verbeet : wined3d: Assume the buffer has a buffer object in buffer_add_dirty_area().
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cbaa17d3cf7d6f3bd6a050aff33cce9942287c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa17d3cf7d6f3bd6a050aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:46 2013 +0200 wined3d: Assume the buffer has a buffer object in buffer_add_dirty_area(). --- dlls/wined3d/buffer.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2ba88e..4bfca33 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,11 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static void buffer_add_dirty_area(struct wined3d_buffer *buffer, UINT offset, UINT size) +static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, UINT offset, UINT size) { - if (!buffer->buffer_object) - return; - if (!offset && !size) goto invalidate_all; @@ -188,7 +185,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - buffer_add_dirty_area(This, 0, 0); + buffer_invalidate_bo_range(This, 0, 0); } else { @@ -808,7 +805,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* The declaration changed, reload the whole buffer. */ WARN("Reloading buffer because of a vertex declaration change.\n"); - buffer_add_dirty_area(buffer, 0, 0); + buffer_invalidate_bo_range(buffer, 0, 0); /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates @@ -990,19 +987,19 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (flags & WINED3D_MAP_DISCARD) - buffer_add_dirty_area(buffer, 0, 0); - else if (!(flags & WINED3D_MAP_READONLY)) - buffer_add_dirty_area(buffer, offset, size); - count = ++buffer->resource.map_count; if (buffer->buffer_object) { + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (flags & WINED3D_MAP_DISCARD) + buffer_invalidate_bo_range(buffer, 0, 0); + else if (!(flags & WINED3D_MAP_READONLY)) + buffer_invalidate_bo_range(buffer, offset, size); + if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { if (count == 1)

1 0

Henri Verbeet : wined3d: Make buffer_add_dirty_area() never fail.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 4eb39ec5f44902e218ff13fb4e37cfc9115ca5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb39ec5f44902e218ff13fb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:45 2013 +0200 wined3d: Make buffer_add_dirty_area() never fail. --- dlls/wined3d/buffer.c | 94 +++++++++++++++++++++--------------------------- 1 files changed, 41 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3f692e2..f2ba88e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,41 +34,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static inline BOOL buffer_add_dirty_area(struct wined3d_buffer *This, UINT offset, UINT size) +static void buffer_add_dirty_area(struct wined3d_buffer *buffer, UINT offset, UINT size) { - if (!This->buffer_object) return TRUE; + if (!buffer->buffer_object) + return; - if (This->maps_size <= This->modified_areas) - { - void *new = HeapReAlloc(GetProcessHeap(), 0, This->maps, - This->maps_size * 2 * sizeof(*This->maps)); - if (!new) - { - ERR("Out of memory\n"); - return FALSE; - } - else - { - This->maps = new; - This->maps_size *= 2; - } - } + if (!offset && !size) + goto invalidate_all; - if(offset > This->resource.size || offset + size > This->resource.size) + if (offset > buffer->resource.size || offset + size > buffer->resource.size) { - WARN("Invalid range dirtified, marking entire buffer dirty\n"); - offset = 0; - size = This->resource.size; + WARN("Invalid range specified, invalidating entire buffer.\n"); + goto invalidate_all; } - else if(!offset && !size) + + if (buffer->modified_areas >= buffer->maps_size) { - size = This->resource.size; + struct wined3d_map_range *new; + + if (!(new = HeapReAlloc(GetProcessHeap(), 0, buffer->maps, 2 * buffer->maps_size * sizeof(*buffer->maps)))) + { + ERR("Failed to allocate maps array, invalidating entire buffer.\n"); + goto invalidate_all; + } + + buffer->maps = new; + buffer->maps_size *= 2; } - This->maps[This->modified_areas].offset = offset; - This->maps[This->modified_areas].size = size; - This->modified_areas++; - return TRUE; + buffer->maps[buffer->modified_areas].offset = offset; + buffer->maps[buffer->modified_areas].size = size; + ++buffer->modified_areas; + return; + +invalidate_all: + buffer->modified_areas = 1; + buffer->maps[0].offset = 0; + buffer->maps[0].size = buffer->resource.size; } static inline void buffer_clear_dirty_areas(struct wined3d_buffer *This) @@ -184,13 +186,9 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc This->buffer_object_size = This->resource.size; This->buffer_object_usage = gl_usage; - if(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - if(!buffer_add_dirty_area(This, 0, 0)) - { - ERR("buffer_add_dirty_area failed, this is not expected\n"); - goto fail; - } + buffer_add_dirty_area(This, 0, 0); } else { @@ -808,14 +806,10 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) return; } - /* The declaration changed, reload the whole buffer */ - WARN("Reloading buffer because of decl change\n"); - buffer_clear_dirty_areas(buffer); - if (!buffer_add_dirty_area(buffer, 0, 0)) - { - ERR("buffer_add_dirty_area failed, this is not expected\n"); - return; - } + /* The declaration changed, reload the whole buffer. */ + WARN("Reloading buffer because of a vertex declaration change.\n"); + buffer_add_dirty_area(buffer, 0, 0); + /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates */ @@ -996,20 +990,14 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ if (flags & WINED3D_MAP_DISCARD) - { - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (!buffer_add_dirty_area(buffer, 0, 0)) - return E_OUTOFMEMORY; - } + buffer_add_dirty_area(buffer, 0, 0); else if (!(flags & WINED3D_MAP_READONLY)) - { - if (!buffer_add_dirty_area(buffer, offset, size)) - return E_OUTOFMEMORY; - } + buffer_add_dirty_area(buffer, offset, size); count = ++buffer->resource.map_count;

1 0

Henri Verbeet : wined3d: Don' t bother downloading buffer contents on destruction.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 5e64fd70496d8a85a3dd8983f01d28a2f9c831bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e64fd70496d8a85a3dd8983f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:44 2013 +0200 wined3d: Don't bother downloading buffer contents on destruction. --- dlls/wined3d/buffer.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 586b16c..3f692e2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -551,12 +551,21 @@ static void buffer_unload(struct wined3d_resource *resource) ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); + struct wined3d_context *context; TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) { - buffer_unload(&buffer->resource); + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL); + delete_gl_buffer(buffer, context->gl_info); + context_release(context); + + HeapFree(GetProcessHeap(), 0, buffer->conversion_map); + } + resource_cleanup(&buffer->resource); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); HeapFree(GetProcessHeap(), 0, buffer->maps);

1 0

Andrew Eikum : oleaut32/tests: Test all supported SYSKINDs.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6c45e6fea3c8f3a5b545b32671aaf82c122fede4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c45e6fea3c8f3a5b545b3267… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 17:56:36 2013 -0500 oleaut32/tests: Test all supported SYSKINDs. --- dlls/oleaut32/tests/typelib.c | 187 +++++++++++++++++++++++++---------------- 1 files changed, 113 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c45e6fea3c8f3a5b545b…

1 0

Andrew Eikum : oleaut32/tests: Add save/load tests for created typelibs.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 3821eaf391aa12921b99e974ac0f31c3834bcb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3821eaf391aa12921b99e974a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 17:56:33 2013 -0500 oleaut32/tests: Add save/load tests for created typelibs. --- dlls/oleaut32/tests/typelib.c | 869 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 866 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3821eaf391aa12921b99e…

1 0

Andrew Eikum : oleaut32: Save typelib SYSKIND.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6f5cc0887ef19eb2d72a17a5906801b640e6c4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5cc0887ef19eb2d72a17a59… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:19 2013 -0500 oleaut32: Save typelib SYSKIND. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 031f2b1..fa37737 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9698,7 +9698,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) file.header.magic2 = 0x00010002; file.header.lcid = This->set_lcid ? This->set_lcid : MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); file.header.lcid2 = This->set_lcid; - file.header.varflags = 0x41; /* TODO?? */ + file.header.varflags = 0x40 | This->syskind; if (This->HelpFile) file.header.varflags |= 0x10; if (This->HelpStringDll)

1 0

Andrew Eikum : oleaut32: 64-bit typelib fixes.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: cc29cad2cc925f03fe220c2b40ca8d1d6bd53261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc29cad2cc925f03fe220c2b4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:14 2013 -0500 oleaut32: 64-bit typelib fixes. --- dlls/oleaut32/typelib.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d8e9840..031f2b1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2537,10 +2537,18 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->lpstrSchema=NULL; /* reserved */ ptiRet->cbSizeInstance=tiBase.size; +#ifdef _WIN64 + if(pLibInfo->syskind == SYS_WIN32) + ptiRet->cbSizeInstance=sizeof(void*); +#endif ptiRet->typekind=tiBase.typekind & 0xF; ptiRet->cFuncs=LOWORD(tiBase.cElement); ptiRet->cVars=HIWORD(tiBase.cElement); ptiRet->cbAlignment=(tiBase.typekind >> 11 )& 0x1F; /* there are more flags there */ +#ifdef _WIN64 + if(pLibInfo->syskind == SYS_WIN32) + ptiRet->cbAlignment = 8; +#endif ptiRet->wTypeFlags=tiBase.flags; ptiRet->wMajorVerNum=LOWORD(tiBase.version); ptiRet->wMinorVerNum=HIWORD(tiBase.version); @@ -8484,7 +8492,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, case TKIND_INTERFACE: case TKIND_DISPATCH: case TKIND_COCLASS: - info->cbSizeInstance = 4; + info->cbSizeInstance = This->ptr_size; break; case TKIND_RECORD: case TKIND_UNION: @@ -10199,6 +10207,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, !funcDesc->cParams) return TYPE_E_INCONSISTENTPROPFUNCS; +#ifdef _WIN64 + if(This->pTypeLib->syskind == SYS_WIN64 && + funcDesc->oVft % 8 != 0) + return E_INVALIDARG; +#endif + memset(&tmp_func_desc, 0, sizeof(tmp_func_desc)); TLBFuncDesc_Constructor(&tmp_func_desc);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
47
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 August 2013