September 2013 - Wine-commits

Hans Leidekker : winhttp: Fix the base64 decoder.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 050a46f30f42043601166e8aa435c6b97d6137cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=050a46f30f42043601166e8aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 4 15:00:35 2013 +0200 winhttp: Fix the base64 decoder. --- dlls/winhttp/request.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 35a0deb..db8e6af 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1384,7 +1384,7 @@ static unsigned int decode_base64( const WCHAR *base64, unsigned int len, char * char c0, c1, c2, c3; const WCHAR *p = base64; - while (len >= 4) + while (len > 4) { if ((c0 = decode_char( p[0] )) > 63) return 0; if ((c1 = decode_char( p[1] )) > 63) return 0; @@ -1422,6 +1422,21 @@ static unsigned int decode_base64( const WCHAR *base64, unsigned int len, char * } i += 2; } + else + { + if ((c0 = decode_char( p[0] )) > 63) return 0; + if ((c1 = decode_char( p[1] )) > 63) return 0; + if ((c2 = decode_char( p[2] )) > 63) return 0; + if ((c3 = decode_char( p[3] )) > 63) return 0; + + if (buf) + { + buf[i + 0] = (c0 << 2) | (c1 >> 4); + buf[i + 1] = (c1 << 4) | (c2 >> 2); + buf[i + 2] = (c2 << 6) | c3; + } + i += 3; + } return i; }

1 0

