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

Biswapriyo Nath : include: Add ID3D12DebugDevice interface declarations in vkd3d_d3d12sdklayers.idl.
by Alexandre Julliard 10 Jun '22

10 Jun '22

Module: vkd3d Branch: master Commit: abd82c9e6d58c860249a592de1e0f30488325dae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abd82c9e6d58c860249a592… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 9 10:40:28 2022 +0530 include: Add ID3D12DebugDevice interface declarations in vkd3d_d3d12sdklayers.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 86 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 785aba70..8238214c 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -906,6 +906,54 @@ typedef enum D3D12_GPU_BASED_VALIDATION_FLAGS } D3D12_GPU_BASED_VALIDATION_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_FLAGS)") +typedef enum D3D12_RLDO_FLAGS +{ + D3D12_RLDO_NONE = 0x0, + D3D12_RLDO_SUMMARY = 0x1, + D3D12_RLDO_DETAIL = 0x2, + D3D12_RLDO_IGNORE_INTERNAL = 0x4, +} D3D12_RLDO_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RLDO_FLAGS)") + +typedef enum D3D12_DEBUG_DEVICE_PARAMETER_TYPE +{ + D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS, + D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS, + D3D12_DEBUG_DEVICE_PARAMETER_GPU_SLOWDOWN_PERFORMANCE_FACTOR, +} D3D12_DEBUG_DEVICE_PARAMETER_TYPE; + +typedef enum D3D12_DEBUG_FEATURE +{ + D3D12_DEBUG_FEATURE_NONE = 0x00, + D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x01, + D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING = 0x02, + D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION = 0x04, + D3D12_DEBUG_FEATURE_EMULATE_WINDOWS7 = 0x08, +} D3D12_DEBUG_FEATURE; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEBUG_FEATURE)") + +typedef enum D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS +{ + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_NONE = 0x00, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_TRACKING_ONLY_SHADERS = 0x01, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_UNGUARDED_VALIDATION_SHADERS = 0x02, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_FRONT_LOAD_CREATE_GUARDED_VALIDATION_SHADERS = 0x04, + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS_VALID_MASK = 0x07 +} D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS)") + +typedef struct D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS +{ + UINT MaxMessagesPerCommandList; + D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE DefaultShaderPatchMode; + D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS PipelineStateCreateFlags; +} D3D12_DEBUG_DEVICE_GPU_BASED_VALIDATION_SETTINGS; + +typedef struct D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR +{ + FLOAT SlowdownFactor; +} D3D12_DEBUG_DEVICE_GPU_SLOWDOWN_PERFORMANCE_FACTOR; + typedef struct D3D12_MESSAGE { D3D12_MESSAGE_CATEGORY Category; @@ -1001,6 +1049,44 @@ interface ID3D12Debug5 : ID3D12Debug4 void SetEnableAutoName(BOOL enable); } +[ + uuid(3febd6dd-4973-4787-8194-e45f9e28923e), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice : IUnknown +{ + HRESULT SetFeatureMask(D3D12_DEBUG_FEATURE mask); + D3D12_DEBUG_FEATURE GetFeatureMask(); + HRESULT ReportLiveDeviceObjects(D3D12_RLDO_FLAGS flags); +} + +[ + uuid(a9b71770-d099-4a65-a698-3dee10020f88), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice1 : IUnknown +{ + HRESULT SetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, const void *data, UINT size); + HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); + HRESULT ReportLiveDeviceObjects(D3D12_RLDO_FLAGS flags); +} + +[ + uuid(60eccbc1-378d-4df1-894c-f8ac5ce4d7dd), + object, + local, + pointer_default(unique) +] +interface ID3D12DebugDevice2 : ID3D12DebugDevice +{ + HRESULT SetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, const void *data, UINT size); + HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); +} + [ uuid(0742a90b-c387-483f-b946-30a7e4e61458), object,

1 0

Biswapriyo Nath : include: Add ID3D12SharingContract interface declarations in vkd3d_d3d12sdklayers.idl.
by Alexandre Julliard 10 Jun '22

10 Jun '22

Module: vkd3d Branch: master Commit: 694e5c865b01a4728ea1620ad456816248ce88a1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=694e5c865b01a4728ea1620… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 9 10:40:28 2022 +0530 include: Add ID3D12SharingContract interface declarations in vkd3d_d3d12sdklayers.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12sdklayers.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/vkd3d_d3d12sdklayers.idl b/include/vkd3d_d3d12sdklayers.idl index 8238214c..c1036572 100644 --- a/include/vkd3d_d3d12sdklayers.idl +++ b/include/vkd3d_d3d12sdklayers.idl @@ -1087,6 +1087,20 @@ interface ID3D12DebugDevice2 : ID3D12DebugDevice HRESULT GetDebugParameter(D3D12_DEBUG_DEVICE_PARAMETER_TYPE type, void *data, UINT size); } +[ + uuid(0adf7d52-929c-4e61-addb-ffed30de66ef), + object, + local, + pointer_default(unique) +] +interface ID3D12SharingContract : IUnknown +{ + void Present(ID3D12Resource *resource, UINT sub_resource, HWND window); + void SharedFenceSignal(ID3D12Fence *fence, UINT64 fence_value); + void BeginCapturableWork(REFGUID guid); + void EndCapturableWork(REFGUID guid); +} + [ uuid(0742a90b-c387-483f-b946-30a7e4e61458), object,

1 0

Biswapriyo Nath : include: Add ID3D12Device2 declaration in vkd3d_d3d12.idl.
by Alexandre Julliard 10 Jun '22

10 Jun '22

Module: vkd3d Branch: master Commit: b7fbac1c09e4714321310c958acc8a266510b815 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b7fbac1c09e4714321310c9… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jun 9 19:08:36 2022 +0530 include: Add ID3D12Device2 declaration in vkd3d_d3d12.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 5190b9d7..4d96d25c 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1641,6 +1641,12 @@ typedef struct D3D12_COMPUTE_PIPELINE_STATE_DESC D3D12_PIPELINE_STATE_FLAGS Flags; } D3D12_COMPUTE_PIPELINE_STATE_DESC; +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + typedef enum D3D12_COMMAND_LIST_TYPE { D3D12_COMMAND_LIST_TYPE_DIRECT = 0, @@ -2538,6 +2544,20 @@ interface ID3D12Device1 : ID3D12Device const D3D12_RESIDENCY_PRIORITY *priorities); } +[ + uuid(30baa41e-b15b-475c-a0bb-1af5c5b64328), + object, + local, + pointer_default(unique) +] +interface ID3D12Device2 : ID3D12Device1 +{ + HRESULT CreatePipelineState( + [in] const D3D12_PIPELINE_STATE_STREAM_DESC *desc, + [in] REFIID riid, + [out, iid_is(riid)] void **pipeline_state); +} + [ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object,

1 0

Hugh McMaster : conhost: Show caret immediately after reshaping.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 1c9c1ebc808ea61d572d35650d678eb00781116c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9c1ebc808ea61d572d3565… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 19:33:33 2022 +1000 conhost: Show caret immediately after reshaping. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index cc2df3e6e7b..b72278ddc0e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -659,8 +659,11 @@ static void update_window( struct console *console ) if (console->win == GetFocus()) { if (console->window->cursor_visible) + { CreateCaret( console->win, console->window->cursor_bitmap, console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } else DestroyCaret(); }

1 0

Hugh McMaster : conhost: Update debug output and comments when loading/saving settings.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 577258a98106271d0aaa43beb660b42cfc4b3894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577258a98106271d0aaa43be… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 19:35:16 2022 +1000 conhost: Update debug output and comments when loading/saving settings. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index b72278ddc0e..3db4b159696 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -239,7 +239,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) HKEY key, app_key; - TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); + TRACE( "Loading default console settings\n" ); memcpy( config->color_map, color_map, sizeof(color_map) ); memset( config->face_name, 0, sizeof(config->face_name) ); @@ -265,13 +265,15 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) config->win_pos.Y = 0; config->edition_mode = 0; - /* read global settings */ + /* Load default console settings */ if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Console", &key )) { load_registry_key( key, config ); - /* if requested, load part related to console title */ + + /* Load app-specific console settings (if any) */ if (key_name && !RegOpenKeyW( key, key_name, &app_key )) { + TRACE( "Loading %s console settings\n", wine_dbgstr_w(key_name) ); load_registry_key( app_key, config ); RegCloseKey( app_key ); } @@ -408,7 +410,7 @@ static void save_config( const WCHAR *key_name, const struct console_config *con { HKEY key, app_key; - TRACE( "%s %s\n", debugstr_w( key_name ), debugstr_config( config )); + TRACE( "Saving %s console settings\n", key_name ? debugstr_w( key_name ) : "default" ); if (RegCreateKeyW( HKEY_CURRENT_USER, L"Console", &key )) {

