May 2018 - Wine-Commits - list.winehq.org

Akihiro Sagawa : winmm/tests: Add tests regarding MIDI stream player clocks and positions.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 70e541a693f538a952a287470b54070df6cef273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70e541a693f538a952a28747… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:09 2018 +0900 winmm/tests: Add tests regarding MIDI stream player clocks and positions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index b62b461..c78e465 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -19,6 +19,8 @@ */ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <stddef.h> #include "windows.h" #include "mmsystem.h" @@ -531,6 +533,51 @@ static MIDISHORTEVENT strmNops[] = { /* Test callback + dwOffset */ { 0, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, }; +static MIDISHORTEVENT strmNopsWithDelta[] = { + { 0, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, + { 12, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, +}; + +struct time_stamp_records { + UINT count; + DWORD time_stamp[2]; + HANDLE done; +}; + +static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR instance, DWORD_PTR p1, DWORD_PTR p2) +{ + struct time_stamp_records *records = (struct time_stamp_records *)instance; + switch (msg) { + case MM_MOM_POSITIONCB: + if (records->count < sizeof(records->time_stamp)/sizeof(records->time_stamp[0])) + records->time_stamp[records->count] = GetTickCount(); + records->count++; + break; + case MM_MOM_DONE: + SetEvent(records->done); + break; + } +} + +static DWORD get_position(HMIDISTRM hm, UINT type) +{ + MMRESULT rc; + MMTIME mmtime; + mmtime.wType = type; + rc = midiStreamPosition(hm, &mmtime, sizeof(mmtime)); + if (rc != MMSYSERR_NOERROR || mmtime.wType != type) + return MAXDWORD; + + switch (mmtime.wType) { + case TIME_MS: + return mmtime.u.ms; + case TIME_TICKS: + return mmtime.u.ticks; + default: + return MAXDWORD; + } +} + static MMRESULT playStream(HMIDISTRM hm, LPMIDIHDR lpMidiHdr) { MMRESULT rc = midiStreamOut(hm, lpMidiHdr, sizeof(MIDIHDR)); @@ -549,6 +596,9 @@ static void test_midiStream(UINT udev, HWND hwnd) MIDIPROPTEMPO tempo; MIDIPROPTIMEDIV tdiv; } midiprop; + DWORD diff, expected, ret; + const DWORD MARGIN = 50; + struct time_stamp_records records; MIDIOUTCAPSA capsA; if (hwnd) @@ -786,6 +836,100 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(!rc, "midiStreamClose rc=%s\n", mmsys_error(rc)); } + /* Test the player time clock and positions */ + memset(&records, 0, sizeof(records)); + records.done = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(records.done != NULL, "CreateEvent failed (dev=%d)\n", udev); + + rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)time_stamp_callback, (DWORD_PTR)&records, CALLBACK_FUNCTION); + ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 0; + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %u, got %u\n", expected, ret); + + memset(&mhdr, 0, sizeof(mhdr)); + mhdr.lpData = (LPSTR)strmNopsWithDelta; + mhdr.dwBytesRecorded = mhdr.dwBufferLength = sizeof(strmNopsWithDelta); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + rc = midiStreamOut(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiStreamOut(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %u, got %u\n", expected, ret); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + Sleep(50); + + rc = midiStreamPause(hm); + ok(!rc, "midiStreamPause(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 50; + ret = get_position(hm, TIME_MS); + todo_wine ok(ret >= expected && ret < expected + MARGIN, "expected %ums or greater, got %ums\n", expected, ret); + expected = ret; + + Sleep(100); + + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %ums, got %ums\n", expected, ret); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + Sleep(1); + ret = get_position(hm, TIME_MS); + todo_wine ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); + expected = ret; + + ret = WaitForSingleObject(records.done, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, got %d\n", ret); + + rc = midiStreamPause(hm); + ok(!rc, "midiStreamPause(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 250; /* = 12 ticks in 120 BPM */ + ret = get_position(hm, TIME_MS); + ok(ret >= expected - MARGIN && ret <= expected + MARGIN, + "expected greater than %ums, got %ums\n", expected, ret); + trace("after playing, got %ums\n", ret); + + /* set tempo to 240 BPM */ + midiprop.tempo.cbStruct = sizeof(midiprop.tempo); + midiprop.tempo.dwTempo = 250000; + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TEMPO); + ok(!rc, "midiStreamProperty(SET|TEMPO, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + /* a tempo change doesn't affect elapsed ticks */ + ret = get_position(hm, TIME_TICKS); + ok(ret >= strmNopsWithDelta[1].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime + 3, + "expected %u ticks, got %u\n", strmNopsWithDelta[1].dwDeltaTime, ret); + + ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); + + /* Time between midiStreamPause and midiStreamRestart isn't counted. + So, the second event happens at dwDeltaTime(250ms) + 100ms after the first event. */ + expected = 250 + 100; + diff = records.time_stamp[1] - records.time_stamp[0]; + todo_wine ok(diff >= expected - MARGIN && diff <= expected + MARGIN, + "expected %u ~ %ums, got %ums (dev=%d)\n", expected - MARGIN, expected + MARGIN, diff, udev); + + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepareHeader(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + rc = midiStreamStop(hm); + ok(!rc, "midiStreamStop(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + ret = get_position(hm, TIME_MS); + todo_wine ok(ret == 0, "expected 0ms, got %ums\n", ret); + + rc = midiStreamClose(hm); + ok(!rc, "midiStreamClose(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + CloseHandle(records.done); + rc = midiOutGetDevCapsA((UINT_PTR)udev, &capsA, sizeof(capsA)); ok(!rc, "midiOutGetDevCaps(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (!strncmp(capsA.szPname, fluidsynth_prefix, strlen(fluidsynth_prefix)) ||

