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

Alexandre Julliard : configure: Use CROSSCFLAGS when testing the cross-compiler.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: b8a6693e196f0f7f42bafa6a8e5d99f631d4ccdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a6693e196f0f7f42bafa6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 09:43:03 2019 +0200 configure: Use CROSSCFLAGS when testing the cross-compiler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++++------------ configure.ac | 24 ++++++++++++++---------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/configure b/configure index ee80a75..bacbd3e 100755 --- a/configure +++ b/configure @@ -9669,7 +9669,14 @@ test -n "$CROSSCC" || CROSSCC="false" if test "$CROSSCC" != "false" then ac_save_CC="$CC" + saved_CFLAGS=$CFLAGS + CROSSCFLAGS=${CROSSCFLAGS:-$CFLAGS} + + EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall" + + CC="$CROSSCC" + CFLAGS=$CROSSCFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 $as_echo_n "checking whether $CROSSCC works... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9701,13 +9708,6 @@ else $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CC="$ac_save_CC" - CROSSCFLAGS=${CROSSCFLAGS:-$CFLAGS} - - EXTRACROSSCFLAGS="-DWINE_CROSSTEST -Wall" - - - saved_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 $as_echo_n "checking whether the cross-compiler supports -fno-strict-aliasing... " >&6; } if ${ac_cv_cflags__fno_strict_aliasing+:} false; then : @@ -9739,7 +9739,7 @@ $as_echo "$ac_cv_cflags__fno_strict_aliasing" >&6; } if test "x$ac_cv_cflags__fno_strict_aliasing" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -fno-strict-aliasing" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror=unknown-warning-option" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror=unknown-warning-option" >&5 $as_echo_n "checking whether the cross-compiler supports -Werror=unknown-warning-option... " >&6; } if ${ac_cv_cflags__Werror_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 @@ -10239,9 +10239,7 @@ if test "x$ac_cv_cflags__Wno_format" = xyes; then : fi ;; esac - CFLAGS=$saved_CFLAGS - - for ac_flag in $CFLAGS; do + for ac_flag in $CROSSCFLAGS; do case $ac_flag in -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5 $as_echo_n "checking whether the cross-compiler supports -gdwarf-2... " >&6; } @@ -10308,7 +10306,9 @@ fi ;; esac done - test "x$enable_maintainer_mode" != "xyes" || { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 + if test "x$enable_maintainer_mode" = xyes + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Werror" >&5 $as_echo_n "checking whether the cross-compiler supports -Werror... " >&6; } if ${ac_cv_cflags__Werror+:} false; then : $as_echo_n "(cached) " >&6 @@ -10339,6 +10339,10 @@ $as_echo "$ac_cv_cflags__Werror" >&6; } if test "x$ac_cv_cflags__Werror" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Werror" fi + fi + + CFLAGS=$saved_CFLAGS + CC="$ac_save_CC" fi fi if test "x$CROSSTARGET" = "x"; then : diff --git a/configure.ac b/configure.ac index 1311309..b0b7080 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,7 +1002,12 @@ then if test "$CROSSCC" != "false" then ac_save_CC="$CC" + saved_CFLAGS=$CFLAGS + AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS}) + AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall") + CC="$CROSSCC" + CFLAGS=$CROSSCFLAGS AC_MSG_CHECKING([whether $CROSSCC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) @@ -1017,13 +1022,8 @@ then shift done], [AC_MSG_RESULT([no])]) - CC="$ac_save_CC" - AC_SUBST(CROSSCFLAGS,${CROSSCFLAGS:-$CFLAGS}) - AC_SUBST(EXTRACROSSCFLAGS,"-DWINE_CROSSTEST -Wall") - - dnl clang needs to be told to fail on unknown options - saved_CFLAGS=$CFLAGS WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) + dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option]) WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) @@ -1044,17 +1044,21 @@ then x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) ;; esac - CFLAGS=$saved_CFLAGS - dnl Default to dwarf-2 debug info - for ac_flag in $CFLAGS; do + for ac_flag in $CROSSCFLAGS; do case $ac_flag in -g) WINE_TRY_CROSSCFLAGS([-gdwarf-2]) WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;; esac done - test "x$enable_maintainer_mode" != "xyes" || WINE_TRY_CROSSCFLAGS([-Werror]) + if test "x$enable_maintainer_mode" = xyes + then + WINE_TRY_CROSSCFLAGS([-Werror]) + fi + + CFLAGS=$saved_CFLAGS + CC="$ac_save_CC" fi fi WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"],

1 0

Zebediah Figura : qcap/avico: Fix pin IDs.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: f41d11b18a460b7214e257b1f2d85611c0df2eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41d11b18a460b7214e257b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:56 2019 -0500 qcap/avico: Fix pin IDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 4 ++-- dlls/qcap/tests/qcap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index d5a44b2..d5020a0 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -690,8 +690,8 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { - PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n','p','u','t',0}}; - PIN_INFO out_pin_info = {NULL, PINDIR_OUTPUT, {'O','u','t','p','u','t',0}}; + PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n',0}}; + PIN_INFO out_pin_info = {NULL, PINDIR_OUTPUT, {'O','u','t',0}}; AVICompressor *compressor; HRESULT hres; diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 2f6fe1d..20ab2e9 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1832,7 +1832,7 @@ static void test_AviCo(void) ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); - ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + todo_wine ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); hres = IEnumPins_Next(enum_pins, 1, &out_pin, NULL); ok(hres == S_OK, "Next failed: %08x\n", hres); @@ -1841,7 +1841,7 @@ static void test_AviCo(void) ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); ok(pin_info.dir == PINDIR_OUTPUT, "pin_info.dir = %d\n", pin_info.dir); - ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + todo_wine ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); IEnumPins_Release(enum_pins);

1 0

