wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Arkadiusz Hiler : dinput: Get rid of unused parameter in match_device_object.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 8a74acd73a9ba819e555212a06e64c46f50362b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a74acd73a9ba819e555212a06e64c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:53:04 2022 +0300 dinput: Get rid of unused parameter in match_device_object. --- dlls/dinput/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f4bdce51633..e15a22bb413 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD } static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, - const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) + const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); DIOBJECTDATAFORMAT *device_obj, *user_obj; @@ -292,7 +292,7 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const { match_obj = format->rgodf + i; - if (!match_device_object( device_format, user_format, format, match_obj, impl->dinput->dwVersion )) + if (!match_device_object( device_format, user_format, match_obj, impl->dinput->dwVersion )) { WARN( "object %s not found\n", debugstr_diobjectdataformat( match_obj ) ); if (!(match_obj->dwType & DIDFT_OPTIONAL)) goto failed;

1 0

Arkadiusz Hiler : dinput: Set correct object names for dials and sliders.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 17ce835ed3f4b4957fe8cc53df28c845c3cae464 URL: https://gitlab.winehq.org/wine/wine/-/commit/17ce835ed3f4b4957fe8cc53df28c8… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:51:38 2022 +0300 dinput: Set correct object names for dials and sliders. --- dlls/dinput/joystick_hid.c | 2 ++ dlls/dinput/tests/joystick8.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc7b70aac4..7370982d4c9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -354,6 +354,8 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance ) case MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC): return L"X Axis"; case MAKELONG(HID_USAGE_GENERIC_Y, HID_USAGE_PAGE_GENERIC): return L"Y Axis"; case MAKELONG(HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC): return L"Z Axis"; + case MAKELONG(HID_USAGE_GENERIC_SLIDER, HID_USAGE_PAGE_GENERIC): return L"Slider"; + case MAKELONG(HID_USAGE_GENERIC_DIAL, HID_USAGE_PAGE_GENERIC): return L"Dial"; case MAKELONG(PID_USAGE_ATTACK_LEVEL, HID_USAGE_PAGE_PID): return L"Attack Level"; case MAKELONG(PID_USAGE_ATTACK_TIME, HID_USAGE_PAGE_PID): return L"Attack Time"; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 90d7182a1fa..3303a3c9f32 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2992,8 +2992,8 @@ static void test_many_axes_joystick(void) {0}, {0}, {0}, - {.name = TRUE}, - {.name = TRUE, .guid = TRUE}, + {0}, + {.guid = TRUE}, {.flags = TRUE}, {.flags = TRUE}, {.flags = TRUE}, @@ -3120,7 +3120,7 @@ static void test_many_axes_joystick(void) check_member( objinst, expect_objects[8], "%#lx", dwOfs ); check_member( objinst, expect_objects[8], "%#lx", dwType ); check_member( objinst, expect_objects[8], "%#lx", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[8], tszName ); + if (!localized) check_member_wstr( objinst, expect_objects[8], tszName ); check_member( objinst, expect_objects[8], "%lu", dwFFMaxForce ); check_member( objinst, expect_objects[8], "%lu", dwFFForceResolution ); check_member( objinst, expect_objects[8], "%u", wCollectionNumber );

1 0

Hugh McMaster : regedit: Update the listview item without reloading the value data.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 6901f3ccfc30155a5c38e2285c26a02dce8d903e URL: https://gitlab.winehq.org/wine/wine/-/commit/6901f3ccfc30155a5c38e2285c26a0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 25 20:45:35 2022 +1000 regedit: Update the listview item without reloading the value data. --- programs/regedit/edit.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 4588be196d6..537bcbd4541 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -143,9 +143,6 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size); if (ret) error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED); - free(params->data); - params->data = NULL; - return !ret; } @@ -427,7 +424,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); - read_value(hwnd, &params); format_value_data(g_pChildWnd->hListWnd, index, params.type, params.data, params.size); }

1 0

Hugh McMaster : regedit: Set the dlgproc value name via a function, not a global.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: d1bc3623e8dfe1b71e9d0c6905cdde03cf253f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1bc3623e8dfe1b71e9d0c6905cdde… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 25 20:40:27 2022 +1000 regedit: Set the dlgproc value name via a function, not a global. --- programs/regedit/edit.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index e63fd8fcf8b..4588be196d6 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -29,7 +29,6 @@ #include "main.h" -static const WCHAR* editValueName; static BOOL isDecimal; struct edit_params @@ -150,6 +149,14 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) return !ret; } +static void set_dlgproc_value_name(HWND hwndDlg, struct edit_params *params) +{ + if (params->value_name) + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); + else + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); +} + static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) { struct edit_params *params; @@ -160,7 +167,7 @@ static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpa case WM_INITDIALOG: params = (struct edit_params *)lparam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); + set_dlgproc_value_name(hwndDlg, params); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data); return TRUE; case WM_COMMAND: @@ -200,7 +207,7 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar case WM_INITDIALOG: params = (struct edit_params *)lparam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); + set_dlgproc_value_name(hwndDlg, params); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data); CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, IDC_DWORD_HEX); isDecimal = FALSE; @@ -237,10 +244,7 @@ static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wP case WM_INITDIALOG: params = (struct edit_params *)lParam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - if (params->value_name) - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); - else - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); + set_dlgproc_value_name(hwndDlg, params); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->size, (LPARAM)params->data); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; @@ -380,8 +384,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) struct edit_params params; BOOL result = FALSE; - editValueName = valueName ? valueName : g_pszDefaultValueName; - if (RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &params.hkey)) { error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);

1 0

Hugh McMaster : regedit: Update binary data via update_registry_value().
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5e2c3dd53725c4a5064c2f09daaf570f048946f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e2c3dd53725c4a5064c2f09daaf57… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Jul 24 22:41:05 2022 +1000 regedit: Update binary data via update_registry_value(). --- programs/regedit/edit.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 44ef45993fd..e63fd8fcf8b 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -96,6 +96,11 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) switch (params->type) { + case REG_SZ: + case REG_EXPAND_SZ: + params->data = buf; + params->size = (len + 1) * sizeof(WCHAR); + break; case REG_DWORD: params->size = sizeof(DWORD); params->data = malloc(params->size); @@ -129,9 +134,11 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) params->size = j * sizeof(WCHAR); break; } - default: /* REG_SZ, REG_EXPAND_SZ */ - params->data = buf; - params->size = (len + 1) * sizeof(WCHAR); + default: /* hex data types */ + free(buf); + params->size = SendMessageW(hwndValue, HEM_GETDATA, 0, 0); + params->data = malloc(params->size); + SendMessageW(hwndValue, HEM_GETDATA, (WPARAM)params->size, (LPARAM)params->data); } ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size); @@ -224,9 +231,7 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { struct edit_params *params; - BYTE *data; - LONG size; - LONG lRet; + int ret = 0; switch(uMsg) { case WM_INITDIALOG: @@ -243,23 +248,10 @@ static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wP switch (LOWORD(wParam)) { case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - size = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - data = malloc(size); - - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); - lRet = RegSetValueExW(params->hkey, params->value_name, 0, params->type, data, size); - free(data); - - if (lRet == ERROR_SUCCESS) - EndDialog(hwndDlg, 1); - else - { - error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED); - EndDialog(hwndDlg, 0); - } - return TRUE; + ret = update_registry_value(hwndDlg, params); + /* fall through */ case IDCANCEL: - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, ret); return TRUE; } }