1 0

Nikolay Sivov : include: Update with latest DirectWrite API additions.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: da705e5e53f2c3f87b47e786ce4a797c8d6f132e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da705e5e53f2c3f87b47e786… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 24 16:58:50 2018 +0300 include: Update with latest DirectWrite API additions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 376 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 360 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da705e5e53f2c3f87b47…

1 0

Alexandre Julliard : server: Removed unused visible rect from get_window_rectangles request.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 376c218ad69610dee92ef5ab51b313a90edf514c URL: https://source.winehq.org/git/wine.git/?a=commit;h=376c218ad69610dee92ef5ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 24 14:10:12 2018 +0200 server: Removed unused visible rect from get_window_rectangles request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +-- server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 1 - server/window.c | 17 ++--------------- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 564ae92..98dbcb7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3682,7 +3682,6 @@ struct get_window_rectangles_reply { struct reply_header __header; rectangle_t window; - rectangle_t visible; rectangle_t client; }; enum coords_relative @@ -6511,6 +6510,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 552 +#define SERVER_PROTOCOL_VERSION 553 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9fb155b..99e7221 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2643,7 +2643,6 @@ enum message_type int relative; /* coords relative to (see below) */ @REPLY rectangle_t window; /* window rectangle */ - rectangle_t visible; /* visible part of the window rectangle */ rectangle_t client; /* client rectangle */ @END enum coords_relative diff --git a/server/request.h b/server/request.h index 3e6183b..2d55dfb 100644 --- a/server/request.h +++ b/server/request.h @@ -1767,9 +1767,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); C_ASSERT( sizeof(struct get_window_rectangles_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, window) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, visible) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); -C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 24 ); +C_ASSERT( sizeof(struct get_window_rectangles_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); diff --git a/server/trace.c b/server/trace.c index 44004ad..e2980a3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3222,7 +3222,6 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req ) { dump_rectangle( " window=", &req->window ); - dump_rectangle( ", visible=", &req->visible ); dump_rectangle( ", client=", &req->client ); } diff --git a/server/window.c b/server/window.c index 4a1a278..9492a00 100644 --- a/server/window.c +++ b/server/window.c @@ -2346,42 +2346,29 @@ DECL_HANDLER(get_window_rectangles) if (!win) return; reply->window = win->window_rect; - reply->visible = win->visible_rect; reply->client = win->client_rect; switch (req->relative) { case COORDS_CLIENT: offset_rect( &reply->window, -win->client_rect.left, -win->client_rect.top ); - offset_rect( &reply->visible, -win->client_rect.left, -win->client_rect.top ); offset_rect( &reply->client, -win->client_rect.left, -win->client_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->client_rect, &reply->window ); - mirror_rect( &win->client_rect, &reply->visible ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &reply->window ); break; case COORDS_WINDOW: offset_rect( &reply->window, -win->window_rect.left, -win->window_rect.top ); - offset_rect( &reply->visible, -win->window_rect.left, -win->window_rect.top ); offset_rect( &reply->client, -win->window_rect.left, -win->window_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->window_rect, &reply->visible ); - mirror_rect( &win->window_rect, &reply->client ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->window_rect, &reply->client ); break; case COORDS_PARENT: if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { mirror_rect( &win->parent->client_rect, &reply->window ); - mirror_rect( &win->parent->client_rect, &reply->visible ); mirror_rect( &win->parent->client_rect, &reply->client ); } break; case COORDS_SCREEN: client_to_screen_rect( win->parent, &reply->window ); - client_to_screen_rect( win->parent, &reply->visible ); client_to_screen_rect( win->parent, &reply->client ); break; default:

