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

Dmitry Timoshkov : gdi32: Fix parameters of some GDI stock fonts.
by Alexandre Julliard June 4, 2012

June 4, 2012

Module: wine Branch: master Commit: cca41207c161250d709ae3f8e0b002ac5c794de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca41207c161250d709ae3f8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 4 12:05:25 2012 +0900 gdi32: Fix parameters of some GDI stock fonts. --- dlls/gdi32/gdiobj.c | 140 +++++++++++++++++++++++----------------------- dlls/gdi32/tests/font.c | 81 +++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cca41207c161250d709ae…

1 0

Francois Gouget : msvcp90: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard June 4, 2012

June 4, 2012

Module: wine Branch: master Commit: fd84b7d0af2da4adce98b48f2c5349a3bab37004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd84b7d0af2da4adce98b48f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 2 10:35:35 2012 +0200 msvcp90: Add a trailing '\n' to a TRACE() message. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a436abf..c903acf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2418,7 +2418,7 @@ void __thiscall basic_ios_char_dtor(basic_ios_char *this) DEFINE_THISCALL_WRAPPER(MSVCP_basic_ios_char_vector_dtor, 8) basic_ios_char* __thiscall MSVCP_basic_ios_char_vector_dtor(basic_ios_char *this, unsigned int flags) { - TRACE("(%p %x)", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1;

1 0

Henri Verbeet : d3dx9: Use wine_dbgstr_rect() in some more places.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 176d27e88993d353fddf82312a31e95b5cbd5c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176d27e88993d353fddf82312… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:50 2012 +0200 d3dx9: Use wine_dbgstr_rect() in some more places. --- dlls/d3dx9_36/font.c | 23 +++--- dlls/d3dx9_36/sprite.c | 7 +- dlls/d3dx9_36/surface.c | 214 ++++++++++++++++++++++------------------------- 3 files changed, 116 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=176d27e88993d353fddf8…

1 0

Henri Verbeet : ddraw/tests: Split up test_coop_level_surf_create().
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 34c9586b603df3a34bf40ff290c91e762a887897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c9586b603df3a34bf40ff29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:49 2012 +0200 ddraw/tests: Split up test_coop_level_surf_create(). --- dlls/ddraw/tests/d3d.c | 76 --------------------------------------------- dlls/ddraw/tests/ddraw1.c | 24 ++++++++++++++ dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++ dlls/ddraw/tests/ddraw4.c | 24 ++++++++++++++ dlls/ddraw/tests/ddraw7.c | 24 ++++++++++++++ 5 files changed, 96 insertions(+), 76 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f0ec3cb..24700f6 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3626,80 +3626,6 @@ static void z_format_test(void) ok(count, "Expected at least one supported Z Buffer format\n"); } -static void test_coop_level_surf_create(void) -{ - IDirectDrawSurface7 *surface7; - IDirectDrawSurface4 *surface4; - IDirectDrawSurface *surface1; - IDirectDraw7 *ddraw7; - IDirectDraw4 *ddraw4; - IDirectDraw2 *ddraw2; - IDirectDraw *ddraw1; - DDSURFACEDESC2 ddsd2; - DDSURFACEDESC ddsd; - HRESULT hr; - - /* IDirectDraw */ - if (FAILED(hr = DirectDrawCreate(NULL, &ddraw1, NULL))) - { - skip("Failed to create IDirectDraw object (%#x), skipping tests.\n", hr); - return; - } - - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw_CreateSurface(ddraw1, &ddsd, &surface1, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - /* IDirectDraw2 */ - if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw2))) - { - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw2_CreateSurface(ddraw2, &ddsd, &surface1, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - IDirectDraw2_Release(ddraw2); - } - else skip("Failed to query IDirectDraw2 interface, skipping tests.\n"); - - /* IDirectDraw4 */ - if (SUCCEEDED(IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw4, (void **)&ddraw4))) - { - memset(&ddsd2, 0, sizeof(ddsd2)); - ddsd2.dwSize = sizeof(ddsd2); - ddsd2.dwFlags = DDSD_CAPS; - ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw4_CreateSurface(ddraw4, &ddsd2, &surface4, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - IDirectDraw4_Release(ddraw4); - } - else skip("Failed to query IDirectDraw4 interface, skipping tests.\n"); - - IDirectDraw_Release(ddraw1); - - /* IDirectDraw7 */ - if (FAILED(hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL))) - { - skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); - return; - } - - memset(&ddsd2, 0, sizeof(ddsd2)); - ddsd2.dwSize = sizeof(ddsd2); - ddsd2.dwFlags = DDSD_CAPS; - ddsd2.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw7_CreateSurface(ddraw7, &ddsd2, &surface7, NULL); - ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); - - IDirectDraw7_Release(ddraw7); -} - static void test_get_caps1(void) { D3DDEVICEDESC hw_caps, hel_caps; @@ -4053,6 +3979,4 @@ START_TEST(d3d) test_get_caps1(); D3D1_releaseObjects(); } - - test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a3b71c3..fb8b0be 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2414,6 +2414,29 @@ static void test_initialize(void) } } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface *surface; + IDirectDraw *ddraw; + DDSURFACEDESC ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw_Release(ddraw); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -2432,4 +2455,5 @@ START_TEST(ddraw1) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 0b4e536..c6641ae 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2533,6 +2533,29 @@ static void test_initialize(void) CoUninitialize(); } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface *surface; + IDirectDraw2 *ddraw; + DDSURFACEDESC ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -2553,4 +2576,5 @@ START_TEST(ddraw2) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f505653..0bf0eea 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2648,6 +2648,29 @@ static void test_initialize(void) CoUninitialize(); } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface4 *surface; + IDirectDraw4 *ddraw; + DDSURFACEDESC2 ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2669,4 +2692,5 @@ START_TEST(ddraw4) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6faa46c..4152f6b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2457,6 +2457,29 @@ static void test_initialize(void) CoUninitialize(); } +static void test_coop_level_surf_create(void) +{ + IDirectDrawSurface7 *surface; + IDirectDraw7 *ddraw; + DDSURFACEDESC2 ddsd; + HRESULT hr; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOCOOPERATIVELEVELSET, "Surface creation returned hr %#x.\n", hr); + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2485,4 +2508,5 @@ START_TEST(ddraw7) test_redundant_mode_set(); test_coop_level_mode_set(); test_initialize(); + test_coop_level_surf_create(); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVertexDeclaration9Impl.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: bdd42942c0157cf0f01ba02fea482bc90dae97d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd42942c0157cf0f01ba02fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:52 2012 +0200 d3d9: Get rid of IDirect3DVertexDeclaration9Impl. --- dlls/d3d9/d3d9_private.h | 36 +++++----------- dlls/d3d9/device.c | 22 +++++----- dlls/d3d9/vertexdeclaration.c | 90 ++++++++++++++++++++--------------------- 3 files changed, 67 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bdd42942c0157cf0f01ba…

