April 2019 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Assign *device in adapter_vk_create_device().
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 750016bc8d5f54bb49c305b6fa878181c8e28d3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=750016bc8d5f54bb49c305b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 13:06:40 2019 +0200 wined3d: Assign *device in adapter_vk_create_device(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2047e71..cb4dbab 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -268,6 +268,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } + *device = &device_vk->d; + return WINED3D_OK; fail:

1 0

Alexandre Julliard : makefiles: Also pass -fPIC flag when linking.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 8039941c52758113955d376bd7b6b6e1e5b5f76c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8039941c52758113955d376b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 22:42:17 2019 +0200 makefiles: Also pass -fPIC flag when linking. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- configure | 15 ++++++++++----- configure.ac | 11 ++++++++--- tools/makedep.c | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index ffdd61c..63e58d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ EXTRACFLAGS = @EXTRACFLAGS@ EXTRACROSSCFLAGS= @EXTRACROSSCFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ -UNWINDFLAGS = @UNWINDFLAGS@ +LDDLLFLAGS = @LDDLLFLAGS@ LDEXECFLAGS = @LDEXECFLAGS@ LIBS = @LIBS@ BISON = @BISON@ diff --git a/configure b/configure index 253a820..40c6a7d 100755 --- a/configure +++ b/configure @@ -631,7 +631,6 @@ RT_LIBS POLL_LIBS DL_LIBS TOOLSEXT -UNWINDFLAGS BUILTINFLAG EXCESS_PRECISION_CFLAGS EXTRACFLAGS @@ -743,6 +742,7 @@ WINELOADER_LDFLAGS TOP_INSTALL_DEV TOP_INSTALL_LIB LDEXECFLAGS +LDDLLFLAGS LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS @@ -7849,6 +7849,8 @@ LDRPATH_INSTALL="" LDRPATH_LOCAL="" +LDDLLFLAGS="" + LDEXECFLAGS="" TOP_INSTALL_LIB="" @@ -8660,6 +8662,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" COREFOUNDATION_LIBS="-framework CoreFoundation" @@ -9038,6 +9041,7 @@ fi linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDEXECFLAGS="-Wl,-pie" enable_wineandroid_drv=${enable_wineandroid_drv:-yes} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 @@ -9280,9 +9284,11 @@ fi *) case $host_cpu in *i[3456789]86*) - DLLFLAGS="$DLLFLAGS -fno-PIC" ;; + DLLFLAGS="$DLLFLAGS -fno-PIC" + LDDLLFLAGS="-fno-PIC" ;; *) - DLLFLAGS="$DLLFLAGS -fPIC" ;; + DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5 $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; } @@ -17548,8 +17554,7 @@ then $as_echo "#define __ASM_CFI(str) str" >>confdefs.h - UNWINDFLAGS=-fasynchronous-unwind-tables - + LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else $as_echo "#define __ASM_CFI(str) \"\"" >>confdefs.h diff --git a/configure.ac b/configure.ac index cb98a45..e35189c 100644 --- a/configure.ac +++ b/configure.ac @@ -707,6 +707,7 @@ dnl **** Check for working dll **** AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") +AC_SUBST(LDDLLFLAGS,"") AC_SUBST(LDEXECFLAGS,"") AC_SUBST(TOP_INSTALL_LIB,"") AC_SUBST(TOP_INSTALL_DEV,"") @@ -746,6 +747,7 @@ case $host_os in AC_LANG_POP([Objective C]) LIBEXT="dylib" DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" dnl declare needed frameworks @@ -891,6 +893,7 @@ case $host_os in linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" LDEXECFLAGS="-Wl,-pie" enable_wineandroid_drv=${enable_wineandroid_drv:-yes} WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], @@ -926,9 +929,11 @@ case $host_os in *) case $host_cpu in *i[[3456789]]86*) - DLLFLAGS="$DLLFLAGS -fno-PIC" ;; + DLLFLAGS="$DLLFLAGS -fno-PIC" + LDDLLFLAGS="-fno-PIC" ;; *) - DLLFLAGS="$DLLFLAGS -fPIC" ;; + DLLFLAGS="$DLLFLAGS -fPIC" + LDDLLFLAGS="-fPIC" ;; esac AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf, [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic], @@ -2137,7 +2142,7 @@ then asm_func_header="$asm_func_header.cfi_startproc\\n\\t" asm_func_trailer="\\n\\t.cfi_endproc$asm_func_trailer" AC_DEFINE([__ASM_CFI(str)],[str],[Define to a macro to output a .cfi assembly pseudo-op]) - AC_SUBST([UNWINDFLAGS],[-fasynchronous-unwind-tables]) + LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else AC_DEFINE([__ASM_CFI(str)],[""]) if test "x$enable_win64" = "xyes" diff --git a/tools/makedep.c b/tools/makedep.c index 05c574d..f5c5e0a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -134,7 +134,7 @@ static struct strarray msvcrt_flags; static struct strarray extra_cflags; static struct strarray extra_cross_cflags; static struct strarray cpp_flags; -static struct strarray unwind_flags; +static struct strarray lddll_flags; static struct strarray libs; static struct strarray enable_tests; static struct strarray cmdline_vars; @@ -2282,7 +2282,7 @@ static void output_winegcc_command( struct makefile *make, int cross ) else { output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_filenames( lddll_flags ); } } @@ -4201,7 +4201,7 @@ int main( int argc, char *argv[] ) extra_cflags = get_expanded_make_var_array( top_makefile, "EXTRACFLAGS" ); extra_cross_cflags = get_expanded_make_var_array( top_makefile, "EXTRACROSSCFLAGS" ); cpp_flags = get_expanded_make_var_array( top_makefile, "CPPFLAGS" ); - unwind_flags = get_expanded_make_var_array( top_makefile, "UNWINDFLAGS" ); + lddll_flags = get_expanded_make_var_array( top_makefile, "LDDLLFLAGS" ); libs = get_expanded_make_var_array( top_makefile, "LIBS" ); enable_tests = get_expanded_make_var_array( top_makefile, "ENABLE_TESTS" ); top_install_lib = get_expanded_make_var_array( top_makefile, "TOP_INSTALL_LIB" );