1 0

Michael Müller : dxdiagn: Add several more fields for DisplayDevices.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 3eee8b5594f7063e3c657ad79ec8ea58386edf6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eee8b5594f7063e3c657ad7… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 24 01:48:32 2018 +0000 dxdiagn: Add several more fields for DisplayDevices. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 159 +++++++++++++++++++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 2 + 2 files changed, 161 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eee8b5594f7063e3c65…

1 0

Dmitry Timoshkov : kerberos: Add support for ISC_REQ_IDENTIFY flag.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 1cf45fe554f007077300779f4c484473ef7c2b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf45fe554f007077300779f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:35:52 2018 +0800 kerberos: Add support for ISC_REQ_IDENTIFY flag. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0ff6ae2..63137d8 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -791,6 +791,7 @@ static ULONG flags_isc_req_to_gss( ULONG flags ) if (flags & ISC_REQ_INTEGRITY) ret |= GSS_C_INTEG_FLAG; if (flags & ISC_REQ_NULL_SESSION) ret |= GSS_C_ANON_FLAG; if (flags & ISC_REQ_USE_DCE_STYLE) ret |= GSS_C_DCE_STYLE; + if (flags & ISC_REQ_IDENTIFY) ret |= GSS_C_IDENTIFY_FLAG; return ret; } @@ -804,6 +805,7 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + if (flags & GSS_C_IDENTIFY_FLAG) ret |= ISC_RET_IDENTIFY; return ret; } @@ -817,6 +819,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + if (flags & GSS_C_IDENTIFY_FLAG) ret |= ASC_RET_IDENTIFY; return ret; } @@ -1014,7 +1017,8 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | - ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE; + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | + ISC_REQ_IDENTIFY; OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle;

1 0

