December 2011 - Wine-commits

Henri Verbeet : wined3d: The VertexAttrib*h[v] calls in NV_half_float depend on NV_vertex_program.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 11efbbf1403ef65c7a6b03f9c03491ca06932c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11efbbf1403ef65c7a6b03f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:02 2011 +0100 wined3d: The VertexAttrib*h[v] calls in NV_half_float depend on NV_vertex_program. Based on a patch by Aurélien Couderc. --- dlls/wined3d/drawprim.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bfc5ba4..3b18c63 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -384,7 +384,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, /* Are those 16 bit floats. C doesn't have a 16 bit float type. I could read the single bits and calculate a 4 * byte float according to the IEEE standard */ - if (gl_info->supported[NV_HALF_FLOAT]) + if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) { /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib2hvNV(index, ptr)); @@ -397,7 +397,7 @@ static inline void send_attribute(const struct wined3d_gl_info *gl_info, } break; case WINED3DFMT_R16G16B16A16_FLOAT: - if (gl_info->supported[NV_HALF_FLOAT]) + if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) { /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib4hvNV(index, ptr));

1 0

Henri Verbeet : wined3d: Print the GL_RENDERER string when no " card selector" is available in wined3d_guess_card().
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: d2ca44a597fe5d4f1fb92e32b1aea75804e2aaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca44a597fe5d4f1fb92e32b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:03 2011 +0100 wined3d: Print the GL_RENDERER string when no "card selector" is available in wined3d_guess_card(). --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2d5c2f..57c3058 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2150,8 +2150,8 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * return vendor_card_select_table[i].select_card(gl_info, gl_renderer); } - FIXME_(d3d_caps)("No card selector available for GL vendor %d and card vendor %04x.\n", - *gl_vendor, *card_vendor); + FIXME_(d3d_caps)("No card selector available for GL vendor %#x and card vendor %04x (using GL_RENDERER %s).\n", + *gl_vendor, *card_vendor, debugstr_a(gl_renderer)); /* Default to generic Nvidia hardware based on the supported OpenGL extensions. The choice * for Nvidia was because the hardware and drivers they make are of good quality. This makes

1 0

Henri Verbeet : wined3d: Introduce a helper function for checking colors against a color key.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: f3afa69f8d257c2d0ecb26a3476edc4a5fc93715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3afa69f8d257c2d0ecb26a34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:04 2011 +0100 wined3d: Introduce a helper function for checking colors against a color key. --- dlls/wined3d/surface.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a081216..16e79f4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4534,6 +4534,14 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c return WINED3D_OK; } +static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color) +{ + /* FIXME: Is this really how color keys are supposed to work? I think it + * makes more sense to compare the individual channels. */ + return color >= color_key->color_space_low_value + && color <= color_key->color_space_high_value; +} + void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) { const struct wined3d_device *device = surface->resource.device; @@ -4575,22 +4583,13 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 * color key itself is passed to glAlphaFunc in other cases the * alpha component of pixels that should be masked away is set to 0. */ if (index_in_alpha) - { table[i][3] = i; - } - else if (colorkey && (i >= surface->src_blt_color_key.color_space_low_value) - && (i <= surface->src_blt_color_key.color_space_high_value)) - { + else if (colorkey && color_in_range(&surface->src_blt_color_key, i)) table[i][3] = 0x00; - } else if (pal->flags & WINEDDPCAPS_ALPHA) - { table[i][3] = pal->palents[i].peFlags; - } else - { table[i][3] = 0xFF; - } } } } @@ -4656,8 +4655,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) *Dest |= 0x0001; Dest++; } @@ -4678,8 +4676,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = color; - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) *Dest |= (1 << 15); else *Dest &= ~(1 << 15); @@ -4700,8 +4697,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; DWORD dstcolor = color << 8; - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) dstcolor |= 0xff; *(DWORD*)dest = dstcolor; source += 3; @@ -4722,8 +4718,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { DWORD color = 0xffffff & *(const DWORD*)source; DWORD dstcolor = color << 8; - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) dstcolor |= 0xff; *(DWORD*)dest = dstcolor; source += 4;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: af6b98c44bec5e68552b71d31ffd8bf78785f466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6b98c44bec5e68552b71d31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:05 2011 +0100 wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef. --- dlls/d3d9/d3d9_private.h | 9 ++++----- dlls/wined3d/directx.c | 24 ++++++++++++------------ include/wine/wined3d.h | 14 +++++++------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 76fef72..b16498e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -111,11 +111,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->DeclTypes = _pWineCaps->DeclTypes; \ _pD3D9Caps->NumSimultaneousRTs = _pWineCaps->NumSimultaneousRTs; \ _pD3D9Caps->StretchRectFilterCaps = _pWineCaps->StretchRectFilterCaps; \ - _pD3D9Caps->VS20Caps.Caps = _pWineCaps->VS20Caps.Caps; \ - _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.DynamicFlowControlDepth; \ - _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.NumTemps; \ - _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.NumTemps; \ - _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.StaticFlowControlDepth; \ + _pD3D9Caps->VS20Caps.Caps = _pWineCaps->VS20Caps.caps; \ + _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \ + _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.temp_count; \ + _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.static_flow_control_depth; \ _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.Caps; \ _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.DynamicFlowControlDepth; \ _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.NumTemps; \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 57c3058..b73a82d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4763,32 +4763,32 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * aren't set (in case of software rendering) use the VS 3.0 from * MSDN or else if there's OpenGL spec use a hardcoded value minimum * VS3.0 value. */ - caps->VS20Caps.Caps = WINED3DVS20CAPS_PREDICATION; + caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->VS20Caps.DynamicFlowControlDepth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.NumTemps = max(32, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; + caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps); /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ - caps->VS20Caps.StaticFlowControlDepth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; + caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); } else if (caps->VertexShaderVersion == 2) { - caps->VS20Caps.Caps = 0; - caps->VS20Caps.DynamicFlowControlDepth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.NumTemps = max(12, adapter->gl_info.limits.arb_vs_temps); - caps->VS20Caps.StaticFlowControlDepth = 1; + caps->VS20Caps.caps = 0; + caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; + caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.static_flow_control_depth = 1; caps->MaxVShaderInstructionsExecuted = 65535; caps->MaxVertexShader30InstructionSlots = 0; } else { /* VS 1.x */ - caps->VS20Caps.Caps = 0; - caps->VS20Caps.DynamicFlowControlDepth = 0; - caps->VS20Caps.NumTemps = 0; - caps->VS20Caps.StaticFlowControlDepth = 0; + caps->VS20Caps.caps = 0; + caps->VS20Caps.dynamic_flow_control_depth = 0; + caps->VS20Caps.temp_count = 0; + caps->VS20Caps.static_flow_control_depth = 0; caps->MaxVShaderInstructionsExecuted = 0; caps->MaxVertexShader30InstructionSlots = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ea9f4fb..b8981d5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1742,13 +1742,13 @@ struct wined3d_strided_data BOOL position_transformed; }; -typedef struct _WINED3DVSHADERCAPS2_0 +struct wined3d_vertex_shader_caps { - DWORD Caps; - INT DynamicFlowControlDepth; - INT NumTemps; - INT StaticFlowControlDepth; -} WINED3DVSHADERCAPS2_0; + DWORD caps; + INT dynamic_flow_control_depth; + INT temp_count; + INT static_flow_control_depth; +}; typedef struct _WINED3DPSHADERCAPS2_0 { @@ -1860,7 +1860,7 @@ typedef struct _WINED3DCAPS DWORD DeclTypes; DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; - WINED3DVSHADERCAPS2_0 VS20Caps; + struct wined3d_vertex_shader_caps VS20Caps; WINED3DPSHADERCAPS2_0 PS20Caps; DWORD VertexTextureFilterCaps; DWORD MaxVShaderInstructionsExecuted;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 38c3cde6fdeacd42b71b0ec95ea2300a69a5512c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c3cde6fdeacd42b71b0ec95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:06 2011 +0100 wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef. --- dlls/d3d9/d3d9_private.h | 10 +++++----- dlls/wined3d/directx.c | 30 +++++++++++++++--------------- include/wine/wined3d.h | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index b16498e..1c3748d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -115,11 +115,11 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \ _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.temp_count; \ _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.static_flow_control_depth; \ - _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.Caps; \ - _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.DynamicFlowControlDepth; \ - _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.NumTemps; \ - _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.StaticFlowControlDepth; \ - _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.NumInstructionSlots; \ + _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.caps; \ + _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.dynamic_flow_control_depth; \ + _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.temp_count; \ + _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.static_flow_control_depth; \ + _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.instruction_slot_count; \ _pD3D9Caps->VertexTextureFilterCaps = _pWineCaps->VertexTextureFilterCaps; \ _pD3D9Caps->MaxVShaderInstructionsExecuted = _pWineCaps->MaxVShaderInstructionsExecuted; \ _pD3D9Caps->MaxPShaderInstructionsExecuted = _pWineCaps->MaxPShaderInstructionsExecuted; \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b73a82d..fe77b88 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4804,18 +4804,18 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte /* Caps is more or less undocumented on MSDN but it appears to be * used for PS20Caps based on results from R9600/FX5900/Geforce6800 * cards from Windows */ - caps->PS20Caps.Caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | + caps->PS20Caps.caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | WINED3DPS20CAPS_GRADIENTINSTRUCTIONS | WINED3DPS20CAPS_PREDICATION | WINED3DPS20CAPS_NODEPENDENTREADLIMIT | WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->PS20Caps.DynamicFlowControlDepth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.NumTemps = max(32, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; + caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ - caps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; + caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ - caps->PS20Caps.NumInstructionSlots = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; + caps->PS20Caps.instruction_slot_count = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 65535; caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, @@ -4824,23 +4824,23 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte else if(caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ - caps->PS20Caps.Caps = 0; - caps->PS20Caps.DynamicFlowControlDepth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.NumTemps = max(12, adapter->gl_info.limits.arb_ps_temps); - caps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ + caps->PS20Caps.caps = 0; + caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ + caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ - caps->PS20Caps.NumInstructionSlots = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; + caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 512; /* Minimum value, a GeforceFX uses 1024 */ caps->MaxPixelShader30InstructionSlots = 0; } else /* PS 1.x */ { - caps->PS20Caps.Caps = 0; - caps->PS20Caps.DynamicFlowControlDepth = 0; - caps->PS20Caps.NumTemps = 0; - caps->PS20Caps.StaticFlowControlDepth = 0; - caps->PS20Caps.NumInstructionSlots = 0; + caps->PS20Caps.caps = 0; + caps->PS20Caps.dynamic_flow_control_depth = 0; + caps->PS20Caps.temp_count = 0; + caps->PS20Caps.static_flow_control_depth = 0; + caps->PS20Caps.instruction_slot_count = 0; caps->MaxPShaderInstructionsExecuted = 0; caps->MaxPixelShader30InstructionSlots = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b8981d5..4f5998c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1750,14 +1750,14 @@ struct wined3d_vertex_shader_caps INT static_flow_control_depth; }; -typedef struct _WINED3DPSHADERCAPS2_0 +struct wined3d_pixel_shader_caps { - DWORD Caps; - INT DynamicFlowControlDepth; - INT NumTemps; - INT StaticFlowControlDepth; - INT NumInstructionSlots; -} WINED3DPSHADERCAPS2_0; + DWORD caps; + INT dynamic_flow_control_depth; + INT temp_count; + INT static_flow_control_depth; + INT instruction_slot_count; +}; typedef struct _WINEDDCAPS { @@ -1861,7 +1861,7 @@ typedef struct _WINED3DCAPS DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; struct wined3d_vertex_shader_caps VS20Caps; - WINED3DPSHADERCAPS2_0 PS20Caps; + struct wined3d_pixel_shader_caps PS20Caps; DWORD VertexTextureFilterCaps; DWORD MaxVShaderInstructionsExecuted; DWORD MaxPShaderInstructionsExecuted;

1 0

Pierre Schweitzer : usp10: Fix memory leak.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 06f65740b2efc23ff6520cef44ea73fc79409e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f65740b2efc23ff6520cef4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Thu Dec 8 22:58:56 2011 +0100 usp10: Fix memory leak. --- dlls/usp10/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1506bd5..359d4a3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1464,6 +1464,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) { + heap_free (BidiLevel); heap_free (glyphs); heap_free (pwLogClust); heap_free (piAdvance);

1 0

Jacek Caban : wininet: Use test.winehq.org instead of crossover.codeweavers .com in test_async_HttpSendRequestEx.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 3dc2c3ca44333db57d1180dd9c24b8e97629d9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc2c3ca44333db57d1180dd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 16:40:07 2011 +0100 wininet: Use test.winehq.org instead of crossover.codeweavers.com in test_async_HttpSendRequestEx. --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7c6d97c..80d6d7e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3372,13 +3372,13 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) pInternetSetStatusCallbackA( ses, check_notification ); setup_test( &info, internet_connect, __LINE__ ); - con = InternetConnect( ses, "crossover.codeweavers.com", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); + con = InternetConnect( ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); ok( con != NULL, "InternetConnect failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); setup_test( &info, http_open_request, __LINE__ ); - req = HttpOpenRequest( con, "POST", "posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); + req = HttpOpenRequest( con, "POST", "tests/posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); ok( req != NULL, "HttpOpenRequest failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 );

1 0

Jacek Caban : wininet: Properly handle closed connection in HTTP_HttpEndRequestW.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 892d3cd46bb748bbb6f65d9733ec6b2fff0bc8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892d3cd46bb748bbb6f65d973… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 16:40:27 2011 +0100 wininet: Properly handle closed connection in HTTP_HttpEndRequestW. --- dlls/wininet/http.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5d6fdd0..631a184 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4977,6 +4977,12 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ DWORD dwBufferSize; DWORD res = ERROR_SUCCESS; + if(!request->netconn) { + WARN("Not connected\n"); + send_request_complete(request, 0, ERROR_INTERNET_OPERATION_CANCELLED); + return ERROR_INTERNET_OPERATION_CANCELLED; + } + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0);

