March 2016 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Add ARB_texture_swizzle extension.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 5cb85f3b2f2791c5f085bf720683b31caddee745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb85f3b2f2791c5f085bf720… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:09 2016 +0100 wined3d: Add ARB_texture_swizzle extension. Signed-off-by: Matteo Bruni <mbruni(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 | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f57f326..02c8a26 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,6 +156,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, + {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, @@ -3473,6 +3474,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, {ARB_TEXTURE_RGB10_A2UI, MAKEDWORD_VERSION(3, 3)}, + {ARB_TEXTURE_SWIZZLE, MAKEDWORD_VERSION(3, 3)}, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8943cb0..f1f12ac 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -92,6 +92,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, + ARB_TEXTURE_SWIZZLE, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA,

1 0

Matteo Bruni : d3d11/tests: Add a test for DXGI_FORMAT_A8_UNORM textures.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 05be74b6c4affc472d7f580bb2fd8bb4cfeeb6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=05be74b6c4affc472d7f580bb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:11 2016 +0100 d3d11/tests: Add a test for DXGI_FORMAT_A8_UNORM textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9348aff..548636a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3627,6 +3627,13 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; + static const BYTE a8_data[] = + { + 0x00, 0x10, 0x20, 0x30, + 0x40, 0x50, 0x60, 0x70, + 0x80, 0x90, 0xa0, 0xb0, + 0xc0, 0xd0, 0xe0, 0xf0, + }; static const BYTE bc1_data[] = { 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, @@ -3673,6 +3680,8 @@ static void test_texture(void) }; static const struct texture srgb_texture = {4, 4, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture a8_texture = {4, 4, 1, DXGI_FORMAT_A8_UNORM, + {{a8_data, 4 * sizeof(*a8_data)}}}; static const struct texture bc1_texture = {8, 8, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; @@ -3713,6 +3722,13 @@ static void test_texture(void) 0xff708cba, 0xffdee0e2, 0xfff3fbfd, 0xff1a1801, 0xffa9ff00, 0xff93f159, 0xff670067, 0xffb8177f, }; + static const DWORD a8_colors[] = + { + 0x00000000, 0x10000000, 0x20000000, 0x30000000, + 0x40000000, 0x50000000, 0x60000000, 0x70000000, + 0x80000000, 0x90000000, 0xa0000000, 0xb0000000, + 0xc0000000, 0xd0000000, 0xe0000000, 0xf0000000, + }; static const DWORD bc_colors[] = { 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xff00ff00, @@ -3785,6 +3801,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, + {&ps_sample, &a8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.0f, level_1_colors}, @@ -3940,9 +3957,9 @@ static void test_texture(void) draw_quad(&test_context); get_texture_readback(test_context.backbuffer, &rb); - for (x = 0; x < 4; ++x) + for (y = 0; y < 4; ++y) { - for (y = 0; y < 4; ++y) + for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); ok(compare_color(color, test->expected_colors[y * 4 + x], 1),

1 0

Matteo Bruni : wined3d: Use ARB_texture_swizzle for color fixups when possible.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 0ed39ad13db834525f35462f4c9deec1c61786aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed39ad13db834525f35462f4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:10 2016 +0100 wined3d: Use ARB_texture_swizzle for color fixups when possible. Signed-off-by: Matteo Bruni <mbruni(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 | 4 +++- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 5 ++++- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/utils.c | 5 ++++- dlls/wined3d/wined3d_private.h | 6 ++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 910350d..0e6cc5b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -634,6 +634,7 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_cs_set_texture *op = data; struct wined3d_texture *prev; @@ -653,7 +654,8 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) op->texture->sampler = op->stage; if (!prev || op->texture->target != prev->target - || !is_same_fixup(new_format->color_fixup, old_format->color_fixup) + || (!is_same_fixup(new_format->color_fixup, old_format->color_fixup) + && !(can_use_texture_swizzle(gl_info, new_format) && can_use_texture_swizzle(gl_info, old_format))) || (new_fmt_flags & WINED3DFMT_FLAG_SHADOW) != (old_fmt_flags & WINED3DFMT_FLAG_SHADOW)) device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8892d49..e6ef82a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2883,9 +2883,8 @@ static void PRINTF_ATTR(9, 10) shader_glsl_gen_sample_code(const struct wined3d_ shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); - /* FIXME: We currently don't support fixups for vertex shaders or anything - * above SM3. Note that for SM4+ the sampler index doesn't have to match - * the resource index. */ + /* If ARB_texture_swizzle is supported we don't need to do anything here. + * We actually rely on it for vertex shaders and SM4+. */ if (version->type == WINED3D_SHADER_TYPE_PIXEL && version->major < 4) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; @@ -8035,7 +8034,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] + && gl_info->supported[ARB_TEXTURE_SWIZZLE]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9aa0fa1..db30868 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2786,7 +2786,10 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->color_fixup[i] = COLOR_FIXUP_IDENTITY; continue; } - args->color_fixup[i] = texture->resource.format->color_fixup; + if (can_use_texture_swizzle(gl_info, texture->resource.format)) + args->color_fixup[i] = COLOR_FIXUP_IDENTITY; + else + args->color_fixup[i] = texture->resource.format->color_fixup; if (texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW) args->shadow |= 1u << i; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index feb6919..e163e83 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -219,6 +219,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format *format = texture->resource.format; + const struct color_fixup_desc fixup = format->color_fixup; struct gl_texture *gl_tex; GLenum target; @@ -330,6 +332,31 @@ void wined3d_texture_bind(struct wined3d_texture *texture, gl_info->gl_ops.gl.p_glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY); checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); } + + if (!is_identity_fixup(fixup) && can_use_texture_swizzle(gl_info, format)) + { + static const GLenum swizzle_source[] = + { + GL_ZERO, /* CHANNEL_SOURCE_ZERO */ + GL_ONE, /* CHANNEL_SOURCE_ONE */ + GL_RED, /* CHANNEL_SOURCE_X */ + GL_GREEN, /* CHANNEL_SOURCE_Y */ + GL_BLUE, /* CHANNEL_SOURCE_Z */ + GL_ALPHA, /* CHANNEL_SOURCE_W */ + }; + struct + { + GLint x, y, z, w; + } + swizzle; + + swizzle.x = swizzle_source[fixup.x_source]; + swizzle.y = swizzle_source[fixup.y_source]; + swizzle.z = swizzle_source[fixup.z_source]; + swizzle.w = swizzle_source[fixup.w_source]; + gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, &swizzle.x); + checkGLcall("glTexParameteriv(GL_TEXTURE_SWIZZLE_RGBA)"); + } } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 506bc07..df22e80 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4840,7 +4840,10 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d if ((texture = state->textures[i])) { - settings->op[i].color_fixup = texture->resource.format->color_fixup; + if (can_use_texture_swizzle(gl_info, texture->resource.format)) + settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; + else + settings->op[i].color_fixup = texture->resource.format->color_fixup; if (ignore_textype) { settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9d2a96..7b7b65b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3435,6 +3435,12 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } +static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) +{ + return gl_info->supported[ARB_TEXTURE_SWIZZLE] && !is_complex_fixup(format->color_fixup) + && !is_scaling_fixup(format->color_fixup); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Nikolay Sivov : user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 9d91fce444fab9dc408f1e3834b2b0738843ec41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d91fce444fab9dc408f1e383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 17:36:13 2016 +0300 user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 2 +- dlls/user32/tests/scroll.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index b28ee44..a210962 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2039,7 +2039,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnableScrollBar( HWND hwnd, UINT nBar, UINT flags nBar = SB_HORZ; } else - bFineWithMe = TRUE; + bFineWithMe = nBar != SB_CTL; if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return FALSE; if (bFineWithMe && infoPtr->flags == flags) return FALSE; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 691855b..1c454fb 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,6 +114,15 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + /* disable window, try to reenable */ + ret = EnableWindow( hScroll, FALSE ); + ok( !ret, "got %d\n", ret ); + ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "got %d\n", ret ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + DestroyWindow(hScroll); DestroyWindow(mainwnd); } @@ -539,7 +548,7 @@ static void test_SetScrollInfo(void) EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); @@ -551,9 +560,10 @@ static void test_SetScrollInfo(void) memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.nMax = 100; + si.nMin = 10; si.nPos = 0; si.nPage = 100; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); @@ -564,6 +574,18 @@ static void test_SetScrollInfo(void) ret = GetScrollInfo(hScroll, SB_CTL, &si); ok(ret, "got %d\n", ret); + EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); + ok(IsWindowEnabled(hScroll), "expected enabled scrollbar\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 10; + si.nMin = 100; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(ret, "scroll bar disabled\n"); + DestroyWindow(hScroll); DestroyWindow(mainwnd); }

1 0

Austin English : winscard: Add stubs for SCardListReadersA/W.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: c1614094f4c1e6cbde0f357b9dd910b64db9d4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1614094f4c1e6cbde0f357b9… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 20 22:58:27 2016 -0500 winscard: Add stubs for SCardListReadersA/W. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/winscard.c | 12 ++++++++++++ dlls/winscard/winscard.spec | 4 ++-- include/winscard.h | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index bcf8129..a8a1735 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -129,3 +129,15 @@ void WINAPI SCardReleaseStartedEvent(void) { FIXME("stub\n"); } + +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + return SCARD_E_NO_READERS_AVAILABLE; +} + +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + return SCARD_E_NO_READERS_AVAILABLE; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 8ecf988..5fd8903 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -40,8 +40,8 @@ @ stub SCardListInterfacesW @ stub SCardListReaderGroupsA @ stub SCardListReaderGroupsW -@ stub SCardListReadersA -@ stub SCardListReadersW +@ stdcall SCardListReadersA(long str ptr ptr) +@ stdcall SCardListReadersW(long wstr ptr ptr) @ stub SCardLocateCardsA @ stub SCardLocateCardsByATRA @ stub SCardLocateCardsByATRW diff --git a/include/winscard.h b/include/winscard.h index 884d350..fc729e2 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -120,8 +120,8 @@ LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPD LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); #define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) -LONG WINAPI SCardListReadersA(SCARDCONTEXT,LPCSTR,LPSTR,LPDWORD); -LONG WINAPI SCardListReadersW(SCARDCONTEXT,LPCWSTR,LPWSTR,LPDWORD); +LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *); +LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *); #define SCardListReaders WINELIB_NAME_AW(SCardListReaders) LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD);

