June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Support growing both 32- and 64-bit stacks.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: de89ce1bfedeb386baddd047884dc73dfe6f70bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=de89ce1bfedeb386baddd047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 17 09:25:19 2021 +0200 ntdll: Support growing both 32- and 64-bit stacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 90 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0a4004d2db9..52af195aa56 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3131,29 +3131,67 @@ void virtual_map_user_shared_data(void) } +struct thread_stack_info +{ + char *start; + char *limit; + char *end; + SIZE_T guaranteed; + BOOL is_wow; +}; + +/*********************************************************************** + * is_inside_thread_stack + */ +static BOOL is_inside_thread_stack( void *ptr, struct thread_stack_info *stack ) +{ + TEB *teb = NtCurrentTeb(); + WOW_TEB *wow_teb = get_wow_teb( teb ); + + stack->start = teb->DeallocationStack; + stack->limit = teb->Tib.StackLimit; + stack->end = teb->Tib.StackBase; + stack->guaranteed = max( teb->GuaranteedStackBytes, page_size * (is_win64 ? 2 : 1) ); + stack->is_wow = FALSE; + if ((char *)ptr > stack->start && (char *)ptr <= stack->end) return TRUE; + + if (!wow_teb) return FALSE; + stack->start = ULongToPtr( wow_teb->DeallocationStack ); + stack->limit = ULongToPtr( wow_teb->Tib.StackLimit ); + stack->end = ULongToPtr( wow_teb->Tib.StackBase ); + stack->guaranteed = max( wow_teb->GuaranteedStackBytes, page_size * (is_win64 ? 1 : 2) ); + stack->is_wow = TRUE; + return ((char *)ptr > stack->start && (char *)ptr <= stack->end); +} + + /*********************************************************************** * grow_thread_stack */ -static NTSTATUS grow_thread_stack( char *page ) +static NTSTATUS grow_thread_stack( char *page, struct thread_stack_info *stack_info ) { NTSTATUS ret = 0; - size_t guaranteed = max( NtCurrentTeb()->GuaranteedStackBytes, page_size * (is_win64 ? 2 : 1) ); set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); mprotect_range( page, page_size, 0, 0 ); - if (page >= (char *)NtCurrentTeb()->DeallocationStack + page_size + guaranteed) + if (page >= stack_info->start + page_size + stack_info->guaranteed) { set_page_vprot_bits( page - page_size, page_size, VPROT_COMMITTED | VPROT_GUARD, 0 ); mprotect_range( page - page_size, page_size, 0, 0 ); } else /* inside guaranteed space -> overflow exception */ { - page = (char *)NtCurrentTeb()->DeallocationStack + page_size; - set_page_vprot_bits( page, guaranteed, VPROT_COMMITTED, VPROT_GUARD ); - mprotect_range( page, guaranteed, 0, 0 ); + page = stack_info->start + page_size; + set_page_vprot_bits( page, stack_info->guaranteed, VPROT_COMMITTED, VPROT_GUARD ); + mprotect_range( page, stack_info->guaranteed, 0, 0 ); ret = STATUS_STACK_OVERFLOW; } - NtCurrentTeb()->Tib.StackLimit = page; + if (stack_info->is_wow) + { + WOW_TEB *wow_teb = get_wow_teb( NtCurrentTeb() ); + wow_teb->Tib.StackLimit = PtrToUlong( page ); + } + else NtCurrentTeb()->Tib.StackLimit = page; return ret; } @@ -3171,14 +3209,14 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) vprot = get_page_vprot( page ); if (!is_inside_signal_stack( stack ) && (vprot & VPROT_GUARD)) { - if (page < (char *)NtCurrentTeb()->DeallocationStack || - page >= (char *)NtCurrentTeb()->Tib.StackBase) + struct thread_stack_info stack_info; + if (!is_inside_thread_stack( page, &stack_info )) { set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); mprotect_range( page, page_size, 0, 0 ); ret = STATUS_GUARD_PAGE_VIOLATION; } - else ret = grow_thread_stack( page ); + else ret = grow_thread_stack( page, &stack_info ); } else if (err & EXCEPTION_WRITE_FAULT) { @@ -3205,19 +3243,16 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *rec ) { char *stack = stack_ptr; + struct thread_stack_info stack_info; - if (is_inside_signal_stack( stack )) - { - ERR( "nested exception on signal stack in thread %04x addr %p stack %p (%p-%p-%p)\n", - GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); - abort_thread(1); - } - - if (stack - size > stack || /* check for overflow in subtraction */ - stack <= (char *)NtCurrentTeb()->DeallocationStack || - stack > (char *)NtCurrentTeb()->Tib.StackBase) + if (!is_inside_thread_stack( stack, &stack_info )) { + if (is_inside_signal_stack( stack )) + { + ERR( "nested exception on signal stack in thread %04x addr %p stack %p\n", + GetCurrentThreadId(), rec->ExceptionAddress, stack ); + abort_thread(1); + } WARN( "exception outside of stack limits in thread %04x addr %p stack %p (%p-%p-%p)\n", GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); @@ -3226,19 +3261,20 @@ void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *r stack -= size; - if (stack < (char *)NtCurrentTeb()->DeallocationStack + 4096) + if (stack < stack_info.start + 4096) { /* stack overflow on last page, unrecoverable */ - UINT diff = (char *)NtCurrentTeb()->DeallocationStack + 4096 - stack; + UINT diff = stack_info.start + 4096 - stack; ERR( "stack overflow %u bytes in thread %04x addr %p stack %p (%p-%p-%p)\n", - diff, GetCurrentThreadId(), rec->ExceptionAddress, stack, NtCurrentTeb()->DeallocationStack, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + diff, GetCurrentThreadId(), rec->ExceptionAddress, stack, stack_info.start, + stack_info.limit, stack_info.end ); abort_thread(1); } - else if (stack < (char *)NtCurrentTeb()->Tib.StackLimit) + else if (stack < stack_info.limit) { mutex_lock( &virtual_mutex ); /* no need for signal masking inside signal handler */ - if ((get_page_vprot( stack ) & VPROT_GUARD) && grow_thread_stack( ROUND_ADDR( stack, page_mask ))) + if ((get_page_vprot( stack ) & VPROT_GUARD) && + grow_thread_stack( ROUND_ADDR( stack, page_mask ), &stack_info )) { rec->ExceptionCode = STATUS_STACK_OVERFLOW; rec->NumberParameters = 0;

1 0

Giovanni Mascellani : winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 997074224a01041f57aeb23c1b73f03002216e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=997074224a01041f57aeb23c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jun 17 13:30:36 2021 +0200 winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute. The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..382210ad9e2 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,14 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat +{ + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 90, + MFVideoRotationFormat_180 = 180, + MFVideoRotationFormat_270 = 270 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001,

1 0

Nikolay Sivov : include: Add IMFWorkQueueServicesEx definition.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 0ca8b6dd1f7e8a1ee1099353f0e4c48615fe26a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca8b6dd1f7e8a1ee1099353… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 17 15:07:26 2021 +0300 include: Add IMFWorkQueueServicesEx definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4e1a29d43d6..76e0d0dfeb4 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1270,6 +1270,165 @@ interface IMFRealTimeClientEx : IUnknown ); } +[ + object, + uuid(35fe1bb8-a3a9-40fe-bbec-eb569c9ccca3), +] +interface IMFWorkQueueServices : IUnknown +{ + [local] + HRESULT BeginRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteBeginRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndRegisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteEndRegisterTopologyWorkQueuesWithMMCSS( + [in] IUnknown *result + ); + + [local] + HRESULT BeginUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginUnregisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteBeginUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndUnregisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteEndUnregisterTopologyWorkQueuesWithMMCSS( + [in] IUnknown *result + ); + + HRESULT GetTopologyWorkQueueMMCSSClass( + [in] DWORD queue, + [out, size_is(*classname_len)] LPWSTR classname, + [in, out] DWORD *classname_len + ); + + HRESULT GetTopologyWorkQueueMMCSSTaskId( + [in] DWORD queue, + [out] DWORD *taksid + ); + + [local] + HRESULT BeginRegisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteBeginRegisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndRegisterPlatformWorkQueueWithMMCSS( + [in] IMFAsyncResult *result, + [out] DWORD *taskid + ); + + [call_as(EndRegisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteEndRegisterPlatformWorkQueueWithMMCSS( + [in] IUnknown *result, + [out] DWORD *taskid + ); + + [local] + HRESULT BeginUnregisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginUnregisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteBeginUnregisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndUnregisterPlatformWorkQueueWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndUnregisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteEndUnregisterPlatformWorkQueueWithMMCSS( + [in] IUnknown *result + ); + + HRESULT GetPlaftormWorkQueueMMCSSClass( + [in] DWORD platform_queue, + [out, size_is(*classname_len)] LPWSTR classname, + [in, out] DWORD *classname_len + ); + + HRESULT GetPlatformWorkQueueMMCSSTaskId( + [in] DWORD platform_queue, + [out] DWORD *taskid + ); +} + +[ + object, + uuid(96bf961b-40fe-42f1-ba9d-320238b49700), +] +interface IMFWorkQueueServicesEx : IMFWorkQueueServices +{ + HRESULT GetTopologyWorkQueueMMCSSPriority( + [in] DWORD queueid, + [out] LONG *priority + ); + + [local] + HRESULT BeginRegisterPlatformWorkQueueWithMMCSSEx( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] LONG priority, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterPlatformWorkQueueWithMMCSSEx)] + HRESULT RemoteBeginRegisterPlatformWorkQueueWithMMCSSEx( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] LONG priority, + [in] IMFRemoteAsyncCallback *callback + ); + + HRESULT GetPlatformWorkQueueMMCSSPriority( + [in] DWORD platform_queue, + [out] LONG *priority + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, @@ -1386,6 +1545,7 @@ cpp_quote("EXTERN_GUID(MR_CAPTURE_POLICY_VOLUME_SERVICE, 0x24030acd, 0x107a, 0x4 cpp_quote("EXTERN_GUID(MR_STREAM_VOLUME_SERVICE, 0xf8b5fa2f, 0x32ef, 0x46f5, 0xb1, 0x72, 0x13, 0x21, 0x21, 0x2f, 0xb2, 0xc4);") cpp_quote("EXTERN_GUID(MR_AUDIO_POLICY_SERVICE, 0x911fd737, 0x6775, 0x4ab0, 0xa6, 0x14, 0x29, 0x78, 0x62, 0xfd, 0xac, 0x88);") cpp_quote("EXTERN_GUID(MF_PROPERTY_HANDLER_SERVICE, 0xa3face02, 0x32b8, 0x41dd, 0x90, 0xe7, 0x5f, 0xef, 0x7c, 0x89, 0x91, 0xb5);") +cpp_quote("EXTERN_GUID(MF_WORKQUEUE_SERVICES, 0x8e37d489, 0x41e0, 0x413a, 0x90, 0x68, 0x28, 0x7c, 0x88, 0x6d, 0x8d, 0xda);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Gijs Vermeulen : ntdll: Avoid declaration-after-statement warning.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 836ec1d7ed423798c57ba00dbcd19a1a480e32da URL: https://source.winehq.org/git/wine.git/?a=commit;h=836ec1d7ed423798c57ba00d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 17 14:35:50 2021 +0200 ntdll: Avoid declaration-after-statement warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index c1ff0289cf2..140e7fc8e0d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -894,10 +894,11 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) { #if defined(MACH_TASK_BASIC_INFO) struct mach_task_basic_info info; + mach_msg_type_number_t infoCount; if (unix_pid != -1) return; /* FIXME: Retrieve information for other processes. */ - mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; + infoCount = MACH_TASK_BASIC_INFO_COUNT; if(task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) { pvmi->VirtualSize = info.resident_size + info.virtual_size;

1 0

Hugh McMaster : reg/tests: Test key and value creation in 32-bit and 64-bit registry views.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 24d0d6f524d6c51cc5d8c909bf6cd942d6ae443d URL: https://source.winehq.org/git/wine.git/?a=commit;h=24d0d6f524d6c51cc5d8c909… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 17 23:34:03 2021 +1000 reg/tests: Test key and value creation in 32-bit and 64-bit registry views. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 133 ++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/import.c | 39 ++++++++----- programs/reg/tests/reg_test.h | 2 + 3 files changed, 159 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 384eb9012c7..264693ab349 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -274,6 +274,16 @@ static void test_command_syntax(void) /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Test registry view */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:32", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:64", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:64 /reg:64", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_key_formats(void) @@ -849,6 +859,117 @@ static void test_reg_multi_sz(void) delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void test_registry_view_win32(void) +{ + HKEY hkey; + DWORD r; + BOOL is_wow64, is_win32; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + /* Try adding to the 32-bit registry view (32-bit Windows) */ + run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine32 /d Test /f /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, 0); + + /* Try adding to the 64-bit registry view, which doesn't exist on 32-bit Windows */ + run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, 0); +} + +static void test_registry_view_win64(void) +{ + HKEY hkey; + DWORD r; + BOOL is_wow64, is_win64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + /* Try adding to the 32-bit registry view (64-bit Windows) */ + run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine32 /d Test /f /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + todo_wine verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + todo_wine close_key(hkey); + todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try adding to the 64-bit registry view (64-bit Windows) */ + run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); +} + +static void test_registry_view_wow64(void) +{ + HKEY hkey; + DWORD r; + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + /* Try adding to the 32-bit registry view (WOW64) */ + run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine32 /d Test /f /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try adding to the 64-bit registry view (WOW64) */ + run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + todo_wine close_key(hkey); + + todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + todo_wine close_key(hkey); + todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); +} + START_TEST(add) { DWORD r; @@ -868,4 +989,16 @@ START_TEST(add) test_reg_dword(); test_reg_dword_big_endian(); test_reg_multi_sz(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index c8a6b079a6a..2d8ece8990b 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -18,6 +18,29 @@ #include "reg_test.h" +BOOL is_elevated_process(void) +{ + LONG err; + HKEY hkey; + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + + if (err == ERROR_ACCESS_DENIED) + return FALSE; + + if (err == ERROR_FILE_NOT_FOUND) + { + if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL)) + return FALSE; + + RegCloseKey(hkey); + RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + } + + return TRUE; +} + static BOOL write_file(const void *str, DWORD size) { HANDLE file; @@ -3466,30 +3489,16 @@ static void test_unicode_import_with_whitespace(void) static void test_import_win31(void) { - LONG err; HKEY hkey; DWORD r; /* Check if reg.exe is running with elevated privileges */ - err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - if (err == ERROR_ACCESS_DENIED) + if (!is_elevated_process()) { win_skip("reg.exe is not running with elevated privileges; " "skipping Windows 3.1 import tests\n"); return; } - if (err == ERROR_FILE_NOT_FOUND) - { - if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ, NULL, &hkey, NULL)) - { - win_skip("reg.exe is not running with elevated privileges; " - "skipping Windows 3.1 import tests\n"); - return; - } - RegCloseKey(hkey); - RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - } /* Test simple value */ test_import_str("REGEDIT\r\n" diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index db525619978..fdc747af1e9 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -90,6 +90,8 @@ extern const char *embedded_null_test; extern const char *escaped_null_test; /* import.c */ +BOOL is_elevated_process(void); + #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc);

1 0

Andrew Eikum : shell32: Always create default known folder directories.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 978e03ea942a7734dfb2d8c4b79e84fe8ac89f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978e03ea942a7734dfb2d8c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 17 10:43:01 2021 -0500 shell32: Always create default known folder directories. Some applications query for the default path, but this would fail on older prefixes where the new default path was never created. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f71b660a7aa..005e905baaa 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4688,6 +4688,13 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, } } } + else + { + /* create the default dir, which may be different from the path + * stored in the registry. */ + SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, + hToken, SHGFP_TYPE_DEFAULT, path); + } } if (hUserKey) RegCloseKey(hUserKey);

