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

Hugh McMaster : regedit: Mark WCHAR szTitle static.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 4b964b82104fb3a0949faaa6434583ca4bd750fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b964b82104fb3a0949faaa6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:42 2022 +1000 regedit: Mark WCHAR szTitle static. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.c | 2 +- programs/regedit/main.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 664821f6a5d..ecc06a5280e 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -51,7 +51,7 @@ HMENU hPopupMenus = 0; UINT nClipboardFormat; #define MAX_LOADSTRING 100 -WCHAR szTitle[MAX_LOADSTRING]; +static WCHAR szTitle[MAX_LOADSTRING]; const WCHAR szChildClass[] = L"REGEDIT"; static const WCHAR szFrameClass[] = L"RegEdit_RegEdit"; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index d32000f78ac..29ecb433916 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -95,7 +95,6 @@ extern HMENU hPopupMenus; extern HFONT hFont; extern enum OPTION_FLAGS Options; -extern WCHAR szTitle[]; extern const WCHAR szChildClass[]; extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[];

1 0

Hugh McMaster : regedit: Remove unused WCHAR szHexEditClass from main header.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 498e0da0957c573d11c31cdfec04166d9cb12dc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=498e0da0957c573d11c31cdf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Apr 14 23:01:43 2022 +1000 regedit: Remove unused WCHAR szHexEditClass from main header. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.h | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 29ecb433916..6ad7835e4df 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -96,7 +96,6 @@ extern HFONT hFont; extern enum OPTION_FLAGS Options; extern const WCHAR szChildClass[]; -extern const WCHAR szHexEditClass[]; extern WCHAR g_pszDefaultValueName[]; extern DWORD g_columnToSort;

1 0

