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

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: a4b314f4824783e65f258859756a9dcfd9eb1c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b314f4824783e65f2588597… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:31:00 2009 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 85 +++++++++++++++++++++++++++++++++---------- tools/config.sub | 100 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 145 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4b314f4824783e65f258…

1 0

Nikolay Sivov : comctl32/listview: Use NMITEMACTIVATE instead of NMLISTVIEW for NM_*CLICK notifications.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 4b73240ae490b393b026677e7a6d3b5450c34f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b73240ae490b393b026677e7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu May 28 20:33:31 2009 +0400 comctl32/listview: Use NMITEMACTIVATE instead of NMLISTVIEW for NM_*CLICK notifications. --- dlls/comctl32/listview.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 140f60d..fb1828e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -775,20 +775,20 @@ static inline LRESULT notify_listview(const LISTVIEW_INFO *infoPtr, INT code, LP static BOOL notify_click(const LISTVIEW_INFO *infoPtr, INT code, const LVHITTESTINFO *lvht) { - NMLISTVIEW nmlv; + NMITEMACTIVATE nmia; LVITEMW item; HWND hwnd = infoPtr->hwndSelf; TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); - ZeroMemory(&nmlv, sizeof(nmlv)); - nmlv.iItem = lvht->iItem; - nmlv.iSubItem = lvht->iSubItem; - nmlv.ptAction = lvht->pt; + ZeroMemory(&nmia, sizeof(nmia)); + nmia.iItem = lvht->iItem; + nmia.iSubItem = lvht->iSubItem; + nmia.ptAction = lvht->pt; item.mask = LVIF_PARAM; item.iItem = lvht->iItem; item.iSubItem = 0; - if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmlv.lParam = item.lParam; - notify_listview(infoPtr, code, &nmlv); + if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmia.lParam = item.lParam; + notify_hdr(infoPtr, code, (LPNMHDR)&nmia); return IsWindow(hwnd); }

1 0

Alexandre Julliard : dbghelp: Try to avoid crashing on unrecognized attributes.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: bb2d643f490106e033dbc606a5928ab232be5cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2d643f490106e033dbc606a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:30:28 2009 +0200 dbghelp: Try to avoid crashing on unrecognized attributes. --- dlls/dbghelp/dwarf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 44e2cad..82e836f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1334,6 +1334,8 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, switch (loc.kind) { + case loc_error: + break; case loc_absolute: /* it's a global variable */ /* FIXME: we don't handle its scope yet */

1 0

Stefan Dösinger : wined3d: Remove a MESA hack.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: e2be741bc0abbbc685e17729bf23a59ba273957f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2be741bc0abbbc685e17729b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 15:48:45 2009 +0200 wined3d: Remove a MESA hack. --- dlls/wined3d/arb_program_shader.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8b9e185..1713302 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2132,11 +2132,6 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "TEMP A0_SHADOW;\n"); } - /* Mesa supports only 95 constants */ - if (GL_VEND(MESA) || GL_VEND(WINE)) - This->baseShader.limits.constant_float = - min(95, This->baseShader.limits.constant_float); - shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */

1 0

