wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Michael Stefaniuc : oleaut32/tests: Compare the correct variants.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: bb83794e2873f50aee3b4f1a8d5fb84a2b1c5e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb83794e2873f50aee3b4f1a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:50:42 2012 +0200 oleaut32/tests: Compare the correct variants. --- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 06686e0..4f7b843 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1286,7 +1286,7 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - ok(SafeArrayGetDim(V_ARRAY(&v)) == SafeArrayGetDim(V_ARRAY(&v)), "array dims differ\n"); + ok(SafeArrayGetDim(V_ARRAY(&v)) == SafeArrayGetDim(V_ARRAY(&v2)), "array dims differ\n"); SafeArrayGetLBound(V_ARRAY(&v), 1, &bound); SafeArrayGetLBound(V_ARRAY(&v2), 1, &bound2); ok(bound == bound2, "array lbounds differ\n"); @@ -1329,7 +1329,7 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v)), "array dims differ\n"); + ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array lbounds differ\n");

1 0

Henri Verbeet : ddraw/tests: Add a helper function to create a material.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 3f0af44ffbfdca20d8e0a685ea6155847ecd2162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0af44ffbfdca20d8e0a685e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:15 2012 +0200 ddraw/tests: Add a helper function to create a material. --- dlls/ddraw/tests/ddraw1.c | 102 ++++++++++++++------------------------ dlls/ddraw/tests/ddraw2.c | 121 +++++++++++++++------------------------------ 2 files changed, 78 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f0af44ffbfdca20d8e0a…

1 0

Henri Verbeet : wined3d: device_clear_render_targets() never fails.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 49c4623b2fba96aa18f6146fb58783efc868ee14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c4623b2fba96aa18f6146fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:14 2012 +0200 wined3d: device_clear_render_targets() never fails. --- dlls/wined3d/device.c | 14 ++++++-------- dlls/wined3d/surface.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a6443e5..ad30afa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -637,7 +637,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context } /* Do not call while under the GL lock. */ -HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, +void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { @@ -673,7 +673,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { context_release(context); WARN("Invalid context, skipping clear.\n"); - return WINED3D_OK; + return; } if (target) @@ -702,7 +702,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { context_release(context); WARN("Failed to apply clear state, skipping clear.\n"); - return WINED3D_OK; + return; } ENTER_GL(); @@ -819,8 +819,6 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); - - return WINED3D_OK; } ULONG CDECL wined3d_device_incref(struct wined3d_device *device) @@ -3958,10 +3956,10 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } wined3d_get_draw_rect(&device->stateBlock->state, &draw_rect); + device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, + &device->fb, rect_count, rects, &draw_rect, flags, color, depth, stencil); - return device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, rect_count, rects, - &draw_rect, flags, color, depth, stencil); + return WINED3D_OK; } void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 76f5863..a80cab2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6447,8 +6447,9 @@ static HRESULT ffp_blit_color_fill(struct wined3d_device *device, struct wined3d const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; struct wined3d_fb_state fb = {&dst_surface, NULL}; - return device_clear_render_targets(device, 1, &fb, - 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); + device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); + + return WINED3D_OK; } /* Do not call while under the GL lock. */ @@ -6458,8 +6459,9 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, const RECT draw_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_fb_state fb = {NULL, surface}; - return device_clear_render_targets(device, 0, &fb, - 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + device_clear_render_targets(device, 0, &fb, 1, rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); + + return WINED3D_OK; } const struct blit_shader ffp_blit = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf99835..0a110f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1788,7 +1788,7 @@ struct wined3d_device struct list patches[PATCHMAP_SIZE]; }; -HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, +void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Move the present() back buffer check to the common wined3d_swapchain_present() code.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 3ba95e2f3ea0664de3a6965bb3803914ba611824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba95e2f3ea0664de3a6965bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:13 2012 +0200 wined3d: Move the present() back buffer check to the common wined3d_swapchain_present() code. --- dlls/wined3d/swapchain.c | 27 ++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2674ce6..0e363a5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -145,10 +145,17 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (!swapchain->back_buffers) + { + WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + wined3d_swapchain_set_window(swapchain, dst_window_override); - return swapchain->swapchain_ops->swapchain_present(swapchain, - src_rect, dst_rect, dirty_region, flags); + swapchain->swapchain_ops->swapchain_present(swapchain, src_rect, dst_rect, dirty_region, flags); + + return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, @@ -446,7 +453,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } -static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, +static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { struct wined3d_surface *back_buffer = swapchain->back_buffers[0]; @@ -461,7 +468,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R { context_release(context); WARN("Invalid context, skipping present.\n"); - return WINED3D_OK; + return; } gl_info = context->gl_info; @@ -685,9 +692,6 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R } context_release(context); - - TRACE("returning\n"); - return WINED3D_OK; } static const struct wined3d_swapchain_ops swapchain_gl_ops = @@ -740,16 +744,11 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r ReleaseDC(window, dst_dc); } -static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, +static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { struct wined3d_surface *front, *back; - if (!swapchain->back_buffers) - { - WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } front = swapchain->front_buffer; back = swapchain->back_buffers[0]; @@ -806,8 +805,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const } x11_copy_to_screen(swapchain, NULL); - - return WINED3D_OK; } static const struct wined3d_swapchain_ops swapchain_gdi_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 472c21a..bf99835 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2443,7 +2443,7 @@ struct wined3d_rendertarget_view struct wined3d_swapchain_ops { - HRESULT (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, + void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, const RGNDATA *dirty_region, DWORD flags); };