Józef Kucia : vkd3d: Fix memory leak in vkd3d_init_device_caps() (Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: vkd3d Branch: master Commit: abdaa20376c2414408a4aa12f9189b2ed258bc78 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abdaa20376c2414408a4aa1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 11:05:35 2019 +0200 vkd3d: Fix memory leak in vkd3d_init_device_caps() (Coverity). 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> --- libs/vkd3d/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index dd76fd5..43c6830 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1277,6 +1277,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, if (vulkan_info->max_feature_level < create_info->minimum_feature_level) { WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level); + vkd3d_free(*user_extension_supported); + *user_extension_supported = NULL; return E_INVALIDARG; }

1 0

Józef Kucia : tests: Use uint64_t for width and row_pitch (Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: vkd3d Branch: master Commit: de0d7a837b403acae00fd46f24579cf642d08a86 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de0d7a837b403acae00fd46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 11:05:38 2019 +0200 tests: Use uint64_t for width and row_pitch (Coverity). 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> --- tests/d3d12_test_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 9c38caf..6eb9cea 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -320,11 +320,11 @@ static inline unsigned int format_block_height(DXGI_FORMAT format) struct resource_readback { - unsigned int width; + uint64_t width; unsigned int height; unsigned int depth; ID3D12Resource *resource; - unsigned int row_pitch; + uint64_t row_pitch; void *data; };

1 0

Józef Kucia : vkd3d-shader: Avoid mixing enum types ( Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: vkd3d Branch: master Commit: a46a2fb21b320e50692a8fe22874128c9fb8c227 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a46a2fb21b320e50692a8fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 11:05:37 2019 +0200 vkd3d-shader: Avoid mixing enum types (Coverity). 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> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b013416..54c52b7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5408,7 +5408,7 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx assert((input->mask & 0xff) == (output->mask & 0xff)); assert(input->component_type == output->component_type); - if ((input_builtin = get_spirv_builtin_for_sysval(compiler, input->sysval_semantic))) + if ((input_builtin = get_spirv_builtin_for_sysval(compiler, vkd3d_siv_from_sysval(input->sysval_semantic)))) { component_type = input_builtin->component_type; component_count = input_builtin->component_count;

1 0

Józef Kucia : vkd3d-common: Explicitly limit value to UINT_MAX in vkd3d_env_var_as_uint().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: vkd3d Branch: master Commit: 18f8019fd95a51fb1bcdad226c40de3616d13612 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=18f8019fd95a51fb1bcdad2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 11:05:36 2019 +0200 vkd3d-common: Explicitly limit value to UINT_MAX in vkd3d_env_var_as_uint(). 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> --- libs/vkd3d-common/debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 9d10c28..6b9662b 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -22,6 +22,7 @@ #include <ctype.h> #include <errno.h> #include <inttypes.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -310,7 +311,7 @@ unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) errno = 0; r = strtoul(value, &end_ptr, 0); if (!errno && end_ptr != value) - return r; + return min(r, UINT_MAX); } return default_value;

1 0

Józef Kucia : vkd3d-shader: Assert that write masks are valid.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: vkd3d Branch: master Commit: f7fa7a3fb8468815f929ce9e86210e87a71e612f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7fa7a3fb8468815f929ce9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 8 11:05:39 2019 +0200 vkd3d-shader: Assert that write masks are valid. 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> --- libs/vkd3d-shader/spirv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 54c52b7..8795020 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6004,6 +6004,7 @@ static void vkd3d_dxbc_compiler_emit_bitfield_instruction(struct vkd3d_dxbc_comp return; } + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, k = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) @@ -6044,6 +6045,7 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); /* FIXME: Consider a single UnpackHalf2x16 intruction per 2 components. */ + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) @@ -6077,6 +6079,7 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil zero_id = vkd3d_dxbc_compiler_get_constant_float(compiler, 0.0f); /* FIXME: Consider a single PackHalf2x16 intruction per 2 components. */ + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) @@ -7035,6 +7038,7 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc type_id, image.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); texel_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) @@ -7077,6 +7081,7 @@ static void vkd3d_dxbc_compiler_emit_ld_tgsm(struct vkd3d_dxbc_compiler *compile base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, type_id, reg_info.structure_stride, &src[0], VKD3DSP_WRITEMASK_0, &src[1], VKD3DSP_WRITEMASK_0); + assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(dst->write_mask & (VKD3DSP_WRITEMASK_0 << i)))

1 0

