February 2011 - Wine-commits

Henri Verbeet : wined3d: Merge device_unload_resource() and reset_unload_resources().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 1da773ff4d102a512ce3ab3fedf7cb830216e384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da773ff4d102a512ce3ab3fe… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:38 2011 +0100 wined3d: Merge device_unload_resource() and reset_unload_resources(). --- dlls/wined3d/device.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e2e4b86..365225b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2102,11 +2102,14 @@ err_out: return hr; } -static HRESULT WINAPI device_unload_resource(IWineD3DResource *resource, void *ctx) +static HRESULT WINAPI device_unload_resource(IWineD3DResource *resource, void *data) { + TRACE("Unloading resource %p.\n", resource); + IWineD3DResource_UnLoad(resource); IWineD3DResource_Release(resource); - return WINED3D_OK; + + return S_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, @@ -6180,13 +6183,6 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES return WINED3D_OK; } -static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) { - TRACE("Unloading resource %p\n", resource); - IWineD3DResource_UnLoad(resource); - IWineD3DResource_Release(resource); - return S_OK; -} - static BOOL is_display_mode_supported(IWineD3DDeviceImpl *This, const WINED3DPRESENT_PARAMETERS *pp) { UINT i, count; @@ -6223,7 +6219,7 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain context = context_acquire(device, NULL); gl_info = context->gl_info; - IWineD3DDevice_EnumResources((IWineD3DDevice *)device, reset_unload_resources, NULL); + IWineD3DDevice_EnumResources((IWineD3DDevice *)device, device_unload_resource, NULL); LIST_FOR_EACH_ENTRY(shader, &device->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { device->shader_backend->shader_destroy(shader);

1 0

Henri Verbeet : wined3d: Remove IWineD3DResource::UnLoad() from the public interface.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 39497ff4d19d5312fcc968a5166195450b6dddd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39497ff4d19d5312fcc968a51… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:39 2011 +0100 wined3d: Remove IWineD3DResource::UnLoad() from the public interface. --- dlls/wined3d/basetexture.c | 4 +- dlls/wined3d/buffer.c | 28 +++--- dlls/wined3d/cubetexture.c | 54 ++++++------ dlls/wined3d/device.c | 4 +- dlls/wined3d/resource.c | 4 +- dlls/wined3d/surface.c | 203 +++++++++++++++++++++------------------- dlls/wined3d/surface_gdi.c | 15 --- dlls/wined3d/texture.c | 49 +++++----- dlls/wined3d/volume.c | 31 ++++--- dlls/wined3d/volumetexture.c | 43 +++++---- dlls/wined3d/wined3d_private.h | 14 ++- include/wine/wined3d.idl | 2 - 12 files changed, 231 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39497ff4d19d5312fcc96…

1 0

Rico Schüller : d3dcompiler: Fix SystemValueType for pixelshader output signature.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3f04448dbbe5d096e44847a788981544dd504ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f04448dbbe5d096e44847a78… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:50:52 2011 +0100 d3dcompiler: Fix SystemValueType for pixelshader output signature. --- dlls/d3dcompiler_43/reflection.c | 26 ++++++++++++++++++++++---- dlls/d3dcompiler_43/tests/reflection.c | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 9119a83..120eff0 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1315,7 +1315,7 @@ err_out: return hr; } -HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section) +static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, struct dxbc_section *section, DWORD target) { D3D11_SIGNATURE_PARAMETER_DESC *d; unsigned int string_data_offset; @@ -1393,6 +1393,24 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, stru d[i].ReadWriteMask = (mask >> 8) & 0xff; d[i].Mask = mask & 0xff; + /* pixel shaders have a special handling for SystemValueType in the output signature */ + if (((target & 0xffff0000) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) + { + TRACE("Pixelshader output signature fixup.\n"); + + if (d[i].Register == 0xffffffff) + { + if (!strcasecmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; + if (!strcasecmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; + if (!strcasecmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; + if (!strcasecmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; + } + else + { + d[i].SystemValueType = D3D_NAME_TARGET; + } + } + TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " "type %u, register idx: %u, use_mask %#x, input_mask %#x, stream %u\n", debugstr_a(d[i].SemanticName), d[i].SemanticIndex, d[i].SystemValueType, @@ -1484,7 +1502,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->isgn, section); + hr = d3dcompiler_parse_signature(reflection->isgn, section, reflection->target); if (FAILED(hr)) { WARN("Failed to parse section ISGN.\n"); @@ -1502,7 +1520,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->osgn, section); + hr = d3dcompiler_parse_signature(reflection->osgn, section, reflection->target); if (FAILED(hr)) { WARN("Failed to parse section OSGN.\n"); @@ -1519,7 +1537,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection goto err_out; } - hr = d3dcompiler_parse_signature(reflection->pcsg, section); + hr = d3dcompiler_parse_signature(reflection->pcsg, section, reflection->target); if (FAILED(hr)) { WARN("Failed to parse section PCSG.\n"); diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fdfbf1b..98b8c0c 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -694,7 +694,7 @@ static void test_reflection_desc_ps(void) i, desc.SemanticIndex, pdesc->SemanticIndex); ok(desc.Register == pdesc->Register, "GetOutputParameterDesc(%u) Register failed, got %u, expected %u\n", i, desc.Register, pdesc->Register); - todo_wine ok(desc.SystemValueType == pdesc->SystemValueType, "GetOutputParameterDesc(%u) SystemValueType failed, got %x, expected %x\n", + ok(desc.SystemValueType == pdesc->SystemValueType, "GetOutputParameterDesc(%u) SystemValueType failed, got %x, expected %x\n", i, desc.SystemValueType, pdesc->SystemValueType); ok(desc.ComponentType == pdesc->ComponentType, "GetOutputParameterDesc(%u) ComponentType failed, got %x, expected %x\n", i, desc.ComponentType, pdesc->ComponentType);

1 0

Rico Schüller : d3dcompiler/tests: Add reflection ps output desc test.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3850e8f4e3cea5aab0a8b5f092afffeaf84885cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3850e8f4e3cea5aab0a8b5f09… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:50:55 2011 +0100 d3dcompiler/tests: Add reflection ps output desc test. --- dlls/d3dcompiler_43/tests/reflection.c | 222 ++++++++++++++++++++++++++++++++ 1 files changed, 222 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3850e8f4e3cea5aab0a8b…

1 0

Rico Schüller : d3dcompiler: Reorder section parsing to reflect the order from the shader blob.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 3c1ffbf2e7f440b3d15615f1932e29b43743d24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1ffbf2e7f440b3d15615f19… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:50:58 2011 +0100 d3dcompiler: Reorder section parsing to reflect the order from the shader blob. --- dlls/d3dcompiler_43/reflection.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 120eff0..157e791 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1465,25 +1465,6 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection switch (section->tag) { - case TAG_STAT: - hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); - if (FAILED(hr)) - { - WARN("Failed to parse section STAT.\n"); - goto err_out; - } - break; - - case TAG_SHEX: - case TAG_SHDR: - hr = d3dcompiler_parse_shdr(reflection, section->data, section->data_size); - if (FAILED(hr)) - { - WARN("Failed to parse SHDR section.\n"); - goto err_out; - } - break; - case TAG_RDEF: hr = d3dcompiler_parse_rdef(reflection, section->data, section->data_size); if (FAILED(hr)) @@ -1545,6 +1526,25 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_SHEX: + case TAG_SHDR: + hr = d3dcompiler_parse_shdr(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse SHDR section.\n"); + goto err_out; + } + break; + + case TAG_STAT: + hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse section STAT.\n"); + goto err_out; + } + break; + default: FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); break;

1 0

Rico Schüller : d3dcompiler/tests: Add constant buffer test.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: a0abef6b457bd5e120ce488ff4f170474cf6e932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0abef6b457bd5e120ce488ff… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 27 22:51:05 2011 +0100 d3dcompiler/tests: Add constant buffer test. --- dlls/d3dcompiler_43/tests/reflection.c | 336 ++++++++++++++++++++++++++++++++ 1 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0abef6b457bd5e120ce4…

1 0

Alexandre Julliard : server: Work around Mac OS not being able to set global breakpoint flags.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: e7a032c13144058d780b3c563b0f7c612a5223ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a032c13144058d780b3c563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 26 12:41:36 2011 +0100 server: Work around Mac OS not being able to set global breakpoint flags. --- server/mach.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/mach.c b/server/mach.c index f9490f3..f890321 100644 --- a/server/mach.c +++ b/server/mach.c @@ -211,6 +211,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); + unsigned int dr7; /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); @@ -223,6 +224,9 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + /* Mac OS doesn't allow setting the global breakpoint flags */ + dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1); + #if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.__dr0 = context->debug.i386_regs.dr0; state.__dr1 = context->debug.i386_regs.dr1; @@ -231,7 +235,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.__dr4 = 0; state.__dr5 = 0; state.__dr6 = context->debug.i386_regs.dr6; - state.__dr7 = context->debug.i386_regs.dr7; + state.__dr7 = dr7; #else state.dr0 = context->debug.i386_regs.dr0; state.dr1 = context->debug.i386_regs.dr1; @@ -240,7 +244,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dr4 = 0; state.dr5 = 0; state.dr6 = context->debug.i386_regs.dr6; - state.dr7 = context->debug.i386_regs.dr7; + state.dr7 = dr7; #endif if (!thread_set_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, count )) {

1 0

Gerald Pfeifer : wpp: Add explicit casts when mixing unsigned and signed integers.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0d92426d2b5c45dad3f11d7b524726a931bb6b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d92426d2b5c45dad3f11d7b5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 26 21:01:02 2011 +0100 wpp: Add explicit casts when mixing unsigned and signed integers. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index a66072d..f2805e1 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP (signed) v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.si = v1.val.ui OP v2.val.si; \ + r.val.si = (signed) v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP (signed long) v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sl = v1.val.ul OP v2.val.sl; \ + r.val.sl = (signed long) v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sll = v1.val.ull OP v2.val.sll; \ + r.val.sll = (wrc_sll_t) v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Marcus Meissner : server: Avoid shadowing a global variable.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 7f602db55bced64fd05a632b6821b8c99abefcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f602db55bced64fd05a632b6… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 25 16:36:07 2011 +0100 server: Avoid shadowing a global variable. --- server/atom.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/atom.c b/server/atom.c index eb0b782..a124426 100644 --- a/server/atom.c +++ b/server/atom.c @@ -334,19 +334,19 @@ static struct atom_table *get_table( obj_handle_t h, int create ) /* add an atom in the global table; used for window properties */ atom_t add_global_atom( struct winstation *winstation, const struct unicode_str *str ) { - struct atom_table *global_table = get_global_table( winstation, 1 ); - if (!global_table) return 0; - return add_atom( global_table, str ); + struct atom_table *table = get_global_table( winstation, 1 ); + if (!table) return 0; + return add_atom( table, str ); } /* find an atom in the global table; used for window properties */ atom_t find_global_atom( struct winstation *winstation, const struct unicode_str *str ) { - struct atom_table *global_table = get_global_table( winstation, 0 ); + struct atom_table *table = get_global_table( winstation, 0 ); struct atom_entry *entry; - if (!str->len || str->len > MAX_ATOM_LEN || !global_table) return 0; - if ((entry = find_atom_entry( global_table, str, atom_hash(global_table, str) ))) + if (!str->len || str->len > MAX_ATOM_LEN || !table) return 0; + if ((entry = find_atom_entry( table, str, atom_hash(table, str) ))) return entry->atom; return 0; } @@ -356,10 +356,10 @@ int grab_global_atom( struct winstation *winstation, atom_t atom ) { if (atom >= MIN_STR_ATOM) { - struct atom_table *global_table = get_global_table( winstation, 0 ); - if (global_table) + struct atom_table *table = get_global_table( winstation, 0 ); + if (table) { - struct atom_entry *entry = get_atom_entry( global_table, atom ); + struct atom_entry *entry = get_atom_entry( table, atom ); if (entry) entry->count++; return (entry != NULL); } @@ -373,8 +373,8 @@ void release_global_atom( struct winstation *winstation, atom_t atom ) { if (atom >= MIN_STR_ATOM) { - struct atom_table *global_table = get_global_table( winstation, 0 ); - if (global_table) delete_atom( global_table, atom, 1 ); + struct atom_table *table = get_global_table( winstation, 0 ); + if (table) delete_atom( table, atom, 1 ); } }

1 0

Jeremy Newman : removing and redirecting myths page to the wiki
by Jeremy Newman 28 Feb '11

28 Feb '11

Module: website Branch: master Commit: d6856ffcf1bfba577230b4768b11b2ee5b1f112a URL: http://source.winehq.org/git/website.git/?a=commit;h=d6856ffcf1bfba577230b4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Feb 28 10:40:31 2011 -0600 removing and redirecting myths page to the wiki --- templates/en/myths.template | 270 ------------------------------------------- templates/he/myths.template | 270 ------------------------------------------- templates/pl/myths.template | 270 ------------------------------------------- 3 files changed, 0 insertions(+), 810 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d6856ffcf1bfba5772…

1 0