August 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Load dll from the directory containing the manifest for local assemblies.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 5b6bb63adbf1eafd7f7fcb0d46fe3e272e1aae68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b6bb63adbf1eafd7f7fcb0d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 20:31:42 2007 +0200 ntdll: Load dll from the directory containing the manifest for local assemblies. --- dlls/ntdll/loader.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a37394d..843e4d5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1592,6 +1592,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) { static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\'}; + static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; ACTCTX_SECTION_KEYED_DATA data; @@ -1624,6 +1625,29 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) /* restart with larger buffer */ } + if ((p = strrchrW( info->lpAssemblyManifestPath, '\\' ))) + { + DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); + + p++; + if (strncmpiW( p, info->lpAssemblyDirectoryName, dirlen ) || strcmpiW( p + dirlen, dotManifestW )) + { + /* manifest name does not match directory name, so it's not a global + * windows/winsxs manifest; use the manifest directory name instead */ + dirlen = p - info->lpAssemblyManifestPath; + needed = (dirlen + 1) * sizeof(WCHAR) + nameW.Length; + if (!(*fullname = p = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + memcpy( p, info->lpAssemblyManifestPath, dirlen * sizeof(WCHAR) ); + p += dirlen; + strcpyW( p, libname ); + goto done; + } + } + needed = (windows_dir.Length + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + nameW.Length + 2*sizeof(WCHAR)); @@ -1640,7 +1664,6 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); *p++ = '\\'; strcpyW( p, libname ); - TRACE ("found %s for %s\n", debugstr_w(*fullname), debugstr_w(libname) ); done: RtlFreeHeap( GetProcessHeap(), 0, info ); RtlReleaseActivationContext( data.hActCtx ); @@ -1687,6 +1710,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, status = find_actctx_dll( libname, &fullname ); if (status == STATUS_SUCCESS) { + TRACE ("found %s for %s\n", debugstr_w(fullname), debugstr_w(libname) ); RtlFreeHeap( GetProcessHeap(), 0, dllname ); libname = dllname = fullname; }

1 0