Jacek Caban : ntoskrnl.exe: Implement IoCreateSynchronizationEvent.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: fd8bc0c16dcfab29007b4e3af32531aa23145007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd8bc0c16dcfab29007b4e3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 17:43:39 2019 +0100 ntoskrnl.exe: Implement IoCreateSynchronizationEvent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46804 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +---------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/sync.c | 26 ++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 27 +++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 6 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0e9415f..c1a74f1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -402,7 +402,7 @@ static CRITICAL_SECTION_DEBUG handle_map_critsect_debug = }; static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 }; -static NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) +NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { struct object_header *header; void *obj; @@ -3291,15 +3291,6 @@ BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer) } /***************************************************** - * IoCreateSynchronizationEvent (NTOSKRNL.EXE.@) - */ -PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle) -{ - FIXME("(%p %p) stub\n", name, handle); - return (KEVENT *)0xdeadbeaf; -} - -/***************************************************** * IoStartNextPacket (NTOSKRNL.EXE.@) */ VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 43f4747..508f9e6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1395,7 +1395,7 @@ @ stdcall -private ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage @ stdcall -private ZwSetEaFile(long ptr ptr long) NtSetEaFile -@ stdcall -private ZwSetEvent(long ptr) NtSetEvent +@ stdcall ZwSetEvent(long ptr) NtSetEvent @ stdcall -private ZwSetInformationFile(long ptr ptr long long) NtSetInformationFile @ stdcall -private ZwSetInformationJobObject(long long ptr long) NtSetInformationJobObject @ stdcall -private ZwSetInformationObject(long long ptr long) NtSetInformationObject diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 82ee18e..5215b43 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -29,6 +29,7 @@ struct _OBJECT_TYPE { void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN; +NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; extern POBJECT_TYPE ExEventObjectType; extern POBJECT_TYPE ExSemaphoreObjectType; diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 3085543..12dacae 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -219,6 +219,32 @@ static struct _OBJECT_TYPE event_type = { POBJECT_TYPE ExEventObjectType = &event_type; /*********************************************************************** + * IoCreateSynchronizationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateSynchronizationEvent( UNICODE_STRING *name, HANDLE *ret_handle ) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle; + KEVENT *event; + NTSTATUS ret; + + TRACE( "(%p %p)\n", name, ret_handle ); + + InitializeObjectAttributes( &attr, name, 0, 0, NULL ); + ret = NtCreateEvent( &handle, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, TRUE ); + if (ret) return NULL; + + if (kernel_object_from_handle( handle, ExEventObjectType, (void**)&event )) + { + NtClose( handle); + return NULL; + } + + *ret_handle = handle; + return event; +} + +/*********************************************************************** * KeSetEvent (NTOSKRNL.EXE.@) */ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8823746..4a564ef 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -474,6 +474,33 @@ static void test_sync(void) ZwClose(handle); ObDereferenceObject(event); + event = IoCreateSynchronizationEvent(NULL, &handle); + ok(event != NULL, "IoCreateSynchronizationEvent failed\n"); + + ret = wait_single(event, 0); + ok(ret == 0, "got %#x\n", ret); + KeResetEvent(event); + ret = wait_single(event, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + ret = wait_single_handle(handle, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ret = ZwSetEvent(handle, NULL); + ok(!ret, "NtSetEvent returned %#x\n", ret); + ret = wait_single(event, 0); + ok(ret == 0, "got %#x\n", ret); + ret = wait_single_handle(handle, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + KeSetEvent(event, 0, FALSE); + ret = wait_single_handle(handle, 0); + ok(!ret, "got %#x\n", ret); + ret = wait_single(event, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ret = ZwClose(handle); + ok(!ret, "ZwClose returned %#x\n", ret); + /* test semaphores */ KeInitializeSemaphore(&semaphore, 0, 5); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 02c1bf3..e5804c0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1488,6 +1488,7 @@ VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); +PKEVENT WINAPI IoCreateSynchronizationEvent(UNICODE_STRING*,HANDLE*); void WINAPI IoDeleteDevice(DEVICE_OBJECT*); void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*);

1 0

Vijay Kiran Kamuju : include: Add missing tags and defines in mmreg.h.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 165eeb2f1c58b6017d58cd33facc0499ba838dd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=165eeb2f1c58b6017d58cd33… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 31 23:07:40 2019 +0200 include: Add missing tags and defines in mmreg.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mmreg.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- include/mmsystem.h | 4 +-- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/include/mmreg.h b/include/mmreg.h index e7d70bb..323f5ac 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -75,6 +75,21 @@ typedef struct _WAVEFORMATEX { } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ +#ifndef WAVE_FORMAT_PCM +typedef struct waveformat_tag { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; +} WAVEFORMAT, *PWAVEFORMAT, *NPWAVEFORMAT, *LPWAVEFORMAT; + +typedef struct pcmwaveformat_tag { + WAVEFORMAT wf; + WORD wBitsPerSample; +} PCMWAVEFORMAT, *PPCMWAVEFORMAT, *NPPCMWAVEFORMAT, *LPPCMWAVEFORMAT; +#endif /* WAVE_FORMAT_PCM */ + /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #ifndef WAVE_FORMAT_PCM @@ -117,6 +132,8 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_MPEGLAYER3 0x0055 #define WAVE_FORMAT_MSRT24 0x0082 /* Microsoft Corporation */ #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 +#define WAVE_FORMAT_RAW_AAC1 0x00FF +#define WAVE_FORMAT_MSAUDIO1 0x0160 #define WAVE_FORMAT_WMAUDIO2 0x0161 #define WAVE_FORMAT_WMAUDIO3 0x0162 #define WAVE_FORMAT_WMAUDIO_LOSSLESS 0x0163 @@ -124,6 +141,7 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_CREATIVE_ADPCM 0x0200 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH8 0x0202 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH10 0x0203 /* Creative Labs, Inc */ +#define WAVE_FORMAT_GENERIC_PASSTHRU 0x0249 #define WAVE_FORMAT_FM_TOWNS_SND 0x0300 /* Fujitsu Corp. */ #define WAVE_FORMAT_OLIGSM 0x1000 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIADPCM 0x1001 /* Ing C. Olivetti & C., S.p.A. */ @@ -131,14 +149,19 @@ typedef struct _WAVEFORMATEX { #define WAVE_FORMAT_OLISBC 0x1003 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIOPR 0x1004 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_MPEG_ADTS_AAC 0x1600 +#define WAVE_FORMAT_MPEG_RAW_AAC 0x1601 +#define WAVE_FORMAT_MPEG_LOAS 0x1602 #define WAVE_FORMAT_MPEG_HEAAC 0x1610 +#define WAVE_FORMAT_DTS2 0x2001 #define WAVE_FORMAT_ALAC 0x6c61 #define WAVE_FORMAT_OPUS 0x704f #define WAVE_FORMAT_AMR_NB 0x7361 #define WAVE_FORMAT_AMR_WB 0x7362 #define WAVE_FORMAT_AMR_WP 0x7363 +#define WAVE_FORMAT_MPEG_AAC 0xa106 #define WAVE_FORMAT_FLAC 0xf1ac + #ifndef MM_MICROSOFT #define MM_MICROSOFT 0x01 #endif @@ -147,6 +170,9 @@ typedef struct _WAVEFORMATEX { #define MM_MSFT_ACM_GSM610 0x24 #define MM_MSFT_ACM_G711 0x25 #define MM_MSFT_ACM_PCM 0x26 +#define MM_MSFT_ACM_WMAUDIO 39 +#define MM_MSFT_ACM_MSAUDIO1 39 +#define MM_MSFT_ACM_WMAUDIO2 101 #define MM_FRAUNHOFER_IIS 0xAC #define MM_FHGIIS_MPEGLAYER3_DECODE 0x09 @@ -175,6 +201,15 @@ typedef struct adpcmwaveformat_tag { typedef ADPCMWAVEFORMAT *PADPCMWAVEFORMAT, *NPADPCMWAVEFORMAT, *LPADPCMWAVEFORMAT; +typedef struct drmwaveformat_tag { + WAVEFORMATEX wfx; + WORD wReserved; + ULONG ulContentId; + WAVEFORMATEX wfxSecure; +} DRMWAVEFORMAT; +typedef DRMWAVEFORMAT *PDRMWAVEFORMAT, *NPDRMWAVEFORMAT, + *LPDRMWAVEFORMAT; + typedef struct dvi_adpcmwaveformat_tag { WAVEFORMATEX wfx; WORD wSamplesPerBlock; @@ -410,7 +445,9 @@ typedef struct mpeg1waveformat_tag { WORD fwHeadFlags; DWORD dwPTSLow; DWORD dwPTSHigh; -} MPEG1WAVEFORMAT,* PMPEG1WAVEFORMAT; +} MPEG1WAVEFORMAT; +typedef MPEG1WAVEFORMAT *PMPEG1WAVEFORMAT, + *NPMPEG1WAVEFORMAT, *LPMPEG1WAVEFORMAT; #define ACM_MPEG_LAYER1 0x0001 #define ACM_MPEG_LAYER2 0x0002 @@ -434,6 +471,8 @@ typedef struct mpeglayer3waveformat_tag { WORD nFramesPerBlock; WORD nCodecDelay; } MPEGLAYER3WAVEFORMAT; +typedef MPEGLAYER3WAVEFORMAT *PMPEGLAYER3WAVEFORMAT, + *NPMPEGLAYER3WAVEFORMAT, *LPMPEGLAYER3WAVEFORMAT; #define MPEGLAYER3_WFX_EXTRA_BYTES 12 @@ -445,6 +484,42 @@ typedef struct mpeglayer3waveformat_tag { #define MPEGLAYER3_FLAG_PADDING_ON 0x00000001 #define MPEGLAYER3_FLAG_PADDING_OFF 0x00000002 +typedef struct msaudio1waveformat_tag { + WAVEFORMATEX wfx; + WORD wSamplesPerBlock; + WORD wEncodeOptions; +} MSAUDIO1WAVEFORMAT, *LPMSAUDIO1WAVEFORMAT; + +#define WMAUDIO_BITS_PER_SAMPLE 16 +#define WMAUDIO_MAX_CHANNELS 2 + +#define MSAUDIO1_BITS_PER_SAMPLE WMAUDIO_BITS_PER_SAMPLE +#define MSAUDIO1_MAX_CHANNELS WMAUDIO_MAX_CHANNELS +#define MSAUDIO1_WFX_EXTRA_BYTES (sizeof(MSAUDIO1WAVEFORMAT) - sizeof(WAVEFORMATEX)) + +typedef struct wmaudio2waveformat_tag { + WAVEFORMATEX wfx; + DWORD dwSamplesPerBlock; + WORD wEncodeOptions; + DWORD dwSuperBlockAlign; +} WMAUDIO2WAVEFORMAT, *LPWMAUDIO2WAVEFORMAT; + +#define WMAUDIO2_BITS_PER_SAMPLE WMAUDIO_BITS_PER_SAMPLE +#define WMAUDIO2_MAX_CHANNELS WMAUDIO_MAX_CHANNELS +#define WMAUDIO2_WFX_EXTRA_BYTES (sizeof(WMAUDIO2WAVEFORMAT) - sizeof(WAVEFORMATEX)) + +typedef struct wmaudio3waveformat_tag { + WAVEFORMATEX wfx; + WORD wValidBitsPerSample; + DWORD dwChannelMask; + DWORD dwReserved1; + DWORD dwReserved2; + WORD wEncodeOptions; + WORD wReserved3; +} WMAUDIO3WAVEFORMAT, *LPWMAUDIO3WAVEFORMAT; + +#define WMAUDIO3_WFX_EXTRA_BYTES (sizeof(WMAUDIO3WAVEFORMAT) - sizeof(WAVEFORMATEX)) + #ifdef GUID_DEFINED #ifndef _WAVEFORMATEXTENSIBLE_ @@ -499,7 +574,6 @@ typedef WAVEFORMATIEEEFLOATEX* LPWAVEFORMATIEEEFLOATEX; #endif /* _SPEAKER_POSITIONS_ */ - /* DIB stuff */ #ifndef BI_BITFIELDS diff --git a/include/mmsystem.h b/include/mmsystem.h index ee7e316..2a0782d 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -474,6 +474,7 @@ DECL_WINELIB_TYPE_AW(LPWAVEINCAPS2) #define WAVE_FORMAT_96M16 0x00040000 /* 96 kHz, Mono, 16-bit */ #define WAVE_FORMAT_96S16 0x00080000 /* 96 kHz, Stereo, 16-bit */ +#ifndef WAVE_FORMAT_PCM /* General format structure common to all formats, same for Win16 and Win32 */ typedef struct waveformat_tag { WORD wFormatTag; @@ -483,14 +484,13 @@ typedef struct waveformat_tag { WORD nBlockAlign; } WAVEFORMAT, *LPWAVEFORMAT; -#ifndef WAVE_FORMAT_PCM #define WAVE_FORMAT_PCM 1 -#endif typedef struct pcmwaveformat_tag { WAVEFORMAT wf; WORD wBitsPerSample; } PCMWAVEFORMAT, *LPPCMWAVEFORMAT; +#endif #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_

1 0

Gabriel Ivăncescu : comctl32/button: Use WM_GETTEXTLENGTH to see if the button has any text.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 8ee1e3453e2e714241bcaac0cd75f4af3f828c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ee1e3453e2e714241bcaac0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 4 14:39:49 2019 +0300 comctl32/button: Use WM_GETTEXTLENGTH to see if the button has any text. There's no reason to allocate and then parse the entire string just to see if its length is zero. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f282abf..5338ef8 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1276,20 +1276,16 @@ static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); - WCHAR *text = get_button_text(infoPtr); HDC hdc; HFONT hfont; SIZE labelSize; INT textOffset; - INT textLength = 0; double scaleX; double scaleY; LONG checkboxWidth, checkboxHeight; LONG maxWidth = 0; - if (text) textLength = lstrlenW(text); - heap_free(text); - if (textLength == 0) + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) { BUTTON_GetClientRectSize(infoPtr, size); return TRUE; @@ -1325,26 +1321,18 @@ static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) { - WCHAR *text = get_button_text(infoPtr); SIZE labelSize; - INT textLength = 0; - if (text) textLength = lstrlenW(text); - - if (textLength == 0) - { + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) BUTTON_GetClientRectSize(infoPtr, size); - heap_free(text); - return TRUE; - } - heap_free(text); - - /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ - BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); - - size->cx = labelSize.cx; - size->cy = labelSize.cy; + else + { + /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); + size->cx = labelSize.cx; + size->cy = labelSize.cy; + } return TRUE; }

1 0

Gabriel Ivăncescu : comctl32/button: Delay calling get_button_text until it is needed to prevent a leak.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 715065feb3915d37555e02f79d586f26adda1152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715065feb3915d37555e02f7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 25 15:31:53 2019 +0200 comctl32/button: Delay calling get_button_text until it is needed to prevent a leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index e974f86..f282abf 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2326,10 +2326,10 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in RECT bgRect, textRect; HFONT font = infoPtr->font; HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - WCHAR *text = get_button_text(infoPtr); NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + WCHAR *text; GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); @@ -2357,10 +2357,9 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - if (text) + if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { - if (!(cdrf & CDRF_DOERASE)) - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); heap_free(text); } @@ -2398,11 +2397,11 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; - WCHAR *text = get_button_text(infoPtr); NMCUSTOMDRAW nmcd; LRESULT cdrf; LOGFONTW lf; HWND parent; + WCHAR *text; BOOL created_font = FALSE; HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); @@ -2456,6 +2455,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + text = get_button_text(infoPtr); if (!(cdrf & CDRF_DOERASE) && text) DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); @@ -2464,11 +2464,10 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; if (text) { - if (focused) + if (!(cdrf & CDRF_SKIPPOSTPAINT) && focused) { RECT focusRect;

1 0

Józef Kucia : wined3d: Use Vulkan physical device properties to fill GPU description.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 79631ffff76b1ad8dcb74eb62af3194442b755b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79631ffff76b1ad8dcb74eb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 5 10:52:07 2019 +0200 wined3d: Use Vulkan physical device properties to fill GPU description. 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 | 60 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ca3a0f9..5c4bdd0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -186,6 +186,61 @@ fail: return FALSE; } +static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_info) +{ + VkPhysicalDevice physical_devices[1]; + uint32_t count; + VkResult vr; + + if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, NULL))) < 0) + { + WARN("Failed to enumerate physical devices, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + if (!count) + { + WARN("No physical device.\n"); + return VK_NULL_HANDLE; + } + if (count > 1) + { + /* TODO: Create wined3d_adapter for each device. */ + FIXME("Multiple physical devices available.\n"); + count = 1; + } + + if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, physical_devices))) < 0) + { + WARN("Failed to get physical devices, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + return physical_devices[0]; +} + +const struct wined3d_gpu_description *get_vulkan_gpu_description(const struct wined3d_vk_info *vk_info, + VkPhysicalDevice physical_device) +{ + const struct wined3d_gpu_description *description; + VkPhysicalDeviceProperties properties; + + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &properties)); + + 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: %u.%u.%u.\n", VK_VERSION_MAJOR(properties.apiVersion), + VK_VERSION_MINOR(properties.apiVersion), VK_VERSION_PATCH(properties.apiVersion)); + + if ((description = wined3d_get_gpu_description(properties.vendorID, properties.deviceID))) + return description; + + FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", + debugstr_a(properties.deviceName), properties.vendorID, properties.deviceID); + + return wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -205,7 +260,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, goto fail; } - if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) + if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) + goto fail_vulkan; + + if (!(gpu_description = get_vulkan_gpu_description(vk_info, adapter_vk->physical_device))) { ERR("Failed to get GPU description.\n"); goto fail_vulkan; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 068ece6..a60a4f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2755,6 +2755,7 @@ struct wined3d_adapter_vk struct wined3d_adapter a; struct wined3d_vk_info vk_info; + VkPhysicalDevice physical_device; }; static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter)

