November 2017 - Wine-commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_DrawIndexedInstancedIndirect().
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 8151875fcbf5355e9ea4c1b84b022edc874bb370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8151875fcbf5355e9ea4c1b84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:44 2017 +0100 d3d11: Implement d3d11_immediate_context_DrawIndexedInstancedIndirect(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c216b07..7a8f3df 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -842,7 +842,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawAuto(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstancedIndirect(ID3D11DeviceContext *iface, ID3D11Buffer *buffer, UINT offset) { - FIXME("iface %p, buffer %p, offset %u stub!\n", iface, buffer, offset); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_buffer *d3d_buffer; + + TRACE("iface %p, buffer %p, offset %u.\n", iface, buffer, offset); + + d3d_buffer = unsafe_impl_from_ID3D11Buffer(buffer); + + wined3d_mutex_lock(); + wined3d_device_draw_indexed_primitive_instanced_indirect(device->wined3d_device, + d3d_buffer->wined3d_buffer, offset); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D11DeviceContext *iface,

1 0

Michael Müller : wined3d: Add support for start instance in draw_primitive_arrays().
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: deae0044f4d7e3432871d89cba259f4d942d17d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deae0044f4d7e3432871d89cb… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Nov 1 22:08:45 2017 +0100 wined3d: Add support for start instance in draw_primitive_arrays(). 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 | 5 +++++ dlls/wined3d/drawprim.c | 16 +++++++++++++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eae7505..ef3a7fd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -109,6 +109,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, /* ARB */ + {"GL_ARB_base_instance", ARB_BASE_INSTANCE }, {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, @@ -2686,6 +2687,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_APPLE_flush_buffer_range */ USE_GL_FUNC(glBufferParameteriAPPLE) USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) + /* GL_ARB_base_instance */ + USE_GL_FUNC(glDrawArraysInstancedBaseInstance) + USE_GL_FUNC(glDrawElementsInstancedBaseVertexBaseInstance) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) @@ -3881,6 +3885,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, + {ARB_BASE_INSTANCE, MAKEDWORD_VERSION(4, 2)}, {ARB_CONSERVATIVE_DEPTH, MAKEDWORD_VERSION(4, 2)}, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 67fca62..a7ca748 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -69,18 +69,32 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct return; } - if (start_instance) + if (start_instance && !(gl_info->supported[ARB_BASE_INSTANCE] && gl_info->supported[ARB_INSTANCED_ARRAYS])) FIXME("Start instance (%u) not supported.\n", start_instance); if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { if (!idx_size) { + if (gl_info->supported[ARB_BASE_INSTANCE]) + { + GL_EXTCALL(glDrawArraysInstancedBaseInstance(state->gl_primitive_type, start_idx, count, instance_count, start_instance)); + checkGLcall("glDrawArraysInstancedBaseInstance"); + return; + } + GL_EXTCALL(glDrawArraysInstanced(state->gl_primitive_type, start_idx, count, instance_count)); checkGLcall("glDrawArraysInstanced"); return; } + if (gl_info->supported[ARB_BASE_INSTANCE]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(state->gl_primitive_type, count, idx_type, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_idx, start_instance)); + checkGLcall("glDrawElementsInstancedBaseVertexBaseInstance"); + return; + } if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { GL_EXTCALL(glDrawElementsInstancedBaseVertex(state->gl_primitive_type, count, idx_type, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 47f3770..f676b2f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -42,6 +42,7 @@ enum wined3d_gl_extension APPLE_FLUSH_BUFFER_RANGE, APPLE_YCBCR_422, /* ARB */ + ARB_BASE_INSTANCE, ARB_BLEND_FUNC_EXTENDED, ARB_CLEAR_BUFFER_OBJECT, ARB_CLEAR_TEXTURE,

1 0

Józef Kucia : include/d3d11: Add definitions for indirect draw arguments.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 792f42f6d3960ba128991315ea91a7d1f6cd966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=792f42f6d3960ba128991315e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:46 2017 +0100 include/d3d11: Add definitions for indirect draw arguments. 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/d3d11.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index ba2cad8..a7b9812 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -2101,6 +2101,23 @@ typedef struct D3D11_QUERY_DATA_PIPELINE_STATISTICS UINT64 CSInvocations; } D3D11_QUERY_DATA_PIPELINE_STATISTICS; +typedef struct D3D11_DRAW_INSTANCED_INDIRECT_ARGS +{ + UINT VertexCountPerInstance; + UINT InstanceCount; + UINT StartVertexLocation; + UINT StartInstanceLocation; +} D3D11_DRAW_INSTANCED_INDIRECT_ARGS; + +typedef struct D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS +{ + UINT IndexCountPerInstance; + UINT InstanceCount; + UINT StartIndexLocation; + INT BaseVertexLocation; + UINT StartInstanceLocation; +} D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS; + typedef struct D3D11_AUTHENTICATED_CONFIGURE_INPUT { D3D11_OMAC omac;

1 0

Józef Kucia : wined3d: Add support for R8_UNORM vertex format.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 5b3b1aa238773f94ae3a0e0b11d30af1809b4416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3b1aa238773f94ae3a0e0b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:47 2017 +0100 wined3d: Add support for R8_UNORM vertex 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/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0d54334..2a12a91 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -405,6 +405,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_TRUE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE},

1 0

Józef Kucia : d3d11/tests: Add test for SV_InstanceID.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: dfbcc93da34f6b628838353d4a87d10149fb5ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbcc93da34f6b628838353d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 1 22:08:48 2017 +0100 d3d11/tests: Add test for SV_InstanceID. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 268 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 256 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfbcc93da34f6b6288383…

1 0

Józef Kucia : wined3d: Add 4.4 to supported OpenGL versions.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 6a0546da92e7607e8013a3c26bc2151e2efc6884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0546da92e7607e8013a3c26… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 2 11:39:28 2017 +0100 wined3d: Add 4.4 to supported OpenGL versions. We have a more efficient codepath for SM4+ interpolation modifiers if GLSL 4.40 is available. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef3a7fd..c89d556 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6515,6 +6515,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, { static const DWORD supported_gl_versions[] = { + MAKEDWORD_VERSION(4, 4), MAKEDWORD_VERSION(3, 2), MAKEDWORD_VERSION(1, 0), };

1 0

Nikolay Sivov : dwrite: Set lfItalic style to get more compatible results for gdiinterop.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: e5276c766b25d19c35e5dd2e0394e9d336db4410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5276c766b25d19c35e5dd2e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 13:15:34 2017 +0300 dwrite: Set lfItalic style to get more compatible results for gdiinterop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4f570f5..18fb00b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1375,6 +1375,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->style = DWRITE_FONT_STYLE_OBLIQUE; else if (fsSelection & OS2_FSSELECTION_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); @@ -1404,12 +1405,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (macStyle & TT_HEAD_MACSTYLE_BOLD) props->weight = DWRITE_FONT_WEIGHT_BOLD; - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) { props->style = DWRITE_FONT_STYLE_ITALIC; + props->lf.lfItalic = 1; + } } props->lf.lfWeight = props->weight; - props->lf.lfItalic = props->style == DWRITE_FONT_STYLE_ITALIC; TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);

1 0

Zhiyi Zhang : kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 1354c0f3e4d4c46218a8657bb89cc0c25f102606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1354c0f3e4d4c46218a8657bb… Author: Zhiyi Zhang <gd.yi(a)139.com> Date: Wed Nov 1 22:26:38 2017 +0800 kernel32/tests: Add more tests for LocaleNameToLCID and LCIDToLocalName. Signed-off-by: Zhiyi Zhang <gd.yi(a)139.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 86fcc33..11a5788 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2779,7 +2779,7 @@ static void test_LocaleNameToLCID(void) ptr++; } - /* zh-Hant */ + /* zh-Hant has LCID 0x7c04, but LocaleNameToLCID actually returns 0x0c04, which is the LCID of zh-HK */ lcid = pLocaleNameToLCID(zhHantW, 0); todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHantW), lcid); @@ -2787,6 +2787,11 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); + /* check that 0x7c04 also works and is mapped to zh-HK */ + ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_CHINESE_TRADITIONAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); + todo_wine ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); + todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* zh-hant */ lcid = pLocaleNameToLCID(zhhantW, 0); @@ -2798,14 +2803,20 @@ static void test_LocaleNameToLCID(void) todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhantW), wine_dbgstr_w(buffer)); - /* zh-Hans */ + /* zh-Hans has LCID 0x0004, but LocaleNameToLCID actually returns 0x0804, which is the LCID of zh-CN */ lcid = pLocaleNameToLCID(zhHansW, 0); + /* check that LocaleNameToLCID actually returns 0x0804 */ todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); + /* check that 0x0004 also works and is mapped to zh-CN */ + ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE, SUBLANG_NEUTRAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); + ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); /* zh-hans */ lcid = pLocaleNameToLCID(zhhansW, 0);

