June 2007 - Wine-Commits - list.winehq.org

Michael Stefaniuc : winefile: Do not use the TEXT() macro on character constants. The implicit cast from char to WCHAR works as well in UNICODE mode.
by Alexandre Julliard June 28, 2007

June 28, 2007

Module: wine Branch: master Commit: fa684a717aac92173fd60f7e48e28a0aa9d9e25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa684a717aac92173fd60f7e4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 22:54:56 2007 +0200 winefile: Do not use the TEXT() macro on character constants. The implicit cast from char to WCHAR works as well in UNICODE mode. --- programs/winefile/winefile.c | 64 +++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7a0577e..860ecd2 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -455,7 +455,7 @@ static Entry* find_entry_win(Entry* dir, LPCTSTR name) LPCTSTR q = entry->data.cFileName; do { - if (!*p || *p==TEXT('\\') || *p==TEXT('/')) + if (!*p || *p == '\\' || *p == '/') return entry; } while(tolower(*p++) == tolower(*q++)); @@ -463,7 +463,7 @@ static Entry* find_entry_win(Entry* dir, LPCTSTR name) q = entry->data.cAlternateFileName; do { - if (!*p || *p==TEXT('\\') || *p==TEXT('/')) + if (!*p || *p == '\\' || *p == '/') return entry; } while(tolower(*p++) == tolower(*q++)); } @@ -486,14 +486,14 @@ static Entry* read_tree_win(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWND #endif while(entry) { - while(*s && *s!=TEXT('\\') && *s!=TEXT('/')) + while(*s && *s != '\\' && *s != '/') *d++ = *s++; - while(*s==TEXT('\\') || *s==TEXT('/')) + while(*s == '\\' || *s == '/') s++; - *d++ = TEXT('\\'); - *d = TEXT('\0'); + *d++ = '\\'; + *d = '\0'; read_directory(entry, buffer, sortOrder, hwnd); @@ -634,7 +634,7 @@ static Entry* find_entry_unix(Entry* dir, LPCTSTR name) LPCTSTR q = entry->data.cFileName; do { - if (!*p || *p==TEXT('/')) + if (!*p || *p == '/') return entry; } while(*p++ == *q++); } @@ -654,14 +654,14 @@ static Entry* read_tree_unix(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWN entry->etype = ET_UNIX; while(entry) { - while(*s && *s!=TEXT('/')) + while(*s && *s != '/') *d++ = *s++; - while(*s == TEXT('/')) + while(*s == '/') s++; - *d++ = TEXT('/'); - *d = TEXT('\0'); + *d++ = '/'; + *d = '\0'; read_directory(entry, buffer, sortOrder, hwnd); @@ -1195,8 +1195,8 @@ static int compareExt(const void* arg1, const void* arg2) name1 = fd1->cFileName; name2 = fd2->cFileName; - ext1 = _tcsrchr(name1, TEXT('.')); - ext2 = _tcsrchr(name2, TEXT('.')); + ext1 = _tcsrchr(name1, '.'); + ext2 = _tcsrchr(name2, '.'); if (ext1) ext1++; @@ -1308,7 +1308,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND while(*s) *d++ = *s++; - *d++ = TEXT('\\'); + *d++ = '\\'; for(entry=dir->down; entry; entry=entry->next) if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -1331,7 +1331,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND while(*s) *d++ = *s++; - *d++ = TEXT('/'); + *d++ = '/'; for(entry=dir->down; entry; entry=entry->next) if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -1353,7 +1353,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND while(*s) *d++ = *s++; - *d++ = TEXT('\\'); + *d++ = '\\'; for(entry=dir->down; entry; entry=entry->next) if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -1521,7 +1521,7 @@ static void get_path(Entry* dir, PTSTR path) SFGAOF attribs; HRESULT hr = S_OK; - path[0] = TEXT('\0'); + path[0] = '\0'; attribs = 0; @@ -1546,7 +1546,7 @@ static void get_path(Entry* dir, PTSTR path) name = entry->data.cFileName; s = name; - for(l=0; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) + for(l=0; *s && *s != '/' && *s != '\\'; s++) l++; } @@ -1558,10 +1558,10 @@ static void get_path(Entry* dir, PTSTR path) #ifndef _NO_EXTENSIONS if (entry->etype == ET_UNIX) - path[0] = TEXT('/'); + path[0] = '/'; else #endif - path[0] = TEXT('\\'); + path[0] = '\\'; } entry = entry->up; @@ -1576,13 +1576,13 @@ static void get_path(Entry* dir, PTSTR path) if (!level) { #ifndef _NO_EXTENSIONS if (entry->etype == ET_UNIX) - path[len++] = TEXT('/'); + path[len++] = '/'; else #endif - path[len++] = TEXT('\\'); + path[len++] = '\\'; } - path[len] = TEXT('\0'); + path[len] = '\0'; } } @@ -2651,7 +2651,7 @@ static void init_output(HWND hwnd) if (GetNumberFormat(LOCALE_USER_DEFAULT, 0, s1000, 0, b, 16) > 4) Globals.num_sep = b[1]; else - Globals.num_sep = TEXT('.'); + Globals.num_sep = '.'; old_font = SelectObject(hdc, Globals.hfont); GetTextExtentPoint32(hdc, sSpace, 1, &Globals.spaceSize); @@ -2877,12 +2877,12 @@ static int insert_entries(Pane* pane, Entry* dir, LPCTSTR pattern, int filter_fl if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* don't display entries "." and ".." in the left pane */ - if (pane->treePane && entry->data.cFileName[0]==TEXT('.')) + if (pane->treePane && entry->data.cFileName[0] == '.') if ( #ifndef _NO_EXTENSIONS - entry->data.cFileName[1]==TEXT('\0') || + entry->data.cFileName[1] == '\0' || #endif - (entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0'))) + (entry->data.cFileName[1] == '.' && entry->data.cFileName[2] == '\0')) continue; /* filter directories in right pane */ @@ -3015,7 +3015,7 @@ static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols) FILETIME lft; int len = 0; - *buffer = TEXT('\0'); + *buffer = '\0'; if (!ft->dwLowDateTime && !ft->dwHighDateTime) return; @@ -3039,7 +3039,7 @@ static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols) buffer[len++] = ' '; if (!GetTimeFormat(LOCALE_USER_DEFAULT, 0, &systime, 0, buffer+len, BUFFER_LEN-len)) - buffer[len] = TEXT('\0'); + buffer[len] = '\0'; } } @@ -3200,11 +3200,11 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi attrs = entry->data.dwFileAttributes; if (attrs & FILE_ATTRIBUTE_DIRECTORY) { - if (entry->data.cFileName[0]==TEXT('.') && entry->data.cFileName[1]==TEXT('.') - && entry->data.cFileName[2]==TEXT('\0')) + if (entry->data.cFileName[0] == '.' && entry->data.cFileName[1] == '.' + && entry->data.cFileName[2] == '\0') img = IMG_FOLDER_UP; #ifndef _NO_EXTENSIONS - else if (entry->data.cFileName[0]==TEXT('.') && entry->data.cFileName[1]==TEXT('\0')) + else if (entry->data.cFileName[0] == '.' && entry->data.cFileName[1] == '\0') img = IMG_FOLDER_CUR; #endif else if (

1 0

Michael Stefaniuc : winefile: Do not use wide character constants.
by Alexandre Julliard June 28, 2007

June 28, 2007

Module: wine Branch: master Commit: 699df04e85dfd7f5c8459bbb0aa6b642f896c697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699df04e85dfd7f5c8459bbb0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 22:48:29 2007 +0200 winefile: Do not use wide character constants. --- programs/winefile/splitpath.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winefile/splitpath.c b/programs/winefile/splitpath.c index 542379a..42286ec 100644 --- a/programs/winefile/splitpath.c +++ b/programs/winefile/splitpath.c @@ -33,18 +33,18 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* if (drv) { *drv++ = *path++; *drv++ = *path++; - *drv = L'\0'; + *drv = '\0'; } } else if (drv) - *drv = L'\0'; + *drv = '\0'; /* search for end of string or stream separator */ - for(end=path; *end && *end!=L':'; ) + for(end=path; *end && *end!=':'; ) end++; /* search for begin of file extension */ - for(p=end; p>path && *--p!=L'\\' && *p!=L'/'; ) - if (*p == L'.') { + for(p=end; p>path && *--p!='\\' && *p!='/'; ) + if (*p == '.') { end = p; break; } @@ -64,14 +64,14 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* for(s=p; s<end; ) *name++ = *s++; - *name = L'\0'; + *name = '\0'; } if (dir) { for(s=path; s<p; ) *dir++ = *s++; - *dir = L'\0'; + *dir = '\0'; } }

