wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Józef Kucia : wined3d: Introduce get_format_internal( ) helper function.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: e59ad5d1362d9aba2e07ed357cd70b7a7f4e2717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ad5d1362d9aba2e07ed357… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:37 2016 +0100 wined3d: Introduce get_format_internal() helper 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/utils.c | 173 +++++++++++++-------------------------------------- 1 file changed, 43 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e59ad5d1362d9aba2e07e…

1 0

Józef Kucia : wined3d: Fix depth/ stencil shader resource views.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: af1be967a0b0262a980e9bfbdff107c1d6db7e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1be967a0b0262a980e9bfbd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:36 2016 +0100 wined3d: Fix depth/stencil shader resource views. The WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT, WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT formats were not initialized. 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/utils.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 609f415..00899a1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -276,6 +276,19 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_TYPELESS, "uuuX"}, }; +struct wined3d_format_typeless_depth_stencil_info +{ + enum wined3d_format_id depth_stencil_id; + enum wined3d_format_id depth_view_id; + enum wined3d_format_id stencil_view_id; +}; + +static const struct wined3d_format_typeless_depth_stencil_info typeless_depth_stencil_formats[] = +{ + {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT}, + {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT}, +}; + struct wined3d_format_ddi_info { enum wined3d_format_id id; @@ -1665,6 +1678,13 @@ static inline int get_format_idx(enum wined3d_format_id format_id) return -1; } +static void copy_format(struct wined3d_format *dst_format, const struct wined3d_format *src_format) +{ + enum wined3d_format_id id = dst_format->id; + *dst_format = *src_format; + dst_format->id = id; +} + static void format_set_flag(struct wined3d_format *format, unsigned int flag) { unsigned int i; @@ -2912,8 +2932,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win srgb_format = &gl_info->formats[srgb_fmt_idx]; - *srgb_format = *format; - srgb_format->id = format_srgb_info[j].srgb_format_id; + copy_format(srgb_format, format); if (gl_info->supported[EXT_TEXTURE_SRGB] && !(adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) @@ -3460,12 +3479,51 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_format = &gl_info->formats[typeless_fmt_idx]; memcpy(flags, typeless_format->flags, sizeof(flags)); - *typeless_format = *format; - typeless_format->id = typed_formats[i].typeless_id; + copy_format(typeless_format, format); for (j = 0; j < ARRAY_SIZE(typeless_format->flags); ++j) typeless_format->flags[j] |= flags[j]; } + for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) + { + struct wined3d_format *ds_format, *depth_view_format, *stencil_view_format; + int ds_fmt_idx, depth_view_fmt_idx, stencil_view_fmt_idx; + + ds_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].depth_stencil_id); + if (ds_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].depth_stencil_id), + typeless_depth_stencil_formats[i].depth_stencil_id); + return FALSE; + } + + depth_view_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].depth_view_id); + if (depth_view_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].depth_view_id), + typeless_depth_stencil_formats[i].depth_view_id); + return FALSE; + } + + stencil_view_fmt_idx = get_format_idx(typeless_depth_stencil_formats[i].stencil_view_id); + if (stencil_view_fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(typeless_depth_stencil_formats[i].stencil_view_id), + typeless_depth_stencil_formats[i].stencil_view_id); + return FALSE; + } + + ds_format = &gl_info->formats[ds_fmt_idx]; + depth_view_format = &gl_info->formats[depth_view_fmt_idx]; + stencil_view_format = &gl_info->formats[stencil_view_fmt_idx]; + + copy_format(depth_view_format, ds_format); + copy_format(stencil_view_format, ds_format); + } + return TRUE; }

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 7c9dbd789aed14100fb4d6eb4db1859ce5921dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9dbd789aed14100fb4d6eb4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:35 2016 +0100 wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format. 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/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/utils.c | 144 ++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9dbd789aed14100fb4d…

1 0

Józef Kucia : wined3d: Implement stencil shader resource views.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 85c8c3eea8a5ac31deb52dda7d3e28d2c8f11a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c8c3eea8a5ac31deb52dda7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:34 2016 +0100 wined3d: Implement stencil shader resource views. 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 | 6 ++++++ dlls/wined3d/view.c | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fabd69c..5787c22 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3904,6 +3904,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD TRACE("Disabling ARB_clip_control because ARB_viewport_array is not supported.\n"); gl_info->supported[ARB_CLIP_CONTROL] = FALSE; } + if (gl_info->supported[ARB_STENCIL_TEXTURING] && !gl_info->supported[ARB_TEXTURE_SWIZZLE]) + { + /* The stencil value needs to be placed in the green channel. */ + TRACE("Disabling ARB_stencil_texturing because ARB_texture_swizzle is not supported.\n"); + gl_info->supported[ARB_STENCIL_TEXTURING] = FALSE; + } if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) { TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 86d3ebb..2e728ac 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static BOOL is_stencil_view_format(const struct wined3d_format *format) +{ + return format->id == WINED3DFMT_X24_TYPELESS_G8_UINT + || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -320,6 +326,25 @@ static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shad desc->u.texture.layer_idx, desc->u.texture.layer_count)); checkGLcall("Create texture view"); + if (is_stencil_view_format(view_format)) + { + static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; + + if (!gl_info->supported[ARB_STENCIL_TEXTURING]) + { + context_release(context); + FIXME("OpenGL implementation does not support stencil texturing.\n"); + return; + } + + context_bind_texture(context, view->target, view->object); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); + checkGLcall("Initialize stencil view"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + } + context_release(context); } @@ -391,7 +416,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->format->id == view_format->id && texture->target == view->target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count) + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + && !is_stencil_view_format(view_format)) { TRACE("Creating identity shader resource view.\n"); }

