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

Francois Gouget : testbot/cgi: Improve the title for multi-word collection / item class names.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: 1c90fd56e778b654da080b3cf39047d805e4f1f3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1c90fd56e778b654da080b3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:05:07 2022 +0200 testbot/cgi: Improve the title for multi-word collection / item class names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 +++- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index d59310b..ddbbd66 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -137,7 +137,9 @@ sub GetTitle($) { my ($self) = @_; - return ucfirst($self->{Collection}->GetCollectionName()); + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; } sub GenerateTitle($) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 66fcab7..567a489 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -94,8 +94,11 @@ sub GetTitle($) { my ($self) = @_; - return $self->GetParam("Key") ? $self->GetParam("Key") : - "Add " . $self->{Collection}->GetItemName(); + return $self->GetParam("Key") if ($self->GetParam("Key")); + + my $Title = $self->{Collection}->GetItemName(); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return "Add $Title"; } sub GenerateFormStart($)

1 0

Francois Gouget : testbot/web: Add an Apache module import for the Munin redirects.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: a132383bd4f771008757d2bbd9bf7358e9cd7fe9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a132383bd4f771008757d2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:05:14 2022 +0200 testbot/web: Add an Apache module import for the Munin redirects. Fortunately it is only needed in the error case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Munin.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index c2464d0..513c690 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -19,6 +19,7 @@ use strict; +use Apache2::Const -compile => qw(REDIRECT); use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::VMs;

1 0

Francois Gouget : testbot/web: Document why ErrField is not set when failing to delete an item.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: 5adffdb0f644c9434fef9db53dcad9d5dcab251a URL: https://source.winehq.org/git/tools.git/?a=commit;h=5adffdb0f644c9434fef9db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:02:45 2022 +0200 testbot/web: Document why ErrField is not set when failing to delete an item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMsList.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index 019bc63..ae514e9 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -117,7 +117,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $User->Status('deleted'); - (my $ErrProperty, $self->{ErrMessage}) = $User->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $User->Save(); return 0 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting the web sessions diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 0ed0b0d..1895225 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -59,7 +59,8 @@ sub OnItemAction($$$$) if ($Action eq "Delete") { $VM->Role("deleted"); - (my $ErrProperty, $self->{ErrMessage}) = $VM->Save(); + # Setting $self->{ErrField} is only useful on form pages + (my $_ErrProperty, $self->{ErrMessage}) = $VM->Save(); return !defined $self->{ErrMessage}; }

1 0

Francois Gouget : testbot/web: Document the Fcntl usage.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: d29fd0fddd8fde89e5b2fdf71ee38aefd096b601 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d29fd0fddd8fde89e5b2fdf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:06:50 2022 +0200 testbot/web: Document the Fcntl usage. Use Fcntl qw(O_RDONLY) for simple cases. This is better than adding a comment which may get out-of-date if more constants are needed. But still use a comment to avoid too much duplication in more complex cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- testbot/lib/WineTestBot/Utils.pm | 2 +- testbot/web/GetFile.pl | 2 +- testbot/web/GetTaskFile.pl | 2 +- testbot/web/Screenshot.pl | 2 +- testbot/web/Submit.pl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index db9d82d..7880b8e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -37,7 +37,7 @@ sub BEGIN } use Errno qw(EAGAIN); -use Fcntl; +use Fcntl; # For O_XXX and FD_XXX use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 27b222f..5315c75 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); -use Fcntl; +use Fcntl qw(O_CREAT O_EXCL O_WRONLY); use WineTestBot::Config; diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a869949..59602bf 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -21,7 +21,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use WineTestBot::Jobs; diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 4111119..0b7f167 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # for O_READONLY +use Fcntl qw(O_RDONLY); use WineTestBot::Config; diff --git a/testbot/web/Screenshot.pl b/testbot/web/Screenshot.pl index a8a3d88..685c4a4 100644 --- a/testbot/web/Screenshot.pl +++ b/testbot/web/Screenshot.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; -use Fcntl; +use Fcntl qw(O_RDONLY); use WineTestBot::Config; use WineTestBot::CGI::Sessions; use WineTestBot::Engine::Notify; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 472622d..e2173d8 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,7 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use CGI qw(:standard); -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename;

1 0