1 0

Henri Verbeet : d3d10: COM cleanup for the ID3D10EffectVariable interface.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: fa6a8396a0bfcbebc3f431d6af5cfd3bd788013b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6a8396a0bfcbebc3f431d6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:12 2012 +0200 d3d10: COM cleanup for the ID3D10EffectVariable interface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 265 ++++++++++++++++++++++--------------------- 2 files changed, 137 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa6a8396a0bfcbebc3f43…

1 0

Henri Verbeet : d3d10core: COM cleanup for the ID3D10Buffer interface.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 0a9ac7e992824f28b81dc0f3f5a14deed4d781b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9ac7e992824f28b81dc0f3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:11 2012 +0200 d3d10core: COM cleanup for the ID3D10Buffer interface. --- dlls/d3d10core/buffer.c | 47 +++++++++++++++++++++++------------- dlls/d3d10core/d3d10core_private.h | 5 +++- dlls/d3d10core/device.c | 10 ++++--- dlls/d3d10core/inputlayout.c | 1 - dlls/d3d10core/shader.c | 1 - dlls/d3d10core/view.c | 1 - 6 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index fd2175e..90ff0e8 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -24,11 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static inline struct d3d10_buffer *impl_from_ID3D10Buffer(ID3D10Buffer *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_buffer, ID3D10Buffer_iface); +} + /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_ID3D10Buffer) || IsEqualGUID(riid, &IID_ID3D10Resource) @@ -36,40 +41,38 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface || IsEqualGUID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) { - struct d3d10_buffer *This = (struct d3d10_buffer *)iface; - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + ULONG refcount = InterlockedIncrement(&buffer->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", buffer, refcount); if (refcount == 1) - wined3d_buffer_incref(This->wined3d_buffer); + wined3d_buffer_incref(buffer->wined3d_buffer); return refcount; } static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) { - struct d3d10_buffer *This = (struct d3d10_buffer *)iface; - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + ULONG refcount = InterlockedDecrement(&buffer->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) - { - wined3d_buffer_decref(This->wined3d_buffer); - } + wined3d_buffer_decref(buffer->wined3d_buffer); return refcount; } @@ -132,7 +135,7 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { - struct d3d10_buffer *buffer = (struct d3d10_buffer *)iface; + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); @@ -146,9 +149,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) { + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + TRACE("iface %p.\n", iface); - wined3d_buffer_unmap(((struct d3d10_buffer *)iface)->wined3d_buffer); + wined3d_buffer_unmap(buffer->wined3d_buffer); } static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) @@ -177,6 +182,14 @@ static const struct ID3D10BufferVtbl d3d10_buffer_vtbl = d3d10_buffer_GetDesc, }; +struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_buffer_vtbl); + return CONTAINING_RECORD(iface, struct d3d10_buffer, ID3D10Buffer_iface); +} + static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) { HeapFree(GetProcessHeap(), 0, parent); @@ -193,7 +206,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi struct wined3d_buffer_desc wined3d_desc; HRESULT hr; - buffer->vtbl = &d3d10_buffer_vtbl; + buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; buffer->refcount = 1; FIXME("Implement DXGI<->wined3d usage conversion\n"); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index d99a337..5f320e0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -21,6 +21,8 @@ #include "wine/debug.h" +#include <assert.h> + #define COBJMACROS #include "winbase.h" #include "wingdi.h" @@ -111,7 +113,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic /* ID3D10Buffer */ struct d3d10_buffer { - const struct ID3D10BufferVtbl *vtbl; + ID3D10Buffer ID3D10Buffer_iface; LONG refcount; struct wined3d_buffer *wined3d_buffer; @@ -119,6 +121,7 @@ struct d3d10_buffer HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; +struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilView */ struct d3d10_depthstencil_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cf21bba..637109f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -203,9 +203,10 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac for (i = 0; i < buffer_count; ++i) { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + wined3d_device_set_stream_source(This->wined3d_device, start_slot, - buffers[i] ? ((struct d3d10_buffer *)buffers[i])->wined3d_buffer : NULL, - offsets[i], strides[i]); + buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } } @@ -213,12 +214,13 @@ static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface, ID3D10Buffer *buffer, DXGI_FORMAT format, UINT offset) { struct d3d10_device *This = impl_from_ID3D10Device(iface); + struct d3d10_buffer *buffer_impl = unsafe_impl_from_ID3D10Buffer(buffer); TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); wined3d_device_set_index_buffer(This->wined3d_device, - buffer ? ((struct d3d10_buffer *)buffer)->wined3d_buffer : NULL, + buffer_impl ? buffer_impl->wined3d_buffer : NULL, wined3dformat_from_dxgi_format(format)); if (offset) FIXME("offset %u not supported.\n", offset); } @@ -644,7 +646,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, return hr; } - *buffer = (ID3D10Buffer *)object; + *buffer = &object->ID3D10Buffer_iface; TRACE("Created ID3D10Buffer %p\n", object); diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index d6ae787..09b8998 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -19,7 +19,6 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> #include "d3d10core_private.h" diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 82ddadc..c6803ed 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -19,7 +19,6 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> #include "d3d10core_private.h" diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 57c4148..57473e4 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -19,7 +19,6 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> #define NONAMELESSUNION #include "d3d10core_private.h"

1 0

Nikolay Sivov : msxml3: Use expected/ actual sequence concept for reader tests including attributes tests.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: bcd858547b237161b803852a663289abb1dd4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd858547b237161b803852a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 15 13:47:30 2012 +0400 msxml3: Use expected/actual sequence concept for reader tests including attributes tests. --- dlls/msxml3/saxreader.c | 19 +- dlls/msxml3/tests/saxreader.c | 1580 ++++++++++++++++++++++++++--------------- 2 files changed, 1030 insertions(+), 569 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd858547b237161b8038…

1 0

Michael Stefaniuc : strmbase: Remove break after return (Smatch).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 8a8ba19eafe64170bd7df984a5c3d2d4891bc137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8ba19eafe64170bd7df984a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 16:36:41 2012 +0200 strmbase: Remove break after return (Smatch). --- dlls/strmbase/window.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 7de66a9..aa9214a 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -194,7 +194,6 @@ BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg case WM_RBUTTONUP: PostMessageW(pControlWindow->hwndDrain, uMsg, wParam, lParam); return TRUE; - break; default: break; }

1 0

Michael Stefaniuc : mmdevapi: Remove superfluous NULL pointer check before HeapFree (Smatch).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 5c47973c249cf22a4750de42880012269de555f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c47973c249cf22a4750de428… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 16:31:57 2012 +0200 mmdevapi: Remove superfluous NULL pointer check before HeapFree (Smatch). --- dlls/mmdevapi/devenum.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 866aa06..075313c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -301,8 +301,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st }else if(cur->ref > 0) WARN("Modifying an MMDevice with postitive reference count!\n"); - if(cur->drv_id) - HeapFree(GetProcessHeap(), 0, cur->drv_id); + HeapFree(GetProcessHeap(), 0, cur->drv_id); cur->drv_id = name; cur->flow = flow;

1 0

Michael Stefaniuc : d3drm: Remove leftover return statement (Smatch).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 72d7ce28f051177b33e732909e56fda939334975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d7ce28f051177b33e732909… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 16:26:22 2012 +0200 d3drm: Remove leftover return statement (Smatch). --- dlls/d3drm/d3drm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7d92858..3db6b9e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1452,8 +1452,6 @@ end: IDirectXFile_Release(pDXFile); return ret; - - return E_NOTIMPL; } static HRESULT WINAPI IDirect3DRM3Impl_Tick(IDirect3DRM3* iface, D3DVALUE tick)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
72
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 April 2012