1 0

Józef Kucia : wined3d: Add ARB_stencil_texturing extension.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: fc12d331c50ac82ef8dd29a9c51ea72482baf061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc12d331c50ac82ef8dd29a9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:33 2016 +0100 wined3d: Add ARB_stencil_texturing extension. 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 | 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 773d185..fabd69c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shadow", ARB_SHADOW }, + {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, @@ -3636,6 +3637,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, + {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2bafa89..26089ad 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW, + ARB_STENCIL_TEXTURING, ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_COMPRESSION,

1 0

Józef Kucia : wined3d: Record sampler usage for sample_c instruction.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: dc7db9852a2f66aaddc8a7ed022356ee0b2debcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7db9852a2f66aaddc8a7ed0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:32 2016 +0100 wined3d: Record sampler usage for sample_c instruction. 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/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 765c682..bf4b421 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1282,6 +1282,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B + || ins.handler_idx == WINED3DSIH_SAMPLE_C || ins.handler_idx == WINED3DSIH_SAMPLE_C_LZ || ins.handler_idx == WINED3DSIH_SAMPLE_GRAD || ins.handler_idx == WINED3DSIH_SAMPLE_LOD)

1 0

Jacek Caban : server: Signal pipe server fd in create_pipe_server.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: d8bfbbdc07f7562e8ab3283ac160f94b428ade75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bfbbdc07f7562e8ab3283ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 2 13:37:59 2016 +0100 server: Signal pipe server fd in create_pipe_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++++++++ server/named_pipe.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 6c311a4..28bac91 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -110,6 +110,13 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD return (BOOL)rpcargs.returnValue; } +#define test_signaled(h) _test_signaled(__LINE__,h) +static void _test_signaled(unsigned line, HANDLE handle) +{ + DWORD res = WaitForSingleObject(handle, 0); + ok_(__FILE__,line)(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -176,6 +183,7 @@ static void test_CreateNamedPipe(int pipemode) /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, /* lpSecurityAttrib */ NULL); ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + test_signaled(hnp); ret = WaitNamedPipeA(PIPENAME, 2000); ok(ret, "WaitNamedPipe failed (%d)\n", GetLastError()); diff --git a/server/named_pipe.c b/server/named_pipe.c index 55d05c1..d93c40f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -690,6 +690,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned release_object( server ); return NULL; } + set_fd_signaled( server->ioctl_fd, 1 ); set_server_state( server, ps_idle_server ); return server; }

1 0

Michael Müller : ntdll: Move EventSetInformation from advapi32 to ntdll.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 7ce4ae6895314eef8d984b285b1380477c391ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce4ae6895314eef8d984b285… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Dec 2 15:34:37 2016 +0300 ntdll: Move EventSetInformation from advapi32 to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ---------- dlls/ntdll/misc.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 4868841..0ecd4e9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -273,7 +273,7 @@ @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister -@ stdcall EventSetInformation(int64 long ptr long) +@ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation @ stdcall EventUnregister(int64) ntdll.EtwEventUnregister @ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 9bd75e8..c1dbb99 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -880,16 +880,6 @@ ULONG WINAPI EventWriteTransfer( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor } /****************************************************************************** - * EventSetInformation [ADVAPI32.@] - */ -ULONG WINAPI EventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, PVOID info, - ULONG length ) -{ - FIXME("%u, %p, %u\n", class, info, length); - return ERROR_SUCCESS; -} - -/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 687fff5..ceb82f6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -380,6 +380,16 @@ ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) return ERROR_SUCCESS; } +/********************************************************************* + * EtwEventSetInformation (NTDLL.@) + */ +ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, void *info, + ULONG length ) +{ + FIXME("(%s, %u, %p, %u) stub\n", wine_dbgstr_longlong(handle), class, info, length); + return ERROR_SUCCESS; +} + /****************************************************************************** * EtwRegisterTraceGuidsW (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 57f00c0..28aa2df 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -42,6 +42,7 @@ @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() @ stdcall EtwEventRegister(ptr ptr ptr ptr) +@ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64) @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)

1 0

Hugh McMaster : reg/tests: Test whether comment lines ending in a backslash affect the next line.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: f4334f29f81714da25d3e0b7e77346ef2d64725b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4334f29f81714da25d3e0b7e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:45 2016 +0000 reg/tests: Test whether comment lines ending in a backslash affect the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d338620..6447d45 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -971,6 +971,16 @@ static void test_import(void) if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine9\"=\"Line 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1143,6 +1153,16 @@ static void test_import(void) if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine9\"=\"Line 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Fix line concatenation tests.
by Alexandre Julliard 02 Dec '16

02 Dec '16

Module: wine Branch: master Commit: 80b884fbef4286ed5555ae46b53f596a90cc5506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b884fbef4286ed5555ae46b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:22 2016 +0000 reg/tests: Fix line concatenation tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bdbf776..d338620 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -927,8 +927,8 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,69,6e,65,20,\ - 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n" @@ -1099,8 +1099,8 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\ - 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine3\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n"

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 December 2016