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

Eric Pouech : include: Use Mingw64's __uuidof when present.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: wine Branch: master Commit: 4a1f1082e47ac0fddd6d4925636a557a593f3801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a1f1082e47ac0fddd6d4925… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon May 2 18:05:30 2022 +0200 include: Use Mingw64's __uuidof when present. otherwise Wine's and Mingw64's __uuidof() conflict (C++) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 912fcea0cbe..6f7e26df0c6 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -44,7 +44,10 @@ typedef struct _GUID /* Macros for __uuidof emulation */ #ifdef __cplusplus # if defined(__MINGW32__) -# define __WINE_UUID_ATTR __attribute__((selectany)) +# if !defined(__uuidof) /* Mingw64 can provide support for __uuidof and __CRT_UUID_DECL */ +# define __WINE_UUID_ATTR __attribute__((selectany)) +# undef __CRT_UUID_DECL +# endif # elif defined(__GNUC__) # define __WINE_UUID_ATTR __attribute__((visibility("hidden"),weak)) # endif @@ -76,7 +79,7 @@ extern "C++" { #define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid -#else /* __WINE_UUID_ATTR */ +#elif !defined(__CRT_UUID_DECL) #define __CRT_UUID_DECL(type,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove a inconsistent ref check.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: wine Branch: master Commit: 1805b2ff26c2a6b777eef7d7813d74807c716a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1805b2ff26c2a6b777eef7d7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu May 19 12:04:31 2022 +0200 windows.media.speech/tests: Remove a inconsistent ref check. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 33da6828dc2..e5dbc289840 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1135,7 +1135,6 @@ static void test_SpeechRecognizer(void) ok(!WaitForSingleObject(compilation_handler.event_finished, 5000), "Wait for event_finished failed.\n"); todo_wine ok(compilation_handler.ref == 3, "Got unexpected ref %lu.\n", compilation_handler.ref); - todo_wine check_refcount(operation, 3); handler = (void*)0xdeadbeef; old_ref = compilation_handler.ref;

1 0

Rémi Bernon : ntdll: Use block size helpers in heap_reallocate.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: wine Branch: master Commit: 61bc8abd1fa26861c43ed59097bb014a6ffd383c URL: https://source.winehq.org/git/wine.git/?a=commit;h=61bc8abd1fa26861c43ed590… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 17:27:25 2022 +0200 ntdll: Use block size helpers 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e3bfc3d37e7..6e64d0d7dfb 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1662,8 +1662,8 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size /* Check if we need to grow the block */ - old_data_size = (block->size & ARENA_SIZE_MASK); - old_size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes; + old_data_size = block_get_size( block ) - sizeof(*block); + old_size = block_get_size( block ) - block_get_overhead( block ); if (data_size > old_data_size) { if ((next = next_block( subheap, block )) && (block_get_flags( next ) & ARENA_FLAG_FREE) &&

1 0

Rémi Bernon : ntdll: Rename HEAP_FindFreeBlock size parameter.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: wine Branch: master Commit: eb931b84211aa034a8ee2f48578ab08c3ec8351e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb931b84211aa034a8ee2f48… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 19:52:22 2022 +0200 ntdll: Rename HEAP_FindFreeBlock size parameter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9036d71fa05..e3bfc3d37e7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1065,13 +1065,12 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, * Find a free block at least as large as the requested size, and make sure * the requested size is committed. */ -static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, - SUBHEAP **ppSubHeap ) +static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **ppSubHeap ) { SUBHEAP *subheap; struct list *ptr; SIZE_T total_size; - FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( size + sizeof(ARENA_INUSE) ); + FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( data_size + sizeof(ARENA_INUSE) ); /* Find a suitable free list, and in it find a block large enough */ @@ -1081,10 +1080,10 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, ARENA_FREE *pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); SIZE_T arena_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - if (arena_size >= size) + if (arena_size >= data_size) { subheap = find_subheap( heap, (struct block *)pArena, FALSE ); - if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, size )) return NULL; + if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, data_size )) return NULL; *ppSubHeap = subheap; return pArena; } @@ -1094,7 +1093,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, if (!(heap->flags & HEAP_GROWABLE)) { - WARN("Not enough space in heap %p for %08lx bytes\n", heap, size ); + 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 @@ -1102,8 +1101,8 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, * 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 = size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); - if (total_size < size) return NULL; /* overflow */ + total_size = data_size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); + if (total_size < data_size) return NULL; /* overflow */ if ((subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, max( heap->grow_size, total_size ) )))

