wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Józef Kucia : wined3d: Factor out release_shader_resources() function.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 12058f66cf0010bab3640191afcade4313bf717f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12058f66cf0010bab3640191a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:21 2017 +0100 wined3d: Factor out release_shader_resources() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 55 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e9d04f4..8acfe31 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -446,15 +446,42 @@ static void acquire_shader_resources(const struct wined3d_state *state) } } -static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +static void release_shader_resources(const struct wined3d_state *state) { - struct wined3d_state *state = &cs->device->state; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; - const struct wined3d_cs_draw *op = data; struct wined3d_shader *shader; unsigned int i, j; + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_release(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_release(view->resource); + } + } +} + +static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_state *state = &cs->device->state; + const struct wined3d_cs_draw *op = data; + unsigned int i; + if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && state->load_base_vertex_index != op->base_vertex_idx) { @@ -484,27 +511,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } if (state->fb->depth_stencil) wined3d_resource_release(state->fb->depth_stencil->resource); - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_resource_release(&state->cb[i][j]->resource); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - wined3d_resource_release(view->resource); - } - } + release_shader_resources(state); } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx,

1 0

Józef Kucia : wined3d: Factor out acquire_shader_resources() function.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 900e6e14787a0193c52473cd33b880226fa3c592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900e6e14787a0193c52473cd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:20 2017 +0100 wined3d: Factor out acquire_shader_resources() function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 57 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c030d35..e9d04f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -416,6 +416,36 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * cs->ops->submit(cs); } +static void acquire_shader_resources(const struct wined3d_state *state) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_acquire(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_acquire(view->resource); + } + } +} + static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; @@ -481,11 +511,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { const struct wined3d_state *state = &cs->device->state; - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; struct wined3d_cs_draw *op; - unsigned int i, j; + unsigned int i; op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_DRAW; @@ -515,27 +542,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i } if (state->fb->depth_stencil) wined3d_resource_acquire(state->fb->depth_stencil->resource); - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_resource_acquire(&state->cb[i][j]->resource); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - wined3d_resource_acquire(view->resource); - } - } + acquire_shader_resources(state); cs->ops->submit(cs); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetConstantBuffers().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 1a190a6381614a6e100b690a2aba543cb7874cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a190a6381614a6e100b690a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:19 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cf1bdfe..064d754 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1229,8 +1229,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_cs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_cs_cb().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 00074ba8a028fa0d775dec14c4d2bb203eecb2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=00074ba8a028fa0d775dec14c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:18 2017 +0100 wined3d: Introduce wined3d_device_set_cs_cb(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/state.c | 3 +++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 12 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73b7e69..acf4307 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2818,6 +2818,13 @@ void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, stru wined3d_shader_decref(prev); } +void CDECL wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer) +{ + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_COMPUTE, idx, buffer); +} + void CDECL wined3d_device_set_unordered_access_view(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 901a97c..4b21c57 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4985,6 +4985,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),{ STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY),state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), state_cb_warn, }, WINED3D_GL_EXT_NONE }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, + { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE), state_cb_warn, }, WINED3D_GL_EXT_NONE }, { STATE_SHADER_RESOURCE_BINDING, { STATE_SHADER_RESOURCE_BINDING, state_shader_resource_binding}, WINED3D_GL_EXT_NONE }, { STATE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_binding }, ARB_SHADER_IMAGE_LOAD_STORE }, { STATE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, @@ -5964,6 +5966,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), + STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE), STATE_SHADER_RESOURCE_BINDING, STATE_VIEWPORT, STATE_LIGHT_TYPE, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bf41e15..3e87ca2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -110,6 +110,7 @@ @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) +@ cdecl wined3d_device_set_cs_cb(ptr long ptr) @ cdecl wined3d_device_set_cursor_position(ptr long long long) @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4b0ea06..42a125d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2236,6 +2236,7 @@ HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader); +void __cdecl wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Store uniform blocks limits as array.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 6b32db4f0bbc5c324d3f9703ae0a03786fffb9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b32db4f0bbc5c324d3f9703a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:17 2017 +0100 wined3d: Store uniform blocks limits as array. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 21 ++++++++++++--------- dlls/wined3d/utils.c | 29 ++++++++++------------------- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f3af990..71a4f60 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3333,15 +3333,15 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) { GLfloat gl_floatv[2]; + unsigned int i; GLint gl_max; gl_info->limits.blends = 1; gl_info->limits.buffers = 1; gl_info->limits.textures = 1; gl_info->limits.texture_coords = 1; - gl_info->limits.vertex_uniform_blocks = 0; - gl_info->limits.geometry_uniform_blocks = 0; - gl_info->limits.fragment_uniform_blocks = 0; + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; @@ -3522,15 +3522,17 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.vertex_uniform_blocks = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max vertex uniform blocks: %u (%d).\n", gl_info->limits.vertex_uniform_blocks, gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max vertex uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX], gl_max); } } if (gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.geometry_uniform_blocks = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max geometry uniform blocks: %u (%d).\n", gl_info->limits.geometry_uniform_blocks, gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max geometry uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY], gl_max); } if (gl_info->supported[ARB_FRAGMENT_SHADER]) { @@ -3544,8 +3546,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.fragment_uniform_blocks = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max fragment uniform blocks: %u (%d).\n", gl_info->limits.fragment_uniform_blocks, gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max fragment uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL], gl_max); } } if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4f063b4..ca9d310 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5904,26 +5904,17 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) { - *base = 0; - *count = gl_limits->vertex_uniform_blocks; - - if (shader_type == WINED3D_SHADER_TYPE_VERTEX) - return; - - *base += *count; - *count = gl_limits->geometry_uniform_blocks; - - if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY) - return; - - *base += *count; - *count = gl_limits->fragment_uniform_blocks; + unsigned int i; - if (shader_type == WINED3D_SHADER_TYPE_PIXEL) - return; + *base = 0; + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + *count = gl_limits->uniform_blocks[i]; + if (i == shader_type) + return; + *base += *count; + } - *base += *count; + ERR("Unrecognized shader type %#x.\n", shader_type); *count = 0; - - ERR("Unhandled shader type %#x.\n", shader_type); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7f9081..bf8f612 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2146,9 +2146,7 @@ struct wined3d_gl_limits UINT lights; UINT textures; UINT texture_coords; - unsigned int vertex_uniform_blocks; - unsigned int geometry_uniform_blocks; - unsigned int fragment_uniform_blocks; + unsigned int uniform_blocks[WINED3D_SHADER_TYPE_COUNT]; UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers;

1 0

Young Chung : ucrtbase: Add __conio_common_vcprintf()/_vcwprintf().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: cd2c28433b362ab688a40d295f3928335617662d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2c28433b362ab688a40d295… Author: Young Chung <ychung(a)esri.com> Date: Tue Jan 31 10:01:03 2017 -0800 ucrtbase: Add __conio_common_vcprintf()/_vcwprintf(). Signed-off-by: Young Chung <ychung(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-conio-l1-1-0.spec | 4 ++-- dlls/msvcrt/console.c | 24 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec b/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec index 3b7f637..6d71343 100644 --- a/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec @@ -1,8 +1,8 @@ -@ stub __conio_common_vcprintf +@ cdecl __conio_common_vcprintf(int64 str ptr ptr) ucrtbase.__conio_common_vcprintf @ stub __conio_common_vcprintf_p @ stub __conio_common_vcprintf_s @ stub __conio_common_vcscanf -@ stub __conio_common_vcwprintf +@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) ucrtbase.__conio_common_vcwprintf @ stub __conio_common_vcwprintf_p @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 8293b1d..ebde26a 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -560,3 +560,27 @@ int CDECL _cwprintf(const MSVCRT_wchar_t* format, ...) return retval; } + +/********************************************************************* + * __conio_common_vcprintf (MSVCRT.@) + */ +int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return pf_printf_a(puts_clbk_console_a, NULL, format, locale, + options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); +} + +/********************************************************************* + * __conio_common_vcwprintf (MSVCRT.@) + */ +int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const MSVCRT_wchar_t* format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return pf_printf_w(puts_clbk_console_w, NULL, format, locale, + options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 800ae8f..85f196b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -73,11 +73,11 @@ @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func -@ stub __conio_common_vcprintf +@ cdecl __conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf @ stub __conio_common_vcprintf_p @ stub __conio_common_vcprintf_s @ stub __conio_common_vcscanf -@ stub __conio_common_vcwprintf +@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) MSVCRT__conio_common_vcwprintf @ stub __conio_common_vcwprintf_p @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf

1 0

Jacek Caban : inetcomm: Added support for decoding quoted-printable data.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 0672bfa216a48ca0394ea7294212e36681a18280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0672bfa216a48ca0394ea7294… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 11:23:39 2017 +0100 inetcomm: Added support for decoding quoted-printable data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 97 +++++++++++++++++++++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 14 +++++++ 2 files changed, 108 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c55be72..0ed7cef 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1614,6 +1614,90 @@ static HRESULT decode_base64(IStream *input, IStream **ret_stream) return S_OK; } +static int hex_digit(char c) +{ + if('0' <= c && c <= '9') + return c - '0'; + if('A' <= c && c <= 'F') + return c - 'A' + 10; + if('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +static HRESULT decode_qp(IStream *input, IStream **ret_stream) +{ + const unsigned char *ptr, *end; + unsigned char *ret, prev = 0; + unsigned char buf[1024]; + LARGE_INTEGER pos; + IStream *output; + DWORD size; + int n = -1; + HRESULT hres; + + pos.QuadPart = 0; + hres = IStream_Seek(input, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) + return hres; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &output); + if(FAILED(hres)) + return hres; + + while(1) { + hres = IStream_Read(input, buf, sizeof(buf), &size); + if(FAILED(hres) || !size) + break; + + ptr = ret = buf; + end = buf + size; + + while(ptr < end) { + unsigned char byte = *ptr++; + + switch(n) { + case -1: + if(byte == '=') + n = 0; + else + *ret++ = byte; + continue; + case 0: + prev = byte; + n = 1; + continue; + case 1: + if(prev != '\r' || byte != '\n') { + int h1 = hex_digit(prev), h2 = hex_digit(byte); + if(h1 != -1 && h2 != -1) + *ret++ = (h1 << 4) | h2; + else + *ret++ = '='; + } + n = -1; + continue; + } + } + + if(ret > buf) { + hres = IStream_Write(output, buf, ret - buf, NULL); + if(FAILED(hres)) + break; + } + } + + if(SUCCEEDED(hres)) + hres = IStream_Seek(output, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) { + IStream_Release(output); + return hres; + } + + *ret_stream = output; + return S_OK; +} + static HRESULT WINAPI MimeBody_GetData( IMimeBody* iface, ENCODINGTYPE ietEncoding, @@ -1628,12 +1712,19 @@ static HRESULT WINAPI MimeBody_GetData( if(This->encoding != ietEncoding) { switch(This->encoding) { case IET_BASE64: - if(ietEncoding != IET_BINARY) - FIXME("Encofing %d is not supported.\n", ietEncoding); - return decode_base64(This->data, ppStream); + hres = decode_base64(This->data, ppStream); + break; + case IET_QP: + hres = decode_qp(This->data, ppStream); + break; default: FIXME("Decoding %d is not supported.\n", This->encoding); + hres = S_FALSE; } + if(ietEncoding != IET_BINARY) + FIXME("Encoding %d is not supported.\n", ietEncoding); + if(hres != S_FALSE) + return hres; } start.QuadPart = 0; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index c680938..fbee6e1 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -556,6 +556,20 @@ static void test_SetData(void) test_stream_read(stream, S_OK, " \t\r", 3); IStream_Release(stream); + stream = create_stream_from_string(" =3d=3D\"one\" \t=\r\ntw= o=\nx3\n=34\r\n5"); + hr = IMimeBody_SetData(body, IET_QP, "text", "plain", &IID_IStream, stream); + IStream_Release(stream); + ok(hr == S_OK, "SetData failed: %08x\n", hr); + + test_current_encoding(body, IET_QP); + + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + ok(hr == S_OK, "GetData failed %08x\n", hr); + + test_stream_read(stream, S_OK, " ==\"one\" \ttw=o=3\n4\r\n5", -1); + + IStream_Release(stream); + IMimeBody_Release(body); }

1 0

Jacek Caban : inetcomm: Added mhtml binding tests.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 07af9d0db3dedd9170a5aedda41be9f578e8fa1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07af9d0db3dedd9170a5aedda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 11:23:20 2017 +0100 inetcomm: Added mhtml binding tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 271 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 3f07adc..c680938 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -62,6 +62,11 @@ DEFINE_EXPECT(Stream_Read); DEFINE_EXPECT(Stream_Stat); DEFINE_EXPECT(Stream_Seek); DEFINE_EXPECT(Stream_Seek_END); +DEFINE_EXPECT(GetBindInfo); +DEFINE_EXPECT(ReportProgress_MIMETYPEAVAILABLE); +DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); +DEFINE_EXPECT(ReportData); +DEFINE_EXPECT(ReportResult); static const char msg1[] = "MIME-Version: 1.0\r\n" @@ -1162,6 +1167,268 @@ static void test_MimeOleGetPropertySchema(void) IMimePropertySchema_Release(schema); } +typedef struct { + const char *url; + const char *content; + const char *mime; + const char *data; +} mhtml_binding_test_t; + +static const mhtml_binding_test_t binding_tests[] = { + { + "mhtml:file://%s", + mhtml_page1, + "text/html", + "<HTML></HTML>" + }, + { + "mhtml:file://%s!http://winehq.org/mhtmltest.html", + mhtml_page1, + "Image/Jpeg", + "Test" + } +}; + +static const mhtml_binding_test_t *current_binding_test; +static IInternetProtocol *current_binding_protocol; + +static HRESULT WINAPI BindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetBindInfo, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI BindInfo_AddRef(IInternetBindInfo *iface) +{ + return 2; +} + +static ULONG WINAPI BindInfo_Release(IInternetBindInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) +{ + CHECK_EXPECT(GetBindInfo); + + ok(grfBINDF != NULL, "grfBINDF == NULL\n"); + ok(pbindinfo != NULL, "pbindinfo == NULL\n"); + ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %d\n", pbindinfo->cbSize); + + *grfBINDF = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NEEDFILE; + return S_OK; +} + +static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulStringType, LPOLESTR *ppwzStr, + ULONG cEl, ULONG *pcElFetched) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IInternetBindInfoVtbl InternetBindInfoVtbl = { + BindInfo_QueryInterface, + BindInfo_AddRef, + BindInfo_Release, + BindInfo_GetBindInfo, + BindInfo_GetBindString +}; + +static IInternetBindInfo bind_info = { + &InternetBindInfoVtbl +}; + +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&CLSID_MimeEdit, guidService)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); + return E_FAIL; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider service_provider = { &ServiceProviderVtbl }; + +static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(&IID_IServiceProvider, riid)) { + *ppv = &service_provider; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ProtocolSink_AddRef(IInternetProtocolSink *iface) +{ + return 2; +} + +static ULONG WINAPI ProtocolSink_Release(IInternetProtocolSink *iface) +{ + return 1; +} + +static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, + const WCHAR *szStatusText) +{ + switch(ulStatusCode) { + case BINDSTATUS_MIMETYPEAVAILABLE: + CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + ok(!strcmp_wa(szStatusText, current_binding_test->mime), "status text %s\n", wine_dbgstr_w(szStatusText)); + return S_OK; + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + return S_OK; + default: + ok(0, "unexpected call %u %s\n", ulStatusCode, wine_dbgstr_w(szStatusText)); + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, + ULONG ulProgressMax) +{ + char buf[1024]; + DWORD read; + HRESULT hres; + + CHECK_EXPECT(ReportData); + + ok(!ulProgress, "ulProgress = %u\n", ulProgress); + ok(ulProgress == ulProgressMax, "ulProgress != ulProgressMax\n"); + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_INTERMEDIATEDATANOTIFICATION + | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE | BSCF_AVAILABLEDATASIZEUNKNOWN), + "grcf = %08x\n", grfBSCF); + + hres = IInternetProtocol_Read(current_binding_protocol, buf, sizeof(buf), &read); + ok(hres == S_OK, "Read failed: %08x\n", hres); + buf[read] = 0; + ok(!strcmp(buf, current_binding_test->data), "unexpected data: %s\n", buf); + + return S_OK; +} + +static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, + LPCWSTR szResult) +{ + CHECK_EXPECT(ReportResult); + ok(hrResult == S_OK, "hrResult = %08x\n", hrResult); + ok(!dwError, "dwError = %u\n", dwError); + ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult)); + return S_OK; +} + +static IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { + ProtocolSink_QueryInterface, + ProtocolSink_AddRef, + ProtocolSink_Release, + ProtocolSink_Switch, + ProtocolSink_ReportProgress, + ProtocolSink_ReportData, + ProtocolSink_ReportResult +}; + +static IInternetProtocolSink protocol_sink = { &InternetProtocolSinkVtbl }; + +static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) +{ + char file_name[MAX_PATH+32], *p, urla[INTERNET_MAX_URL_LENGTH]; + WCHAR test_url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + IUnknown *unk; + HRESULT hres; + HANDLE file; + DWORD size; + + p = file_name + GetCurrentDirectoryA(sizeof(file_name), file_name); + *p++ = '\\'; + strcpy(p, "winetest.mht"); + + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + WriteFile(file, test->content, strlen(test->content), &size, NULL); + CloseHandle(file); + + sprintf(urla, test->url, file_name); + MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR)); + + hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres); + + hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetProtocolEx, (void**)&unk); + ok(hres == E_NOINTERFACE, "Could get IInternetProtocolEx\n"); + + current_binding_test = test; + current_binding_protocol = protocol; + + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + SET_EXPECT(ReportData); + SET_EXPECT(ReportResult); + hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); + ok(hres == S_OK, "Start failed: %08x\n", hres); + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + todo_wine CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + CHECK_CALLED(ReportData); + CHECK_CALLED(ReportResult); + + IInternetProtocol_Release(protocol); + ok(DeleteFileA("winetest.mht"), "DeleteFile failed: %u\n", GetLastError()); +} + static const struct { const char *base_url; const char *relative_url; @@ -1279,6 +1546,7 @@ static void test_mhtml_protocol(void) IUnknown outer = { &outer_vtbl }; IClassFactory *class_factory; IUnknown *unk, *unk2; + unsigned i; HRESULT hres; /* test class factory */ @@ -1306,6 +1574,9 @@ static void test_mhtml_protocol(void) if(!broken_mhtml_resolver) test_mhtml_protocol_info(); + + for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++) + test_mhtml_protocol_binding(binding_tests + i); } static void test_MimeOleObjectFromMoniker(void)

1 0

Jacek Caban : inetcomm: Added support for binding mhtml protocol handler.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: cf8e259eb6cbbef1b15801bc656a9a53f5e06eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8e259eb6cbbef1b15801bc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 11:23:12 2017 +0100 inetcomm: Added support for binding mhtml protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 380 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 374 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf8e259eb6cbbef1b1580…

1 0

Jacek Caban : inetcomm: Added IInternetProtocolInfo:: CombineUrl implementation.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 3f644cb0bfdba11432f730c9cd1fb95cdb63c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f644cb0bfdba11432f730c9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 1 11:22:39 2017 +0100 inetcomm: Added IInternetProtocolInfo::CombineUrl implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 74 ++++++++++++++++++++++++++++++++++++-- dlls/inetcomm/tests/mimeole.c | 83 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 154 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index f6600b9..300c139 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -24,6 +24,7 @@ #include "inetcomm_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -36,6 +37,39 @@ typedef struct { IUnknown *outer_unk; } MimeHtmlProtocol; +typedef struct { + const WCHAR *mhtml; + size_t mhtml_len; + const WCHAR *location; +} mhtml_url_t; + +static const WCHAR mhtml_prefixW[] = {'m','h','t','m','l',':'}; +static const WCHAR mhtml_separatorW[] = {'!','x','-','u','s','c',':'}; + +static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) +{ + const WCHAR *p; + + if(strncmpiW(url, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) + return E_FAIL; + + r->mhtml = url + sizeof(mhtml_prefixW)/sizeof(WCHAR); + p = strchrW(r->mhtml, '!'); + if(p) { + r->mhtml_len = p - r->mhtml; + /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ + if(!strncmpW(p, mhtml_separatorW, sizeof(mhtml_separatorW)/sizeof(WCHAR))) + p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + else + p++; + }else { + r->mhtml_len = strlenW(r->mhtml); + } + + r->location = p; + return S_OK; +} + static inline MimeHtmlProtocol *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, MimeHtmlProtocol, IUnknown_inner); @@ -247,10 +281,46 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - FIXME("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), + size_t len = sizeof(mhtml_prefixW)/sizeof(WCHAR); + mhtml_url_t url; + WCHAR *p; + HRESULT hres; + + TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - return E_NOTIMPL; + + hres = parse_mhtml_url(pwzBaseUrl, &url); + if(FAILED(hres)) + return hres; + + if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, sizeof(mhtml_prefixW)/sizeof(WCHAR))) { + FIXME("Relative URL is mhtml protocol\n"); + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; + } + + len += url.mhtml_len; + if(*pwzRelativeUrl) + len += strlenW(pwzRelativeUrl) + sizeof(mhtml_separatorW)/sizeof(WCHAR); + if(len >= cchResult) { + *pcchResult = 0; + return E_FAIL; + } + + memcpy(pwzResult, mhtml_prefixW, sizeof(mhtml_prefixW)); + p = pwzResult + sizeof(mhtml_prefixW)/sizeof(WCHAR); + memcpy(p, url.mhtml, url.mhtml_len*sizeof(WCHAR)); + p += url.mhtml_len; + if(*pwzRelativeUrl) { + memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); + p += sizeof(mhtml_separatorW)/sizeof(WCHAR); + strcpyW(p, pwzRelativeUrl); + }else { + *p = 0; + } + + *pcchResult = len; + return S_OK; } static HRESULT WINAPI MimeHtmlProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index fe19893..3f07adc 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -27,6 +27,7 @@ #include "ocidl.h" #include "mimeole.h" +#include "wininet.h" #include <stdio.h> @@ -1161,15 +1162,91 @@ static void test_MimeOleGetPropertySchema(void) IMimePropertySchema_Release(schema); } +static const struct { + const char *base_url; + const char *relative_url; + const char *expected_result; + BOOL todo; +} combine_tests[] = { + { + "mhtml:file:///c:/dir/test.mht", "http://test.org", + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org" + }, { + "mhtml:file:///c:/dir/test.mht", "3D\"http://test.org\"", + "mhtml:file:///c:/dir/test.mht!x-usc:3D\"http://test.org\"" + }, { + "mhtml:file:///c:/dir/test.mht", "123abc", + "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "123abc", + "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + }, { + "MhtMl:file:///c:/dir/test.mht!x-usc:http://test.org/dir/dir2/file.html", "../..", + "mhtml:file:///c:/dir/test.mht!x-usc:../.." + }, {"mhtml:file:///c:/dir/test.mht!x-usc:file:///c:/dir/dir2/file.html", "../..", + "mhtml:file:///c:/dir/test.mht!x-usc:../.." + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "", + "mhtml:file:///c:/dir/test.mht" + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///d:/file.html", + "file:///d:/file.html", TRUE + }, { + "mhtml:file:///c:/dir/test.mht!x-usc:http://test.org", "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", + "mhtml:file:///c:/dir2/test.mht!x-usc:http://test.org", TRUE + }, { + "mhtml:file:///c:/dir/test.mht!http://test.org", "123abc", + "mhtml:file:///c:/dir/test.mht!x-usc:123abc" + }, { + "mhtml:file:///c:/dir/test.mht!http://test.org", "", + "mhtml:file:///c:/dir/test.mht" + } +}; + static void test_mhtml_protocol_info(void) { + WCHAR *base_url, *relative_url, combined_url[INTERNET_MAX_URL_LENGTH]; IInternetProtocolInfo *protocol_info; + DWORD combined_len; + unsigned i, exlen; HRESULT hres; + static const WCHAR http_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','o','r','g',0}; + hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); + for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) { + base_url = a2w(combine_tests[i].base_url); + relative_url = a2w(combine_tests[i].relative_url); + + combined_len = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + todo_wine_if(combine_tests[i].todo) + ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); + if(SUCCEEDED(hres)) { + exlen = strlen(combine_tests[i].expected_result); + ok(combined_len == exlen, "[%u] combined len is %u, expected %u\n", i, combined_len, exlen); + ok(!strcmp_wa(combined_url, combine_tests[i].expected_result), "[%u] combined URL is %s, expected %s\n", + i, wine_dbgstr_w(combined_url), combine_tests[i].expected_result); + + combined_len = 0xdeadbeef; + hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, + combined_url, exlen, &combined_len, 0); + ok(hres == E_FAIL, "[%u] CombineUrl returned: %08x\n", i, hres); + ok(!combined_len, "[%u] combined_len = %u\n", i, combined_len); + } + + HeapFree(GetProcessHeap(), 0, base_url); + HeapFree(GetProcessHeap(), 0, relative_url); + } + + hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, + combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); + IInternetProtocolInfo_Release(protocol_info); } @@ -1195,6 +1272,8 @@ static const IUnknownVtbl outer_vtbl = { outer_Release }; +static BOOL broken_mhtml_resolver; + static void test_mhtml_protocol(void) { IUnknown outer = { &outer_vtbl }; @@ -1225,7 +1304,8 @@ static void test_mhtml_protocol(void) IClassFactory_Release(class_factory); - test_mhtml_protocol_info(); + if(!broken_mhtml_resolver) + test_mhtml_protocol_info(); } static void test_MimeOleObjectFromMoniker(void) @@ -1261,6 +1341,7 @@ static void test_MimeOleObjectFromMoniker(void) IBindCtx_Release(bind_ctx); if(hres == INET_E_RESOURCE_NOT_FOUND) { /* winxp */ win_skip("Broken MHTML behaviour found. Skipping some tests.\n"); + broken_mhtml_resolver = TRUE; return; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017