November 2018 - Wine-Commits

Gabriel Ivăncescu : shell32/autocomplete: Pass the mouse wheel to the auto-suggest listbox, if visible.
by Alexandre Julliard Nov. 8, 2018

Nov. 8, 2018

Module: wine Branch: master Commit: 4234e597ef7e9fbf8e29ab68b0e5b2231b753a02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4234e597ef7e9fbf8e29ab68… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 7 17:14:19 2018 +0200 shell32/autocomplete: Pass the mouse wheel to the auto-suggest listbox, if visible. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 22fc62c..705b28b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -637,6 +637,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); autocomplete_text(This, hwnd, autoappend_flag_yes); return ret; + case WM_MOUSEWHEEL: + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + return SendMessageW(This->hwndListBox, WM_MOUSEWHEEL, wParam, lParam); + break; case WM_SETFONT: if (This->hwndListBox) SendMessageW(This->hwndListBox, WM_SETFONT, wParam, lParam);

1 0

Józef Kucia : include: Use angle-bracket includes consistently.
by Alexandre Julliard Nov. 8, 2018

Nov. 8, 2018

Module: vkd3d Branch: master Commit: be462a932fd97a5237e3889a838449514840d4d7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be462a932fd97a5237e3889… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:30 2018 +0100 include: Use angle-bracket includes consistently. 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> --- include/vkd3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 0965309..3d560b5 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -22,8 +22,8 @@ #include <vkd3d_types.h> #ifndef VKD3D_NO_WIN32_TYPES -# include "vkd3d_windows.h" -# include "vkd3d_d3d12.h" +# include <vkd3d_windows.h> +# include <vkd3d_d3d12.h> #endif /* VKD3D_NO_WIN32_TYPES */ #ifndef VKD3D_NO_VULKAN_H

1 0

Józef Kucia : vkd3d: Handle VKD3D_ERROR_INVALID_SHADER in hresult_from_vkd3d_result().
by Alexandre Julliard Nov. 8, 2018

Nov. 8, 2018

Module: vkd3d Branch: master Commit: 4d149b6f896dc4c3bde02fd55edc6bb5adaac636 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4d149b6f896dc4c3bde02fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:28 2018 +0100 vkd3d: Handle VKD3D_ERROR_INVALID_SHADER in hresult_from_vkd3d_result(). 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> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 05d15b2..a242444 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -410,6 +410,7 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: + case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL;

1 0

Józef Kucia : include: Add STATIC_ASSERT() macro.
by Alexandre Julliard Nov. 8, 2018

Nov. 8, 2018

Module: vkd3d Branch: master Commit: 41ca2469b28a7e93484538e287e0a6c39102c776 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41ca2469b28a7e93484538e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:31 2018 +0100 include: Add STATIC_ASSERT() macro. 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> --- include/private/vkd3d_common.h | 2 ++ libs/vkd3d-shader/dxbc.c | 2 +- libs/vkd3d-shader/spirv.c | 6 +++--- tests/d3d12.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 2e3873b..d097f3d 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -26,6 +26,8 @@ #define DIV_ROUND_UP(a, b) ((a) % (b) == 0 ? (a) / (b) : (a) / (b) + 1) +#define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1]) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index eb1729c..7b03448 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1788,7 +1788,7 @@ static void read_dword(const char **ptr, DWORD *d) static void read_float(const char **ptr, float *f) { - assert(sizeof(float) == sizeof(DWORD)); /* FIXME: use static assert */ + STATIC_ASSERT(sizeof(float) == sizeof(DWORD)); read_dword(ptr, (DWORD *)f); } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c9634ed..1655bf3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6897,10 +6897,10 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ unsigned int i, count; DWORD variable_idx; - function_id = compiler->epilogue_function_id; + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); + STATIC_ASSERT(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); - assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); - assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); + function_id = compiler->epilogue_function_id; void_id = vkd3d_spirv_get_op_type_void(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 4); diff --git a/tests/d3d12.c b/tests/d3d12.c index b50723b..c855e9c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7786,7 +7786,7 @@ static void test_shader_instructions(void) }, }; - assert(sizeof(tests->input) == sizeof(uint_tests->input)); + STATIC_ASSERT(sizeof(tests->input) == sizeof(uint_tests->input)); memset(&desc, 0, sizeof(desc)); desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;

