May 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : ntdll: Prefer using block size rather than data size.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 86b2ca98a4271a87e341e481c1f57d85b0422379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b2ca98a4271a87e341e481… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 22:01:01 2022 +0200 ntdll: Prefer using block size rather than data size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86b2ca98a4271a87e341…

1 0

Gabriel Ivăncescu : mshtml: Use binary search when looking up events by name.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 5eec1429fd8228af08b8f155b837a9a021b38d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eec1429fd8228af08b8f155… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:14 2022 +0300 mshtml: Use binary search when looking up events by name. Since they're already sorted (except for DOMContentLoaded because of case sensitivity). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 27 ++++++++++++++++++--------- dlls/mshtml/htmlevent.h | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fe3433692f3..f28dd639ff6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -105,7 +105,10 @@ typedef struct { #define EVENT_MOUSE_TO_RELATED 0x0100 #define EVENT_MOUSE_FROM_RELATED 0x0200 +/* Keep these sorted case sensitively */ static const event_info_t event_info[] = { + {L"DOMContentLoaded", EVENT_TYPE_EVENT, 0, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"abort", EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, EVENT_BIND_TO_TARGET}, {L"animationend", EVENT_TYPE_EVENT, DISPID_EVPROP_ONANIMATIONEND, @@ -128,8 +131,6 @@ static const event_info_t event_info[] = { EVENT_FIXME | EVENT_BUBBLES}, {L"dblclick", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, - {L"DOMContentLoaded", EVENT_TYPE_EVENT, 0, - EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"drag", EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAG, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {L"dragstart", EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART, @@ -192,11 +193,15 @@ C_ASSERT(ARRAY_SIZE(event_info) == EVENTID_LAST); static eventid_t str_to_eid(const WCHAR *str) { - int i; + unsigned i, a = 0, b = ARRAY_SIZE(event_info); + int c; - for(i=0; i < ARRAY_SIZE(event_info); i++) { - if(!wcscmp(event_info[i].name, str)) + while(a < b) { + i = (a + b) / 2; + if(!(c = wcscmp(event_info[i].name, str))) return i; + if(c > 0) b = i; + else a = i + 1; } return EVENTID_LAST; @@ -204,14 +209,18 @@ static eventid_t str_to_eid(const WCHAR *str) static eventid_t attr_to_eid(const WCHAR *str) { - int i; + unsigned i, a = 0, b = ARRAY_SIZE(event_info); + int c; if((str[0] != 'o' && str[0] != 'O') || (str[1] != 'n' && str[1] != 'N')) return EVENTID_LAST; - for(i=0; i < ARRAY_SIZE(event_info); i++) { - if(!wcscmp(event_info[i].name, str+2) && event_info[i].dispid) - return i; + while(a < b) { + i = (a + b) / 2; + if(!(c = wcscmp(event_info[i].name, str+2))) + return event_info[i].dispid ? i : EVENTID_LAST; + if(c > 0) b = i; + else a = i + 1; } return EVENTID_LAST; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 7f62bd69a7f..5d534512739 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -17,6 +17,7 @@ */ typedef enum { + EVENTID_DOMCONTENTLOADED, EVENTID_ABORT, EVENTID_ANIMATIONEND, EVENTID_ANIMATIONSTART, @@ -28,7 +29,6 @@ typedef enum { EVENTID_CONTEXTMENU, EVENTID_DATAAVAILABLE, EVENTID_DBLCLICK, - EVENTID_DOMCONTENTLOADED, EVENTID_DRAG, EVENTID_DRAGSTART, EVENTID_ERROR,

1 0

Hans Leidekker : secur32: Add support for SCH_CREDENTIALS.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 0a8adeba9237abd06d2186ef81107d9fec6d478b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a8adeba9237abd06d2186ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 12:09:01 2022 +0200 secur32: Add support for SCH_CREDENTIALS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 104 +++++++++++++++++++++++++++++++----------- dlls/secur32/tests/schannel.c | 11 ++++- include/schannel.h | 49 ++++++++++++++++++++ 3 files changed, 137 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a8adeba9237abd06d21…

1 0