Rémi Bernon : kernel32/tests: Tweak tests results for w7pro64.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: af6dd8eb0c84287553ea982bd93f1f43f6aa13c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af6dd8eb0c84287553ea982b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:29 2022 +0200 kernel32/tests: Tweak tests results for w7pro64. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 53cff284c6f..a131a7f56e0 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -328,10 +328,12 @@ static void test_HeapCreate(void) ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); - ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x80 * sizeof(void *)) ); + /* theshold between failure and success varies, and w7pro64 has a much larger overhead. */ + + ptr = HeapAlloc( heap, 0, alloc_size - (0x400 + 0x100 * sizeof(void *)) ); ok( !!ptr, "HeapAlloc failed, error %lu\n", GetLastError() ); size = HeapSize( heap, 0, ptr ); - ok( size == alloc_size - (0x400 + 0x80 * sizeof(void *)), + ok( size == alloc_size - (0x400 + 0x100 * sizeof(void *)), "HeapSize returned %#Ix, error %lu\n", size, GetLastError() ); ret = HeapFree( heap, 0, ptr ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); @@ -438,7 +440,7 @@ static void test_HeapCreate(void) "got Region.dwCommittedSize %#lx\n", entries[0].Region.dwCommittedSize ); todo_wine ok( entries[0].Region.dwUnCommittedSize == 0x10000 - entries[0].Region.dwCommittedSize || - entries[0].Region.dwUnCommittedSize == 0x40000 - entries[0].Region.dwCommittedSize /* win7 */, + entries[0].Region.dwUnCommittedSize == 0x10000 * sizeof(void *) - entries[0].Region.dwCommittedSize /* win7 */, "got Region.dwUnCommittedSize %#lx\n", entries[0].Region.dwUnCommittedSize ); todo_wine ok( (BYTE *)entries[0].Region.lpFirstBlock == (BYTE *)entries[0].lpData + entries[0].cbData + 2 * sizeof(void *) || @@ -493,7 +495,7 @@ static void test_HeapCreate(void) ok( entries[3].lpData == ptr, "got lpData %p\n", entries[3].lpData ); todo_wine ok( entries[3].cbData == 5 * alloc_size, "got cbData %#lx\n", entries[3].cbData ); - ok( entries[3].cbOverhead == 0 || entries[3].cbOverhead == 0x20 /* win7 */, + ok( entries[3].cbOverhead == 0 || entries[3].cbOverhead == 8 * sizeof(void *) /* win7 */, "got cbOverhead %#x\n", entries[3].cbOverhead ); todo_wine ok( entries[3].iRegionIndex == 64, "got iRegionIndex %d\n", entries[3].iRegionIndex ); @@ -520,7 +522,7 @@ static void test_HeapCreate(void) ok( entries[4].lpData == ptr1, "got lpData %p\n", entries[4].lpData ); todo_wine ok( entries[4].cbData == 5 * alloc_size, "got cbData %#lx\n", entries[4].cbData ); - ok( entries[4].cbOverhead == 0 || entries[4].cbOverhead == 0x20 /* win7 */, + ok( entries[4].cbOverhead == 0 || entries[4].cbOverhead == 8 * sizeof(void *) /* win7 */, "got cbOverhead %#x\n", entries[4].cbOverhead ); todo_wine ok( entries[4].iRegionIndex == 64, "got iRegionIndex %d\n", entries[4].iRegionIndex );

1 0

Rémi Bernon : kernel32/tests: Reduce the number of GlobalAlloc size tests.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: eb087788db19018ddb1420025d9d6a5a2a3a18e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb087788db19018ddb142002… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:30 2022 +0200 kernel32/tests: Reduce the number of GlobalAlloc size tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index a131a7f56e0..e1cda94f78c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -998,7 +998,7 @@ static void test_GlobalAlloc(void) mem = GlobalFree( mem ); ok( !mem, "GlobalFree failed, error %lu\n", GetLastError() ); - for (alloc_size = 1; alloc_size < 0x10000000; alloc_size <<= 1) + for (alloc_size = 1; alloc_size < 0x10000000; alloc_size <<= 5) { winetest_push_context( "size %#Ix", alloc_size );

1 0

Rémi Bernon : ntdll: Use a dedicated member for shared heap flag.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 9d34933f24e9152296f7ae3ca5bd0003afb1413b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d34933f24e9152296f7ae3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:31 2022 +0200 ntdll: Use a dedicated member for shared heap flag. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 346bcf3c10c..01364016271 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -153,6 +153,7 @@ typedef struct tagHEAP /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ DWORD flags; /* Heap flags */ DWORD force_flags; /* Forced heap flags for debugging */ + BOOL shared; /* System shared heap */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ @@ -687,7 +688,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) /* Decommit the end of the heap */ - if (!(subheap->heap->flags & HEAP_SHARED)) HEAP_Decommit( subheap, pFree + 1 ); + if (!(subheap->heap->shared)) HEAP_Decommit( subheap, pFree + 1 ); } @@ -922,6 +923,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap = address; heap->flags = flags; + heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); list_init( &heap->subheap_list ); @@ -967,7 +969,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap->critSection.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": HEAP.critSection"); } - if (flags & HEAP_SHARED) + if (heap->shared) { /* let's assume that only one thread at a time will try to do this */ HANDLE sem = heap->critSection.LockSemaphore;

1 0

Rémi Bernon : ntdll: Fix main heap struct layout and flags members.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 43fe980818d93e8f407eb6447aaf7eb4381c3cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fe980818d93e8f407eb644… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 19 19:33:32 2022 +0200 ntdll: Fix main heap struct layout and flags members. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 3 -- dlls/ntdll/heap.c | 72 +++++++++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e1cda94f78c..104eced3bf4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1974,9 +1974,7 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); - todo_wine_if( force_flags & (HEAP_PRIVATE|HEAP_NO_SERIALIZE) ) ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); - todo_wine_if( heap_flags & (HEAP_VALIDATE_ALL|HEAP_VALIDATE_PARAMS|HEAP_SHARED|HEAP_PRIVATE) ) ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); if (heap->flags & HEAP_PAGE_ALLOCS) @@ -1990,7 +1988,6 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags } else { - todo_wine ok( heap->ffeeffee == 0xffeeffee, "got ffeeffee %#x\n", heap->ffeeffee ); ok( heap->auto_flags == (heap_flags & HEAP_GROWABLE) || !heap->auto_flags, "got auto_flags %#x\n", heap->auto_flags ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 01364016271..298c39f24ff 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -142,17 +142,17 @@ typedef struct tagSUBHEAP #define SUBHEAP_MAGIC ((DWORD)('S' | ('U'<<8) | ('B'<<16) | ('H'<<24))) typedef struct tagHEAP -{ - DWORD_PTR unknown1[2]; - DWORD unknown2[2]; - DWORD_PTR unknown3[4]; - DWORD unknown4; - DWORD_PTR unknown5[2]; - DWORD unknown6[3]; - DWORD_PTR unknown7[2]; - /* For Vista through 10, 'flags' is at offset 0x40 (x86) / 0x70 (x64) */ - DWORD flags; /* Heap flags */ - DWORD force_flags; /* Forced heap flags for debugging */ +{ /* win32/win64 */ + DWORD_PTR unknown1[2]; /* 0000/0000 */ + DWORD ffeeffee; /* 0008/0010 */ + DWORD auto_flags; /* 000c/0014 */ + DWORD_PTR unknown2[7]; /* 0010/0018 */ + DWORD unknown3[2]; /* 002c/0050 */ + DWORD_PTR unknown4[3]; /* 0034/0058 */ + DWORD flags; /* 0040/0070 */ + DWORD force_flags; /* 0044/0074 */ + /* end of the Windows 10 compatible struct layout */ + BOOL shared; /* System shared heap */ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ @@ -173,6 +173,7 @@ typedef struct tagHEAP #define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ +#define HEAP_PRIVATE 0x00001000 #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 #define HEAP_VALIDATE_ALL 0x20000000 @@ -922,7 +923,9 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* If this is a primary subheap, initialize main heap */ heap = address; - heap->flags = flags; + heap->ffeeffee = 0xffeeffee; + heap->auto_flags = (flags & HEAP_GROWABLE); + heap->flags = (flags & ~HEAP_SHARED); heap->shared = (flags & HEAP_SHARED) != 0; heap->magic = HEAP_MAGIC; heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); @@ -1438,6 +1441,25 @@ static BOOL validate_block_pointer( HEAP *heap, SUBHEAP **ret_subheap, const ARE return ret; } +static DWORD heap_flags_from_global_flag( DWORD flag ) +{ + DWORD ret = 0; + + if (flag & FLG_HEAP_ENABLE_TAIL_CHECK) + ret |= HEAP_TAIL_CHECKING_ENABLED; + if (flag & FLG_HEAP_ENABLE_FREE_CHECK) + ret |= HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_PARAMETERS) + ret |= HEAP_VALIDATE_PARAMS | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_VALIDATE_ALL) + ret |= HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (flag & FLG_HEAP_DISABLE_COALESCING) + ret |= HEAP_DISABLE_COALESCE_ON_FREE; + if (flag & FLG_HEAP_PAGE_ALLOCS) + ret |= HEAP_PAGE_ALLOCS; + + return ret; +} /*********************************************************************** * heap_set_debug_flags @@ -1446,27 +1468,21 @@ static void heap_set_debug_flags( HANDLE handle ) { HEAP *heap = HEAP_GetPtr( handle ); ULONG global_flags = RtlGetNtGlobalFlags(); - ULONG flags = 0; + DWORD flags, force_flags; if (TRACE_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_ALL; if (WARN_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_PARAMETERS; - if (global_flags & FLG_HEAP_ENABLE_TAIL_CHECK) flags |= HEAP_TAIL_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_ENABLE_FREE_CHECK) flags |= HEAP_FREE_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_DISABLE_COALESCING) flags |= HEAP_DISABLE_COALESCE_ON_FREE; - if (global_flags & FLG_HEAP_PAGE_ALLOCS) flags |= HEAP_PAGE_ALLOCS | HEAP_GROWABLE; + flags = heap_flags_from_global_flag( global_flags ); + force_flags = (heap->flags | flags) & ~(HEAP_SHARED|HEAP_DISABLE_COALESCE_ON_FREE); - if (global_flags & FLG_HEAP_VALIDATE_PARAMETERS) - flags |= HEAP_VALIDATE | HEAP_VALIDATE_PARAMS | - HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; - if (global_flags & FLG_HEAP_VALIDATE_ALL) - flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | - HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (global_flags & FLG_HEAP_ENABLE_TAGGING) flags |= HEAP_SHARED; + if (!(global_flags & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); if (RUNNING_ON_VALGRIND) flags = 0; /* no sense in validating since Valgrind catches accesses */ heap->flags |= flags; - heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE); + heap->force_flags |= force_flags; if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { @@ -1541,11 +1557,9 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c /* Allocate the heap block */ - if (!totalSize) - { - totalSize = HEAP_DEF_SIZE; - flags |= HEAP_GROWABLE; - } + if (processHeap) flags |= HEAP_PRIVATE; + if (!processHeap || !totalSize || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE; + if (!totalSize) totalSize = HEAP_DEF_SIZE; if (!(subheap = HEAP_CreateSubHeap( NULL, addr, flags, commitSize, totalSize ))) return 0;

1 0

Connor McAdams : webservices/tests: Add test for binary encoding nested structure handling.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 0913f72e6365948bf7b77833e7965f62c51bde17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0913f72e6365948bf7b77833… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Apr 18 13:13:08 2022 -0400 webservices/tests: Add test for binary encoding nested structure handling. Add a test for a nested structure with an optional ending element. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 89 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index eacde56928d..1a2cd1fe420 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4874,6 +4874,8 @@ static const WS_XML_TEXT_NODE *read_text_node( WS_XML_READER *reader ) static void test_binary_encoding(void) { + WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_s_a = {3, (BYTE *)"s_a"}, str_s_b = {3, (BYTE *)"s_b"}; + WS_XML_STRING str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; static WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; static const char test[] = {0x40,0x01,'t',0x01}; @@ -4949,6 +4951,9 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x05,0x02,'p','2',0x01,'t',0x98,0x04,'t','e','s','t',0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char test200[] = {0x02,0x07,'c','o','m','m','e','n','t'}; + static const char test_endelem[] = + { 0x40, 0x01, 't', 0x40, 0x01, 'a', 0x83, 0x40, 0x01, 's', 0x40, 0x03, 's', '_', 'a', 0x82, 0x01, 0x01, + 0x40, 0x01, 'b', 0x83, 0x01 }; const WS_XML_NODE *node; const WS_XML_TEXT_NODE *text_node; const WS_XML_ELEMENT_NODE *elem; @@ -4969,8 +4974,8 @@ static void test_binary_encoding(void) WS_HEAP *heap; BOOL found; HRESULT hr; - WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f1[3], f2[2], *fields[3], *fields2[2]; struct typetest { WS_BYTES data; @@ -4983,6 +4988,17 @@ static void test_binary_encoding(void) { UINT64 val; } *typetest3; + struct s + { + INT32 s_a; + INT32 s_b; + }; + struct test + { + INT32 a; + struct s *s; + INT32 b; + } *test_struct; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); @@ -5689,6 +5705,75 @@ static void test_binary_encoding(void) WS_READ_REQUIRED_POINTER, heap, &typetest3, sizeof(typetest3), NULL ); ok( hr == WS_E_NUMERIC_OVERFLOW, "got %#lx\n", hr ); + /* Test optional ending field on a nested struct. */ + hr = set_input_bin( reader, test_endelem, sizeof(test_endelem), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + memset( &f1[0], 0, sizeof(f1[0]) ); + f1[0].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[0].localName = &str_a; + f1[0].ns = &ns; + f1[0].type = WS_INT32_TYPE; + fields[0] = &f1[0]; + + memset( &f1[1], 0, sizeof(f1[1]) ); + f1[1].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[1].localName = &str_s; + f1[1].ns = &ns; + f1[1].type = WS_STRUCT_TYPE; + f1[1].typeDescription = &s2; + f1[1].options = WS_FIELD_POINTER; + f1[1].offset = FIELD_OFFSET(struct test, s); + fields[1] = &f1[1]; + + memset( &f1[2], 0, sizeof(f1[2]) ); + f1[2].mapping = WS_ELEMENT_FIELD_MAPPING; + f1[2].localName = &str_b; + f1[2].ns = &ns; + f1[2].type = WS_INT32_TYPE; + f1[2].offset = FIELD_OFFSET(struct test, b); + fields[2] = &f1[2]; + + memset( &f2[0], 0, sizeof(f2[0]) ); + f2[0].mapping = WS_ELEMENT_FIELD_MAPPING; + f2[0].localName = &str_s_a; + f2[0].ns = &ns; + f2[0].type = WS_INT32_TYPE; + fields2[0] = &f2[0]; + + memset( &f2[1], 0, sizeof(f2[1]) ); + f2[1].mapping = WS_ELEMENT_FIELD_MAPPING; + f2[1].localName = &str_s_b; + f2[1].ns = &ns; + f2[1].type = WS_INT32_TYPE; + f2[1].offset = FIELD_OFFSET(struct s, s_b); + f2[1].options = WS_FIELD_OPTIONAL; + fields2[1] = &f2[1]; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct s); + s2.alignment = TYPE_ALIGNMENT(struct s); + s2.fields = fields2; + s2.fieldCount = 2; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 3; + + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); + todo_wine ok( hr == S_OK, "got %#lx\n", hr ); + if (SUCCEEDED(hr)) + { + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); + } + WsFreeHeap( heap ); WsFreeReader( reader ); }

