February 2017 - Wine-Commits

Hans Leidekker : credui: Split domain from username in SspiPromptForCredentialsW.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 848f478091ed83b19e082af1ea451bf4ac06d5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=848f478091ed83b19e082af1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 1 14:18:48 2017 +0100 credui: Split domain from username in SspiPromptForCredentialsW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b85129a..0da4643 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -910,23 +910,45 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, len_username, password, len_password, save, flags ))) { - DWORD size = sizeof(*id); - WCHAR *ptr; + DWORD size = sizeof(*id), len_domain = 0; + WCHAR *ptr, *user = username, *domain = NULL; - len_username = strlenW( username ); + if ((ptr = strchrW( username, '\\' ))) + { + user = ptr + 1; + len_username = strlenW( user ); + if (!strcmpiW( package, ntlmW ) || !strcmpiW( package, negotiateW )) + { + domain = username; + len_domain = ptr - username; + } + *ptr = 0; + } + else len_username = strlenW( username ); len_password = strlenW( password ); size += (len_username + 1) * sizeof(WCHAR); + size += (len_domain + 1) * sizeof(WCHAR); size += (len_password + 1) * sizeof(WCHAR); if (!(id = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; ptr = (WCHAR *)(id + 1); - memcpy( ptr, username, (len_username + 1) * sizeof(WCHAR) ); + memcpy( ptr, user, (len_username + 1) * sizeof(WCHAR) ); id->User = ptr; id->UserLength = len_username; ptr += len_username + 1; - id->Domain = NULL; - id->DomainLength = 0; + if (len_domain) + { + memcpy( ptr, domain, (len_domain + 1) * sizeof(WCHAR) ); + id->Domain = ptr; + id->DomainLength = len_domain; + ptr += len_domain + 1; + } + else + { + id->Domain = NULL; + id->DomainLength = 0; + } memcpy( ptr, password, (len_password + 1) * sizeof(WCHAR) ); id->Password = ptr; id->PasswordLength = len_password;

1 0

Hans Leidekker : wbemprox: Don't define USE_WS_PREFIX on MinGW.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: d11a07ec7c4247ea8c3de78cc09aee8f2c7d7298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11a07ec7c4247ea8c3de78cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 1 14:18:49 2017 +0100 wbemprox: Don't define USE_WS_PREFIX on MinGW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 - dlls/wbemprox/builtin.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index e6dc995..f411898 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DUSE_WS_PREFIX MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 14e819e..0976306 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -31,8 +31,17 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "winsock2.h" -#include "ws2tcpip.h" +#ifdef __MINGW32__ +# include "winsock2.h" +# include "ws2tcpip.h" +# define WS_AF_UNSPEC AF_UNSPEC +# define WS_NI_MAXHOST NI_MAXHOST +# define WS_NI_NAMEREQD NI_NAMEREQD +#else +# define USE_WS_PREFIX +# include "winsock2.h" +# include "ws2tcpip.h" +#endif #include "initguid.h" #include "wbemcli.h" #include "wbemprov.h"

1 0

Józef Kucia : wined3d: Factor out release_shader_resources() function.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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: Introduce wined3d_device_set_cs_cb().
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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

Young Chung : ucrtbase: Add __conio_common_vcprintf()/_vcwprintf().
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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

Nikolay Sivov : dwrite/tests: Line metrics tests with uniform spacing.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: eb7edb249b80781e738fc805f8a317f32a381dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7edb249b80781e738fc805f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:54:42 2017 +0300 dwrite/tests: Line metrics tests with uniform spacing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 15274b9..741fc3e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3624,6 +3624,21 @@ static void test_GetLineMetrics(void) ok(metrics[3].height == metrics[1].height, "got %f, old %f\n", metrics[3].height, metrics[1].height); ok(metrics[3].baseline == metrics[1].baseline, "got %f, old %f\n", metrics[3].baseline, metrics[1].baseline); + /* Switch to uniform spacing */ + hr = IDWriteTextLayout_SetLineSpacing(layout, DWRITE_LINE_SPACING_METHOD_UNIFORM, 456.0f, 123.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %u\n", count); + + for (i = 0; i < count; i++) { + todo_wine { + ok(metrics[i].height == 456.0f, "%u: got line height %f\n", i, metrics[i].height); + ok(metrics[i].baseline == 123.0f, "%u: got line baseline %f\n", i, metrics[i].baseline); + } + } + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Jacek Caban : inetcomm: Added support for binding mhtml protocol handler.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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

Michael Stefaniuc : msvcrt/tests: Use NULL instead of casting 0.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 6fadcca527f8d4a9766ebc759d2e43fe16e97141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fadcca527f8d4a9766ebc759… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 1 10:47:20 2017 +0100 msvcrt/tests: Use NULL instead of casting 0. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index a6d2833..017ae77 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -562,7 +562,7 @@ static void test_thread_handle_close(void) DWORD ret; /* _beginthread: handle is not closed on ExitThread and _endthreadex */ - hThread = (HANDLE)_beginthread(test_thread_func, 0, (void*)0); + hThread = (HANDLE)_beginthread(test_thread_func, 0, NULL); ok(hThread != INVALID_HANDLE_VALUE, "_beginthread failed (%d)\n", errno); WaitForSingleObject(hThread, INFINITE); ret = CloseHandle(hThread);

1 0

Nikolay Sivov : comctl32/propsheet: Force wizard header if any of pages has title/subtitle.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 6eafebedb88ccd00aac6b838fd9d882c94ae61b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eafebedb88ccd00aac6b838f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:17:03 2017 +0300 comctl32/propsheet: Force wizard header if any of pages has title/subtitle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 1809b86..4c04dfe 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -486,6 +486,9 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, width = (WORD)*p; p++; height = (WORD)*p; p++; + if (lppsp->dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) + psInfo->ppshheader.dwFlags |= PSH_HEADER; + /* Special calculation for interior wizard pages so the largest page is * calculated correctly. We need to add all the padding and space occupied * by the header so the width and height sums up to the whole wizard client

1 0

Nikolay Sivov : dwrite/tests: More spacing tests with isDiacritic.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 9350e57322e7228c7133d097db69e8ea251e47bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9350e57322e7228c7133d097d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 07:54:41 2017 +0300 dwrite/tests: More spacing tests with isDiacritic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 3263d0b..a0dbb186 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1759,6 +1759,21 @@ static const struct spacing_test spacing_tests[] = { { 0.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 11.0 }, { 2.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, /* 40 */ { 1.0, -10.0, -5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 0.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 0, 1, 0 }, { 0 } } }, { -10.0, 1.0, 5.0, { 8.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { -1.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + /* isDiacritic */ + { 1.0, 0.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 11.0, 12.0 }, { 3.0, 4.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, + { 1.0, 1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 12.0, 13.0 }, { 3.0, 4.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, + { 1.0, -1.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 10.0, 11.0 }, { 3.0, 4.0 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, /* 45 */ + { 0.0, -10.0, 0.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 1.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, + { -5.0, -4.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 5.0 }, { -1.0, -0.5 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, + { -5.0, -5.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 5.0 }, { -0.5, 0.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 }} }, + { 2.0, 0.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 7.0, 7.0 }, { 6.0, 6.5 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, + { 2.0, 1.0, 5.0, { 1.0, 2.0 }, { 2.0, 3.0 }, { 8.0, 8.0 }, { 6.0, 6.5 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, /* 50 */ + { 2.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 7.0, 7.0 }, { 4.0, 5.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 } } }, + { 1.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 11.0 }, { 3.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 0, 1, 0 } } }, + { -10.0, 1.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 6.0 }, { -3.0, -3.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0, 0, 1, 0, 0 } } }, + { 0.0, -10.0, 5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 5.0, 5.0 }, { 2.0, 3.0 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, + { 1.0, -10.0, -5.0, { 10.0, 11.0 }, { 2.0, 3.0 }, { 0.0, 0.0 }, { 2.0, 3.0 }, FALSE, { { 0, 0, 1, 0, 0 }, { 0 } } }, /* 55 */ + { -10.0, 1.0, 5.0, { 8.0, 11.0 }, { 2.0, 3.0 }, { 6.0, 6.0 }, { -1.0, -3.0 }, FALSE, { { 0 }, { 0, 0, 1, 0, 0 } } }, }; static void test_ApplyCharacterSpacing(void)

1 0