1 0

Brendan Shanks : wow64: Allow setting NtSetInformationProcess(ProcessExecuteFlags).
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: bbdab496eec81a37921ea492b70c49f9f206666e URL: https://gitlab.winehq.org/wine/wine/-/commit/bbdab496eec81a37921ea492b70c49… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Sun Jul 24 10:12:25 2022 -0700 wow64: Allow setting NtSetInformationProcess(ProcessExecuteFlags). --- dlls/wow64/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 55cb19c6a17..1d35702bf01 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1075,6 +1075,7 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) { case ProcessDefaultHardErrorMode: /* ULONG */ case ProcessPriorityClass: /* PROCESS_PRIORITY_CLASS */ + case ProcessExecuteFlags: /* ULONG */ return NtSetInformationProcess( handle, class, ptr, len ); case ProcessAffinityMask: /* ULONG_PTR */ @@ -1085,9 +1086,6 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) } else return STATUS_INVALID_PARAMETER; - case ProcessExecuteFlags: /* ULONG */ - return STATUS_ACCESS_DENIED; - case ProcessInstrumentationCallback: /* PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION */ if (len == sizeof(PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION32)) {

1 0

Brendan Shanks : ntdll: Allow changes to DEP flags under Wow64.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: ce5fe931e138b880aa110143d840cf13143066ba URL: https://gitlab.winehq.org/wine/wine/-/commit/ce5fe931e138b880aa110143d840cf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jul 21 11:03:18 2022 -0700 ntdll: Allow changes to DEP flags under Wow64. --- dlls/ntdll/unix/process.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 078ad75099d..83888717a5c 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -73,9 +73,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); -static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE | (sizeof(void *) > sizeof(int) ? - MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | - MEM_EXECUTE_OPTION_PERMANENT : 0); +static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE; static UINT process_error_mode; @@ -1434,8 +1432,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class case ProcessExecuteFlags: len = sizeof(ULONG); - if (size == len) *(ULONG *)info = execute_flags; - else ret = STATUS_INFO_LENGTH_MISMATCH; + if (size != len) + ret = STATUS_INFO_LENGTH_MISMATCH; + else if (is_win64 && !NtCurrentTeb()->WowTebOffset) + *(ULONG *)info = MEM_EXECUTE_OPTION_DISABLE | + MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | + MEM_EXECUTE_OPTION_PERMANENT; + else + *(ULONG *)info = execute_flags; break; case ProcessPriorityClass: @@ -1560,7 +1564,7 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; case ProcessExecuteFlags: - if (is_win64 || size != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; + if ((is_win64 && !NtCurrentTeb()->WowTebOffset) || size != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; if (execute_flags & MEM_EXECUTE_OPTION_PERMANENT) return STATUS_ACCESS_DENIED; else {