1 0

Nikolay Sivov : xmllite/writer: Fix a bunch of Write* methods to set closed state.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 1cb6fa5e846e17e9c1b10f95a5b584f2e374299b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb6fa5e846e17e9c1b10f95a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 10:41:25 2016 +0300 xmllite/writer: Fix a bunch of Write* methods to set closed state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 57 +++++++++++++++++++++++++++++++++++++++++++-- dlls/xmllite/writer.c | 8 +++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index cb379fe..7a958b3 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -918,23 +918,76 @@ static void test_writer_state(void) /* initial state */ check_writer_state(writer, E_UNEXPECTED); - /* set output and call 'wrong' method */ + /* set output and call 'wrong' method, WriteEndElement */ stream = writer_set_output(writer); hr = IXmlWriter_WriteEndElement(writer); ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); - IStream_Release(stream); + /* WriteAttributeString */ stream = writer_set_output(writer); hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); check_writer_state(writer, WR_E_INVALIDACTION); + IStream_Release(stream); + + /* WriteEndDocument */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + IStream_Release(stream); + + /* WriteFullEndElement */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + IStream_Release(stream); + + /* WriteCData */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteCData(writer, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + IStream_Release(stream); + + /* WriteName */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteName(writer, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + IStream_Release(stream); + + /* WriteNmToken */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteNmToken(writer, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + IStream_Release(stream); + /* WriteString */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteString(writer, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); IStream_Release(stream); IXmlWriter_Release(writer); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 5e3557b..61190c6 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -626,7 +626,9 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) case XmlWriterState_ElemStarted: writer_close_starttag(This); break; + case XmlWriterState_Ready: case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; default: ; @@ -912,7 +914,9 @@ static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_Ready: case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; default: ; @@ -931,7 +935,9 @@ static HRESULT WINAPI xmlwriter_WriteNmToken(IXmlWriter *iface, LPCWSTR pwszNmTo { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_Ready: case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; default: ; @@ -1136,7 +1142,9 @@ static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText) { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_Ready: case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; default: ;

1 0

Patrick Armstrong : bcrypt: Added BCryptHash function.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 408251948ec890c570e981a89ad999e1c870a279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408251948ec890c570e981a89… Author: Patrick Armstrong <pat(a)triplefox.com> Date: Wed Mar 23 22:22:22 2016 -0700 bcrypt: Added BCryptHash function. Signed-off-by: Patrick Armstrong <pat(a)oldpatricka.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 1 + dlls/bcrypt/bcrypt_main.c | 32 ++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 1 + 4 files changed, 91 insertions(+) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index c52d89f..e299fe0 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -29,6 +29,7 @@ @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) @ stdcall BCryptHashData(ptr ptr long long) @ stub BCryptImportKey @ stub BCryptImportKeyPair diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ed1cab0..43d4688 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -808,6 +808,38 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON } } +NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, + UCHAR *input, ULONG inputlen, UCHAR *output, ULONG outputlen ) +{ + NTSTATUS status; + BCRYPT_HASH_HANDLE handle; + + TRACE( "%p, %p, %u, %p, %u, %p, %u\n", algorithm, secret, secretlen, + input, inputlen, output, outputlen ); + + status = BCryptCreateHash( algorithm, &handle, NULL, 0, secret, secretlen, 0); + if (status != STATUS_SUCCESS) + { + return status; + } + + status = BCryptHashData( handle, input, inputlen, 0 ); + if (status != STATUS_SUCCESS) + { + BCryptDestroyHash( handle ); + return status; + } + + status = BCryptFinishHash( handle, output, outputlen, 0 ); + if (status != STATUS_SUCCESS) + { + BCryptDestroyHash( handle ); + return status; + } + + return BCryptDestroyHash( handle ); +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 447861e..e2318c4 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -26,6 +26,9 @@ #include "wine/test.h" +static NTSTATUS (WINAPI *pBCryptHash)( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG secretlen, + UCHAR *input, ULONG inputlen, UCHAR *output, ULONG outputlen ); + static void test_BCryptGenRandom(void) { NTSTATUS ret; @@ -648,8 +651,55 @@ static void test_md5(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_BcryptHash(void) +{ + static const char expected[] = + "e2a3e68d23ce348b8f68b3079de3d4c9"; + static const char expected_hmac[] = + "7bda029b93fa8d817fcc9e13d6bdf092"; + BCRYPT_ALG_HANDLE alg; + UCHAR md5[16], md5_hmac[16]; + char str[65]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + test_hash_length(alg, 16); + test_alg_name(alg, "MD5"); + + memset(md5, 0, sizeof(md5)); + ret = pBCryptHash(alg, NULL, 0, (UCHAR *)"test", sizeof("test"), md5, sizeof(md5)); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( md5, sizeof(md5), str ); + ok(!strcmp(str, expected), "got %s\n", str); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + alg = NULL; + memset(md5_hmac, 0, sizeof(md5_hmac)); + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, BCRYPT_ALG_HANDLE_HMAC_FLAG); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + ret = pBCryptHash(alg, (UCHAR *)"key", sizeof("key"), (UCHAR *)"test", sizeof("test"), md5_hmac, sizeof(md5_hmac)); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( md5_hmac, sizeof(md5_hmac), str ); + ok(!strcmp(str, expected_hmac), "got %s\n", str); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + START_TEST(bcrypt) { + HMODULE module; + + module = GetModuleHandleA( "bcrypt.dll" ); + test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); test_sha1(); @@ -657,4 +707,11 @@ START_TEST(bcrypt) test_sha384(); test_sha512(); test_md5(); + + pBCryptHash = (void *)GetProcAddress( module, "BCryptHash" ); + + if (pBCryptHash) + test_BcryptHash(); + else + win_skip("BCryptHash is not available\n"); } diff --git a/include/bcrypt.h b/include/bcrypt.h index ddfd66e..93f4326 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -92,6 +92,7 @@ NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *); NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCHAR, ULONG); NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG);

1 0

Nikolay Sivov : xmllite/writer: Put writer into closed state on WriteAttributeString().
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 2d9f6f7215db832205f8e1da8b5ccaa3eaaafc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9f6f7215db832205f8e1da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 10:41:24 2016 +0300 xmllite/writer: Put writer into closed state on WriteAttributeString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 10 ++++++++++ dlls/xmllite/writer.c | 2 ++ 2 files changed, 12 insertions(+) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 81945d1..cb379fe 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -907,6 +907,7 @@ static void test_WriteRaw(void) static void test_writer_state(void) { + static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -927,6 +928,15 @@ static void test_writer_state(void) IStream_Release(stream); + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + check_writer_state(writer, WR_E_INVALIDACTION); + + IStream_Release(stream); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 7895fb0..5e3557b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -591,7 +591,9 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_Ready: case XmlWriterState_DocClosed: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; default: ;

1 0

Nikolay Sivov : xmllite/writer: Handle initial and ready states in the rest of tested Write* methods.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: e89c2df7c5b28e475dcdd6ab3afe480be451f411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89c2df7c5b28e475dcdd6ab3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 10:41:23 2016 +0300 xmllite/writer: Handle initial and ready states in the rest of tested Write* methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 10 +---- dlls/xmllite/writer.c | 97 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index ce4e13d..81945d1 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -63,18 +63,15 @@ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) /* FIXME: add WriteAttributes */ hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteCData(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteCharEntity(writer, aW[0]); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteChars(writer, aW, 1); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteComment(writer, aW); @@ -92,19 +89,17 @@ todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteEntityRef(writer, aW); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteFullEndElement(writer); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); -todo_wine { hr = IXmlWriter_WriteName(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteNmToken(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); -} + /* FIXME: add WriteNode */ /* FIXME: add WriteNodeShallow */ @@ -112,14 +107,12 @@ todo_wine { ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteRaw(writer, aW); ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteRawChars(writer, aW, 1); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); @@ -129,7 +122,6 @@ todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); hr = IXmlWriter_WriteString(writer, aW); -todo_wine ok(hr == exp_hr, "got 0x%08x, expected 0x%08x\n", hr, exp_hr); /* FIXME: add WriteSurrogateCharEntity */ diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 6aa851f..7895fb0 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -587,6 +587,16 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -644,8 +654,22 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) return S_OK; } -static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR wch) +static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR ch) { + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %x\n", This, ch); + + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -655,6 +679,16 @@ static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -821,6 +855,16 @@ static HRESULT WINAPI xmlwriter_WriteEntityRef(IXmlWriter *iface, LPCWSTR pwszNa FIXME("%p %s\n", This, wine_dbgstr_w(pwszName)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -862,6 +906,16 @@ static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName) FIXME("%p %s\n", This, wine_dbgstr_w(pwszName)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -871,6 +925,16 @@ static HRESULT WINAPI xmlwriter_WriteNmToken(IXmlWriter *iface, LPCWSTR pwszNmTo FIXME("%p %s\n", This, wine_dbgstr_w(pwszNmToken)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -938,6 +1002,16 @@ static HRESULT WINAPI xmlwriter_WriteQualifiedName(IXmlWriter *iface, LPCWSTR pw FIXME("%p %s %s\n", This, wine_dbgstr_w(pwszLocalName), wine_dbgstr_w(pwszNamespaceUri)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } @@ -975,10 +1049,19 @@ static HRESULT WINAPI xmlwriter_WriteRawChars(IXmlWriter *iface, const WCHAR *p FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; } - static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandalone standalone) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -1047,6 +1130,16 @@ static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText) FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); + switch (This->state) + { + case XmlWriterState_Initial: + return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } + return E_NOTIMPL; }

1 0

Nikolay Sivov : msxml3/tests: Use win_skip() consistently.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 7d72595475ec2a980294233140eb9ace378de302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d72595475ec2a98029423314… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 12:05:41 2016 +0300 msxml3/tests: Use win_skip() consistently. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 4 ++-- dlls/msxml3/tests/xmldoc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e71acaa..8a0b00e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -5592,7 +5592,7 @@ START_TEST(saxreader) if(FAILED(hr)) { - skip("Failed to create SAXXMLReader instance\n"); + win_skip("Failed to create SAXXMLReader instance\n"); CoUninitialize(); return; } @@ -5642,7 +5642,7 @@ START_TEST(saxreader) test_mxattr_dispex(); } else - skip("SAXAttributes not supported\n"); + win_skip("SAXAttributes not supported\n"); CoUninitialize(); } diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index b724f5c..359297f 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -515,7 +515,7 @@ static BOOL test_try_xmldoc(void) &IID_IXMLDocument, (LPVOID*)&doc); if (FAILED(hr)) { - skip("Failed to create XMLDocument instance\n"); + win_skip("Failed to create XMLDocument instance\n"); return FALSE; }

1 0