1 0

Rémi Bernon : ntdll: Rename local variables in heap_allocate.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: wine Branch: master Commit: b20f466628af2fa9aaab46d920a75a9604bb8561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20f466628af2fa9aaab46d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 17:44:16 2022 +0200 ntdll: Rename local variables in heap_allocate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac994167f22..9036d71fa05 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1536,17 +1536,16 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret ) { - ARENA_FREE *pArena; - ARENA_INUSE *pInUse; + struct block *block; + struct entry *entry; + SIZE_T data_size; SUBHEAP *subheap; - SIZE_T rounded_size; - - rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE( flags ); - if (rounded_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; + data_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + if (data_size < size) return STATUS_NO_MEMORY; /* overflow */ + if (data_size < HEAP_MIN_DATA_SIZE) data_size = HEAP_MIN_DATA_SIZE; - if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE) + if (data_size >= HEAP_MIN_LARGE_BLOCK_SIZE) { if (!(*ret = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; return STATUS_SUCCESS; @@ -1554,29 +1553,29 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Locate a suitable free block */ - if (!(pArena = HEAP_FindFreeBlock( heap, rounded_size, &subheap ))) return STATUS_NO_MEMORY; + if (!(entry = HEAP_FindFreeBlock( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; /* Remove the arena from the free list */ - list_remove( &pArena->entry ); + list_remove( &entry->entry ); /* Build the in-use arena */ - pInUse = (ARENA_INUSE *)pArena; + block = (struct block *)entry; /* in-use arena is smaller than free arena, * so we have to add the difference to the size */ - pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - pInUse->magic = ARENA_INUSE_MAGIC; + block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(*entry) - sizeof(*block); + block->magic = ARENA_INUSE_MAGIC; /* Shrink the block */ - shrink_used_block( subheap, pInUse, rounded_size, size ); + shrink_used_block( subheap, block, data_size, size ); - notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY ); - initialize_block( pInUse + 1, size, pInUse->unused_bytes, flags ); + notify_alloc( block + 1, size, flags & HEAP_ZERO_MEMORY ); + initialize_block( block + 1, size, block->unused_bytes, flags ); - *ret = pInUse + 1; + *ret = block + 1; return STATUS_SUCCESS; }

1 0

Rémi Bernon : ntdll: Ignore back pointer when validating free block pattern.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: wine Branch: master Commit: 2815c117bcfefe4889b35701734435d578772af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2815c117bcfefe4889b35701… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 19 09:13:20 2022 +0200 ntdll: Ignore back pointer when validating free block pattern. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 44c9ad53196..e4a307bd23a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1182,6 +1182,7 @@ static BOOL validate_free_block( const SUBHEAP *subheap, const struct block *blo if (!err && (flags & HEAP_FREE_CHECKING_ENABLED)) { const char *ptr = (char *)(entry + 1), *end = (char *)block + block_get_size( block ); + if (next) end -= sizeof(struct block *); if (end > commit_end) end = commit_end; while (!err && ptr < end) {

1 0

Francois Gouget : testbot/orm: Let AddFilter() create the Collection Filter field.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: tools Branch: master Commit: 51f70445d2ad8f6eea0df46fda02e45fe8d208d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51f70445d2ad8f6eea0df46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 19 19:14:39 2022 +0200 testbot/orm: Let AddFilter() create the Collection Filter field. All that initializing Filter in the constructor does is waste memory. Documenting its existence there is enough. Furthermore Clone() shouldn't have been setting it to an empty hashref. Fortunately a typo made this ineffectual. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index bec5b1c..4e7a032 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -91,7 +91,7 @@ sub new($$$$$;$$@) MasterColNames => $MasterColNames, MasterColValues => $MasterColValues, MasterKey => ComputeMasterKey($MasterColValues), - Filter => undef, + # Filter => undef by default AllScopeItems => $AllScopeItems || {}, Items => undef}; if ($AllScopeItems) @@ -136,7 +136,7 @@ sub Clone($) MasterColNames => $self->{MasterColNames}, MasterColValues => $self->{MasterColValues}, MasterKey => $self->{MasterKey}, - Filters => {}, + # Filter => undef by default AllScopeItems => $self->{AllScopeItems}, Items => undef}; # See Collection::new()

1 0

Francois Gouget : testbot/orm: Let the Collection Items field pop into existence when needed.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: tools Branch: master Commit: 9ee451bf6f647490636c526710e16621907f6c16 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9ee451bf6f647490636c526… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 19 19:14:52 2022 +0200 testbot/orm: Let the Collection Items field pop into existence when needed. Collections don't check that it exists so all setting it in the constructor does is waste memory. Documenting its existence there is enough. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 4e7a032..63d470b 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -93,7 +93,8 @@ sub new($$$$$;$$@) MasterKey => ComputeMasterKey($MasterColValues), # Filter => undef by default AllScopeItems => $AllScopeItems || {}, - Items => undef}; + # Items => undef by default + }; if ($AllScopeItems) { # Avoid memory cycles in case Items have Detailref properties: @@ -138,7 +139,8 @@ sub Clone($) MasterKey => $self->{MasterKey}, # Filter => undef by default AllScopeItems => $self->{AllScopeItems}, - Items => undef}; + # Items => undef by default + }; # See Collection::new() weaken($Copy->{AllScopeItems});

1 0

Francois Gouget : testbot/orm: Remove the $ColPrefix BuildKeyWhere() parameter.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: tools Branch: master Commit: e2614f1495ae61213819b20da09be56147019b2b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e2614f1495ae61213819b20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 19 19:14:14 2022 +0200 testbot/orm: Remove the $ColPrefix BuildKeyWhere() parameter. It is unused. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 10cc1f3..dc527d4 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -132,9 +132,9 @@ sub FromDb($$$) return $Value; } -sub BuildKeyWhere($$$$) +sub BuildKeyWhere($$$) { - my ($self, $PropertyDescriptors, $ColPrefix, $Where) = @_; + my ($self, $PropertyDescriptors, $Where) = @_; foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { @@ -146,7 +146,7 @@ sub BuildKeyWhere($$$$) { $Where .= " AND "; } - $Where .= $ColPrefix . $ColName . " = ?"; + $Where .= "$ColName = ?"; } } } @@ -363,8 +363,7 @@ sub LoadItem($$$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), "", - $Where); + $Where = $self->BuildKeyWhere($Collection->GetPropertyDescriptors(), $Where); push @Data, $Collection->SplitKey($RequestedKey); my $Query = "SELECT $Fields FROM " . $Collection->GetTableName(); @@ -480,7 +479,7 @@ sub BuildUpdateStatement($$$$) { $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; } - $Where = $self->BuildKeyWhere($PropertyDescriptors, "", $Where); + $Where = $self->BuildKeyWhere($PropertyDescriptors, $Where); return "UPDATE $TableName SET $Fields WHERE $Where"; } @@ -606,8 +605,7 @@ sub DeleteItem($$) $Where = join(" = ? AND ", @{$MasterColNames}) . " = ?"; push @Data, @{$MasterColValues}; } - $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), "", - $Where); + $Where = $self->BuildKeyWhere($Item->GetPropertyDescriptors(), $Where); push @Data, $Item->GetKeyComponents(); my $Statement = $self->GetDb()->prepare("DELETE FROM " .

1 0

Francois Gouget : testbot/cgi: In case of insufficient privileges redirect to the main page.
by Alexandre Julliard May 19, 2022

May 19, 2022

Module: tools Branch: master Commit: 22baa974532565ff19effa4acf39b930556c8da2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=22baa974532565ff19effa4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 19 19:13:58 2022 +0200 testbot/cgi: In case of insufficient privileges redirect to the main page. There is no point asking already logged in users to log in again if they don't have enough privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index a4d1ebe..c42a4f2 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -88,12 +88,15 @@ sub new($$$$@) { $self->CheckSecurePage(); my $Session = $self->GetCurrentSession(); - if (! defined($Session) || - ! $Session->User->HasRole($RequiredRole)) + if (!defined $Session) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); exit($self->Redirect(MakeSecureURL($LoginURL))); } + elsif (!$Session->User->HasRole($RequiredRole)) + { + exit($self->Redirect("/")); + } } $self->_initialize(@_);

1 0