1 0

Michael Stefaniuc : user32: Avoid using the comma operator.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 516dc52401724906648411a577ac135a21909106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516dc52401724906648411a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:57 2019 +0200 user32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 9601c60..fd0751e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -677,7 +677,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, { /* Throw away katakana access keys */ (*count)--, i++; /* skip the prefix */ - (*count)--, i++; /* skip the letter */ + (*count)--; i++; /* skip the letter */ } else {

1 0

Zebediah Figura : ddraw: Forbid creating a stateblock while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 1879a17ec444f0b47d78f141896e7ce9b6f007f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1879a17ec444f0b47d78f141… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:38:00 2019 -0500 ddraw: Forbid creating a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b471612..003ce1d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6018,6 +6018,13 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } + /* The D3DSTATEBLOCKTYPE enum is fine here. */ hr = wined3d_stateblock_create(device->wined3d_device, type, &wined3d_sb); if (FAILED(hr)) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 61042e3..5f066a6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15872,7 +15872,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : ddraw: Avoid passing invalid device type to wined3d.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: c3da067216aaa842ff62943cd9d43ea041764b7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3da067216aaa842ff62943c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 5 10:52:12 2019 +0200 ddraw: Avoid passing invalid device type to wined3d. 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/ddraw/main.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0faa9823..ac4d3f7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -256,62 +256,52 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, IDirectDrawSurface4 **surface, HDC *devi * E_OUTOFMEMORY if some allocation failed * ***********************************************************************/ -static HRESULT -DDRAW_Create(const GUID *guid, - void **DD, - IUnknown *UnkOuter, - REFIID iid) +static HRESULT DDRAW_Create(const GUID *guid, void **out, IUnknown *outer_unknown, REFIID iid) { enum wined3d_device_type device_type; struct ddraw *ddraw; - HRESULT hr; DWORD flags = 0; + HRESULT hr; TRACE("driver_guid %s, ddraw %p, outer_unknown %p, interface_iid %s.\n", - debugstr_guid(guid), DD, UnkOuter, debugstr_guid(iid)); + debugstr_guid(guid), out, outer_unknown, debugstr_guid(iid)); - *DD = NULL; + *out = NULL; if (guid == (GUID *) DDCREATE_EMULATIONONLY) { - /* Use the reference device id. This doesn't actually change anything, - * WineD3D always uses OpenGL for D3D rendering. One could make it request - * indirect rendering - */ device_type = WINED3D_DEVICE_TYPE_REF; } - else if(guid == (GUID *) DDCREATE_HARDWAREONLY) + else if (guid == (GUID *) DDCREATE_HARDWAREONLY) { device_type = WINED3D_DEVICE_TYPE_HAL; } else { - device_type = 0; + device_type = WINED3D_DEVICE_TYPE_HAL; } /* DDraw doesn't support aggregation, according to msdn */ - if (UnkOuter != NULL) + if (outer_unknown != NULL) return CLASS_E_NOAGGREGATION; if (!IsEqualGUID(iid, &IID_IDirectDraw7)) flags = WINED3D_LEGACY_FFP_LIGHTING; - /* DirectDraw creation comes here */ if (!(ddraw = heap_alloc_zero(sizeof(*ddraw)))) { - ERR("Out of memory when creating DirectDraw\n"); + ERR("Out of memory when creating DirectDraw.\n"); return E_OUTOFMEMORY; } - hr = ddraw_init(ddraw, flags, device_type); - if (FAILED(hr)) + if (FAILED(hr = ddraw_init(ddraw, flags, device_type))) { WARN("Failed to initialize ddraw object, hr %#x.\n", hr); heap_free(ddraw); return hr; } - hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, DD); + hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, out); IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); if (SUCCEEDED(hr)) list_add_head(&global_ddraw_list, &ddraw->ddraw_list_entry);

