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

Alistair Leslie-Hughes : oledb32: Correct DBPROP_INIT_HWND type for Win64.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: ad008e223a3d89f828d6f2d1cd542a56ab5ad2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad008e223a3d89f828d6f2d1c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 6 15:13:29 2013 +1000 oledb32: Correct DBPROP_INIT_HWND type for Win64. --- dlls/oledb32/datainit.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b6ba0e1..dba3087 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -298,7 +298,7 @@ struct dbproperty { static const WCHAR conn_timeout[] = {'C','o','n','n','e','c','t',' ','T','i','m','e','o','u','t',0}; static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; -static const WCHAR extemdedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; +static const WCHAR extendedW[] = {'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s',0}; static const WCHAR gen_timeout[] = {'G','e','n','e','r','a','l',' ','T','i','m','e','o','u','t',0}; static const WCHAR initcatW[] = {'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g',0}; static const WCHAR localeIDW[] = {'L','o','c','a','l','e',' ','I','d','e','n','t','i','f','i','e','r',0}; @@ -306,7 +306,7 @@ static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0}; static const WCHAR modeW[] = {'M','o','d','e',0}; static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0}; static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0}; -static const WCHAR persiststW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; +static const WCHAR persistW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; static const WCHAR promptW[] = {'P','r','o','m','p','t',0}; static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0}; static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0}; @@ -314,7 +314,7 @@ static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d',' static const struct dbproperty dbproperties[] = { { conn_timeout,DBPROP_INIT_TIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, - { extemdedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { extendedW, DBPROP_INIT_PROVIDERSTRING, DBPROPOPTIONS_REQUIRED, VT_BSTR }, { gen_timeout, DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { initcatW, DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { localeIDW, DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, @@ -322,12 +322,17 @@ static const struct dbproperty dbproperties[] = { { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, - { persiststW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, + { persistW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, { promptW, DBPROP_INIT_PROMPT, DBPROPOPTIONS_OPTIONAL, VT_I2 }, { useridW, DBPROP_AUTH_USERID, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, +#ifndef _WIN64 { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I4 }, +#else + { winhandleW, DBPROP_INIT_HWND, DBPROPOPTIONS_OPTIONAL, VT_I8 }, +#endif }; + static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) { VARIANT src, dest;

1 0

Dmitry Timoshkov : ole32: Add a basic OLE client/server test suite.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: eeca784b708ce44257b78bf1e8c291eeccf5d8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeca784b708ce44257b78bf1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 6 18:36:40 2013 +0900 ole32: Add a basic OLE client/server test suite. --- dlls/ole32/tests/Makefile.in | 1 + dlls/ole32/tests/ole_server.c | 486 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 487 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eeca784b708ce44257b78…

1 0

Ken Thomases : winemac: Honor requests to order owned windows relative to other owned windows of the same owner .
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: f6924b96039dce65710d6b0b4e46e9eac191e85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6924b96039dce65710d6b0b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 7 04:26:02 2013 -0500 winemac: Honor requests to order owned windows relative to other owned windows of the same owner. --- dlls/winemac.drv/cocoa_window.m | 59 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 54e59fd..3750931 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -710,6 +710,55 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return TRUE; } + - (void) order:(NSWindowOrderingMode)mode childWindow:(WineWindow*)child relativeTo:(WineWindow*)other + { + NSMutableArray* windowNumbers; + NSNumber* childWindowNumber; + NSUInteger otherIndex; + NSMutableArray* children; + + // Get the z-order from the window server and modify it to reflect the + // requested window ordering. + windowNumbers = [[[[self class] windowNumbersWithOptions:0] mutableCopy] autorelease]; + childWindowNumber = [NSNumber numberWithInteger:[child windowNumber]]; + [windowNumbers removeObject:childWindowNumber]; + otherIndex = [windowNumbers indexOfObject:[NSNumber numberWithInteger:[other windowNumber]]]; + [windowNumbers insertObject:childWindowNumber atIndex:otherIndex + (mode == NSWindowAbove ? 0 : 1)]; + + // Get our child windows and sort them in the reverse of the desired + // z-order (back-to-front). + children = [[[self childWindows] mutableCopy] autorelease]; + [children sortWithOptions:NSSortStable + usingComparator:^NSComparisonResult(id obj1, id obj2){ + NSNumber* window1Number = [NSNumber numberWithInteger:[obj1 windowNumber]]; + NSNumber* window2Number = [NSNumber numberWithInteger:[obj2 windowNumber]]; + NSUInteger index1 = [windowNumbers indexOfObject:window1Number]; + NSUInteger index2 = [windowNumbers indexOfObject:window2Number]; + if (index1 == NSNotFound) + { + if (index2 == NSNotFound) + return NSOrderedSame; + else + return NSOrderedAscending; + } + else if (index2 == NSNotFound) + return NSOrderedDescending; + else if (index1 < index2) + return NSOrderedDescending; + else if (index2 < index1) + return NSOrderedAscending; + + return NSOrderedSame; + }]; + + // Remove all of the child windows and re-add them back-to-front so they + // are in the desired order. + for (other in children) + [self removeChildWindow:other]; + for (other in children) + [self addChildWindow:other ordered:NSWindowAbove]; + } + /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next @@ -740,6 +789,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (![self isOrdered:orderingMode relativeTo:other]) { + WineWindow* parent = (WineWindow*)[self parentWindow]; + WineWindow* otherParent = (WineWindow*)[other parentWindow]; + // This window level may not be right for this window based // on floating-ness, fullscreen-ness, etc. But we set it // temporarily to allow us to order the windows properly. @@ -747,6 +799,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([self level] != [other level]) [self setLevel:[other level]]; [self orderWindow:orderingMode relativeTo:[other windowNumber]]; + + // The above call to -[NSWindow orderWindow:relativeTo:] won't + // reorder windows which are both children of the same parent + // relative to each other, so do that separately. + if (parent && parent == otherParent) + [parent order:orderingMode childWindow:self relativeTo:other]; + needAdjustWindowLevels = TRUE; } }

1 0

Christian Costa : d3dxof: Add test for more complex object.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: 65d7a8b3d10a35b619c0b2da25dfe243b4e189f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d7a8b3d10a35b619c0b2da2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jun 6 23:30:17 2013 +0200 d3dxof: Add test for more complex object. --- dlls/d3dxof/tests/d3dxof.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 83fd23d..8d322ad 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -327,6 +327,46 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; +static char templates_complex_object[] = +"xof 0302txt 0064\n" +"template Vector\n" +"{\n" +"<3D82AB5E-62DA-11CF-AB39-0020AF71E433>\n" +"FLOAT x;\n" +"FLOAT y;\n" +"FLOAT z;\n" +"}\n" +"template MeshFace\n" +"{\n" +"<3D82AB5F-62DA-11CF-AB39-0020AF71E433>\n" +"DWORD nFaceVertexIndices;\n" +"array DWORD faceVertexIndices[nFaceVertexIndices];\n" +"}\n" +"template Mesh\n" +"{\n" +"<3D82AB44-62DA-11CF-AB39-0020AF71E433>\n" +"DWORD nVertices;\n" +"array Vector vertices[nVertices];\n" +"DWORD nFaces;\n" +"array MeshFace faces[nFaces];\n" +"[...]\n" +"}\n"; + +static char object_complex[] = +"xof 0302txt 0064\n" +"Mesh Object\n" +"{\n" +"4;;;,\n" +"1.0;;;, 0.0;;;, 0.0;;;,\n" +"0.0;;;, 1.0;;;, 0.0;;;,\n" +"0.0;;;, 0.0;;;, 1.0;;;,\n" +"1.0;;;, 1.0;;;, 1.0;;;,\n" +"3;;;,\n" +"3;;;, 0;;;, 1;;;, 2;;;,\n" +"3;;;, 1;;;, 2;;;, 3;;;,\n" +"3;;;, 3;;;, 1;;;, 2;;;,\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -938,6 +978,42 @@ static void test_syntax_semicolon_comma(void) IDirectXFile_Release(dxfile); } +static void test_complex_object(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + IDirectXFileEnumObject *enum_object; + IDirectXFileData *file_data; + DXFILELOADMEMORY load_info; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + ret = IDirectXFile_RegisterTemplates(dxfile, templates_complex_object, sizeof(templates_complex_object) - 1); + ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + + load_info.lpMemory = object_complex; + load_info.dSize = sizeof(object_complex) - 1; + ret = IDirectXFile_CreateEnumObject(dxfile, &load_info, DXFILELOAD_FROMMEMORY, &enum_object); + ok(ret == DXFILE_OK, "IDirectXFile_CreateEnumObject failed with %#x\n", ret); + ret = IDirectXFileEnumObject_GetNextDataObject(enum_object, &file_data); + ok(ret == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject failed with %#x\n", ret); + + IDirectXFileData_Release(file_data); + IDirectXFileEnumObject_Release(enum_object); + IDirectXFile_Release(dxfile); +} /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -1122,6 +1198,7 @@ START_TEST(d3dxof) test_getname(); test_syntax(); test_syntax_semicolon_comma(); + test_complex_object(); test_dump(); FreeLibrary(hd3dxof);

1 0

Alistair Leslie-Hughes : wine.inf: Install oledb32 into the correct directory.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: 28e80addf87fa512ec9cbf57fc86e214bf548e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e80addf87fa512ec9cbf57f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 7 14:06:34 2013 +1000 wine.inf: Install oledb32 into the correct directory. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index c82173d..45fca8f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2538,6 +2538,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wmic.exe 11,wbem,wmiutils.dll 16422,Internet Explorer,iexplore.exe +16427,System\OLE DB,oledb32.dll 11,,* [SystemIni]

1 0

Henri Verbeet : wined3d: Don't modify the texcoord mask for "projected" cube textures in shader_glsl_tex().
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: e8905e360f047db8af42af64ec08086a5814a1e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8905e360f047db8af42af64e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:53 2013 +0200 wined3d: Don't modify the texcoord mask for "projected" cube textures in shader_glsl_tex(). --- dlls/wined3d/glsl_shader.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6afc3d8..0379729 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3515,8 +3515,11 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; mask = WINED3DSP_WRITEMASK_3; } - } else { - if (ins->flags & WINED3DSI_TEXLD_PROJECT) + } + else + { + if ((ins->flags & WINED3DSI_TEXLD_PROJECT) + && ins->ctx->reg_maps->sampler_type[sampler_idx] != WINED3DSTT_CUBE) { /* ps 2.0 texldp instruction always divides by the fourth component. */ sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED;

1 0

Henri Verbeet : d3d8: Create textures for swapchain surfaces.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: d97a8b3e8336dad729579a37b543639ffb8ef1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97a8b3e8336dad729579a37b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:51 2013 +0200 d3d8: Create textures for swapchain surfaces. --- dlls/d3d8/device.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5bdf2fd..2f09a4f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -571,6 +571,21 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { struct d3d8_surface *surface; + if (desc.resource_type == WINED3D_RTYPE_TEXTURE) + { + IUnknown *parent = wined3d_resource_get_parent(resource); + IDirect3DBaseTexture8 *texture; + + if (SUCCEEDED(IUnknown_QueryInterface(parent, &IID_IDirect3DBaseTexture8, (void **)&texture))) + { + IDirect3DBaseTexture8_Release(texture); + WARN("Texture %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", texture, resource); + return D3DERR_DEVICELOST; + } + + return D3D_OK; + } + if (desc.resource_type != WINED3D_RTYPE_SURFACE) { WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); @@ -2917,26 +2932,30 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); + struct wined3d_resource_desc texture_desc; struct d3d8_surface *d3d_surface; + struct wined3d_texture *texture; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", device_parent, container_parent, desc, surface); - if (FAILED(hr = d3d8_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), WINED3D_SURFACE_MAPPABLE, (IDirect3DSurface8 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + texture_desc = *desc; + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &texture_desc, 1, + WINED3D_SURFACE_MAPPABLE, &device->IDirect3DDevice8_iface, &d3d8_null_wined3d_parent_ops, &texture))) { - WARN("Failed to create surface, hr %#x.\n", hr); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - *surface = d3d_surface->wined3d_surface; + *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); wined3d_surface_incref(*surface); + wined3d_texture_decref(texture); - d3d_surface->container = (IUnknown *)&device->IDirect3DDevice8_iface; - /* Implicit surfaces are created with an refcount of 0 */ - IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); + d3d_surface = wined3d_surface_get_parent(*surface); + d3d_surface->forwardReference = NULL; + d3d_surface->parent_device = &device->IDirect3DDevice8_iface; return hr; }

1 0

Henri Verbeet : wined3d: Fix a typo in shader_glsl_generate_ffp_fragment_shader().
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: f52d4044eb1bcb4acdab42588d6d2630497ccb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52d4044eb1bcb4acdab42588… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 7 10:17:52 2013 +0200 wined3d: Fix a typo in shader_glsl_generate_ffp_fragment_shader(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 57f22de..6afc3d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5405,7 +5405,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf shader_addline(buffer, "void main()\n{\n"); if (lowest_disabled_stage < 7 && settings->emul_clipplanes) - shader_addline(buffer, "if (any(lessThan(gl_texCoord[7], vec4(0.0)))) discard;\n"); + shader_addline(buffer, "if (any(lessThan(gl_TexCoord[7], vec4(0.0)))) discard;\n"); /* Generate texture sampling instructions) */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage)

1 0

Ken Thomases : winemac: Command-clicks shouldn't give windows focus.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: b96b5655142aa42f4679f25b297f354723fa1894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96b5655142aa42f4679f25b2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 7 04:25:29 2013 -0500 winemac: Command-clicks shouldn't give windows focus. --- dlls/winemac.drv/cocoa_window.m | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7c2e040..54e59fd 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1132,7 +1132,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[self firstResponder] keyDown:event]; else { - if ([event type] == NSLeftMouseDown) + if ([event type] == NSLeftMouseDown && + (([event modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { /* Since our windows generally claim they can't be made key, clicks in their title bars are swallowed by the theme frame stuff. So,

1 0

Christian Costa : d3dx9_36: Simplify code + fix typo.
by Alexandre Julliard June 7, 2013

June 7, 2013

Module: wine Branch: master Commit: cfe08e719b87308888cd34e89d4228365b7b0672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe08e719b87308888cd34e89… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jun 6 08:57:44 2013 +0200 d3dx9_36: Simplify code + fix typo. --- dlls/d3dx9_36/mesh.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 82b3134..f38a79e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2657,7 +2657,7 @@ static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_o hr = filedata->lpVtbl->Lock(filedata, &data_size, (const void**)&data); if (FAILED(hr)) return hr; - /* FIXME: String must be retreive directly instead through a pointer once ID3DXFILE is fixed */ + /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ if (data_size < sizeof(LPSTR)) { WARN("truncated data (%lu bytes)\n", data_size); filedata->lpVtbl->Unlock(filedata); @@ -2864,11 +2864,8 @@ static HRESULT parse_material_list(ID3DXFileData *filedata, struct mesh_data *me if (num_materials != mesh->num_materials) { WARN("only %u of %u materials defined\n", num_materials, mesh->num_materials); hr = E_FAIL; - goto end; } - hr = D3D_OK; - end: filedata->lpVtbl->Unlock(filedata); return hr; @@ -3125,8 +3122,6 @@ static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *m data += 2 * sizeof(WORD); mesh_data->nb_bones = *(WORD*)data; hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, mesh_data->nb_bones, &mesh_data->skin_info); - if (FAILED(hr)) - goto end; } else { const char *name; DWORD nb_influences; @@ -3150,12 +3145,8 @@ static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *m if (SUCCEEDED(hr)) hr = mesh_data->skin_info->lpVtbl->SetBoneOffsetMatrix(mesh_data->skin_info, index, (const D3DMATRIX*)(data + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)))); - if (FAILED(hr)) - goto end; } - hr = D3D_OK; - end: filedata->lpVtbl->Unlock(filedata); return hr;

1 0