1 0

Józef Kucia : include: Move vkd3d_result to common header.
by Alexandre Julliard Nov. 8, 2018

Nov. 8, 2018

Module: vkd3d Branch: master Commit: f732501a1449da66b2c6aaf5ab3bf77f5cf67d9c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f732501a1449da66b2c6aaf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:29 2018 +0100 include: Move vkd3d_result to common header. 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> --- Makefile.am | 1 + include/vkd3d.h | 4 ++-- include/vkd3d_shader.h | 16 ++-------------- include/vkd3d_types.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1116718..c2a20c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ vkd3d_public_headers = \ include/vkd3d_dxgibase.h \ include/vkd3d_dxgiformat.h \ include/vkd3d_shader.h \ + include/vkd3d_types.h \ include/vkd3d_utils.h \ include/vkd3d_windows.h diff --git a/include/vkd3d.h b/include/vkd3d.h index de80542..0965309 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -19,6 +19,8 @@ #ifndef __VKD3D_H #define __VKD3D_H +#include <vkd3d_types.h> + #ifndef VKD3D_NO_WIN32_TYPES # include "vkd3d_windows.h" # include "vkd3d_d3d12.h" @@ -32,8 +34,6 @@ extern "C" { #endif /* __cplusplus */ -#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff - enum vkd3d_structure_type { VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index f96e505..20ed0fb 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -19,12 +19,12 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H +#include <vkd3d_types.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff - enum vkd3d_shader_structure_type { VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, @@ -34,18 +34,6 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; -enum vkd3d_result -{ - VKD3D_OK = 0, - VKD3D_ERROR = -1, /* unspecified failure */ - VKD3D_ERROR_OUT_OF_MEMORY = -2, - VKD3D_ERROR_INVALID_ARGUMENT = -3, - VKD3D_ERROR_INVALID_SHADER = -4, - VKD3D_ERROR_NOT_IMPLEMENTED = -5, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), -}; - enum vkd3d_shader_compiler_option { VKD3D_SHADER_STRIP_DEBUG = 0x00000001, diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h new file mode 100644 index 0000000..34c6674 --- /dev/null +++ b/include/vkd3d_types.h @@ -0,0 +1,44 @@ +/* + * Copyright 2016-2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_TYPES_H +#define __VKD3D_TYPES_H + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff + +enum vkd3d_result +{ + VKD3D_OK = 0, + VKD3D_ERROR = -1, /* unspecified failure */ + VKD3D_ERROR_OUT_OF_MEMORY = -2, + VKD3D_ERROR_INVALID_ARGUMENT = -3, + VKD3D_ERROR_INVALID_SHADER = -4, + VKD3D_ERROR_NOT_IMPLEMENTED = -5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), +}; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __VKD3D_TYPES_H */

1 0

Józef Kucia : include: Avoid bitfields in public structures.
by Alexandre Julliard Nov. 8, 2018

Nov. 8, 2018

Module: vkd3d Branch: master Commit: bf227d4a2887a00c52ece0e8cd7c63dc3f0a68e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bf227d4a2887a00c52ece0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 8 17:19:32 2018 +0100 include: Avoid bitfields in public structures. 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> --- include/private/vkd3d_common.h | 2 ++ include/vkd3d_shader.h | 7 ++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d097f3d..d942acf 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -28,6 +28,8 @@ #define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1]) +#define MEMBER_SIZE(t, m) sizeof(((t *)0)->m) + static inline size_t align(size_t addr, size_t alignment) { return (addr + (alignment - 1)) & ~(alignment - 1); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20ed0fb..c0d1f65 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -365,6 +365,7 @@ enum vkd3d_root_signature_version int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +/* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 struct vkd3d_shader_scan_info @@ -372,9 +373,9 @@ struct vkd3d_shader_scan_info enum vkd3d_shader_structure_type type; void *next; - unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - unsigned int sampler_comparison_mode_mask; + unsigned int uav_read_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ + unsigned int uav_counter_mask; /* VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS */ + unsigned int sampler_comparison_mode_mask; /* 16 */ }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5e292c7..37aee0f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -18,6 +18,9 @@ #include "vkd3d_shader_private.h" +STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_counter_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); +STATIC_ASSERT(MEMBER_SIZE(struct vkd3d_shader_scan_info, uav_read_mask) * CHAR_BIT >= VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS); + struct vkd3d_shader_parser { struct vkd3d_shader_desc shader_desc;