1 0

Austin English : ksecdd.sys: Add stub driver.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 107106220be454906a56e3ef0eba095ea2a7f280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107106220be454906a56e3ef… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 3 02:19:21 2019 -0500 ksecdd.sys: Add stub driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46898 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ksecdd.sys/Makefile.in | 7 +++ dlls/ksecdd.sys/ksecdd.sys.spec | 104 ++++++++++++++++++++++++++++++++++++++++ dlls/ksecdd.sys/main.c | 35 ++++++++++++++ dlls/ksecdd.sys/version.rc | 26 ++++++++++ loader/wine.inf.in | 2 + 7 files changed, 177 insertions(+) diff --git a/configure b/configure index dd0473b..ee80a75 100755 --- a/configure +++ b/configure @@ -1359,6 +1359,7 @@ enable_jsproxy enable_kerberos enable_kernel32 enable_kernelbase +enable_ksecdd_sys enable_ksuser enable_ktmw32 enable_l3codeca_acm @@ -20214,6 +20215,7 @@ wine_fn_config_makefile dlls/kernelbase enable_kernelbase wine_fn_config_makefile dlls/kernelbase/tests enable_tests wine_fn_config_makefile dlls/keyboard.drv16 enable_win16 wine_fn_config_makefile dlls/krnl386.exe16 enable_win16 +wine_fn_config_makefile dlls/ksecdd.sys enable_ksecdd_sys wine_fn_config_makefile dlls/ksuser enable_ksuser wine_fn_config_makefile dlls/ktmw32 enable_ktmw32 wine_fn_config_makefile dlls/l3codeca.acm enable_l3codeca_acm diff --git a/configure.ac b/configure.ac index 2b0c8e1..1311309 100644 --- a/configure.ac +++ b/configure.ac @@ -3374,6 +3374,7 @@ WINE_CONFIG_MAKEFILE(dlls/kernelbase) WINE_CONFIG_MAKEFILE(dlls/kernelbase/tests) WINE_CONFIG_MAKEFILE(dlls/keyboard.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/krnl386.exe16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/ksecdd.sys) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) diff --git a/dlls/ksecdd.sys/Makefile.in b/dlls/ksecdd.sys/Makefile.in new file mode 100644 index 0000000..9b6430e --- /dev/null +++ b/dlls/ksecdd.sys/Makefile.in @@ -0,0 +1,7 @@ +MODULE = ksecdd.sys +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/ksecdd.sys/ksecdd.sys.spec b/dlls/ksecdd.sys/ksecdd.sys.spec new file mode 100644 index 0000000..31b1b35 --- /dev/null +++ b/dlls/ksecdd.sys/ksecdd.sys.spec @@ -0,0 +1,104 @@ +@ stub SystemPrng +@ stub AcceptSecurityContext +@ stub AcquireCredentialsHandleW +@ stub AddCredentialsW +@ stub ApplyControlToken +@ stub BCryptCloseAlgorithmProvider +@ stub BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeriveKey +@ stub BCryptDeriveKeyCapi +@ stub BCryptDeriveKeyPBKDF2 +@ stub BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stub BCryptEnumAlgorithms +@ stub BCryptEnumProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stub BCryptFinishHash +@ stub BCryptFreeBuffer +@ stub BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stub BCryptGetFipsAlgorithmMode +@ stub BCryptGetProperty +@ stub BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stub BCryptOpenAlgorithmProvider +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptVerifySignature +@ stub CompleteAuthToken +@ stub CredMarshalTargetInfo +@ stub DeleteSecurityContext +@ stub EnumerateSecurityPackagesW +@ stub ExportSecurityContext +@ stub FreeContextBuffer +@ stub FreeCredentialsHandle +@ stub GetSecurityUserInfo +@ stub ImpersonateSecurityContext +@ stub ImportSecurityContextW +@ stub InitSecurityInterfaceW +@ stub InitializeSecurityContextW +@ stub KSecRegisterSecurityProvider +@ stub KSecValidateBuffer +@ stub LsaEnumerateLogonSessions +@ stub LsaGetLogonSessionData +@ stub MakeSignature +@ stub MapSecurityError +@ stub QueryContextAttributesW +@ stub QueryCredentialsAttributesW +@ stub QuerySecurityContextToken +@ stub QuerySecurityPackageInfoW +@ stub RevertSecurityContext +@ stub SealMessage +@ stub SecLookupAccountName +@ stub SecLookupAccountSid +@ stub SecLookupWellKnownSid +@ stub SecMakeSPN +@ stub SecMakeSPNEx +@ stub SecMakeSPNEx2 +@ stub SecSetPagingMode +@ stub SetCredentialsAttributesW +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslExportKey +@ stub SslFreeObject +@ stub SslGetServerIdentity +@ stub SslImportKey +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenProvider +@ stub SspiAcceptSecurityContextAsync +@ stub SspiAcquireCredentialsHandleAsyncW +@ stub SspiCompareAuthIdentities +@ stub SspiCopyAuthIdentity +@ stub SspiCreateAsyncContext +@ stub SspiDeleteSecurityContextAsync +@ stub SspiEncodeAuthIdentityAsStrings +@ stub SspiEncodeStringsAsAuthIdentity +@ stub SspiFreeAsyncContext +@ stub SspiFreeAuthIdentity +@ stub SspiFreeCredentialsHandleAsync +@ stub SspiGetAsyncCallStatus +@ stub SspiInitializeSecurityContextAsyncW +@ stub SspiLocalFree +@ stub SspiMarshalAuthIdentity +@ stub SspiReinitAsyncContext +@ stub SspiSetAsyncNotifyCallback +@ stub SspiUnmarshalAuthIdentity +@ stub SspiValidateAuthIdentity +@ stub SspiZeroAuthIdentity +@ stub TokenBindingGetKeyTypesServer +@ stub TokenBindingVerifyMessage +@ stub UnsealMessage +@ stub VerifySignature diff --git a/dlls/ksecdd.sys/main.c b/dlls/ksecdd.sys/main.c new file mode 100644 index 0000000..2773c49 --- /dev/null +++ b/dlls/ksecdd.sys/main.c @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ksecdd); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ksecdd.sys/version.rc b/dlls/ksecdd.sys/version.rc new file mode 100644 index 0000000..5cea75f --- /dev/null +++ b/dlls/ksecdd.sys/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2019 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ksecdd.sys" +#define WINE_FILENAME_STR "ksecdd.sys" +#define WINE_FILEVERSION 10,0,14393,187 +#define WINE_FILEVERSION_STR "10.0.14393.187" +#define WINE_PRODUCTVERSION 10,0,14393,197 +#define WINE_PRODUCTVERSION_STR "10.0.14393.197" + +#include "wine/wine_common_ver.rc" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1fe8b11..48a9f4b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- 12,,tdi.sys,- @@ -2602,6 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,ksecdd.sys, 12,,mountmgr.sys 12,,ndis.sys 12,,tdi.sys

