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

Henri Verbeet : wined3d: Don't use state_colormat() with the GLSL vertex pipe.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 8a7ddfbb53c2234907ac21ea89fd4f69b3cb8a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7ddfbb53c2234907ac21ea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:11 2013 +0200 wined3d: Don't use state_colormat() with the GLSL vertex pipe. None of the code in there should be needed for the GLSL vertex pipe, and the "untracked materials" counter in particular will trigger an unnecessary fallback to drawStridedSlow(). --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ffe4d25..412c601 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6895,7 +6895,7 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = {STATE_RENDER(WINED3D_RS_CLIPPLANEENABLE), {STATE_RENDER(WINED3D_RS_CLIPPING), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_LIGHTING), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_AMBIENT), {STATE_RENDER(WINED3D_RS_AMBIENT), state_ambient }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORVERTEX), {STATE_RENDER(WINED3D_RS_COLORVERTEX), glsl_vertex_pipe_shader}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_LOCALVIEWER), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_NORMALIZENORMALS), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_DIFFUSEMATERIALSOURCE), {STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 491ee91..74261ec 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4574,7 +4574,7 @@ void vertexdeclaration(struct wined3d_context *context, const struct wined3d_sta && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_COLORVERTEX))) - state_colormat(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); + context_apply_state(context, state, STATE_RENDER(WINED3D_RS_COLORVERTEX)); if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_LIGHTING))) state_lighting(context, state, STATE_RENDER(WINED3D_RS_LIGHTING));

1 0

