April 2022 - Wine-Devel - list.winehq.org

[PATCH] winetest: Create processes with DETACHED_PROCESS flag.
by Rémi Bernon April 2, 2022

April 2, 2022

So that it doesn't automatically create a console window when there is not one already. Fixing a regression from f034084d49b354811096524d472ae5172ac1cebf. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Same as for the TestLauncher patch, I'm not completely sure what DETACHED_PROCESS does, but as it uses STARTF_USESTDHANDLES too I think the kernelbase create_process_params path taken should mostly be the same, except that it will never force CONSOLE_HANDLE_ALLOC. programs/winetest/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index eb86770afbf..4ff2995714f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -619,7 +619,7 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritic { STARTUPINFOA si; PROCESS_INFORMATION pi; - DWORD wait, status, flags; + DWORD wait, status, flags = DETACHED_PROCESS; UINT old_errmode; /* Flush to disk so we know which test caused Windows to crash if it does */ @@ -635,10 +635,9 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritic { old_errmode = SetErrorMode(0); SetErrorMode(old_errmode | SEM_FAILCRITICALERRORS); - flags = 0; } else - flags = CREATE_DEFAULT_ERROR_MODE; + flags |= CREATE_DEFAULT_ERROR_MODE; if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, flags, NULL, tempdir, &si, &pi)) -- 2.35.1

8 17

[PATCH 1/2] dlls/mciwave.c: correctly handle error return status from mmioRead
by Eric Pouech April 1, 2022

April 1, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Supersedes 230982 --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 1d9abce84a3..3ca884ed6e0 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -291,7 +291,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) if (!pwfx) return MCIERR_OUT_OF_MEMORY; r = mmioRead(wmw->hFile, (HPSTR)pwfx, mmckInfo.cksize); - if (r < sizeof(PCMWAVEFORMAT)) { + if (r < 0 || r < sizeof(PCMWAVEFORMAT)) { HeapFree(GetProcessHeap(), 0, pwfx); return MCIERR_INVALID_FILE; }

2 3

[PATCH 1/6] include/winerror.h: Add missing WinRT HRESULT codes.
by Bernhard Kölbl April 1, 2022

April 1, 2022

Taken from MSDN and original winerror.h. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002) -- 2.35.1

3 14

[PATCH 1/5] kernel32: Return TRUE from GlobalUnlock on invalid handle error.
by Rémi Bernon April 1, 2022

April 1, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 4 +++- dlls/kernel32/tests/heap.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dbb240d89fc..9cce4402aed 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -234,8 +234,10 @@ void *WINAPI GlobalLock( HGLOBAL handle ) */ BOOL WINAPI GlobalUnlock( HGLOBAL handle ) { + BOOL ret; if (unsafe_ptr_from_HLOCAL( handle )) return TRUE; - return LocalUnlock( handle ); + if ((ret = LocalUnlock( handle )) || !GetLastError()) return ret; + return GetLastError() != ERROR_NOT_LOCKED; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 476be96cea8..25f5e367e7c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -524,7 +524,6 @@ static void test_GlobalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = GlobalUnlock( mem ); - todo_wine ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); #if 0 /* corrupts Wine heap */ -- 2.35.1

2 5

[PATCH v2 1/3] msvcr100: Add _StructuredTaskCollection::_Schedule stub.
by Torge Matthies April 1, 2022

April 1, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47375 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- v1 -> v2: Added wine bug link, renamed structured_task_collection to StructuredTaskCollection. dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/concurrency.c | 12 ++++++++++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 50db9348327..ab57c736672 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -596,7 +596,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 19b4cbe96d7..68a78a6aa16 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -364,7 +364,7 @@ @ stub -arch=win32 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=win32 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=win32 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z @ stub -arch=win64 ?_Schedule(a)_TaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z @ thiscall -arch=win32 ?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z(ptr long) SpinWait__SetSpinCount diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 23840f85eda..0f5eaf9ac51 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -616,7 +616,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64ddeed42f4..332a617932e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -598,7 +598,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05f408d6884..d70f1423f68 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -594,7 +594,7 @@ @ stub -arch=win64 ?_RunAndWait(a)_TaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@@Z -@ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z +@ thiscall -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z(ptr ptr) StructuredTaskCollection__Schedule @ stub -arch=arm ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=i386 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXPAV_UnrealizedChore(a)23@PAVlocation(a)3@@Z @ stub -arch=win64 ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@PEAVlocation(a)3@@Z diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 54b2c49db99..478fa54dc57 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -174,6 +174,11 @@ typedef struct cs_queue #endif } cs_queue; +typedef struct +{ + char dummy; +} StructuredTaskCollection; + typedef struct { ULONG_PTR unk_thread_id; @@ -1706,6 +1711,13 @@ bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +/* ?_Schedule(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXPEAV_UnrealizedChore(a)23@@Z */ +DEFINE_THISCALL_WRAPPER(StructuredTaskCollection__Schedule, 8) +void __thiscall StructuredTaskCollection__Schedule(StructuredTaskCollection *this, /*Concurrency::details::_UnrealizedChore*/void *chore) +{ + FIXME("(%p %p): stub!\n", this, chore); +} + /* ??0critical_section(a)Concurrency@@QAE(a)XZ */ /* ??0critical_section(a)Concurrency@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) -- 2.35.1

2 6

[PATCH] wined3d: Reset and reuse Vulkan descriptor pools.
by Jan Sikorski April 1, 2022

April 1, 2022

