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