Francois Gouget : testbot/web: Remove unneeded CGI imports.
by Alexandre Julliard 30 Mar '22

30 Mar '22

Module: tools Branch: master Commit: cdad6a990a00cb169b5b264b08736d36c70b35b1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cdad6a990a00cb169b5b264… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 30 19:06:53 2022 +0200 testbot/web: Remove unneeded CGI imports. Not only are they unneeded, but when combined with qw(:standard) they prevent calling $self->escapeHTML() (where $self is an ObjectModel::CGI::Page object). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Logout.pl | 1 - testbot/web/Submit.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 17e81d2..b0fd5cd 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -24,7 +24,6 @@ package LogoutPage; use ObjectModel::CGI::Page; our @ISA = qw(ObjectModel::CGI::Page); -use CGI qw(:standard); use WineTestBot::CGI::Sessions; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index e2173d8..ef7816b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -25,7 +25,6 @@ package SubmitPage; use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); -use CGI qw(:standard); use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX

1 0

Rémi Bernon : kernel32: Fix indentation of Global* functions.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 48ebc410efb9644fa7cab53ee0747ca058a73c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48ebc410efb9644fa7cab53e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:36 2022 +0200 kernel32: Fix indentation of Global* functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 171 +++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 8e767d03211..7e366eb991e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -231,11 +231,10 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalHandle( - LPCVOID pmem /* [in] Pointer to global memory block */ -) { +HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) +{ HGLOBAL handle; - PGLOBAL32_INTERN maybe_intern; + PGLOBAL32_INTERN maybe_intern; LPCVOID test; if (!pmem) @@ -244,7 +243,7 @@ HGLOBAL WINAPI GlobalHandle( return 0; } - RtlLockHeap(GetProcessHeap()); + RtlLockHeap( GetProcessHeap() ); __TRY { handle = 0; @@ -252,22 +251,25 @@ HGLOBAL WINAPI GlobalHandle( /* note that if pmem is a pointer to a block allocated by */ /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* will fail. */ - if (ISPOINTER(pmem)) { - if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) { - handle = (HGLOBAL)pmem; /* valid fixed block */ + if (ISPOINTER( pmem )) + { + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) + { + handle = (HGLOBAL)pmem; /* valid fixed block */ break; } - handle = POINTER_TO_HANDLE(pmem); - } else - handle = (HGLOBAL)pmem; + handle = POINTER_TO_HANDLE( pmem ); + } + else handle = (HGLOBAL)pmem; /* Now test handle either passed in or retrieved from pointer */ maybe_intern = HANDLE_TO_INTERN( handle ); - if (maybe_intern->Magic == MAGIC_GLOBAL_USED) { + if (maybe_intern->Magic == MAGIC_GLOBAL_USED) + { test = maybe_intern->Pointer; if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ - HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ - break; /* valid moveable block */ + HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ + break; /* valid moveable block */ } handle = 0; SetLastError( ERROR_INVALID_HANDLE ); @@ -278,12 +280,11 @@ HGLOBAL WINAPI GlobalHandle( handle = 0; } __ENDTRY - RtlUnlockHeap(GetProcessHeap()); + RtlUnlockHeap( GetProcessHeap() ); return handle; } - /*********************************************************************** * GlobalReAlloc (KERNEL32.@) * @@ -317,50 +318,49 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) */ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) { - SIZE_T retval; - PGLOBAL32_INTERN pintern; - - if (!((ULONG_PTR)hmem >> 16)) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } - - if(ISPOINTER(hmem)) - { - retval=HeapSize(GetProcessHeap(), 0, hmem); - - if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ - { - retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); - if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; - } - } - else - { - RtlLockHeap(GetProcessHeap()); - pintern=HANDLE_TO_INTERN(hmem); - - if(pintern->Magic==MAGIC_GLOBAL_USED) - { - if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ - retval = 0; - else - { - retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); - if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; - } - } - else - { - WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); - SetLastError(ERROR_INVALID_HANDLE); - retval=0; - } - RtlUnlockHeap(GetProcessHeap()); - } - if (retval == ~(SIZE_T)0) retval = 0; - return retval; + SIZE_T retval; + PGLOBAL32_INTERN pintern; + + if (!((ULONG_PTR)hmem >> 16)) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } + + if (ISPOINTER( hmem )) + { + retval = HeapSize( GetProcessHeap(), 0, hmem ); + if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ + { + retval = HeapSize( GetProcessHeap(), 0, (char *)hmem - HGLOBAL_STORAGE ); + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; + } + } + else + { + RtlLockHeap( GetProcessHeap() ); + pintern = HANDLE_TO_INTERN( hmem ); + + if (pintern->Magic == MAGIC_GLOBAL_USED) + { + if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ + retval = 0; + else + { + retval = HeapSize( GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; + } + } + else + { + WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + SetLastError( ERROR_INVALID_HANDLE ); + retval = 0; + } + RtlUnlockHeap( GetProcessHeap() ); + } + if (retval == ~(SIZE_T)0) retval = 0; + return retval; } @@ -415,32 +415,31 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) */ UINT WINAPI GlobalFlags(HGLOBAL hmem) { - DWORD retval; - PGLOBAL32_INTERN pintern; - - if(ISPOINTER(hmem)) - { - retval=0; - } - else - { - RtlLockHeap(GetProcessHeap()); - pintern=HANDLE_TO_INTERN(hmem); - if(pintern->Magic==MAGIC_GLOBAL_USED) - { - retval=pintern->LockCount + (pintern->Flags<<8); - if(pintern->Pointer==0) - retval|= GMEM_DISCARDED; - } - else - { - WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); - SetLastError(ERROR_INVALID_HANDLE); - retval = GMEM_INVALID_HANDLE; - } - RtlUnlockHeap(GetProcessHeap()); - } - return retval; + DWORD retval; + PGLOBAL32_INTERN pintern; + + if (ISPOINTER( hmem )) + { + retval = 0; + } + else + { + RtlLockHeap( GetProcessHeap() ); + pintern = HANDLE_TO_INTERN( hmem ); + if (pintern->Magic == MAGIC_GLOBAL_USED) + { + retval = pintern->LockCount + (pintern->Flags << 8); + if (pintern->Pointer == 0) retval |= GMEM_DISCARDED; + } + else + { + WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + SetLastError( ERROR_INVALID_HANDLE ); + retval = GMEM_INVALID_HANDLE; + } + RtlUnlockHeap( GetProcessHeap() ); + } + return retval; }

