February 2020 - Wine-devel - list.winehq.org

[PATCH] vcomp/tests: Link to activation context API directly.
by Nikolay Sivov 21 Feb '20

21 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vcomp/tests/vcomp.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a8b80a0e22..0aea30815e 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -27,11 +27,6 @@ static HANDLE vcomp_actctx_hctx; static ULONG_PTR vcomp_actctx_cookie; static HMODULE vcomp_handle; -static HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); -static BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); -static VOID (WINAPI *pReleaseActCtx)(HANDLE); - typedef CRITICAL_SECTION *omp_lock_t; typedef CRITICAL_SECTION *omp_nest_lock_t; @@ -191,18 +186,10 @@ static const char vcomp_manifest[] = static void create_vcomp_manifest(void) { char temp_path[MAX_PATH]; - HMODULE kernel32; DWORD written; ACTCTXA ctx; HANDLE file; - kernel32 = GetModuleHandleA("kernel32.dll"); - pCreateActCtxA = (void *)GetProcAddress(kernel32, "CreateActCtxA"); - pActivateActCtx = (void *)GetProcAddress(kernel32, "ActivateActCtx"); - pDeactivateActCtx = (void *)GetProcAddress(kernel32, "DeactivateActCtx"); - pReleaseActCtx = (void *)GetProcAddress(kernel32, "ReleaseActCtx"); - if (!pCreateActCtxA) return; - if (!GetTempPathA(sizeof(temp_path), temp_path) || !GetTempFileNameA(temp_path, "vcomp", 0, vcomp_manifest_file)) { @@ -231,7 +218,7 @@ static void create_vcomp_manifest(void) memset(&ctx, 0, sizeof(ctx)); ctx.cbSize = sizeof(ctx); ctx.lpSource = vcomp_manifest_file; - vcomp_actctx_hctx = pCreateActCtxA(&ctx); + vcomp_actctx_hctx = CreateActCtxA(&ctx); if (!vcomp_actctx_hctx) { ok(0, "failed to create activation context\n"); @@ -239,10 +226,10 @@ static void create_vcomp_manifest(void) return; } - if (!pActivateActCtx(vcomp_actctx_hctx, &vcomp_actctx_cookie)) + if (!ActivateActCtx(vcomp_actctx_hctx, &vcomp_actctx_cookie)) { win_skip("failed to activate context\n"); - pReleaseActCtx(vcomp_actctx_hctx); + ReleaseActCtx(vcomp_actctx_hctx); DeleteFileA(vcomp_manifest_file); vcomp_actctx_hctx = NULL; } @@ -255,8 +242,8 @@ static void release_vcomp(void) if (vcomp_actctx_hctx) { - pDeactivateActCtx(0, vcomp_actctx_cookie); - pReleaseActCtx(vcomp_actctx_hctx); + DeactivateActCtx(0, vcomp_actctx_cookie); + ReleaseActCtx(vcomp_actctx_hctx); DeleteFileA(vcomp_manifest_file); } } -- 2.25.0

1 0

[PATCH] oleaut32/tests: Link to activation context API directly.
by Nikolay Sivov 21 Feb '20

21 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e8956fb3b1..75f8d78f07 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -89,10 +89,6 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); static LONG (WINAPI *pRegDeleteKeyExW)(HKEY,LPCWSTR,REGSAM,DWORD); @@ -296,10 +292,6 @@ static void init_function_pointers(void) pRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "RegisterTypeLibForUser"); pUnRegisterTypeLibForUser = (void *)GetProcAddress(hmod, "UnRegisterTypeLibForUser"); - pActivateActCtx = (void *)GetProcAddress(hk32, "ActivateActCtx"); - pCreateActCtxW = (void *)GetProcAddress(hk32, "CreateActCtxW"); - pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); - pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); pRegDeleteKeyExW = (void*)GetProcAddress(hadv, "RegDeleteKeyExW"); } @@ -5744,7 +5736,7 @@ static HANDLE create_actctx(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "actctx.cbSize=%d\n", actctx.cbSize); @@ -5798,12 +5790,6 @@ static void test_LoadRegTypeLib(void) BSTR path; BOOL ret; - if (!pActivateActCtx) - { - win_skip("Activation contexts not supported, skipping LoadRegTypeLib tests\n"); - return; - } - create_manifest_file("testdep.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main); @@ -5824,7 +5810,7 @@ static void test_LoadRegTypeLib(void) hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); path = NULL; @@ -5926,10 +5912,10 @@ static void test_LoadRegTypeLib(void) DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb2.tlb"); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } #define AUX_HREF 1 -- 2.25.0