Dmitry Timoshkov : server: Print the debug trace to stderr.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: e22f8d2fd86421c61c03de8e675054c9ca3922da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e22f8d2fd86421c61c03de8e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 4 11:47:03 2013 +0900 server: Print the debug trace to stderr. --- server/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index d6a228e..145e2a7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -466,7 +466,7 @@ static void sock_dump( struct object *obj, int verbose ) { struct sock *sock = (struct sock *)obj; assert( obj->ops == &sock_ops ); - printf( "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", + fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", sock->fd, sock->state, sock->mask, sock->pmask, sock->hmask ); }

1 0

Bruno Jesus : ws2_32: Merge protocol.c and socket.c.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 03362e5a3dcc3a7dff8c5ba45c299a16ed3e3a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03362e5a3dcc3a7dff8c5ba45… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 3 22:51:58 2013 -0300 ws2_32: Merge protocol.c and socket.c. --- dlls/ws2_32/Makefile.in | 1 - dlls/ws2_32/protocol.c | 324 ----------------------------------------------- dlls/ws2_32/socket.c | 274 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 274 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03362e5a3dcc3a7dff8c5…

1 0

Nikolay Sivov : ntdll: Added support for multiple progids in comClass and clrClass elements.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: af3a20d2ea493fa5c0d0516db5bb48309b218fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3a20d2ea493fa5c0d0516db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 09:47:32 2013 +0400 ntdll: Added support for multiple progids in comClass and clrClass elements. --- dlls/kernel32/tests/actctx.c | 18 ++++++++- dlls/ntdll/actctx.c | 80 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8d2f352..b689d30 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -113,7 +113,14 @@ static const char manifest3[] = " miscStatusContent=\"insideout\"" " miscStatusThumbnail=\"alignable\"" " miscStatusDocPrint=\"simpleframe,setclientsitefirst\"" -" />" +" >" +" <progid>ProgId.ProgId.1</progid>" +" <progid>ProgId.ProgId.2</progid>" +" <progid>ProgId.ProgId.3</progid>" +" <progid>ProgId.ProgId.4</progid>" +" <progid>ProgId.ProgId.5</progid>" +" <progid>ProgId.ProgId.6</progid>" +" </comClass>" " <comInterfaceProxyStub " " name=\"Iifaceps\"" " tlbid=\"{99999999-8888-7777-6666-555555555558}\"" @@ -152,7 +159,14 @@ static const char manifest3[] = " tlbid=\"{99999999-8888-7777-6666-555555555555}\"" " runtimeVersion=\"1.2.3.4\"" " threadingModel=\"Neutral\"" -" />" +" >" +" <progid>clrprogid.1</progid>" +" <progid>clrprogid.2</progid>" +" <progid>clrprogid.3</progid>" +" <progid>clrprogid.4</progid>" +" <progid>clrprogid.5</progid>" +" <progid>clrprogid.6</progid>" +" </clrClass>" "</assembly>"; static const char manifest_wndcls1[] = diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f652c18..2ce7715 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5,6 +5,7 @@ * Copyright 2007 Eric Pouech * Copyright 2007 Jacek Caban for CodeWeavers * Copyright 2007 Alexandre Julliard + * Copyright 2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -368,6 +369,13 @@ struct clrsurrogate_data no modules part as it belongs to assembly level, not a file. */ +struct progids +{ + WCHAR **progids; + unsigned int num; + unsigned int allocated; +}; + struct entity { DWORD kind; @@ -394,6 +402,7 @@ struct entity DWORD miscstatusthumbnail; DWORD miscstatusicon; DWORD miscstatusdocprint; + struct progids progids; } comclass; struct { WCHAR *iid; @@ -777,7 +786,7 @@ static struct entity* add_entity(struct entity_array *array, DWORD kind) static void free_entity_array(struct entity_array *array) { - unsigned int i; + unsigned int i, j; for (i = 0; i < array->num; i++) { struct entity *entity = &array->base[i]; @@ -789,6 +798,9 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.version); + for (j = 0; j < entity->u.comclass.progids.num; j++) + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progids.progids[j]); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progids.progids); break; case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.iid); @@ -1372,10 +1384,44 @@ static DWORD parse_com_class_misc(const xmlstr_t *value) return flags; } +static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) +{ + struct progids *progids = &entity->u.comclass.progids; + + if (progids->allocated == 0) + { + progids->allocated = 4; + if (!(progids->progids = RtlAllocateHeap(GetProcessHeap(), 0, progids->allocated * sizeof(WCHAR*)))) return FALSE; + } + + if (progids->allocated == progids->num) + { + progids->allocated *= 2; + progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + } + + if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE; + progids->num++; + + return TRUE; +} + +static BOOL parse_com_class_progid(xmlbuf_t* xmlbuf, struct entity *entity) +{ + xmlstr_t content; + BOOL end = FALSE; + + if (!parse_expect_no_attr(xmlbuf, &end) || end || !parse_text_content(xmlbuf, &content)) + return FALSE; + + if (!com_class_add_progid(&content, entity)) return FALSE; + return parse_expect_end_elem(xmlbuf, progidW, asmv1W); +} + static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader *acl) { xmlstr_t elem, attr_name, attr_value; - BOOL ret, end = FALSE, error; + BOOL ret = TRUE, end = FALSE, error; struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) @@ -1431,13 +1477,17 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, str if (end) return TRUE; - while ((ret = next_xml_elem(xmlbuf, &elem))) + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { if (xmlstr_cmp_end(&elem, comClassW)) { ret = parse_end_element(xmlbuf); break; } + else if (xmlstr_cmp(&elem, progidW)) + { + ret = parse_com_class_progid(xmlbuf, entity); + } else { WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); @@ -1797,8 +1847,8 @@ static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, error, ret = TRUE; struct entity* entity; entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); @@ -1837,7 +1887,25 @@ static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, clrClassW, asmv1W); + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, clrClassW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, progidW)) + { + ret = parse_com_class_progid(xmlbuf, entity); + } + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + return ret; } static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl)

1 0

