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

Alistair Leslie-Hughes : include: Add THREAD_POWER_THROTTLING_STATE type.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 1e7c6d73c8f558668c6140d4a97fae0ad51d71eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e7c6d73c8f558668c6140d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 16:09:23 2022 +1000 include: Add THREAD_POWER_THROTTLING_STATE type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/processthreadsapi.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h index d266b7a727b..f2554950952 100644 --- a/include/processthreadsapi.h +++ b/include/processthreadsapi.h @@ -37,6 +37,13 @@ typedef struct _MEMORY_PRIORITY_INFORMATION ULONG MemoryPriority; } MEMORY_PRIORITY_INFORMATION, *PMEMORY_PRIORITY_INFORMATION; +typedef struct _THREAD_POWER_THROTTLING_STATE +{ + ULONG Version; + ULONG ControlMask; + ULONG StateMask; +} THREAD_POWER_THROTTLING_STATE; + WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); WINBASEAPI BOOL WINAPI SetThreadInformation(HANDLE,THREAD_INFORMATION_CLASS,LPVOID,DWORD);

1 0

Alistair Leslie-Hughes : winex11.drv: Define ControlMask when not available.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: cf4a781e987a98a8d48610362a20a320c4a1016d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4a781e987a98a8d4861036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 17:40:44 2022 +1000 winex11.drv: Define ControlMask when not available. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winex11.drv/bitblt.c | 2 -- dlls/winex11.drv/event.c | 6 ------ dlls/winex11.drv/keyboard.c | 7 ++++--- dlls/winex11.drv/mouse.c | 4 +--- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 4 +--- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d1e6407d87c..10388a1cc8f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -46,8 +46,6 @@ # endif #endif -#include "windef.h" -#include "winbase.h" #include "x11drv.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cbab1dcfe13..f81d2338faf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -39,13 +39,7 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" - #include "x11drv.h" - -/* avoid conflict with field names in included win32 headers */ -#undef Status #include "shlobj.h" /* DROPFILES */ #include "shellapi.h" diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6157548474b..7b4ad9acd8d 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -44,14 +44,13 @@ #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" +#include "x11drv.h" + #include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winnls.h" #include "ime.h" -#include "x11drv.h" #include "wine/server.h" #include "wine/debug.h" @@ -64,6 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); +static const unsigned int ControlMask = 1 << 2; + static int min_keycode, max_keycode, keysyms_per_keycode; static KeySym *key_mapping; static WORD keyc2vkey[256], keyc2scan[256]; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d0cdd3d4984..2ce03c3f12f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -50,11 +50,9 @@ MAKE_FUNCPTR(XcursorLibraryLoadCursor); #define NONAMELESSUNION #define OEMRESOURCE -#include "windef.h" -#include "winbase.h" -#include "winreg.h" #include "x11drv.h" +#include "winreg.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 773fa81f5f3..07fb1515e24 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -43,14 +43,14 @@ /* avoid conflict with field names in included win32 headers */ #undef Status + #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" + +#include "x11drv.h" #include "wingdi.h" #include "winuser.h" -#include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" #include "mwm.h" diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 613dc0e05fe..222d7328387 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -57,6 +57,9 @@ #undef Status /* avoid conflict with wintrnl.h */ typedef int Status; +/* avoid conflict with processthreadsapi.h */ +#undef ControlMask + #include "windef.h" #include "winbase.h" #include "ntgdi.h" diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 40d0e750d1b..a118757dfbe 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -45,14 +45,12 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winreg.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST #include "x11drv.h" +#include "winreg.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h"

1 0