1 0

Rémi Bernon : kernel32: Make Global* traces and identifiers more consistent.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: fc12f812c3f7a234e12c1fde455f452aa6fe26c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc12f812c3f7a234e12c1fde… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:37 2022 +0200 kernel32: Make Global* traces and identifiers more consistent. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 111 +++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 7e366eb991e..fefb88d6857 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -183,7 +183,7 @@ typedef struct __GLOBAL32_INTERN * Lock a global memory object and return a pointer to first byte of the memory * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS * Success: Pointer to first byte of the memory block @@ -193,9 +193,9 @@ typedef struct __GLOBAL32_INTERN * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE * */ -LPVOID WINAPI GlobalLock(HGLOBAL hmem) +void *WINAPI GlobalLock( HGLOBAL handle ) { - return LocalLock( hmem ); + return LocalLock( handle ); } @@ -205,7 +205,7 @@ LPVOID WINAPI GlobalLock(HGLOBAL hmem) * Unlock a global memory object. * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS * Success: Object is still locked @@ -215,10 +215,10 @@ LPVOID WINAPI GlobalLock(HGLOBAL hmem) * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE * */ -BOOL WINAPI GlobalUnlock(HGLOBAL hmem) +BOOL WINAPI GlobalUnlock( HGLOBAL handle ) { - if (ISPOINTER( hmem )) return TRUE; - return LocalUnlock( hmem ); + if (ISPOINTER( handle )) return TRUE; + return LocalUnlock( handle ); } @@ -231,13 +231,15 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) +HGLOBAL WINAPI GlobalHandle( const void *ptr ) { + PGLOBAL32_INTERN mem; HGLOBAL handle; - PGLOBAL32_INTERN maybe_intern; LPCVOID test; - if (!pmem) + TRACE_(globalmem)( "ptr %p\n", ptr ); + + if (!ptr) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; @@ -248,27 +250,27 @@ HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) { handle = 0; - /* note that if pmem is a pointer to a block allocated by */ + /* note that if ptr is a pointer to a block allocated by */ /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* will fail. */ - if (ISPOINTER( pmem )) + if (ISPOINTER( ptr )) { - if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) + if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, ptr )) { - handle = (HGLOBAL)pmem; /* valid fixed block */ + handle = (HGLOBAL)ptr; /* valid fixed block */ break; } - handle = POINTER_TO_HANDLE( pmem ); + handle = POINTER_TO_HANDLE( ptr ); } - else handle = (HGLOBAL)pmem; + else handle = (HGLOBAL)ptr; /* Now test handle either passed in or retrieved from pointer */ - maybe_intern = HANDLE_TO_INTERN( handle ); - if (maybe_intern->Magic == MAGIC_GLOBAL_USED) + mem = HANDLE_TO_INTERN( handle ); + if (mem->Magic == MAGIC_GLOBAL_USED) { - test = maybe_intern->Pointer; + test = mem->Pointer; if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ - HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ + HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, mem )) /* intern valid arena? */ break; /* valid moveable block */ } handle = 0; @@ -294,9 +296,9 @@ HGLOBAL WINAPI GlobalHandle( LPCVOID pmem ) * Handle: Success * NULL: Failure */ -HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) +HGLOBAL WINAPI GlobalReAlloc( HGLOBAL handle, SIZE_T size, UINT flags ) { - return LocalReAlloc( hmem, size, flags ); + return LocalReAlloc( handle, size, flags ); } @@ -306,7 +308,7 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) * Get the size of a global memory object. * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS * Failure: 0 @@ -316,44 +318,45 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE * */ -SIZE_T WINAPI GlobalSize(HGLOBAL hmem) +SIZE_T WINAPI GlobalSize( HGLOBAL handle ) { + PGLOBAL32_INTERN mem; SIZE_T retval; - PGLOBAL32_INTERN pintern; - if (!((ULONG_PTR)hmem >> 16)) + TRACE_(globalmem)( "handle %p\n", handle ); + + if (!((ULONG_PTR)handle >> 16)) { SetLastError( ERROR_INVALID_HANDLE ); return 0; } - if (ISPOINTER( hmem )) + if (ISPOINTER( handle )) { - retval = HeapSize( GetProcessHeap(), 0, hmem ); + retval = HeapSize( GetProcessHeap(), 0, handle ); if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ { - retval = HeapSize( GetProcessHeap(), 0, (char *)hmem - HGLOBAL_STORAGE ); + retval = HeapSize( GetProcessHeap(), 0, (char *)handle - HGLOBAL_STORAGE ); if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; } } else { RtlLockHeap( GetProcessHeap() ); - pintern = HANDLE_TO_INTERN( hmem ); - - if (pintern->Magic == MAGIC_GLOBAL_USED) + mem = HANDLE_TO_INTERN( handle ); + if (mem->Magic == MAGIC_GLOBAL_USED) { - if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ + if (!mem->Pointer) /* handle case of GlobalAlloc( ??,0) */ retval = 0; else { - retval = HeapSize( GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); + retval = HeapSize( GetProcessHeap(), 0, (char *)mem->Pointer - HGLOBAL_STORAGE ); if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; } } else { - WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + WARN_(globalmem)( "invalid handle %p\n", handle ); SetLastError( ERROR_INVALID_HANDLE ); retval = 0; } @@ -367,36 +370,36 @@ SIZE_T WINAPI GlobalSize(HGLOBAL hmem) /*********************************************************************** * GlobalWire (KERNEL32.@) */ -LPVOID WINAPI GlobalWire(HGLOBAL hmem) +void *WINAPI GlobalWire( HGLOBAL handle ) { - return GlobalLock( hmem ); + return GlobalLock( handle ); } /*********************************************************************** * GlobalUnWire (KERNEL32.@) */ -BOOL WINAPI GlobalUnWire(HGLOBAL hmem) +BOOL WINAPI GlobalUnWire( HGLOBAL handle ) { - return GlobalUnlock( hmem); + return GlobalUnlock( handle ); } /*********************************************************************** * GlobalFix (KERNEL32.@) */ -VOID WINAPI GlobalFix(HGLOBAL hmem) +VOID WINAPI GlobalFix( HGLOBAL handle ) { - GlobalLock( hmem ); + GlobalLock( handle ); } /*********************************************************************** * GlobalUnfix (KERNEL32.@) */ -VOID WINAPI GlobalUnfix(HGLOBAL hmem) +VOID WINAPI GlobalUnfix( HGLOBAL handle ) { - GlobalUnlock( hmem); + GlobalUnlock( handle ); } @@ -406,34 +409,36 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) * Get information about a global memory object. * * PARAMS - * hmem [I] Handle of the global memory object + * handle [I] Handle of the global memory object * * RETURNS - * Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid + * Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid * Success: Value specifying allocation flags and lock count * */ -UINT WINAPI GlobalFlags(HGLOBAL hmem) +UINT WINAPI GlobalFlags( HGLOBAL handle ) { + PGLOBAL32_INTERN mem; DWORD retval; - PGLOBAL32_INTERN pintern; - if (ISPOINTER( hmem )) + TRACE_(globalmem)( "handle %p\n", handle ); + + if (ISPOINTER( handle )) { retval = 0; } else { RtlLockHeap( GetProcessHeap() ); - pintern = HANDLE_TO_INTERN( hmem ); - if (pintern->Magic == MAGIC_GLOBAL_USED) + mem = HANDLE_TO_INTERN( handle ); + if (mem->Magic == MAGIC_GLOBAL_USED) { - retval = pintern->LockCount + (pintern->Flags << 8); - if (pintern->Pointer == 0) retval |= GMEM_DISCARDED; + retval = mem->LockCount + (mem->Flags << 8); + if (mem->Pointer == 0) retval |= GMEM_DISCARDED; } else { - WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic ); + WARN_(globalmem)( "invalid handle %p\n", handle ); SetLastError( ERROR_INVALID_HANDLE ); retval = GMEM_INVALID_HANDLE; }

1 0

Rémi Bernon : kernelbase: Fix indentation of LocalReAlloc.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 424e38f3f8bdeb5bb6b45ea88d8c66070ec49b34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=424e38f3f8bdeb5bb6b45ea8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:38 2022 +0200 kernelbase: Fix indentation of LocalReAlloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 183 +++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 92 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 42ffd1bcdd9..8c818f33ca6 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -791,98 +791,97 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL hmem ) */ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL hmem, SIZE_T size, UINT flags ) { - struct local_header *header; - void *ptr; - HLOCAL ret = 0; - DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; - - RtlLockHeap( GetProcessHeap() ); - if (flags & LMEM_MODIFY) /* modify flags */ - { - if (is_pointer( hmem ) && (flags & LMEM_MOVEABLE)) - { - /* make a fixed block moveable - * actually only NT is able to do this. But it's soo simple - */ - if (hmem == 0) - { - WARN( "null handle\n"); - SetLastError( ERROR_NOACCESS ); - } - else - { - size = RtlSizeHeap( GetProcessHeap(), 0, hmem ); - ret = LocalAlloc( flags, size ); - ptr = LocalLock( ret ); - memcpy( ptr, hmem, size ); - LocalUnlock( ret ); - LocalFree( hmem ); - } - } - else if (!is_pointer( hmem ) && (flags & LMEM_DISCARDABLE)) - { - /* change the flags to make our block "discardable" */ - header = get_header( hmem ); - header->flags |= LMEM_DISCARDABLE >> 8; - ret = hmem; - } - else SetLastError( ERROR_INVALID_PARAMETER ); - } - else - { - if (is_pointer( hmem )) - { - /* reallocate fixed memory */ - if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; - ret = HeapReAlloc( GetProcessHeap(), heap_flags, hmem, size ); - } - else - { - /* reallocate a moveable block */ - header = get_header( hmem ); - if (size != 0) - { - if (size <= INT_MAX - HLOCAL_STORAGE) - { - if (header->ptr) - { - if ((ptr = HeapReAlloc( GetProcessHeap(), heap_flags, - (char *)header->ptr - HLOCAL_STORAGE, - size + HLOCAL_STORAGE ))) - { - header->ptr = (char *)ptr + HLOCAL_STORAGE; - ret = hmem; - } - } - else - { - if ((ptr = HeapAlloc( GetProcessHeap(), heap_flags, size + HLOCAL_STORAGE ))) - { - *(HLOCAL *)ptr = hmem; - header->ptr = (char *)ptr + HLOCAL_STORAGE; - ret = hmem; - } - } - } - else SetLastError( ERROR_OUTOFMEMORY ); - } - else - { - if (header->lock == 0) - { - if (header->ptr) - { - HeapFree( GetProcessHeap(), 0, (char *)header->ptr - HLOCAL_STORAGE ); - header->ptr = NULL; - } - ret = hmem; - } - else WARN( "not freeing memory associated with locked handle\n" ); - } - } - } - RtlUnlockHeap( GetProcessHeap() ); - return ret; + struct local_header *header; + void *ptr; + HLOCAL ret = 0; + DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; + + RtlLockHeap( GetProcessHeap() ); + if (flags & LMEM_MODIFY) /* modify flags */ + { + if (is_pointer( hmem ) && (flags & LMEM_MOVEABLE)) + { + /* make a fixed block moveable + * actually only NT is able to do this. But it's soo simple + */ + if (hmem == 0) + { + WARN( "null handle\n" ); + SetLastError( ERROR_NOACCESS ); + } + else + { + size = RtlSizeHeap( GetProcessHeap(), 0, hmem ); + ret = LocalAlloc( flags, size ); + ptr = LocalLock( ret ); + memcpy( ptr, hmem, size ); + LocalUnlock( ret ); + LocalFree( hmem ); + } + } + else if (!is_pointer( hmem ) && (flags & LMEM_DISCARDABLE)) + { + /* change the flags to make our block "discardable" */ + header = get_header( hmem ); + header->flags |= LMEM_DISCARDABLE >> 8; + ret = hmem; + } + else SetLastError( ERROR_INVALID_PARAMETER ); + } + else + { + if (is_pointer( hmem )) + { + /* reallocate fixed memory */ + if (!(flags & LMEM_MOVEABLE)) heap_flags |= HEAP_REALLOC_IN_PLACE_ONLY; + ret = HeapReAlloc( GetProcessHeap(), heap_flags, hmem, size ); + } + else + { + /* reallocate a moveable block */ + header = get_header( hmem ); + if (size != 0) + { + if (size <= INT_MAX - HLOCAL_STORAGE) + { + if (header->ptr) + { + if ((ptr = HeapReAlloc( GetProcessHeap(), heap_flags, (char *)header->ptr - HLOCAL_STORAGE, + size + HLOCAL_STORAGE ))) + { + header->ptr = (char *)ptr + HLOCAL_STORAGE; + ret = hmem; + } + } + else + { + if ((ptr = HeapAlloc( GetProcessHeap(), heap_flags, size + HLOCAL_STORAGE ))) + { + *(HLOCAL *)ptr = hmem; + header->ptr = (char *)ptr + HLOCAL_STORAGE; + ret = hmem; + } + } + } + else SetLastError( ERROR_OUTOFMEMORY ); + } + else + { + if (header->lock == 0) + { + if (header->ptr) + { + HeapFree( GetProcessHeap(), 0, (char *)header->ptr - HLOCAL_STORAGE ); + header->ptr = NULL; + } + ret = hmem; + } + else WARN( "not freeing memory associated with locked handle\n" ); + } + } + } + RtlUnlockHeap( GetProcessHeap() ); + return ret; }

1 0

Rémi Bernon : kernelbase: Make (Global|Local)* traces and identifiers more consistent.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: 4ba774d85ea1596b9573c38bab234a5515b7eab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba774d85ea1596b9573c38b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 15:24:39 2022 +0200 kernelbase: Make (Global|Local)* traces and identifiers more consistent. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 185 +++++++++++++++++++++++++---------------------- 1 file changed, 97 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ba774d85ea1596b9573…

1 0

Bernhard Kölbl : windows.media.speech: Add IVector<HSTRING>.
by Alexandre Julliard 29 Mar '22

29 Mar '22

Module: wine Branch: master Commit: d8c9e6705947fd04d3d73b6d1020c86486808caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c9e6705947fd04d3d73b6d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 29 19:30:44 2022 +0200 windows.media.speech: Add IVector<HSTRING>. And use it in listconstraint. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/Makefile.in | 3 +- dlls/windows.media.speech/listconstraint.c | 11 +- dlls/windows.media.speech/private.h | 2 + dlls/windows.media.speech/vector.c | 313 +++++++++++++++++++++++++++++ 4 files changed, 326 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c9e6705947fd04d3d7…

1 0