April 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10: COM cleanup for the ID3D10EffectVariable interface.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Michael Stefaniuc : ntdll/tests: Avoid casting zero.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 6ea39eed8d2c603a1442828e97840c731a2caffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea39eed8d2c603a1442828e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:58:50 2012 +0200 ntdll/tests: Avoid casting zero. --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 63bc813..5ba577d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1154,7 +1154,7 @@ static void test_RtlIpv4AddressToString(void) CHAR buffer[20]; CHAR *res; IN_ADDR ip; - DWORD len; + DWORD_PTR len; if (!pRtlIpv4AddressToStringA) { @@ -1175,7 +1175,7 @@ static void test_RtlIpv4AddressToString(void) res = pRtlIpv4AddressToStringA(&ip, NULL); ok( (res == (char *)~0) || - broken(res == (char *)0 + len), /* XP and w2003 */ + broken(res == (char *)len), /* XP and w2003 */ "got %p (expected ~0)\n", res); if (0) {

1 0

Jacek Caban : jscript: Make sure to jump out of switch before entering implicit default clausule.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 05d59abc1c7a0463a90fc121252b0e342a3609d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d59abc1c7a0463a90fc1212… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 11:25:25 2012 +0200 jscript: Make sure to jump out of switch before entering implicit default clausule. --- dlls/jscript/compile.c | 3 +++ dlls/jscript/tests/lang.js | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0a66348..b14c50b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1516,6 +1516,9 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t assert(i == case_cnt); if(!have_default) { + hres = push_instr_uint(ctx, OP_jmp, stat_ctx.break_label); + if(FAILED(hres)) + return hres; instr_ptr(ctx, default_jmp)->arg1.uint = ctx->code_off; if(!push_instr(ctx, OP_undefined)) return E_OUTOFMEMORY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 41374e2..4d2efa3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -726,6 +726,16 @@ case 3: ok(false, "unexpected case 3"); } +(function() { + var i=0; + + switch(1) { + case 1: + i++; + } + return i; +})(); + tmp = eval("1"); ok(tmp === 1, "eval(\"1\") !== 1"); eval("{ ok(tmp === 1, 'eval: tmp !== 1'); } tmp = 2;");

1 0

Marcus Meissner : dmusic: Remove useless NULL check (Coverity).
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: af5c45aac0f2725f200ca78d147043d9fac6f259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5c45aac0f2725f200ca78d1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 16 09:12:40 2012 +0200 dmusic: Remove useless NULL check (Coverity). --- dlls/dmusic/tests/dmusic.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 29ad642..c537afa 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -100,8 +100,7 @@ static void test_dmusic(void) if (port) IDirectMusicPort_Release(port); - if (dmusic) - IDirectMusic_Release(dmusic); + IDirectMusic_Release(dmusic); } START_TEST(dmusic)

1 0

Henri Verbeet : wined3d: device_clear_render_targets() never fails.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Akihiro Sagawa : comctl32/tests: Add tests for long info tip texts.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 28f26c978387e161b42b9dd5960a91e1af6b49a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f26c978387e161b42b9dd59… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 13 22:45:20 2012 +0900 comctl32/tests: Add tests for long info tip texts. --- dlls/comctl32/tests/tooltips.c | 124 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 31504d1..cf571de 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -636,6 +636,128 @@ static void test_ttm_gettoolinfo(void) DestroyWindow(hwnd); } +static void test_longtextA(void) +{ + static const char longtextA[] = + "According to MSDN, TTM_ENUMTOOLS claims that TOOLINFO's lpszText is maximum " + "80 chars including null. In fact, the buffer is not null-terminated."; + HWND hwnd; + TTTOOLINFOA toolinfoA = { 0 }; + CHAR bufA[256]; + LRESULT r; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = GetModuleHandleA(NULL); + toolinfoA.uFlags = 0; + toolinfoA.uId = 0x1234ABCD; + strcpy(bufA, longtextA); + toolinfoA.lpszText = bufA; + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + if (r) + { + int textlen; + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0xABCD1234; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_ENUMTOOLSA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + ok(toolinfoA.uId == 0x1234ABCD, + "uId should be retrieved, got %p\n", (void*)toolinfoA.uId); + + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + + memset(bufA, 0, sizeof(bufA)); + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + textlen = lstrlenA(toolinfoA.lpszText); + todo_wine ok(textlen == 80, "lpszText has %d chars\n", textlen); + } + + DestroyWindow(hwnd); +} + +static void test_longtextW(void) +{ + static const char longtextA[] = + "According to MSDN, TTM_ENUMTOOLS claims that TOOLINFO's lpszText is maximum " + "80 chars including null. Actually, this is not applied for wide version."; + HWND hwnd; + TTTOOLINFOW toolinfoW = { 0 }; + WCHAR bufW[256]; + LRESULT r; + int lenW; + + hwnd = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + if(!hwnd) + { + win_skip("CreateWindowExW() not supported. Skipping.\n"); + return; + } + + toolinfoW.cbSize = TTTOOLINFOW_V2_SIZE; + toolinfoW.hwnd = NULL; + toolinfoW.hinst = GetModuleHandleW(NULL); + toolinfoW.uFlags = 0; + toolinfoW.uId = 0x1234ABCD; + MultiByteToWideChar(CP_ACP, 0, longtextA, -1, bufW, sizeof(bufW)/sizeof(bufW[0])); + lenW = lstrlenW(bufW); + toolinfoW.lpszText = bufW; + toolinfoW.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoW.rect); + r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); + if (r) + { + int textlen; + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0xABCD1234; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_ENUMTOOLSW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); + ok(toolinfoW.uId == 0x1234ABCD, + "uId should be retrieved, got %p\n", (void*)toolinfoW.uId); + + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); + + memset(bufW, 0, sizeof(bufW)); + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + textlen = lstrlenW(toolinfoW.lpszText); + ok(textlen == lenW || + broken(textlen == 0 && toolinfoW.lpszText == NULL), /* nt4, kb186177 */ + "lpszText has %d chars\n", textlen); + } + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -644,4 +766,6 @@ START_TEST(tooltips) test_customdraw(); test_gettext(); test_ttm_gettoolinfo(); + test_longtextA(); + test_longtextW(); }

1 0

Henri Verbeet : d3d10core: COM cleanup for the ID3D10Buffer interface.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Christian Costa : winegstreamer: Remove useless FIXME.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 1a5851f634efe9261b9bb98b32eb07e72d713437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5851f634efe9261b9bb98b3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 13 19:23:31 2012 +0200 winegstreamer: Remove useless FIXME. --- dlls/winegstreamer/gsttffilter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 3a84f7a..03b854b 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -796,7 +796,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P NULL); hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); - FIXME("%08x\n", hr); gst_caps_unref(capsin); gst_caps_unref(capsout);

1 0

Nikolay Sivov : msxml3: Use expected/ actual sequence concept for reader tests including attributes tests.
by Alexandre Julliard April 16, 2012

April 16, 2012

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 : d3drm: Remove leftover return statement (Smatch).
by Alexandre Julliard April 16, 2012

April 16, 2012

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