October 2016 - Wine-commits

Matteo Bruni : wined3d: Add ARB_clip_control extension.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 94956da913dfe49047aa81f8468e80eb3a495e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94956da913dfe49047aa81f84… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:55 2016 +0200 wined3d: Add ARB_clip_control extension. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b4394b8..b03ddf6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -109,6 +109,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, @@ -2580,6 +2581,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_clip_control */ + USE_GL_FUNC(glClipControl) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) /* GL_ARB_copy_buffer */ @@ -3607,6 +3610,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 57fbea4..b71190d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension APPLE_YCBCR_422, /* ARB */ ARB_BLEND_FUNC_EXTENDED, + ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT,

1 0

Matteo Bruni : wined3d: Use ARB_clip_control to avoid vertex position fixups.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: a5d2b3622b7b4f731075d9cd62c76c64c468666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d2b3622b7b4f731075d9cd6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:56 2016 +0200 wined3d: Use ARB_clip_control to avoid vertex position fixups. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++---------- dlls/wined3d/context.c | 15 ++++++++-- dlls/wined3d/directx.c | 17 +++++++++++ dlls/wined3d/glsl_shader.c | 26 +++++++++++----- dlls/wined3d/state.c | 63 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 26 +++++++++------- 6 files changed, 143 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5d2b3622b7b4f731075d…

1 0