1 0

Paul Gofman : ntdll: Preserve rbx register when calling DLL entry point on x64.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 7527869fe868834ede7601aa40f11d28cb809f06 URL: https://gitlab.winehq.org/wine/wine/-/commit/7527869fe868834ede7601aa40f11d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 11 17:54:36 2022 -0500 ntdll: Preserve rbx register when calling DLL entry point on x64. --- dlls/ntdll/loader.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 20a96664825..043bce67ea9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -264,7 +264,7 @@ void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) * that only modifying esi leads to a crash, so use this one to backup * ebp while running the dll entry proc. */ -#ifdef __i386__ +#if defined(__i386__) extern BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); __ASM_GLOBAL_FUNC(call_dll_entry_point, "pushl %ebp\n\t" @@ -298,13 +298,36 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -#else /* __i386__ */ +#elif defined(__x86_64__) +extern BOOL CDECL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); +/* Some apps modify rbx in TLS entry point. */ +__ASM_GLOBAL_FUNC(call_dll_entry_point, + "pushq %rbx\n\t" + __ASM_SEH(".seh_pushreg %rbx\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbx,0\n\t") + "subq $48,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 48\n\t") + __ASM_SEH(".seh_endprologue\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 48\n\t") + "mov %rcx,%r10\n\t" + "mov %rdx,%rcx\n\t" + "mov %r8d,%edx\n\t" + "mov %r9,%r8\n\t" + "call *%r10\n\t" + "addq $48,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -48\n\t") + "popq %rbx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbx\n\t") + "ret" ) +#else static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ) { return proc( module, reason, reserved ); } -#endif /* __i386__ */ +#endif #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)

1 0

Brendan Shanks : wow64: Respect the large address aware flag.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: a3de8d191b7034ec47e3ed27f91fc7b1eb61d069 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3de8d191b7034ec47e3ed27f91fc7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 27 13:47:41 2022 -0700 wow64: Respect the large address aware flag. --- dlls/wow64/process.c | 2 +- dlls/wow64/syscall.c | 4 ++++ dlls/wow64/wow64_private.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 0c6726b9c6e..55cb19c6a17 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1118,7 +1118,7 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) PROCESS_STACK_ALLOCATION_INFORMATION info; info.ReserveSize = stack->ReserveSize; - info.ZeroBits = stack->ZeroBits ? stack->ZeroBits : 0x7fffffff; + info.ZeroBits = get_zero_bits( stack->ZeroBits ); if (!(status = NtSetInformationProcess( handle, class, &info, sizeof(info) ))) stack->StackBase = PtrToUlong( info.StackBase ); return status; diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 7cab0894738..80c4bf73d8b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; ULONG_PTR args_alignment = 0; +ULONG_PTR default_zero_bits = 0x7fffffff; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -566,10 +567,13 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex { HMODULE module; UNICODE_STRING str; + SYSTEM_BASIC_INFORMATION info; RtlWow64GetProcessMachines( GetCurrentProcess(), &current_machine, &native_machine ); if (!current_machine) current_machine = native_machine; args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); + NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); + default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index b26148023db..c089a6ec4aa 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -39,6 +39,7 @@ extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; +extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; struct object_attr64 @@ -83,7 +84,7 @@ static inline ULONG64 get_ulong64( UINT **args ) static inline ULONG_PTR get_zero_bits( ULONG_PTR zero_bits ) { - return zero_bits ? zero_bits : 0x7fffffff; + return zero_bits ? zero_bits : default_zero_bits; } static inline void **addr_32to64( void **addr, ULONG *addr32 )