1 0

Rémi Bernon : hidclass.sys: Simplify signed / unsigned item value parsing.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: e7423a054d0e574e59088b9e7c33a2d06b8d8c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7423a054d0e574e59088b9e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 17 10:20:16 2021 +0200 hidclass.sys: Simplify signed / unsigned item value parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 109 +++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7423a054d0e574e5908…

1 0

Rémi Bernon : hidclass.sys: Use a single switch to parse all item types.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 81e2106e57a6a6b36d7a58e7390e91a0554d8761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e2106e57a6a6b36d7a58e7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 17 10:20:17 2021 +0200 hidclass.sys: Use a single switch to parse all item types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 365 +++++++++++++++++++---------------------- 1 file changed, 165 insertions(+), 200 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81e2106e57a6a6b36d7a…

1 0

Rémi Bernon : hidclass.sys: Introduce new hid_parser_state struct.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 08deef6a517669f2264f994863f42d69484bd464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08deef6a517669f2264f9948… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 17 10:20:18 2021 +0200 hidclass.sys: Introduce new hid_parser_state struct. And internal hid_value_caps struct, and use them to store items and usages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 194 +++++++++++++++++++++++++---------------- include/wine/hid.h | 23 +++++ 2 files changed, 141 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08deef6a517669f2264f…

