wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Francois Gouget : schtasks/tests: Verify that the task folders are correctly deleted.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: a2d5644797ee6177d1eae05ac8d53e4b7d866137 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2d5644797ee6177d1eae05ac8d53e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 7 00:13:11 2023 +0100 schtasks/tests: Verify that the task folders are correctly deleted. --- programs/schtasks/tests/schtasks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index 238dc3bdc16..3ed2378c90c 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -266,8 +266,10 @@ START_TEST(schtasks) r = DeleteFileA("test.xml"); ok(r, "DeleteFileA failed: %lu\n", GetLastError()); - ITaskFolder_DeleteFolder(root, wine_testW, 0); - ITaskFolder_DeleteFolder(root, wineW, 0); + r = ITaskFolder_DeleteFolder(root, wine_testW, 0); + ok(r == S_OK, "DeleteFolder(\\wine\\test) failed: %lx\n", r); + r = ITaskFolder_DeleteFolder(root, wineW, 0); + ok(r == S_OK, "DeleteFolder(\\wine) failed: %lx\n", r); ITaskFolder_Release(root); ITaskService_Release(service);

1 0

Francois Gouget : schtasks/tests: Deleting folders requires elevated privileges on Windows 7 & 8.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 739c5c547c361880a69993b21855af0fa00ade76 URL: https://gitlab.winehq.org/wine/wine/-/commit/739c5c547c361880a69993b21855af… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Mar 25 17:52:59 2023 +0100 schtasks/tests: Deleting folders requires elevated privileges on Windows 7 & 8. This means skipping any test that requires creating a task as the test would be unable to clean up after itself. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52193 Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54634 --- programs/schtasks/tests/Makefile.in | 2 +- programs/schtasks/tests/schtasks.c | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/programs/schtasks/tests/Makefile.in b/programs/schtasks/tests/Makefile.in index dcf641c4b13..424f9a294d1 100644 --- a/programs/schtasks/tests/Makefile.in +++ b/programs/schtasks/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = schtasks.exe -IMPORTS = ole32 +IMPORTS = advapi32 ole32 C_SRCS = \ diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index c1168d4b209..238dc3bdc16 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -16,8 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #define COBJMACROS +#include "winternl.h" #include "initguid.h" #include "taskschd.h" @@ -58,6 +61,37 @@ static WCHAR *a2w(const char *str) return ret; } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL check_win_version(int min_major, int min_minor) +{ + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + NTSTATUS (WINAPI *pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); + RTL_OSVERSIONINFOEXW rtlver; + + rtlver.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + pRtlGetVersion = (void *)GetProcAddress(hntdll, "RtlGetVersion"); + pRtlGetVersion(&rtlver); + return rtlver.dwMajorVersion > min_major || + (rtlver.dwMajorVersion == min_major && + rtlver.dwMinorVersion >= min_minor); +} +#define is_win10_plus() check_win_version(10, 0) + #define run_command(a) _run_command(__LINE__,a) static DWORD _run_command(unsigned line, const char *cmd) { @@ -173,6 +207,12 @@ START_TEST(schtasks) static WCHAR wine_testW[] = L"\\wine\\test"; DWORD r; + if (!is_process_elevated() && !is_win10_plus()) + { + win_skip("Deleting the test folders requires elevated privileges on Windows <= 8\n"); + return; + } + CoInitialize(NULL); if(!initialize_task_service()) { CoUninitialize();

1 0

Huw Davies : win32u: Fix printf format warnings.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: d0246c3ea0680f0bb40dcd0e5b54c942e096925c URL: https://gitlab.winehq.org/wine/wine/-/commit/d0246c3ea0680f0bb40dcd0e5b54c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 13:44:57 2023 +0100 win32u: Fix printf format warnings. --- dlls/win32u/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 11bb129134c..a49376d96a9 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2457,7 +2457,7 @@ BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_P UINT32 *entry_count, UINT32 *pointer_count, void *pointer_info ) { FIXME( "id %#x, type %#x, unk0 %#zx, unk1 %#zx, size %#zx, entry_count %p, pointer_count %p, pointer_info %p stub!\n", - id, (int)type, unk0, unk1, (size_t)size, entry_count, pointer_count, pointer_info ); + id, (int)type, (size_t)unk0, (size_t)unk1, (size_t)size, entry_count, pointer_count, pointer_info ); RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; }