1 0

Rémi Bernon : ole32/tests: Update IStream_SetSize with large size test result.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 15d01a2a12d1936f47749fd25988f2c8614cdbe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d01a2a12d1936f47749fd2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 7 20:22:23 2022 +0200 ole32/tests: Update IStream_SetSize with large size test result. The high part is ignored, and OOM error is only returned if there's not enough memory available, not because of GlobalReAlloc specific behavior. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 237bcca9251..8310800a5c7 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -294,10 +294,9 @@ static void test_streamonhglobal(void) /* test OOM condition */ ull.u.HighPart = -1; - ull.u.LowPart = -1; + ull.u.LowPart = 0; hr = IStream_SetSize(pStream, ull); - ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ - "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08lx\n", hr); + ok(hr == S_OK, "IStream_SetSize with large size should have returned S_OK instead of 0x%08lx\n", hr); IStream_Release(pStream); }

1 0

Rémi Bernon : ntdll: Add block padding when HEAP_ADD_USER_INFO flag is set.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 31df70a3ded5c9e29ba218d1ffc1aa6d24a820b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31df70a3ded5c9e29ba218d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 23:46:08 2022 +0200 ntdll: Add block padding when HEAP_ADD_USER_INFO flag is set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 3 +-- dlls/ntdll/heap.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 91f582f36de..97f4d9c9fe3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2277,14 +2277,13 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags expect_size = max( alloc_size, 2 * sizeof(void *) ); expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size + 2 * sizeof(void *) ); diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ); - todo_wine ok( diff == expect_size, "got diff %#Ix\n", diff ); ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr2 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); - todo_wine + todo_wine_if( global_flags & FLG_HEAP_ENABLE_FREE_CHECK ) ok( !memcmp( ptr0 + alloc_size + tail_size, padd_buf, 2 * sizeof(void *) ), "unexpected padding\n" ); tmp_ptr = (void *)0xdeadbeef; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0ecff6f6cba..6d9f949b6a9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -212,6 +212,7 @@ C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK ); /* some undocumented flags (names are made up) */ #define HEAP_PRIVATE 0x00001000 +#define HEAP_ADD_USER_INFO 0x00000100 #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 #define HEAP_VALIDATE_ALL 0x20000000 @@ -451,7 +452,7 @@ static RTL_CRITICAL_SECTION_DEBUG process_heap_cs_debug = static inline ULONG heap_get_flags( const HEAP *heap, ULONG flags ) { if (flags & (HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED)) flags |= HEAP_CHECKING_ENABLED; - flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | HEAP_REALLOC_IN_PLACE_ONLY | HEAP_CHECKING_ENABLED; + flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | HEAP_REALLOC_IN_PLACE_ONLY | HEAP_CHECKING_ENABLED | HEAP_ADD_USER_INFO; return heap->flags | flags; } @@ -1476,7 +1477,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static SIZE_T heap_get_block_size( HEAP *heap, ULONG flags, SIZE_T size ) { - static const ULONG padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS; + static const ULONG padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS | HEAP_ADD_USER_INFO; static const ULONG check_flags = HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED | HEAP_CHECKING_ENABLED; SIZE_T overhead;