Henri Verbeet : wined3d: Add missing ActivateContext calls to shader_destroy() implementations.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: d37472f27b8c91f8d92f3286e5a53ca4c473df83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37472f27b8c91f8d92f3286e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:20 2009 +0200 wined3d: Add missing ActivateContext calls to shader_destroy() implementations. --- dlls/wined3d/arb_program_shader.c | 5 ++++- dlls/wined3d/glsl_shader.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 922f62b..5d37440 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2503,7 +2503,10 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { static void shader_arb_destroy(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *baseShader = (IWineD3DBaseShaderImpl *) iface; - const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)baseShader->baseShader.device)->adapter->gl_info; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)baseShader->baseShader.device; + const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); if (shader_is_pshader_version(baseShader->baseShader.reg_maps.shader_version.type)) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 08bcaa6..c4b5cca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4295,6 +4295,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { */ char pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(pshader) { struct glsl_pshader_private *shader_data; ps = (IWineD3DPixelShaderImpl *) This;

1 0

Stefan Dösinger : wined3d: Use NRM from GL_NV_fragment_program2 if available.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 7168b6232313795b663ff9744fba5531babe581c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7168b6232313795b663ff9744… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 28 17:36:52 2009 +0200 wined3d: Use NRM from GL_NV_fragment_program2 if available. --- dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0b6bb35..918f676 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1792,14 +1792,24 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 1 /* Use TB */, src_name); - shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); - shader_addline(buffer, "RSQ TA, TA.x;\n"); - /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, - src_name); + + if(pshader && priv->target_version >= NV3) + { + shader_addline(buffer, "NRM%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name); + } + else + { + shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TA, TA.x;\n"); + /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ + shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, + src_name); + } } static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) @@ -2043,7 +2053,10 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, list_init(&priv_ctx.if_frames); shader_addline(buffer, "!!ARBfp1.0\n"); - if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { + if(GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) { + shader_addline(buffer, "OPTION NV_fragment_program2;\n"); + priv_ctx.target_version = NV3; + } else if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); priv_ctx.target_version = NV2; } else {

1 0

Stefan Dösinger : wined3d: Allocate the proper size for the lconst map.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 5f723bc44a768af5f9ca5f2d4e4f8ea1575e87a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f723bc44a768af5f9ca5f2d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 28 17:11:30 2009 +0200 wined3d: Allocate the proper size for the lconst map. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d37440..8b9e185 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -352,7 +352,7 @@ static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) if(This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) return NULL; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->baseShader.limits.temporary); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->baseShader.limits.constant_float); if(!ret) { ERR("Out of memory\n"); return NULL;

1 0

Henri Verbeet : wined3d: Use the proper OUT swizzle in handle_ps3_input().
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 7433eb76b5f05ae54702fe9e57ba315407ed651b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7433eb76b5f05ae54702fe9e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 wined3d: Use the proper OUT swizzle in handle_ps3_input(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c4b5cca..2385dbc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3405,13 +3405,13 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in semantic_name_out = output_signature[j].semantic_name; semantic_idx_out = output_signature[j].semantic_idx; - shader_glsl_write_mask_to_str(output_signature[i].mask, reg_mask_out); + shader_glsl_write_mask_to_str(output_signature[j].mask, reg_mask_out); if (semantic_idx_in == semantic_idx_out && !strcmp(semantic_name_in, semantic_name_out)) { shader_addline(buffer, "%s%s = OUT[%u]%s;\n", - destination, reg_mask, j, reg_mask); + destination, reg_mask, j, reg_mask_out); found = TRUE; } }

1 0

Henri Verbeet : wined3d: Add device resources from resource_init().
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 5654544725ed01f365707ae41764fee054c54281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5654544725ed01f365707ae41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 09:13:21 2009 +0200 wined3d: Add device resources from resource_init(). This is consistent with removing them from resource_cleanup(). --- dlls/wined3d/device.c | 42 +++++++++++---------------------------- dlls/wined3d/resource.c | 6 ++++- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 19 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5654544725ed01f365707…

1 0

Jacek Caban : wininet.h: Added more error codes.
by Alexandre Julliard May 29, 2009

May 29, 2009

Module: wine Branch: master Commit: 6ecb686dbd401a7d8dece8fd957cc3a5de7df612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ecb686dbd401a7d8dece8fd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 21:35:34 2009 +0200 wininet.h: Added more error codes. --- include/wininet.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 6ce8ae0..e37700a 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1464,7 +1464,10 @@ INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LP #define ERROR_INTERNET_SEC_CERT_REVOKED (INTERNET_ERROR_BASE + 170) #define ERROR_INTERNET_FAILED_DUETOSECURITYCHECK (INTERNET_ERROR_BASE + 171) #define ERROR_INTERNET_NOT_INITIALIZED (INTERNET_ERROR_BASE + 172) -#define INTERNET_ERROR_LAST ERROR_INTERNET_NOT_INITIALIZED +#define ERROR_INTERNET_NEED_MSN_SSPI_PKG (INTERNET_ERROR_BASE + 173) +#define ERROR_INTERNET_LOGIN_FAILURE_DISPLAY_ENTITY_BODY (INTERNET_ERROR_BASE + 174) +#define ERROR_INTERNET_DECODING_FAILED (INTERNET_ERROR_BASE + 175) +#define INTERNET_ERROR_LAST ERROR_INTERNET_DECODING_FAILED #define NORMAL_CACHE_ENTRY 0x00000001

1 0