1 0

Paul Vriens : advapi32/service: Make sure we fill all struct members.
by Alexandre Julliard June 28, 2007

June 28, 2007

Module: wine Branch: master Commit: 9c6a5dfa85b1012f8512743dec38c6057160c814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6a5dfa85b1012f8512743de… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 27 17:14:55 2007 +0200 advapi32/service: Make sure we fill all struct members. --- dlls/advapi32/service.c | 63 +++++++++++++++++++++++++++++++++++++++-- dlls/advapi32/tests/service.c | 10 ++++-- 2 files changed, 66 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 09ab0de..c7bb0c7 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -240,6 +240,8 @@ static const WCHAR szDependOnService[] = { 'D','e','p','e','n','d','O','n','S','e','r','v','i','c','e',0}; static const WCHAR szObjectName[] = { 'O','b','j','e','c','t','N','a','m','e',0}; +static const WCHAR szTag[] = { + 'T','a','g',0}; struct reg_value { DWORD type; @@ -1849,6 +1851,11 @@ QueryServiceConfigW( SC_HANDLE hService, } hKey = hsvc->hkey; + /* TODO: Check which members are mandatory and what the registry types + * should be. This should of course also be tested when a service is + * created. + */ + /* calculate the size required first */ total = sizeof (QUERY_SERVICE_CONFIGW); @@ -1871,6 +1878,8 @@ QueryServiceConfigW( SC_HANDLE hService, r = RegQueryValueExW( hKey, szGroup, 0, &type, NULL, &sz ); if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) total += sz; + else + total += sizeof(WCHAR); sz = 0; r = RegQueryValueExW( hKey, szDependencies, 0, &type, NULL, &sz ); @@ -1883,11 +1892,15 @@ QueryServiceConfigW( SC_HANDLE hService, r = RegQueryValueExW( hKey, szObjectName, 0, &type, NULL, &sz ); if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) total += sz; + else + total += sizeof(WCHAR); sz = 0; r = RegQueryValueExW( hKey, szDisplayName, 0, &type, NULL, &sz ); if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) total += sz; + else + total += sizeof(WCHAR); *pcbBytesNeeded = total; @@ -1915,6 +1928,11 @@ QueryServiceConfigW( SC_HANDLE hService, if( ( r == ERROR_SUCCESS ) || ( type == REG_DWORD ) ) lpServiceConfig->dwErrorControl = val; + sz = sizeof val; + r = RegQueryValueExW( hKey, szTag, 0, &type, (LPBYTE)&val, &sz ); + if( ( r == ERROR_SUCCESS ) || ( type == REG_DWORD ) ) + lpServiceConfig->dwTagId = val; + /* now do the strings */ p = (LPBYTE) &lpServiceConfig[1]; n = total - sizeof (QUERY_SERVICE_CONFIGW); @@ -1939,12 +1957,18 @@ QueryServiceConfigW( SC_HANDLE hService, sz = n; r = RegQueryValueExW( hKey, szGroup, 0, &type, p, &sz ); + lpServiceConfig->lpLoadOrderGroup = (LPWSTR) p; if( ( r == ERROR_SUCCESS ) || ( type == REG_SZ ) ) { - lpServiceConfig->lpLoadOrderGroup = (LPWSTR) p; p += sz; n -= sz; } + else + { + *(WCHAR *) p = 0; + p += sizeof(WCHAR); + n -= sizeof(WCHAR); + } sz = n; r = RegQueryValueExW( hKey, szDependencies, 0, &type, p, &sz ); @@ -1961,11 +1985,44 @@ QueryServiceConfigW( SC_HANDLE hService, n -= sizeof(WCHAR); } + sz = n; + r = RegQueryValueExW( hKey, szObjectName, 0, &type, p, &sz ); + lpServiceConfig->lpServiceStartName = (LPWSTR) p; + if( ( r == ERROR_SUCCESS ) || ( type == REG_SZ ) ) + { + p += sz; + n -= sz; + } + else + { + *(WCHAR *) p = 0; + p += sizeof(WCHAR); + n -= sizeof(WCHAR); + } + + sz = n; + r = RegQueryValueExW( hKey, szDisplayName, 0, &type, p, &sz ); + lpServiceConfig->lpDisplayName = (LPWSTR) p; + if( ( r == ERROR_SUCCESS ) || ( type == REG_SZ ) ) + { + p += sz; + n -= sz; + } + else + { + *(WCHAR *) p = 0; + p += sizeof(WCHAR); + n -= sizeof(WCHAR); + } + if( n < 0 ) ERR("Buffer overflow!\n"); - TRACE("Image path = %s\n", debugstr_w(lpServiceConfig->lpBinaryPathName) ); - TRACE("Group = %s\n", debugstr_w(lpServiceConfig->lpLoadOrderGroup) ); + TRACE("Image path = %s\n", debugstr_w(lpServiceConfig->lpBinaryPathName) ); + TRACE("Group = %s\n", debugstr_w(lpServiceConfig->lpLoadOrderGroup) ); + TRACE("Dependencies = %s\n", debugstr_w(lpServiceConfig->lpDependencies) ); + TRACE("Service account name = %s\n", debugstr_w(lpServiceConfig->lpServiceStartName) ); + TRACE("Display name = %s\n", debugstr_w(lpServiceConfig->lpDisplayName) ); return TRUE; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 7dde5f5..206e4f0 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -116,6 +116,8 @@ static void test_sequence(void) "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); ok(given == needed, "Expected the given (%d) and needed (%d) buffersizes to be equal\n", given, needed); } + ok(config->lpBinaryPathName && config->lpLoadOrderGroup && config->lpDependencies && config->lpServiceStartName && + config->lpDisplayName, "Expected all string struct members to be non-NULL\n"); ok(config->dwServiceType == (SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS), "Expected SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS, got %d\n", config->dwServiceType); ok(config->dwStartType == SERVICE_DISABLED, "Expected SERVICE_DISABLED, got %d\n", config->dwStartType); @@ -125,11 +127,11 @@ static void test_sequence(void) ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); /* TODO: Show the double 0 terminated string */ todo_wine + { ok(!memcmp(config->lpDependencies, dependencies, sizeof(dependencies)), "Wrong string\n"); - if(config->lpServiceStartName) /* FIXME: Wine workaround, remove when fixed */ - ok(!strcmp(config->lpServiceStartName, localsystem), "Expected 'LocalSystem', got '%s'\n", config->lpServiceStartName); - if(config->lpDisplayName) /* FIXME: Wine workaround, remove when fixed */ - ok(!strcmp(config->lpDisplayName, displayname), "Expected '%s', got '%s'\n", displayname, config->lpDisplayName); + ok(!strcmp(config->lpServiceStartName, localsystem), "Expected 'LocalSystem', got '%s'\n", config->lpServiceStartName); + } + ok(!strcmp(config->lpDisplayName, displayname), "Expected '%s', got '%s'\n", displayname, config->lpDisplayName); SetLastError(0xdeadbeef); ret = DeleteService(svc_handle);

1 0

Andrew Talbot : ntdll: Constify some variables.
by Alexandre Julliard June 28, 2007

June 28, 2007

Module: wine Branch: master Commit: e3708a60b40e96818fcf3f43b9e71fb473bf7bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3708a60b40e96818fcf3f43b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jun 27 20:59:51 2007 +0100 ntdll: Constify some variables. --- dlls/ntdll/thread.c | 2 +- dlls/ntdll/virtual.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b100608..eaea02c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -131,7 +131,7 @@ static inline NTSTATUS init_teb( TEB *teb ) * * Make sure the unicode string doesn't point beyond the end pointer */ -static inline void fix_unicode_string( UNICODE_STRING *str, char *end_ptr ) +static inline void fix_unicode_string( UNICODE_STRING *str, const char *end_ptr ) { if ((char *)str->Buffer >= end_ptr) { diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5964258..7f42f59 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -366,9 +366,9 @@ static void add_reserved_area( void *addr, size_t size ) * * Check if an address range goes beyond a given limit. */ -static inline int is_beyond_limit( void *addr, size_t size, void *limit ) +static inline int is_beyond_limit( const void *addr, size_t size, const void *limit ) { - return (limit && (addr >= limit || (char *)addr + size > (char *)limit)); + return (limit && (addr >= limit || (const char *)addr + size > (const char *)limit)); }

1 0

Konstantin Kondratyuk : uninstaller: Add Russian resources.
by Alexandre Julliard June 28, 2007

June 28, 2007

Module: wine Branch: master Commit: 83980adbe0687858f6cda62af4734744f698b872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83980adbe0687858f6cda62af… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Jun 27 11:03:11 2007 +0400 uninstaller: Add Russian resources. --- programs/uninstaller/Ru.rc | 44 ++++++++++++++++++++++++++++++++++++++++++ programs/uninstaller/rsrc.rc | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/Ru.rc b/programs/uninstaller/Ru.rc new file mode 100644 index 0000000..e1f182e --- /dev/null +++ b/programs/uninstaller/Ru.rc @@ -0,0 +1,44 @@ +/* + * Uninstaller (Russian Resources) + * + * Copyright 2007 Konstantin Kondratyuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�� WINE" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "��, �� :",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&��",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&� ��",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "&��",IDC_EXIT,270,81,50,14 +END + + +STRINGTABLE DISCARDABLE { + IDS_APPNAME, "�� WINE" + IDS_ABOUT, "�� WINE (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." + IDS_ABOUTTITLE, "� ��" + IDS_REGISTRYKEYNOTAVAILABLE, "�� !" + IDS_UNINSTALLFAILED, "�� '%s', �� -�� .\r\n�� ?" +} diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 4bc2394..5e64715 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -39,6 +39,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ru.rc" #include "Tr.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

James Hawkins : msi: Reference count the custom action data to avoid freeing the data by another thread .
by Alexandre Julliard June 27, 2007

June 27, 2007

Module: wine Branch: master Commit: 4c3e4ba02907f780d7bb78acc646115b5792765d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3e4ba02907f780d7bb78acc… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 25 15:56:21 2007 -0700 msi: Reference count the custom action data to avoid freeing the data by another thread. Based on a patch by Rob Shearman. --- dlls/msi/custom.c | 55 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2ea73f9..cd38af6 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -493,6 +493,7 @@ static UINT wait_process_handle(MSIPACKAGE* package, UINT type, typedef struct _msi_custom_action_info { struct list entry; + LONG refs; MSIPACKAGE *package; LPWSTR source; LPWSTR target; @@ -502,20 +503,31 @@ typedef struct _msi_custom_action_info { GUID guid; } msi_custom_action_info; -static void free_custom_action_data( msi_custom_action_info *info ) +static void release_custom_action_data( msi_custom_action_info *info ) { EnterCriticalSection( &msi_custom_action_cs ); - list_remove( &info->entry ); + + if (!--info->refs) + { + list_remove( &info->entry ); + if (info->handle) + CloseHandle( info->handle ); + msi_free( info->action ); + msi_free( info->source ); + msi_free( info->target ); + msiobj_release( &info->package->hdr ); + msi_free( info ); + } + LeaveCriticalSection( &msi_custom_action_cs ); - if (info->handle) - CloseHandle( info->handle ); - msi_free( info->action ); - msi_free( info->source ); - msi_free( info->target ); - msiobj_release( &info->package->hdr ); - msi_free( info ); } +/* must be called inside msi_custom_action_cs if info is in the pending custom actions list */ +static void addref_custom_action_data( msi_custom_action_info *info ) +{ + info->refs++; + } + static UINT wait_thread_handle( msi_custom_action_info *info ) { UINT rc = ERROR_SUCCESS; @@ -529,7 +541,7 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) if (!(info->type & msidbCustomActionTypeContinue)) rc = custom_get_thread_return( info->package, info->handle ); - free_custom_action_data( info ); + release_custom_action_data( info ); } else { @@ -550,6 +562,7 @@ static msi_custom_action_info *find_action_by_guid( const GUID *guid ) { if (IsEqualGUID( &info->guid, guid )) { + addref_custom_action_data( info ); found = TRUE; break; } @@ -657,7 +670,7 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) if (info->type & msidbCustomActionTypeAsync && info->type & msidbCustomActionTypeContinue) - free_custom_action_data( info ); + release_custom_action_data( info ); return r; } @@ -694,6 +707,8 @@ static DWORD WINAPI ACTION_CAInstallPackage(const GUID *guid) r = MsiInstallProductW(info->source, info->target); MsiSetInternalUI(old_level, NULL); + release_custom_action_data(info); + return r; } @@ -722,6 +737,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( return NULL; msiobj_addref( &package->hdr ); + info->refs = 2; /* 1 for our caller and 1 for thread we created */ info->package = package; info->type = type; info->target = strdupW( target ); @@ -736,7 +752,9 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( info->handle = CreateThread( NULL, 0, DllThread, &info->guid, 0, NULL ); if (!info->handle) { - free_custom_action_data( info ); + /* release both references */ + release_custom_action_data( info ); + release_custom_action_data( info ); return NULL; } @@ -753,6 +771,7 @@ static msi_custom_action_info *do_msidbCAConcurrentInstall( return NULL; msiobj_addref( &package->hdr ); + info->refs = 2; /* 1 for our caller and 1 for thread we created */ info->package = package; info->type = type; info->target = strdupW( target ); @@ -767,7 +786,9 @@ static msi_custom_action_info *do_msidbCAConcurrentInstall( info->handle = CreateThread( NULL, 0, ConcurrentInstallThread, &info->guid, 0, NULL ); if (!info->handle) { - free_custom_action_data( info ); + /* release both references */ + release_custom_action_data( info ); + release_custom_action_data( info ); return NULL; } @@ -1103,7 +1124,7 @@ static DWORD WINAPI ACTION_CallScript( const GUID *guid ) if (info->type & msidbCustomActionTypeAsync && info->type & msidbCustomActionTypeContinue) - free_custom_action_data( info ); + release_custom_action_data( info ); return S_OK; } @@ -1133,6 +1154,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( return NULL; msiobj_addref( &package->hdr ); + info->refs = 2; /* 1 for our caller and 1 for thread we created */ info->package = package; info->type = type; info->target = strdupW( function ); @@ -1147,7 +1169,9 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( info->handle = CreateThread( NULL, 0, ScriptThread, &info->guid, 0, NULL ); if (!info->handle) { - free_custom_action_data( info ); + /* release both references */ + release_custom_action_data( info ); + release_custom_action_data( info ); return NULL; } @@ -1329,7 +1353,6 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) { if (DuplicateHandle(GetCurrentProcess(), info->handle, GetCurrentProcess(), &wait_handles[handle_count], SYNCHRONIZE, FALSE, 0)) handle_count++; - free_custom_action_data( info ); } }

1 0

Alexandre Julliard : msi: Avoid some redundant checks in MsiCloseHandle.
by Alexandre Julliard June 27, 2007

June 27, 2007

Module: wine Branch: master Commit: bb8ba38f986ed36bdf78dfeee43e3ec840bc2b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8ba38f986ed36bdf78dfeee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 14:14:49 2007 +0200 msi: Avoid some redundant checks in MsiCloseHandle. --- dlls/msi/handle.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 34ebdbf..ae42d84 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -64,7 +64,7 @@ typedef struct msi_handle_info_t } msi_handle_info; static msi_handle_info *msihandletable = NULL; -static int msihandletable_size = 0; +static unsigned int msihandletable_size = 0; void msi_free_handle_table(void) { @@ -158,8 +158,6 @@ void *msihandle2msiinfo(MSIHANDLE handle, UINT type) EnterCriticalSection( &MSI_handle_cs ); handle--; - if( handle<0 ) - goto out; if( handle >= msihandletable_size ) goto out; if( msihandletable[handle].remote) @@ -185,8 +183,6 @@ IUnknown *msi_get_remote( MSIHANDLE handle ) EnterCriticalSection( &MSI_handle_cs ); handle--; - if( handle<0 ) - goto out; if( handle>=msihandletable_size ) goto out; if( !msihandletable[handle].remote) @@ -273,7 +269,6 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) { MSIOBJECTHDR *info = NULL; UINT ret = ERROR_INVALID_HANDLE; - IUnknown *unk; TRACE("%lx\n",handle); @@ -282,16 +277,17 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) EnterCriticalSection( &MSI_handle_cs ); - unk = msi_get_remote( handle ); - if (unk) + handle--; + if (handle >= msihandletable_size) + goto out; + + if (msihandletable[handle].remote) { - /* release once for handle, once for table entry */ - IUnknown_Release( unk ); - IUnknown_Release( unk ); + IUnknown_Release( msihandletable[handle].u.unk ); } else { - info = msihandle2msiinfo(handle, 0); + info = msihandletable[handle].u.obj; if( !info ) goto out; @@ -300,17 +296,15 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) ERR("Invalid handle!\n"); goto out; } - - msiobj_release( info ); } - msihandletable[handle-1].u.obj = NULL; - msihandletable[handle-1].remote = 0; - msihandletable[handle-1].dwThreadId = 0; + msihandletable[handle].u.obj = NULL; + msihandletable[handle].remote = 0; + msihandletable[handle].dwThreadId = 0; ret = ERROR_SUCCESS; - TRACE("handle %lx Destroyed\n", handle); + TRACE("handle %lx destroyed\n", handle+1); out: LeaveCriticalSection( &MSI_handle_cs ); if( info )