1 0

Rémi Bernon : kernelbase: Use HEAP_ADD_USER_INFO for HLOCAL allocations.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 06b582e69534561fb3cc8bec439d334257ad63ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b582e69534561fb3cc8bec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 00:08:04 2022 +0200 kernelbase: Use HEAP_ADD_USER_INFO for HLOCAL allocations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 736d3642995..776f0aafa18 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -713,6 +713,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) * Global/local heap functions ***********************************************************************/ +/* some undocumented flags (names are made up) */ +#define HEAP_ADD_USER_INFO 0x00000100 + /* not compatible with windows */ struct kernelbase_global_data { @@ -826,15 +829,15 @@ HGLOBAL WINAPI DECLSPEC_HOTPATCH GlobalFree( HLOCAL handle ) */ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) { + DWORD heap_flags = HEAP_ADD_USER_INFO; HANDLE heap = GetProcessHeap(); struct mem_entry *mem; - DWORD heap_flags = 0; HLOCAL handle; void *ptr; TRACE_(globalmem)( "flags %#x, size %#Ix\n", flags, size ); - if (flags & LMEM_ZEROINIT) heap_flags = HEAP_ZERO_MEMORY; + if (flags & LMEM_ZEROINIT) heap_flags |= HEAP_ZERO_MEMORY; if (!(flags & LMEM_MOVEABLE)) /* pointer */ { @@ -964,13 +967,15 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) */ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT flags ) { + DWORD heap_flags = HEAP_ADD_USER_INFO; struct mem_entry *mem; HLOCAL ret = 0; - DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; void *ptr; TRACE_(globalmem)( "handle %p, size %#Ix, flags %#x\n", handle, size, flags ); + if (flags & LMEM_ZEROINIT) heap_flags |= HEAP_ZERO_MEMORY; + RtlLockHeap( GetProcessHeap() ); if (flags & LMEM_MODIFY) /* modify flags */ {