1 0

[PATCH 1/2] mf: Shut down quality manager on session shutdown.
by Nikolay Sivov 21 Feb '20

21 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6b5d590a25..5ee4074379 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -907,6 +907,8 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) { session->state = SESSION_STATE_SHUT_DOWN; IMFMediaEventQueue_Shutdown(session->event_queue); + if (session->quality_manager) + IMFQualityManager_Shutdown(session->quality_manager); } LeaveCriticalSection(&session->cs); -- 2.25.0

1 1

[PATCH] winex11.drv: Support reporting correct PCI ID for GPUs.
by Zhiyi Zhang 21 Feb '20

21 Feb '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 48 ++++++ dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/xrandr.c | 293 +++++++++++++++++++++++++++++++---- 3 files changed, 311 insertions(+), 32 deletions(-) diff --git a/configure.ac b/configure.ac index 47d2b750c0..8d5312d80e 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,7 @@ AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) +AC_ARG_WITH(drm, AS_HELP_STRING([--without-drm],[do not use DRM (Direct Rendering Manager support)])) AC_ARG_WITH(faudio, AS_HELP_STRING([--without-faudio],[do not use FAudio (XAudio2 support)])) AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])) @@ -86,6 +87,10 @@ AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwi AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) 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(x11-xcb, AS_HELP_STRING([--without-x11-xcb],[do not use Xlib XCB support]), + [if test "x$withval" = "xno"; then ac_cv_header_X11_Xlib_xcb_h=no; fi]) +AC_ARG_WITH(xcb-dri3, AS_HELP_STRING([--without-xcb-dri3],[do not use XCB DRI3 support]), + [if test "x$withval" = "xno"; then ac_cv_header_xcb_dri3_h=no; fi]) 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]) AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]), @@ -1115,6 +1120,7 @@ then dnl *** All of the following tests require X11/Xlib.h AC_CHECK_HEADERS([X11/Xlib.h \ + X11/Xlib-xcb.h \ X11/XKBlib.h \ X11/Xutil.h \ X11/Xcursor/Xcursor.h \ @@ -1226,6 +1232,48 @@ then WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"], [libxrandr ${notice_platform}development files not found, XRandr won't be supported.]) + dnl *** Check for Xlib XCB + if test "$ac_cv_header_X11_Xlib_xcb_h" = "yes" -a "x$ac_cv_lib_soname_Xrandr" != "x" + then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib-xcb.h>]], + [[static typeof(XGetXCBConnection) * func; if (func) return 0;]])], + [WINE_CHECK_SONAME(X11-xcb, XGetXCBConnection,,, [$X_LIBS $X_EXTRA_LIBS])], + [WINE_NOTICE([libx11-xcb ${notice_platform}development files too old, Xlib XCB won't be supported.])]) + fi + WINE_NOTICE_WITH(x11_xcb, [test "x$ac_cv_lib_soname_X11_xcb" = "x"], + [libx11-xcb ${notice_platform}development files not found, Xlib XCB won't be supported.]) + + dnl *** Check for XCB DRI3 + if test "x$ac_cv_lib_soname_X11_xcb" != "x" + then + AC_CHECK_HEADERS([xcb/dri3.h]) + if test "$ac_cv_header_xcb_dri3_h" = "yes" + then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xcb/dri3.h>]], + [[static typeof(xcb_dri3_open) * func; if (func) return 0;]])], + [WINE_CHECK_SONAME(xcb-dri3, xcb_dri3_open,,, [$X_LIBS $X_EXTRA_LIBS])], + [WINE_NOTICE([libxcb-dri3 ${notice_platform}development files too old, XCB DRI3 won't be supported.])]) + fi + fi + WINE_NOTICE_WITH(xcb_dri3, [test "x$ac_cv_lib_soname_xcb_dri3" = "x"], + [libxcb-dri3 ${notice_platform}development files not found, XCB DRI3 won't be supported.]) + + dnl *** Check for libdrm + if test "x$with_drm" != "xno" -a "x$ac_cv_lib_soname_Xrandr" != "x" + then + WINE_PACKAGE_FLAGS(DRM, [libdrm],,,, + [AC_CHECK_HEADERS([xf86drm.h]) + if test "$ac_cv_header_xf86drm_h" = "yes" + then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xf86drm.h>]], + [[static typeof(drmGetDevice) * func; if (func) return 0;]])], + [WINE_CHECK_SONAME(drm, drmGetDevice,,, [$DRM_LIBS])], + [WINE_NOTICE([libdrm ${notice_platform}development files too old, DRM may not work.])]) + fi]) + fi + WINE_NOTICE_WITH(drm, [test "x$ac_cv_lib_soname_drm" = "x"], + [libdrm ${notice_platform}development files not found, DRM won't be supported.]) + dnl *** Check for Xfixes extension if test "$ac_cv_header_X11_extensions_Xfixes_h" = "yes" then diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 3e2d7ef895..71258a0a23 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winex11.drv IMPORTS = uuid setupapi rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 ole32 shell32 imm32 -EXTRAINCL = $(X_CFLAGS) +EXTRAINCL = $(X_CFLAGS) $(DRM_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) C_SRCS = \ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 930e0282be..d405dcba7a 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -33,6 +33,15 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> +#ifdef HAVE_X11_XLIB_XCB_H +#include <X11/Xlib-xcb.h> +#endif +#ifdef HAVE_XCB_DRI3_H +#include <xcb/dri3.h> +#endif +#ifdef HAVE_XF86DRM_H +#include <xf86drm.h> +#endif #include "x11drv.h" #include "wine/heap.h" @@ -76,6 +85,25 @@ MAKE_FUNCPTR(XRRGetProviderInfo) MAKE_FUNCPTR(XRRFreeProviderInfo) #endif +#if defined(SONAME_LIBX11_XCB) && defined(SONAME_LIBXCB_DRI3) +MAKE_FUNCPTR(XGetXCBConnection) +MAKE_FUNCPTR(xcb_dri3_id) +MAKE_FUNCPTR(xcb_dri3_open) +MAKE_FUNCPTR(xcb_dri3_open_reply) +MAKE_FUNCPTR(xcb_dri3_open_reply_fds) +MAKE_FUNCPTR(xcb_get_extension_data) +static void *x11_xcb_handle; +static void *xcb_dri3_handle; +static BOOL dri3_loaded; +#endif + +#ifdef SONAME_LIBDRM +MAKE_FUNCPTR(drmFreeDevice) +MAKE_FUNCPTR(drmGetDevice) +static void *drm_handle; +static BOOL drm_loaded; +#endif + #undef MAKE_FUNCPTR static struct x11drv_mode_info *dd_modes; @@ -91,49 +119,73 @@ static int load_xrandr(void) (xrandr_handle = wine_dlopen(SONAME_LIBXRANDR, RTLD_NOW, NULL, 0))) { -#define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(xrandr_handle, #f, NULL, 0)) == NULL) \ +#define LOAD_SYMBOL(library, symbol) \ + if((p##symbol = wine_dlsym(library##_handle, #symbol, NULL, 0)) == NULL) \ goto sym_not_found; - LOAD_FUNCPTR(XRRConfigCurrentConfiguration) - LOAD_FUNCPTR(XRRConfigCurrentRate) - LOAD_FUNCPTR(XRRFreeScreenConfigInfo) - LOAD_FUNCPTR(XRRGetScreenInfo) - LOAD_FUNCPTR(XRRQueryExtension) - LOAD_FUNCPTR(XRRQueryVersion) - LOAD_FUNCPTR(XRRRates) - LOAD_FUNCPTR(XRRSetScreenConfig) - LOAD_FUNCPTR(XRRSetScreenConfigAndRate) - LOAD_FUNCPTR(XRRSizes) + LOAD_SYMBOL(xrandr, XRRConfigCurrentConfiguration) + LOAD_SYMBOL(xrandr, XRRConfigCurrentRate) + LOAD_SYMBOL(xrandr, XRRFreeScreenConfigInfo) + LOAD_SYMBOL(xrandr, XRRGetScreenInfo) + LOAD_SYMBOL(xrandr, XRRQueryExtension) + LOAD_SYMBOL(xrandr, XRRQueryVersion) + LOAD_SYMBOL(xrandr, XRRRates) + LOAD_SYMBOL(xrandr, XRRSetScreenConfig) + LOAD_SYMBOL(xrandr, XRRSetScreenConfigAndRate) + LOAD_SYMBOL(xrandr, XRRSizes) r = 1; #ifdef HAVE_XRRGETSCREENRESOURCES - LOAD_FUNCPTR(XRRFreeCrtcInfo) - LOAD_FUNCPTR(XRRFreeOutputInfo) - LOAD_FUNCPTR(XRRFreeScreenResources) - LOAD_FUNCPTR(XRRGetCrtcInfo) - LOAD_FUNCPTR(XRRGetOutputInfo) - LOAD_FUNCPTR(XRRGetScreenResources) - LOAD_FUNCPTR(XRRSetCrtcConfig) - LOAD_FUNCPTR(XRRSetScreenSize) + LOAD_SYMBOL(xrandr, XRRFreeCrtcInfo) + LOAD_SYMBOL(xrandr, XRRFreeOutputInfo) + LOAD_SYMBOL(xrandr, XRRFreeScreenResources) + LOAD_SYMBOL(xrandr, XRRGetCrtcInfo) + LOAD_SYMBOL(xrandr, XRRGetOutputInfo) + LOAD_SYMBOL(xrandr, XRRGetScreenResources) + LOAD_SYMBOL(xrandr, XRRSetCrtcConfig) + LOAD_SYMBOL(xrandr, XRRSetScreenSize) r = 2; #endif #ifdef HAVE_XRRGETPROVIDERRESOURCES - LOAD_FUNCPTR(XRRSelectInput) - LOAD_FUNCPTR(XRRGetOutputPrimary) - LOAD_FUNCPTR(XRRGetProviderResources) - LOAD_FUNCPTR(XRRFreeProviderResources) - LOAD_FUNCPTR(XRRGetProviderInfo) - LOAD_FUNCPTR(XRRFreeProviderInfo) + LOAD_SYMBOL(xrandr, XRRSelectInput) + LOAD_SYMBOL(xrandr, XRRGetOutputPrimary) + LOAD_SYMBOL(xrandr, XRRGetProviderResources) + LOAD_SYMBOL(xrandr, XRRFreeProviderResources) + LOAD_SYMBOL(xrandr, XRRGetProviderInfo) + LOAD_SYMBOL(xrandr, XRRFreeProviderInfo) r = 4; #endif -#undef LOAD_FUNCPTR +#if defined(SONAME_LIBX11_XCB) && defined(SONAME_LIBXCB_DRI3) + if ((x11_xcb_handle = wine_dlopen(SONAME_LIBX11_XCB, RTLD_NOW, NULL, 0)) && + (xcb_dri3_handle = wine_dlopen(SONAME_LIBXCB_DRI3, RTLD_NOW, NULL, 0))) + { + LOAD_SYMBOL(x11_xcb, XGetXCBConnection) + LOAD_SYMBOL(xcb_dri3, xcb_dri3_id) + LOAD_SYMBOL(xcb_dri3, xcb_dri3_open) + LOAD_SYMBOL(xcb_dri3, xcb_dri3_open_reply) + LOAD_SYMBOL(xcb_dri3, xcb_dri3_open_reply_fds) + LOAD_SYMBOL(xcb_dri3, xcb_get_extension_data) + dri3_loaded = TRUE; + } +#endif + +#ifdef SONAME_LIBDRM + if ((drm_handle = wine_dlopen(SONAME_LIBDRM, RTLD_NOW, NULL, 0))) + { + LOAD_SYMBOL(drm, drmFreeDevice) + LOAD_SYMBOL(drm, drmGetDevice) + drm_loaded = TRUE; + } +#endif + +#undef LOAD_SYMBOL + } sym_not_found: - if (!r) TRACE("Unable to load function ptrs from XRandR library\n"); - } + if (!r) + TRACE("Unable to load function ptrs from XRandR library\n"); return r; } @@ -662,6 +714,181 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) crtc->y + crtc->height == primary.bottom; } +static int get_drm_device_from_provider( RRProvider provider ) +{ +#if defined(SONAME_LIBX11_XCB) && defined(SONAME_LIBXCB_DRI3) + const xcb_query_extension_reply_t *extension; + xcb_dri3_open_cookie_t cookie; + xcb_dri3_open_reply_t *reply; + xcb_connection_t *connection; + int *fds, fd; + + if (!dri3_loaded) + return -1; + + connection = pXGetXCBConnection( gdi_display ); + extension = pxcb_get_extension_data( connection, pxcb_dri3_id ); + if (!extension || !extension->present) + { + WARN("DRI3 is unsupported.\n"); + return -1; + } + + cookie = pxcb_dri3_open( connection, DefaultRootWindow( gdi_display ), provider ); + reply = pxcb_dri3_open_reply( connection, cookie, NULL ); + + if (!reply) + return -1; + + if (reply->nfd != 1) + { + free( reply ); + return -1; + } + + fds = pxcb_dri3_open_reply_fds( connection, reply ); + fd = fds[0]; + free( reply ); + fcntl( fd, F_SETFD, FD_CLOEXEC ); + return fd; +#endif /* defined(SONAME_LIBX11_XCB) && defined(SONAME_LIBXCB_DRI3) */ + + WARN("DRI3 support not compiled in. Finding a DRM device with a RandR provider won't work!\n"); + return -1; +} + +/* Fallback when DRI3 is unavailable. For example, GPUs using NVIDIA proprietary drivers. + * This functions may not get the correct device when there are multiple GPUs present */ +static int get_drm_device_from_index( int gpu_index ) +{ +#ifdef __linux__ + char device_path[MAX_PATH]; + int fd; + + sprintf( device_path, "/dev/dri/card%d", gpu_index ); + fd = open( device_path, O_RDONLY ); + if (fd < 0) + return -1; + + fcntl( fd, F_SETFD, FD_CLOEXEC ); + return fd; +#endif /* __linux__ */ + + return -1; +} + +#ifdef __linux__ +static unsigned int read_id( const char *device_name, const char *id_name ) +{ + char filename[MAX_PATH]; + unsigned int id = 0; + FILE *file; + + sprintf( filename, "%s/%s", device_name, id_name ); + file = fopen( filename, "r" ); + if (!file) + return 0; + + fscanf( file, "%x", &id ); + fclose( file ); + return id; +} +#endif /* __linux__ */ + +static BOOL get_gpu_pci_id( struct x11drv_gpu *gpu, int gpu_index ) +{ + int fd = get_drm_device_from_provider( (RRProvider)gpu->id ); + + if (fd < 0) + fd = get_drm_device_from_index( gpu_index ); + + if (fd < 0) + { + WARN("Failed to get DRM device.\n"); + return FALSE; + } + +#ifdef SONAME_LIBDRM + { + drmDevice *device; + int ret; + + if (!drm_loaded) + { + close( fd ); + return FALSE; + } + + ret = pdrmGetDevice( fd, &device ); + close( fd ); + + if (ret != 0) + return FALSE; + + if (device->bustype != DRM_BUS_PCI) + { + pdrmFreeDevice( &device ); + return FALSE; + } + + gpu->vendor_id = device->deviceinfo.pci->vendor_id; + gpu->device_id = device->deviceinfo.pci->device_id; + gpu->subsys_id = (UINT)device->deviceinfo.pci->subdevice_id << 16 | device->deviceinfo.pci->subvendor_id; + gpu->revision_id = device->deviceinfo.pci->revision_id; + pdrmFreeDevice( &device ); + return TRUE; + } +#endif /* SONAME_LIBDRM */ + + /* Fallback on Linux when libdrm is too old to have drmGetDevice() */ +#ifdef __linux__ + { + char fd_path[MAX_PATH], link[MAX_PATH], device_path[128], node_name[64]; + char *subsystem_name, subsystem_path[MAX_PATH]; + int ret; + + /* Get DRM device path from fd */ + snprintf( fd_path, sizeof(fd_path), "/proc/self/fd/%d", fd ); + ret = readlink( fd_path, link, sizeof(link) - 1 ); + close( fd ); + + if (ret < 0) + return FALSE; + + link[ret] = 0; + if (sscanf( link, "/dev/dri/%63s", node_name ) != 1) + return FALSE; + + snprintf( device_path, sizeof(device_path), "/sys/class/drm/%s/device", node_name ); + snprintf( subsystem_path, sizeof(subsystem_path), "%s/subsystem", device_path ); + + /* Check if device is using PCI */ + ret = readlink( subsystem_path, link, sizeof(link) - 1 ); + if (ret < 0) + return FALSE; + + link[ret] = 0; + subsystem_name = strrchr( link, '/' ); + if (!subsystem_name) + return FALSE; + + if (strncmp( subsystem_name + 1, "pci", 3 )) + return FALSE; + + /* Read IDs */ + gpu->vendor_id = read_id( device_path, "vendor" ); + gpu->device_id = read_id( device_path, "device" ); + gpu->subsys_id = read_id( device_path, "subsystem_device" ) << 16 | read_id( device_path, "subsystem_vendor" ); + gpu->revision_id = read_id( device_path, "revision" ); + return TRUE; + } +#endif /* __linux__ */ + + close( fd ); + WARN("DRM support not compiled in. No valid PCI ID will be reported for GPUs.\n"); + return FALSE; +} + static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -725,9 +952,13 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) gpus[i].id = provider_resources->providers[i]; MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); - /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report - * their PCI address in the name but many others don't */ pXRRFreeProviderInfo( provider_info ); + + if (!get_gpu_pci_id( &gpus[i], i )) + WARN("Failed to get PCI ID for GPU %s\n", wine_dbgstr_w(gpus[i].name)); + + TRACE("name:%s vendor id:0x%04x device id:0x%04x subsystem id:0x%08x revision id:0x%02x\n", + wine_dbgstr_w(gpus[i].name), gpus[i].vendor_id, gpus[i].device_id, gpus[i].subsys_id, gpus[i].revision_id); } /* Make primary GPU the first */ -- 2.20.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 21 Feb '20

21 Feb '20

1 0

[PATCH v3 1/2] kernel32/tests: Add tests for ContinueDebugEvent with DBG_REPLY_LATER.
by Rémi Bernon 21 Feb '20

21 Feb '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 62 +++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index a2b5d1f410e..7fe4f872282 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -309,6 +309,56 @@ static void fetch_process_context(struct debugger_context *ctx) #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 +#define test_reply_later(a) test_reply_later_(__LINE__,a) +static void test_reply_later_(unsigned int line, struct debugger_context *ctx) +{ + DEBUG_EVENT de0, de1; + HANDLE thread; + NTSTATUS status; + + if (!ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_REPLY_LATER)) + todo_wine win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); + else + { + ok_(__FILE__,line)(WaitForDebugEvent(&de0, 50), "WaitForDebugEvent failed, last error:%u\n", GetLastError()); + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == de0.dwDebugEventCode, + "delayed event differ, code:%x was:%x\n", de0.dwDebugEventCode, ctx->ev.dwDebugEventCode); + ok_(__FILE__,line)(ctx->ev.dwProcessId == de0.dwProcessId, + "delayed event differ, pid:%x was:%x\n", de0.dwProcessId, ctx->ev.dwProcessId); + ok_(__FILE__,line)(ctx->ev.dwThreadId == de0.dwThreadId, + "delayed event differ, tid:%x was:%x\n", de0.dwThreadId, ctx->ev.dwThreadId); + + if (ctx->ev.dwDebugEventCode != CREATE_PROCESS_DEBUG_EVENT && + ctx->ev.dwDebugEventCode != CREATE_THREAD_DEBUG_EVENT && + ctx->ev.dwDebugEventCode != EXIT_THREAD_DEBUG_EVENT && + ctx->ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT) + { + thread = OpenThread(THREAD_SUSPEND_RESUME, FALSE, ctx->ev.dwThreadId); + ok_(__FILE__,line)(thread != INVALID_HANDLE_VALUE, "OpenThread failed, last error:%u\n", GetLastError()); + + status = NtSuspendThread(thread, NULL); + ok_(__FILE__,line)(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); + + ok_(__FILE__,line)(ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_REPLY_LATER), + "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + + ok_(__FILE__,line)(!WaitForDebugEvent(&de1, 50), "WaitForDebugEvent succeeded.\n"); + status = NtResumeThread(thread, NULL); + + ok_(__FILE__,line)(!status, "NtResumeThread failed, last error:%u\n", GetLastError()); + CloseHandle(thread); + + ok_(__FILE__,line)(WaitForDebugEvent(&de1, 50), "WaitForDebugEvent failed, last error:%u\n", GetLastError()); + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == de1.dwDebugEventCode, + "delayed event differ, code:%x was:%x\n", de1.dwDebugEventCode, ctx->ev.dwDebugEventCode); + ok_(__FILE__,line)(ctx->ev.dwProcessId == de1.dwProcessId, + "delayed event differ, pid:%x was:%x\n", de1.dwProcessId, ctx->ev.dwProcessId); + ok_(__FILE__,line)(ctx->ev.dwThreadId == de1.dwThreadId, + "delayed event differ, tid:%x was:%x\n", de1.dwThreadId, ctx->ev.dwThreadId); + } + } +} + #define next_event(a,b) next_event_(__LINE__,a,b) static void next_event_(unsigned line, struct debugger_context *ctx, unsigned timeout) { @@ -1273,7 +1323,11 @@ static void test_debugger(const char *argv0) next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); wait_for_breakpoint(&ctx); - do next_event(&ctx, POLL_EVENT_TIMEOUT); + do + { + test_reply_later(&ctx); + next_event(&ctx, POLL_EVENT_TIMEOUT); + } while(ctx.ev.dwDebugEventCode != -1); mem = VirtualAllocEx(pi.hProcess, NULL, sizeof(buf), MEM_COMMIT, PAGE_EXECUTE_READWRITE); @@ -1297,6 +1351,7 @@ static void test_debugger(const char *argv0) debuggee_thread = get_debuggee_thread(&ctx, ctx.ev.dwThreadId); wait_for_breakpoint(&ctx); + test_reply_later(&ctx); fetch_thread_context(debuggee_thread); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); @@ -1304,8 +1359,11 @@ static void test_debugger(const char *argv0) get_ip(&debuggee_thread->ctx)); single_step(&ctx, debuggee_thread, thread_proc + 2); + test_reply_later(&ctx); single_step(&ctx, debuggee_thread, thread_proc + 3); + test_reply_later(&ctx); single_step(&ctx, debuggee_thread, thread_proc); + test_reply_later(&ctx); byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc, &byte, 1, NULL); @@ -1328,6 +1386,7 @@ static void test_debugger(const char *argv0) ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); expect_event(&ctx, CREATE_THREAD_DEBUG_EVENT); expect_breakpoint_exception(&ctx, NULL); + test_reply_later(&ctx); expect_event(&ctx, EXIT_THREAD_DEBUG_EVENT); /* BREAKPOINT_PROMPT */ @@ -1422,6 +1481,7 @@ static void test_debugger(const char *argv0) do { + test_reply_later(&ctx); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok (ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "got exception\n"); } -- 2.25.0

2 4

Re: [PATCH v10] include: Add xact3.idl
by Alistair Leslie-Hughes 21 Feb '20

21 Feb '20

On 14/2/20 6:08 pm, Alistair Leslie-Hughes wrote: > > > On 14/2/20 1:40 pm, Dmitry Timoshkov wrote: >> Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: >> >>> +cpp_quote("typedef struct XACT_WAVE_INSTANCE_PROPERTIES") >>> +cpp_quote("{") >>> +cpp_quote(" XACT_WAVE_PROPERTIES properties;") >>> +cpp_quote(" BOOL backgroundMusic;") >>> +cpp_quote("} XACT_WAVE_INSTANCE_PROPERTIES;") >> >> Is there a reason why this one needs to use cpp_quote? >> > properties is a keyword in midl which causes an error when the header is > generated. Just above this cide is a version which midl is happy with. I've just re looked at this this, midl doesn't support cpp_quote inside of a struct. So it has to be manually defined. Alistair.

1 0

[PATCH] msvcrt/tests: Simplify the name of the test unit for child processes.
by Francois Gouget 21 Feb '20

21 Feb '20

The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/msvcrt/tests/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 63d5100de28..0c4e024a8ec 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1464,7 +1464,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = get_base_name(selfname); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; @@ -1477,7 +1477,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; @@ -2168,7 +2168,7 @@ static void test_pipes(const char* selfname) } arg_v[0] = get_base_name(selfname); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); @@ -2197,7 +2197,7 @@ static void test_pipes(const char* selfname) return; } - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); -- 2.20.1

