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

Matteo Bruni : d3dx9/tests: Test D3DXAssembleShader() with both terminated and not terminated include data.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 0c7090a1daa255f60d6b0b17f6df5f64dd4021a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7090a1daa255f60d6b0b17… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 30 19:37:21 2022 +0200 d3dx9/tests: Test D3DXAssembleShader() with both terminated and not terminated include data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/asm.c | 176 ++++++++++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c7090a1daa255f60d6b…

1 0

Rémi Bernon : ntdll: Use next_block helper in heap_reallocate.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 90f766fa760433c9e7762f2c4e68fe6eb2e95f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f766fa760433c9e7762f2c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 1 20:23:27 2022 +0200 ntdll: Use next_block helper in heap_reallocate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0142328e978..374b4e1f209 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1683,7 +1683,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size oldActualSize = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; if (rounded_size > oldBlockSize) { - char *pNext = (char *)(pArena + 1) + oldBlockSize; + struct block *next; if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE && (flags & HEAP_GROWABLE)) { @@ -1694,14 +1694,14 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size HEAP_MakeInUseBlockFree( subheap, pArena ); return STATUS_SUCCESS; } - if ((pNext < (char *)subheap->base + subheap->size) && - (*(DWORD *)pNext & ARENA_FLAG_FREE) && - (oldBlockSize + (*(DWORD *)pNext & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) >= rounded_size)) + + if ((next = next_block( subheap, pArena )) && (block_get_flags( next ) & ARENA_FLAG_FREE) && + (oldBlockSize + block_get_size( next ) >= rounded_size)) { /* The next block is free and large enough */ - ARENA_FREE *pFree = (ARENA_FREE *)pNext; - list_remove( &pFree->entry ); - pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); + struct entry *entry = (struct entry *)next; + list_remove( &entry->entry ); + pArena->size += block_get_size( next ); if (!HEAP_Commit( subheap, pArena, rounded_size )) return STATUS_NO_MEMORY; notify_realloc( pArena + 1, oldActualSize, size ); HEAP_ShrinkBlock( subheap, pArena, rounded_size );

1 0