1 0

Rémi Bernon : ntdll: Implement RtlSetUserValueHeap.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: ff864e5621c5f31ef697ef06b3f814c1a7f66550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff864e5621c5f31ef697ef06… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 7 15:03:31 2022 +0200 ntdll: Implement RtlSetUserValueHeap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 13 +++---------- dlls/ntdll/heap.c | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 97f4d9c9fe3..4221fd39c0f 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -354,9 +354,7 @@ static void test_HeapCreate(void) ok( !!ptrs[i], "HeapAlloc failed, error %lu\n", GetLastError() ); align |= (UINT_PTR)ptrs[i]; } - todo_wine_if( sizeof(void *) == 8 ) ok( !(align & (8 * sizeof(void *) - 1)), "got wrong alignment\n" ); - todo_wine_if( sizeof(void *) == 8 ) ok( align & (8 * sizeof(void *)), "got wrong alignment\n" ); for (i = 0; i < ARRAY_SIZE(ptrs); ++i) { @@ -2228,7 +2226,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); align = (UINT_PTR)ptr0 | (UINT_PTR)ptr1 | (UINT_PTR)ptr2; - todo_wine_if( sizeof(void *) == 8 || alloc_size == 0x7efe9 ) + todo_wine_if( alloc_size == 0x7efe9 ) ok( !(align & (8 * sizeof(void *) - 1)), "wrong align\n" ); expect_size = max( alloc_size, 2 * sizeof(void *) ); @@ -2303,7 +2301,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ok( tmp_flags == 0x200, "got flags %#lx\n", tmp_flags ); ret = pRtlSetUserValueHeap( heap, 0, ptr0, (void *)0xdeadbeef ); - todo_wine ok( ret, "RtlSetUserValueHeap failed, error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = pRtlSetUserFlagsHeap( heap, 0, ptr0, 0, 0x1000 ); @@ -2330,13 +2327,9 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags "got flags %#lx\n", tmp_flags ); user_ptr = (void **)(ptr0 + alloc_size + tail_size); - todo_wine ok( user_ptr[1] == (void *)0xdeadbeef, "unexpected user value\n" ); - if (user_ptr[1] == (void *)0xdeadbeef) - { - user_ptr[0] = (void *)0xdeadbeef; - user_ptr[1] = (void *)0xdeadbee0; - } + user_ptr[0] = (void *)0xdeadbeef; + user_ptr[1] = (void *)0xdeadbee0; tmp_ptr = NULL; tmp_flags = 0; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6d9f949b6a9..64d4f6644af 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -105,10 +105,11 @@ C_ASSERT( sizeof(struct entry) == 2 * ALIGNMENT ); typedef struct { + SIZE_T __pad[sizeof(SIZE_T) / sizeof(DWORD)]; struct list entry; /* entry in heap large blocks list */ SIZE_T data_size; /* size of user data */ SIZE_T block_size; /* total size of virtual memory block */ - DWORD pad[2]; /* padding to ensure 16-byte alignment of data */ + void *user_value; DWORD size; /* fields for compatibility with normal arenas */ DWORD magic; /* these must remain at the end of the structure */ } ARENA_LARGE; @@ -362,6 +363,12 @@ static inline void mark_block_tail( struct block *block, DWORD flags ) memset( tail, ARENA_TAIL_FILLER, ALIGNMENT ); } valgrind_make_noaccess( tail, ALIGNMENT ); + if (flags & HEAP_ADD_USER_INFO) + { + if (flags & HEAP_TAIL_CHECKING_ENABLED || RUNNING_ON_VALGRIND) tail += ALIGNMENT; + valgrind_make_writable( tail + sizeof(void *), sizeof(void *) ); + memset( tail + sizeof(void *), 0, sizeof(void *) ); + } } /* initialize contents of a newly created block of memory */ @@ -2001,10 +2008,31 @@ BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE heap, ULONG flags, void *ptr, void **u /*********************************************************************** * RtlSetUserValueHeap (NTDLL.@) */ -BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE heap, ULONG flags, void *ptr, void *user_value ) +BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void *user_value ) { - FIXME( "heap %p, flags %#x, ptr %p, user_value %p stub!\n", heap, flags, ptr, user_value ); - return FALSE; + ARENA_LARGE *large = (ARENA_LARGE *)ptr - 1; + struct block *block; + BOOLEAN ret = TRUE; + SUBHEAP *subheap; + HEAP *heap; + char *tmp; + + TRACE( "handle %p, flags %#x, ptr %p, user_value %p.\n", handle, flags, ptr, user_value ); + + if (!(heap = HEAP_GetPtr( handle ))) return TRUE; + + heap_lock( heap, flags ); + if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) ret = FALSE; + else if (!subheap) large->user_value = user_value; + else + { + tmp = (char *)block + block_get_size( block ) - block->tail_size + sizeof(void *); + if ((heap_get_flags( heap, flags ) & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND) tmp += ALIGNMENT; + *(void **)tmp = user_value; + } + heap_unlock( heap, flags ); + + return ret; } /***********************************************************************

1 0

Rémi Bernon : kernelbase: Use RtlSetUserValueHeap to store HLOCAL.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 64efaf26b75cd83cc624cdf6c1490755c62f56a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64efaf26b75cd83cc624cdf6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 9 12:09:26 2022 +0200 kernelbase: Use RtlSetUserValueHeap to store HLOCAL. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 776f0aafa18..409b35089e3 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -44,6 +44,9 @@ WINE_DECLARE_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(globalmem); +BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void *user_value ); + + /*********************************************************************** * Virtual memory functions ***********************************************************************/ @@ -842,6 +845,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) if (!(flags & LMEM_MOVEABLE)) /* pointer */ { ptr = HeapAlloc( heap, heap_flags, size ); + if (ptr) RtlSetUserValueHeap( heap, heap_flags, ptr, ptr ); TRACE_(globalmem)( "return %p\n", ptr ); return ptr; } @@ -869,6 +873,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) else { if (!(ptr = HeapAlloc( heap, heap_flags, size + HLOCAL_STORAGE ))) goto failed; + RtlSetUserValueHeap( heap, heap_flags, ptr, handle ); *(HLOCAL *)ptr = handle; mem->ptr = (char *)ptr + HLOCAL_STORAGE; } @@ -1014,6 +1019,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f /* reallocate fixed memory */ if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; ret = HeapReAlloc( GetProcessHeap(), heap_flags, ptr, size ); + if (ret) RtlSetUserValueHeap( GetProcessHeap(), heap_flags, ret, ret ); } else if ((mem = unsafe_mem_from_HLOCAL( handle ))) { @@ -1027,6 +1033,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f if ((ptr = HeapReAlloc( GetProcessHeap(), heap_flags, (char *)mem->ptr - HLOCAL_STORAGE, size + HLOCAL_STORAGE ))) { + RtlSetUserValueHeap( GetProcessHeap(), heap_flags, ptr, handle ); mem->ptr = (char *)ptr + HLOCAL_STORAGE; ret = handle; } @@ -1035,6 +1042,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT f { if ((ptr = HeapAlloc( GetProcessHeap(), heap_flags, size + HLOCAL_STORAGE ))) { + RtlSetUserValueHeap( GetProcessHeap(), heap_flags, ptr, handle ); *(HLOCAL *)ptr = handle; mem->ptr = (char *)ptr + HLOCAL_STORAGE; ret = handle;

1 0