1 0

[PATCH] shell32/tests: Simplify the name of the test unit for child processes.
by Francois Gouget 21 Feb '20

21 Feb '20

The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9ec72263128..f3a634dc298 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1779,7 +1779,7 @@ static void test_NonExistentPath(void) STARTUPINFOA startup; PROCESS_INFORMATION info; - sprintf(buffer, "%s tests/shellpath.c 1", selfname); + sprintf(buffer, "%s shellpath 1", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -1794,7 +1794,7 @@ static void test_NonExistentPath(void) strlen(originalPath) + 1); RegFlushKey(key); - sprintf(buffer, "%s tests/shellpath.c 2", selfname); + sprintf(buffer, "%s shellpath 2", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; -- 2.20.1

1 0

[PATCH] include: Update wcstok declarations.
by Daniel Lehman 21 Feb '20

21 Feb '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- follow-up to 31c57484ab5927fa61489fb607aeb023e9fb1b1b for winelib --- include/msvcrt/string.h | 16 +++++++++++++++- include/msvcrt/wchar.h | 16 +++++++++++++++- include/tchar.h | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index f8bc40fb2a..a8bf04d5b4 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -119,8 +119,22 @@ _ACRTIMP wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); _ACRTIMP size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*); -_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +_ACRTIMP wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**); _ACRTIMP size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); + +#ifdef _UCRT +_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**); +static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# ifdef __cplusplus +extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# elif defined(_CRT_NON_CONFORMING_WCSTOK) +# define wcstok _wcstok +# endif +#else /* _UCRT */ +_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +# define _wcstok wcstok +#endif /* _UCRT */ + #endif /* _WSTRING_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 0b7be92174..c406e35701 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -174,8 +174,22 @@ wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*); -wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); + +#ifdef _UCRT +wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**); +static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# ifdef __cplusplus +extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# elif defined(_CRT_NON_CONFORMING_WCSTOK) +# define wcstok _wcstok +# endif +#else /* _UCRT */ +wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +# define _wcstok wcstok +#endif /* _UCRT */ + #endif /* _WSTRING_DEFINED */ wchar_t __cdecl btowc(int); diff --git a/include/tchar.h b/include/tchar.h index e14aaf3884..9fc4c72099 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -148,7 +148,7 @@ extern "C" { #define _tcsspn WINE_tchar_routine(strspn, _mbsspn, wcsspn) #define _tcsstr WINE_tchar_routine(strstr, _mbsstr, wcsstr) #define _tcstod WINE_tchar_routine(strtod, strtod, wcstod) -#define _tcstok WINE_tchar_routine(strtok, _mbstok, wcstok) +#define _tcstok WINE_tchar_routine(strtok, _mbstok, _wcstok) #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul) #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr) -- 2.17.1

1 0