Rémi Bernon : ntdll: Move min commit size to main heap struct.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 74453b7c24bd9dbe1dd84d3172b8cbc256ca38b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74453b7c24bd9dbe1dd84d31… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 12:46:40 2022 +0200 ntdll: Move min commit size to main heap struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 52c9e120a64..061dbd8a731 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -164,7 +164,6 @@ struct tagHEAP; typedef struct tagSUBHEAP { 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 */ struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ @@ -191,6 +190,7 @@ typedef struct tagHEAP struct list subheap_list; /* Sub-heap list */ struct list large_list; /* Large blocks list */ SIZE_T grow_size; /* Size of next subheap for growing heap */ + SIZE_T min_size; /* Minimum committed size */ DWORD magic; /* Magic number */ DWORD pending_pos; /* Position in pending free requests ring */ ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ @@ -649,12 +649,13 @@ static inline BOOL subheap_commit( SUBHEAP *subheap, const struct block *block, static inline BOOL subheap_decommit( SUBHEAP *subheap, const void *commit_end ) { + char *base = subheap_base( subheap ); HEAP *heap = subheap->heap; SIZE_T size; void *addr; commit_end = ROUND_ADDR((char *)commit_end + COMMIT_MASK, COMMIT_MASK); - commit_end = max( (char *)commit_end, (char *)subheap_base( subheap ) + subheap->min_commit ); + if (subheap == &heap->subheap) commit_end = max( (char *)commit_end, (char *)base + heap->min_size ); if (commit_end >= subheap_commit_end( subheap )) return TRUE; size = (char *)subheap_commit_end( subheap ) - (char *)commit_end; @@ -939,7 +940,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap = address; subheap->heap = heap; subheap->size = totalSize; - subheap->min_commit = 0x10000; subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); @@ -956,13 +956,13 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); + heap->min_size = commitSize; list_init( &heap->subheap_list ); list_init( &heap->large_list ); subheap = &heap->subheap; subheap->heap = heap; subheap->size = totalSize; - subheap->min_commit = commitSize; subheap->commitSize = commitSize; subheap->magic = SUBHEAP_MAGIC; subheap->headerSize = ROUND_SIZE( sizeof(HEAP) );

1 0

Jacek Caban : winemac: Use libc for driver memory allocation.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: f35ecdf73ee6d871bebec11050bdd88b42c3c0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f35ecdf73ee6d871bebec110… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 02:01:42 2022 +0200 winemac: Use libc for driver memory allocation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 48 +++++++++++++++++++++--------------------- dlls/winemac.drv/display.c | 20 +++++++++--------- dlls/winemac.drv/gdi.c | 4 ++-- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/macdrv_main.c | 4 ++-- dlls/winemac.drv/mouse.c | 20 +++++++++--------- dlls/winemac.drv/opengl.c | 29 +++++++++++++------------ dlls/winemac.drv/surface.c | 15 ++++++------- dlls/winemac.drv/vulkan.c | 9 ++++---- dlls/winemac.drv/window.c | 28 ++++++++++++------------ 10 files changed, 88 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f35ecdf73ee6d871bebe…

1 0

Jacek Caban : winemac: Directly use wine_nt_to_unix_file_name.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 174e0ba090c857db7cf28c33eaada8a8efa1565e URL: https://source.winehq.org/git/wine.git/?a=commit;h=174e0ba090c857db7cf28c33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 20:28:11 2022 +0200 winemac: Directly use wine_nt_to_unix_file_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 81 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 93706680470..cdb4e5e02a8 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -24,6 +24,8 @@ #include "config.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "macdrv.h" #include "winuser.h" #include "shellapi.h" @@ -588,6 +590,78 @@ static WCHAR *get_dos_file_name(const char *path) } +/*********************************************************************** + * get_nt_pathname + * + * Simplified version of RtlDosPathNameToNtPathName_U. + */ +static BOOL get_nt_pathname(const WCHAR *name, UNICODE_STRING *nt_name) +{ + static const WCHAR ntprefixW[] = {'\\','?','?','\\'}; + static const WCHAR uncprefixW[] = {'U','N','C','\\'}; + size_t len = lstrlenW(name); + WCHAR *ptr; + + nt_name->MaximumLength = (len + 8) * sizeof(WCHAR); + if (!(ptr = malloc(nt_name->MaximumLength))) return FALSE; + nt_name->Buffer = ptr; + + memcpy(ptr, ntprefixW, sizeof(ntprefixW)); + ptr += ARRAYSIZE(ntprefixW); + if (name[0] == '\\' && name[1] == '\\') + { + if ((name[2] == '.' || name[2] == '?') && name[3] == '\\') + { + name += 4; + len -= 4; + } + else + { + memcpy(ptr, uncprefixW, sizeof(uncprefixW)); + ptr += ARRAYSIZE(uncprefixW); + name += 2; + len -= 2; + } + } + memcpy(ptr, name, (len + 1) * sizeof(WCHAR)); + ptr += len; + nt_name->Length = (ptr - nt_name->Buffer) * sizeof(WCHAR); + return TRUE; +} + + +/* based on wine_get_unix_file_name */ +static char *get_unix_file_name(const WCHAR *dosW) +{ + UNICODE_STRING nt_name; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + ULONG size = 256; + char *buffer; + + if (!get_nt_pathname(dosW, &nt_name)) return NULL; + InitializeObjectAttributes(&attr, &nt_name, 0, 0, NULL); + for (;;) + { + if (!(buffer = malloc(size))) + { + free(nt_name.Buffer); + return NULL; + } + status = wine_nt_to_unix_file_name(&attr, buffer, &size, FILE_OPEN_IF); + if (status != STATUS_BUFFER_TOO_SMALL) break; + free(buffer); + } + free(nt_name.Buffer); + if (status) + { + free(buffer); + return NULL; + } + return buffer; +} + + /************************************************************************** * import_nsfilenames_to_hdrop * @@ -861,7 +935,7 @@ static CFDataRef export_hdrop_to_filenames(void *data, size_t size) TRACE(" %s\n", dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); if (dropfiles->fWide) - unixname = wine_get_unix_file_name(p); + unixname = get_unix_file_name(p); else { int len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); @@ -875,7 +949,7 @@ static CFDataRef export_hdrop_to_filenames(void *data, size_t size) } MultiByteToWideChar(CP_ACP, 0, p, -1, buffer, buffer_len); - unixname = wine_get_unix_file_name(buffer); + unixname = get_unix_file_name(buffer); } else unixname = NULL; @@ -893,13 +967,14 @@ static CFDataRef export_hdrop_to_filenames(void *data, size_t size) p = (char*)p + strlen(p) + 1; filename = CFStringCreateWithFileSystemRepresentation(NULL, unixname); - HeapFree(GetProcessHeap(), 0, unixname); if (!filename) { WARN("failed to create CFString from Unix path %s\n", debugstr_a(unixname)); + free(unixname); goto done; } + free(unixname); CFArrayAppendValue(filenames, filename); CFRelease(filename); }

1 0

Jacek Caban : winemac: Directly use win32u in query_pasteboard_data.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: ff88345f7dd4496b0ec61e526203746a4dc0ccf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff88345f7dd4496b0ec61e52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 00:59:39 2022 +0200 winemac: Directly use win32u in query_pasteboard_data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 152 +++++++++++++------------------------------ 1 file changed, 47 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff88345f7dd4496b0ec6…

1 0

Alistair Leslie-Hughes : ntdll: Fake success for ThreadPowerThrottlingState.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: bf86dfbcadbe0e79ae07afb57e469f388a9104a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf86dfbcadbe0e79ae07afb5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 22 16:10:27 2022 +1000 ntdll: Fake success for ThreadPowerThrottlingState. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52956 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 6 ++++++ dlls/wow64/process.c | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 6d937675bcb..15bb3be34b2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -2255,6 +2255,12 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" ); return STATUS_SUCCESS; + case ThreadPowerThrottlingState: + if (length != sizeof(THREAD_POWER_THROTTLING_STATE)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + FIXME( "ThreadPowerThrottling stub!\n" ); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 82ca4181116..0c6726b9c6e 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1158,6 +1158,7 @@ NTSTATUS WINAPI wow64_NtSetInformationThread( UINT *args ) case ThreadBasePriority: /* ULONG */ case ThreadHideFromDebugger: /* void */ case ThreadEnableAlignmentFaultFixup: /* BOOLEAN */ + case ThreadPowerThrottlingState: /* THREAD_POWER_THROTTLING_STATE */ return NtSetInformationThread( handle, class, ptr, len ); case ThreadImpersonationToken: /* HANDLE */

1 0

Rémi Bernon : ntdll: Add a first heap block member to the subheap.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 7f9efcd4169a8181b3cee9f3a910fd2390fbc101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f9efcd4169a8181b3cee9f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 25 09:30:43 2022 +0200 ntdll: Add a first heap block member to the subheap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 061dbd8a731..d83e3971420 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -161,17 +161,19 @@ typedef union struct tagHEAP; -typedef struct tagSUBHEAP +typedef struct DECLSPEC_ALIGN(ALIGNMENT) tagSUBHEAP { + SIZE_T __pad[sizeof(SIZE_T) / sizeof(DWORD)]; SIZE_T size; /* Size of the whole sub-heap */ SIZE_T commitSize; /* Committed size of the sub-heap */ struct list entry; /* Entry in sub-heap list */ struct tagHEAP *heap; /* Main heap structure */ - DWORD headerSize; /* Size of the heap header */ - DWORD magic; /* Magic number */ + struct block block; } SUBHEAP; -#define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) +/* block must be last and aligned */ +C_ASSERT( sizeof(SUBHEAP) == offsetof(SUBHEAP, block) + sizeof(struct block) ); +C_ASSERT( sizeof(SUBHEAP) == 4 * ALIGNMENT ); typedef struct tagHEAP { /* win32/win64 */ @@ -199,6 +201,9 @@ typedef struct tagHEAP SUBHEAP subheap; } HEAP; +/* subheap must be last and aligned */ +C_ASSERT( sizeof(HEAP) == offsetof(HEAP, subheap) + sizeof(SUBHEAP) ); +C_ASSERT( sizeof(HEAP) % ALIGNMENT == 0 ); C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK ); #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -274,7 +279,7 @@ static inline SIZE_T subheap_size( const SUBHEAP *subheap ) static inline SIZE_T subheap_overhead( const SUBHEAP *subheap ) { - return subheap->headerSize; + return (char *)&subheap->block - (char *)subheap_base( subheap ); } static inline const void *subheap_commit_end( const SUBHEAP *subheap ) @@ -284,7 +289,7 @@ static inline const void *subheap_commit_end( const SUBHEAP *subheap ) static inline void *first_block( const SUBHEAP *subheap ) { - return (char *)subheap_base( subheap ) + subheap->headerSize; + return (void *)&subheap->block; } static inline const void *last_block( const SUBHEAP *subheap ) @@ -303,7 +308,7 @@ static inline struct block *next_block( const SUBHEAP *subheap, const struct blo static inline BOOL check_subheap( const SUBHEAP *subheap ) { const char *base = ROUND_ADDR( subheap, COMMIT_MASK ); - return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); + return contains( base, subheap->size, &subheap->block, base + subheap->commitSize - (char *)&subheap->block ); } static BOOL heap_validate( const HEAP *heap ); @@ -941,8 +946,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->heap = heap; subheap->size = totalSize; subheap->commitSize = commitSize; - subheap->magic = SUBHEAP_MAGIC; - subheap->headerSize = ROUND_SIZE( sizeof(SUBHEAP) ); list_add_head( &heap->subheap_list, &subheap->entry ); } else @@ -964,8 +967,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, subheap->heap = heap; subheap->size = totalSize; subheap->commitSize = commitSize; - subheap->magic = SUBHEAP_MAGIC; - subheap->headerSize = ROUND_SIZE( sizeof(HEAP) ); list_add_head( &heap->subheap_list, &subheap->entry ); /* Build the free lists */ @@ -1048,12 +1049,9 @@ static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **su WARN("Not enough space in heap %p for %08lx bytes\n", heap, data_size ); return NULL; } - /* make sure that we have a big enough size *committed* to fit another - * last free arena in ! - * So just one heap struct, one first free arena which will eventually - * get used, and a second free arena that might get assigned all remaining - * free space in shrink_used_block() */ - total_size = data_size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); + + /* SUBHEAP includes the first block header, and we want to fit a free entry at the end */ + total_size = sizeof(SUBHEAP) + data_size + sizeof(ARENA_FREE); if (total_size < data_size) return NULL; /* overflow */ if ((*subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size,

1 0

Gabriel Ivăncescu : mshtml: Implement timeout for XMLHttpRequest.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: 105e6b83d3ad9d1572ed94c93a8ca62ae0d1f828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=105e6b83d3ad9d1572ed94c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed May 25 19:13:13 2022 +0300 mshtml: Implement timeout for XMLHttpRequest. 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/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 2 + dlls/mshtml/tests/xmlhttprequest.c | 36 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 116 +++++++++++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 930ab3bbe19..55742728923 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,6 +265,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLWindow6) \ XIID(IHTMLWindow7) \ XIID(IHTMLXMLHttpRequest) \ + XIID(IHTMLXMLHttpRequest2) \ XIID(IHTMLXMLHttpRequestFactory) \ XIID(IOmHistory) \ XIID(IOmNavigator) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5f104475f0d..8503523f927 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -397,6 +397,8 @@ sync_test("xhr_props", function() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("ontimeout", true); + test_exposed("timeout", true); }); sync_test("stylesheet_props", function() { diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 868035d0419..6aef9f5a35d 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -1007,6 +1007,41 @@ static void test_xhr_post(IHTMLDocument2 *doc) xhr = NULL; } +static void test_timeout(IHTMLDocument2 *doc) +{ + IHTMLXMLHttpRequest2 *xhr2; + LONG timeout; + HRESULT hres; + + create_xmlhttprequest(doc); + if(!xhr) + return; + + hres = IHTMLXMLHttpRequest_QueryInterface(xhr, &IID_IHTMLXMLHttpRequest2, (void**)&xhr2); + ok(hres == S_OK, "QueryInterface(IHTMLXMLHttpRequest2) failed: %08lx\n", hres); + + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, NULL); + ok(hres == E_POINTER, "get_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 0, "timeout = %ld\n", timeout); + + /* Some Windows versions only allow setting timeout after open() */ + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST", TRUE); + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; + + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, -1); + ok(hres == E_INVALIDARG || broken(hres == E_FAIL), "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, 1337); + ok(hres == S_OK, "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 1337, "timeout = %ld\n", timeout); + + IHTMLXMLHttpRequest2_Release(xhr2); +} + static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) { BSTR url; @@ -1071,6 +1106,7 @@ START_TEST(xmlhttprequest) test_async_xhr(doc, large_page_url, NULL); test_async_xhr_abort(doc, large_page_url); test_xhr_post(doc); + test_timeout(doc); IHTMLDocument2_Release(doc); } SysFreeString(content_type); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 17219593026..066b94ba5e7 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -105,6 +105,7 @@ typedef struct { struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; + IHTMLXMLHttpRequest2 IHTMLXMLHttpRequest2_iface; IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; @@ -236,6 +237,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IHTMLXMLHttpRequest_iface; }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { *ppv = &This->IHTMLXMLHttpRequest_iface; + }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest2, riid)) { + *ppv = &This->IHTMLXMLHttpRequest2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { *ppv = &This->IProvideClassInfo2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { @@ -726,6 +729,117 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_IHTMLXMLHttpRequest2(IHTMLXMLHttpRequest2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IHTMLXMLHttpRequest2_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_QueryInterface(IHTMLXMLHttpRequest2 *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_AddRef(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_Release(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfoCount(IHTMLXMLHttpRequest2 *iface, UINT *pctinfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfo(IHTMLXMLHttpRequest2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetIDsOfNames(IHTMLXMLHttpRequest2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_Invoke(IHTMLXMLHttpRequest2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_timeout(IHTMLXMLHttpRequest2 *iface, LONG v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + TRACE("(%p)->(%ld)\n", This, v); + + if(v < 0) + return E_INVALIDARG; + return map_nsresult(nsIXMLHttpRequest_SetTimeout(This->nsxhr, v)); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_timeout(IHTMLXMLHttpRequest2 *iface, LONG *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + nsresult nsres; + UINT32 timeout; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIXMLHttpRequest_GetTimeout(This->nsxhr, &timeout); + *p = timeout; + return map_nsresult(nsres); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static const IHTMLXMLHttpRequest2Vtbl HTMLXMLHttpRequest2Vtbl = { + HTMLXMLHttpRequest2_QueryInterface, + HTMLXMLHttpRequest2_AddRef, + HTMLXMLHttpRequest2_Release, + HTMLXMLHttpRequest2_GetTypeInfoCount, + HTMLXMLHttpRequest2_GetTypeInfo, + HTMLXMLHttpRequest2_GetIDsOfNames, + HTMLXMLHttpRequest2_Invoke, + HTMLXMLHttpRequest2_put_timeout, + HTMLXMLHttpRequest2_get_timeout, + HTMLXMLHttpRequest2_put_ontimeout, + HTMLXMLHttpRequest2_get_ontimeout +}; + static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); @@ -895,6 +1009,7 @@ static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { }; static const tid_t HTMLXMLHttpRequest_iface_tids[] = { + IHTMLXMLHttpRequest2_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { @@ -1013,6 +1128,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + ret->IHTMLXMLHttpRequest2_iface.lpVtbl = &HTMLXMLHttpRequest2Vtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode);

1 0

Nikolay Sivov : kernel32/tests: Run process information tests over defined test data.
by Alexandre Julliard May 25, 2022

May 25, 2022

Module: wine Branch: master Commit: d9c4974c9c5d17f703d47b11ba566e39a84867cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c4974c9c5d17f703d47b11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 19:18:18 2022 +0300 kernel32/tests: Run process information tests over defined test data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len);

1 0