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

Akihiro Sagawa : winmm: Protect MIDI stream info with critical section.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 169d657d78206304005d6d02dbd45b3f73493f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169d657d78206304005d6d02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:10 2018 +0900 winmm: Protect MIDI stream info with critical section. 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/winmm.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index e0a2360..0933f03 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -912,6 +912,7 @@ typedef struct WINE_MIDIStream { HMIDIOUT hDevice; HANDLE hThread; DWORD dwThreadID; + CRITICAL_SECTION lock; DWORD dwTempo; DWORD dwTimeDiv; DWORD dwPositionMS; @@ -1140,8 +1141,10 @@ start_header: /* do we have to wait ? */ if (me->dwDeltaTime) { + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->dwPositionMS += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); lpMidiStrm->dwPulses += me->dwDeltaTime; + LeaveCriticalSection(&lpMidiStrm->lock); dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; @@ -1185,7 +1188,9 @@ start_header: midiOutShortMsg(lpMidiStrm->hDevice, MEVT_EVENTPARM(me->dwEvent)); break; case MEVT_TEMPO: + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->dwTempo = MEVT_EVENTPARM(me->dwEvent); + LeaveCriticalSection(&lpMidiStrm->lock); break; case MEVT_VERSION: break; @@ -1248,8 +1253,11 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, (HDRVR)lpMidiStrm->hDevice, MM_MOM_CLOSE, lpwm->mod.dwInstance, 0, 0); - if(!ret) + if(!ret) { + lpMidiStrm->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&lpMidiStrm->lock); HeapFree(GetProcessHeap(), 0, lpMidiStrm); + } return midiOutClose((HMIDIOUT)hMidiStrm); } @@ -1306,6 +1314,9 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, return ret; } + InitializeCriticalSection(&lpMidiStrm->lock); + lpMidiStrm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_MidiStream.lock"); + lpMidiStrm->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); lpMidiStrm->wFlags = HIWORD(fdwOpen); @@ -1402,6 +1413,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm } else if (lpMMT == NULL || cbmmt != sizeof(MMTIME)) { ret = MMSYSERR_INVALPARAM; } else { + EnterCriticalSection(&lpMidiStrm->lock); switch (lpMMT->wType) { default: FIXME("Unsupported time type %x\n", lpMMT->wType); @@ -1419,6 +1431,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm TRACE("=> %d ticks\n", lpMMT->u.ticks); break; } + LeaveCriticalSection(&lpMidiStrm->lock); } return ret; } @@ -1440,6 +1453,7 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD } else if (dwProperty & MIDIPROP_TEMPO) { MIDIPROPTEMPO* mpt = (MIDIPROPTEMPO*)lpPropData; + EnterCriticalSection(&lpMidiStrm->lock); if (sizeof(MIDIPROPTEMPO) != mpt->cbStruct) { ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { @@ -1449,13 +1463,16 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD mpt->dwTempo = lpMidiStrm->dwTempo; TRACE("Getting tempo <= %d\n", mpt->dwTempo); } + LeaveCriticalSection(&lpMidiStrm->lock); } else if (dwProperty & MIDIPROP_TIMEDIV) { MIDIPROPTIMEDIV* mptd = (MIDIPROPTIMEDIV*)lpPropData; if (sizeof(MIDIPROPTIMEDIV) != mptd->cbStruct) { ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; + LeaveCriticalSection(&lpMidiStrm->lock); TRACE("Setting time div to %d\n", mptd->dwTimeDiv); } else if (dwProperty & MIDIPROP_GET) { mptd->dwTimeDiv = lpMidiStrm->dwTimeDiv;

1 0

Akihiro Sagawa : winmm: Add playing status to MIDI stream structure and use it.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: b70f0d723a768b9fdc89cd835b23718f6cd61f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70f0d723a768b9fdc89cd83… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:12 2018 +0900 winmm: Add playing status to MIDI stream structure and use it. 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/winmm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0933f03..da87be2 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -919,6 +919,7 @@ typedef struct WINE_MIDIStream { DWORD dwPulses; DWORD dwStartTicks; WORD wFlags; + WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; } WINE_MIDIStream; @@ -928,6 +929,10 @@ typedef struct WINE_MIDIStream { #define WINE_MSM_PAUSE (WM_USER+2) #define WINE_MSM_RESUME (WM_USER+3) +#define MSM_STATUS_STOPPED WINE_MSM_STOP +#define MSM_STATUS_PAUSED WINE_MSM_PAUSE +#define MSM_STATUS_PLAYING WINE_MSM_RESUME + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ @@ -976,7 +981,6 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI LPMIDIHDR lpMidiHdr; LPMIDIHDR* lpmh; LPBYTE lpData; - BOOL paused = FALSE; for (;;) { switch (msg->message) { @@ -984,6 +988,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI return FALSE; case WINE_MSM_STOP: TRACE("STOP\n"); + lpMidiStrm->status = MSM_STATUS_STOPPED; /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ @@ -1003,10 +1008,11 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI case WINE_MSM_RESUME: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS; + lpMidiStrm->status = MSM_STATUS_PLAYING; return TRUE; case WINE_MSM_PAUSE: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ - paused = TRUE; + lpMidiStrm->status = MSM_STATUS_PAUSED; break; /* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent * by native mcimidi, it doesn't look like a correct one". @@ -1087,7 +1093,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI FIXME("Unknown message %d\n", msg->message); break; } - if (!paused) + if (lpMidiStrm->status != MSM_STATUS_PAUSED) return TRUE; GetMessageA(msg, 0, 0, 0); } @@ -1292,6 +1298,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->dwPositionMS = 0; + lpMidiStrm->status = MSM_STATUS_PAUSED; mosm.dwStreamID = (DWORD)lpMidiStrm; /* FIXME: the correct value is not allocated yet for MAPPER */ @@ -1332,8 +1339,6 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* wait for thread to have started, and for its queue to be created */ WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); - TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm);

1 0

Józef Kucia : configure: Check for libvkd3d.
by Alexandre Julliard 24 May '18

24 May '18

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

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

24 May '18

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

Józef Kucia : d3d12: Implement D3D12SerializeRootSignature().
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 803fa9620538e283c7e101983dd32d1df65c3f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=803fa9620538e283c7e10198… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:17 2018 +0200 d3d12: Implement D3D12SerializeRootSignature(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/d3d12_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index b607993..53151bf 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -5,4 +5,4 @@ 104 stub D3D12CoreGetLayeredDeviceSize 105 stub D3D12CoreRegisterLayers 106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -107 stub D3D12SerializeRootSignature +107 stdcall D3D12SerializeRootSignature(ptr long ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index b810dd5..bb17cbc 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -58,3 +58,12 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } + +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) +{ + TRACE("root_signature_desc %p, version %#x, blob %p, error_blob %p.\n", + root_signature_desc, version, blob, error_blob); + + return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); +}