Nikolay Sivov : shell32: Fix remaining cases of implementation pointer being returned.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 725b069e68d288009f1a3d9bcb7120adddfda96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=725b069e68d288009f1a3d9bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 10:12:30 2013 +0400 shell32: Fix remaining cases of implementation pointer being returned. --- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_printers.c | 2 +- dlls/shell32/shlview.c | 14 ++++---------- dlls/shell32/shlview_cmenu.c | 2 +- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index e2b73d0..c4072b7 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -112,7 +112,7 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index a21a2f3..686edb0 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -140,7 +140,7 @@ static HRESULT WINAPI ISF_MyComputer_fnQueryInterface (IShellFolder2 *iface, IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 1cff18d..36d18bc 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -133,7 +133,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnQueryInterface (IShellFolder2 *iface, IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index e8d17d1..7ee6548 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -80,7 +80,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnQueryInterface(IShellFolder2 *ifac IsEqualIID (riid, &IID_IShellFolder) || IsEqualIID (riid, &IID_IShellFolder2)) { - *ppvObj = This; + *ppvObj = &This->IShellFolder2_iface; } else if (IsEqualIID (riid, &IID_IPersist) || IsEqualIID (riid, &IID_IPersistFolder) || diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2cdd160..29593f8 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1751,17 +1751,11 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView2 *iface, REFIID rii *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IShellView) || + IsEqualIID(riid, &IID_IShellView2)) { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellView)) - { - *ppvObj = This; - } - else if(IsEqualIID(riid, &IID_IShellView2)) - { - *ppvObj = This; + *ppvObj = &This->IShellView2_iface; } else if(IsEqualIID(riid, &IID_IShellFolderView)) { diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 4c4edef..fb4ef4e 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -78,7 +78,7 @@ static HRESULT WINAPI ContextMenu_QueryInterface(IContextMenu3 *iface, REFIID ri IsEqualIID(riid, &IID_IContextMenu2) || IsEqualIID(riid, &IID_IContextMenu3)) { - *ppvObj = This; + *ppvObj = &This->IContextMenu3_iface; } else if (IsEqualIID(riid, &IID_IShellExtInit)) /*IShellExtInit*/ {

1 0

Henri Verbeet : wined3d: Use clamp() instead of max() for calculating the clamped cosine in the ffp lighting calculations.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: ff6ce4c669ac901abdc9664d891b4b6d044df295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6ce4c669ac901abdc9664d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:43 2013 +0200 wined3d: Use clamp() instead of max() for calculating the clamped cosine in the ffp lighting calculations. On typical hardware, the clamp() would be an instruction modifier, while the max() would need an extra instruction. --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 740e100..280ec20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4940,7 +4940,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (!settings->normal) break; shader_addline(buffer, "dir = normalize(dir);\n"); - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) / att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); @@ -4965,7 +4965,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer shader_addline(buffer, "ambient += gl_LightSource[%u].ambient.xyz * att;\n", i); if (!settings->normal) break; - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) * att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); @@ -4980,7 +4980,8 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (!settings->normal) break; shader_addline(buffer, "dir = normalize(gl_LightSource[%u].position.xyz);\n", i); - shader_addline(buffer, "diffuse += max(0.0, dot(dir, normal)) * gl_LightSource[%u].diffuse.xyz;\n", i); + shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" + " * gl_LightSource[%u].diffuse.xyz;\n", i); shader_addline(buffer, "t = dot(normal, gl_LightSource[%u].halfVector.xyz);\n", i); shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular;\n", i);

1 0

