wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Michael Stefaniuc : winefile: Do not use wide character constants.
by Alexandre Julliard 28 Jun '07

28 Jun '07

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

Andrew Talbot : ntdll: Constify some variables.
by Alexandre Julliard 28 Jun '07

28 Jun '07

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

Paul Vriens : advapi32/service: Don't rely blindly on type.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: ff62d6cf42e8504f5d8fa27d0c848723cca4af7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff62d6cf42e8504f5d8fa27d0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 28 07:59:55 2007 +0200 advapi32/service: Don't rely blindly on type. --- dlls/advapi32/service.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c7bb0c7..731d668 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1915,22 +1915,22 @@ QueryServiceConfigW( SC_HANDLE hService, sz = sizeof val; r = RegQueryValueExW( hKey, szType, 0, &type, (LPBYTE)&val, &sz ); - if( ( r == ERROR_SUCCESS ) || ( type == REG_DWORD ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_DWORD ) ) lpServiceConfig->dwServiceType = val; sz = sizeof val; r = RegQueryValueExW( hKey, szStart, 0, &type, (LPBYTE)&val, &sz ); - if( ( r == ERROR_SUCCESS ) || ( type == REG_DWORD ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_DWORD ) ) lpServiceConfig->dwStartType = val; sz = sizeof val; r = RegQueryValueExW( hKey, szError, 0, &type, (LPBYTE)&val, &sz ); - if( ( r == ERROR_SUCCESS ) || ( type == REG_DWORD ) ) + 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 ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_DWORD ) ) lpServiceConfig->dwTagId = val; /* now do the strings */ @@ -1958,7 +1958,7 @@ 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 ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) { p += sz; n -= sz; @@ -1973,7 +1973,7 @@ QueryServiceConfigW( SC_HANDLE hService, sz = n; r = RegQueryValueExW( hKey, szDependencies, 0, &type, p, &sz ); lpServiceConfig->lpDependencies = (LPWSTR) p; - if( ( r == ERROR_SUCCESS ) || ( type == REG_SZ ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) { p += sz; n -= sz; @@ -1988,7 +1988,7 @@ QueryServiceConfigW( SC_HANDLE hService, sz = n; r = RegQueryValueExW( hKey, szObjectName, 0, &type, p, &sz ); lpServiceConfig->lpServiceStartName = (LPWSTR) p; - if( ( r == ERROR_SUCCESS ) || ( type == REG_SZ ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) { p += sz; n -= sz; @@ -2003,7 +2003,7 @@ QueryServiceConfigW( SC_HANDLE hService, sz = n; r = RegQueryValueExW( hKey, szDisplayName, 0, &type, p, &sz ); lpServiceConfig->lpDisplayName = (LPWSTR) p; - if( ( r == ERROR_SUCCESS ) || ( type == REG_SZ ) ) + if( ( r == ERROR_SUCCESS ) && ( type == REG_SZ ) ) { p += sz; n -= sz;

1 0

Paul Vriens : advapi32/service: Make sure we fill all struct members.
by Alexandre Julliard 28 Jun '07

28 Jun '07

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

Konstantin Kondratyuk : uninstaller: Add Russian resources.
by Alexandre Julliard 28 Jun '07

28 Jun '07

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 27 Jun '07

27 Jun '07

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 27 Jun '07

27 Jun '07

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 27 Jun '07

27 Jun '07

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 27 Jun '07

27 Jun '07

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 27 Jun '07

27 Jun '07

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

← Newer
1
...
5
6
7
8
9
10
11
...
86
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 June 2007