1 0

Józef Kucia : d3d12: Implement D3D12CreateDevice().
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: ef88037bdaa532e52f46dc4d89143a8621022ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef88037bdaa532e52f46dc4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:18 2018 +0200 d3d12: Implement D3D12CreateDevice(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 1 + dlls/d3d12/d3d12_main.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 458f3e2..62fb01a 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,5 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 +IMPORTS = gdi32 user32 EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index bb17cbc..c1dc8c8 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -26,7 +26,9 @@ #define WINE_VK_ALIGN(x) #include "wine/debug.h" +#include "wine/heap.h" #include "wine/vulkan.h" +#include "wine/vulkan_driver.h" #include "d3d12.h" @@ -41,13 +43,101 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return E_NOTIMPL; } +static HRESULT d3d12_signal_event(HANDLE event) +{ + return SetEvent(event) ? S_OK : E_FAIL; +} + +struct d3d12_thread_data +{ + PFN_vkd3d_thread main_pfn; + void *data; +}; + +static DWORD WINAPI d3d12_thread_main(void *data) +{ + struct d3d12_thread_data *thread_data = data; + + thread_data->main_pfn(thread_data->data); + heap_free(thread_data); + return 0; +} + +static void *d3d12_create_thread(PFN_vkd3d_thread main_pfn, void *data) +{ + struct d3d12_thread_data *thread_data; + HANDLE thread; + + if (!(thread_data = heap_alloc(sizeof(*thread_data)))) + { + ERR("Failed to allocate thread data.\n"); + return NULL; + } + + thread_data->main_pfn = main_pfn; + thread_data->data = data; + + if (!(thread = CreateThread(NULL, 0, d3d12_thread_main, thread_data, 0, NULL))) + heap_free(thread_data); + + return thread; +} + +static HRESULT d3d12_join_thread(void *handle) +{ + HANDLE thread = handle; + DWORD ret; + + if ((ret = WaitForSingleObject(thread, INFINITE)) != WAIT_OBJECT_0) + ERR("Failed to wait for thread, ret %#x.\n", ret); + CloseHandle(thread); + return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; +} + +static const struct vulkan_funcs *get_vk_funcs(void) +{ + const struct vulkan_funcs *vk_funcs; + HDC hdc; + + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); + return vk_funcs; +} + HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { - FIXME("adapter %p, minimum_feature_level %#x, iid %s, device %p stub!\n", + struct vkd3d_instance_create_info instance_create_info; + struct vkd3d_device_create_info device_create_info; + const struct vulkan_funcs *vk_funcs; + + TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", adapter, minimum_feature_level, debugstr_guid(iid), device); - return E_NOTIMPL; + if (!(vk_funcs = get_vk_funcs())) + { + ERR("Failed to get Wine Vulkan driver.\n"); + return E_FAIL; + } + + FIXME("Ignoring adapter %p.\n", adapter); + + memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.pfn_signal_event = d3d12_signal_event; + instance_create_info.pfn_create_thread = d3d12_create_thread; + instance_create_info.pfn_join_thread = d3d12_join_thread; + instance_create_info.wchar_size = sizeof(WCHAR); + instance_create_info.pfn_vkGetInstanceProcAddr + = (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; + + memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.minimum_feature_level = minimum_feature_level; + device_create_info.instance_create_info = &instance_create_info; + + return vkd3d_create_device(&device_create_info, iid, device); } HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size,

1 0

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

24 May '18

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 24 May '18

24 May '18

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

Dmitry Timoshkov : kerberos: Translate GSS_C_DCE_STYLE to appropriate ISC_RET and ASC_RET flags.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 1288908ace239c9b440f605025c829b2d5216437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1288908ace239c9b440f6050… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:36:03 2018 +0800 kerberos: Translate GSS_C_DCE_STYLE to appropriate ISC_RET and ASC_RET flags. 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, 2 insertions(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 63137d8..60042e6 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -805,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_DCE_STYLE) ret |= ISC_RET_USED_DCE_STYLE; if (flags & GSS_C_IDENTIFY_FLAG) ret |= ISC_RET_IDENTIFY; return ret; } @@ -819,6 +820,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_DCE_STYLE) ret |= ASC_RET_USED_DCE_STYLE; if (flags & GSS_C_IDENTIFY_FLAG) ret |= ASC_RET_IDENTIFY; return ret; }

1 0

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

24 May '18

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