Piotr Caban : msvcp110: Fix cin/cout/cerr/clog structure sizes.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 3ba26d38eb38ca32ea23c76c2c50f2a412730d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba26d38eb38ca32ea23c76c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 4 10:09:58 2016 +0200 msvcp110: Fix cin/cout/cerr/clog structure sizes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f673bc1..84a6bf2c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15138,8 +15138,12 @@ static basic_filebuf_char filebuf_char_stdin; /* ?cin(a)std@@3V?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_istream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } cin = { { 0 } }; +C_ASSERT(sizeof(cin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_cin(a)std@@3PAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_cin(a)std@@3PEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_istream_char *_Ptr_cin = &cin.obj; @@ -15148,8 +15152,12 @@ static basic_filebuf_wchar filebuf_short_stdin; /* ?wcin(a)std@@3V?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_istream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } ucin = { { 0 } }; +C_ASSERT(sizeof(ucin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcin(a)std@@3PAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wcin(a)std@@3PEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_istream_wchar *_Ptr_ucin = &ucin.obj; @@ -15158,8 +15166,12 @@ static basic_filebuf_wchar filebuf_wchar_stdin; /* ?wcin(a)std@@3V?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_istream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wcin = { { 0 } }; +C_ASSERT(sizeof(wcin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcin(a)std@@3PAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wcin(a)std@@3PEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_istream_wchar *_Ptr_wcin = &wcin.obj; @@ -15168,8 +15180,12 @@ static basic_filebuf_char filebuf_char_stdout; /* ?cout(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_ostream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } cout = { { 0 } }; +C_ASSERT(sizeof(cout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_cout(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_cout(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_cout = &cout.obj; @@ -15178,8 +15194,12 @@ static basic_filebuf_wchar filebuf_short_stdout; /* ?wcout(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } ucout = { { 0 } }; +C_ASSERT(sizeof(ucout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcout(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wcout(a)std@@3PEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_ucout = &ucout.obj; @@ -15188,8 +15208,12 @@ static basic_filebuf_wchar filebuf_wchar_stdout; /* ?wcout(a)std@@3V?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wcout = { { 0 } }; +C_ASSERT(sizeof(wcout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcout(a)std@@3PAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wcout(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wcout = &wcout.obj; @@ -15198,8 +15222,12 @@ static basic_filebuf_char filebuf_char_stderr; /* ?cerr(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_ostream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } cerr = { { 0 } }; +C_ASSERT(sizeof(cerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_cerr(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_cerr(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_cerr = &cerr.obj; @@ -15208,8 +15236,12 @@ static basic_filebuf_wchar filebuf_short_stderr; /* ?wcerr(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } ucerr = { { 0 } }; +C_ASSERT(sizeof(ucerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcerr(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wcerr(a)std@@3PEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_ucerr = &ucerr.obj; @@ -15218,8 +15250,12 @@ static basic_filebuf_wchar filebuf_wchar_stderr; /* ?wcerr(a)std@@3V?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wcerr = { { 0 } }; +C_ASSERT(sizeof(wcerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcerr(a)std@@3PAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wcerr(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wcerr = &wcerr.obj; @@ -15228,8 +15264,12 @@ static basic_filebuf_char filebuf_char_log; /* ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_ostream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } clog = { { 0 } }; +C_ASSERT(sizeof(clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_clog = &clog.obj; @@ -15238,8 +15278,12 @@ static basic_filebuf_wchar filebuf_short_log; /* ?wclog(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } uclog = { { 0 } }; +C_ASSERT(sizeof(uclog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wclog(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wclog(a)std@@3PEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_uclog = &uclog.obj; @@ -15248,8 +15292,12 @@ static basic_filebuf_wchar filebuf_wchar_log; /* ?wclog(a)std@@3V?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wclog = { { 0 } }; +C_ASSERT(sizeof(wclog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wclog(a)std@@3PAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wclog(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wclog = &wclog.obj;

1 0

Piotr Caban : msvcp140/tests: Test virtual base table size exports.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: ca862a3849f481e87cc2c1ed5b9b0de60526355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca862a3849f481e87cc2c1ed5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 4 10:10:05 2016 +0200 msvcp140/tests: Test virtual base table size exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index d54ced3..82e2b34 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -47,9 +47,45 @@ static void test_thrd(void) p__Thrd_id(), GetCurrentThreadId()); } +static struct { + int value[2]; + const char* export_name; +} vbtable_size_exports_list[] = { + {{0x20, 0x20}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_istream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@7B?$basic_ostream(a)DU?$char_traits(a)D@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_istream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@7B?$basic_ostream(a)GU?$char_traits(a)G@std@@@1@@"}, + {{0x20, 0x20}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x10, 0x10}, "??_8?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@7B?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1@@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{0x18, 0x18}, "??_8?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@7B@"}, + {{ 0x8, 0x10}, "??_8?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@7B@"}, + {{ 0x0, 0x0}, 0} +}; + +static void test_vbtable_size_exports(void) +{ + int i; + const int *p_vbtable; + int arch_idx = (sizeof(void*) == 8); + + for (i = 0; vbtable_size_exports_list[i].export_name; i++) + { + SET(p_vbtable, vbtable_size_exports_list[i].export_name); + + ok(p_vbtable[0] == 0, "vbtable[0] wrong, got 0x%x\n", p_vbtable[0]); + ok(p_vbtable[1] == vbtable_size_exports_list[i].value[arch_idx], + "%d: %s[1] wrong, got 0x%x\n", i, vbtable_size_exports_list[i].export_name, p_vbtable[1]); + } +} + START_TEST(msvcp140) { if(!init()) return; test_thrd(); + test_vbtable_size_exports(); FreeLibrary(msvcp); }

1 0

Hans Leidekker : ntdll: SzCSDVersion is an empty string on Windows 8 and up.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: f94784ddbac9880789171d9f0126499485051249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94784ddbac9880789171d9f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:33 2016 +0200 ntdll: SzCSDVersion is an empty string on Windows 8 and up. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 3 +++ dlls/ntdll/version.c | 9 +++------ programs/winecfg/appdefaults.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index a47e52c..4182c06 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -156,6 +156,9 @@ static void test_GetVersionEx(void) ok(ret || broken(ret == 0), /* win95 */ "Expected GetVersionExA to succeed\n"); + + if (!infoExA.wServicePackMajor && !infoExA.wServicePackMinor) + ok(!infoExA.szCSDVersion[0], "got '%s'\n", infoExA.szCSDVersion); } static void test_VerifyVersionInfo(void) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index b6cafc6..06f9827 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -176,20 +176,17 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WIN8 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN81 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN10 */ { sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 91478fc..f674824 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,9 +48,9 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, - { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, - { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},

1 0

Hans Leidekker : advapi32: Add a stub implementation of EnableTraceEx2.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: bacc68822aec1a025bc0e8c7aab7b75061e1c8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacc68822aec1a025bc0e8c7a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:32 2016 +0200 advapi32: Add a stub implementation of EnableTraceEx2. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 14 ++++++++++++++ .../api-ms-win-eventing-controller-l1-1-0.spec | 2 +- include/evntrace.h | 13 +++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index c2a8d01..b1a051c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -248,7 +248,7 @@ @ stub ElfReportEventW @ stdcall EnableTrace(long long long ptr int64) @ stdcall EnableTraceEx(ptr ptr int64 long long int64 int64 long ptr) -# @ stub EnableTraceEx2 +@ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) # @ stub EncryptedFileKeyInfo diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f947511..893f6e5 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -239,6 +239,20 @@ ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSessi } /****************************************************************************** + * EnableTraceEx2 [ADVAPI32.@] + */ +ULONG WINAPI EnableTraceEx2( TRACEHANDLE handle, LPCGUID provider, ULONG control, UCHAR level, + ULONGLONG match_any, ULONGLONG match_all, ULONG timeout, + PENABLE_TRACE_PARAMETERS params ) +{ + FIXME("(%s, %s, %u, %c, %s, %s, %u, %p): stub\n", wine_dbgstr_longlong(handle), + debugstr_guid(provider), control, level, wine_dbgstr_longlong(match_any), + wine_dbgstr_longlong(match_all), timeout, params); + + return ERROR_SUCCESS; +} + +/****************************************************************************** * EnableTrace [ADVAPI32.@] */ ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) diff --git a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec index a418637..0b58510 100644 --- a/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-controller-l1-1-0/api-ms-win-eventing-controller-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW -@ stub EnableTraceEx2 +@ stdcall EnableTraceEx2(int64 ptr long long int64 int64 long ptr) advapi32.EnableTraceEx2 @ stub EnumerateTraceGuidsEx @ stub EventAccessControl @ stub EventAccessQuery diff --git a/include/evntrace.h b/include/evntrace.h index 191f232..6ebcfba 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -248,6 +248,18 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; +typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + +typedef struct _ENABLE_TRACE_PARAMETERS +{ + ULONG Version; + ULONG EnableProperty; + ULONG ControlFlags; + GUID SourceId; + PEVENT_FILTER_DESCRIPTOR EnableFilterDesc; + ULONG FilterDescCount; +} ENABLE_TRACE_PARAMETERS, *PENABLE_TRACE_PARAMETERS; + #define INVALID_PROCESSTRACE_HANDLE ((TRACEHANDLE)~(ULONG_PTR)0) ULONG WINAPI CloseTrace(TRACEHANDLE); @@ -255,6 +267,7 @@ ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); #define ControlTrace WINELIB_NAME_AW(ControlTrace) ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WINAPI EnableTraceEx2(TRACEHANDLE,LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,ULONG,PENABLE_TRACE_PARAMETERS); ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace)

1 0

Hans Leidekker : webservices: Add support for writing WS_DATETIME values.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 503d152bfb5023a77ce30f7a22c938e2f3b16e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503d152bfb5023a77ce30f7a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:34 2016 +0200 webservices: Add support for writing WS_DATETIME values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 23 +------- dlls/webservices/tests/writer.c | 88 ++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 18 +++++++ dlls/webservices/writer.c | 98 ++++++++++++++++++++++++++++++++++ include/webservices.h | 6 +++ 5 files changed, 212 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=503d152bfb5023a77ce30…

1 0

Hans Leidekker : webservices: Add support for reading WS_BYTES values.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 8ce55bc98f0882d6573b7cc56623017ff28eeb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce55bc98f0882d6573b7cc56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:35 2016 +0200 webservices: Add support for reading WS_BYTES values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 157 +++++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 22 ++++++ include/webservices.h | 13 ++++ 3 files changed, 180 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce55bc98f0882d6573b7…

1 0

Hans Leidekker : webservices: Add support for writing WS_BYTES values.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: c8a90e5de9305b3b34c2094c59fa3781d9be8c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a90e5de9305b3b34c2094c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:36 2016 +0200 webservices: Add support for writing WS_BYTES values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 100 ++++++++++++++++++++++------------------ dlls/webservices/writer.c | 75 ++++++++++++++++++++++++++++-- 2 files changed, 127 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a90e5de9305b3b34c20…

1 0

Huw Davies : riched20: Set the end-of-paragraph run width to that of a space.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 4c322698dad93edccc55c1462e7d8428a3177ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c322698dad93edccc55c1462… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:31 2016 +0100 riched20: Set the end-of-paragraph run width to that of a space. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 778a952..984f8f5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -611,17 +611,16 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i int startx, int *pAscent, int *pDescent) { SIZE size; - int nMaxLen = run->len; + WCHAR spaceW[] = {' ',0}; - if (nLen>nMaxLen) - nLen = nMaxLen; + nLen = min( nLen, run->len ); - /* FIXME the following call also ensures that TEXTMETRIC structure is filled - * this is wasteful for MERF_NONTEXT runs, but that shouldn't matter - * in practice - */ - - if (para->nFlags & MEPF_COMPLEX) + if (run->nFlags & MERF_ENDPARA) + { + nLen = min( nLen, 1 ); + ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + } + else if (para->nFlags & MEPF_COMPLEX) { size.cx = run->nWidth; }

1 0