wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

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

19 May '22

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 19 May '22

19 May '22

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: Rename local variables in heap_reallocate.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: a3acd635817f62532dae62bc55dcfd9355c8e16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3acd635817f62532dae62bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 17:30:17 2022 +0200 ntdll: Rename local variables 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 | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d0f547faee7..ac994167f22 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1646,17 +1646,16 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *pt static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size, void **ret ) { - struct block *next; - ARENA_INUSE *pArena; + SIZE_T old_data_size, old_size, data_size; + struct block *next, *block; SUBHEAP *subheap; - SIZE_T oldBlockSize, oldActualSize, rounded_size; NTSTATUS status; - 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 (!(pArena = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; + if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) { if (!(*ret = realloc_large_block( heap, flags, ptr, size ))) return STATUS_NO_MEMORY; @@ -1665,49 +1664,46 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size /* Check if we need to grow the block */ - oldBlockSize = (pArena->size & ARENA_SIZE_MASK); - oldActualSize = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; - if (rounded_size > oldBlockSize) + old_data_size = (block->size & ARENA_SIZE_MASK); + old_size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes; + if (data_size > old_data_size) { - if ((next = next_block( subheap, pArena )) && (block_get_flags( next ) & ARENA_FLAG_FREE) && - rounded_size < HEAP_MIN_LARGE_BLOCK_SIZE && rounded_size <= oldBlockSize + block_get_size( next )) + if ((next = next_block( subheap, block )) && (block_get_flags( next ) & ARENA_FLAG_FREE) && + data_size < HEAP_MIN_LARGE_BLOCK_SIZE && data_size <= old_data_size + block_get_size( next )) { /* The next block is free and large enough */ 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 ); - shrink_used_block( subheap, pArena, rounded_size, size ); + block->size += block_get_size( next ); + if (!HEAP_Commit( subheap, block, data_size )) return STATUS_NO_MEMORY; + notify_realloc( block + 1, old_size, size ); + shrink_used_block( subheap, block, data_size, size ); } else { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, size, ret ))) return status; - memcpy( *ret, pArena + 1, oldActualSize ); - if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + oldActualSize, 0, size - oldActualSize ); - notify_free( pArena + 1 ); - HEAP_MakeInUseBlockFree( subheap, pArena ); + memcpy( *ret, block + 1, old_size ); + if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); + notify_free( ptr ); + HEAP_MakeInUseBlockFree( subheap, block ); return STATUS_SUCCESS; } } else { - notify_realloc( pArena + 1, oldActualSize, size ); - shrink_used_block( subheap, pArena, rounded_size, size ); + notify_realloc( block + 1, old_size, size ); + shrink_used_block( subheap, block, data_size, size ); } /* Clear the extra bytes if needed */ - if (size > oldActualSize) - initialize_block( (char *)(pArena + 1) + oldActualSize, size - oldActualSize, - pArena->unused_bytes, flags ); - else - mark_block_tail( (char *)(pArena + 1) + size, pArena->unused_bytes, flags ); + if (size <= old_size) mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); + else initialize_block( (char *)(block + 1) + old_size, size - old_size, block->unused_bytes, flags ); /* Return the new arena */ - *ret = pArena + 1; + *ret = block + 1; return STATUS_SUCCESS; }

1 0

Rémi Bernon : ntdll: Use block helpers in subheap_notify_free_all.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 9325bfada79b96fb1bd9de23499b33d5e681079d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9325bfada79b96fb1bd9de23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:33:32 2022 +0200 ntdll: Use block helpers in subheap_notify_free_all. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e4a307bd23a..d0f547faee7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -383,29 +383,18 @@ static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size #endif } -static void subheap_notify_free_all(SUBHEAP const *subheap) +static void notify_free_all( SUBHEAP *subheap ) { #ifdef VALGRIND_FREELIKE_BLOCK - char const *ptr = (char const *)subheap->base + subheap->headerSize; + struct block *block; if (!RUNNING_ON_VALGRIND) return; if (!check_subheap( subheap )) return; - while (ptr < (char const *)subheap->base + subheap->size) + for (block = first_block( subheap ); block; block = next_block( subheap, block )) { - if (*(const DWORD *)ptr & ARENA_FLAG_FREE) - { - ARENA_FREE const *pArena = (ARENA_FREE const *)ptr; - if (pArena->magic!=ARENA_FREE_MAGIC) ERR("bad free_magic @%p\n", pArena); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - } - else - { - ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; - if (pArena->magic == ARENA_INUSE_MAGIC) notify_free(pArena + 1); - else if (pArena->magic != ARENA_PENDING_MAGIC) ERR("bad inuse_magic @%p\n", pArena); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - } + if (block_get_flags( block ) & ARENA_FLAG_FREE) continue; + if (block_get_type( block ) == ARENA_INUSE_MAGIC) notify_free( block + 1 ); } #endif } @@ -1531,13 +1520,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) LIST_FOR_EACH_ENTRY_SAFE( subheap, next, &heapPtr->subheap_list, SUBHEAP, entry ) { if (subheap == &heapPtr->subheap) continue; /* do this one last */ - subheap_notify_free_all(subheap); + notify_free_all( subheap ); list_remove( &subheap->entry ); size = 0; addr = subheap->base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - subheap_notify_free_all(&heapPtr->subheap); + notify_free_all( &heapPtr->subheap ); RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); size = 0; addr = heapPtr->subheap.base;

1 0

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

19 May '22

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

Alistair Leslie-Hughes : dwmapi: Clear DWM_TIMING_INFO structure before returning.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 034b7e306e91ef6429168b70fab39e2646a97a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=034b7e306e91ef6429168b70… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 19 16:53:24 2022 +1000 dwmapi: Clear DWM_TIMING_INFO structure before returning. Clearing the structure passed in, allows Chromium to calculated failback values when refreshing windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53016 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 9defcb14373..6bb086a87d1 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -226,6 +226,9 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) if(!i++) FIXME("(%p %p)\n", hwnd, info); + memset(info, 0, info->cbSize); + info->cbSize = sizeof(DWM_TIMING_INFO); + return S_OK; }

1 0

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

19 May '22

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

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

19 May '22

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: Let AddFilter() create the Collection Filter field.
by Alexandre Julliard 19 May '22

19 May '22

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: Remove the $ColPrefix BuildKeyWhere() parameter.
by Alexandre Julliard 19 May '22

19 May '22

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

← Newer
1
...
35
36
37
38
39
40
41
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022