Henri Verbeet : wined3d: Handle pre-transformed vertices in the GLSL vertex pipe.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: ffc9f535eb7817ea4cd0d0657471e61a9813debd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc9f535eb7817ea4cd0d0657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 14 09:07:12 2013 +0200 wined3d: Handle pre-transformed vertices in the GLSL vertex pipe. This also avoids a fallback to drawStridedSlow(). --- dlls/wined3d/buffer.c | 11 ++++++----- dlls/wined3d/device.c | 7 ++----- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/glsl_shader.c | 20 +++++++++++++++----- dlls/wined3d/state.c | 1 + dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 ++++- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index adfae98..586b16c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -266,7 +266,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, } static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, const BOOL check_d3dcolor, const BOOL is_ffp_position, const BOOL is_ffp_color, + UINT attrib_idx, const BOOL check_d3dcolor, const BOOL check_position, const BOOL is_ffp_color, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; @@ -288,7 +288,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win if (!is_ffp_color) FIXME("Test for non-color fixed function WINED3DFMT_B8G8R8A8_UNORM format\n"); } - else if (is_ffp_position && si->position_transformed) + else if (check_position && si->position_transformed) { if (format != WINED3DFMT_R32G32B32A32_FLOAT) { @@ -309,12 +309,13 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win static BOOL buffer_find_decl(struct wined3d_buffer *This) { struct wined3d_device *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_adapter *adapter = device->adapter; const struct wined3d_stream_info *si = &device->stream_info; const struct wined3d_state *state = &device->stateBlock->state; + BOOL support_d3dcolor = adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA]; + BOOL support_xyzrhw = adapter->d3d_info.xyzrhw; UINT stride_this_run = 0; BOOL ret = FALSE; - BOOL support_d3dcolor = gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; /* In d3d7 the vertex buffer declaration NEVER changes because it is stored in the d3d7 vertex buffer. * Once we have our declaration there is no need to look it up again. Index buffers also never need @@ -386,7 +387,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) */ ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, - TRUE, TRUE, FALSE, &stride_this_run) || ret; + TRUE, !support_xyzrhw, FALSE, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, TRUE, FALSE, FALSE, &stride_this_run) || ret; ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42456b0..464181f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -332,14 +332,11 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); - if ((stream_info->position_transformed || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) - { + if (((stream_info->position_transformed && !device->adapter->d3d_info.xyzrhw) + || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo) device->useDrawStridedSlow = TRUE; - } else - { device->useDrawStridedSlow = FALSE; - } } if (prev_all_vbo != stream_info->all_vbo) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 91e5d1f..067c60b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2635,6 +2635,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_gl_info *gl_info = &adapter->gl_info; + struct wined3d_vertex_caps vertex_caps; enum wined3d_pci_vendor card_vendor; struct fragment_caps fragment_caps; struct shader_caps shader_caps; @@ -2865,6 +2866,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; + adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); + adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; + adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); adapter->d3d_info.limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; adapter->d3d_info.limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 412c601..e14d7ab 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5011,11 +5011,20 @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_ shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); - shader_addline(buffer, "vec4 ec_pos = gl_ModelViewMatrix * gl_Vertex;\n"); - shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); - if (settings->clipping) - shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); - shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); + if (settings->transformed) + { + shader_addline(buffer, "vec4 ec_pos = vec4(gl_Vertex.xyz, 1.0);\n"); + shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); + shader_addline(buffer, "if (gl_Vertex.w != 0.0) gl_Position /= gl_Vertex.w;\n"); + } + else + { + shader_addline(buffer, "vec4 ec_pos = gl_ModelViewMatrix * gl_Vertex;\n"); + shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); + if (settings->clipping) + shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); + shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); + } if (!settings->normal) shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); @@ -6737,6 +6746,7 @@ static void glsl_vertex_pipe_vp_enable(const struct wined3d_gl_info *gl_info, BO static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) { + caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = 0; caps->max_vertex_blend_matrix_index = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 74261ec..ffce803 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5641,6 +5641,7 @@ static void ffp_free(struct wined3d_device *device) {} static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) { + caps->xyzrhw = FALSE; caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = gl_info->limits.blends; caps->max_vertex_blend_matrix_index = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b83a05a..5b7fb3c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3552,8 +3552,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct { memset(settings, 0, sizeof(*settings)); - settings->clipping = state->render_states[WINED3D_RS_CLIPPING] - && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; + settings->transformed = 1; settings->point_size = state->gl_primitive_type == GL_POINTS; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; @@ -3573,6 +3572,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct return; } + settings->transformed = 0; settings->clipping = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; settings->normal = !!(si->use_map & (1 << WINED3D_FFP_NORMAL)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82a4584..1fbe081 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1193,6 +1193,7 @@ struct fragment_pipeline struct wined3d_vertex_caps { + BOOL xyzrhw; DWORD max_active_lights; DWORD max_vertex_blend_matrices; DWORD max_vertex_blend_matrix_index; @@ -1606,6 +1607,7 @@ struct wined3d_d3d_limits struct wined3d_d3d_info { struct wined3d_d3d_limits limits; + BOOL xyzrhw; BOOL vs_clipping; DWORD valid_rt_mask; }; @@ -1723,6 +1725,7 @@ struct wined3d_ffp_vs_settings DWORD ambient_source : 2; DWORD specular_source : 2; + DWORD transformed : 1; DWORD clipping : 1; DWORD normal : 1; DWORD normalize : 1; @@ -1731,7 +1734,7 @@ struct wined3d_ffp_vs_settings DWORD point_size : 1; DWORD fog_mode : 2; DWORD texcoords : 8; /* MAX_TEXTURES */ - DWORD padding : 16; + DWORD padding : 15; BYTE texgen[MAX_TEXTURES]; };

1 0

Hans Leidekker : wbemprox: Always use resize_table to allocate memory for table data.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: c9fe6139b5c9a98eb7686bef1ad5e416f3486df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fe6139b5c9a98eb7686bef1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:01:33 2013 +0200 wbemprox: Always use resize_table to allocate memory for table data. --- dlls/wbemprox/builtin.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8878ddc..b9bdacc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -846,7 +846,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_computersystem *)table->data; rec->description = compsys_descriptionW; @@ -1499,7 +1499,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return FILL_STATUS_FAILED; } for (aa = buffer; aa; aa = aa->Next) count++; - if (!(table->data = heap_alloc( sizeof(*rec) * count ))) + if (!resize_table( table, count, sizeof(*rec) )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -1664,7 +1664,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * UINT i, offset = 0, maxclockspeed, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; - if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return FILL_STATUS_FAILED; + if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; get_processor_id( processor_id ); get_processor_manufacturer( manufacturer ); @@ -1740,7 +1740,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_operatingsystem *)table->data; rec->caption = os_captionW; @@ -1956,7 +1956,8 @@ static enum fill_status fill_videocontroller( struct table *table, const struct enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; - if (!(table->data = heap_alloc( sizeof(*rec) ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + memset (&desc, 0, sizeof(desc)); hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); if (FAILED(hr)) goto done;

1 0

Hans Leidekker : wbemprox: Override variant conversion for Win32_VideoController.AdapterRAM.
by Alexandre Julliard 14 Jun '13

14 Jun '13

Module: wine Branch: master Commit: 33c440fb227d8429d9ef3a9606ccc7b216d65d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c440fb227d8429d9ef3a960… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 14 10:02:02 2013 +0200 wbemprox: Override variant conversion for Win32_VideoController.AdapterRAM. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b9bdacc..35c18e3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -403,7 +403,7 @@ static const struct column col_stdregprov[] = }; static const struct column col_videocontroller[] = { - { prop_adapterramW, CIM_UINT32 }, + { prop_adapterramW, CIM_UINT32, VT_I4 }, { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, { prop_currentverticalresW, CIM_UINT32 },

1 0

André Hentschel : winemaker: Don' t destroy relative paths.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: 7bd49ab2df7db6b33f4043ec4fc3b0d2b1cad3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd49ab2df7db6b33f4043ec4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 12 23:00:10 2013 +0200 winemaker: Don't destroy relative paths. --- tools/winemaker | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index c3921a1..3ddd834 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1862,7 +1862,6 @@ sub search_from($$) my $path=$_[1]; my $real_path=""; - $dirname =~ s/(\.\/)+//; if ($dirname eq "" or $dirname eq "." or $dirname eq "./") { $dirname=cwd; } elsif ($dirname !~ m+^/+) {

1 0

André Hentschel : winemaker: Add includes separately for vcproj files.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: bf236d423f915c2a0c981acfde43e3c6168d7de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf236d423f915c2a0c981acfd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 12 23:00:30 2013 +0200 winemaker: Add includes separately for vcproj files. --- tools/winemaker | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 3ddd834..611a490 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -959,8 +959,10 @@ sub source_scan_project_file($$$) if ($vc_compiler_tool->getName eq "AdditionalIncludeDirectories") { $configt=$vc_compiler_tool->getValue; $configt=~s/\\/\//g; - $configt=~s/;/ -I/g; - push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; + my @addincl = split(/\s*;\s*/, $configt); + foreach $configt (@addincl) { + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; + } } } }

1 0

André Hentschel : winemaker: Try to find the real case of a given filename or path from project files.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: 1337726318e6c6bf14287198f57f63d72086b8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1337726318e6c6bf14287198f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 12 23:00:45 2013 +0200 winemaker: Try to find the real case of a given filename or path from project files. --- tools/winemaker | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 611a490..dc94f7d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -21,7 +21,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.3"; +my $version="0.8.4"; use Cwd; use File::Basename; @@ -683,6 +683,11 @@ sub source_scan_project_file($$$) # Additional Include Directories $sfilet=$1; $sfilet=~s/\\/\//g; + my @compinc=split /\/+/, $sfilet; + my $realinc=search_from($path, \@compinc); + if (defined $realinc) { + $sfilet=$realinc; + } if ($sfilet=~/^\w:/) { print STDERR "warning: Can't fix path $sfilet\n" } else { @@ -894,6 +899,11 @@ sub source_scan_project_file($$$) $sfilet=~s/\\\\/\\/g; #remove double backslash $sfilet=~s/^\.\\//; #remove starting 'this directory' $sfilet=~s/\\/\//g; #make slashes out of backslashes + my @compsrc=split(/\/+/, $sfilet); + my $realsrc=search_from($path, \@compsrc); + if (defined $realsrc) { + $sfilet=$realsrc; + } if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { push @sources_c,$sfilet; } elsif ($sfilet =~ /\.cpp$/i) { @@ -961,6 +971,11 @@ sub source_scan_project_file($$$) $configt=~s/\\/\//g; my @addincl = split(/\s*;\s*/, $configt); foreach $configt (@addincl) { + my @compinc=split(/\/+/, $configt); + my $realinc=search_from($path, \@compinc); + if (defined $realinc) { + $configt=$realinc; + } push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; } }

1 0

Alistair Leslie-Hughes : oleaut32/tests: Add DECIMAL tests.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: 661c2b8a0ed4495b21f4d666222434c47241ae14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661c2b8a0ed4495b21f4d6662… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 13 11:14:42 2013 +1000 oleaut32/tests: Add DECIMAL tests. --- dlls/oleaut32/tests/vartype.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 345a822..bce6fff 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4335,6 +4335,9 @@ static void test_VarDecAdd(void) ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); + SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH2(VarDecAdd); todo_wine EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); + /* Promotes to the highest scale, so here the results are in the scale of 2 */ SETDEC(l,2,0,0,0); SETDEC(r,0,0,0,0); MATH2(VarDecAdd); EXPECTDEC(2,0,0,0); SETDEC(l,2,0,0,100); SETDEC(r,0,0,0,1); MATH2(VarDecAdd); EXPECTDEC(2,0,0,200); @@ -4555,6 +4558,8 @@ static void test_VarDecCmp(void) SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,0,0); MATH1(VarDecCmp); EXPECT_GT; SETDEC(out,0,DECIMAL_NEG,-1,-1); SETDEC(l,0,DECIMAL_NEG,-1,-1); MATH1(VarDecCmp); EXPECT_EQ; + SETDEC(l,3,0,0,123456); SETDEC64(out,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + MATH1(VarDecCmp); todo_wine EXPECT_LT; } static void test_VarDecCmpR8(void)

1 0

Alexandre Julliard : secur32: Set the SSL server name to enable the SNI extension.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: c51880149551e54f29ca39970080c0ac94c2d859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51880149551e54f29ca39970… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 15:50:38 2013 +0200 secur32: Set the SSL server name to enable the SNI extension. --- dlls/secur32/schannel.c | 12 ++++++++++++ dlls/secur32/schannel_gnutls.c | 9 +++++++++ dlls/secur32/schannel_macosx.c | 9 +++++++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index ecc189d..240062f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -825,6 +825,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } + if (pszTargetName) + { + UINT len = WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, NULL, 0, NULL, NULL ); + char *target = HeapAlloc( GetProcessHeap(), 0, len ); + + if (target) + { + WideCharToMultiByte( CP_UNIXCP, 0, pszTargetName, -1, target, len, NULL, NULL ); + schan_imp_set_session_target( ctx->session, target ); + HeapFree( GetProcessHeap(), 0, target ); + } + } phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index cbe64e8..ed9bfde 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -66,6 +66,7 @@ MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); +MAKE_FUNCPTR(gnutls_server_name_set); MAKE_FUNCPTR(gnutls_transport_get_ptr); MAKE_FUNCPTR(gnutls_transport_set_errno); MAKE_FUNCPTR(gnutls_transport_set_ptr); @@ -182,6 +183,13 @@ void schan_imp_set_session_transport(schan_imp_session session, pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)t); } +void schan_imp_set_session_target(schan_imp_session session, const char *target) +{ + gnutls_session_t s = (gnutls_session_t)session; + + pgnutls_server_name_set( s, GNUTLS_NAME_DNS, target, strlen(target) ); +} + SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { gnutls_session_t s = (gnutls_session_t)session; @@ -491,6 +499,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send); + LOAD_FUNCPTR(gnutls_server_name_set) LOAD_FUNCPTR(gnutls_transport_get_ptr) LOAD_FUNCPTR(gnutls_transport_set_errno) LOAD_FUNCPTR(gnutls_transport_set_ptr) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 9463c94..5d88223 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -734,6 +734,15 @@ void schan_imp_set_session_transport(schan_imp_session session, s->transport = t; } +void schan_imp_set_session_target(schan_imp_session session, const char *target) +{ + struct mac_session *s = (struct mac_session*)session; + + TRACE("(%p/%p, %s)\n", s, s->context, debugstr_a(target)); + + SSLSetPeerDomainName( s->context, target, strlen(target) ); +} + SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { struct mac_session *s = (struct mac_session*)session; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index dc08429..ea1fcfb 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -247,6 +247,7 @@ extern BOOL schan_imp_create_session(schan_imp_session *session, schan_credentia extern void schan_imp_dispose_session(schan_imp_session session) DECLSPEC_HIDDEN; extern void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) DECLSPEC_HIDDEN; +extern void schan_imp_set_session_target(schan_imp_session session, const char *target) DECLSPEC_HIDDEN; extern SECURITY_STATUS schan_imp_handshake(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) DECLSPEC_HIDDEN; extern unsigned int schan_imp_get_max_message_size(schan_imp_session session) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wininet/tests: Use test.winehq. com for invalid certs tests.
by Alexandre Julliard 13 Jun '13

13 Jun '13

Module: wine Branch: master Commit: df17007af7322fb6b379ffcc199eca53ca52a82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df17007af7322fb6b379ffcc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 15:20:10 2013 +0200 wininet/tests: Use test.winehq.com for invalid certs tests. --- dlls/wininet/tests/http.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d4c28a..b8b34e2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3629,16 +3629,19 @@ static void test_cert_struct(HINTERNET req) BOOL res; static const char ex_subject[] = - "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" - "GT98380011\r\n" - "See www.rapidssl.com/resources/cps (c)13\r\n" - "Domain Control Validated - RapidSSL(R)\r\n" - "*.winehq.org"; + "US\r\n" + "Minnesota\r\n" + "Saint Paul\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org"; static const char ex_issuer[] = "US\r\n" - "\"GeoTrust, Inc.\"\r\n" - "RapidSSL CA"; + "Minnesota\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org"; memset(&info, 0x5, sizeof(info)); @@ -3731,7 +3734,7 @@ static void test_security_flags(void) pInternetSetStatusCallbackA(ses, &callback); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - conn = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + conn = InternetConnectA(ses, "test.winehq.com", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0xdeadbeef); ok(conn != NULL, "InternetConnect failed with error %u\n", GetLastError()); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -3755,7 +3758,7 @@ static void test_security_flags(void) } test_secflags_option(req, 0); - test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); @@ -3788,8 +3791,8 @@ static void test_security_flags(void) WaitForSingleObject(hCompleteEvent, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); @@ -3926,7 +3929,7 @@ static void test_security_flags(void) |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); test_cert_struct(req); - test_security_info("https://test.winehq.org/data/some_file.html?q", 0, 0x1800000); + test_security_info("https://test.winehq.com/data/some_file.html?q", 0, 0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -3946,7 +3949,7 @@ static void test_security_flags(void) pInternetSetStatusCallbackA(ses, &callback); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - conn = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + conn = InternetConnectA(ses, "test.winehq.com", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0xdeadbeef); ok(conn != NULL, "InternetConnect failed with error %u\n", GetLastError()); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -3998,7 +4001,7 @@ static void test_security_flags(void) CloseHandle(hCompleteEvent); - test_security_info("http://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("http://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("file:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("xxx:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); }

1 0