Rémi Bernon : ntdll: Store the block size directly in block headers.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 4c3cc858f87aaaf4d3e6f0809ab09a520f8da37d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3cc858f87aaaf4d3e6f080… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 16:08:44 2022 +0200 ntdll: Store the block size directly in block headers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac0f14646c4..1b6337d4ce8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -253,17 +253,11 @@ static inline UINT block_get_overhead( const struct block *block ) /* return the size of a block, including its header */ static inline UINT block_get_size( const struct block *block ) { - UINT data_size = block->size & ARENA_SIZE_MASK, size = data_size; - if (block_get_flags( block ) & ARENA_FLAG_FREE) size += sizeof(struct entry); - else size += sizeof(*block); - if (size < data_size) return ~0u; - return size; + return block->size & ARENA_SIZE_MASK; } static inline void block_set_size( struct block *block, UINT flags, UINT block_size ) { - if (flags & ARENA_FLAG_FREE) block_size -= sizeof(struct entry); - else block_size -= sizeof(*block); block->size = (block_size & ARENA_SIZE_MASK) | (flags & ~ARENA_SIZE_MASK); }

1 0

Nikolay Sivov : ntdll/tests: Use NtQueryInformationProcess() directly.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: f97f5e1350746e4e69c2f1acdbe2d3b838eb746d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f97f5e1350746e4e69c2f1ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 19:18:20 2022 +0300 ntdll/tests: Use NtQueryInformationProcess() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 8 +- dlls/ntdll/tests/info.c | 198 +++++++++++++++++++++---------------------- dlls/ntdll/tests/reg.c | 4 +- 3 files changed, 102 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f97f5e1350746e4e69c2…

1 0

Rémi Bernon : ntdll: Remove base member from SUBHEAP struct.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 0f49c99a10711e46d21c59175d6d023d9ea8b70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f49c99a10711e46d21c5917… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 09:28:33 2022 +0200 ntdll: Remove base member from SUBHEAP struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 15b708f66c2..52c9e120a64 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -122,6 +122,7 @@ typedef struct #define ALIGNMENT (2*sizeof(void*)) #define LARGE_ALIGNMENT 16 /* large blocks have stricter alignment */ #define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) +#define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); @@ -162,7 +163,6 @@ struct tagHEAP; typedef struct tagSUBHEAP { - void *base; /* Base address of the sub-heap memory block */ SIZE_T size; /* Size of the whole sub-heap */ SIZE_T min_commit; /* Minimum committed size */ SIZE_T commitSize; /* Committed size of the sub-heap */ @@ -199,10 +199,11 @@ typedef struct tagHEAP SUBHEAP subheap; } HEAP; +C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK ); + #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) #define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ -#define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */ #define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ @@ -263,7 +264,7 @@ static inline void block_set_size( struct block *block, UINT flags, UINT block_s static inline void *subheap_base( const SUBHEAP *subheap ) { - return subheap->base; + return ROUND_ADDR( subheap, COMMIT_MASK ); } static inline SIZE_T subheap_size( const SUBHEAP *subheap ) @@ -301,7 +302,7 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo static inline BOOL check_subheap( const SUBHEAP *subheap ) { - const char *base = subheap->base; + const char *base = ROUND_ADDR( subheap, COMMIT_MASK ); return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); } @@ -936,7 +937,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* If this is a secondary subheap, insert it into list */ subheap = address; - subheap->base = address; subheap->heap = heap; subheap->size = totalSize; subheap->min_commit = 0x10000; @@ -960,7 +960,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, list_init( &heap->large_list ); subheap = &heap->subheap; - subheap->base = address; subheap->heap = heap; subheap->size = totalSize; subheap->min_commit = commitSize; @@ -1476,13 +1475,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) notify_free_all( subheap ); list_remove( &subheap->entry ); size = 0; - addr = subheap->base; + addr = ROUND_ADDR( subheap, COMMIT_MASK ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } notify_free_all( &heapPtr->subheap ); RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); size = 0; - addr = heapPtr->subheap.base; + addr = heap; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); return 0; }

1 0

Zhiyi Zhang : light.msstyles: Add Menu parts.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: b90662e695c512de1d4476d7ff15004e4f1e2497 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b90662e695c512de1d4476d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 25 17:28:37 2022 +0800 light.msstyles: Add Menu parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53034 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 ++ dlls/light.msstyles/blue_menu_popup_check_16px.bmp | Bin 0 -> 4234 bytes dlls/light.msstyles/blue_menu_popup_check_16px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_check_18px.bmp | Bin 0 -> 5322 bytes dlls/light.msstyles/blue_menu_popup_check_18px.svg | 9 ++ dlls/light.msstyles/blue_menu_popup_separator.bmp | Bin 0 -> 162 bytes dlls/light.msstyles/blue_menu_popup_separator.svg | 5 + dlls/light.msstyles/blue_menu_popup_submenu.bmp | Bin 0 -> 786 bytes dlls/light.msstyles/blue_menu_popup_submenu.svg | 9 ++ dlls/light.msstyles/blue_menu_system_close.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_close.svg | 5 + dlls/light.msstyles/blue_menu_system_maximize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_maximize.svg | 5 + dlls/light.msstyles/blue_menu_system_minimize.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_minimize.svg | 5 + dlls/light.msstyles/blue_menu_system_restore.bmp | Bin 0 -> 1018 bytes dlls/light.msstyles/blue_menu_system_restore.svg | 15 ++ dlls/light.msstyles/light.rc | 154 +++++++++++++++++++++ 18 files changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b90662e695c512de1d44…