1 0

Jacek Caban : user32: Allow scrollbar control to store scroll info in subclassed window.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 8c8701befb785b93a1ca6e42241f0b112ffd7069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c8701befb785b93a1ca6e42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 6 13:31:22 2018 +0100 user32: Allow scrollbar control to store scroll info in subclassed window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46004 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45966 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 35 +++++++++++++++++++++++++++++------ dlls/user32/tests/scroll.c | 1 - 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 30a0cd9..37095df 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -50,6 +50,14 @@ typedef struct SCROLLBAR_INFO vert; } WINSCROLLBAR_INFO, *LPWINSCROLLBAR_INFO; +typedef struct +{ + DWORD magic; + SCROLLBAR_INFO info; +} SCROLLBAR_WNDDATA; + +#define SCROLLBAR_MAGIC 0x5c6011ba + /* Minimum size of the rectangle between the arrows */ #define SCROLL_MIN_RECT 4 @@ -118,7 +126,7 @@ const struct builtin_class_descr SCROLL_builtin_class = scrollbarW, /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ WINPROC_SCROLLBAR, /* proc */ - sizeof(SCROLLBAR_INFO), /* extra */ + sizeof(SCROLLBAR_WNDDATA), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ }; @@ -159,8 +167,13 @@ static SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) if (wndPtr->pScroll) infoPtr = &((LPWINSCROLLBAR_INFO)wndPtr->pScroll)->vert; break; case SB_CTL: - if (get_class_winproc( wndPtr->class ) == BUILTIN_WINPROC( WINPROC_SCROLLBAR )) - infoPtr = (SCROLLBAR_INFO *)wndPtr->wExtra; + if (wndPtr->cbWndExtra >= sizeof(SCROLLBAR_WNDDATA)) + { + SCROLLBAR_WNDDATA *data = (SCROLLBAR_WNDDATA*)wndPtr->wExtra; + if (data->magic == SCROLLBAR_MAGIC) + infoPtr = &data->info; + } + if (!infoPtr) WARN("window is not a scrollbar control\n"); break; case SB_BOTH: WARN("with SB_BOTH\n"); @@ -1131,18 +1144,28 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) */ static void SCROLL_CreateScrollBar(HWND hwnd, LPCREATESTRUCTW lpCreate) { - LPSCROLLBAR_INFO info = SCROLL_GetInternalInfo(hwnd, SB_CTL, TRUE); - if (!info) return; + LPSCROLLBAR_INFO info = NULL; + WND *win; TRACE("hwnd=%p lpCreate=%p\n", hwnd, lpCreate); + win = WIN_GetPtr(hwnd); + if (win->cbWndExtra >= sizeof(SCROLLBAR_WNDDATA)) + { + SCROLLBAR_WNDDATA *data = (SCROLLBAR_WNDDATA*)win->wExtra; + data->magic = SCROLLBAR_MAGIC; + info = &data->info; + } + else WARN("Not enough extra data\n"); + WIN_ReleasePtr(win); + if (!info) return; + if (lpCreate->style & WS_DISABLED) { info->flags = ESB_DISABLE_BOTH; TRACE("Created WS_DISABLED scrollbar\n"); } - if (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX)) { if (lpCreate->style & SBS_SIZEBOXTOPLEFTALIGN) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 1ff9b39..43d4720 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -640,7 +640,6 @@ static void test_subclass(void) memset(&scroll_info, 0xcc, sizeof(scroll_info)); scroll_info.cbSize = sizeof(scroll_info); res = SendMessageA(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)&scroll_info); - todo_wine ok(res == 1, "SBM_GETSCROLLBARINFO returned %lu\n", res); DestroyWindow(hwnd);

1 0