1 0

Thomas J. Moore : ntdll: Also try to stat() the drive root.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 071e729969c5536e3b5958b11d43341803f6bd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=071e729969c5536e3b5958b1… Author: Thomas J. Moore <darktjm(a)gmail.com> Date: Thu Apr 4 10:59:09 2019 -0500 ntdll: Also try to stat() the drive root. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46863 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b46c2a6..859f4d8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2638,7 +2638,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer char *p; unix_name[pos + ret] = 0; for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; - if (!redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) + if (!name_len || !redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) { if (!stat( unix_name, &st )) {

1 0

Jacek Caban : server: Use generic kernel object list to store client device pointer.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: b4f78d6896a7fc85b3ec29d3db30d5d8e9b790e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4f78d6896a7fc85b3ec29d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 17:43:27 2019 +0100 server: Use generic kernel object list to store client device pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 37 +++++++++++++----------------- include/wine/server_protocol.h | 11 ++++----- server/device.c | 52 ++++++++++++++++++++++++++++-------------- server/protocol.def | 7 ++---- server/request.h | 17 ++++++-------- server/trace.c | 14 ++++-------- 6 files changed, 68 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4f78d6896a7fc85b3ec…

1 0

Jacek Caban : mshtml.idl: Add some SVG interfaces declaration.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: af77d208776c9c51d361affe37fb89accff9944f URL: https://source.winehq.org/git/wine.git/?a=commit;h=af77d208776c9c51d361affe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 5 17:59:49 2019 +0200 mshtml.idl: Add some SVG interfaces declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 280 +++++++++++ include/mshtml.idl | 1422 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1702 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af77d208776c9c51d361…

1 0

André Hentschel : ntdll: Adjust PC according to THUMB /ARM flag.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: abca25b30f712f80b9bcd29af7096d68d11596a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abca25b30f712f80b9bcd29a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 27 13:48:12 2019 +0100 ntdll: Adjust PC according to THUMB/ARM flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46189 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 32205ea..db9cb80 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -283,9 +283,12 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_cpu_context, ".arm\n\t" - "ldr r1, [r0, #0x44]\n\t" /* context->Cpsr */ - "msr CPSR_f, r1\n\t" + "ldr r2, [r0, #0x44]\n\t" /* context->Cpsr */ + "tst r2, #0x20\n\t" /* thumb? */ "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ + "orrne r1, r1, #1\n\t" /* Adjust PC according to thumb */ + "biceq r1, r1, #1\n\t" /* Adjust PC according to arm */ + "msr CPSR_f, r2\n\t" "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ "push {r1}\n\t"

1 0

Michael Stefaniuc : dxdiagn: Remove useless cast to self.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 0004deba435d0dfa1306b5775989acd6633ea2b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0004deba435d0dfa1306b577… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:59 2019 +0200 dxdiagn: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ede7344..46193e9 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1627,7 +1627,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (FAILED(hr)) goto cleanup; - hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&ppRF); + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, &ppRF); if (FAILED(hr)) goto cleanup; pRF = ((REGFILTER2**)ppRF)[0];