Józef Kucia : configure: Check for libvkd3d.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 281bdcac73ffc4ef5eb795e51d230efe8b436938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=281bdcac73ffc4ef5eb795e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:15 2018 +0200 configure: Check for libvkd3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 ++++++ include/config.h.in | 3 ++ 3 files changed, 119 insertions(+) diff --git a/configure b/configure index ec15a90..2d526c5 100755 --- a/configure +++ b/configure @@ -636,6 +636,8 @@ UNWINDFLAGS EXCESS_PRECISION_CFLAGS BUILTINFLAG EXTRACFLAGS +VKD3D_LIBS +VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS @@ -863,6 +865,7 @@ with_sdl with_tiff with_udev with_v4l +with_vkd3d with_vulkan with_xcomposite with_xcursor @@ -1814,6 +1817,8 @@ MPG123_CFLAGS MPG123_LIBS NETAPI_CFLAGS NETAPI_LIBS +VKD3D_CFLAGS +VKD3D_LIBS LDAP_CFLAGS LDAP_LIBS' @@ -2493,6 +2498,7 @@ Optional Packages: --without-tiff do not use TIFF --without-udev do not use udev (plug and play support) --without-v4l do not use v4l1 (v4l support) + --without-vkd3d do not use vkd3d (Direct3D 12 support) --without-vulkan do not use Vulkan --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension @@ -2591,6 +2597,9 @@ Some influential environment variables: NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config + VKD3D_CFLAGS + C compiler flags for libvkd3d, overriding pkg-config + VKD3D_LIBS Linker flags for libvkd3d, overriding pkg-config LDAP_CFLAGS C compiler flags for openldap, overriding pkg-config LDAP_LIBS Linker flags for openldap, overriding pkg-config @@ -3814,6 +3823,12 @@ if test "${with_v4l+set}" = set; then : fi +# Check whether --with-vkd3d was given. +if test "${with_vkd3d+set}" = set; then : + withval=$with_vkd3d; +fi + + # Check whether --with-vulkan was given. if test "${with_vulkan+set}" = set; then : withval=$with_vulkan; @@ -14678,6 +14693,94 @@ esac fi +if test "x$with_vkd3d" != "xno" +then + if ${VKD3D_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + VKD3D_CFLAGS=`$PKG_CONFIG --cflags libvkd3d 2>/dev/null` +fi +fi + +if ${VKD3D_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + VKD3D_LIBS=`$PKG_CONFIG --libs libvkd3d 2>/dev/null` +fi +fi + + +$as_echo "$as_me:${as_lineno-$LINENO}: libvkd3d cflags: $VKD3D_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libvkd3d libs: $VKD3D_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $VKD3D_CFLAGS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lvkd3d" >&5 +$as_echo_n "checking for -lvkd3d... " >&6; } +if ${ac_cv_lib_soname_vkd3d+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lvkd3d $VKD3D_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char vkd3d_create_device (); +int +main () +{ +return vkd3d_create_device (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_vkd3d=`$ac_cv_path_LDD conftest.exe | grep "vkd3d" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_vkd3d=`$OTOOL -L conftest$ac_exeext | grep "libvkd3d\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libvkd3d\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_vkd3d=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libvkd3d\\.$LIBEXT" | sed -e "s/^.*\\[\$libvkd3d\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_vkd3d:+false} :; then : + ac_cv_lib_soname_vkd3d=`$LDD conftest$ac_exeext | grep "libvkd3d\\.$LIBEXT" | sed -e "s/^.*$libvkd3d\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_vkd3d:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_vkd3d" >&5 +$as_echo "$ac_cv_lib_soname_vkd3d" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBVKD3D "$ac_cv_lib_soname_vkd3d" +_ACEOF + + +fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$VKD3D_CFLAGS" || VKD3D_CFLAGS=`echo " $VKD3D_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$VKD3D_LIBS" || VKD3D_LIBS=`echo " $VKD3D_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + +fi +if test "x$ac_cv_lib_soname_vkd3d" = "x"; then : + case "x$with_vkd3d" in + x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported." ;; + xno) ;; + *) as_fn_error $? "vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported. +This is an error since --with-vkd3d was requested." "$LINENO" 5 ;; +esac + +fi +test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} + EXTRACFLAGS="" @@ -18184,6 +18287,8 @@ KSTAT_LIBS = $KSTAT_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS +VKD3D_CFLAGS = $VKD3D_CFLAGS +VKD3D_LIBS = $VKD3D_LIBS EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS DL_LIBS = $DL_LIBS POLL_LIBS = $POLL_LIBS diff --git a/configure.ac b/configure.ac index 312c235..3a6a3a1 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -1855,6 +1856,16 @@ fi WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x"], [libvulkan ${notice_platform}development files not found, Vulkan won't be supported.]) +dnl **** Check for vkd3d **** +if test "x$with_vkd3d" != "xno" +then + WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, + [WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS])]) +fi +WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"], + [vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) +test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") diff --git a/include/config.h.in b/include/config.h.in index 3346b01..c3247cb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1545,6 +1545,9 @@ /* Define to the soname of the libv4l1 library. */ #undef SONAME_LIBV4L1 +/* Define to the soname of the libvkd3d library. */ +#undef SONAME_LIBVKD3D + /* Define to the soname of the libvulkan library. */ #undef SONAME_LIBVULKAN

1 0