1 0

Nikolay Sivov : xmllite/tests: Use wide string literals.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: 416d1416a5461ba06109bf906c8c90aeb52a51e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=416d1416a5461ba06109bf90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:18:42 2022 +0300 xmllite/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 47 +++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d9c831fb52d..c4af39173a6 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1248,7 +1248,6 @@ static const char test_public_dtd[] = static void test_read_public_dtd(void) { - static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1299,8 +1298,8 @@ static void test_read_public_dtd(void) hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { - ok(len == lstrlenW(dtdnameW), "got %u\n", len); - ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + ok(len == 7, "got %u\n", len); + ok(!lstrcmpW(str, L"testdtd"), "got %s\n", wine_dbgstr_w(str)); } IXmlReader_Release(reader); } @@ -1311,7 +1310,6 @@ static const char test_system_dtd[] = static void test_read_system_dtd(void) { - static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; IXmlReader *reader; const WCHAR *str; XmlNodeType type; @@ -1352,8 +1350,8 @@ static void test_read_system_dtd(void) hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); todo_wine { - ok(len == lstrlenW(dtdnameW), "got %u\n", len); - ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); + ok(len == 7, "got %u\n", len); + ok(!lstrcmpW(str, L"testdtd"), "got %s\n", wine_dbgstr_w(str)); } read_node(reader, XmlNodeType_Comment); @@ -2550,16 +2548,7 @@ static void test_attribute_by_name(void) { static const char *xml = "<a><elem xmlns=\"myns\" a=\"value a\" b=\"value b\" xmlns:ns=\"ns uri\" " "ns:c=\"value c\" c=\"value c2\"/></a>"; - static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', - '2','0','0','0','/','x','m','l','n','s','/',0}; - static const WCHAR nsuriW[] = {'n','s',' ','u','r','i',0}; - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; - static const WCHAR mynsW[] = {'m','y','n','s',0}; - static const WCHAR nsW[] = {'n','s',0}; - static const WCHAR emptyW[] = {0}; - static const WCHAR aW[] = {'a',0}; - static const WCHAR bW[] = {'b',0}; - static const WCHAR cW[] = {'c',0}; + static const WCHAR xmlns_uriW[] = L"http://www.w3.org/2000/xmlns/"; IXmlReader *reader; HRESULT hr; @@ -2571,12 +2560,12 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); - hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); read_node(reader, XmlNodeType_Element); @@ -2587,43 +2576,43 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"", xmlns_uriW); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"myns"); - hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value a"); - hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); - hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW); + hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"ns", NULL); ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); - hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"ns uri"); - hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW); + hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value b"); - hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL); + hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c2"); - hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW); + hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); reader_value(reader, L"value c");

1 0

Huw Davies : wineoss: Remove some unused members.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: dbb2a75aeae42ef6d0c5d1d234066845dfab4594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb2a75aeae42ef6d0c5d1d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 07:38:42 2022 +0100 wineoss: Remove some unused members. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 439bc9e442c..03c329680e5 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -67,11 +67,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; unsigned char incoming[3]; unsigned char incPrev; char incLen; @@ -81,11 +79,9 @@ typedef struct { typedef struct { BOOL bEnabled; - DWORD bufsize; MIDIOPENDESC midiDesc; WORD wFlags; LPMIDIHDR lpQueueHdr; - DWORD dwTotalPlayed; void* lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ MIDIOUTCAPSW caps; } WINE_MIDIOUT; @@ -749,8 +745,6 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiInDev[wDevID].lpQueueHdr = NULL; - MidiInDev[wDevID].dwTotalPlayed = 0; - MidiInDev[wDevID].bufsize = 0x3FFF; MidiInDev[wDevID].midiDesc = *lpDesc; MidiInDev[wDevID].state = 0; MidiInDev[wDevID].incLen = 0; @@ -796,7 +790,6 @@ static DWORD midClose(WORD wDevID) } midiCloseSeq(); - MidiInDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; return ret; @@ -1130,8 +1123,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiOutDev[wDevID].lpQueueHdr = NULL; - MidiOutDev[wDevID].dwTotalPlayed = 0; - MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); @@ -1175,7 +1166,6 @@ static DWORD modClose(WORD wDevID) HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra); MidiOutDev[wDevID].lpExtra = 0; - MidiOutDev[wDevID].bufsize = 0; MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret;