1 0

Francois Gouget : widl: Error_loc() messages must have a trailing linefeed.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 99f77667bb23a5c0f2b5b60a1e591fecd9714fb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/99f77667bb23a5c0f2b5b60a1e591f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 22 02:24:57 2023 +0100 widl: Error_loc() messages must have a trailing linefeed. --- tools/widl/parser.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 1b16de63f0b..3ea03a7a26f 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -173,7 +173,7 @@ static int token_winrt( int token, const char *str, YYSTYPE *yylval ) static void winrt_enable( int ns_prefix ) { - if (!list_empty( &import_stack ) && !winrt_mode) error_loc( "WinRT IDL file imported in non-winrt mode." ); + if (!list_empty( &import_stack ) && !winrt_mode) error_loc( "WinRT IDL file imported in non-winrt mode.\n" ); use_abi_namespace = ns_prefix; winrt_mode = TRUE;

1 0

Francois Gouget : imm32/tests: Document the WINE_LANGID value.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 683ad8221b54ff37f5c185b0571da893bf409792 URL: https://gitlab.winehq.org/wine/wine/-/commit/683ad8221b54ff37f5c185b0571da8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 04:18:26 2023 +0100 imm32/tests: Document the WINE_LANGID value. --- dlls/imm32/tests/ime_wrapper.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/ime_wrapper.rc b/dlls/imm32/tests/ime_wrapper.rc index 812754ce4ce..e71d81f4fc9 100644 --- a/dlls/imm32/tests/ime_wrapper.rc +++ b/dlls/imm32/tests/ime_wrapper.rc @@ -18,7 +18,7 @@ #pragma makedep testdll -#define WINE_LANGID 047f +#define WINE_LANGID 047f /* LANG_INVARIANT/SUBLANG_DEFAULT */ #define WINE_FILETYPE VFT_DRV #define WINE_FILESUBTYPE VFT2_DRV_INPUTMETHOD #define WINE_FILENAME "ime_wrapper"

1 0

Bernhard Kölbl : windows.media.speech/tests: Allow recognizer state to be idle during active recognition session.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 4f824a507afecc43c2543c0c54448a523142d0b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f824a507afecc43c2543c0c54448a… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Mar 25 22:02:59 2023 +0100 windows.media.speech/tests: Allow recognizer state to be idle during active recognition session. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54441 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 6bc5a8b1751..fb0fa9e3b4d 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1772,7 +1772,7 @@ static void test_Recognition(void) recog_state = 0xdeadbeef; hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state); ok(hr == S_OK, "ISpeechRecognizer2_get_State failed, hr %#lx.\n", hr); - ok(recog_state == SpeechRecognizerState_Capturing, "recog_state was %u.\n", recog_state); + ok(recog_state == SpeechRecognizerState_Capturing || broken(recog_state == SpeechRecognizerState_Idle), "recog_state was %u.\n", recog_state); /* * TODO: Use a loopback device together with prerecorded audio files to test the recognizer's functionality.

1 0

Louis Lenders : wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: e8b0c9239562ed78c94d7dba87d5004b4d82b113 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8b0c9239562ed78c94d7dba87d500… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 25 18:32:07 2023 +0100 wine.inf: Add EditionID to HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54675 --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c5850d1e205..9aaf2124ee3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2512,6 +2512,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%,"EditionId",2,"Professional" HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0

1 0

Marc-Aurel Zent : iphlpapi: Return FALSE for bad handles in IcmpCloseHandle.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 5de03757f7d5f0cbdbbee079f6b0f548d0ad2626 URL: https://gitlab.winehq.org/wine/wine/-/commit/5de03757f7d5f0cbdbbee079f6b0f5… Author: Marc-Aurel Zent <marc_aurel(a)me.com> Date: Sun Mar 26 13:31:14 2023 +0200 iphlpapi: Return FALSE for bad handles in IcmpCloseHandle. --- dlls/iphlpapi/iphlpapi_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6286c168277..4afe3470630 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4565,7 +4565,12 @@ struct icmp_handle_data */ BOOL WINAPI IcmpCloseHandle( HANDLE handle ) { - struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + struct icmp_handle_data *data; + + if (handle == NULL || handle == INVALID_HANDLE_VALUE) + return FALSE; + + data = (struct icmp_handle_data *)handle; CloseHandle( data->nsi_device ); heap_free( data );

1 0

Rémi Bernon : widl: Define PARSER_LTYPE instead of api.location.type.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 78c5e3ab0321a9a8a24e2bc35518419f97cd8d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/78c5e3ab0321a9a8a24e2bc3551841… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Mar 25 13:31:57 2023 +0100 widl: Define PARSER_LTYPE instead of api.location.type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54729 --- tools/widl/parser.y | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e3476f6ded8..5567d94559e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -106,6 +106,13 @@ static typelib_t *current_typelib; %} +%code requires +{ + +#define PARSER_LTYPE struct location + +} + %code provides { @@ -119,7 +126,6 @@ void pop_import( PARSER_LTYPE *yylloc ); } -%define api.location.type {struct location} %define api.prefix {parser_} %define api.pure full %define parse.error verbose

1 0

Vicki Pfau : hidparse.sys: Include zero-count reports in cap count.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: 6a88500af29b82040f0518eb87171ca047fb95aa URL: https://gitlab.winehq.org/wine/wine/-/commit/6a88500af29b82040f0518eb87171c… Author: Vicki Pfau <vi(a)endrift.com> Date: Sat Mar 25 01:08:56 2023 -0700 hidparse.sys: Include zero-count reports in cap count. Signed-off-by: Vicki Pfau <vi(a)endrift.com> --- dlls/dinput/tests/hid.c | 2 -- dlls/hidparse.sys/main.c | 34 +++++++++++++++++++--------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index facbf69fcec..bd01d1ae868 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3173,11 +3173,9 @@ static void check_preparsed_data( HANDLE file, const struct hidp_kdr *expect_kdr check_member( *kdr, *expect_kdr, "%d", output_caps_end ); check_member( *kdr, *expect_kdr, "%d", output_report_byte_length ); check_member( *kdr, *expect_kdr, "%d", feature_caps_start ); - todo_wine check_member( *kdr, *expect_kdr, "%d", feature_caps_count ); check_member( *kdr, *expect_kdr, "%d", feature_caps_end ); check_member( *kdr, *expect_kdr, "%d", feature_report_byte_length ); - todo_wine check_member( *kdr, *expect_kdr, "%d", caps_size ); check_member( *kdr, *expect_kdr, "%d", number_link_collection_nodes ); diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 7058093e03c..feb5b3531a4 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -130,11 +130,11 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) data->output_caps_start, data->output_caps_count, data->output_caps_end, data->output_report_byte_length, data->feature_caps_start, data->feature_caps_count, data->feature_caps_end, data->feature_report_byte_length, data->number_link_collection_nodes ); - end = data->input_caps_count; + end = data->input_caps_end - data->input_caps_start; for (i = 0; i < end; i++) TRACE( "input %d: %s\n", i, debugstr_hid_value_caps( HID_INPUT_VALUE_CAPS( data ) + i ) ); - end = data->output_caps_count; + end = data->output_caps_end - data->output_caps_start; for (i = 0; i < end; i++) TRACE( "output %d: %s\n", i, debugstr_hid_value_caps( HID_OUTPUT_VALUE_CAPS( data ) + i ) ); - end = data->feature_caps_count; + end = data->feature_caps_end - data->feature_caps_start; for (i = 0; i < end; i++) TRACE( "feature %d: %s\n", i, debugstr_hid_value_caps( HID_FEATURE_VALUE_CAPS( data ) + i ) ); end = data->number_link_collection_nodes; for (i = 0; i < end; i++) TRACE( "collection %d: %s\n", i, debugstr_hid_collection_node( HID_COLLECTION_NODES( data ) + i ) ); @@ -171,6 +171,7 @@ struct hid_parser_state ULONG bit_size[3][256]; USHORT byte_length[3]; USHORT caps_count[3]; + USHORT empty_caps[3]; USHORT data_count[3]; }; @@ -373,6 +374,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (!state->items.report_count) { + state->empty_caps[type] += usages_size; reset_local_items( state ); return TRUE; } @@ -435,6 +437,8 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state caps_size = state->caps_count[HidP_Input] + state->caps_count[HidP_Output] + state->caps_count[HidP_Feature]; + caps_size += state->empty_caps[HidP_Input] + state->empty_caps[HidP_Output] + + state->empty_caps[HidP_Feature]; caps_size *= sizeof(struct hid_value_caps); size = caps_size + FIELD_OFFSET(struct hid_preparsed_data, value_caps[0]) + @@ -446,26 +450,26 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state data->usage = state->usage; data->usage_page = state->usage_page; data->input_caps_start = 0; - data->input_caps_count = state->caps_count[HidP_Input]; - data->input_caps_end = data->input_caps_start + data->input_caps_count; + data->input_caps_count = state->caps_count[HidP_Input] + state->empty_caps[HidP_Input]; + data->input_caps_end = data->input_caps_start + state->caps_count[HidP_Input]; data->input_report_byte_length = state->byte_length[HidP_Input]; data->output_caps_start = data->input_caps_end; - data->output_caps_count = state->caps_count[HidP_Output]; - data->output_caps_end = data->output_caps_start + data->output_caps_count; + data->output_caps_count = state->caps_count[HidP_Output] + state->empty_caps[HidP_Output]; + data->output_caps_end = data->output_caps_start + state->caps_count[HidP_Output]; data->output_report_byte_length = state->byte_length[HidP_Output]; data->feature_caps_start = data->output_caps_end; - data->feature_caps_count = state->caps_count[HidP_Feature]; - data->feature_caps_end = data->feature_caps_start + data->feature_caps_count; + data->feature_caps_count = state->caps_count[HidP_Feature] + state->empty_caps[HidP_Feature]; + data->feature_caps_end = data->feature_caps_start + state->caps_count[HidP_Feature]; data->feature_report_byte_length = state->byte_length[HidP_Feature]; data->caps_size = caps_size; data->number_link_collection_nodes = state->number_link_collection_nodes; caps = HID_INPUT_VALUE_CAPS( data ); - memcpy( caps, state->values[0], data->input_caps_count * sizeof(*caps) ); + memcpy( caps, state->values[0], state->caps_count[HidP_Input] * sizeof(*caps) ); caps = HID_OUTPUT_VALUE_CAPS( data ); - memcpy( caps, state->values[1], data->output_caps_count * sizeof(*caps) ); + memcpy( caps, state->values[1], state->caps_count[HidP_Output] * sizeof(*caps) ); caps = HID_FEATURE_VALUE_CAPS( data ); - memcpy( caps, state->values[2], data->feature_caps_count * sizeof(*caps) ); + memcpy( caps, state->values[2], state->caps_count[HidP_Feature] * sizeof(*caps) ); nodes = HID_COLLECTION_NODES( data ); for (i = 0; i < data->number_link_collection_nodes; ++i) @@ -675,7 +679,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de device_desc->CollectionDesc[0].PreparsedData = (PHIDP_PREPARSED_DATA)preparsed; caps = HID_INPUT_VALUE_CAPS( preparsed ); - caps_end = caps + preparsed->input_caps_count; + caps_end = caps + preparsed->input_caps_end - preparsed->input_caps_start; for (; caps != caps_end; ++caps) { len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; @@ -684,7 +688,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de } caps = HID_OUTPUT_VALUE_CAPS( preparsed ); - caps_end = caps + preparsed->output_caps_count; + caps_end = caps + preparsed->output_caps_end - preparsed->output_caps_start; for (; caps != caps_end; ++caps) { len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count; @@ -693,7 +697,7 @@ NTSTATUS WINAPI HidP_GetCollectionDescription( PHIDP_REPORT_DESCRIPTOR report_de } caps = HID_FEATURE_VALUE_CAPS( preparsed ); - caps_end = caps + preparsed->feature_caps_count; + caps_end = caps + preparsed->feature_caps_end - preparsed->feature_caps_start; for (; caps != caps_end; ++caps) { len = caps->start_byte * 8 + caps->start_bit + caps->bit_size * caps->report_count;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2023