Henri Verbeet : wined3d: Avoid a couple of useless glGetUniformLocationARB( ) calls.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 99092c2700d315136f79b2a96400f6900476fc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99092c2700d315136f79b2a96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:44 2013 +0200 wined3d: Avoid a couple of useless glGetUniformLocationARB() calls. --- dlls/wined3d/glsl_shader.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 280ec20..93ec2a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5754,18 +5754,20 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_vs_program *vs) + GLhandleARB program_id, struct glsl_vs_program *vs, unsigned int vs_c_count) { unsigned int i; char name[32]; vs->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); - for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) + for (i = 0; i < vs_c_count; ++i) { snprintf(name, sizeof(name), "vs_c[%u]", i); vs->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&vs->uniform_f_locations[vs_c_count], 0xff, + (gl_info->limits.glsl_vs_float_constants - vs_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -5777,18 +5779,20 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info, - GLhandleARB program_id, struct glsl_ps_program *ps) + GLhandleARB program_id, struct glsl_ps_program *ps, unsigned int ps_c_count) { unsigned int i; char name[32]; ps->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); - for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) + for (i = 0; i < ps_c_count; ++i) { snprintf(name, sizeof(name), "ps_c[%u]", i); ps->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); } + memset(&ps->uniform_f_locations[ps_c_count], 0xff, + (gl_info->limits.glsl_ps_float_constants - ps_c_count) * sizeof(GLhandleARB)); for (i = 0; i < MAX_CONST_I; ++i) { @@ -6002,8 +6006,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); - shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps); + shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs, + vshader ? vshader->limits.constant_float : 0); + shader_glsl_init_ps_uniform_locations(gl_info, programId, &entry->ps, + pshader ? pshader->limits.constant_float : 0); checkGLcall("Find glsl program uniform locations"); if (pshader && pshader->reg_maps.shader_version.major >= 3

1 0

Henri Verbeet : wined3d: Don' t set WINED3DUSAGE_RENDERTARGET on the front buffer.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 6325f3ddd8d9922b49608b3afc096eaebada737d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6325f3ddd8d9922b49608b3af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:45 2013 +0200 wined3d: Don't set WINED3DUSAGE_RENDERTARGET on the front buffer. We never render directly to the front buffer, and in case of e.g. a P8 front buffer, we would fail surface creation if we were to enforce format restrictions. --- dlls/wined3d/swapchain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d1cb2f5..981d946 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -882,7 +882,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 surface_desc.format = swapchain->desc.backbuffer_format; surface_desc.multisample_type = swapchain->desc.multisample_type; surface_desc.multisample_quality = swapchain->desc.multisample_quality; - surface_desc.usage = WINED3DUSAGE_RENDERTARGET; + surface_desc.usage = 0; surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = swapchain->desc.backbuffer_width; surface_desc.height = swapchain->desc.backbuffer_height; @@ -992,6 +992,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 goto err; } + surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) { TRACE("Creating back buffer %u.\n", i);

1 0

Henri Verbeet : d3dx9: Avoid LPVOID.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: 871967d0fb4c3695cabd13a8669b513b5085c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=871967d0fb4c3695cabd13a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:46 2013 +0200 d3dx9: Avoid LPVOID. --- dlls/d3dx9_36/core.c | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/effect.c | 12 +++++-- dlls/d3dx9_36/line.c | 6 ++-- dlls/d3dx9_36/mesh.c | 65 ++++++++++++++++++------------------- dlls/d3dx9_36/shader.c | 8 ++-- dlls/d3dx9_36/tests/mesh.c | 8 ++-- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/d3dx9_36/texture.c | 9 +++-- dlls/d3dx9_36/util.c | 2 +- include/d3dx9anim.h | 26 +++++++------- include/d3dx9core.h | 14 ++++---- include/d3dx9effect.h | 16 +++++----- include/d3dx9math.h | 2 +- include/d3dx9mesh.h | 44 +++++++++++++------------- include/d3dx9shader.h | 4 +- include/d3dx9tex.h | 6 ++- include/d3dx9xof.h | 15 +++++---- 19 files changed, 126 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=871967d0fb4c3695cabd1…

1 0

Henri Verbeet : d3dcompiler: Get rid of a couple of redundant casts.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: aab72562d56cb322377ed0825530d165d85300f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab72562d56cb322377ed0825… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:47 2013 +0200 d3dcompiler: Get rid of a couple of redundant casts. --- dlls/d3dcompiler_43/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 0f61f61..221dad5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1688,7 +1688,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig static int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); if (name == type->name) @@ -1825,7 +1825,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls static int compare_function_decl_rb(const void *key, const struct wine_rb_entry *entry) { - const struct list *params = (const struct list *)key; + const struct list *params = key; const struct hlsl_ir_function_decl *decl = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); int params_count = params ? list_count(params) : 0; int decl_params_count = decl->parameters ? list_count(decl->parameters) : 0; @@ -1860,7 +1860,7 @@ static const struct wine_rb_functions hlsl_ir_function_decl_rb_funcs = static int compare_function_rb(const void *key, const struct wine_rb_entry *entry) { - const char *name = (const char *)key; + const char *name = key; const struct hlsl_ir_function *func = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_ir_function,entry); return strcmp(name, func->name);

1 0