1 0

Nikolay Sivov : d2d1/effect: Add a helper to append shader objects to the context.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 5317f869e09a84d5f4f9ee3d743c446e0f3cced4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5317f869e09a84d5f4f9ee3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 25 10:29:13 2022 +0300 d2d1/effect: Add a helper to append shader objects to the context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index ff808475a78..79d704dd949 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -37,18 +37,35 @@ static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1Effec static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context) { - unsigned int i; + size_t i; for (i = 0; i < effect_context->shader_count; ++i) - { - if (effect_context->shaders[i].shader) - IUnknown_Release(effect_context->shaders[i].shader); - } + IUnknown_Release(effect_context->shaders[i].shader); heap_free(effect_context->shaders); ID2D1DeviceContext_Release(&effect_context->device_context->ID2D1DeviceContext_iface); } +static HRESULT d2d_effect_context_add_shader(struct d2d_effect_context *effect_context, + REFGUID shader_id, void *shader) +{ + struct d2d_shader *entry; + + if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, + effect_context->shader_count + 1, sizeof(*effect_context->shaders))) + { + WARN("Failed to resize shaders array.\n"); + return E_OUTOFMEMORY; + } + + entry = &effect_context->shaders[effect_context->shader_count++]; + entry->id = *shader_id; + entry->shader = shader; + IUnknown_AddRef(entry->shader); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -189,7 +206,6 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); ID3D11VertexShader *vertex_shader; - struct d2d_shader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", @@ -205,22 +221,10 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect return hr; } - if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, - effect_context->shader_count + 1, sizeof(*effect_context->shaders))) - { - ERR("Failed to resize shaders array.\n"); - ID3D11VertexShader_Release(vertex_shader); - return E_OUTOFMEMORY; - } - memset(effect_context->shaders + effect_context->shader_count, 0, - sizeof(*effect_context->shaders) * (effect_context->shaders_size - effect_context->shader_count)); + hr = d2d_effect_context_add_shader(effect_context, shader_id, vertex_shader); + ID3D11VertexShader_Release(vertex_shader); - effect_context->shader_count++; - shader = &effect_context->shaders[effect_context->shader_count - 1]; - shader->id = *shader_id; - shader->shader = (IUnknown *)vertex_shader; - - return S_OK; + return hr; } static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1EffectContext *iface,

1 0

Brendan Shanks : win32u: Fix typo in NtUserGetIconInfo.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: b88ba537ea879772dc86fc8b811523744795b22d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b88ba537ea879772dc86fc8b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue May 24 12:38:32 2022 -0700 win32u: Fix typo in NtUserGetIconInfo. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/win32u/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 032110b26d0..e51feb87115 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -600,7 +600,7 @@ BOOL WINAPI NtUserGetIconInfo( HICON icon, ICONINFO *info, UNICODE_STRING *modul { size_t size = min( res_name->MaximumLength, lstrlenW( obj->resname) * sizeof(WCHAR) ); if (size) memcpy( res_name->Buffer, obj->resname, size ); - module->Length = size / sizeof(WCHAR); /* length in chars, not bytes */ + res_name->Length = size / sizeof(WCHAR); /* length in chars, not bytes */ } } }

1 0

Rémi Bernon : qasf/tests: Add more ASF Reader filter tests.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 031747a5aaa7614a3982cda14a1714fc9b54d2f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=031747a5aaa7614a3982cda1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 21 18:02:38 2022 +0100 qasf/tests: Add more ASF Reader filter tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/qasf/tests/Makefile.in | 2 + dlls/qasf/tests/asfreader.c | 234 +++++++++++++++++++++++++++++++++++++++++++- dlls/qasf/tests/resource.rc | 25 +++++ dlls/qasf/tests/test.wmv | Bin 0 -> 45663 bytes 4 files changed, 257 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=031747a5aaa7614a3982…

1 0