Rémi Bernon : ntdll: Check that ptr is in committed blocks in find_subheap.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 39697a2c007026356f143379c2fe875722e46f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=39697a2c007026356f143379… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 21:12:15 2022 +0200 ntdll: Check that ptr is in committed blocks in find_subheap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5174fe99fc3..0142328e978 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -614,15 +614,17 @@ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL la } -static SUBHEAP *find_subheap( const HEAP *heap, const void *ptr ) +static SUBHEAP *find_subheap( const HEAP *heap, const struct block *block, BOOL heap_walk ) { SUBHEAP *subheap; LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { + SIZE_T blocks_size = (char *)last_block( subheap ) - (char *)first_block( subheap ); if (!check_subheap( subheap )) return NULL; - if (contains( subheap_base( subheap ), subheap_size( subheap ), ptr, sizeof(struct block) )) - return subheap; + if (contains( first_block( subheap ), blocks_size, block, sizeof(*block) )) return subheap; + /* outside of blocks region, possible corruption or heap_walk */ + if (contains( subheap_base( subheap ), subheap_size( subheap ), block, 0 )) return heap_walk ? subheap : NULL; } return NULL; @@ -760,7 +762,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) mark_block_free( pArena + 1, pArena->size & ARENA_SIZE_MASK, heap->flags ); if (!prev) return; pArena = prev; - subheap = find_subheap( heap, pArena ); + subheap = find_subheap( heap, pArena, FALSE ); } /* Check if we can merge with previous block */ @@ -1097,7 +1099,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); if (arena_size >= size) { - subheap = find_subheap( heap, pArena ); + subheap = find_subheap( heap, (struct block *)pArena, FALSE ); if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, size )) return NULL; *ppSubHeap = subheap; return pArena; @@ -1145,9 +1147,7 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) const SUBHEAP *subheap; unsigned int i; - if (!(subheap = find_subheap( heap, block ))) return FALSE; - if ((char *)block >= (char *)subheap->base + subheap->headerSize) return TRUE; - if (subheap != &heap->subheap) return FALSE; + if ((subheap = find_subheap( heap, block, FALSE ))) return TRUE; for (i = 0; i < HEAP_NB_FREE_LISTS; i++) if (block == (struct block *)&heap->freeList[i].arena) return TRUE; return FALSE; } @@ -1155,7 +1155,6 @@ static BOOL is_valid_free_block( const HEAP *heap, const struct block *block ) static BOOL validate_free_block( const SUBHEAP *subheap, const struct block *block ) { const char *err = NULL, *base = subheap_base( subheap ), *commit_end = subheap_commit_end( subheap ); - SIZE_T blocks_size = (char *)last_block( subheap ) - (char *)first_block( subheap ); const struct entry *entry = (struct entry *)block; const struct block *prev, *next; HEAP *heap = subheap->heap; @@ -1163,8 +1162,6 @@ static BOOL validate_free_block( const SUBHEAP *subheap, const struct block *blo if ((ULONG_PTR)(block + 1) % ALIGNMENT) err = "invalid block alignment"; - else if (!contains( first_block( subheap ), blocks_size, block, sizeof(*block) )) - err = "invalid block pointer"; else if (block_get_type( block ) != ARENA_FREE_MAGIC) err = "invalid block header"; else if (!(block_get_flags( block ) & ARENA_FLAG_FREE) || (block_get_flags( block ) & ARENA_FLAG_PREV_FREE)) @@ -1211,7 +1208,6 @@ static BOOL validate_free_block( const SUBHEAP *subheap, const struct block *blo static BOOL validate_used_block( const SUBHEAP *subheap, const struct block *block ) { const char *err = NULL, *base = subheap_base( subheap ), *commit_end = subheap_commit_end( subheap ); - SIZE_T blocks_size = (char *)last_block( subheap ) - (char *)first_block( subheap ); const HEAP *heap = subheap->heap; DWORD flags = heap->flags; const struct block *next; @@ -1219,8 +1215,6 @@ static BOOL validate_used_block( const SUBHEAP *subheap, const struct block *blo if ((ULONG_PTR)(block + 1) % ALIGNMENT) err = "invalid block alignment"; - else if (!contains( first_block( subheap ), blocks_size, block, sizeof(*block) )) - err = "invalid block pointer"; else if (block_get_type( block ) != ARENA_INUSE_MAGIC && block_get_type( block ) != ARENA_PENDING_MAGIC) err = "invalid block header"; else if (block_get_flags( block ) & ARENA_FLAG_FREE) @@ -1272,12 +1266,11 @@ static BOOL heap_validate_ptr( const HEAP *heap, const void *ptr, SUBHEAP **subh const struct block *arena = (struct block *)ptr - 1; const ARENA_LARGE *large_arena; - if (!(*subheap = find_subheap( heap, arena )) || - ((const char *)arena < (char *)(*subheap)->base + (*subheap)->headerSize)) + if (!(*subheap = find_subheap( heap, arena, FALSE ))) { if (!(large_arena = find_large_block( heap, ptr ))) { - if (WARN_ON(heap)) WARN("heap %p, ptr %p is not inside heap\n", heap, ptr ); + if (WARN_ON(heap)) WARN("heap %p, ptr %p: block region not found\n", heap, ptr ); return FALSE; } @@ -1325,7 +1318,6 @@ static inline struct block *unsafe_block_from_ptr( const HEAP *heap, const void { struct block *block = (struct block *)ptr - 1; const char *err = NULL, *base, *commit_end; - SIZE_T blocks_size; if (heap->flags & HEAP_VALIDATE) { @@ -1333,11 +1325,10 @@ static inline struct block *unsafe_block_from_ptr( const HEAP *heap, const void return block; } - if ((*subheap = find_subheap( heap, block ))) + if ((*subheap = find_subheap( heap, block, FALSE ))) { base = subheap_base( *subheap ); commit_end = subheap_commit_end( *subheap ); - blocks_size = (char *)last_block( *subheap ) - (char *)first_block( *subheap ); } if (!*subheap) @@ -1347,8 +1338,6 @@ static inline struct block *unsafe_block_from_ptr( const HEAP *heap, const void } else if ((ULONG_PTR)ptr % ALIGNMENT) err = "invalid ptr alignment"; - else if (!contains( first_block( *subheap ), blocks_size, block, sizeof(*block) )) - err = "invalid block pointer"; else if (block_get_type( block ) == ARENA_PENDING_MAGIC || (block_get_flags( block ) & ARENA_FLAG_FREE)) err = "already freed block"; else if (block_get_type( block ) != ARENA_INUSE_MAGIC) @@ -1975,7 +1964,7 @@ static NTSTATUS heap_walk( const HEAP *heap, struct rtl_heap_entry *entry ) if ((large = find_large_block( heap, entry->lpData ))) next = &large->entry; - else if ((subheap = find_subheap( heap, entry->lpData ))) + else if ((subheap = find_subheap( heap, entry->lpData, TRUE ))) { if (!(status = heap_walk_blocks( heap, subheap, entry ))) return STATUS_SUCCESS; else if (status != STATUS_NO_MORE_ENTRIES) return status;

1 0

Matteo Bruni : d3dx9/mesh: Make use of more proper types.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 8537db02390948a2fb951f814018cb7b1caed449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8537db02390948a2fb951f81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 26 06:09:13 2022 +0200 d3dx9/mesh: Make use of more proper types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 450 +++++++++++++++++++++++++++------------------------ 1 file changed, 237 insertions(+), 213 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8537db02390948a2fb95…

1 0

Matteo Bruni : d3dcompiler/asm: Parse negative numbers with a whitespace after the sign.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: bc3a69f2af93907b2e382bdc793cc9db4beb1690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc3a69f2af93907b2e382bdc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 21:55:00 2022 +0200 d3dcompiler/asm: Parse negative numbers with a whitespace after the sign. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/asmshader.l | 2 +- dlls/d3dcompiler_43/asmshader.y | 43 ++++++++++++++++++++++++++++++++--------- dlls/d3dcompiler_43/tests/asm.c | 28 ++++++++++++++++++++------- 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.l b/dlls/d3dcompiler_43/asmshader.l index 63ecddd1899..81718556787 100644 --- a/dlls/d3dcompiler_43/asmshader.l +++ b/dlls/d3dcompiler_43/asmshader.l @@ -96,7 +96,7 @@ NEWLINE (\n)|(\r\n) COMMA "," -IMMVAL \-?(([0-9]+\.?)|([0-9]*\.[0-9]+))(f)? +IMMVAL (([0-9]+\.?)|([0-9]*\.[0-9]+))(f)? ANY (.) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 00c98b1dbc3..cdc75c18a3e 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -304,6 +304,8 @@ int asmshader_lex(void); %type <rel_reg> rel_reg %type <reg> predicate %type <immval> immsum +%type <immval> signed_integer +%type <immval> signed_float %type <sregs> sregs %% @@ -713,11 +715,11 @@ instruction: INSTR_ADD omods dreg ',' sregs asm_ctx.line_no); set_parse_status(&asm_ctx.status, PARSE_WARN); } - | INSTR_DEF REG_CONSTFLOAT ',' IMMVAL ',' IMMVAL ',' IMMVAL ',' IMMVAL + | INSTR_DEF REG_CONSTFLOAT ',' signed_float ',' signed_float ',' signed_float ',' signed_float { asm_ctx.funcs->constF(&asm_ctx, $2, $4.val, $6.val, $8.val, $10.val); } - | INSTR_DEFI REG_CONSTINT ',' IMMVAL ',' IMMVAL ',' IMMVAL ',' IMMVAL + | INSTR_DEFI REG_CONSTINT ',' signed_integer ',' signed_integer ',' signed_integer ',' signed_integer { asm_ctx.funcs->constI(&asm_ctx, $2, $4.val, $6.val, $8.val, $10.val); } @@ -1387,23 +1389,46 @@ rel_reg: /* empty */ $$.swizzle = $5; } -immsum: IMMVAL +immsum: signed_integer + | immsum '+' signed_integer { - if(!$1.integer) { + $$.val = $1.val + $3.val; + } + | immsum '-' signed_integer + { + $$.val = $1.val - $3.val; + } + +signed_integer: + IMMVAL + { + if (!$1.integer) + { asmparser_message(&asm_ctx, "Line %u: Unexpected float %f\n", - asm_ctx.line_no, $1.val); + asm_ctx.line_no, $1.val); set_parse_status(&asm_ctx.status, PARSE_ERR); } $$.val = $1.val; } - | immsum '+' IMMVAL + | '-' IMMVAL { - if(!$3.integer) { + if (!$2.integer) + { asmparser_message(&asm_ctx, "Line %u: Unexpected float %f\n", - asm_ctx.line_no, $3.val); + asm_ctx.line_no, $2.val); set_parse_status(&asm_ctx.status, PARSE_ERR); } - $$.val = $1.val + $3.val; + $$.val = -$2.val; + } + +signed_float: + IMMVAL + { + $$.val = $1.val; + } + | '-' IMMVAL + { + $$.val = -$2.val; } smod: SMOD_BIAS diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 25471b51673..df686b9378c 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -34,7 +34,6 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena struct shader_test { const char *text; const DWORD bytes[128]; - BOOL todo; }; static void dump_shader(DWORD *shader) { @@ -60,7 +59,6 @@ static void exec_tests(const char *name, struct shader_test tests[], unsigned in messages = NULL; hr = D3DAssemble(tests[i].text, strlen(tests[i].text), NULL, NULL, NULL, D3DCOMPILE_SKIP_VALIDATION, &shader, &messages); - todo_wine_if(tests[i].todo) ok(hr == S_OK, "Test %s, shader %u: D3DAssemble failed with error %#lx - %ld.\n", name, i, hr, hr & 0xffff); if(messages) { trace("D3DAssemble messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); @@ -214,7 +212,6 @@ static void vs_1_1_test(void) { "def c12, 0, -1, -0.5, 1024\n", {0xfffe0101, 0x00000051, 0xa00f000c, 0x00000000, 0xbf800000, 0xbf000000, 0x44800000, 0x0000ffff}, - TRUE }, { /* shader 14: writemasks, swizzles */ "vs_1_1\n" @@ -758,12 +755,11 @@ static void vs_2_0_test(void) { }, { /* shader 22 */ "vs_2_0\n" - "defi i0, -1, 1, 10, 0\n" + "defi i0, - 1, 1, 10, 0\n" "defi i1, 0, 40, 30, 10\n", {0xfffe0200, 0x05000030, 0xf00f0000, 0xffffffff, 0x00000001, 0x0000000a, 0x00000000, 0x05000030, 0xf00f0001, 0x00000000, 0x00000028, 0x0000001e, 0x0000000a, 0x0000ffff}, - TRUE }, { /* shader 23 */ "vs_2_0\n" @@ -976,7 +972,6 @@ static void ps_2_x_test(void) { {0xffff0201, 0x05000030, 0xf00f0000, 0xffffffff, 0x00000001, 0x0000000a, 0x00000000, 0x05000030, 0xf00f0001, 0x00000000, 0x00000028, 0x0000001e, 0x0000000a, 0x0000ffff}, - TRUE }, { /* shader 2 */ "ps_2_x\n" @@ -1177,7 +1172,12 @@ static void vs_3_0_test(void) { {0xfffe0300, 0x04000002, 0x800f0000, 0x90e42014, 0xf0e40800, 0x80e40002, 0x0000ffff} }, - + { /* shader 15 */ + "vs.3.0\n" + "add r0, v0[aL + 1 + 3], r2\n", + {0xfffe0300, 0x04000002, 0x800f0000, 0x90e42004, 0xf0e40800, 0x80e40002, + 0x0000ffff} + }, }; exec_tests("vs_3_0", tests, ARRAY_SIZE(tests)); @@ -1408,6 +1408,20 @@ static void failure_test(void) { /* shader 43: */ "ps_2_0\n" "texm3x3vspec t3, t0\n", + /* shader 44: expression in defi not allowed */ + "vs_2_0\n" + "defi i0, -1 - 1, 1, 10, 0\n" + "defi i1, 0, 40, 30, 10\n", + /* shader 45: '-' not allowed inside relative addressing operands */ + "vs.3.0\n" + "add r0, v0[aL - 3 + 5], r2\n", + /* shader 46: float constants in defi */ + "vs_2_0\n" + "defi i0, 1.0, 1.1, 10.2, 0.3\n" + "defi i1, 0, 40, 30, 10\n", + /* shader 47: double '-' sign */ + "vs.3.0\n" + "defi c0, -1, --1, 0, 0\n", }; HRESULT hr; unsigned int i;

1 0

Rémi Bernon : ntdll: Remove unused QUIET/NOISY constants and parameters.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 06681774af6de0ee1c546f779c70149ec13a625a URL: https://source.winehq.org/git/wine.git/?a=commit;h=06681774af6de0ee1c546f77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 21:12:00 2022 +0200 ntdll: Remove unused QUIET/NOISY constants and parameters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a23ab1a4c95..85964d04a59 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -127,9 +127,6 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define ROUND_SIZE(size) ((((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + ARENA_OFFSET) -#define QUIET 1 /* Suppress messages */ -#define NOISY 0 /* Report all errors */ - /* minimum data size (without arenas) of an allocated block */ /* make sure that it's larger than a free list entry */ #define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) @@ -289,7 +286,7 @@ static inline BOOL check_subheap( const SUBHEAP *subheap ) return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); } -static BOOL heap_validate( HEAP *heap, BOOL quiet ); +static BOOL heap_validate( HEAP *heap ); /* mark a block of memory as free for debugging purposes */ static inline void mark_block_free( void *ptr, SIZE_T size, DWORD flags ) @@ -579,7 +576,7 @@ static HEAP *HEAP_GetPtr( if (heapPtr->flags & HEAP_VALIDATE_ALL) { heap_lock( heapPtr, 0 ); - valid = heap_validate( heapPtr, NOISY ); + valid = heap_validate( heapPtr ); heap_unlock( heapPtr, 0 ); if (!valid && TRACE_ON(heap)) @@ -1290,7 +1287,7 @@ static BOOL heap_validate_ptr( const HEAP *heap, const void *ptr, SUBHEAP **subh return validate_used_block( *subheap, arena ); } -static BOOL heap_validate( HEAP *heap, BOOL quiet ) +static BOOL heap_validate( HEAP *heap ) { const ARENA_LARGE *large_arena; const SUBHEAP *subheap; @@ -1930,7 +1927,7 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE heap, ULONG flags, const void *ptr ) { heap_lock( heapPtr, flags ); if (ptr) ret = heap_validate_ptr( heapPtr, ptr, &subheap ); - else ret = heap_validate( heapPtr, QUIET ); + else ret = heap_validate( heapPtr ); heap_unlock( heapPtr, flags ); }

1 0

Rémi Bernon : ntdll: Use block helpers to iterate blocks in heap_validate.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 3001a2ff3195af788ce0fa13d2fa96a830ea072a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3001a2ff3195af788ce0fa13… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:38:18 2022 +0200 ntdll: Use block helpers to iterate blocks in heap_validate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 85964d04a59..b11218bc7a6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -286,7 +286,7 @@ static inline BOOL check_subheap( const SUBHEAP *subheap ) return contains( base, subheap->size, base + subheap->headerSize, subheap->commitSize - subheap->headerSize ); } -static BOOL heap_validate( HEAP *heap ); +static BOOL heap_validate( const HEAP *heap ); /* mark a block of memory as free for debugging purposes */ static inline void mark_block_free( void *ptr, SIZE_T size, DWORD flags ) @@ -1287,15 +1287,14 @@ static BOOL heap_validate_ptr( const HEAP *heap, const void *ptr, SUBHEAP **subh return validate_used_block( *subheap, arena ); } -static BOOL heap_validate( HEAP *heap ) +static BOOL heap_validate( const HEAP *heap ) { const ARENA_LARGE *large_arena; + const struct block *block; const SUBHEAP *subheap; LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { - char *ptr = (char *)subheap->base + subheap->headerSize; - if (!check_subheap( subheap )) { ERR( "heap %p, subheap %p corrupted sizes\n", heap, subheap ); @@ -1303,17 +1302,15 @@ static BOOL heap_validate( HEAP *heap ) return FALSE; } - while (ptr < (char *)subheap->base + subheap->size) + for (block = first_block( subheap ); block; block = next_block( subheap, block )) { - if (*(DWORD *)ptr & ARENA_FLAG_FREE) + if (block_get_flags( block ) & ARENA_FLAG_FREE) { - if (!validate_free_block( subheap, (ARENA_INUSE *)ptr )) return FALSE; - ptr += sizeof(ARENA_FREE) + (*(DWORD *)ptr & ARENA_SIZE_MASK); + if (!validate_free_block( subheap, block )) return FALSE; } else { - if (!validate_used_block( subheap, (ARENA_INUSE *)ptr )) return FALSE; - ptr += sizeof(ARENA_INUSE) + (*(DWORD *)ptr & ARENA_SIZE_MASK); + if (!validate_used_block( subheap, block )) return FALSE; } } }

1 0

Rémi Bernon : ntdll: Use next_block helper to iterate in heap_set_debug_flags.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 8fc51f3c2188239ae66935472ef804db525310fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fc51f3c2188239ae6693547… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:39:00 2022 +0200 ntdll: Use next_block helper to iterate in heap_set_debug_flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b11218bc7a6..5174fe99fc3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1405,37 +1405,28 @@ static void heap_set_debug_flags( HANDLE handle ) if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { - SUBHEAP *subheap; + struct block *block; ARENA_LARGE *large; + SUBHEAP *subheap; LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { - char *ptr = (char *)subheap->base + subheap->headerSize; - char *end = (char *)subheap->base + subheap->commitSize; + const char *commit_end = subheap_commit_end( subheap ); if (!check_subheap( subheap )) break; - while (ptr < end) + for (block = first_block( subheap ); block; block = next_block( subheap, block )) { - ARENA_INUSE *arena = (ARENA_INUSE *)ptr; - SIZE_T size = arena->size & ARENA_SIZE_MASK; - if (arena->size & ARENA_FLAG_FREE) + if (block_get_flags( block ) & ARENA_FLAG_FREE) { - SIZE_T count = size; - - ptr += sizeof(ARENA_FREE) + size; - if (ptr >= end) count = end - (char *)((ARENA_FREE *)arena + 1); - else count -= sizeof(ARENA_FREE *); - mark_block_free( (ARENA_FREE *)arena + 1, count, flags ); + char *data = (char *)block + block_get_overhead( block ), *end = (char *)block + block_get_size( block ); + if (end >= commit_end) mark_block_free( data, commit_end - data, flags ); + else mark_block_free( data, end - sizeof(struct block *) - data, flags ); } else { - if (arena->magic == ARENA_PENDING_MAGIC) - mark_block_free( arena + 1, size, flags ); - else - mark_block_tail( (char *)(arena + 1) + size - arena->unused_bytes, - arena->unused_bytes, flags ); - ptr += sizeof(ARENA_INUSE) + size; + if (block_get_type( block ) == ARENA_PENDING_MAGIC) mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), flags ); + else mark_block_tail( (char *)block + block_get_size( block ) - block->unused_bytes, block->unused_bytes, flags ); } } }

1 0

Matteo Bruni : d3dx9/shader: Use more proper integer types.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 90b0ef658cf6be54a3cf90dd874fa551c0d4da14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90b0ef658cf6be54a3cf90dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 26 10:56:54 2022 +0200 d3dx9/shader: Use more proper integer types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index eae01674c0a..e4cd6d8c10e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2695,7 +2695,7 @@ static HRESULT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semant D3DDECLUSAGE_FOG, D3DDECLUSAGE_PSIZE }; - DWORD reg_type, usage, index, version_token = *byte_code; + uint32_t reg_type, usage, index, version_token = *byte_code; BOOL is_ps = version_token >> 16 == 0xffff; unsigned int major, minor, i = 0, j; BYTE colors = 0, rastout = 0; @@ -2717,8 +2717,8 @@ static HRESULT get_shader_semantics(const DWORD *byte_code, D3DXSEMANTIC *semant { if (has_dcl && (*byte_code & 0xffff) == D3DSIO_DCL) { - DWORD usage_token = byte_code[1]; - DWORD reg = byte_code[2]; + uint32_t usage_token = byte_code[1]; + uint32_t reg = byte_code[2]; reg_type = ((reg & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | ((reg & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2);

1 0

Zhiyi Zhang : maintainers: Add myself to some sections.
by Alexandre Julliard May 17, 2022

May 17, 2022

Module: wine Branch: master Commit: 7149c0157367762ff0b4482ef3faafb7102d01f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7149c0157367762ff0b4482e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:20:06 2022 +0800 maintainers: Add myself to some sections. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b012f3c4e09..f532c2eb570 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -50,6 +50,7 @@ F: dlls/xaudio*/ Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Zhiyi Zhang <zzhang(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog @@ -278,6 +279,11 @@ P: Huw Davies <huw(a)codeweavers.com> P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 +Theming +M: Zhiyi Zhang <zzhang(a)codeweavers.com> +F: dlls/light.msstyles/ +F: dlls/uxtheme/ + TWAIN P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ @@ -363,6 +369,7 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Rémi Bernon <rbernon(a)codeweavers.com> +P: Zhiyi Zhang <zzhang(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing

1 0