1 0

Alistair Leslie-Hughes : xactengine3_7: Remove entry after FAudio Destroyed call.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5f6425f0efa74a44bdeb65f065a9db3a19e9628c URL: https://gitlab.winehq.org/wine/wine/-/commit/5f6425f0efa74a44bdeb65f065a9db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 12:34:27 2022 +1000 xactengine3_7: Remove entry after FAudio Destroyed call. FACTWaveBank_Destroy will invoke the callback which we attempt to lookup the wavebank. The callback must have a pointer, help states it isn't valid but still points to the wavebank that was destroyed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/tests/xact3.c | 6 ++-- dlls/xactengine3_7/xact_dll.c | 70 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 5daa18ca81b..6b66af59ff0 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -172,9 +172,11 @@ static void WINAPI notification_cb(const XACT_NOTIFICATION *notification) data->received = TRUE; ok(notification->type == data->type, "Unexpected notification type %u\n", notification->type); - todo_wine_if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) - ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", + if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) + { + ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", notification->waveBank.pWaveBank, data->wave_bank); + } ok(thread_id == data->thread_id, "Unexpected thread id %#lx instead of %#lx\n", thread_id, data->thread_id); } diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index f7be480656d..ee559dd4b07 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -60,6 +60,21 @@ struct wrapper_lookup void *xact; }; +typedef struct _XACT3EngineImpl { + IXACT3Engine IXACT3Engine_iface; + + FACTAudioEngine *fact_engine; + + XACT_READFILE_CALLBACK pReadFile; + XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; + XACT_NOTIFICATION_CALLBACK notification_callback; + + void *wb_prepared_context; + void *wb_destroyed_context; + struct wine_rb_tree wb_wrapper_lookup; + CRITICAL_SECTION wb_wrapper_lookup_cs; +} XACT3EngineImpl; + static int wrapper_lookup_compare(const void *key, const struct wine_rb_entry *entry) { struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); @@ -74,20 +89,30 @@ static void wrapper_lookup_destroy(struct wine_rb_entry *entry, void *context) HeapFree(GetProcessHeap(), 0, lookup); } -typedef struct _XACT3EngineImpl { - IXACT3Engine IXACT3Engine_iface; +static void wrapper_remove_entry(XACT3EngineImpl *engine, void *key) +{ + struct wrapper_lookup *lookup; + struct wine_rb_entry *entry; - FACTAudioEngine *fact_engine; + EnterCriticalSection(&engine->wb_wrapper_lookup_cs); - XACT_READFILE_CALLBACK pReadFile; - XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; - XACT_NOTIFICATION_CALLBACK notification_callback; + entry = wine_rb_get(&engine->wb_wrapper_lookup, key); + if (!entry) + { + LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); - void *wb_prepared_context; - void *wb_destroyed_context; - struct wine_rb_tree wb_wrapper_lookup; - CRITICAL_SECTION wb_wrapper_lookup_cs; -} XACT3EngineImpl; + WARN("cannot find key in wrapper lookup\n"); + } + else + { + wine_rb_remove(&engine->wb_wrapper_lookup, entry); + + LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); + + lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); + HeapFree(GetProcessHeap(), 0, lookup); + } +} typedef struct _XACT3CueImpl { IXACT3Cue IXACT3Cue_iface; @@ -591,33 +616,14 @@ static inline XACT3WaveBankImpl *impl_from_IXACT3WaveBank(IXACT3WaveBank *iface) static HRESULT WINAPI IXACT3WaveBankImpl_Destroy(IXACT3WaveBank *iface) { XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); - struct wrapper_lookup *lookup; - struct wine_rb_entry *entry; HRESULT hr; TRACE("(%p)\n", This); - EnterCriticalSection(&This->engine->wb_wrapper_lookup_cs); - - entry = wine_rb_get(&This->engine->wb_wrapper_lookup, This->fact_wavebank); - - if (!entry) - { - LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs); - - WARN("cannot find wave bank in wrapper lookup\n"); - } - else - { - wine_rb_remove(&This->engine->wb_wrapper_lookup, entry); + hr = FACTWaveBank_Destroy(This->fact_wavebank); - LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs); + wrapper_remove_entry(This->engine, This->fact_wavebank); - lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); - HeapFree(GetProcessHeap(), 0, lookup); - } - - hr = FACTWaveBank_Destroy(This->fact_wavebank); HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
64
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 July 2022