May 2011 - Wine-Commits - list.winehq.org

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetAnnotationByName().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 1ffad656985ba1b8e3a6354c4624e51961538b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ffad656985ba1b8e3a6354c4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu May 5 11:30:37 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetAnnotationByName(). --- dlls/d3dx9_36/effect.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e2b6710..5732dee 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1061,8 +1061,54 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect *iface, D3DXHANDLE object, LPCSTR name) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, object); + struct d3dx_pass *pass = is_valid_pass(This, object); + struct d3dx_technique *technique = is_valid_technique(This, object); + UINT annotation_count = 0, i; + D3DXHANDLE *annotation_handles = NULL; + + FIXME("iface %p, object %p, name %s partial stub\n", This, object, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified\n"); + return NULL; + } - FIXME("iface %p, object %p, name %s stub\n", This, object, debugstr_a(name)); + if (pass) + { + annotation_count = pass->annotation_count; + annotation_handles = pass->annotation_handles; + } + else if (technique) + { + annotation_count = technique->annotation_count; + annotation_handles = technique->annotation_handles; + } + else + { + if (!param) param = get_parameter_by_name(This, NULL, object); + + if (param) + { + annotation_count = param->annotation_count; + annotation_handles = param->annotation_handles; + } + } + /* Todo: add funcs */ + + for (i = 0; i < annotation_count; i++) + { + struct d3dx_parameter *anno = get_parameter_struct(annotation_handles[i]); + + if (!strcmp(anno->name, name)) + { + TRACE("Returning parameter %p\n", anno); + return get_parameter_handle(anno); + } + } + + WARN("Invalid argument specified\n"); return NULL; }

1 0

Henri Verbeet : d3d8/tests: Add a volume texture test to test_reset().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: a4b032fd3111aeea9ce76c94b1ff9fa2a590320e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b032fd3111aeea9ce76c94b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 4 22:18:45 2011 +0200 d3d8/tests: Add a volume texture test to test_reset(). --- dlls/d3d8/tests/device.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index bf2d4c3..3bb70b7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -885,6 +885,7 @@ static void test_reset(void) UINT mode_count = 0; HWND window = NULL; D3DVIEWPORT8 vp; + D3DCAPS8 caps; DWORD shader; HRESULT hr; UINT i; @@ -975,6 +976,9 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDeviceCaps(device1, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); ok(width == modes[i].w, "Screen width is %u, expected %u.\n", width, modes[i].w); @@ -1099,6 +1103,29 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + IDirect3DVolumeTexture8 *volume_texture; + + hr = IDirect3DDevice8_CreateVolumeTexture(device1, 16, 16, 4, 1, 0, + D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &volume_texture); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", + hr, D3DERR_DEVICENOTRESET); + IDirect3DVolumeTexture8_Release(volume_texture); + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device1); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + } + else + { + skip("Volume textures not supported.\n"); + } + /* Scratch, sysmem and managed pool resources are fine. */ hr = IDirect3DDevice8_CreateTexture(device1, 16, 16, 1, 0, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &texture); ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr);

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetAnnotation().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 7858a6f8e695023e423af5ae4331fdf7c39702cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7858a6f8e695023e423af5ae4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu May 5 11:30:30 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetAnnotation(). --- dlls/d3dx9_36/effect.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 27f22b2..e2b6710 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1017,8 +1017,43 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetFunctionByName(ID3DXBaseEffect * static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *iface, D3DXHANDLE object, UINT index) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, object); + struct d3dx_pass *pass = is_valid_pass(This, object); + struct d3dx_technique *technique = is_valid_technique(This, object); + UINT annotation_count = 0; + D3DXHANDLE *annotation_handles = NULL; + + FIXME("iface %p, object %p, index %u partial stub\n", This, object, index); + + if (pass) + { + annotation_count = pass->annotation_count; + annotation_handles = pass->annotation_handles; + } + else if (technique) + { + annotation_count = technique->annotation_count; + annotation_handles = technique->annotation_handles; + } + else + { + if (!param) param = get_parameter_by_name(This, NULL, object); - FIXME("iface %p, object %p, index %u stub\n", This, object, index); + if (param) + { + annotation_count = param->annotation_count; + annotation_handles = param->annotation_handles; + } + } + /* Todo: add funcs */ + + if (index < annotation_count) + { + TRACE("Returning parameter %p\n", annotation_handles[index]); + return annotation_handles[index]; + } + + WARN("Invalid argument specified\n"); return NULL; }

1 0