1 0

Rémi Bernon : hidclass.sys: Add a stack to parser_state to store global items.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 34cbc202f372e383b712d346d8dc12fa594739bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=34cbc202f372e383b712d346… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 17 10:20:19 2021 +0200 hidclass.sys: Add a stack to parser_state to store global items. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 124 +++++++++++++++++++++---------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index b66e9deb9a0..b57ab2a7da8 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -128,11 +128,6 @@ struct collection { struct list collections; }; -struct caps_stack { - struct list entry; - struct hid_value_caps caps; -}; - static inline const char *debugstr_hidp_value_caps( HIDP_VALUE_CAPS *caps ) { if (!caps) return "(null)"; @@ -298,17 +293,69 @@ struct hid_parser_state DWORD usages_size; struct hid_value_caps items; + + struct hid_value_caps *stack; + DWORD stack_size; + DWORD global_idx; }; +static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) +{ + if (index < *array_size) return TRUE; + if ((*array_size = *array_size ? (*array_size * 3 / 2) : 32) <= index) return FALSE; + if (!(*array = realloc( *array, *array_size * sizeof(**array) ))) return FALSE; + return TRUE; +} + +static void copy_global_items( struct hid_value_caps *dst, const struct hid_value_caps *src ) +{ + dst->usage_page = src->usage_page; + dst->logical_min = src->logical_min; + dst->logical_max = src->logical_max; + dst->physical_min = src->physical_min; + dst->physical_max = src->physical_max; + dst->units_exp = src->units_exp; + dst->units = src->units; + dst->bit_size = src->bit_size; + dst->report_id = src->report_id; + dst->report_count = src->report_count; +} + static void reset_local_items( struct hid_parser_state *state ) { - state->items.is_range = FALSE; - state->items.is_string_range = FALSE; - state->items.is_designator_range = FALSE; - state->items.usage_min = FALSE; + struct hid_value_caps tmp; + copy_global_items( &tmp, &state->items ); + memset( &state->items, 0, sizeof(state->items) ); + copy_global_items( &state->items, &tmp ); state->usages_size = 0; } +static BOOL parse_global_push( struct hid_parser_state *state ) +{ + if (!array_reserve( &state->stack, &state->stack_size, state->global_idx )) + { + ERR( "HID parser stack overflow!\n" ); + return FALSE; + } + + copy_global_items( state->stack + state->global_idx, &state->items ); + state->global_idx++; + return TRUE; +} + +static BOOL parse_global_pop( struct hid_parser_state *state ) +{ + if (!state->global_idx) + { + ERR( "HID parser global stack underflow!\n" ); + return FALSE; + } + + state->global_idx--; + copy_global_items( &state->items, state->stack + state->global_idx ); + return TRUE; +} + static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage ) { state->usages[state->usages_size] = usage; @@ -317,6 +364,13 @@ static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage ) return state->usages_size <= 255; } +static void free_parser_state( struct hid_parser_state *state ) +{ + if (state->global_idx) ERR( "%u unpopped device caps on the stack\n", state->global_idx ); + free( state->stack ); + free( state ); +} + static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) @@ -366,7 +420,7 @@ static void parse_collection(unsigned int bSize, int itemVal, static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *feature_index, unsigned int *collection_index, - struct collection *collection, struct hid_parser_state *state, struct list *stack ) + struct collection *collection, struct hid_parser_state *state ) { int i, j; UINT32 value; @@ -445,7 +499,7 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int reset_local_items( state ); if ((i = parse_descriptor( descriptor, i, length, feature_index, collection_index, - subcollection, state, stack )) < 0) + subcollection, state )) < 0) return i; continue; } @@ -484,34 +538,11 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int state->items.report_count = value; break; case SHORT_ITEM(TAG_GLOBAL_PUSH, TAG_TYPE_GLOBAL): - { - struct caps_stack *saved; - if (!(saved = malloc(sizeof(*saved)))) return -1; - saved->caps = state->items; - TRACE("Push\n"); - list_add_tail(stack, &saved->entry); + if (!parse_global_push( state )) return -1; break; - } case SHORT_ITEM(TAG_GLOBAL_POP, TAG_TYPE_GLOBAL): - { - struct list *tail; - struct caps_stack *saved; - TRACE("Pop\n"); - tail = list_tail(stack); - if (tail) - { - saved = LIST_ENTRY(tail, struct caps_stack, entry); - state->items = saved->caps; - list_remove(tail); - free(saved); - } - else - { - ERR("Pop but no stack!\n"); - return -1; - } + if (!parse_global_pop( state )) return -1; break; - } case SHORT_ITEM(TAG_LOCAL_USAGE, TAG_TYPE_LOCAL): if (!parse_local_usage( state, value )) return -1; @@ -775,8 +806,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct collection *base; int i; - struct list caps_stack; - unsigned int feature_count = 0; unsigned int cidx; @@ -791,8 +820,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) } } - list_init(&caps_stack); - if (!(state = calloc( 1, sizeof(*state) ))) return NULL; if (!(base = calloc( 1, sizeof(*base) ))) { @@ -804,30 +831,19 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) list_init(&base->collections); cidx = 0; - if (parse_descriptor( descriptor, 0, length, &feature_count, &cidx, base, state, &caps_stack ) < 0) + if (parse_descriptor( descriptor, 0, length, &feature_count, &cidx, base, state ) < 0) { free_collection(base); - free( state ); + free_parser_state( state ); return NULL; } debug_collection(base); - if (!list_empty(&caps_stack)) - { - struct caps_stack *entry, *cursor; - ERR("%i unpopped device caps on the stack\n", list_count(&caps_stack)); - LIST_FOR_EACH_ENTRY_SAFE(entry, cursor, &caps_stack, struct caps_stack, entry) - { - list_remove(&entry->entry); - free(entry); - } - } - if ((data = build_PreparseData(base, cidx))) debug_print_preparsed(data); free_collection(base); - free( state ); + free_parser_state( state ); return data; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 735d1a0d996..ff1db96a06a 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2093,6 +2093,7 @@ static void test_hidp(HANDLE file, int report_id) check_member(value_caps[4], value_caps[3], "%d", PhysicalMax); todo_wine check_member(value_caps[4], value_caps[3], "%04x", Range.UsageMin); + todo_wine check_member(value_caps[4], value_caps[3], "%04x", Range.UsageMax); check_member(value_caps[4], value_caps[3], "%d", Range.StringMin); check_member(value_caps[4], value_caps[3], "%d", Range.StringMax);

1 0