Alexandre Julliard : user32: Erase parent window when child is hidden. From a patch by Clinton Stimpson.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: ce7bfd6a3f9258e2edb0b056e076f71978c1cc52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7bfd6a3f9258e2edb0b056e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 20:32:15 2007 +0200 user32: Erase parent window when child is hidden. From a patch by Clinton Stimpson. --- dlls/user32/painting.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/user_private.h | 1 + dlls/user32/winpos.c | 18 ++++++++++++------ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 30dddae..862c75f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -280,7 +280,7 @@ static BOOL send_erase( HWND hwnd, UINT flags, HRGN client_rgn, * * Implementation of RDW_ERASENOW behavior. */ -static void erase_now( HWND hwnd, UINT rdw_flags ) +void erase_now( HWND hwnd, UINT rdw_flags ) { HWND child = 0; HRGN hrgn; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 04dca3f..930821f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3994,7 +3994,7 @@ static void test_messages(void) /* check parent messages too */ log_all_parent_messages++; ShowWindow(hchild, SW_HIDE); - ok_sequence(WmHideChildSeq2, "ShowWindow(SW_HIDE):child", TRUE); + ok_sequence(WmHideChildSeq2, "ShowWindow(SW_HIDE):child", FALSE); log_all_parent_messages--; ShowWindow(hchild, SW_SHOW); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d6eac17..67be8f5 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -213,6 +213,7 @@ extern HBRUSH SYSCOLOR_55AABrush; extern BOOL CLIPBOARD_ReleaseOwner(void); extern BOOL FOCUS_MouseActivate( HWND hwnd ); extern BOOL HOOK_IsHooked( INT id ); +extern void erase_now( HWND hwnd, UINT rdw_flags ); extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index adf897e..a13753c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1604,13 +1604,19 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) &newWindowRect, &newClientRect, orig_flags, valid_rects )) return FALSE; - /* Windows doesn't redraw a window if it is being just moved */ - if (!(orig_flags & SWP_SHOWWINDOW) && - (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE) + /* erase parent if hiding child */ + if (!(orig_flags & SWP_DEFERERASE)) { - UINT rdw_flags = RDW_FRAME | RDW_ERASE; - if ( !(orig_flags & SWP_DEFERERASE) ) rdw_flags |= RDW_ERASENOW; - RedrawWindow( winpos->hwnd, NULL, NULL, rdw_flags ); + if (orig_flags & SWP_HIDEWINDOW) + { + HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); + erase_now( parent, RDW_NOCHILDREN ); + } + else if (!(orig_flags & SWP_SHOWWINDOW) && + (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE) + { + erase_now( winpos->hwnd, 0 ); + } } if( winpos->flags & SWP_HIDEWINDOW )

1 0

Peter Dons Tychsen : server: Added the install driver privilege to the default user.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: ec4d8903ef2eb056b8da21fd3d6975744873a87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4d8903ef2eb056b8da21fd3… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Fri Jul 27 02:05:04 2007 +0200 server: Added the install driver privilege to the default user. --- server/token.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 8975c54..a97fbde 100644 --- a/server/token.c +++ b/server/token.c @@ -660,7 +660,7 @@ struct token *token_create_admin( void ) { SeSystemProfilePrivilege , 0 }, { SeProfileSingleProcessPrivilege, 0 }, { SeIncreaseBasePriorityPrivilege, 0 }, - { SeLoadDriverPrivilege , 0 }, + { SeLoadDriverPrivilege , SE_PRIVILEGE_ENABLED }, { SeCreatePagefilePrivilege , 0 }, { SeIncreaseQuotaPrivilege , 0 }, { SeUndockPrivilege , 0 },

1 0

appdb/tables create_tables
by WineHQ 01 Aug '07

01 Aug '07

ChangeSet ID: 31301 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/31 22:29:12 Modified files: tables : create_tables Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove single quotes by removing the contractions that necessitated them Patch: http://cvs.winehq.org/patch.py?id=31301 Old revision New revision Changes Path 1.12 1.13 +3 -3 appdb/tables/create_tables Index: appdb/tables/create_tables diff -u -p appdb/tables/create_tables:1.12 appdb/tables/create_tables:1.13 --- appdb/tables/create_tables:1.12 1 Aug 2007 3:29:12 -0000 +++ appdb/tables/create_tables 1 Aug 2007 3:29:12 -0000 @@ -1,9 +1,9 @@ #! /bin/sh echo Create the base user -echo NOTE: It's ok for this to fail if the user already exists -echo there doesn't appear to be a way to create a user only -echo if they don't exist so we have to live with a potential +echo NOTE: It is ok for this to fail if the user already exists +echo there does not appear to be a way to create a user only +echo if they do not exist so we have to live with a potential echo error after we try. mysql -p -u root < create_user.sql

1 0

appdb/include maintainer.php
by WineHQ 01 Aug '07

01 Aug '07

ChangeSet ID: 31300 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/31 21:19:33 Modified files: include : maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>, Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up some html in maintainer notification emails, add information about who the email is addressed to so there is some way to see who the notification system is notifying. Patch: http://cvs.winehq.org/patch.py?id=31300 Old revision New revision Changes Path 1.51 1.52 +9 -8 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.51 appdb/include/maintainer.php:1.52 --- appdb/include/maintainer.php:1.51 1 Aug 2007 2:19:33 -0000 +++ appdb/include/maintainer.php 1 Aug 2007 2:19:33 -0000 @@ -930,20 +930,21 @@ class maintainer // construct the subject of the notification email that we may send $sSubject = "Notification of queued data for "; - $sMsg = "You are receiving this email to notify you that there is queued data"; + $sMsg = ""; + $sMsg.= "Hello ".$oUser->sRealname."<".$oUser->sEmail.">".".\n\n"; + $sMsg.= "You are receiving this email to notify you that there is queued data"; $sMsg.=" for the "; if($this->bSuperMaintainer) { $oApp = new Application($this->iAppId); $sSubject.= $oApp->sName; - $sMsg.='application, '.$oApp->objectMakeLink().', that you maintain.'."\n"; + $sMsg.='application, '.$oApp->sName.'('.$oApp->objectMakeUrl().'), that you maintain.'."\n"; } else { $sFullname = version::fullName($this->iVersionId); $oVersion = new Version($this->iVersionId); $sSubject.= $sFullname; - $sMsg.='version, <a href="'.$oVersion->objectMakeUrl().'">'.$sFullname. - '</a>, that you maintain.'."\n"; + $sMsg.='version, '.$sFullname.'('.$oVersion->objectMakeUrl().'), that you maintain.'."\n"; } $sSubject.=" ready for your processing"; @@ -964,8 +965,8 @@ class maintainer { $oVersion = new Version($iVersionId); - $sMsg .= 'Version <a href="'.$oVersion->objectMakeUrl().'">'.$sFullname. - '</a> is queued and ready for processing.'; + $sMsg .= 'Version '.$sFullname.' ('.$oVersion->objectMakeUrl().'">'.$sFullname. + ') is queued and ready for processing.'; $iSubmitTime = strtotime($oVersion->sSubmitTime); @@ -981,8 +982,8 @@ class maintainer { // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php - $sMsg = 'Please visit <a href="'.BASE."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". - "Version%20Queue".'">AppDB Version queue</a> to process queued versions for applications you maintain.\n'; + $sMsg = 'Please visit the test data queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". + "Version%20Queue".') to process queued versions for applications you maintain.\n'; } //////////////////

1 0