1 0

Jacek Caban : wininet: Added more connection failure tests.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 7a1ad69869032559b71973e106747d3d416d97ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1ad69869032559b71973e10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 16:40:43 2011 +0100 wininet: Added more connection failure tests. --- dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 89 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 80d6d7e..eb7f868 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3221,6 +3221,8 @@ struct info HANDLE wait; DWORD thread; unsigned int line; + DWORD expect_result; + BOOL is_aborted; }; static CRITICAL_SECTION notification_cs; @@ -3233,11 +3235,27 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW EnterCriticalSection( &notification_cs ); + if(info->is_aborted) { + LeaveCriticalSection(&notification_cs); + return; + } + if (status == INTERNET_STATUS_HANDLE_CREATED) { DWORD size = sizeof(struct info *); HttpQueryInfoA( handle, INTERNET_OPTION_CONTEXT_VALUE, &info, &size, 0 ); + }else if(status == INTERNET_STATUS_REQUEST_COMPLETE) { + INTERNET_ASYNC_RESULT *ar = (INTERNET_ASYNC_RESULT*)buffer; + + ok(buflen == sizeof(*ar), "unexpected buflen = %d\n", buflen); + if(info->expect_result == ERROR_SUCCESS) { + ok(ar->dwResult == 1, "ar->dwResult = %ld, expected 1\n", ar->dwResult); + }else { + ok(!ar->dwResult, "ar->dwResult = %ld, expected 1\n", ar->dwResult); + ok(ar->dwError == info->expect_result, "ar->dwError = %d, expected %d\n", ar->dwError, info->expect_result); + } } + i = info->index; if (i >= info->count) { @@ -3277,17 +3295,22 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW LeaveCriticalSection( &notification_cs ); } -static void setup_test( struct info *info, enum api function, unsigned int line ) +static void setup_test( struct info *info, enum api function, unsigned int line, DWORD expect_result ) { info->function = function; info->line = line; + info->expect_result = expect_result; } struct notification_data { const struct notification *test; const unsigned int count; + const char *method; + const char *host; + const char *path; const char *data; + BOOL expect_conn_failure; }; static const struct notification async_send_request_ex_test[] = @@ -3334,16 +3357,46 @@ static const struct notification async_send_request_ex_test2[] = { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } }; +static const struct notification async_send_request_ex_resolve_failure_test[] = +{ + { internet_connect, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_open_request, INTERNET_STATUS_HANDLE_CREATED, 0 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_RESOLVING_NAME, 1 }, + { http_send_request_ex, INTERNET_STATUS_DETECTING_PROXY, 1, 0, 1 }, + { http_send_request_ex, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { http_end_request, INTERNET_STATUS_REQUEST_COMPLETE, 1 }, + { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0, 1 }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, }, + { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING, 0, } +}; + static const struct notification_data notification_data[] = { { async_send_request_ex_test, sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + "POST", + "test.winehq.org", + "tests/posttest.php", "Public ID=codeweavers" }, { async_send_request_ex_test2, - sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]) + sizeof(async_send_request_ex_test)/sizeof(async_send_request_ex_test[0]), + "POST", + "test.winehq.org", + "tests/posttest.php" }, + { + async_send_request_ex_resolve_failure_test, + sizeof(async_send_request_ex_resolve_failure_test)/sizeof(async_send_request_ex_resolve_failure_test[0]), + "GET", + "brokenhost", + "index.html", + NULL, + TRUE + } }; static void test_async_HttpSendRequestEx(const struct notification_data *nd) @@ -3356,7 +3409,7 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) static const char *accept[2] = {"*/*", NULL}; char buffer[32]; - trace("\n"); + trace("Async HttpSendRequestEx test (%s %s)\n", nd->method, nd->host); InitializeCriticalSection( &notification_cs ); @@ -3365,50 +3418,63 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) info.index = 0; info.wait = CreateEvent( NULL, FALSE, FALSE, NULL ); info.thread = GetCurrentThreadId(); + info.is_aborted = FALSE; ses = InternetOpen( "winetest", 0, NULL, NULL, INTERNET_FLAG_ASYNC ); ok( ses != NULL, "InternetOpen failed\n" ); pInternetSetStatusCallbackA( ses, check_notification ); - setup_test( &info, internet_connect, __LINE__ ); - con = InternetConnect( ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); + setup_test( &info, internet_connect, __LINE__, ERROR_SUCCESS ); + con = InternetConnect( ses, nd->host, 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)&info ); ok( con != NULL, "InternetConnect failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); - setup_test( &info, http_open_request, __LINE__ ); - req = HttpOpenRequest( con, "POST", "tests/posttest.php", NULL, NULL, accept, 0, (DWORD_PTR)&info ); + setup_test( &info, http_open_request, __LINE__, ERROR_SUCCESS ); + req = HttpOpenRequest( con, nd->method, nd->path, NULL, NULL, accept, 0, (DWORD_PTR)&info ); ok( req != NULL, "HttpOpenRequest failed %u\n", GetLastError() ); WaitForSingleObject( info.wait, 10000 ); - memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); - b.dwStructSize = sizeof(INTERNET_BUFFERSA); - b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; - b.dwHeadersLength = strlen( b.lpcszHeader ); - b.dwBufferTotal = nd->data ? strlen( nd->data ) : 0; + if(nd->data) { + memset( &b, 0, sizeof(INTERNET_BUFFERSA) ); + b.dwStructSize = sizeof(INTERNET_BUFFERSA); + b.lpcszHeader = "Content-Type: application/x-www-form-urlencoded"; + b.dwHeadersLength = strlen( b.lpcszHeader ); + b.dwBufferTotal = nd->data ? strlen( nd->data ) : 0; + } - setup_test( &info, http_send_request_ex, __LINE__ ); + setup_test( &info, http_send_request_ex, __LINE__, + nd->expect_conn_failure ? ERROR_INTERNET_NAME_NOT_RESOLVED : ERROR_SUCCESS ); ret = HttpSendRequestExA( req, nd->data ? &b : NULL, NULL, 0x28, 0 ); ok( !ret && GetLastError() == ERROR_IO_PENDING, "HttpSendRequestExA failed %d %u\n", ret, GetLastError() ); - WaitForSingleObject( info.wait, 10000 ); + error = WaitForSingleObject( info.wait, 10000 ); + if(error != WAIT_OBJECT_0) { + skip("WaitForSingleObject returned %d, assuming DNS problem\n", error); + info.is_aborted = TRUE; + goto abort; + } size = sizeof(buffer); SetLastError( 0xdeadbeef ); ret = HttpQueryInfoA( req, HTTP_QUERY_CONTENT_ENCODING, buffer, &size, 0 ); error = GetLastError(); ok( !ret, "HttpQueryInfoA failed %u\n", GetLastError() ); - todo_wine - ok( error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, - "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); + if(nd->expect_conn_failure) { + ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND got %u\n", error ); + }else { + todo_wine + ok(error == ERROR_INTERNET_INCORRECT_HANDLE_STATE, + "expected ERROR_INTERNET_INCORRECT_HANDLE_STATE got %u\n", error ); + } if (nd->data) { written = 0; size = strlen( nd->data ); - setup_test( &info, internet_writefile, __LINE__ ); + setup_test( &info, internet_writefile, __LINE__, ERROR_SUCCESS ); ret = InternetWriteFile( req, nd->data, size, &written ); ok( ret, "InternetWriteFile failed %u\n", GetLastError() ); ok( written == size, "expected %u got %u\n", written, size ); @@ -3423,7 +3489,8 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) } SetLastError( 0xdeadbeef ); - setup_test( &info, http_end_request, __LINE__ ); + setup_test( &info, http_end_request, __LINE__, + nd->expect_conn_failure ? ERROR_INTERNET_OPERATION_CANCELLED : ERROR_SUCCESS); ret = HttpEndRequestA( req, NULL, 0x28, 0 ); error = GetLastError(); ok( !ret, "HttpEndRequestA succeeded\n" ); @@ -3431,7 +3498,8 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd) WaitForSingleObject( info.wait, 10000 ); - setup_test( &info, internet_close_handle, __LINE__ ); + setup_test( &info, internet_close_handle, __LINE__, ERROR_SUCCESS ); + abort: InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); @@ -3571,6 +3639,7 @@ START_TEST(http) test_open_url_async(); test_async_HttpSendRequestEx(&notification_data[0]); test_async_HttpSendRequestEx(&notification_data[1]); + test_async_HttpSendRequestEx(&notification_data[2]); InternetOpenRequest_test(); test_http_cache(); InternetOpenUrlA_test();

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 08 Dec '11

08 Dec '11

Module: wine Branch: master Commit: 32955de35300283f4209df38aa331075b9fefa59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32955de35300283f4209df38a… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Dec 7 18:08:09 2011 +0100 po: Update Italian translation. --- po/it.po | 66 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 32 insertions(+), 34 deletions(-) diff --git a/po/it.po b/po/it.po index 707abb1..0a127f0 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-06 11:22+0100\n" +"PO-Revision-Date: 2011-12-07 18:06+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -2215,7 +2215,6 @@ msgid "Welcome to the Certificate Import Wizard" msgstr "Benvenuto alla Guida all'Importazione di Certificati" #: cryptui.rc:283 -#, fuzzy msgid "" "This wizard helps you import certificates, certificate revocation lists, and " "certificate trust lists from a file to a certificate store.\n" @@ -2227,10 +2226,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Questa guida ti aiuta a importare certificate, liste di revoca di " +"certificati e liste di fiducia di certificati da un file in un deposito di " +"certificati.\n" +"\n" "Un certificato può essere usato per identificare te o il computer da cui " -"stai comunicando. Può essere anche usato per l'autenticazione, e per firmare " -"messaggi. I depositi certificati sono collezioni di certificati, liste di " -"revoca di certificati, e liste di fiducia di certificati." +"stai comunicando. Può essere anche usato per l'autenticazione e per firmare " +"messaggi. I depositi di certificati sono collezioni di certificati, liste di " +"revoca di certificati e liste di fiducia di certificati.\n" +"\n" +"Per continuare, premere Avanti." #: cryptui.rc:291 cryptui.rc:427 msgid "&File name:" @@ -2348,7 +2353,6 @@ msgid "Welcome to the Certificate Export Wizard" msgstr "Benvenuto alla Guida all'Esportazione del Certificato" #: cryptui.rc:373 -#, fuzzy msgid "" "This wizard helps you export certificates, certificate revocation lists, and " "certificate trust lists from a certificate store to a file.\n" @@ -2360,10 +2364,16 @@ msgid "" "\n" "To continue, click Next." msgstr "" +"Questa guida ti aiuta a esportare certificate, liste di revoca di " +"certificati e liste di fiducia di certificati da un deposito di certificati " +"in un file.\n" +"\n" "Un certificato può essere usato per identificare te o il computer da cui " -"stai comunicando. Può essere anche usato per l'autenticazione, e per firmare " -"messaggi. I depositi certificati sono collezioni di certificati, liste di " -"revoca di certificati, e liste di fiducia di certificati." +"stai comunicando. Può essere anche usato per l'autenticazione e per firmare " +"messaggi. I depositi di certificati sono collezioni di certificati, liste di " +"revoca di certificati e liste di fiducia di certificati.\n" +"\n" +"Per continuare, premere Avanti." #: cryptui.rc:381 msgid "" @@ -9937,19 +9947,16 @@ msgid "N" msgstr "N" #: cmd.rc:294 -#, fuzzy msgid "File association missing for extension %1\n" -msgstr "Associazione di file mancante per l'estensione %s\n" +msgstr "Associazione di file mancante per l'estensione %1\n" #: cmd.rc:295 -#, fuzzy msgid "No open command associated with file type '%1'\n" -msgstr "Nessun comando di apertura associato con il tipo di file '%s'\n" +msgstr "Nessun comando di apertura associato con il tipo di file '%1'\n" #: cmd.rc:296 -#, fuzzy msgid "Overwrite %1" -msgstr "Sovrascrivere %s" +msgstr "Sovrascrivere %1" #: cmd.rc:297 msgid "More..." @@ -9968,23 +9975,20 @@ msgid "Syntax error\n" msgstr "Errore di sintassi\n" #: cmd.rc:303 -#, fuzzy msgid "No help available for %1\n" -msgstr "Nessun aiuto disponibile per %s\n" +msgstr "Nessun aiuto disponibile per %1\n" #: cmd.rc:304 msgid "Target to GOTO not found\n" msgstr "Destinazione del GOTO non trovata\n" #: cmd.rc:305 -#, fuzzy msgid "Current Date is %1\n" -msgstr "La data attuale è %s\n" +msgstr "La data attuale è %1\n" #: cmd.rc:306 -#, fuzzy msgid "Current Time is %1\n" -msgstr "L'ora attuale è %s\n" +msgstr "L'ora attuale è %1\n" #: cmd.rc:307 msgid "Enter new date: " @@ -9995,9 +9999,8 @@ msgid "Enter new time: " msgstr "Inserisci una nuova ora: " #: cmd.rc:309 -#, fuzzy msgid "Environment variable %1 not defined\n" -msgstr "Variabile d'ambiente %s non definita\n" +msgstr "Variabile d'ambiente %1 non definita\n" #: cmd.rc:310 xcopy.rc:38 msgid "Failed to open '%1'\n" @@ -10013,19 +10016,16 @@ msgid "A" msgstr "T" #: cmd.rc:313 -#, fuzzy msgid "%1, Delete" -msgstr "%s, Cancella" +msgstr "%1, Cancella" #: cmd.rc:314 -#, fuzzy msgid "Echo is %1\n" -msgstr "Echo è %s\n" +msgstr "Echo è %1\n" #: cmd.rc:315 -#, fuzzy msgid "Verify is %1\n" -msgstr "Verify è %s\n" +msgstr "Verify è %1\n" #: cmd.rc:316 msgid "Verify must be ON or OFF\n" @@ -10036,14 +10036,13 @@ msgid "Parameter error\n" msgstr "Errore nel parametro\n" #: cmd.rc:318 -#, fuzzy msgid "" "Volume in drive %1!c! is %2\n" "Volume Serial Number is %3!04x!-%4!04x!\n" "\n" msgstr "" -"Il volume nell'unità %c è %s\n" -"Il numero seriale del volume è %04x-%04x\n" +"Il volume nell'unità %1!c! è %2\n" +"Il numero seriale del volume è %3!04x!-%4!04x!\n" "\n" #: cmd.rc:319 @@ -10063,9 +10062,8 @@ msgid "Wine Command Prompt" msgstr "Prompt dei comandi di Wine" #: cmd.rc:323 -#, fuzzy msgid "CMD Version %1!S!\n" -msgstr "Versione di CMD %s\n" +msgstr "Versione di CMD %1!S!\n" #: cmd.rc:324 msgid "More? "

1 0