March 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : d3d9: Use the private store api for buffers.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: f2b5bf26b766a51ae24537aa14092768d7e9d930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b5bf26b766a51ae24537aa1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:15 2014 +0100 d3d9: Use the private store api for buffers. --- dlls/d3d9/buffer.c | 60 ++++------------------------------------ dlls/d3d9/d3d9_main.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/d3d9_private.h | 6 ++++ 3 files changed, 81 insertions(+), 54 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index d0ad890..cc93b18 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -105,52 +105,28 @@ static HRESULT WINAPI d3d9_vertexbuffer_SetPrivateData(IDirect3DVertexBuffer9 *i REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_vertexbuffer_GetPrivateData(IDirect3DVertexBuffer9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&buffer->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer9 *iface, REFGUID guid) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&buffer->resource, guid); } static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface, DWORD priority) @@ -401,52 +377,28 @@ static HRESULT WINAPI d3d9_indexbuffer_SetPrivateData(IDirect3DIndexBuffer9 *ifa REFGUID guid, const void *data, DWORD data_size, DWORD flags) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(guid), data, data_size, flags); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_set_private_data(&buffer->resource, guid, data, data_size, flags); } static HRESULT WINAPI d3d9_indexbuffer_GetPrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid, void *data, DWORD *data_size) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(guid), data, data_size); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_get_private_data(resource, guid, data, data_size); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_get_private_data(&buffer->resource, guid, data, data_size); } static HRESULT WINAPI d3d9_indexbuffer_FreePrivateData(IDirect3DIndexBuffer9 *iface, REFGUID guid) { struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); - struct wined3d_resource *resource; - HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); - wined3d_mutex_lock(); - resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); - hr = wined3d_resource_free_private_data(resource, guid); - wined3d_mutex_unlock(); - - return hr; + return d3d9_resource_free_private_data(&buffer->resource, guid); } static DWORD WINAPI d3d9_indexbuffer_SetPriority(IDirect3DIndexBuffer9 *iface, DWORD priority) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index c8dd901..8796733 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -165,9 +165,78 @@ void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) void d3d9_resource_cleanup(struct d3d9_resource *resource) { + wined3d_private_store_cleanup(&resource->private_store); +} + +HRESULT d3d9_resource_free_private_data(struct d3d9_resource *resource, const GUID *guid) +{ + struct wined3d_private_data *entry; + + wined3d_mutex_lock(); + entry = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!entry) + { + wined3d_mutex_unlock(); + return D3DERR_NOTFOUND; + } + + wined3d_private_store_free_private_data(&resource->private_store, entry); + wined3d_mutex_unlock(); + + return D3D_OK; +} + +HRESULT d3d9_resource_get_private_data(struct d3d9_resource *resource, const GUID *guid, + void *data, DWORD *data_size) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + HRESULT hr; + + wined3d_mutex_lock(); + stored_data = wined3d_private_store_get_private_data(&resource->private_store, guid); + if (!stored_data) + { + hr = D3DERR_NOTFOUND; + goto done; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + { + hr = D3D_OK; + goto done; + } + if (size_in < stored_data->size) + { + hr = D3DERR_MOREDATA; + goto done; + } + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + hr = D3D_OK; + +done: + wined3d_mutex_unlock(); + return hr; } void d3d9_resource_init(struct d3d9_resource *resource) { resource->refcount = 1; + wined3d_private_store_init(&resource->private_store); +} + +HRESULT d3d9_resource_set_private_data(struct d3d9_resource *resource, const GUID *guid, + const void *data, DWORD data_size, DWORD flags) +{ + HRESULT hr; + + wined3d_mutex_lock(); + hr = wined3d_private_store_set_private_data(&resource->private_store, guid, data, data_size, flags); + wined3d_mutex_unlock(); + return hr; } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 40be940..8d75f62 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -169,10 +169,16 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine struct d3d9_resource { LONG refcount; + struct wined3d_private_store private_store; }; void d3d9_resource_cleanup(struct d3d9_resource *resource) DECLSPEC_HIDDEN; +HRESULT d3d9_resource_free_private_data(struct d3d9_resource *resource, const GUID *guid) DECLSPEC_HIDDEN; +HRESULT d3d9_resource_get_private_data(struct d3d9_resource *resource, const GUID *guid, + void *data, DWORD *data_size) DECLSPEC_HIDDEN; void d3d9_resource_init(struct d3d9_resource *resource) DECLSPEC_HIDDEN; +HRESULT d3d9_resource_set_private_data(struct d3d9_resource *resource, const GUID *guid, + const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; struct d3d9_volume {

1 0

Stefan Dösinger : d3d9: Introduce a resource structure.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 96a74e0cf7330f815f7dca00f848d4d2c39855b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a74e0cf7330f815f7dca00f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 24 12:17:14 2014 +0100 d3d9: Introduce a resource structure. --- dlls/d3d9/buffer.c | 20 ++++++++++++-------- dlls/d3d9/d3d9_main.c | 9 +++++++++ dlls/d3d9/d3d9_private.h | 18 +++++++++++++----- dlls/d3d9/device.c | 2 +- dlls/d3d9/surface.c | 10 ++++++---- dlls/d3d9/texture.c | 22 ++++++++++++---------- dlls/d3d9/volume.c | 10 ++++++---- 7 files changed, 59 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96a74e0cf7330f815f7dc…

1 0

Ken Thomases : wined3d: Track if a context' s hdc is private so we never need to restore its pixel format.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 272873823e9beff91ea1a62845fc7e5f94a9636f URL: http://source.winehq.org/git/wine.git/?a=commit;h=272873823e9beff91ea1a6284… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:46:18 2014 -0500 wined3d: Track if a context's hdc is private so we never need to restore its pixel format. This currently only applies to the swapchain backup DC, but it will soon be used for surfaces created using the WGL_WINE_surface extension. Also, there are a couple of cases where ddraw creates private windows and passes them in. It could be extended to those. --- dlls/wined3d/context.c | 21 +++++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8dbe001..34c0637 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -750,7 +750,7 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) return ret; } -static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, int format) +static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) { const struct wined3d_gl_info *gl_info = context->gl_info; int current = GetPixelFormat(dc); @@ -768,7 +768,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, in } context->restore_pf = 0; - context->restore_pf_win = WindowFromDC(dc); + context->restore_pf_win = private ? NULL : WindowFromDC(dc); return TRUE; } @@ -787,12 +787,12 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, in return FALSE; } - win = WindowFromDC(dc); + win = private ? NULL : WindowFromDC(dc); if (win != context->restore_pf_win) { context_restore_pixel_format(context); - context->restore_pf = current; + context->restore_pf = private ? 0 : current; context->restore_pf_win = win; } @@ -813,7 +813,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, ctx->pixel_format)) + if (!context_set_pixel_format(ctx, ctx->hdc, ctx->hdc_is_private, ctx->pixel_format)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -846,7 +846,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return FALSE; } - if (!context_set_pixel_format(ctx, dc, ctx->pixel_format)) + if (!context_set_pixel_format(ctx, dc, TRUE, ctx->pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, dc); @@ -890,6 +890,7 @@ static void context_update_window(struct wined3d_context *context) wined3d_release_dc(context->win_handle, context->hdc); context->win_handle = context->swapchain->win_handle; + context->hdc_is_private = FALSE; context->needs_set = 1; context->valid = 1; @@ -1328,6 +1329,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, int swap_interval; DWORD state; HDC hdc; + BOOL hdc_is_private = FALSE; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1388,7 +1390,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, { WARN("Failed to retireve device context, trying swapchain backup.\n"); - if (!(hdc = swapchain_get_backup_dc(swapchain))) + if ((hdc = swapchain_get_backup_dc(swapchain))) + hdc_is_private = TRUE; + else { ERR("Failed to retrieve a device context.\n"); goto out; @@ -1439,7 +1443,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->gl_info = gl_info; - if (!context_set_pixel_format(ret, hdc, pixel_format)) + if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); context_release(ret); @@ -1516,6 +1520,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->glCtx = ctx; ret->win_handle = swapchain->win_handle; ret->hdc = hdc; + ret->hdc_is_private = hdc_is_private; ret->pixel_format = pixel_format; ret->needs_set = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0199ef8..69630b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1086,7 +1086,8 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ DWORD rebind_fbo : 1; DWORD needs_set : 1; - DWORD padding : 18; + DWORD hdc_is_private : 1; + DWORD padding : 17; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask;

1 0

Ken Thomases : wined3d: When restoring pixel format in context_release(), mark the context as needing to be set on the next context_acquire().
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 57c51710e0a4474872125cc54be7562ea8db6ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c51710e0a4474872125cc54… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:46:04 2014 -0500 wined3d: When restoring pixel format in context_release(), mark the context as needing to be set on the next context_acquire(). If we had to restore the pixel format then we know it won't be what we need when the app calls into wined3d again. This helps avoid the GetPixelFormat() in context_acquire(). --- dlls/wined3d/context.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3341ae2..8dbe001 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -719,9 +719,10 @@ void context_surface_update(struct wined3d_context *context, const struct wined3 } } -static void context_restore_pixel_format(struct wined3d_context *ctx) +static BOOL context_restore_pixel_format(struct wined3d_context *ctx) { const struct wined3d_gl_info *gl_info = ctx->gl_info; + BOOL ret = FALSE; if (ctx->restore_pf && IsWindow(ctx->restore_pf_win)) { @@ -730,7 +731,7 @@ static void context_restore_pixel_format(struct wined3d_context *ctx) HDC dc = GetDC(ctx->restore_pf_win); if (dc) { - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf))) + if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf)))) { ERR("wglSetPixelFormatWINE failed to restore pixel format %d on window %p.\n", ctx->restore_pf, ctx->restore_pf_win); @@ -746,6 +747,7 @@ static void context_restore_pixel_format(struct wined3d_context *ctx) ctx->restore_pf = 0; ctx->restore_pf_win = NULL; + return ret; } static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, int format) @@ -1088,7 +1090,8 @@ void context_release(struct wined3d_context *context) if (!--context->level) { - context_restore_pixel_format(context); + if (context_restore_pixel_format(context)) + context->needs_set = 1; if (context->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc);

1 0

Dmitry Timoshkov : include: Fix a typo in _MSC_VER.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 4dff2e7157f7c1c712eb98ec3f813fe2b5b80e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dff2e7157f7c1c712eb98ec3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 24 16:08:16 2014 +0900 include: Fix a typo in _MSC_VER. --- include/rpcndr.h | 2 +- include/winnt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 99200ac..f795566 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -429,7 +429,7 @@ typedef struct _MIDL_STUBLESS_PROXY_INFO } MIDL_STUBLESS_PROXY_INFO, *PMIDL_STUBLESS_PROXY_INFO; -#if defined(__i386__) && !defined(__MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__) +#if defined(__i386__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__) /* Calling convention for returning structures/unions is different between Windows and gcc on i386 */ typedef LONG_PTR CLIENT_CALL_RETURN; #else diff --git a/include/winnt.h b/include/winnt.h index f785d33..93fd70a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -154,7 +154,7 @@ extern "C" { # define DECLSPEC_EXPORT #endif -#if defined(__MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) # define DECLSPEC_HIDDEN #elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))

1 0

Henri Verbeet : d3d9/tests: Use a separate device for stream_test().
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 63609b3418b5982afe463316d1f0a3af95f16749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63609b3418b5982afe463316d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 24 11:31:36 2014 +0100 d3d9/tests: Use a separate device for stream_test(). --- dlls/d3d9/tests/visual.c | 144 ++++++++++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63609b3418b5982afe463…

1 0

Henri Verbeet : d3d9/tests: Use a separate device for test_vshader_float16 ().
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: ad306ce41a20b881aed1c90281badc6126ec9bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad306ce41a20b881aed1c9028… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 24 11:31:37 2014 +0100 d3d9/tests: Use a separate device for test_vshader_float16(). --- dlls/d3d9/tests/visual.c | 67 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 27f4fd6..6f3fef3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8317,24 +8317,26 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) if(dcl_positiont) IDirect3DVertexDeclaration9_Release(dcl_positiont); } -struct vertex_float16color { - float x, y, z; - DWORD c1, c2; -}; - -static void test_vshader_float16(IDirect3DDevice9 *device) +static void test_vshader_float16(void) { - HRESULT hr; + IDirect3DVertexDeclaration9 *vdecl = NULL; + IDirect3DVertexBuffer9 *buffer = NULL; + IDirect3DVertexShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; void *data; - static const D3DVERTEXELEMENT9 decl_elements[] = { + HRESULT hr; + + static const D3DVERTEXELEMENT9 decl_elements[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT16_4,D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; - IDirect3DVertexDeclaration9 *vdecl = NULL; - IDirect3DVertexBuffer9 *buffer = NULL; - IDirect3DVertexShader9 *shader; static const DWORD shader_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -8344,7 +8346,13 @@ static void test_vshader_float16(IDirect3DDevice9 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff, }; - struct vertex_float16color quad[] = { + static const struct vertex_float16color + { + float x, y, z; + DWORD c1, c2; + } + quad[] = + { { -1.0, -1.0, 0.1, 0x3c000000, 0x00000000 }, /* green */ { -1.0, 0.0, 0.1, 0x3c000000, 0x00000000 }, { 0.0, -1.0, 0.1, 0x3c000000, 0x00000000 }, @@ -8366,7 +8374,26 @@ static void test_vshader_float16(IDirect3DDevice9 *device) { 0.0, 1.0, 0.1, 0x00000000, 0x3c000000 }, }; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff102030, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(3, 0)) + { + skip("No vs_3_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff102030, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vdecl); @@ -8451,16 +8478,14 @@ static void test_vshader_float16(IDirect3DDevice9 *device) "Input 0x00000000, 0x00003c00 returned color %08x, expected 0x000000ff\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShader failed hr=%08x\n", hr); - IDirect3DVertexDeclaration9_Release(vdecl); IDirect3DVertexShader9_Release(shader); IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void conditional_np2_repeat_test(IDirect3DDevice9 *device) @@ -16125,7 +16150,6 @@ START_TEST(visual) clip_planes_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr); - test_vshader_float16(device_ptr); } else { skip("No vs_3_0 support\n"); } @@ -16135,6 +16159,7 @@ START_TEST(visual) cleanup_device(device_ptr); device_ptr = NULL; + test_vshader_float16(); stream_test(); fog_with_shader_test(); texbem_test();

1 0

Hans Leidekker : wbemprox: Add support for WBEM_FLAG_NONSYSTEM_ONLY and WBEM_FLAG_SYSTEM_ONLY in IWbemClassObject ::GetNames.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: c3566b088d3f1843aaf974e9ad80567dc0246ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3566b088d3f1843aaf974e9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 24 11:42:00 2014 +0100 wbemprox: Add support for WBEM_FLAG_NONSYSTEM_ONLY and WBEM_FLAG_SYSTEM_ONLY in IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 14 +++++++------- dlls/wbemprox/query.c | 8 +++++++- dlls/wbemprox/tests/query.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 +- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 58fbbf8..5a9e2e4 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -476,17 +476,17 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (wszQualifierName || pQualifierVal) - { - FIXME("qualifier not supported\n"); - return E_NOTIMPL; - } - if (lFlags != WBEM_FLAG_ALWAYS) + if (lFlags != WBEM_FLAG_ALWAYS && + lFlags != WBEM_FLAG_NONSYSTEM_ONLY && + lFlags != WBEM_FLAG_SYSTEM_ONLY) { FIXME("flags %08x not supported\n", lFlags); return E_NOTIMPL; } - return get_properties( ec->query->view, pNames ); + if (wszQualifierName || pQualifierVal) + FIXME("qualifier not supported\n"); + + return get_properties( ec->query->view, lFlags, pNames ); } static HRESULT WINAPI class_object_BeginEnumeration( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 921c3cd..fdfcc16 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -959,7 +959,7 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR return set_value( view->table, row, column, val, type ); } -HRESULT get_properties( const struct view *view, SAFEARRAY **props ) +HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; @@ -970,8 +970,14 @@ HRESULT get_properties( const struct view *view, SAFEARRAY **props ) for (i = 0; i < view->table->num_cols; i++) { + BOOL is_system; + if (is_method( view->table, i )) continue; + is_system = is_system_prop( view->table->columns[i].name ); + if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; + else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + str = SysAllocString( view->table->columns[i].name ); if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 9b77b4c..e99e4ea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -616,6 +616,40 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } +void test_GetNames( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + IWbemClassObject *obj; + SAFEARRAY *names; + ULONG count; + VARIANT val; + + IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (!count) break; + + VariantInit( &val ); + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + + SafeArrayDestroy( names ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -647,6 +681,7 @@ START_TEST(query) test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); + test_GetNames( services ); SysFreeString( path ); IWbemServices_Release( services ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index da4f84f..c047ac1 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -200,7 +200,7 @@ HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; -HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; +HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Fixed tests on some old Windows versions.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: cfb4b0a305140ff018e117d0c8ce330eb7ba74ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb4b0a305140ff018e117d0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 16:25:16 2014 +0100 wininet: Fixed tests on some old Windows versions. --- dlls/wininet/tests/http.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5edc55a..70e82db 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2196,7 +2196,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (!memcmp(buffer, "GET ", sizeof("GET ")-1) && !strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); - send(c, notokmsg, sizeof(notokmsg)-1, 0); + else send(c, notokmsg, sizeof(notokmsg)-1, 0); } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -3055,12 +3055,17 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); - CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); close_async_handle(session, hCompleteEvent, 2); CloseHandle(hCompleteEvent); + + /* + * The connection should be closed before closing handle. This is true for most + * wininet versions (including Wine), but some old win2k versions fail to do that. + */ + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } static void test_conn_close(int port) @@ -3910,6 +3915,7 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + InternetCloseHandle(request); request = HttpOpenRequestA(connect, "POST", "/test_cache_control_verb", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -3917,6 +3923,7 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + InternetCloseHandle(request); request = HttpOpenRequestA(connect, "HEAD", "/test_cache_control_verb", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -3924,6 +3931,7 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + InternetCloseHandle(request); request = HttpOpenRequestA(connect, "GET", "/test_cache_control_verb", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -3931,8 +3939,8 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); - InternetCloseHandle(request); + InternetCloseHandle(connect); InternetCloseHandle(session); }

1 0

Jacek Caban : wininet: Merge GetLastError() test into other request tests.
by Alexandre Julliard March 24, 2014

March 24, 2014

Module: wine Branch: master Commit: 858caa9aa0c6ce7124e03894941bc1e8b7a301b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858caa9aa0c6ce7124e038949… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 16:25:02 2014 +0100 wininet: Merge GetLastError() test into other request tests. --- dlls/wininet/tests/http.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e40cdb6..5edc55a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2213,7 +2213,7 @@ static DWORD CALLBACK server_thread(LPVOID param) static void test_basic_request(int port, const char *verb, const char *url) { HINTERNET hi, hc, hr; - DWORD r, count; + DWORD r, count, error; char buffer[0x100]; hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2225,7 +2225,10 @@ static void test_basic_request(int port, const char *verb, const char *url) hr = HttpOpenRequestA(hc, verb, url, NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); + SetLastError(0xdeadbeef); r = HttpSendRequestA(hr, NULL, 0, NULL, 0); + error = GetLastError(); + ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); ok(r, "HttpSendRequest failed\n"); count = 0; @@ -2241,32 +2244,6 @@ static void test_basic_request(int port, const char *verb, const char *url) InternetCloseHandle(hi); } -static void test_last_error(int port) -{ - HINTERNET hi, hc, hr; - DWORD error; - BOOL r; - - hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(hi != NULL, "open failed\n"); - - hc = InternetConnectA(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(hc != NULL, "connect failed\n"); - - hr = HttpOpenRequestA(hc, NULL, "/test1", NULL, NULL, NULL, 0, 0); - ok(hr != NULL, "HttpOpenRequest failed\n"); - - SetLastError(0xdeadbeef); - r = HttpSendRequestA(hr, NULL, 0, NULL, 0); - error = GetLastError(); - ok(r, "HttpSendRequest failed\n"); - ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); - - InternetCloseHandle(hr); - InternetCloseHandle(hc); - InternetCloseHandle(hi); -} - static void test_proxy_indirect(int port) { HINTERNET hi, hc, hr; @@ -3994,7 +3971,6 @@ static void test_http_connection(void) test_response_without_headers(si.port); test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port); - test_last_error(si.port); test_options(si.port); test_no_content(si.port); test_conn_close(si.port);

1 0