1 0

James Hawkins : msi: Add support for remote handles.
by Alexandre Julliard June 27, 2007

June 27, 2007

Module: wine Branch: master Commit: 46158e034cb0f17f32d5c7516df96f1a5ded6093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46158e034cb0f17f32d5c7516… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 26 17:02:06 2007 -0700 msi: Add support for remote handles. --- dlls/msi/handle.c | 135 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 108 insertions(+), 27 deletions(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 6af3c41..34ebdbf 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" @@ -53,7 +55,11 @@ static CRITICAL_SECTION MSI_object_cs = { &MSI_object_cs_debug, -1, 0, 0, 0, 0 } typedef struct msi_handle_info_t { - MSIOBJECTHDR *obj; + BOOL remote; + union { + MSIOBJECTHDR *obj; + IUnknown *unk; + } u; DWORD dwThreadId; } msi_handle_info; @@ -67,16 +73,13 @@ void msi_free_handle_table(void) msihandletable_size = 0; } -MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) +static MSIHANDLE alloc_handle_table_entry(void) { - MSIHANDLE ret = 0; UINT i; - EnterCriticalSection( &MSI_handle_cs ); - /* find a slot */ for(i=0; i<msihandletable_size; i++) - if( !msihandletable[i].obj ) + if( !msihandletable[i].u.obj && !msihandletable[i].u.unk ) break; if( i==msihandletable_size ) { @@ -94,19 +97,58 @@ MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) newsize*sizeof(msi_handle_info)); } if (!p) - goto out; + return 0; msihandletable = p; msihandletable_size = newsize; } + return i + 1; +} + +MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) +{ + msi_handle_info *entry; + MSIHANDLE ret; + + EnterCriticalSection( &MSI_handle_cs ); + + ret = alloc_handle_table_entry(); + if (ret) + { + entry = &msihandletable[ ret - 1 ]; + msiobj_addref( obj ); + entry->u.obj = obj; + entry->dwThreadId = GetCurrentThreadId(); + entry->remote = FALSE; + } + + LeaveCriticalSection( &MSI_handle_cs ); - msiobj_addref( obj ); - msihandletable[i].obj = obj; - msihandletable[i].dwThreadId = GetCurrentThreadId(); - ret = (MSIHANDLE) (i+1); -out: TRACE("%p -> %ld\n", obj, ret ); + return ret; +} + +MSIHANDLE alloc_msi_remote_handle( IUnknown *unk ) +{ + msi_handle_info *entry; + MSIHANDLE ret; + + EnterCriticalSection( &MSI_handle_cs ); + + ret = alloc_handle_table_entry(); + if (ret) + { + entry = &msihandletable[ ret - 1 ]; + IUnknown_AddRef( unk ); + entry->u.unk = unk; + entry->dwThreadId = GetCurrentThreadId(); + entry->remote = TRUE; + } + LeaveCriticalSection( &MSI_handle_cs ); + + TRACE("%p -> %ld\n", unk, ret); + return ret; } @@ -118,15 +160,17 @@ void *msihandle2msiinfo(MSIHANDLE handle, UINT type) handle--; if( handle<0 ) goto out; - if( handle>=msihandletable_size ) + if( handle >= msihandletable_size ) goto out; - if( !msihandletable[handle].obj ) + if( msihandletable[handle].remote) goto out; - if( msihandletable[handle].obj->magic != MSIHANDLE_MAGIC ) + if( !msihandletable[handle].u.obj ) goto out; - if( type && (msihandletable[handle].obj->type != type) ) + if( msihandletable[handle].u.obj->magic != MSIHANDLE_MAGIC ) goto out; - ret = msihandletable[handle].obj; + if( type && (msihandletable[handle].u.obj->type != type) ) + goto out; + ret = msihandletable[handle].u.obj; msiobj_addref( ret ); out: @@ -135,6 +179,28 @@ out: return (void*) ret; } +IUnknown *msi_get_remote( MSIHANDLE handle ) +{ + IUnknown *unk = NULL; + + EnterCriticalSection( &MSI_handle_cs ); + handle--; + if( handle<0 ) + goto out; + if( handle>=msihandletable_size ) + goto out; + if( !msihandletable[handle].remote) + goto out; + unk = msihandletable[handle].u.unk; + if( unk ) + IUnknown_AddRef( unk ); + +out: + LeaveCriticalSection( &MSI_handle_cs ); + + return unk; +} + void *alloc_msiobject(UINT type, UINT size, msihandledestructor destroy ) { MSIOBJECTHDR *info; @@ -205,8 +271,9 @@ int msiobj_release( MSIOBJECTHDR *info ) */ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) { - MSIOBJECTHDR *info; + MSIOBJECTHDR *info = NULL; UINT ret = ERROR_INVALID_HANDLE; + IUnknown *unk; TRACE("%lx\n",handle); @@ -215,18 +282,32 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) EnterCriticalSection( &MSI_handle_cs ); - info = msihandle2msiinfo(handle, 0); - if( !info ) - goto out; - - if( info->magic != MSIHANDLE_MAGIC ) + unk = msi_get_remote( handle ); + if (unk) { - ERR("Invalid handle!\n"); - goto out; + /* release once for handle, once for table entry */ + IUnknown_Release( unk ); + IUnknown_Release( unk ); } + else + { + info = msihandle2msiinfo(handle, 0); + if( !info ) + goto out; + + if( info->magic != MSIHANDLE_MAGIC ) + { + ERR("Invalid handle!\n"); + goto out; + } + + msiobj_release( info ); + } + + msihandletable[handle-1].u.obj = NULL; + msihandletable[handle-1].remote = 0; + msihandletable[handle-1].dwThreadId = 0; - msiobj_release( info ); - msihandletable[handle-1].obj = NULL; ret = ERROR_SUCCESS; TRACE("handle %lx Destroyed\n", handle);

1 0

Paul Vriens : advapi32/service: Return (more) correct needed buffersize.
by Alexandre Julliard June 27, 2007

June 27, 2007

Module: wine Branch: master Commit: dcef0bbf710626c6857594b8e2cbf4d1a10922cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcef0bbf710626c6857594b8e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 26 20:55:01 2007 +0200 advapi32/service: Return (more) correct needed buffersize. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3319ca0..09ab0de 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1815,7 +1815,7 @@ BOOL WINAPI QueryServiceConfigA( SC_HANDLE hService, LPQUERY_SERVICE_CONFIGA con MAP_STR( lpDisplayName ); #undef MAP_STR - *needed = p - buffer; + *needed = p - (LPSTR)config; ret = TRUE; done:

1 0

Paul Vriens : advapi32/service: Fix wrong key.
by Alexandre Julliard June 27, 2007

June 27, 2007

Module: wine Branch: master Commit: 169af787d2edc9330aa8b3e16dd6f2afa127b9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=169af787d2edc9330aa8b3e16… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 26 17:47:56 2007 +0200 advapi32/service: Fix wrong key. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 701227b..3319ca0 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1880,7 +1880,7 @@ QueryServiceConfigW( SC_HANDLE hService, total += sizeof(WCHAR); sz = 0; - r = RegQueryValueExW( hKey, szStart, 0, &type, NULL, &sz ); + r = RegQueryValueExW( hKey, szObjectName, 0, &type, NULL, &sz ); if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) total += sz;

1 0