1 0

Alex Henrie : vbscript/tests: Fix test for WeekDayName(foo, bar, 0).
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 4438b2706b5dad21e9aa8dd29d19be9c5e1a0c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4438b2706b5dad21e9aa8dd29… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 14:12:21 2017 +0100 vbscript/tests: Fix test for WeekDayName(foo, bar, 0). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 4 +++- dlls/vbscript/tests/run.c | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 95ef84f..baa0553 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -594,7 +594,6 @@ if isEnglishLang then Call ok(WeekDayName(1, false) = "Sunday", "WeekDayName(1, false) = " & WeekDayName(1, false)) Call ok(WeekDayName(1, true) = "Sun", "WeekDayName(1, true) = " & WeekDayName(1, true)) Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) - Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) Call ok(WeekDayName(1, true, 2.5) = "Mon", "WeekDayName(1, true, 2.5) = " & WeekDayName(1, true, 2.5)) Call ok(WeekDayName(1, true, 1.5) = "Mon", "WeekDayName(1, true, 1.5) = " & WeekDayName(1, true, 1.5)) @@ -609,6 +608,9 @@ if isEnglishLang then Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true)) end if +Call ok(WeekDayName(1, true, 0) = WeekDayName(1, true, firstDayOfWeek), _ + "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) + Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) Call ok(vbOKOnly = 0, "vbOKOnly = " & vbOKOnly) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 81b1ced..7c97db2 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -123,6 +123,7 @@ DEFINE_EXPECT(OnScriptError); #define DISPID_GLOBAL_LETOBJ 1018 #define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_GLOBAL_TODO_WINE_OK 1020 +#define DISPID_GLOBAL_WEEKSTARTDAY 1021 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -136,6 +137,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check, is_english, allow_ui; +static int first_day_of_week; static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; @@ -204,27 +206,23 @@ static const char *vt2a(VARIANT *v) } } -/* Returns true if the user interface is in English. Note that this does not - * presume of the formatting of dates, numbers, etc. +/* Sets is_english to true if the user interface is in English. Note that this + * does not presume the formatting of dates, numbers, etc. + * Sets first_day_of_week to 1 if Sunday, 2 if Monday, and so on. */ -static BOOL is_lang_english(void) +static void detect_locale(void) { - static HMODULE hkernel32 = NULL; - static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; - static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); + LANGID (WINAPI *pGetThreadUILanguage)(void) = (void*)GetProcAddress(kernel32, "GetThreadUILanguage"); - if (!hkernel32) - { - hkernel32 = GetModuleHandleA("kernel32.dll"); - pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); - pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); - } - if (pGetThreadUILanguage && PRIMARYLANGID(pGetThreadUILanguage()) != LANG_ENGLISH) - return FALSE; - if (pGetUserDefaultUILanguage && PRIMARYLANGID(pGetUserDefaultUILanguage()) != LANG_ENGLISH) - return FALSE; + is_english = ((!pGetThreadUILanguage || PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH) && + PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && + PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; + GetLocaleInfoA(pGetThreadUILanguage ? pGetThreadUILanguage() : GetUserDefaultUILanguage(), + LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + (void*)&first_day_of_week, sizeof(first_day_of_week)); + first_day_of_week = 1 + (first_day_of_week + 1) % 7; } static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) @@ -1010,6 +1008,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLANG; return S_OK; } + if(!strcmp_wa(bstrName, "firstDayOfWeek")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_WEEKSTARTDAY; + return S_OK; + } if(!strcmp_wa(bstrName, "testObj")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_TESTOBJ; @@ -1183,6 +1186,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_BOOL(pvarRes) = is_english ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; + case DISPID_GLOBAL_WEEKSTARTDAY: + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = first_day_of_week; + return S_OK; + case DISPID_GLOBAL_VBVAR: CHECK_EXPECT(global_vbvar_i); @@ -2355,7 +2363,7 @@ START_TEST(run) int argc; char **argv; - is_english = is_lang_english(); + detect_locale(); if(!is_english) skip("Skipping some tests in non-English locale\n");

1 0

Andrey Gusev : hidclass.sys: Remove check for negative value.
by Alexandre Julliard 02 Nov '17

02 Nov '17

Module: wine Branch: master Commit: 495ade93baa2ed13248a4a0e42cb35fda012bcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=495ade93baa2ed13248a4a0e4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 1 18:41:37 2017 +0200 hidclass.sys: Remove check for negative value. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index ee13055..6b84997 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -440,10 +440,8 @@ static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, static void parse_collection(unsigned int bSize, int itemVal, struct collection *collection) { - if (bSize <= 0) - return; - else - { + if (bSize) + { collection->type = itemVal; if (itemVal >= 0x07 && itemVal <= 0x7F) {

1 0