Creating and destroying them is fairly slow. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 104 +++++++++++++++++++++++---------- dlls/wined3d/view.c | 4 +- dlls/wined3d/wined3d_private.h | 9 ++- 3 files changed, 79 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 436973fe76f..9891bf0b541 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -685,17 +685,33 @@ void wined3d_context_vk_destroy_vk_framebuffer(struct wined3d_context_vk *contex o->command_buffer_id = command_buffer_id; } -static void wined3d_context_vk_destroy_vk_descriptor_pool(struct wined3d_context_vk *context_vk, - VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id) +static void wined3d_context_vk_return_vk_descriptor_pool(struct wined3d_context_vk *context_vk, + VkDescriptorPool vk_descriptor_pool) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (!wined3d_array_reserve((void **)&context_vk->vk_descriptor_pools, &context_vk->vk_descriptor_pools_size, + context_vk->vk_descriptor_pool_count + 1, sizeof(*context_vk->vk_descriptor_pools))) + { + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, vk_descriptor_pool, NULL)); + TRACE("Destroying descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); + return; + } + + VK_CALL(vkResetDescriptorPool(device_vk->vk_device, vk_descriptor_pool, 0)); + context_vk->vk_descriptor_pools[context_vk->vk_descriptor_pool_count++] = vk_descriptor_pool; +} + +static void wined3d_context_vk_reset_vk_descriptor_pool(struct wined3d_context_vk *context_vk, + VkDescriptorPool vk_descriptor_pool, uint64_t command_buffer_id) +{ struct wined3d_retired_object_vk *o; if (context_vk->completed_command_buffer_id > command_buffer_id) { - VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, vk_descriptor_pool, NULL)); - TRACE("Destroyed descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); + wined3d_context_vk_return_vk_descriptor_pool(context_vk, vk_descriptor_pool); + TRACE("Reset descriptor pool 0x%s.\n", wine_dbgstr_longlong(vk_descriptor_pool)); return; } @@ -1111,8 +1127,8 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont break; case WINED3D_RETIRED_DESCRIPTOR_POOL_VK: - VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, o->u.vk_descriptor_pool, NULL)); - TRACE("Destroyed descriptor pool 0x%s.\n", wine_dbgstr_longlong(o->u.vk_descriptor_pool)); + wined3d_context_vk_return_vk_descriptor_pool(context_vk, o->u.vk_descriptor_pool); + TRACE("Reset descriptor pool 0x%s.\n", wine_dbgstr_longlong(o->u.vk_descriptor_pool)); break; case WINED3D_RETIRED_MEMORY_VK: @@ -1581,6 +1597,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + unsigned int i; if (buffer->vk_command_buffer) { @@ -1594,8 +1611,9 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) heap_free(context_vk->compute.bindings.bindings); heap_free(context_vk->graphics.bindings.bindings); - if (context_vk->vk_descriptor_pool) - VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, context_vk->vk_descriptor_pool, NULL)); + for (i = 0; i < context_vk->vk_descriptor_pool_count; ++i) + VK_CALL(vkDestroyDescriptorPool(device_vk->vk_device, context_vk->vk_descriptor_pools[i], NULL)); + heap_free(context_vk->vk_descriptor_pools); if (context_vk->vk_framebuffer) VK_CALL(vkDestroyFramebuffer(device_vk->vk_device, context_vk->vk_framebuffer, NULL)); VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); @@ -2655,48 +2673,71 @@ static VkResult wined3d_context_vk_create_vk_descriptor_pool(struct wined3d_devi return vr; } -VkResult wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, - VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set) +VkDescriptorPool wined3d_context_vk_get_vk_descriptor_pool(struct wined3d_context_vk *context_vk) { - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct VkDescriptorSetAllocateInfo set_desc; VkResult vr; - if (!context_vk->vk_descriptor_pool && (vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, - vk_info, &context_vk->vk_descriptor_pool))) + if (context_vk->vk_descriptor_pool_count) + return context_vk->vk_descriptor_pools[0]; + + if (!wined3d_array_reserve((void **)&context_vk->vk_descriptor_pools, &context_vk->vk_descriptor_pools_size, + 1, sizeof(*context_vk->vk_descriptor_pools))) + { + ERR("Failed to allocate array.\n"); + return VK_NULL_HANDLE; + } + + if ((vr = wined3d_context_vk_create_vk_descriptor_pool(wined3d_device_vk(context_vk->c.device), + context_vk->vk_info, context_vk->vk_descriptor_pools))) { WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); - return vr; + return VK_NULL_HANDLE; } + context_vk->vk_descriptor_pool_count = 1; + return context_vk->vk_descriptor_pools[0]; +} + +VkDescriptorSet wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, + VkDescriptorSetLayout vk_set_layout) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct VkDescriptorSetAllocateInfo set_desc; + VkDescriptorPool vk_descriptor_pool; + VkDescriptorSet vk_descriptor_set; + VkResult vr; + + if (!(vk_descriptor_pool = wined3d_context_vk_get_vk_descriptor_pool(context_vk))) + return VK_NULL_HANDLE; + set_desc.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; set_desc.pNext = NULL; - set_desc.descriptorPool = context_vk->vk_descriptor_pool; + set_desc.descriptorPool = vk_descriptor_pool; set_desc.descriptorSetCount = 1; set_desc.pSetLayouts = &vk_set_layout; - if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, vk_descriptor_set))) >= 0) - return vr; + if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, &vk_descriptor_set))) >= 0) + return vk_descriptor_set; if (vr == VK_ERROR_FRAGMENTED_POOL || vr == VK_ERROR_OUT_OF_POOL_MEMORY) { - wined3d_context_vk_destroy_vk_descriptor_pool(context_vk, - context_vk->vk_descriptor_pool, context_vk->current_command_buffer.id); - context_vk->vk_descriptor_pool = VK_NULL_HANDLE; - if ((vr = wined3d_context_vk_create_vk_descriptor_pool(device_vk, vk_info, &context_vk->vk_descriptor_pool))) + wined3d_context_vk_reset_vk_descriptor_pool(context_vk, + vk_descriptor_pool, context_vk->current_command_buffer.id); + context_vk->vk_descriptor_pools[0] = context_vk->vk_descriptor_pools[--context_vk->vk_descriptor_pool_count]; + if (!(vk_descriptor_pool = wined3d_context_vk_get_vk_descriptor_pool(context_vk))) { - WARN("Failed to create descriptor pool, vr %s.\n", wined3d_debug_vkresult(vr)); - return vr; + WARN("Failed to create descriptor pool.\n"); + return VK_NULL_HANDLE; } - set_desc.descriptorPool = context_vk->vk_descriptor_pool; - if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, vk_descriptor_set))) >= 0) - return vr; + set_desc.descriptorPool = vk_descriptor_pool; + if ((vr = VK_CALL(vkAllocateDescriptorSets(device_vk->vk_device, &set_desc, &vk_descriptor_set))) >= 0) + return vk_descriptor_set; } WARN("Failed to allocate descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); - return vr; + return VK_NULL_HANDLE; } static bool wined3d_shader_descriptor_writes_vk_add_write(struct wined3d_shader_descriptor_writes_vk *writes, @@ -2949,7 +2990,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkPipelineLayout vk_pipeline_layout; VkPipelineBindPoint vk_bind_point; VkDescriptorSet vk_descriptor_set; - VkResult vr; size_t i; switch (pipeline) @@ -2973,9 +3013,9 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; } - if ((vr = wined3d_context_vk_create_vk_descriptor_set(context_vk, vk_set_layout, &vk_descriptor_set))) + if (!(vk_descriptor_set = wined3d_context_vk_create_vk_descriptor_set(context_vk, vk_set_layout))) { - WARN("Failed to create descriptor set, vr %s.\n", wined3d_debug_vkresult(vr)); + WARN("Failed to create descriptor set.\n"); return false; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 087aa21b75d..051da2891f3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1922,7 +1922,6 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view DWORD uav_location; unsigned int level; bool is_array; - VkResult vr; device_vk = wined3d_device_vk(device); state = &device_vk->uav_clear_state; @@ -2124,8 +2123,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view vk_info = context_vk->vk_info; - vr = wined3d_context_vk_create_vk_descriptor_set(context_vk, layout->vk_set_layout, &vk_writes[0].dstSet); - if (vr != VK_SUCCESS) + if (!(vk_writes[0].dstSet = wined3d_context_vk_create_vk_descriptor_set(context_vk, layout->vk_set_layout))) { ERR("Failed to create descriptor set.\n"); wined3d_context_vk_destroy_bo(context_vk, &constants_bo); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 574bcdaa26f..54bccb3db5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2600,7 +2600,10 @@ struct wined3d_context_vk VkFramebuffer vk_framebuffer; VkRenderPass vk_render_pass; - VkDescriptorPool vk_descriptor_pool; + + SIZE_T vk_descriptor_pools_size; + SIZE_T vk_descriptor_pool_count; + VkDescriptorPool *vk_descriptor_pools; VkSampleCountFlagBits sample_count; unsigned int rt_count; @@ -2682,8 +2685,8 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context unsigned int wait_semaphore_count, const VkSemaphore *wait_semaphores, const VkPipelineStageFlags *wait_stages, unsigned int signal_semaphore_count, const VkSemaphore *signal_semaphores) DECLSPEC_HIDDEN; void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) DECLSPEC_HIDDEN; -VkResult wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, - VkDescriptorSetLayout vk_set_layout, VkDescriptorSet *vk_descriptor_set) DECLSPEC_HIDDEN; +VkDescriptorSet wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, + VkDescriptorSetLayout vk_set_layout) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); -- 2.32.0

3 2

[PATCH v2 1/3] include: Add defines for ID2D1DeviceContext2.
by Ziqing Hui April 1, 2022

April 1, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Add missing CreateTransformedImageSource. include/d2d1_3.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index d1030d19d9e..2eeda0dd616 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -53,6 +53,21 @@ typedef enum D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS; +typedef enum D2D1_IMAGE_SOURCE_LOADING_OPTIONS +{ + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_NONE = 0x0, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_RELEASE_SOURCE = 0x1, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_CACHE_ON_DEMAND = 0x2, + D2D1_IMAGE_SOURCE_LOADING_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_IMAGE_SOURCE_LOADING_OPTIONS; + +typedef enum D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS +{ + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_NONE = 0x0, + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_LOW_QUALITY_PRIMARY_CONVERSION = 0x1, + D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS; + typedef struct D2D1_INK_POINT { float x; @@ -67,6 +82,12 @@ typedef struct D2D1_INK_BEZIER_SEGMENT D2D1_INK_POINT point3; } D2D1_INK_BEZIER_SEGMENT; +typedef struct D2D1_INK_STYLE_PROPERTIES +{ + D2D1_INK_NIB_SHAPE nibShape; + D2D1_MATRIX_3X2_F nibTransform; +} D2D1_INK_STYLE_PROPERTIES; + typedef struct D2D1_GRADIENT_MESH_PATCH { D2D1_POINT_2F point00; @@ -228,3 +249,77 @@ interface ID2D1TransformedImageSource : ID2D1Image [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out ); }; + +[ + object, + uuid(53dd9855-a3b0-4d5b-82e1-26e25c5e5797), + local, +] +interface ID2D1LookupTable3D : ID2D1Resource +{ +} + +[ + object, + uuid(394ea6a3-0c34-4321-950b-6ca20f0be6c7), + local, +] +interface ID2D1DeviceContext2 : ID2D1DeviceContext1 +{ + HRESULT CreateInk( + [in] const D2D1_INK_POINT *start_point, + [out] ID2D1Ink **ink + ); + HRESULT CreateInkStyle( + [in, optional] const D2D1_INK_STYLE_PROPERTIES *ink_style_properties, + [out] ID2D1InkStyle **ink_style + ); + HRESULT CreateGradientMesh( + [in] const D2D1_GRADIENT_MESH_PATCH *patches, + [in] UINT32 patches_count, + [out] ID2D1GradientMesh **gradient_mesh + ); + HRESULT CreateImageSourceFromWic( + [in] IWICBitmapSource *wic_bitmap_source, + [in] D2D1_IMAGE_SOURCE_LOADING_OPTIONS loading_options, + [in] D2D1_ALPHA_MODE alpha_mode, + [out] ID2D1ImageSourceFromWic **image_source + ); + HRESULT CreateLookupTable3D( + [in] D2D1_BUFFER_PRECISION precision, + [in] const UINT32 *extents, + [in] const BYTE *data, + [in] UINT32 data_count, + [in] const UINT32 *strides, + [out] ID2D1LookupTable3D **lookup_table + ); + HRESULT CreateImageSourceFromDxgi( + [in] IDXGISurface **surfaces, + [in] UINT32 surface_count, + [in] DXGI_COLOR_SPACE_TYPE color_space, + [in] D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS options, + [out] ID2D1ImageSource **image_source + ); + HRESULT GetGradientMeshWorldBounds( + [in] ID2D1GradientMesh *gradient_mesh, + [out] D2D1_RECT_F *bounds + ); + void DrawInk( + [in] ID2D1Ink *ink, + [in] ID2D1Brush *brush, + [in, optional] ID2D1InkStyle *ink_style + ); + void DrawGradientMesh( + [in] ID2D1GradientMesh *gradient_mesh + ); + void DrawGdiMetafile( + [in] ID2D1GdiMetafile *gdi_metafile, + [in, optional] const D2D1_RECT_F *dst_rect, + [in, optional] const D2D1_RECT_F *src_rect + ); + HRESULT CreateTransformedImageSource( + [in] ID2D1ImageSource *source, + [in] const D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *props, + [out] ID2D1TransformedImageSource **transformed + ); +} -- 2.25.1

2 5

[tools] testbot/web: Use SimpleCollectionPage for the branches page.
by Francois Gouget April 1, 2022

April 1, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/BranchesList.pl | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index a325818e5..037023762 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -2,6 +2,7 @@ # Branch list page # # Copyright 2009 Ge van Geldorp +# Copyright 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,33 +20,11 @@ use strict; -package BranchesListPage; - -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +package main; +use ObjectModel::CGI::SimpleCollectionPage; use WineTestBot::Branches; - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - - $self->SUPER::_initialize($Request, $RequiredRole, CreateBranches()); -} - -sub SortKeys($$$) -{ - my ($self, $CollectionBlock, $Keys) = @_; - - my @SortedKeys = sort { $a cmp $b } @$Keys; - return \@SortedKeys; -} - - -package main; - my $Request = shift; - -my $BranchesListPage = BranchesListPage->new($Request, "admin"); -$BranchesListPage->GeneratePage(); +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "admin", CreateBranches()); +$Page->GeneratePage(); -- 2.30.2

1 0

[tools] testbot/cgi: Document CollectionBlock::new().
by Francois Gouget April 1, 2022

April 1, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 200734a6a..cbe22f90f 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -74,6 +74,28 @@ use POSIX qw(strftime); use URI::Escape; +=pod +=over 12 + +=item C<new()> + +Creates a table showing the content of the specified Collection with +support for performing actions on selected rows, or performing global actions. + +Parameters: +=over +=Collection +The collection of objects to show in the table. + +=item EnclosingPage +The page the table will be inserted in. This page object must implement the +ObjectModel::CGI::Page interface. + +=back + +=back +=cut + sub new($$$@) { my $class = shift; -- 2.30.2

1 0

[tools] testbot/TestAgent: Update and fix the usage message.
by Francois Gouget April 1, 2022

April 1, 2022

The upgrade and restart commands were each only half documented. The getversion command was misspelled. Better identify optional arguments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 10bdc63d1..ea18b85b7 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -323,15 +323,17 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; - print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; - print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "Usage: $name0 [options] <hostname> sendfile <localpath> [<serverpath>]\n"; + print "or $name0 [options] <hostname> getfile <serverpath> [<localpath>]\n"; + print "or $name0 [options] <hostname> run <command> [<arguments>]\n"; print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; - print "or $name0 [options] <hostname> getproperty <name>\n"; + print "or $name0 [options] <hostname> getproperty [<name>]\n"; print "or $name0 [options] <hostname> setproperty <name> <value>\n"; - print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; + print "or $name0 [options] <hostname> (getcwd|ping|getversion)\n"; + print "or $name0 [options] <hostname> upgrade <localexe>\n"; + print "or $name0 [options] <hostname> restart <serverexe> [<arg1>...]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; print "\n"; @@ -353,18 +355,21 @@ if (defined $Usage) print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; + print " getcwd Returns the server's current working directory.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the protocol version.\n"; - print " getproperty <name> Retrieves and prints the specified server property, for\n"; + print " getproperty Retrieves and prints the <name> server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; - print " setproperty <name> <value> Sets the specified property.\n"; - print " getcwd Returns the server's current working directory.\n"; + print " setproperty Sets the <name> property to <value>.\n"; print " ping Makes sure the server is still alive.\n"; - print " upgrade Replaces the server executable with the specified file and\n"; - print " restarts it.\n"; - print " restart Replaces and restarts the server from the specified server file\n"; - print " and arguments or from the last command line if omitted.\n"; + print " upgrade Replaces the server executable with the <localexe> local file\n"; + print " and restarts it.\n"; + print " restart The first argument is mandatory and identifies the server file\n"; + print " the server executable should be replaced with. The arguments\n"; + print " that follow, if any, are passed to the server when it is\n"; + print " restarted. If omitted the current server's arguments are used\n"; + print " instead.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-one-timeout <time> Specifies the timeout for one connection\n"; -- 2.30.2

1 0

[tools] testbot/cgi: Remove a stray single quote from textarea fields.
by Francois Gouget April 1, 2022

April 1, 2022

It would set the default value of textareas to a single quote. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This has been lurking from the start! The change from checking whether $Value is true to whether it is defined revealed this bug in the Register form which is the only one to both have a textarea field and to provide a default value, specifically an empty string (false). --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9ce9fa93b..dfcd55e12 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,10 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if (defined $Value) - { - print $self->escapeHTML($Value), "'"; - } + print $self->escapeHTML($Value) if (defined $Value); print "</textarea>"; $self->GenerateRequired($PropertyDescriptor); } -- 2.30.2

1 0

[tools] testbot: Document SecureConnection() and MakeSecureURL().
by Francois Gouget April 1, 2022

April 1, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5315c75d4..d93a938d3 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -42,11 +42,38 @@ use WineTestBot::Config; # Web helpers # +=pod +=over 12 + +=item C<SecureConnection()> + +Returns true if the user accessed the website over a secure connection. + +This relies on the web server setting the $HTTPS environment variable. + +=back +=cut + sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } +=pod +=over 12 + +=item C<MakeSecureURL()> + +Builds a URL that accesses this website using https if possible. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +Note that this method uses $HTTP_HOST which may not match the official website +hostname. As such this should only be used for providing URLs back to the user +accessing the website, not for URLs sent to third-parties. + +=back +=cut sub MakeSecureURL($) { my ($URL) = @_; -- 2.30.2

1 0

[tools] testbot/TestAgent: Simplify the implementation for commands with no argument.
by Francois Gouget April 1, 2022

April 1, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ea18b85b7..a3d6e2625 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -210,15 +210,7 @@ while (@ARGV) @Rm = @ARGV; last; } - elsif ($arg eq "getcwd") - { - $Cmd = $arg; - } - elsif ($arg eq "getversion") - { - set_cmd($arg); - } - elsif ($arg eq "ping" or $arg eq "settime") + elsif ($arg =~ /^(?:getcwd|getversion|ping|settime)$/) { set_cmd($arg); } -- 2.30.2

1 0

[tools] testbot/TestAgent: Fix the spelling of a comment in the module.
by Francois Gouget April 1, 2022

April 1, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 6457b4dd7..2d6002102 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1526,7 +1526,7 @@ sub Upgrade($$) my $rc = $self->_RecvList(''); # The server has quit and thus the connection is no longer usable. - # So disconnect now to force the next RPC to reconnect, instead or letting it + # So disconnect now to force the next RPC to reconnect instead of letting it # try to reuse the broken connection and fail. $self->Disconnect(); -- 2.30.2

1 0

[PATCH v2 6/6] win32u: Move NtUserSendInput implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

3 2

[PATCH 1/2] riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Jinoh Kang April 1, 2022

April 1, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/tests/richole.c | 247 ++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..bb99a9a7276 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,169 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +typedef struct IRichEditOleCallbackImpl { + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *lpclsid; + LPSTORAGE lpstg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct IRichEditOleCallbackImpl *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct IRichEditOleCallbackImpl, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInterface(IRichEditOleCallback *iface, REFIID riid, void **ppvObj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOleCallback)) { + IRichEditOleCallback_AddRef(iface); + *ppvObj = iface; + return S_OK; + } + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_AddRef(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_Release(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetNewStorage(IRichEditOleCallback *iface, LPSTORAGE *lplpstg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetInPlaceContext(IRichEditOleCallback *iface, LPOLEINPLACEFRAME *lplpFrame, LPOLEINPLACEUIWINDOW *lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ShowContainerUI(IRichEditOleCallback *iface, BOOL fShow) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInsertObject(IRichEditOleCallback *iface, LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG expect = This->expect_queryinsertobject; + + todo_wine_if(expect & EXPECT_TODO_WINE) + ok_(__FILE__,This->line)( expect & ~EXPECT_TODO_WINE, "unexpected call to IRichEditOleCallback_QueryInsertObject\n"); + if (!(expect & ~EXPECT_TODO_WINE)) return S_OK; + This->expect_queryinsertobject--; + + if (This->lpclsid && lpclsid) + ok_(__FILE__,This->line)( IsEqualGUID(This->lpclsid, lpclsid), "QueryInsertObject lpclsid expected %s, got %s\n", wine_dbgstr_guid( This->lpclsid ), wine_dbgstr_guid( lpclsid )); + else + ok_(__FILE__,This->line)( This->lpclsid == lpclsid, "QueryInsertObject lpclsid expected %p, got %p\n", This->lpclsid, lpclsid ); + ok_(__FILE__,This->line)( This->lpstg == lpstg, "QueryInsertObject lpstg expected %p, got %p\n", This->lpstg, lpstg ); + ok_(__FILE__,This->line)( This->cp == cp, "QueryInsertObject cp expected %ld, got %ld\n", This->cp, cp ); + return This->queryinsertobject_result; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_DeleteObject(IRichEditOleCallback *iface, LPOLEOBJECT lpoleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryAcceptData(IRichEditOleCallback *iface, LPDATAOBJECT lpdataobj, CLIPFORMAT *lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL fEnterMode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *lpchrg, DWORD reco, LPDATAOBJECT *lplpdataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetDragDropEffect(IRichEditOleCallback *iface, BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect) +{ + if (pdwEffect) *pdwEffect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE *lpchrg, HMENU *lphmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl RichEditOleCallbackImpl_Vtbl = { + RichEditOleCallbackImpl_QueryInterface, + RichEditOleCallbackImpl_AddRef, + RichEditOleCallbackImpl_Release, + RichEditOleCallbackImpl_GetNewStorage, + RichEditOleCallbackImpl_GetInPlaceContext, + RichEditOleCallbackImpl_ShowContainerUI, + RichEditOleCallbackImpl_QueryInsertObject, + RichEditOleCallbackImpl_DeleteObject, + RichEditOleCallbackImpl_QueryAcceptData, + RichEditOleCallbackImpl_ContextSensitiveHelp, + RichEditOleCallbackImpl_GetClipboardData, + RichEditOleCallbackImpl_GetDragDropEffect, + RichEditOleCallbackImpl_GetContextMenu, +}; + +static HRESULT RichEditOleCallbackImpl_Create(struct IRichEditOleCallbackImpl **objptr) +{ + struct IRichEditOleCallbackImpl *obj; + + obj = calloc(sizeof(struct IRichEditOleCallbackImpl), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &RichEditOleCallbackImpl_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line, ULONG expect, const CLSID *lpclsid, LPSTORAGE lpstg, LONG cp, HRESULT result) +{ + if (!This) return; + + This->line = line; + This->expect_queryinsertobject = expect; + This->lpclsid = lpclsid; + This->lpstg = lpstg; + This->cp = cp; + This->queryinsertobject_result = result; +} + +static void olecb_check_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line) +{ + if (!This) return; + + todo_wine_if(This->expect_queryinsertobject & EXPECT_TODO_WINE) + ok(!(This->expect_queryinsertobject & ~EXPECT_TODO_WINE), "expected IRichEditOleCallback_QueryInsertObject to be called\n"); + + olecb_expect_QueryInsertObject(This, 0, 0, NULL, NULL, 0, S_OK); +} + static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -3233,21 +3396,24 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } -#define INSERT_REOBJECT(reole,reobj,cp,user) \ - _insert_reobject(reole, reobj, cp, user, __LINE__) -static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +#define INSERT_REOBJECT(callback,reole,reobj,cp,user) \ + _insert_reobject(callback, reole, reobj, cp, user, __LINE__) +static void _insert_reobject(struct IRichEditOleCallbackImpl *callback, IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) { IOleClientSite *clientsite; HRESULT hr; + + olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); hr = IRichEditOle_InsertObject(reole, reobj); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#lx.\n", hr); IOleClientSite_Release(clientsite); + olecb_check_QueryInsertObject(callback, line); } -static void test_InsertObject(void) +static void subtest_InsertObject(struct IRichEditOleCallbackImpl *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3437,12 @@ static void test_InsertObject(void) BSTR bstr; create_interfaces(&hwnd, &reole, &doc, &selection); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, (LPARAM)&callback->IRichEditOleCallback_iface); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3278,22 +3450,47 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); + INSERT_REOBJECT(callback, reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %ld\n", count); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); + INSERT_REOBJECT(callback, reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %ld\n", count); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); + INSERT_REOBJECT(callback, reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %ld\n", count); + if (callback) + { + IOleClientSite *clientsite; + REOBJECT reobj; + + /* (fail to) insert object1 in (3, 4)*/ + SendMessageA(hwnd, EM_SETSEL, 3, 4); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); + + olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); + fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); + hr = IRichEditOle_InsertObject(reole, &reobj); + todo_wine + ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); + olecb_check_QueryInsertObject(callback, __LINE__); + + IOleClientSite_Release(clientsite); + + count = IRichEditOle_GetObjectCount(reole); + todo_wine + ok(count == 3, "got wrong object count: %ld\n", count); + } + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); @@ -3371,8 +3568,8 @@ static void test_InsertObject(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); /* "abc|d|efg" */ - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); SendMessageW(hwnd, EM_SETSEL, 2, 3); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); @@ -3473,8 +3670,8 @@ static void test_InsertObject(void) ok(!result, "Got result %lx.\n", result); /* "abc|d|efg" */ SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); expected_string = L"abc d efg"; charrange.cpMin = 0; @@ -3551,9 +3748,37 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(result == 0xfffc, "Got char: %lc\n", (WCHAR)result); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, 0); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_InsertObject(void) +{ + struct IRichEditOleCallbackImpl *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = RichEditOleCallbackImpl_Create(&callback); + ok(SUCCEEDED(hr), "RichEditOleCallbackImpl_Create returned %#lx\n", hr); + if (SUCCEEDED(hr)) + { + subtest_InsertObject(callback); + ref = IRichEditOleCallback_Release(&callback->IRichEditOleCallback_iface); + ok(ref == 0, "expected IRichEditOleCallback recount to be 0, got %lu\n", ref); + } + else + { + skip("cannot test InsertObject with callback\n"); + } +} + static void test_GetStoryLength(void) { static const CHAR test_text1[] = "TestSomeText"; -- 2.34.1

2 2

[PATCH v2] setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Gijs Vermeulen April 1, 2022

April 1, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 18 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index b25bd883cc64..e662b422a062 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -731,3 +731,21 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 06d423373b8e..7578fb25c9c7 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -492,8 +492,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) -- 2.35.1

1 0

[PATCH v2 5/6] win32u: Move __wine_send_input implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

3 2

[PATCH v2 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Don't use user32 functions in win32u. dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

3 2

[PATCH v2 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

3 2

[PATCH v2 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

3 2

[PATCH v2 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

3 2

[v6 PATCH 1/2] propsys: Implement VariantToStringWithDefault.
by Nikolay Sivov April 1, 2022

April 1, 2022

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v6: removed unrelated inline helper, this is guarded differently in SDK. dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 16 ++++++++++++++++ include/propvarutil.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..cd92912fde5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,22 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *default_value) +{ + TRACE("%s, %s.\n", debugstr_variant(pvar), debugstr_w(default_value)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + return ret ? ret : L""; + } + + return default_value; +} /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..fcc532fd623 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.35.1

1 1

[PATCH 6/6] win32u: Move NtUserSendInput implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

2 1

[PATCH 5/6] win32u: Move __wine_send_input implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

2 1

[PATCH 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

2 1

[PATCH 3/6] user32: Avoid internal structs in post_dde_message.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-)

2 1

[PATCH 2/6] win32u: Move NtUserWaitForInputIdle implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 48 ++-------------------------- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 61 ++++++++++++++++++++++++++++++------ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++ 8 files changed, 63 insertions(+), 58 deletions(-)

2 1

[PATCH 1/6] win32u: Move NtUserMsgWaitForMultipleObjectsEx implementation from user32.
by Jacek Caban April 1, 2022

April 1, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 66 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 23 +++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/wrappers.c | 7 ++++ include/ntuser.h | 2 ++ 8 files changed, 40 insertions(+), 65 deletions(-)

2 1

[PATCH] crypt32/tests: Add more OCSP response decoding tests.
by Hans Leidekker April 1, 2022

April 1, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/tests/encode.c | 88 ++++++++++++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index f25c779a9ce..8b1959fbef8 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8860,7 +8860,7 @@ static const BYTE ocsp_basic_signed_response[] = { 0x05, 0x51, 0x49, 0xac, 0x2f, 0xe8, 0x67, 0xcf, 0xa7 }; -static const BYTE ocsp_to_be_signed[] = { +static const BYTE ocsp_basic_response[] = { 0x30, 0x81, 0x9e, 0xa2, 0x16, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x31, @@ -8877,6 +8877,24 @@ static const BYTE ocsp_to_be_signed[] = { 0x33, 0x36, 0x30, 0x31, 0x5a }; +static const BYTE ocsp_basic_response_revoked[] = { + 0x30, 0x81, 0xb1, 0xa2, 0x16, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, + 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, + 0xf5, 0x31, 0x7f, 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, + 0x31, 0x30, 0x31, 0x32, 0x35, 0x30, 0x35, 0x5a, 0x30, 0x81, 0x85, 0x30, + 0x81, 0x82, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, + 0x1a, 0x05, 0x00, 0x04, 0x14, 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, + 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, 0xc2, 0x18, 0x76, + 0xeb, 0x04, 0x14, 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, + 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, 0xdc, 0xf5, 0x31, 0x7f, 0x02, + 0x10, 0x0d, 0x2e, 0x67, 0xa2, 0x98, 0x85, 0x3b, 0x9a, 0x54, 0x52, 0xe3, + 0xa2, 0x85, 0xa4, 0x57, 0x2f, 0xa1, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x31, 0x31, 0x30, 0x32, 0x37, 0x32, 0x31, 0x33, 0x38, 0x34, 0x38, 0x5a, + 0x18, 0x0f, 0x32, 0x30, 0x32, 0x32, 0x30, 0x33, 0x33, 0x31, 0x30, 0x31, + 0x30, 0x39, 0x30, 0x31, 0x5a, 0xa0, 0x11, 0x18, 0x0f, 0x32, 0x30, 0x32, + 0x32, 0x30, 0x34, 0x30, 0x37, 0x30, 0x30, 0x32, 0x34, 0x30, 0x31, 0x5a +}; + static const BYTE ocsp_signature[] = { 0x6a, 0x4c, 0xfa, 0xe6, 0xe3, 0x48, 0xbb, 0xd6, 0x18, 0x33, 0x04, 0x9d, 0x6a, 0x92, 0x4d, 0x01, 0x74, 0x4f, 0x1a, 0x70, 0xfa, 0xf2, 0x8b, 0xba, @@ -8914,8 +8932,8 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding) ok(ret, "got %08lx\n", GetLastError()); if (sizeof(void *) == 4) todo_wine ok(size == 496, "got %lu\n", size); else ok(size == 536, "got %lu\n", size); - ok(info->ToBeSigned.cbData == sizeof(ocsp_to_be_signed), "got %lu\n", info->ToBeSigned.cbData); - ok(!memcmp(info->ToBeSigned.pbData, ocsp_to_be_signed, sizeof(ocsp_to_be_signed)), "wrong data\n"); + ok(info->ToBeSigned.cbData == sizeof(ocsp_basic_response), "got %lu\n", info->ToBeSigned.cbData); + ok(!memcmp(info->ToBeSigned.pbData, ocsp_basic_response, sizeof(ocsp_basic_response)), "wrong data\n"); ok(!strcmp(info->SignatureInfo.SignatureAlgorithm.pszObjId, szOID_RSA_SHA256RSA), "got %s\n", info->SignatureInfo.SignatureAlgorithm.pszObjId); @@ -8941,22 +8959,35 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) static const BYTE resp_id[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE resp_id2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE name_hash[] = { 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE name_hash2[] = { + 0x74, 0xb4, 0xe7, 0x23, 0x19, 0xc7, 0x65, 0x92, 0x15, 0x40, 0x44, 0x7b, 0xc7, 0xce, 0x3e, 0x90, + 0xc2, 0x18, 0x76, 0xeb}; static const BYTE key_hash[] = { 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE key_hash2[] = { + 0xa4, 0x8d, 0xe5, 0xbe, 0x7c, 0x79, 0xe4, 0x70, 0x23, 0x6d, 0x2e, 0x29, 0x34, 0xad, 0x23, 0x58, + 0xdc, 0xf5, 0x31, 0x7f}; static const BYTE serial[] = { 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE serial2[] = { + 0x2f, 0x57, 0xa4, 0x85, 0xa2, 0xe3, 0x52, 0x54, 0x9a, 0x3b, 0x85, 0x98, 0xa2, 0x67, 0x2e, 0x0d}; OCSP_BASIC_RESPONSE_INFO *info; OCSP_BASIC_RESPONSE_ENTRY *entry; + OCSP_BASIC_REVOKED_INFO *revoked; DWORD size; BOOL ret; + /* good cert */ size = 0; - ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_to_be_signed, - sizeof(ocsp_to_be_signed), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response, + sizeof(ocsp_basic_response), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); ok(ret, "got %08lx\n", GetLastError()); ok(!info->dwVersion, "got %lu\n", info->dwVersion); @@ -8991,6 +9022,53 @@ static void test_decodeOCSPBasicResponseInfo(DWORD dwEncoding) ok(!info->cExtension, "got %lu\n", info->cExtension); ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); LocalFree(info); + + /* revoked cert */ + size = 0; + ret = pCryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, ocsp_basic_response_revoked, + sizeof(ocsp_basic_response_revoked), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine ok(ret, "got %08lx\n", GetLastError()); + + if (ret) { + ok(!info->dwVersion, "got %lu\n", info->dwVersion); + ok(info->dwResponderIdChoice == 2, "got %lu\n", info->dwResponderIdChoice); + ok(info->ByKeyResponderId.cbData == sizeof(resp_id), "got %lu\n", info->ByKeyResponderId.cbData); + ok(!memcmp(info->ByKeyResponderId.pbData, resp_id2, sizeof(resp_id2)), "wrong data\n"); + ok(info->ProducedAt.dwLowDateTime == 647048832, "got %lu\n", info->ProducedAt.dwLowDateTime); + ok(info->ProducedAt.dwHighDateTime == 30950558, "got %lu\n", info->ProducedAt.dwHighDateTime); + ok(info->cResponseEntry == 1, "got %lu\n", info->cResponseEntry); + ok(info->rgResponseEntry != NULL, "got %p\n", info->rgResponseEntry); + + entry = info->rgResponseEntry; + ok(!strcmp(entry->CertId.HashAlgorithm.pszObjId, szOID_OIWSEC_sha1), "got '%s'\n", entry->CertId.HashAlgorithm.pszObjId); + ok(entry->CertId.HashAlgorithm.Parameters.cbData == 2, "got %lu\n", entry->CertId.HashAlgorithm.Parameters.cbData); + ok(entry->CertId.HashAlgorithm.Parameters.pbData[0] == 5, "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[0]); + ok(!entry->CertId.HashAlgorithm.Parameters.pbData[1], "got 0x%02x\n", entry->CertId.HashAlgorithm.Parameters.pbData[1]); + ok(entry->CertId.IssuerNameHash.cbData == 20, "got %lu\n", entry->CertId.IssuerNameHash.cbData); + ok(!memcmp(entry->CertId.IssuerNameHash.pbData, name_hash2, sizeof(name_hash2)), "wrong data\n"); + ok(entry->CertId.IssuerKeyHash.cbData == 20, "got %lu\n", entry->CertId.IssuerKeyHash.cbData); + ok(!memcmp(entry->CertId.IssuerKeyHash.pbData, key_hash2, sizeof(key_hash2)), "wrong data\n"); + ok(entry->CertId.SerialNumber.cbData == 16, "got %lu\n", entry->CertId.SerialNumber.cbData); + ok(!memcmp(entry->CertId.SerialNumber.pbData, serial2, sizeof(serial2)), "wrong data\n"); + ok(entry->dwCertStatus == 1, "got %lu\n", entry->dwCertStatus); + ok(entry->pRevokedInfo != NULL, "got NULL\n"); + + revoked = entry->pRevokedInfo; + ok(revoked->RevocationDate.dwLowDateTime == 107865088, "got %lu\n", revoked->RevocationDate.dwLowDateTime); + ok(revoked->RevocationDate.dwHighDateTime == 30919547, "got %lu\n", revoked->RevocationDate.dwHighDateTime); + ok(!revoked->dwCrlReasonCode, "got %lu\n", revoked->dwCrlReasonCode); + + ok(entry->ThisUpdate.dwLowDateTime == 3891950720, "got %lu\n", entry->ThisUpdate.dwLowDateTime); + ok(entry->ThisUpdate.dwHighDateTime == 30950555, "got %lu\n", entry->ThisUpdate.dwHighDateTime); + ok(entry->NextUpdate.dwLowDateTime == 3347801728, "got %lu\n", entry->NextUpdate.dwLowDateTime); + ok(entry->NextUpdate.dwHighDateTime == 30951957, "got %lu\n", entry->NextUpdate.dwHighDateTime); + ok(!entry->cExtension, "got %lu\n", entry->cExtension); + ok(entry->rgExtension == NULL, "got %p\n", entry->rgExtension); + + ok(!info->cExtension, "got %lu\n", info->cExtension); + ok(info->rgExtension == NULL, "got %p\n", info->rgExtension); + } + LocalFree(info); } START_TEST(encode) -- 2.30.2

1 0

[PATCH] directmanipulation: Use CRT memory allocation functions.
by Nikolay Sivov April 1, 2022

April 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/directmanipulation/directmanipulation.c | 21 ++++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index b20c41331e5..e72ffec3ddb 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -23,7 +23,6 @@ #include "winbase.h" #include "oleidl.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "wine/debug.h" #include "directmanipulation.h" @@ -89,7 +88,7 @@ ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -130,7 +129,7 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) { struct directupdatemanager *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -201,7 +200,7 @@ static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -433,7 +432,7 @@ static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface) if (!ref) { - heap_free(This); + free(This); } return ref; } @@ -540,7 +539,7 @@ static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *i { struct primarycontext *primary; TRACE("IDirectManipulationPrimaryContent\n"); - primary = heap_alloc( sizeof(*primary)); + primary = malloc( sizeof(*primary)); if(!primary) return E_OUTOFMEMORY; @@ -719,7 +718,7 @@ static HRESULT create_viewport(IDirectManipulationViewport2 **obj) { struct directviewport *object; - object = heap_alloc(sizeof(*object)); + object = malloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; @@ -766,7 +765,7 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) { if(This->updatemanager) IDirectManipulationUpdateManager_Release(This->updatemanager); - heap_free(This); + free(This); } return ref; } @@ -887,7 +886,7 @@ static HRESULT WINAPI DirectManipulation_CreateInstance(IClassFactory *iface, IU *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -962,7 +961,7 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor2 *iface) { if(This->manager) IDirectManipulationUpdateManager_Release(This->manager); - heap_free(This); + free(This); } return ref; } @@ -1065,7 +1064,7 @@ static HRESULT WINAPI DirectCompositor_CreateInstance(IClassFactory *iface, IUnk *ppv = NULL; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; -- 2.35.1

1 0

[PATCH] msxml3/tests: Use CRT memory allocation functions.
by Nikolay Sivov April 1, 2022

April 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/tests/domdoc.c | 5 ++--- dlls/msxml3/tests/httpreq.c | 5 ++--- dlls/msxml3/tests/saxreader.c | 17 ++++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c6eeb012b68..0643ea5350f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -43,7 +43,6 @@ #include "asptlb.h" #include "shlwapi.h" -#include "wine/heap.h" #include "wine/test.h" #define XML_E_UNEXPECTED_ATTRIBUTE 0xC00CE56C @@ -193,7 +192,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - heap_free(This); + free(This); return ref; } @@ -253,7 +252,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = heap_alloc(sizeof(*event)); + dispevent *event = malloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index bf52e71a6e7..bccfbaf582a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -35,7 +35,6 @@ #include "objsafe.h" #include "mshtml.h" -#include "wine/heap.h" #include "wine/test.h" #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) @@ -1250,7 +1249,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - heap_free(This); + free(This); return ref; } @@ -1326,7 +1325,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = heap_alloc(sizeof(*event)); + dispevent *event = malloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d8101c4ce94..e123d4eba5a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -33,7 +33,6 @@ #include "ocidl.h" #include "dispex.h" -#include "wine/heap.h" #include "wine/test.h" #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -268,13 +267,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = heap_alloc(call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof (struct call_entry)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = heap_realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); } assert(call_seq->sequence); @@ -309,7 +308,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].qnameW); SysFreeString(call_seq->sequence[i].attributes[j].valueW); } - heap_free(call_seq->sequence[i].attributes); + free(call_seq->sequence[i].attributes); call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); @@ -317,7 +316,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].arg3W); } - heap_free(call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -544,7 +543,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = heap_alloc_zero(sizeof(struct call_sequence)); + seq[i] = calloc(1, sizeof(**seq)); } static const WCHAR szSimpleXML[] = @@ -1235,7 +1234,7 @@ static HRESULT WINAPI contentHandler_startElement( int i; struct attribute_entry *attr; - attr = heap_alloc_zero(len * sizeof(*attr)); + attr = calloc(len, sizeof(*attr)); v = VARIANT_TRUE; hr = ISAXXMLReader_getFeature(g_reader, _bstr_("http://xml.org/sax/features/namespaces"), &v); @@ -3374,7 +3373,7 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = heap_alloc(len + 1); + buff = malloc(len + 1); memset(buff, 'A', len); buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); @@ -3457,7 +3456,7 @@ static void test_mxwriter_flush(void) ok(SysStringLen(V_BSTR(&dest)) == len, "got len=%d, expected %d\n", SysStringLen(V_BSTR(&dest)), len); VariantClear(&dest); - heap_free(buff); + free(buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer); -- 2.35.1

1 0

[PATCH] sxs/tests: Use CRT memory allocation functions.
by Nikolay Sivov April 1, 2022

April 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/sxs/tests/sxs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 589d713e08b..0c367f7c6d5 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -26,7 +26,6 @@ #include "shlwapi.h" #include "wine/test.h" -#include "wine/heap.h" #include "initguid.h" #include "interfaces.h" @@ -108,7 +107,7 @@ static void run_test(void) ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = heap_alloc(buffer_size); + info = malloc(buffer_size); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); ok(ret == TRUE, "Got %d\n", ret); @@ -121,14 +120,14 @@ static void run_test(void) ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.0"), "Unexpected runtime version %s.\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); - heap_free(info); + free(info); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %ld\n", GetLastError()); - info = heap_alloc(buffer_size); + info = malloc(buffer_size); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, buffer_size, &buffer_size); @@ -142,7 +141,7 @@ static void run_test(void) ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.1"), "Unexpected runtime version %s.\n", wine_dbgstr_w(info->pcwszRuntimeVersion)); - heap_free(info); + free(info); SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); -- 2.35.1

1 0

[PATCH] mfmediaengine/tests: Remove unused header include.
by Nikolay Sivov April 1, 2022

April 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index ea2f570d721..008ee58849c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -32,7 +32,6 @@ #include "mmdeviceapi.h" #include "audiosessiontypes.h" -#include "wine/heap.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateDXGIDeviceManager)(UINT *token, IMFDXGIDeviceManager **manager); -- 2.35.1

1 0

[PATCH] dxva2: Use CRT memory allocation functions.
by Nikolay Sivov April 1, 2022

April 1, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index b262990e0f7..c5ca3439a68 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -30,7 +30,6 @@ #include "dxva2api.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dxva2); @@ -98,7 +97,7 @@ static BOOL dxva_array_reserve(void **elements, size_t *capacity, size_t count, if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; @@ -178,7 +177,7 @@ static ULONG WINAPI video_processor_Release(IDirectXVideoProcessor *iface) if (!refcount) { IDirectXVideoProcessorService_Release(processor->service); - heap_free(processor); + free(processor); } return refcount; @@ -613,7 +612,7 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir return E_INVALIDARG; } - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirectXVideoProcessor_iface.lpVtbl = &video_processor_vtbl; @@ -776,8 +775,8 @@ static ULONG WINAPI device_manager_Release(IDirect3DDeviceManager9 *iface) if (manager->handles[i].state_block) IDirect3DStateBlock9_Release(manager->handles[i].state_block); } - heap_free(manager->handles); - heap_free(manager); + free(manager->handles); + free(manager); } return refcount; @@ -1051,7 +1050,7 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan *manager = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DDeviceManager9_iface.lpVtbl = &device_manager_vtbl; -- 2.35.1

1 0

[PATCH v5 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf April 1, 2022

April 1, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. v4: - Retrieve string as BSTR. v5: - Remove unnecessary variable. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 20 ++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..61b1b4313ef 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,26 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(pvar) == (VT_BYREF | VT_VARIANT)) pvar = V_VARIANTREF(pvar); + if (V_VT(pvar) == (VT_BYREF | VT_BSTR) || V_VT(pvar) == VT_BSTR) + { + BSTR ret; + ret = V_ISBYREF(pvar) ? *V_BSTRREF(pvar) : V_BSTR(pvar); + + if (!ret) return L""; + return ret; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1

[PATCH v4 1/2] propsys: Implement VariantToStringWithDefault.
by Mohamad Al-Jaf April 1, 2022

April 1, 2022

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Support byref BSTR. - Support nested VARIANT including byref BSTR. v3: - Consolidate code. v4: - Retrieve string as BSTR. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 22 ++++++++++++++++++++++ include/propvarutil.h | 6 ++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15749952e95..7391cf4aaa2 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -194,7 +194,7 @@ @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc -@ stub VariantToStringWithDefault +@ stdcall VariantToStringWithDefault(ptr wstr) @ stub VariantToUInt16 @ stub VariantToUInt16Array @ stub VariantToUInt16ArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 8f6c52f7aa7..046063dd183 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -416,6 +416,28 @@ PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR p return pszDefault; } +/****************************************************************** + * VariantToStringWithDefault (PROPSYS.@) + */ +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault) +{ + VARIANT var = *pvar; + + TRACE("(%p, %s)\n", pvar, debugstr_w(pszDefault)); + + if (V_VT(&var) == (VT_BYREF | VT_VARIANT)) var = *V_VARIANTREF(pvar); + if (V_VT(&var) == (VT_BYREF | VT_BSTR) || V_VT(&var) == VT_BSTR) + { + BSTR ret; + ret = V_ISBYREF(&var) ? *V_BSTRREF(&var) : V_BSTR(&var); + + if (!ret) return L""; + return ret; + } + + return pszDefault; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) diff --git a/include/propvarutil.h b/include/propvarutil.h index 36a670f56e6..2515d71b3b6 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -93,6 +93,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb); HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); +PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); @@ -201,6 +202,11 @@ inline BOOL IsPropVariantString(REFPROPVARIANT propvar) return (PropVariantToStringWithDefault(propvar, NULL) != NULL); } +inline BOOL IsVariantString(const VARIANT *pvar) +{ + return (VariantToStringWithDefault(pvar, NULL) != NULL); +} + #endif /* NO_PROPVAR_INLINES */ #endif /* __cplusplus */ -- 2.35.1

1 1