1 0

Henri Verbeet : ddraw/tests: Split up test_initialize().
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: d61d842630d75c00611ce4d32cfdc2d77c14cc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61d842630d75c00611ce4d32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:48 2012 +0200 ddraw/tests: Split up test_initialize(). --- dlls/ddraw/tests/d3d.c | 130 --------------------------------------------- dlls/ddraw/tests/ddraw1.c | 45 ++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 27 +++++++++ dlls/ddraw/tests/ddraw4.c | 27 +++++++++ dlls/ddraw/tests/ddraw7.c | 27 +++++++++ 5 files changed, 126 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d61d842630d75c00611ce…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DStateBlock9Impl.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 79d62ca1fb9cbee24368fc831ca70ced22588588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d62ca1fb9cbee24368fc831… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:51 2012 +0200 d3d9: Get rid of IDirect3DStateBlock9Impl. --- dlls/d3d9/d3d9_private.h | 24 ++++--------- dlls/d3d9/device.c | 4 +- dlls/d3d9/stateblock.c | 87 ++++++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 63 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 5e44f43..0105010 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -245,25 +245,15 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) DECLSPEC_HIDDEN; -/* ----------------------- */ -/* IDirect3DStateBlock9 */ -/* ----------------------- */ - -/***************************************************************************** - * IDirect3DStateBlock9 implementation structure - */ -typedef struct IDirect3DStateBlock9Impl { - IDirect3DStateBlock9 IDirect3DStateBlock9_iface; - LONG ref; - - /* IDirect3DStateBlock9 fields */ +struct d3d9_stateblock +{ + IDirect3DStateBlock9 IDirect3DStateBlock9_iface; + LONG refcount; struct wined3d_stateblock *wined3d_stateblock; + IDirect3DDevice9Ex *parent_device; +}; - /* Parent reference */ - IDirect3DDevice9Ex *parentDevice; -} IDirect3DStateBlock9Impl; - -HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, struct d3d9_device *device, +HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *device, D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock) DECLSPEC_HIDDEN; /* --------------------------- */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 93b00f8..d17887f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1525,7 +1525,7 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, D3DSTATEBLOCKTYPE type, IDirect3DStateBlock9 **stateblock) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DStateBlock9Impl *object; + struct d3d9_stateblock *object; HRESULT hr; TRACE("iface %p, type %#x, stateblock %p.\n", iface, type, stateblock); @@ -1575,7 +1575,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_stateblock *wined3d_stateblock; - IDirect3DStateBlock9Impl *object; + struct d3d9_stateblock *object; HRESULT hr; TRACE("iface %p, stateblock %p.\n", iface, stateblock); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8e08684..8ec8db9 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -25,67 +25,66 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline IDirect3DStateBlock9Impl *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) +static inline struct d3d9_stateblock *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DStateBlock9Impl, IDirect3DStateBlock9_iface); + return CONTAINING_RECORD(iface, struct d3d9_stateblock, IDirect3DStateBlock9_iface); } -static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(IDirect3DStateBlock9 *iface, - REFIID riid, void **ppobj) +static HRESULT WINAPI d3d9_stateblock_QueryInterface(IDirect3DStateBlock9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DStateBlock9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DStateBlock9_AddRef(iface); - *ppobj = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *ppobj = NULL; + *out = NULL; return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(IDirect3DStateBlock9 *iface) +static ULONG WINAPI d3d9_stateblock_AddRef(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + ULONG refcount = InterlockedIncrement(&stateblock->refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DStateBlock9Impl_Release(IDirect3DStateBlock9 *iface) +static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + ULONG refcount = InterlockedDecrement(&stateblock->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) { + if (!refcount) + { wined3d_mutex_lock(); - wined3d_stateblock_decref(This->wined3d_stateblock); + wined3d_stateblock_decref(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); - IDirect3DDevice9Ex_Release(This->parentDevice); - HeapFree(GetProcessHeap(), 0, This); + IDirect3DDevice9Ex_Release(stateblock->parent_device); + HeapFree(GetProcessHeap(), 0, stateblock); } - return ref; + + return refcount; } -/* IDirect3DStateBlock9 Interface follow: */ -static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *iface, - IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_stateblock_GetDevice(IDirect3DStateBlock9 *iface, IDirect3DDevice9 **device) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)This->parentDevice; + *device = (IDirect3DDevice9 *)stateblock->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -93,54 +92,54 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(IDirect3DStateBlock9 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(IDirect3DStateBlock9 *iface) +static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_capture(This->wined3d_stateblock); + hr = wined3d_stateblock_capture(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(IDirect3DStateBlock9 *iface) +static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { - IDirect3DStateBlock9Impl *This = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_stateblock_apply(This->wined3d_stateblock); + hr = wined3d_stateblock_apply(stateblock->wined3d_stateblock); wined3d_mutex_unlock(); return hr; } -static const IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl = +static const struct IDirect3DStateBlock9Vtbl d3d9_stateblock_vtbl = { /* IUnknown */ - IDirect3DStateBlock9Impl_QueryInterface, - IDirect3DStateBlock9Impl_AddRef, - IDirect3DStateBlock9Impl_Release, + d3d9_stateblock_QueryInterface, + d3d9_stateblock_AddRef, + d3d9_stateblock_Release, /* IDirect3DStateBlock9 */ - IDirect3DStateBlock9Impl_GetDevice, - IDirect3DStateBlock9Impl_Capture, - IDirect3DStateBlock9Impl_Apply + d3d9_stateblock_GetDevice, + d3d9_stateblock_Capture, + d3d9_stateblock_Apply, }; -HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, struct d3d9_device *device, +HRESULT stateblock_init(struct d3d9_stateblock *stateblock, struct d3d9_device *device, D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock) { HRESULT hr; - stateblock->IDirect3DStateBlock9_iface.lpVtbl = &Direct3DStateBlock9_Vtbl; - stateblock->ref = 1; + stateblock->IDirect3DStateBlock9_iface.lpVtbl = &d3d9_stateblock_vtbl; + stateblock->refcount = 1; if (wined3d_stateblock) { @@ -159,8 +158,8 @@ HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, struct d3d9_device } } - stateblock->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(stateblock->parentDevice); + stateblock->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(stateblock->parent_device); return D3D_OK; }

1 0

Henri Verbeet : ddraw/tests: Add test_coop_level_mode_set() for older ddraw versions.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 4f85b3772d87a2ec894fc78dbb56bbaebb704fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f85b3772d87a2ec894fc78db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 1 17:22:47 2012 +0200 ddraw/tests: Add test_coop_level_mode_set() for older ddraw versions. --- dlls/ddraw/tests/ddraw1.c | 441 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 441 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 432 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1314 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f85b3772d87a2ec894fc…

1 0

Daniel Jelinski : kernel32: Make SetThreadStackGuarantee stub return TRUE.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 53b551440cdf9f79cd56ac7b7cca267f0f6916b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b551440cdf9f79cd56ac7b7… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu May 31 21:43:23 2012 +0200 kernel32: Make SetThreadStackGuarantee stub return TRUE. --- dlls/kernel32/thread.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index bdaaee8..c56e1d3 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -378,8 +378,7 @@ BOOL WINAPI SetThreadPriorityBoost( BOOL WINAPI SetThreadStackGuarantee(PULONG stacksize) { FIXME("(%p): stub\n", stacksize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } /**********************************************************************

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh .
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 38ba9bacd0adff172c1dd7a63647d32d40bcd1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ba9bacd0adff172c1dd7a63… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 31 18:47:58 2012 +0200 d3drm: Implement IDirect3DRMMeshImpl_SetGroupMaterial and forward material from mesh builder to created mesh. --- dlls/d3drm/meshbuilder.c | 19 ++++++++++++++++--- dlls/d3drm/tests/d3drm.c | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 146450c..3a6890c 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2011,6 +2011,8 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = E_OUTOFMEMORY; } } + if (SUCCEEDED(hr)) + hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); } @@ -2652,13 +2654,24 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupQuality(IDirect3DRMMesh* iface } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMaterial(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL value) + D3DRMGROUPINDEX id, LPDIRECT3DRMMATERIAL material) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, value); + TRACE("(%p)->(%u,%p)\n", This, id, material); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (This->groups[id].material) + IDirect3DRMMaterial2_Release(This->groups[id].material); + + This->groups[id].material = (LPDIRECT3DRMMATERIAL2)material; + + if (material) + IDirect3DRMMaterial2_AddRef(This->groups[id].material); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8d35802..69aff86 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -372,7 +372,7 @@ static void test_MeshBuilder(void) ok(texture == NULL, "No texture should be present\n"); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); - todo_wine ok(material != NULL, "No material present\n"); + ok(material != NULL, "No material present\n"); if ((hr == D3DRM_OK) && material) { hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]);

1 0