Dmitry Timoshkov : mstask: Keep the job file uuid across load/ save operations.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 8587b4788bccc7fb4a6be8de348928cb91bf83cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8587b4788bccc7fb4a6be8de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 16:29:26 2018 +0800 mstask: Keep the job file uuid across load/save operations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 7a110b3..58be83e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct LONG ref; ITaskDefinition *task; IExecAction *action; + UUID uuid; LPWSTR task_name; HRESULT status; WORD idle_minutes, deadline_minutes; @@ -1241,6 +1242,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) if (fixed->file_version != 0x0001) return SCHED_E_INVALID_TASK; + This->uuid = fixed->uuid; + TRACE("name_size_offset %04x\n", fixed->name_size_offset); TRACE("trigger_offset %04x\n", fixed->trigger_offset); TRACE("error_retry_count %u\n", fixed->error_retry_count); @@ -1583,7 +1586,6 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta ver = GetVersion(); fixed.product_version = MAKEWORD(ver >> 8, ver); fixed.file_version = 0x0001; - CoCreateGuid(&fixed.uuid); fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset += sizeof(USHORT); /* Application Name */ @@ -1627,6 +1629,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta Sleep(100); } + if (GetLastError() == ERROR_ALREADY_EXISTS) + fixed.uuid = This->uuid; + else + CoCreateGuid(&fixed.uuid); + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1848,6 +1855,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + CoCreateGuid(&This->uuid); + /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: 100de495d875e12a438faefd884cd2d5b4011ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=100de495d875e12a438faefd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 24 20:52:07 2018 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 71 ++++++++++++++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1d9f9a5..5214893 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-12 22:41+0900\n" +"PO-Revision-Date: 2018-05-24 20:49+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -6665,10 +6665,8 @@ msgid "Connection reset by peer.\n" msgstr "相手側により接続がリセットされました。\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "メッセージ 0x%1 はファイル %2 に見つかりませんでした。\n" +msgstr "ファイルにデジタル署名がありません。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -8502,10 +8500,8 @@ msgid "&Browse..." msgstr "参照(&B)..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "ファイルの種類" +msgstr "ファイルの種類:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8512,12 @@ msgid "Size:" msgstr "サイズ:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "作成日" +msgstr "作成日:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "属性(&A):" +msgstr "属性:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8528,20 @@ msgid "&Archive" msgstr "アーカイブ(&A)" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "URL:" +msgstr "アプリケーション:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "アイコンの変更(&I)..." +msgstr "変更(&C)..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "更新日時" +msgstr "最終変更日時:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "最終変更日時:" +msgstr "最終アクセス日時:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9167,70 +9151,59 @@ msgid "" msgstr "この証明書には特定できないセキュリティ問題があります。" #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "サービス要求が時間切れとなりました。\n" +msgstr "要求は時間切れとなりました。\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "プリンタエラーが発生しました。" +msgstr "内部エラーが発生しました。\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "パス名が不正です。\n" +msgstr "URL が不正です。\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL スキームを認識できなかったかサポートしていません。\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "ユーザ名を見つけられませんでした。\n" +msgstr "サーバ名をを解決できませんでした。\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "ユーザプロファイルが正しくありません。\n" +msgstr "要求された操作は正しくありません。\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"操作は取り消されました。通常は要求が行われたハンドルが操作の完了前にクローズ" +"されたことが原因です。\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "プロファイルを追加できませんでした。\n" +msgstr "要求された項目は見つかりませんでした。\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "LDAP サーバに接続できません" +msgstr "サーバへの接続試行は失敗しました。\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "サーバへの接続は終了されました。\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"サーバから受信した SSL 証明書の日付が不正です。証明書は期限切れです。\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 証明書の一般名(ホスト名フィールド)が不適切です。\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Józef Kucia : d3d12: Implement D3D12CreateRootSignatureDeserializer().
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: ee4a02ce77023ecf61c1a521da6c99c97e67c9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4a02ce77023ecf61c1a521… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:16 2018 +0200 d3d12: Implement D3D12CreateRootSignatureDeserializer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 2 ++ dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/d3d12_main.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index d7ee1b5..458f3e2 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 +EXTRALIBS = $(VKD3D_LIBS) +EXTRAINCL = $(VKD3D_CFLAGS) C_SRCS = \ d3d12_main.c diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 613092b..b607993 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -4,5 +4,5 @@ 103 stub D3D12CoreCreateLayeredDevice 104 stub D3D12CoreGetLayeredDeviceSize 105 stub D3D12CoreRegisterLayers -106 stub D3D12CreateRootSignatureDeserializer +106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) 107 stub D3D12SerializeRootSignature diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index c1598ca..b810dd5 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -20,9 +20,18 @@ #include "config.h" #include "wine/port.h" +#define VK_NO_PROTOTYPES +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES +#define WINE_VK_ALIGN(x) + #include "wine/debug.h" +#include "wine/vulkan.h" + #include "d3d12.h" +#include <vkd3d.h> + WINE_DEFAULT_DEBUG_CHANNEL(d3d12); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) @@ -40,3 +49,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_NOTIMPL; } + +HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer) +{ + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + data, data_size, debugstr_guid(iid), deserializer); + + return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); +}

1 0

Dmitry Timoshkov : kerberos: Add ISC_REQ_CONNECTION to the list of supported flags.
by Alexandre Julliard May 24, 2018

May 24, 2018

Module: wine Branch: master Commit: f9f7b775d92019a683db2f97d9e73ceb9dcaad65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f7b775d92019a683db2f97… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:36:13 2018 +0800 kerberos: Add ISC_REQ_CONNECTION to the list of supported flags. Formatting messages are not supported anyway. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 60042e6..7d532e5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1020,7 +1020,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | - ISC_REQ_IDENTIFY; + ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION; OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle;

1 0