Nikolay Sivov : dwrite/tests: Test run bidi level too.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: a090314c723354bebb0992ec05ef33a60fd685fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a090314c723354bebb0992ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 15:38:31 2018 +0300 dwrite/tests: Test run bidi level too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a117ca0..6aaf792 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -311,6 +311,7 @@ struct drawcall_entry { WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ WCHAR locale[LOCALE_NAME_MAX_LENGTH]; UINT32 glyphcount; /* only meaningful for DrawGlyphRun() */ + UINT32 bidilevel; }; struct drawcall_sequence @@ -432,6 +433,17 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, ok_(file, line) (expected->glyphcount == actual->glyphcount, "%s: wrong glyph count, %u was expected, but got %u instead\n", context, expected->glyphcount, actual->glyphcount); + + if (expected->bidilevel != actual->bidilevel && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: wrong bidi level, %u was expected, but got %u instead\n", + context, expected->bidilevel, actual->bidilevel); + } + else + ok_(file, line) (expected->bidilevel == actual->bidilevel, + "%s: wrong bidi level, %u was expected, but got %u instead\n", + context, expected->bidilevel, actual->bidilevel); } else if ((expected->kind & DRAW_KINDS_MASK) == DRAW_UNDERLINE) { int cmp = lstrcmpW(expected->locale, actual->locale); @@ -606,6 +618,7 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, ok(lstrlenW(descr->localeName) < LOCALE_NAME_MAX_LENGTH, "unexpectedly long locale name\n"); lstrcpyW(entry.locale, descr->localeName); entry.glyphcount = run->glyphCount; + entry.bidilevel = run->bidiLevel; add_call(sequences, RENDERER_ID, &entry); return S_OK; } @@ -1681,14 +1694,22 @@ static const struct drawcall_entry draw_single_run_seq[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_reordered_run_seq[] = { +static const struct drawcall_entry draw_ltr_reordered_run_seq[] = { { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6 }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7 }, - { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_rtl_reordered_run_seq[] = { + { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6, 2 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, + { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1, 1 }, + { DRAW_LAST_KIND } +}; + static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, @@ -1887,10 +1908,21 @@ todo_wine ctxt.use_gdi_natural = FALSE; ctxt.snapping_disabled = TRUE; + hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_ltr_reordered_run_seq, "draw test 11", FALSE); + + hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); + ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); + flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_reordered_run_seq, "draw test 11", FALSE); + ok_sequence(sequences, RENDERER_ID, draw_rtl_reordered_run_seq, "draw test 12", FALSE); IDWriteTextLayout_Release(layout);

1 0

Dmitry Timoshkov : server: Don' t stop processing change notifications when name length is 0.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 48e5273cd5487b2e4b5149bb8b32916de417c0cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e5273cd5487b2e4b5149bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:05:43 2018 +0300 server: Don't stop processing change notifications when name length is 0. It's legitimate to receive a notification with len = 0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/change.c b/server/change.c index d00a885..3335e7a 100644 --- a/server/change.c +++ b/server/change.c @@ -949,11 +949,9 @@ static void inotify_poll_event( struct fd *fd, int event ) for( ofs = 0; ofs < r - offsetof(struct inotify_event, name); ) { ie = (struct inotify_event*) &buffer[ofs]; - if (!ie->len) - break; ofs += offsetof( struct inotify_event, name[ie->len] ); if (ofs > r) break; - inotify_notify_all( ie ); + if (ie->len) inotify_notify_all( ie ); } }

1 0

Louis Lenders : ntoskrnl.exe: Add stub for KeSetTargetProcessorDpc.
by Alexandre Julliard Nov. 7, 2018

Nov. 7, 2018

Module: wine Branch: master Commit: 52ed78883898bb10e1c8af85804f389928a976c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ed78883898bb10e1c8af85… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 6 13:10:17 2018 +0100 ntoskrnl.exe: Add stub for KeSetTargetProcessorDpc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46040 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4a5ac16..e9e3afa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2845,6 +2845,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI } /*********************************************************************** + * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetTargetProcessorDpc(PRKDPC dpc, CCHAR number) +{ + FIXME("%p, %d stub\n", dpc, number); +} + +/*********************************************************************** * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) */ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Count) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 76d8fb3..5987c52 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -620,7 +620,7 @@ @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql @ stdcall KeSetSystemAffinityThread(long) -@ stub KeSetTargetProcessorDpc +@ stdcall KeSetTargetProcessorDpc(ptr long) @ stub KeSetTimeIncrement @ stub KeSetTimer @ stdcall KeSetTimerEx(ptr int64 long ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e76ccc9..fdf035d 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *);

1 0