1 0

Detlef Riekenberg : kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE).
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: c26a3a011649b92fb665e412fd70910ef6667765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26a3a011649b92fb665e412… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 31 07:52:01 2019 +0200 kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE). FormatMessageA/W sets last error to ERROR_NO_WORK_DONE when nothing was done, after Sep 2015, but before or with Win10 v1709. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 20 ++++++++++++-------- include/winerror.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78a..9214e3e 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -155,7 +155,7 @@ static void test_message_from_string_wide(void) error = GetLastError(); ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==0, "succeeded: r=%d\n", r); - ok(error==0xdeadbeef, "last error %u\n", error); + ok((error==0xdeadbeef) || (error == ERROR_NO_WORK_DONE), "last error %u\n", error); /* format placeholder with no specifier */ SetLastError(0xdeadbeef); @@ -443,7 +443,7 @@ static void test_message_from_string(void) r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); - ok(GetLastError()==0xdeadbeef, + ok((GetLastError()==0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), "last error %u\n", GetLastError()); /* format placeholder with no specifier */ @@ -745,7 +745,8 @@ static void test_message_ignore_inserts(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, @@ -855,7 +856,8 @@ static void test_message_ignore_inserts_wide(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, @@ -1294,8 +1296,8 @@ static void test_message_allocate_buffer(void) "", 0, 0, (char *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (char *)0xdeadbeef; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1391,8 +1393,8 @@ static void test_message_allocate_buffer_wide(void) empty, 0, 0, (WCHAR *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1522,6 +1524,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, @@ -1533,6 +1536,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, diff --git a/include/winerror.h b/include/winerror.h index d78c91e..79be438 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -291,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_NO_DATA 232 #define ERROR_PIPE_NOT_CONNECTED 233 #define ERROR_MORE_DATA 234 +#define ERROR_NO_WORK_DONE 235 #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255

1 0

Huw Davies : wineps: Include the meta region in the clip region.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 18102e9c12a15af81fb863a741d72536167055fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=18102e9c12a15af81fb863a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 5 13:52:14 2019 +0100 wineps: Include the meta region in the clip region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/clipping.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/clipping.c b/dlls/wineps.drv/clipping.c index 59c8817..62022c9 100644 --- a/dlls/wineps.drv/clipping.c +++ b/dlls/wineps.drv/clipping.c @@ -88,8 +88,8 @@ void PSDRV_SetClip( PHYSDEV dev ) return; } - hrgn = CreateRectRgn(0,0,0,0); - if (GetClipRgn(dev->hdc, hrgn)) + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(dev->hdc, hrgn, 3) == 1) /* clip && meta */ { PSDRV_WriteGSave(dev); PSDRV_AddClip( dev, hrgn ); @@ -104,11 +104,12 @@ void PSDRV_SetClip( PHYSDEV dev ) void PSDRV_ResetClip( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - HRGN hrgn = CreateRectRgn(0,0,0,0); - BOOL empty; + HRGN hrgn; + + if (physDev->pathdepth) return; - empty = !GetClipRgn(dev->hdc, hrgn); - if(!empty && !physDev->pathdepth) + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(dev->hdc, hrgn, 3) == 1) /* clip && meta */ PSDRV_WriteGRestore(dev); DeleteObject(hrgn); }

1 0

Józef Kucia : wined3d: Introduce support for Vulkan formats.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 55429b09fecae016c4826ea7f32994e3147b2f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=55429b09fecae016c4826ea7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 5 10:52:09 2019 +0200 wined3d: Introduce support for Vulkan formats. 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 +- dlls/wined3d/utils.c | 159 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 +++- 3 files changed, 172 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55429b09fecae016c482…

1 0

Paul Gofman : kernel32: Add DECLSPEC_HOTPATCH to FindClose().
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: d62187105e37c0729775ae45d161ba74302ce5a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d62187105e37c0729775ae45… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 5 11:26:28 2019 +0300 kernel32: Add DECLSPEC_HOTPATCH to FindClose(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d72..c66073b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2236,7 +2236,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /************************************************************************* * FindClose (KERNEL32.@) */ -BOOL WINAPI FindClose( HANDLE handle ) +BOOL WINAPI DECLSPEC_HOTPATCH FindClose( HANDLE handle ) { FIND_FIRST_INFO *info = handle;

1 0