Henri Verbeet : wined3d: Rename "shader_backend_t" to " wined3d_shader_backend_ops".
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 86b0c6bd7b7bef045730e79e91fb51619a854682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b0c6bd7b7bef045730e79e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 4 22:18:46 2011 +0200 wined3d: Rename "shader_backend_t" to "wined3d_shader_backend_ops". This makes it more consistent with the other call table names in wined3d. --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/wined3d_private.h | 15 ++++++++------- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e3bb562..53c187a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5465,7 +5465,8 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio shader_arb_add_instruction_modifiers(ins); } -const shader_backend_t arb_program_shader_backend = { +const struct wined3d_shader_backend_ops arb_program_shader_backend = +{ shader_arb_handle_instruction, shader_arb_select, shader_arb_select_depth_blt, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1b593ce..69a0673 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2071,7 +2071,7 @@ static const struct fragment_pipeline *select_fragment_implementation(struct win else return &ffp_fragment_pipeline; } -static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter) +static const struct wined3d_shader_backend_ops *select_shader_backend(struct wined3d_adapter *adapter) { int vs_selected_mode, ps_selected_mode; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7bda045..6948ec3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5119,7 +5119,8 @@ static void shader_glsl_handle_instruction(const struct wined3d_shader_instructi shader_glsl_add_instruction_modifiers(ins); } -const shader_backend_t glsl_shader_backend = { +const struct wined3d_shader_backend_ops glsl_shader_backend = +{ shader_glsl_handle_instruction, shader_glsl_select, shader_glsl_select_depth_blt, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7f6e95b..6c8a224 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1528,7 +1528,8 @@ static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) return FALSE; } -const shader_backend_t none_shader_backend = { +const struct wined3d_shader_backend_ops none_shader_backend = +{ shader_none_handle_instruction, shader_none_select, shader_none_select_depth_blt, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 955595c..8606004 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -742,7 +742,8 @@ struct vs_compile_args { struct wined3d_context; struct wined3d_state; -typedef struct { +struct wined3d_shader_backend_ops +{ void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(const struct wined3d_context *context, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(void *shader_priv, const struct wined3d_gl_info *gl_info, @@ -759,11 +760,11 @@ typedef struct { BOOL (*shader_dirtifyable_constants)(void); void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); -} shader_backend_t; +}; -extern const shader_backend_t glsl_shader_backend DECLSPEC_HIDDEN; -extern const shader_backend_t arb_program_shader_backend DECLSPEC_HIDDEN; -extern const shader_backend_t none_shader_backend DECLSPEC_HIDDEN; +extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDDEN; +extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN; +extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN; /* X11 locking */ @@ -1532,7 +1533,7 @@ struct wined3d_adapter LUID luid; const struct fragment_pipeline *fragment_pipe; - const shader_backend_t *shader_backend; + const struct wined3d_shader_backend_ops *shader_backend; const struct blit_shader *blitter; }; @@ -1659,7 +1660,7 @@ struct IWineD3DDeviceImpl /* Selected capabilities */ int vs_selected_mode; int ps_selected_mode; - const shader_backend_t *shader_backend; + const struct wined3d_shader_backend_ops *shader_backend; void *shader_priv; void *fragment_priv; void *blit_priv;

1 0

Adam Martinson : d3d9: Use D3DQUERYTYPE instead of HRESULT in IDirect3DQuery9Impl_GetType().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 62b5d12c0e2689fdef63f34ea8dd0ae9683b0273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b5d12c0e2689fdef63f34ea… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed May 4 15:36:26 2011 -0500 d3d9: Use D3DQUERYTYPE instead of HRESULT in IDirect3DQuery9Impl_GetType(). --- dlls/d3d9/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 5e1bf12..4accc6a 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -95,15 +95,15 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(IDirect3DQuery9 *iface) { IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); - HRESULT hr; + D3DQUERYTYPE type; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_query_get_type(This->wineD3DQuery); + type = wined3d_query_get_type(This->wineD3DQuery); wined3d_mutex_unlock(); - return hr; + return type; } static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface)

1 0

Adam Martinson : msxml3: Don't add a <?xml...?> decl in domdoc_get_xml().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 11df66af0b77d70bebd50fa05203356440c1a9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11df66af0b77d70bebd50fa05… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed May 4 15:38:03 2011 -0500 msxml3: Don't add a <?xml...?> decl in domdoc_get_xml(). --- dlls/msxml3/domdoc.c | 10 ++-------- dlls/msxml3/tests/domdoc.c | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1aa6394..84b7283 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2,7 +2,7 @@ * DOM Document implementation * * Copyright 2005 Mike McCormack - * Copyright 2010 Adam Martinson for CodeWeavers + * Copyright 2010-2011 Adam Martinson for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -370,11 +370,6 @@ static void free_properties(domdoc_properties* properties) } } -static BOOL xmldoc_has_decl(xmlDocPtr doc) -{ - return doc->children && (xmlStrEqual(doc->children->name, (xmlChar*)"xml") == 1); -} - /* links a "<?xml" node as a first child */ void xmldoc_link_xmldecl(xmlDocPtr doc, xmlNodePtr node) { @@ -1394,8 +1389,7 @@ static HRESULT WINAPI domdoc_get_xml( if(!buf) return E_OUTOFMEMORY; - options = xmldoc_has_decl(get_doc(This)) ? XML_SAVE_NO_DECL : 0; - options |= XML_SAVE_FORMAT; + options = XML_SAVE_FORMAT | XML_SAVE_NO_DECL; ctxt = xmlSaveToIO(domdoc_get_xml_writecallback, NULL, buf, "UTF-8", options); if(!ctxt) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 46a4188..c9bfa49 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3,7 +3,7 @@ * * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes - * Copyright 2010 Adam Martinson for CodeWeavers + * Copyright 2010-2011 Adam Martinson for CodeWeavers * Copyright 2010-2011 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -8972,8 +8972,10 @@ static void test_put_nodeTypedValue(void) static void test_get_xml(void) { static const char xmlA[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>\r\n<a>test</a>\r\n"; + static const char fooA[] = "<foo/>"; IXMLDOMProcessingInstruction *pi; IXMLDOMNode *first; + IXMLDOMElement *elem = NULL; IXMLDOMDocument *doc; VARIANT_BOOL b; VARIANT v; @@ -9012,6 +9014,25 @@ static void test_get_xml(void) SysFreeString(xml); IXMLDOMDocument_Release(doc); + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("foo"), &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_putref_documentElement(doc, elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_xml(doc, &xml); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(memcmp(xml, _bstr_(fooA), (sizeof(fooA)-1)*sizeof(WCHAR)) == 0, + "got %s, expected %s\n", wine_dbgstr_w(xml), fooA); + SysFreeString(xml); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetParameterBySemantic().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: f0da0f80663ab670c0d8abfb58073cd836dd2a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0da0f80663ab670c0d8abfb5… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu May 5 11:30:23 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetParameterBySemantic(). --- dlls/d3dx9_36/effect.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5ad078e..27f22b2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -809,8 +809,62 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterByName(ID3DXBaseEffect static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetParameterBySemantic(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPCSTR semantic) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); + struct d3dx_parameter *temp_param; + UINT i; + + TRACE("iface %p, parameter %p, semantic %s\n", This, parameter, debugstr_a(semantic)); + + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (!parameter) + { + for (i = 0; i < This->parameter_count; ++i) + { + temp_param = get_parameter_struct(This->parameter_handles[i]); - FIXME("iface %p, parameter %p, semantic %s stub\n", This, parameter, debugstr_a(semantic)); + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", This->parameter_handles[i]); + return This->parameter_handles[i]; + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", This->parameter_handles[i]); + return This->parameter_handles[i]; + } + } + } + else if (param) + { + for (i = 0; i < param->member_count; ++i) + { + temp_param = get_parameter_struct(param->member_handles[i]); + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", param->member_handles[i]); + return param->member_handles[i]; + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", param->member_handles[i]); + return param->member_handles[i]; + } + } + } + + WARN("Invalid argument specified\n"); return NULL; }

1 0

Jerome Leclanche : wine.desktop: Remove the nonexistent application/ x-win-lnk MIME type.
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: db03d247158ee44c06935b5e23fbf37485d8c8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=db03d247158ee44c06935b5e2… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Wed May 4 19:01:33 2011 +0100 wine.desktop: Remove the nonexistent application/x-win-lnk MIME type. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 76f1bc2..c90753f 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -23,7 +23,7 @@ Name[sr(a)latin]=Wine - dizač Windows programa Name[hr]=Wine - dizač Windows programa Name[he]=Wine — מריץ תכניות Windows Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;application/x-ms-shortcut; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut; Icon=wine NoDisplay=true StartupNotify=true

1 0

Henri Verbeet : d3d9/tests: Add a volume texture test to test_reset().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 4a7ff5fc3577a5d5e79c034cabedbc8da60fa7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7ff5fc3577a5d5e79c034ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 4 22:18:44 2011 +0200 d3d9/tests: Add a volume texture test to test_reset(). --- dlls/d3d9/tests/device.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4d6703f..0aef4b8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -861,6 +861,7 @@ static void test_reset(void) D3DLOCKED_RECT lockrect; IDirect3DDevice9 *device1 = NULL; IDirect3DDevice9 *device2 = NULL; + D3DCAPS9 caps; struct { UINT w; @@ -933,6 +934,9 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after creation returned %#x\n", hr); + hr = IDirect3DDevice9_GetDeviceCaps(device1, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); @@ -1067,6 +1071,29 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + if (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) + { + IDirect3DVolumeTexture9 *volume_texture; + + hr = IDirect3DDevice9_CreateVolumeTexture(device1, 16, 16, 4, 1, 0, + D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &volume_texture, NULL); + ok(SUCCEEDED(hr), "CreateVolumeTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3DERR_INVALIDCALL, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", + hr, D3DERR_DEVICENOTRESET); + IDirect3DVolumeTexture9_Release(volume_texture); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_TestCooperativeLevel(device1); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + } + else + { + skip("Volume textures not supported.\n"); + } + /* Scratch, sysmem and managed pools are fine */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device1, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SCRATCH, &surface, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %08x\n", hr);

1 0

Henri Verbeet : d3d9: Simplify reset_enum_callback().
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 99092e8a0a74a77efec0526c0ccad61c9ebe3544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99092e8a0a74a77efec0526c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 4 22:18:43 2011 +0200 d3d9: Simplify reset_enum_callback(). Note that the existing code wouldn't work for volumes, since volumes aren't proper resources in d3d9. --- dlls/d3d9/device.c | 68 ++++++++++++++++------------------------------------ 1 files changed, 21 insertions(+), 47 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 915fdf0..c7ebfc9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -540,61 +540,35 @@ static UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex static HRESULT WINAPI reset_enum_callback(struct wined3d_resource *resource, void *data) { + struct wined3d_resource_desc desc; BOOL *resources_ok = data; - D3DRESOURCETYPE type; - HRESULT ret = S_OK; - D3DSURFACE_DESC surface_desc; - D3DVOLUME_DESC volume_desc; - D3DINDEXBUFFER_DESC index_desc; - D3DVERTEXBUFFER_DESC vertex_desc; - WINED3DPOOL pool; - IDirect3DResource9 *parent; - - parent = wined3d_resource_get_parent(resource); - type = IDirect3DResource9_GetType(parent); - switch(type) { - case D3DRTYPE_SURFACE: - IDirect3DSurface9_GetDesc((IDirect3DSurface9 *)parent, &surface_desc); - pool = surface_desc.Pool; - break; - - case D3DRTYPE_VOLUME: - IDirect3DVolume9_GetDesc((IDirect3DVolume9 *)parent, &volume_desc); - pool = volume_desc.Pool; - break; - - case D3DRTYPE_INDEXBUFFER: - IDirect3DIndexBuffer9_GetDesc((IDirect3DIndexBuffer9 *) parent, &index_desc); - pool = index_desc.Pool; - break; - - case D3DRTYPE_VERTEXBUFFER: - IDirect3DVertexBuffer9_GetDesc((IDirect3DVertexBuffer9 *)parent, &vertex_desc); - pool = vertex_desc.Pool; - break; - - /* No need to check for textures. If there is a D3DPOOL_DEFAULT texture, there - * is a D3DPOOL_DEFAULT surface or volume as well - */ - default: - pool = WINED3DPOOL_SCRATCH; /* a harmless pool */ - break; - } - if (pool == WINED3DPOOL_DEFAULT) + wined3d_resource_get_desc(resource, &desc); + if (desc.pool == WINED3DPOOL_DEFAULT) { - IDirect3DResource9_AddRef(parent); - if (IUnknown_Release(parent) == 0) + IDirect3DSurface9 *surface; + + if (desc.resource_type != WINED3DRTYPE_SURFACE) { - TRACE("Parent %p is an implicit resource with ref 0\n", parent); - } else { - WARN("Resource %p(wineD3D %p) with pool D3DPOOL_DEFAULT blocks the Reset call\n", parent, resource); - ret = S_FALSE; + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); *resources_ok = FALSE; + return S_FALSE; } + + surface = wined3d_resource_get_parent(resource); + + IDirect3DSurface9_AddRef(surface); + if (IDirect3DSurface9_Release(surface)) + { + WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); + *resources_ok = FALSE; + return S_FALSE; + } + + WARN("Surface %p (resource %p) is an implicit resource with ref 0.\n", surface, resource); } - return ret; + return S_OK; } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevice9Ex *iface,

1 0