1 0

Jefferson Carpenter : server: Add __pad member to pe_image_info_t and zero it.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: dd318b135d359cc6ea558214b32122ef42d21a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd318b135d359cc6ea558214… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Apr 30 04:10:55 2019 +0000 server: Add __pad member to pe_image_info_t and zero it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47032 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 1 + server/mapping.c | 1 + server/protocol.def | 1 + 3 files changed, 3 insertions(+) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9e26aa4..e0b6384 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -714,6 +714,7 @@ typedef struct unsigned int file_size; unsigned int checksum; cpu_type_t cpu; + int __pad; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02 diff --git a/server/mapping.c b/server/mapping.c index 3480724..8a6c4f1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -703,6 +703,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.gp = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; + mapping->image.__pad = 0; if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) diff --git a/server/protocol.def b/server/protocol.def index 79e9802..90f26d4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -730,6 +730,7 @@ typedef struct unsigned int file_size; unsigned int checksum; cpu_type_t cpu; + int __pad; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02

1 0

Józef Kucia : wined3d: Make wined3d_gpu_description from Vulkan physical device properties.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: cf9623e68f1dbd87102ee4593f3ef61e53ebe219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf9623e68f1dbd87102ee459… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 13:06:39 2019 +0200 wined3d: Make wined3d_gpu_description from Vulkan physical device properties. This fallback for cards that are not present in wined3d database should be quite accurate. Almost all information required to fill wined3d_gpu_description can be retrieved from Vulkan. The GPU description string is expected to be slightly different from Windows. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 42 ++++++++++++++++++++++++++++-------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++++- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3709c94..2047e71 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -618,34 +618,53 @@ static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_in return physical_devices[0]; } -const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysicalDeviceProperties *properties) +static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor vendor) { - const struct wined3d_gpu_description *description; + switch (vendor) + { + case HW_VENDOR_AMD: return DRIVER_AMD_RX; + case HW_VENDOR_INTEL: return DRIVER_INTEL_HD4000; + case HW_VENDOR_NVIDIA: return DRIVER_NVIDIA_GEFORCE8; + default: return DRIVER_WINE; + } +} + +static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, + const VkPhysicalDeviceProperties *properties) +{ + const struct wined3d_gpu_description *gpu_description; + struct wined3d_gpu_description description; TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); - if (!(description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) - description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) + gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); - if (!description) + /* FIXME: Get vidmem from Vulkan. */ + if (!gpu_description) { FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", debugstr_a(properties->deviceName), properties->vendorID, properties->deviceID); - description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); + description.vendor = properties->vendorID; + description.device = properties->deviceID; + description.description = properties->deviceName; + description.driver = guess_display_driver(properties->vendorID); + description.vidmem = 0; + + gpu_description = &description; } - return description; + wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; @@ -676,12 +695,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); adapter_vk->device_limits = properties2.properties.limits; - if (!(gpu_description = get_vulkan_gpu_description(&properties2.properties))) - { - ERR("Failed to get GPU description.\n"); - goto fail_vulkan; - } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + adapter_vk_init_driver_info(adapter, &properties2.properties); memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 30acebd..b8c151d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -615,7 +615,7 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vendor = gpu_desc->vendor; driver_info->device = gpu_desc->device; - driver_info->description = gpu_desc->description; + wined3d_copy_name(driver_info->description, gpu_desc->description, ARRAY_SIZE(driver_info->description)); driver_info->vram_bytes = vram_bytes ? vram_bytes : (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e0aef5..00e1de6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2675,12 +2675,15 @@ const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description( enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN; +/* 512 in Direct3D 8/9, 128 in DXGI. */ +#define WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH 512 + struct wined3d_driver_info { enum wined3d_pci_vendor vendor; enum wined3d_pci_device device; const char *name; - const char *description; + char description[WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH]; UINT64 vram_bytes; UINT64 sysmem_bytes; DWORD version_high;

1 0

Jacek Caban : ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 73568dab0b8a82e510f805a91c4d19b843726e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73568dab0b8a82e510f805a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:37:03 2019 +0200 ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6e00041..0bb83cb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1361,11 +1361,11 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, { case IRP_MJ_READ: irpsp->Parameters.Read.Length = length; - irpsp->Parameters.Read.ByteOffset = *startoffset; + irpsp->Parameters.Read.ByteOffset.QuadPart = startoffset ? startoffset->QuadPart : 0; break; case IRP_MJ_WRITE: irpsp->Parameters.Write.Length = length; - irpsp->Parameters.Write.ByteOffset = *startoffset; + irpsp->Parameters.Write.ByteOffset.QuadPart = startoffset ? startoffset->QuadPart : 0; break; } irp->RequestorMode = KernelMode;

1 0

Józef Kucia : dxgi: Avoid magic constants.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: c03184001ec5eeb9bf90a452119ccc033d17398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c03184001ec5eeb9bf90a452… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 13:06:41 2019 +0200 dxgi: Avoid magic constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d96cb1e..859c24a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -149,8 +149,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_DESC3 *desc) { + char description[ARRAY_SIZE(desc->Description)]; struct wined3d_adapter_identifier adapter_id; - char description[128]; HRESULT hr; adapter_id.driver_size = 0; @@ -161,7 +161,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; - if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) + if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, ARRAY_SIZE(description))) { DWORD err = GetLastError(); ERR("Failed to translate description %s (%#x).\n", debugstr_a(description), err);

1 0

Zebediah Figura : makefiles: Build with -fno-PIC on i386.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 8f732c66ab37b54c30d63c74f7822ba1d4f04996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f732c66ab37b54c30d63c74… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 29 22:59:36 2019 -0500 makefiles: Build with -fno-PIC on i386. Many applications attempt to hook or copy native API calls, using methods sophisticated enough to recognize any sequence of x86 instructions, but not enough to recognize and account for a GOT register load. Most such cases only care to insert a JMP instruction in the first five bytes, and so are satisfied by adding the hot-patch prefix. However, the madCodeHook 3.x engine attempts to copy the first 15 bytes, and some copy-protection schemes will try to copy the whole function. Building with -fno-PIC on i386, as is the default behaviour for Visual Studio compiled applications, and likely for Windows libraries as well, fixes those applications, and also stops us once and for all wasting time debugging and individually applying DECLSPEC_HOTPATCH. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37540 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47027 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 95 ++++++++++++++++++++++++++++++++---------------------------- configure.ac | 19 +++++++----- 2 files changed, 62 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f732c66ab37b54c30d6…

1 0

Jacek Caban : ntoskrnl.exe: Support SL_INVOKE_ON_CANCEL in IoCompleteRequest.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: b781a00b143954ce6fc04feeb2af52e682df647d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b781a00b143954ce6fc04fee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:36:56 2019 +0200 ntoskrnl.exe: Support SL_INVOKE_ON_CANCEL in IoCompleteRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b6c79d..6e00041 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2218,13 +2218,14 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; routine = irpsp->CompletionRoutine; call_flag = 0; - /* FIXME: add SL_INVOKE_ON_CANCEL support */ if (routine) { if ((irpsp->Control & SL_INVOKE_ON_SUCCESS) && STATUS_SUCCESS == status) call_flag = 1; if ((irpsp->Control & SL_INVOKE_ON_ERROR) && STATUS_SUCCESS != status) call_flag = 1; + if ((irpsp->Control & SL_INVOKE_ON_CANCEL) && irp->Cancel) + call_flag = 1; } ++irp->CurrentLocation; ++irp->Tail.Overlay.s.u2.CurrentStackLocation;

1 0

Józef Kucia : wined3d: Factor out wined3d_copy_name() .
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: ace408edb466ff05ee764c37778f7c616f1f5e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace408edb466ff05ee764c37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 30 13:06:38 2019 +0200 wined3d: Factor out wined3d_copy_name(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a1c0b88..30acebd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -528,6 +528,18 @@ const struct wined3d_gpu_description *wined3d_get_user_override_gpu_description( return gpu_desc; } +static void wined3d_copy_name(char *dst, const char *src, unsigned int dst_size) +{ + size_t len; + + if (dst_size) + { + len = min(strlen(src), dst_size - 1); + memcpy(dst, src, len); + memset(&dst[len], 0, dst_size - len); + } +} + void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { @@ -1198,7 +1210,6 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { const struct wined3d_adapter *adapter; - size_t len; TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", wined3d, adapter_idx, flags, identifier); @@ -1210,21 +1221,8 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, adapter = wined3d->adapters[adapter_idx]; - if (identifier->driver_size) - { - const char *name = adapter->driver_info.name; - len = min(strlen(name), identifier->driver_size - 1); - memcpy(identifier->driver, name, len); - memset(&identifier->driver[len], 0, identifier->driver_size - len); - } - - if (identifier->description_size) - { - const char *description = adapter->driver_info.description; - len = min(strlen(description), identifier->description_size - 1); - memcpy(identifier->description, description, len); - memset(&identifier->description[len], 0, identifier->description_size - len); - } + wined3d_copy_name(identifier->driver, adapter->driver_info.name, identifier->driver_size); + wined3d_copy_name(identifier->description, adapter->driver_info.description, identifier->description_size); /* Note that d3d8 doesn't supply a device name. */ if (identifier->device_name_size)

1 0

Nikolay Sivov : mfplat: Add more attribute guids.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: ec991fbf298d01e6a46c8f365a5ad802145df8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec991fbf298d01e6a46c8f36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 14:26:27 2019 +0300 mfplat: Add more attribute guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 13 +++++++++++++ include/mfidl.idl | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index abb269c..05ee107 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -564,6 +564,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_WRAPPED_TYPE), X(MF_MT_AVG_BITRATE), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS), X(MF_MT_AUDIO_BLOCK_ALIGNMENT), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), @@ -581,16 +582,21 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID), X(MF_MT_AUDIO_FLOAT_SAMPLES_PER_SECOND), X(MFSampleExtension_ForwardedDecodeUnits), X(MF_EVENT_SOURCE_TOPOLOGY_CANCELED), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID), + X(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME), X(MF_MT_VIDEO_ROTATION), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), X(MF_MT_USER_DATA), X(MF_EVENT_STREAM_METADATA_SYSTEMID), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MFSampleExtension_Token), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), X(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE), X(MF_MT_VIDEO_NO_FRAME_ORDERING), X(MFSampleExtension_3DVideo_SampleFormat), @@ -619,6 +625,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_BYTESTREAM_IFO_FILE_URI), X(MF_EVENT_TOPOLOGY_STATUS), X(MF_BYTESTREAM_DLNA_PROFILE_ID), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE), X(MF_MT_MAJOR_TYPE), X(MF_EVENT_SOURCE_CHARACTERISTICS), X(MF_EVENT_SOURCE_CHARACTERISTICS_OLD), @@ -644,10 +651,12 @@ const char *debugstr_attr(const GUID *guid) X(MF_EVENT_SCRUBSAMPLE_TIME), X(MF_MT_INTERLACE_MODE), X(MF_MT_VIDEO_RENDERER_EXTENSION_PROFILE), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE), X(MF_MT_AUDIO_PREFER_WAVEFORMATEX), X(MFSampleExtension_ForwardedDecodeUnitType), X(MF_MT_AUDIO_AVG_BYTES_PER_SECOND), X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), + X(MF_DEVSOURCE_ATTRIBUTE_MEDIA_TYPE), X(MF_EVENT_MFT_INPUT_STREAM_ID), X(MF_READWRITE_MMCSS_PRIORITY), X(MF_MT_VIDEO_3D), @@ -659,6 +668,7 @@ const char *debugstr_attr(const GUID *guid) X(MFSampleExtension_DecodeTimestamp), X(MF_MT_VIDEO_H264_NO_FMOASO), X(MF_SINK_WRITER_DISABLE_THROTTLING), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), @@ -676,6 +686,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SOURCE_READER_DISABLE_DXVA), X(MF_MT_FORWARD_CUSTOM_NALU), X(MF_MT_SECURE), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE), X(MF_MT_VIDEO_3D_LEFT_IS_BASE), #undef X }; @@ -706,6 +717,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_RGB32), X(MFVideoFormat_RGB565), X(MFVideoFormat_RGB555), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID), X(MFVideoFormat_A2R10G10B10), X(MFMediaType_Script), X(MFMediaType_Image), @@ -789,6 +801,7 @@ const char *debugstr_mf_guid(const GUID *guid) X(MFVideoFormat_v410), X(MFMediaType_Video), X(MFAudioFormat_AAC_HDCP), + X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID), X(MFAudioFormat_Dolby_AC3_HDCP), X(MFMediaType_Subtitle), X(MFMediaType_Stream), diff --git a/include/mfidl.idl b/include/mfidl.idl index ac59e0c..2bdb339 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -648,3 +648,18 @@ cpp_quote("EXTERN_GUID(MF_PD_PLAYBACK_BOUNDARY_TIME, 0x6c990d3b, 0xbb8e, 0x477a cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ISVARIABLEBITRATE, 0x33026ee0, 0xe387, 0x4582, 0xae, 0x0a, 0x34, 0xa2, 0xad, 0x3b, 0xaa, 0x18);") cpp_quote("DEFINE_GUID(MF_PD_ADAPTIVE_STREAMING, 0xea0d5d97, 0x29f9, 0x488b, 0xae, 0x6b, 0x7d, 0x6b, 0x41, 0x36, 0x11, 0x2b);") cpp_quote("EXTERN_GUID(MF_PD_SAMI_STYLELIST, 0xe0b73c7f, 0x486d, 0x484e, 0x98, 0x72, 0x4d, 0xe5, 0x19, 0x2a, 0x7b, 0xf8);") + +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, 0xc60ac5fe, 0x252a, 0x478f, 0xa0, 0xef, 0xbc, 0x8f, 0xa5, 0xf7, 0xca, 0xd3);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_MEDIA_TYPE, 0x56a819ca, 0x0c78, 0x4de4, 0xa0, 0xa7, 0x3d, 0xda, 0xba, 0x0f, 0x24, 0xd4);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, 0x60d0e559, 0x52f8, 0x4fa2, 0xbb, 0xce, 0xac, 0xdb, 0x34, 0xa8, 0xec, 0x01);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK, 0x98d24b5e, 0x5930, 0x4614, 0xb5, 0xa1, 0xf6, 0x00, 0xf9, 0x35, 0x5a, 0x78);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ENDPOINT_ID, 0x30da9258, 0xfeb9, 0x47a7, 0xa4, 0x53, 0x76, 0x3a, 0x7a, 0x8e, 0x1c, 0x5f);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_ROLE, 0xbc9d118e, 0x8c67, 0x4a18, 0x85, 0xd4, 0x12, 0xd3, 0x00, 0x40, 0x05, 0x52);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY, 0x77f0ae69, 0xc3bd, 0x4509, 0x94, 0x1d, 0x46, 0x7e, 0x4d, 0x24, 0x89, 0x9e);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_HW_SOURCE, 0xde7046ba, 0x54d6, 0x4487, 0xa2, 0xa4, 0xec, 0x7c, 0x0d, 0x1b, 0xd1, 0x63);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_PROVIDER_DEVICE_ID, 0x36689d42, 0xa06c, 0x40ae, 0x84, 0xcf, 0xf5, 0xa0, 0x34, 0x06, 0x7c, 0xc4);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, 0x58f0aad8, 0x22bf, 0x4f8a, 0xbb, 0x3d, 0xd2, 0xc4, 0x97, 0x8c, 0x6e, 0x2f);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_MAX_BUFFERS, 0x7dd9b730, 0x4f2d, 0x41d5, 0x8f, 0x95, 0x0c, 0xc9, 0xa9, 0x12, 0xba, 0x26);") + +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_GUID, 0x14dd9a1c, 0x7cff, 0x41be, 0xb1, 0xb9, 0xba, 0x1a, 0xc6, 0xec, 0xb5, 0x71);") +cpp_quote("EXTERN_GUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID, 0x8ac3587a, 0x4ae7, 0x42d8, 0x99, 0xe0, 0x0a, 0x60, 0x13, 0xee, 0xf9, 0x0f);")

1 0