1 0

Huw Davies : wineoss: Remove preprocessor checks for SNDCTL_SEQ_NRMIDIS.
by Alexandre Julliard 19 Apr '22

19 Apr '22

Module: wine Branch: master Commit: ce0904f4b22b377a73835c3a7304fb2bd82edbc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0904f4b22b377a73835c3a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 19 07:38:43 2022 +0100 wineoss: Remove preprocessor checks for SNDCTL_SEQ_NRMIDIS. It's been in the linux kernel since at least 2005 and in OSS's tree since at least 2008 (In both cases it's in the first commit in the respective repos). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 03c329680e5..1cf19b7be1a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -63,8 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifdef SNDCTL_SEQ_NRMIDIS - typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ MIDIOPENDESC midiDesc; @@ -1616,8 +1614,6 @@ static DWORD modReset(WORD wDevID) return MMSYSERR_NOERROR; } -#endif /* SNDCTL_SEQ_NRMIDIS */ - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -1631,7 +1627,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1660,11 +1655,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); -#else - case DRVM_INIT: - case MIDM_GETNUMDEVS: - return 0; -#endif default: TRACE("Unsupported message\n"); } @@ -1681,7 +1671,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef SNDCTL_SEQ_NRMIDIS case DRVM_INIT: return OSS_MidiInit(); case DRVM_EXIT: @@ -1712,11 +1701,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); -#else - case DRVM_INIT: - case MODM_GETNUMDEVS: - return 0; -#endif default: TRACE("Unsupported message\n"); }

1 0