Skip to content

W
wine-winehq
Commit 3611398b authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

msi: Remove msi_ prefix from static functions.

parent d9d700f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 296 deletions
dlls/msi/files.c
View file @ 3611398b
...@@ -67,7 +67,7 @@ HANDLE msi_create_file( MSIPACKAGE *package, const WCHAR *filename, DWORD access ...@@ -67,7 +67,7 @@ HANDLE msi_create_file( MSIPACKAGE *package, const WCHAR *filename, DWORD access
return handle; return handle;
} }
static BOOL msi_copy_file( MSIPACKAGE *package, const WCHAR *src, const WCHAR *dst, BOOL fail_if_exists ) static BOOL copy_file( MSIPACKAGE *package, const WCHAR *src, const WCHAR *dst, BOOL fail_if_exists )
{ {
BOOL ret; BOOL ret;
msi_disable_fs_redirection( package ); msi_disable_fs_redirection( package );
...@@ -85,7 +85,7 @@ BOOL msi_delete_file( MSIPACKAGE *package, const WCHAR *filename ) ...@@ -85,7 +85,7 @@ BOOL msi_delete_file( MSIPACKAGE *package, const WCHAR *filename )
return ret; return ret;
} }
static BOOL msi_create_directory( MSIPACKAGE *package, const WCHAR *path ) static BOOL create_directory( MSIPACKAGE *package, const WCHAR *path )
{ {
BOOL ret; BOOL ret;
msi_disable_fs_redirection( package ); msi_disable_fs_redirection( package );
...@@ -148,7 +148,7 @@ BOOL msi_move_file( MSIPACKAGE *package, const WCHAR *from, const WCHAR *to, DWO ...@@ -148,7 +148,7 @@ BOOL msi_move_file( MSIPACKAGE *package, const WCHAR *from, const WCHAR *to, DWO
return ret; return ret;
} }
static BOOL msi_apply_filepatch( MSIPACKAGE *package, const WCHAR *patch, const WCHAR *old, const WCHAR *new ) static BOOL apply_filepatch( MSIPACKAGE *package, const WCHAR *patch, const WCHAR *old, const WCHAR *new )
{ {
BOOL ret; BOOL ret;
msi_disable_fs_redirection( package ); msi_disable_fs_redirection( package );
...@@ -220,7 +220,7 @@ BOOL msi_create_full_path( MSIPACKAGE *package, const WCHAR *path ) ...@@ -220,7 +220,7 @@ BOOL msi_create_full_path( MSIPACKAGE *package, const WCHAR *path )
while ((len = lstrlenW( new_path )) && new_path[len - 1] == '\\') while ((len = lstrlenW( new_path )) && new_path[len - 1] == '\\')
new_path[len - 1] = 0; new_path[len - 1] = 0;
while (!msi_create_directory( package, new_path )) while (!create_directory( package, new_path ))
{ {
WCHAR *slash; WCHAR *slash;
DWORD last_error = GetLastError(); DWORD last_error = GetLastError();
...@@ -248,7 +248,7 @@ BOOL msi_create_full_path( MSIPACKAGE *package, const WCHAR *path ) ...@@ -248,7 +248,7 @@ BOOL msi_create_full_path( MSIPACKAGE *package, const WCHAR *path )
return ret; return ret;
} }
static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *action ) static void file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *action )
{ {
MSIRECORD *uirow; MSIRECORD *uirow;
...@@ -401,11 +401,11 @@ static void schedule_install_files(MSIPACKAGE *package) ...@@ -401,11 +401,11 @@ static void schedule_install_files(MSIPACKAGE *package)
} }
} }
static UINT copy_file( MSIPACKAGE *package, MSIFILE *file, WCHAR *source ) static UINT copy_file_attributes( MSIPACKAGE *package, MSIFILE *file, WCHAR *source )
{ {
BOOL ret; BOOL ret;
ret = msi_copy_file( package, source, file->TargetPath, FALSE ); ret = copy_file( package, source, file->TargetPath, FALSE );
if (!ret) if (!ret)
return GetLastError(); return GetLastError();
...@@ -419,7 +419,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) ...@@ -419,7 +419,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
TRACE("Copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); TRACE("Copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath));
gle = copy_file( package, file, source ); gle = copy_file_attributes( package, file, source );
if (gle == ERROR_SUCCESS) if (gle == ERROR_SUCCESS)
return gle; return gle;
...@@ -432,7 +432,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) ...@@ -432,7 +432,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
{ {
msi_set_file_attributes( package, file->TargetPath, FILE_ATTRIBUTE_NORMAL ); msi_set_file_attributes( package, file->TargetPath, FILE_ATTRIBUTE_NORMAL );
gle = copy_file( package, file, source ); gle = copy_file_attributes( package, file, source );
TRACE("Overwriting existing file: %d\n", gle); TRACE("Overwriting existing file: %d\n", gle);
} }
if (gle == ERROR_SHARING_VIOLATION || gle == ERROR_USER_MAPPED_FILE) if (gle == ERROR_SHARING_VIOLATION || gle == ERROR_USER_MAPPED_FILE)
...@@ -453,7 +453,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) ...@@ -453,7 +453,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
if (!GetTempFileNameW( pathW, L"msi", 0, tmpfileW )) tmpfileW[0] = 0; if (!GetTempFileNameW( pathW, L"msi", 0, tmpfileW )) tmpfileW[0] = 0;
free( pathW ); free( pathW );
if (msi_copy_file( package, source, tmpfileW, FALSE ) && if (copy_file( package, source, tmpfileW, FALSE ) &&
msi_move_file( package, file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT ) && msi_move_file( package, file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT ) &&
msi_move_file( package, tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT )) msi_move_file( package, tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT ))
{ {
...@@ -472,7 +472,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) ...@@ -472,7 +472,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
return gle; return gle;
} }
static UINT create_directory( MSIPACKAGE *package, const WCHAR *dir ) static UINT create_folder( MSIPACKAGE *package, const WCHAR *dir )
{ {
MSIFOLDER *folder; MSIFOLDER *folder;
const WCHAR *install_path; const WCHAR *install_path;
...@@ -519,7 +519,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR filename, DWORD action, ...@@ -519,7 +519,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR filename, DWORD action,
if (!msi_is_global_assembly( file->Component )) if (!msi_is_global_assembly( file->Component ))
{ {
create_directory( package, file->Component->Directory ); create_folder( package, file->Component->Directory );
} }
*path = wcsdup( file->TargetPath ); *path = wcsdup( file->TargetPath );
*attrs = file->Attributes; *attrs = file->Attributes;
...@@ -579,7 +579,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ...@@ -579,7 +579,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
{ {
BOOL is_global_assembly = msi_is_global_assembly( file->Component ); BOOL is_global_assembly = msi_is_global_assembly( file->Component );
msi_file_update_ui( package, file, L"InstallFiles" ); file_update_ui( package, file, L"InstallFiles" );
rc = msi_load_media_info( package, file->Sequence, mi ); rc = msi_load_media_info( package, file->Sequence, mi );
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
...@@ -628,7 +628,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ...@@ -628,7 +628,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
if (!is_global_assembly) if (!is_global_assembly)
{ {
create_directory(package, file->Component->Directory); create_folder(package, file->Component->Directory);
} }
rc = copy_install_file(package, file, source); rc = copy_install_file(package, file, source);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
...@@ -707,7 +707,7 @@ static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch ) ...@@ -707,7 +707,7 @@ static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch )
WCHAR *tmpfile = msi_create_temp_file( package->db ); WCHAR *tmpfile = msi_create_temp_file( package->db );
if (!tmpfile) return ERROR_INSTALL_FAILURE; if (!tmpfile) return ERROR_INSTALL_FAILURE;
if (msi_apply_filepatch( package, patch->path, patch->File->TargetPath, tmpfile )) if (apply_filepatch( package, patch->path, patch->File->TargetPath, tmpfile ))
{ {
msi_delete_file( package, patch->File->TargetPath ); msi_delete_file( package, patch->File->TargetPath );
msi_move_file( package, tmpfile, patch->File->TargetPath, 0 ); msi_move_file( package, tmpfile, patch->File->TargetPath, 0 );
...@@ -751,7 +751,7 @@ UINT msi_patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATC ...@@ -751,7 +751,7 @@ UINT msi_patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATC
if ((path = msi_get_assembly_path( package, displayname ))) if ((path = msi_get_assembly_path( package, displayname )))
{ {
if (!msi_copy_file( package, path, patch->File->TargetPath, FALSE )) if (!copy_file( package, path, patch->File->TargetPath, FALSE ))
{ {
ERR( "failed to copy file %s -> %s (%lu)\n", debugstr_w(path), ERR( "failed to copy file %s -> %s (%lu)\n", debugstr_w(path),
debugstr_w(patch->File->TargetPath), GetLastError() ); debugstr_w(patch->File->TargetPath), GetLastError() );
...@@ -884,10 +884,10 @@ static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *de ...@@ -884,10 +884,10 @@ static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *de
else else
{ {
TRACE("copying %s -> %s\n", debugstr_w(source), debugstr_w(dest)); TRACE("copying %s -> %s\n", debugstr_w(source), debugstr_w(dest));
ret = msi_copy_file( package, source, dest, FALSE ); ret = copy_file( package, source, dest, FALSE );
if (!ret) if (!ret)
{ {
WARN( "msi_copy_file failed: %lu\n", GetLastError() ); WARN( "copy_file failed: %lu\n", GetLastError() );
return FALSE; return FALSE;
} }
} }
...@@ -1294,7 +1294,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) ...@@ -1294,7 +1294,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param)
} }
TRACE("Duplicating file %s to %s\n", debugstr_w(file->TargetPath), debugstr_w(dest)); TRACE("Duplicating file %s to %s\n", debugstr_w(file->TargetPath), debugstr_w(dest));
if (!msi_copy_file( package, file->TargetPath, dest, TRUE )) if (!copy_file( package, file->TargetPath, dest, TRUE ))
{ {
WARN( "failed to copy file %s -> %s (%lu)\n", WARN( "failed to copy file %s -> %s (%lu)\n",
debugstr_w(file->TargetPath), debugstr_w(dest), GetLastError() ); debugstr_w(file->TargetPath), debugstr_w(dest), GetLastError() );
...@@ -1550,7 +1550,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) ...@@ -1550,7 +1550,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package )
VS_FIXEDFILEINFO *ver; VS_FIXEDFILEINFO *ver;
comp = file->Component; comp = file->Component;
msi_file_update_ui( package, file, L"RemoveFiles" ); file_update_ui( package, file, L"RemoveFiles" );
comp->Action = msi_get_component_action( package, comp ); comp->Action = msi_get_component_action( package, comp );
if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE) if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE)
......
dlls/msi/handle.c
View file @ 3611398b
...@@ -35,27 +35,27 @@ ...@@ -35,27 +35,27 @@
WINE_DEFAULT_DEBUG_CHANNEL(msi); WINE_DEFAULT_DEBUG_CHANNEL(msi);
static CRITICAL_SECTION MSI_handle_cs; static CRITICAL_SECTION handle_cs;
static CRITICAL_SECTION_DEBUG MSI_handle_cs_debug = static CRITICAL_SECTION_DEBUG handle_cs_debug =
{ {
0, 0, &MSI_handle_cs, 0, 0, &handle_cs,
{ &MSI_handle_cs_debug.ProcessLocksList, { &handle_cs_debug.ProcessLocksList,
&MSI_handle_cs_debug.ProcessLocksList }, &handle_cs_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": MSI_handle_cs") } 0, 0, { (DWORD_PTR)(__FILE__ ": handle_cs") }
}; };
static CRITICAL_SECTION MSI_handle_cs = { &MSI_handle_cs_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION handle_cs = { &handle_cs_debug, -1, 0, 0, 0, 0 };
static CRITICAL_SECTION MSI_object_cs; static CRITICAL_SECTION object_cs;
static CRITICAL_SECTION_DEBUG MSI_object_cs_debug = static CRITICAL_SECTION_DEBUG object_cs_debug =
{ {
0, 0, &MSI_object_cs, 0, 0, &object_cs,
{ &MSI_object_cs_debug.ProcessLocksList, { &object_cs_debug.ProcessLocksList,
&MSI_object_cs_debug.ProcessLocksList }, &object_cs_debug.ProcessLocksList },
0, 0, { (DWORD_PTR)(__FILE__ ": MSI_object_cs") } 0, 0, { (DWORD_PTR)(__FILE__ ": object_cs") }
}; };
static CRITICAL_SECTION MSI_object_cs = { &MSI_object_cs_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION object_cs = { &object_cs_debug, -1, 0, 0, 0, 0 };
typedef struct msi_handle_info_t struct handle_info
{ {
BOOL remote; BOOL remote;
union { union {
...@@ -63,18 +63,18 @@ typedef struct msi_handle_info_t ...@@ -63,18 +63,18 @@ typedef struct msi_handle_info_t
MSIHANDLE rem; MSIHANDLE rem;
} u; } u;
DWORD dwThreadId; DWORD dwThreadId;
} msi_handle_info; };
static msi_handle_info *msihandletable = NULL; static struct handle_info *handle_table = NULL;
static unsigned int msihandletable_size = 0; static unsigned int handle_table_size = 0;
void msi_free_handle_table(void) void msi_free_handle_table(void)
{ {
free( msihandletable ); free( handle_table );
msihandletable = NULL; handle_table = NULL;
msihandletable_size = 0; handle_table_size = 0;
DeleteCriticalSection(&MSI_handle_cs); DeleteCriticalSection(&handle_cs);
DeleteCriticalSection(&MSI_object_cs); DeleteCriticalSection(&object_cs);
} }
static MSIHANDLE alloc_handle_table_entry(void) static MSIHANDLE alloc_handle_table_entry(void)
...@@ -82,50 +82,50 @@ static MSIHANDLE alloc_handle_table_entry(void) ...@@ -82,50 +82,50 @@ static MSIHANDLE alloc_handle_table_entry(void)
UINT i; UINT i;
/* find a slot */ /* find a slot */
for(i=0; i<msihandletable_size; i++) for(i = 0; i < handle_table_size; i++)
if( !msihandletable[i].u.obj && !msihandletable[i].u.rem ) if (!handle_table[i].u.obj && !handle_table[i].u.rem)
break; break;
if( i==msihandletable_size ) if (i == handle_table_size)
{ {
msi_handle_info *p; struct handle_info *p;
int newsize; int newsize;
if (msihandletable_size == 0) if (!handle_table_size)
{ {
newsize = 256; newsize = 256;
p = calloc(newsize, sizeof(*p)); p = calloc(newsize, sizeof(*p));
} }
else else
{ {
newsize = msihandletable_size * 2; newsize = handle_table_size * 2;
p = realloc(msihandletable, newsize * sizeof(*p)); p = realloc(handle_table, newsize * sizeof(*p));
if (p) memset(p + msihandletable_size, 0, (newsize - msihandletable_size) * sizeof(*p)); if (p) memset(p + handle_table_size, 0, (newsize - handle_table_size) * sizeof(*p));
} }
if (!p) if (!p)
return 0; return 0;
msihandletable = p; handle_table = p;
msihandletable_size = newsize; handle_table_size = newsize;
} }
return i + 1; return i + 1;
} }
MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj )
{ {
msi_handle_info *entry; struct handle_info *entry;
MSIHANDLE ret; MSIHANDLE ret;
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
ret = alloc_handle_table_entry(); ret = alloc_handle_table_entry();
if (ret) if (ret)
{ {
entry = &msihandletable[ ret - 1 ]; entry = &handle_table[ ret - 1 ];
msiobj_addref( obj ); msiobj_addref( obj );
entry->u.obj = obj; entry->u.obj = obj;
entry->dwThreadId = GetCurrentThreadId(); entry->dwThreadId = GetCurrentThreadId();
entry->remote = FALSE; entry->remote = FALSE;
} }
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
TRACE( "%p -> %lu\n", obj, ret ); TRACE( "%p -> %lu\n", obj, ret );
...@@ -134,21 +134,21 @@ MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) ...@@ -134,21 +134,21 @@ MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj )
MSIHANDLE alloc_msi_remote_handle(MSIHANDLE remote) MSIHANDLE alloc_msi_remote_handle(MSIHANDLE remote)
{ {
msi_handle_info *entry; struct handle_info *entry;
MSIHANDLE ret; MSIHANDLE ret;
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
ret = alloc_handle_table_entry(); ret = alloc_handle_table_entry();
if (ret) if (ret)
{ {
entry = &msihandletable[ ret - 1 ]; entry = &handle_table[ ret - 1 ];
entry->u.rem = remote; entry->u.rem = remote;
entry->dwThreadId = GetCurrentThreadId(); entry->dwThreadId = GetCurrentThreadId();
entry->remote = TRUE; entry->remote = TRUE;
} }
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
TRACE( "%lu -> %lu\n", remote, ret ); TRACE( "%lu -> %lu\n", remote, ret );
...@@ -159,23 +159,23 @@ void *msihandle2msiinfo(MSIHANDLE handle, UINT type) ...@@ -159,23 +159,23 @@ void *msihandle2msiinfo(MSIHANDLE handle, UINT type)
{ {
MSIOBJECTHDR *ret = NULL; MSIOBJECTHDR *ret = NULL;
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
handle--; handle--;
if( handle >= msihandletable_size ) if (handle >= handle_table_size)
goto out; goto out;
if( msihandletable[handle].remote) if (handle_table[handle].remote)
goto out; goto out;
if( !msihandletable[handle].u.obj ) if (!handle_table[handle].u.obj)
goto out; goto out;
if( msihandletable[handle].u.obj->magic != MSIHANDLE_MAGIC ) if (handle_table[handle].u.obj->magic != MSIHANDLE_MAGIC)
goto out; goto out;
if( type && (msihandletable[handle].u.obj->type != type) ) if (type && (handle_table[handle].u.obj->type != type))
goto out; goto out;
ret = msihandletable[handle].u.obj; ret = handle_table[handle].u.obj;
msiobj_addref( ret ); msiobj_addref( ret );
out: out:
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
return ret; return ret;
} }
...@@ -184,16 +184,16 @@ MSIHANDLE msi_get_remote( MSIHANDLE handle ) ...@@ -184,16 +184,16 @@ MSIHANDLE msi_get_remote( MSIHANDLE handle )
{ {
MSIHANDLE ret = 0; MSIHANDLE ret = 0;
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
handle--; handle--;
if( handle>=msihandletable_size ) if (handle >= handle_table_size)
goto out; goto out;
if( !msihandletable[handle].remote) if (!handle_table[handle].remote)
goto out; goto out;
ret = msihandletable[handle].u.rem; ret = handle_table[handle].u.rem;
out: out:
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
return ret; return ret;
} }
...@@ -230,12 +230,12 @@ void msiobj_addref( MSIOBJECTHDR *info ) ...@@ -230,12 +230,12 @@ void msiobj_addref( MSIOBJECTHDR *info )
void msiobj_lock( MSIOBJECTHDR *info ) void msiobj_lock( MSIOBJECTHDR *info )
{ {
EnterCriticalSection( &MSI_object_cs ); EnterCriticalSection( &object_cs );
} }
void msiobj_unlock( MSIOBJECTHDR *info ) void msiobj_unlock( MSIOBJECTHDR *info )
{ {
LeaveCriticalSection( &MSI_object_cs ); LeaveCriticalSection( &object_cs );
} }
int msiobj_release( MSIOBJECTHDR *info ) int msiobj_release( MSIOBJECTHDR *info )
...@@ -276,19 +276,19 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) ...@@ -276,19 +276,19 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle)
if (!handle) if (!handle)
return ERROR_SUCCESS; return ERROR_SUCCESS;
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
handle--; handle--;
if (handle >= msihandletable_size) if (handle >= handle_table_size)
goto out; goto out;
if (msihandletable[handle].remote) if (handle_table[handle].remote)
{ {
remote_CloseHandle( msihandletable[handle].u.rem ); remote_CloseHandle( handle_table[handle].u.rem );
} }
else else
{ {
info = msihandletable[handle].u.obj; info = handle_table[handle].u.obj;
if( !info ) if( !info )
goto out; goto out;
...@@ -299,15 +299,15 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) ...@@ -299,15 +299,15 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle)
} }
} }
msihandletable[handle].u.obj = NULL; handle_table[handle].u.obj = NULL;
msihandletable[handle].remote = 0; handle_table[handle].remote = 0;
msihandletable[handle].dwThreadId = 0; handle_table[handle].dwThreadId = 0;
ret = ERROR_SUCCESS; ret = ERROR_SUCCESS;
TRACE( "handle %lu destroyed\n", handle + 1 ); TRACE( "handle %lu destroyed\n", handle + 1 );
out: out:
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
if( info ) if( info )
msiobj_release( info ); msiobj_release( info );
...@@ -328,18 +328,18 @@ UINT WINAPI MsiCloseAllHandles(void) ...@@ -328,18 +328,18 @@ UINT WINAPI MsiCloseAllHandles(void)
TRACE("\n"); TRACE("\n");
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
for(i=0; i<msihandletable_size; i++) for (i = 0; i < handle_table_size; i++)
{ {
if(msihandletable[i].dwThreadId == GetCurrentThreadId()) if (handle_table[i].dwThreadId == GetCurrentThreadId())
{ {
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
MsiCloseHandle( i+1 ); MsiCloseHandle( i + 1 );
EnterCriticalSection( &MSI_handle_cs ); EnterCriticalSection( &handle_cs );
n++; n++;
} }
} }
LeaveCriticalSection( &MSI_handle_cs ); LeaveCriticalSection( &handle_cs );
return n; return n;
} }
......
dlls/msi/insert.c
View file @ 3611398b
...@@ -106,7 +106,7 @@ err: ...@@ -106,7 +106,7 @@ err:
/* checks to see if the column order specified in the INSERT query /* checks to see if the column order specified in the INSERT query
* matches the column order of the table * matches the column order of the table
*/ */
static BOOL msi_columns_in_order(MSIINSERTVIEW *iv, UINT col_count) static BOOL columns_in_order(MSIINSERTVIEW *iv, UINT col_count)
{ {
LPCWSTR a, b; LPCWSTR a, b;
UINT i; UINT i;
...@@ -124,7 +124,7 @@ static BOOL msi_columns_in_order(MSIINSERTVIEW *iv, UINT col_count) ...@@ -124,7 +124,7 @@ static BOOL msi_columns_in_order(MSIINSERTVIEW *iv, UINT col_count)
/* rearranges the data in the record to be inserted based on column order, /* rearranges the data in the record to be inserted based on column order,
* and pads the record for any missing columns in the INSERT query * and pads the record for any missing columns in the INSERT query
*/ */
static UINT msi_arrange_record(MSIINSERTVIEW *iv, MSIRECORD **values) static UINT arrange_record(MSIINSERTVIEW *iv, MSIRECORD **values)
{ {
MSIRECORD *padded; MSIRECORD *padded;
UINT col_count, val_count; UINT col_count, val_count;
...@@ -140,7 +140,7 @@ static UINT msi_arrange_record(MSIINSERTVIEW *iv, MSIRECORD **values) ...@@ -140,7 +140,7 @@ static UINT msi_arrange_record(MSIINSERTVIEW *iv, MSIRECORD **values)
/* check to see if the columns are arranged already /* check to see if the columns are arranged already
* to avoid unnecessary copying * to avoid unnecessary copying
*/ */
if (col_count == val_count && msi_columns_in_order(iv, col_count)) if (col_count == val_count && columns_in_order(iv, col_count))
return ERROR_SUCCESS; return ERROR_SUCCESS;
padded = MSI_CreateRecord(col_count); padded = MSI_CreateRecord(col_count);
...@@ -231,7 +231,7 @@ static UINT INSERT_execute( struct tagMSIVIEW *view, MSIRECORD *record ) ...@@ -231,7 +231,7 @@ static UINT INSERT_execute( struct tagMSIVIEW *view, MSIRECORD *record )
if( !values ) if( !values )
goto err; goto err;
r = msi_arrange_record( iv, &values ); r = arrange_record( iv, &values );
if( r != ERROR_SUCCESS ) if( r != ERROR_SUCCESS )
goto err; goto err;
......
dlls/msi/media.c
View file @ 3611398b
...@@ -60,7 +60,7 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) ...@@ -60,7 +60,7 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root)
return !wcsicmp( mi->volume_label, p ); return !wcsicmp( mi->volume_label, p );
} }
static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static UINT change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)
{ {
MSIRECORD *record; MSIRECORD *record;
LPWSTR source_dir; LPWSTR source_dir;
...@@ -83,7 +83,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) ...@@ -83,7 +83,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi)
return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT;
} }
static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) static MSICABINETSTREAM *get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )
{ {
MSICABINETSTREAM *cab; MSICABINETSTREAM *cab;
...@@ -183,7 +183,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) ...@@ -183,7 +183,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode )
MSICABINETSTREAM *cab; MSICABINETSTREAM *cab;
IStream *stream; IStream *stream;
if (!(cab = msi_get_cabinet_stream( package_disk.package, package_disk.id ))) if (!(cab = get_cabinet_stream( package_disk.package, package_disk.id )))
{ {
WARN("failed to get cabinet stream\n"); WARN("failed to get cabinet stream\n");
return -1; return -1;
...@@ -255,7 +255,7 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype ) ...@@ -255,7 +255,7 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype )
return -1; return -1;
} }
static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) static UINT media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi)
{ {
MSIRECORD *row; MSIRECORD *row;
...@@ -313,7 +313,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, ...@@ -313,7 +313,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint,
mi->disk_id++; mi->disk_id++;
mi->is_continuous = TRUE; mi->is_continuous = TRUE;
rc = msi_media_get_disk_info(data->package, mi); rc = media_get_disk_info(data->package, mi);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
ERR("Failed to get next cabinet information: %d\n", rc); ERR("Failed to get next cabinet information: %d\n", rc);
...@@ -355,7 +355,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, ...@@ -355,7 +355,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint,
res = 0; res = 0;
if (GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES)
{ {
if (msi_change_media(data->package, mi) != ERROR_SUCCESS) if (change_media(data->package, mi) != ERROR_SUCCESS)
res = -1; res = -1;
} }
...@@ -382,7 +382,7 @@ static INT_PTR cabinet_next_cabinet_stream( FDINOTIFICATIONTYPE fdint, ...@@ -382,7 +382,7 @@ static INT_PTR cabinet_next_cabinet_stream( FDINOTIFICATIONTYPE fdint,
mi->disk_id++; mi->disk_id++;
mi->is_continuous = TRUE; mi->is_continuous = TRUE;
rc = msi_media_get_disk_info( data->package, mi ); rc = media_get_disk_info( data->package, mi );
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
ERR("Failed to get next cabinet information: %u\n", rc); ERR("Failed to get next cabinet information: %u\n", rc);
...@@ -889,7 +889,7 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) ...@@ -889,7 +889,7 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi )
if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE))
{ {
if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) if ((rc = change_media( package, mi )) != ERROR_SUCCESS)
{ {
free( cabinet_file ); free( cabinet_file );
return rc; return rc;
......
dlls/msi/msi.c
View file @ 3611398b
...@@ -1365,7 +1365,7 @@ done: ...@@ -1365,7 +1365,7 @@ done:
return r; return r;
} }
static UINT msi_copy_outval(LPWSTR val, LPWSTR out, LPDWORD size) static UINT copy_outval(const WCHAR *val, WCHAR *out, DWORD *size)
{ {
UINT r = ERROR_SUCCESS; UINT r = ERROR_SUCCESS;
...@@ -1490,7 +1490,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, ...@@ -1490,7 +1490,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
if (!val) if (!val)
val = wcsdup(L""); val = wcsdup(L"");
r = msi_copy_outval(val, szValue, pcchValue); r = copy_outval(val, szValue, pcchValue);
} }
else if (!wcscmp( szProperty, INSTALLPROPERTY_TRANSFORMSW ) || else if (!wcscmp( szProperty, INSTALLPROPERTY_TRANSFORMSW ) ||
!wcscmp( szProperty, INSTALLPROPERTY_LANGUAGEW ) || !wcscmp( szProperty, INSTALLPROPERTY_LANGUAGEW ) ||
...@@ -1515,7 +1515,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, ...@@ -1515,7 +1515,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
if (!val) if (!val)
val = wcsdup(L""); val = wcsdup(L"");
r = msi_copy_outval(val, szValue, pcchValue); r = copy_outval(val, szValue, pcchValue);
} }
else if (!wcscmp( szProperty, INSTALLPROPERTY_PRODUCTSTATEW )) else if (!wcscmp( szProperty, INSTALLPROPERTY_PRODUCTSTATEW ))
{ {
...@@ -1533,14 +1533,14 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, ...@@ -1533,14 +1533,14 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
else else
val = wcsdup(L"1"); val = wcsdup(L"1");
r = msi_copy_outval(val, szValue, pcchValue); r = copy_outval(val, szValue, pcchValue);
goto done; goto done;
} }
else if (props && (val = reg_get_value(props, package, &type))) else if (props && (val = reg_get_value(props, package, &type)))
{ {
free(val); free(val);
val = wcsdup(L"5"); val = wcsdup(L"5");
r = msi_copy_outval(val, szValue, pcchValue); r = copy_outval(val, szValue, pcchValue);
goto done; goto done;
} }
...@@ -1549,7 +1549,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, ...@@ -1549,7 +1549,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
else else
goto done; goto done;
r = msi_copy_outval(val, szValue, pcchValue); r = copy_outval(val, szValue, pcchValue);
} }
else if (!wcscmp( szProperty, INSTALLPROPERTY_ASSIGNMENTTYPEW )) else if (!wcscmp( szProperty, INSTALLPROPERTY_ASSIGNMENTTYPEW ))
{ {
...@@ -1558,7 +1558,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, ...@@ -1558,7 +1558,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid,
/* FIXME */ /* FIXME */
val = wcsdup(L""); val = wcsdup(L"");
r = msi_copy_outval(val, szValue, pcchValue); r = copy_outval(val, szValue, pcchValue);
} }
else else
r = ERROR_UNKNOWN_PROPERTY; r = ERROR_UNKNOWN_PROPERTY;
...@@ -2082,7 +2082,7 @@ UINT WINAPI MsiQueryComponentStateA(LPCSTR szProductCode, ...@@ -2082,7 +2082,7 @@ UINT WINAPI MsiQueryComponentStateA(LPCSTR szProductCode,
return r; return r;
} }
static BOOL msi_comp_find_prod_key(LPCWSTR prodcode, MSIINSTALLCONTEXT context) static BOOL comp_find_prod_key(const WCHAR *prodcode, MSIINSTALLCONTEXT context)
{ {
UINT r; UINT r;
HKEY hkey = NULL; HKEY hkey = NULL;
...@@ -2092,7 +2092,7 @@ static BOOL msi_comp_find_prod_key(LPCWSTR prodcode, MSIINSTALLCONTEXT context) ...@@ -2092,7 +2092,7 @@ static BOOL msi_comp_find_prod_key(LPCWSTR prodcode, MSIINSTALLCONTEXT context)
return (r == ERROR_SUCCESS); return (r == ERROR_SUCCESS);
} }
static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context) static BOOL comp_find_package(const WCHAR *prodcode, MSIINSTALLCONTEXT context)
{ {
LPCWSTR package; LPCWSTR package;
HKEY hkey; HKEY hkey;
...@@ -2116,9 +2116,8 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context) ...@@ -2116,9 +2116,8 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context)
return (res == ERROR_SUCCESS); return (res == ERROR_SUCCESS);
} }
static UINT msi_comp_find_prodcode(WCHAR *squashed_pc, static UINT comp_find_prodcode(const WCHAR *squashed_pc, MSIINSTALLCONTEXT context, const WCHAR *comp, WCHAR *val,
MSIINSTALLCONTEXT context, DWORD *sz)
LPCWSTR comp, LPWSTR val, DWORD *sz)
{ {
HKEY hkey; HKEY hkey;
LONG res; LONG res;
...@@ -2160,9 +2159,9 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, ...@@ -2160,9 +2159,9 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
if (!squash_guid( szProductCode, squashed_pc )) if (!squash_guid( szProductCode, squashed_pc ))
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
found = msi_comp_find_prod_key(szProductCode, dwContext); found = comp_find_prod_key(szProductCode, dwContext);
if (!msi_comp_find_package(szProductCode, dwContext)) if (!comp_find_package(szProductCode, dwContext))
{ {
if (found) if (found)
{ {
...@@ -2176,7 +2175,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, ...@@ -2176,7 +2175,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
*pdwState = INSTALLSTATE_UNKNOWN; *pdwState = INSTALLSTATE_UNKNOWN;
sz = 0; sz = 0;
if (msi_comp_find_prodcode( squashed_pc, dwContext, szComponent, NULL, &sz )) if (comp_find_prodcode( squashed_pc, dwContext, szComponent, NULL, &sz ))
return ERROR_UNKNOWN_COMPONENT; return ERROR_UNKNOWN_COMPONENT;
if (sz == 0) if (sz == 0)
...@@ -2187,7 +2186,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, ...@@ -2187,7 +2186,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode,
UINT r; UINT r;
if (!(val = malloc( sz ))) return ERROR_OUTOFMEMORY; if (!(val = malloc( sz ))) return ERROR_OUTOFMEMORY;
if ((r = msi_comp_find_prodcode( squashed_pc, dwContext, szComponent, val, &sz ))) if ((r = comp_find_prodcode( squashed_pc, dwContext, szComponent, val, &sz )))
{ {
free(val); free(val);
return r; return r;
......
dlls/msi/msiquery.c
View file @ 3611398b
...@@ -564,8 +564,7 @@ UINT WINAPI MsiViewExecute( MSIHANDLE hView, MSIHANDLE hRec ) ...@@ -564,8 +564,7 @@ UINT WINAPI MsiViewExecute( MSIHANDLE hView, MSIHANDLE hRec )
return ret; return ret;
} }
static UINT msi_set_record_type_string( MSIRECORD *rec, UINT field, static UINT set_record_type_string( MSIRECORD *rec, UINT field, UINT type, BOOL temporary )
UINT type, BOOL temporary )
{ {
WCHAR szType[0x10]; WCHAR szType[0x10];
...@@ -633,7 +632,7 @@ UINT MSI_ViewGetColumnInfo( MSIQUERY *query, MSICOLINFO info, MSIRECORD **prec ) ...@@ -633,7 +632,7 @@ UINT MSI_ViewGetColumnInfo( MSIQUERY *query, MSICOLINFO info, MSIRECORD **prec )
if (info == MSICOLINFO_NAMES) if (info == MSICOLINFO_NAMES)
MSI_RecordSetStringW( rec, i+1, name ); MSI_RecordSetStringW( rec, i+1, name );
else else
msi_set_record_type_string( rec, i+1, type, temporary ); set_record_type_string( rec, i+1, type, temporary );
} }
*prec = rec; *prec = rec;
return ERROR_SUCCESS; return ERROR_SUCCESS;
...@@ -1009,15 +1008,15 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) ...@@ -1009,15 +1008,15 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb )
return r; return r;
} }
struct msi_primary_key_record_info struct primary_key_record_info
{ {
DWORD n; DWORD n;
MSIRECORD *rec; MSIRECORD *rec;
}; };
static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param ) static UINT primary_key_iterator( MSIRECORD *rec, void *param )
{ {
struct msi_primary_key_record_info *info = param; struct primary_key_record_info *info = param;
LPCWSTR name, table; LPCWSTR name, table;
DWORD type; DWORD type;
...@@ -1041,10 +1040,9 @@ static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param ) ...@@ -1041,10 +1040,9 @@ static UINT msi_primary_key_iterator( MSIRECORD *rec, LPVOID param )
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, const WCHAR *table, MSIRECORD **prec )
LPCWSTR table, MSIRECORD **prec )
{ {
struct msi_primary_key_record_info info; struct primary_key_record_info info;
MSIQUERY *query = NULL; MSIQUERY *query = NULL;
UINT r; UINT r;
...@@ -1058,7 +1056,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, ...@@ -1058,7 +1056,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
/* count the number of primary key records */ /* count the number of primary key records */
info.n = 0; info.n = 0;
info.rec = 0; info.rec = 0;
r = MSI_IterateRecords( query, 0, msi_primary_key_iterator, &info ); r = MSI_IterateRecords( query, 0, primary_key_iterator, &info );
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
{ {
TRACE( "found %lu primary keys\n", info.n ); TRACE( "found %lu primary keys\n", info.n );
...@@ -1066,7 +1064,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, ...@@ -1066,7 +1064,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db,
/* allocate a record and fill in the names of the tables */ /* allocate a record and fill in the names of the tables */
info.rec = MSI_CreateRecord( info.n ); info.rec = MSI_CreateRecord( info.n );
info.n = 0; info.n = 0;
r = MSI_IterateRecords( query, 0, msi_primary_key_iterator, &info ); r = MSI_IterateRecords( query, 0, primary_key_iterator, &info );
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
*prec = info.rec; *prec = info.rec;
else else
......
dlls/msi/package.c
View file @ 3611398b
...@@ -940,7 +940,7 @@ static MSIPACKAGE *alloc_package( void ) ...@@ -940,7 +940,7 @@ static MSIPACKAGE *alloc_package( void )
return package; return package;
} }
static UINT msi_load_admin_properties(MSIPACKAGE *package) static UINT load_admin_properties(MSIPACKAGE *package)
{ {
BYTE *data; BYTE *data;
UINT r, sz; UINT r, sz;
...@@ -1009,7 +1009,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) ...@@ -1009,7 +1009,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )
} }
if (package->WordCount & msidbSumInfoSourceTypeAdminImage) if (package->WordCount & msidbSumInfoSourceTypeAdminImage)
msi_load_admin_properties( package ); load_admin_properties( package );
package->log_file = INVALID_HANDLE_VALUE; package->log_file = INVALID_HANDLE_VALUE;
package->script = SCRIPT_NONE; package->script = SCRIPT_NONE;
...@@ -2110,7 +2110,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue ...@@ -2110,7 +2110,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue
return ret; return ret;
} }
static MSIRECORD *msi_get_property_row( MSIDATABASE *db, LPCWSTR name ) static MSIRECORD *get_property_row( MSIDATABASE *db, const WCHAR *name )
{ {
MSIRECORD *rec, *row = NULL; MSIRECORD *rec, *row = NULL;
MSIQUERY *view; MSIQUERY *view;
...@@ -2185,7 +2185,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName, ...@@ -2185,7 +2185,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName,
TRACE("%p %s %p %p\n", db, debugstr_w(szName), szValueBuf, pchValueBuf); TRACE("%p %s %p %p\n", db, debugstr_w(szName), szValueBuf, pchValueBuf);
row = msi_get_property_row( db, szName ); row = get_property_row( db, szName );
if (*pchValueBuf > 0) if (*pchValueBuf > 0)
szValueBuf[0] = 0; szValueBuf[0] = 0;
...@@ -2300,7 +2300,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD ...@@ -2300,7 +2300,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD
return r; return r;
} }
row = msi_get_property_row(package->db, nameW); row = get_property_row(package->db, nameW);
if (row) if (row)
value = msi_record_get_string(row, 1, &len); value = msi_record_get_string(row, 1, &len);
...@@ -2363,7 +2363,7 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR ...@@ -2363,7 +2363,7 @@ UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWOR
return r; return r;
} }
row = msi_get_property_row(package->db, name); row = get_property_row(package->db, name);
if (row) if (row)
value = msi_record_get_string(row, 1, &len); value = msi_record_get_string(row, 1, &len);
......
dlls/msi/patch.c
View file @ 3611398b
...@@ -315,7 +315,7 @@ UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) ...@@ -315,7 +315,7 @@ UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si )
return ret; return ret;
} }
static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) static UINT parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch )
{ {
MSIPATCHINFO *pi; MSIPATCHINFO *pi;
UINT r = ERROR_SUCCESS; UINT r = ERROR_SUCCESS;
...@@ -831,7 +831,7 @@ static DWORD is_uninstallable( MSIDATABASE *db ) ...@@ -831,7 +831,7 @@ static DWORD is_uninstallable( MSIDATABASE *db )
return ret; return ret;
} }
static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) static UINT apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch )
{ {
UINT i, r = ERROR_SUCCESS; UINT i, r = ERROR_SUCCESS;
WCHAR **substorage; WCHAR **substorage;
...@@ -872,7 +872,7 @@ void msi_free_patchinfo( MSIPATCHINFO *patch ) ...@@ -872,7 +872,7 @@ void msi_free_patchinfo( MSIPATCHINFO *patch )
free( patch ); free( patch );
} }
static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) static UINT apply_patch_package( MSIPACKAGE *package, const WCHAR *file )
{ {
MSIDATABASE *patch_db = NULL; MSIDATABASE *patch_db = NULL;
WCHAR localfile[MAX_PATH]; WCHAR localfile[MAX_PATH];
...@@ -901,7 +901,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) ...@@ -901,7 +901,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file )
r = ERROR_SUCCESS; r = ERROR_SUCCESS;
goto done; goto done;
} }
r = msi_parse_patch_summary( si, &patch ); r = parse_patch_summary( si, &patch );
if ( r != ERROR_SUCCESS ) if ( r != ERROR_SUCCESS )
goto done; goto done;
...@@ -914,7 +914,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) ...@@ -914,7 +914,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file )
if (!(patch->filename = wcsdup( file ))) goto done; if (!(patch->filename = wcsdup( file ))) goto done;
if (!(patch->localfile = wcsdup( localfile ))) goto done; if (!(patch->localfile = wcsdup( localfile ))) goto done;
r = msi_apply_patch_db( package, patch_db, patch ); r = apply_patch_db( package, patch_db, patch );
if (r != ERROR_SUCCESS) WARN("patch failed to apply %u\n", r); if (r != ERROR_SUCCESS) WARN("patch failed to apply %u\n", r);
done: done:
...@@ -940,7 +940,7 @@ UINT msi_apply_patches( MSIPACKAGE *package ) ...@@ -940,7 +940,7 @@ UINT msi_apply_patches( MSIPACKAGE *package )
patches = msi_split_string( patch_list, ';' ); patches = msi_split_string( patch_list, ';' );
for (i = 0; patches && patches[i] && r == ERROR_SUCCESS; i++) for (i = 0; patches && patches[i] && r == ERROR_SUCCESS; i++)
r = msi_apply_patch_package( package, patches[i] ); r = apply_patch_package( package, patches[i] );
free( patches ); free( patches );
free( patch_list ); free( patch_list );
...@@ -1018,7 +1018,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) ...@@ -1018,7 +1018,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code )
msiobj_release( &patch_db->hdr ); msiobj_release( &patch_db->hdr );
return r; return r;
} }
r = msi_parse_patch_summary( si, &patch_info ); r = parse_patch_summary( si, &patch_info );
msiobj_release( &si->hdr ); msiobj_release( &si->hdr );
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
{ {
...@@ -1034,7 +1034,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) ...@@ -1034,7 +1034,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code )
msi_free_patchinfo( patch_info ); msi_free_patchinfo( patch_info );
return ERROR_OUTOFMEMORY; return ERROR_OUTOFMEMORY;
} }
r = msi_apply_patch_db( package, patch_db, patch_info ); r = apply_patch_db( package, patch_db, patch_info );
msiobj_release( &patch_db->hdr ); msiobj_release( &patch_db->hdr );
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
{ {
......
dlls/msi/record.c
View file @ 3611398b
...@@ -497,7 +497,7 @@ UINT WINAPI MsiRecordGetStringW( MSIHANDLE handle, UINT iField, WCHAR *szValue, ...@@ -497,7 +497,7 @@ UINT WINAPI MsiRecordGetStringW( MSIHANDLE handle, UINT iField, WCHAR *szValue,
return ret; return ret;
} }
static UINT msi_get_stream_size( IStream *stm ) static UINT get_stream_size( IStream *stm )
{ {
STATSTG stat; STATSTG stat;
HRESULT r; HRESULT r;
...@@ -524,7 +524,7 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField) ...@@ -524,7 +524,7 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField)
case MSIFIELD_NULL: case MSIFIELD_NULL:
break; break;
case MSIFIELD_STREAM: case MSIFIELD_STREAM:
return msi_get_stream_size( rec->fields[iField].u.stream ); return get_stream_size( rec->fields[iField].u.stream );
} }
return 0; return 0;
} }
...@@ -865,7 +865,7 @@ UINT MSI_RecordGetIStream( MSIRECORD *rec, UINT iField, IStream **pstm) ...@@ -865,7 +865,7 @@ UINT MSI_RecordGetIStream( MSIRECORD *rec, UINT iField, IStream **pstm)
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static UINT msi_dump_stream_to_file( IStream *stm, LPCWSTR name ) static UINT dump_stream_to_file( IStream *stm, const WCHAR *name )
{ {
ULARGE_INTEGER size; ULARGE_INTEGER size;
LARGE_INTEGER pos; LARGE_INTEGER pos;
...@@ -909,7 +909,7 @@ UINT MSI_RecordStreamToFile( MSIRECORD *rec, UINT iField, LPCWSTR name ) ...@@ -909,7 +909,7 @@ UINT MSI_RecordStreamToFile( MSIRECORD *rec, UINT iField, LPCWSTR name )
r = MSI_RecordGetIStream( rec, iField, &stm ); r = MSI_RecordGetIStream( rec, iField, &stm );
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
{ {
r = msi_dump_stream_to_file( stm, name ); r = dump_stream_to_file( stm, name );
IStream_Release( stm ); IStream_Release( stm );
} }
......
dlls/msi/registry.c
View file @ 3611398b
...@@ -1687,9 +1687,8 @@ done: ...@@ -1687,9 +1687,8 @@ done:
return r; return r;
} }
static UINT msi_get_patch_state(LPCWSTR prodcode, LPCWSTR usersid, static UINT get_patch_state(const WCHAR *prodcode, const WCHAR *usersid, MSIINSTALLCONTEXT context,
MSIINSTALLCONTEXT context, WCHAR *patch, MSIPATCHSTATE *state)
LPWSTR patch, MSIPATCHSTATE *state)
{ {
DWORD type, val, size; DWORD type, val, size;
HKEY prod, hkey = 0; HKEY prod, hkey = 0;
...@@ -1732,10 +1731,9 @@ done: ...@@ -1732,10 +1731,9 @@ done:
return r; return r;
} }
static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, static UINT check_product_patches(const WCHAR *prodcode, const WCHAR *usersid, MSIINSTALLCONTEXT context,
MSIINSTALLCONTEXT context, DWORD filter, DWORD index, DWORD *idx, DWORD filter, DWORD index, DWORD *idx, WCHAR *patch, WCHAR *targetprod,
LPWSTR patch, LPWSTR targetprod, MSIINSTALLCONTEXT *targetctx, MSIINSTALLCONTEXT *targetctx, WCHAR *targetsid, DWORD *sidsize, WCHAR **transforms)
LPWSTR targetsid, DWORD *sidsize, LPWSTR *transforms)
{ {
MSIPATCHSTATE state = MSIPATCHSTATE_INVALID; MSIPATCHSTATE state = MSIPATCHSTATE_INVALID;
LPWSTR ptr, patches = NULL; LPWSTR ptr, patches = NULL;
...@@ -1806,8 +1804,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, ...@@ -1806,8 +1804,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid,
{ {
if (!(filter & MSIPATCHSTATE_APPLIED)) if (!(filter & MSIPATCHSTATE_APPLIED))
{ {
temp = msi_get_patch_state(prodcode, usersid, context, temp = get_patch_state(prodcode, usersid, context, ptr, &state);
ptr, &state);
if (temp == ERROR_BAD_CONFIGURATION) if (temp == ERROR_BAD_CONFIGURATION)
{ {
r = ERROR_BAD_CONFIGURATION; r = ERROR_BAD_CONFIGURATION;
...@@ -1822,8 +1819,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, ...@@ -1822,8 +1819,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid,
{ {
if (!(filter & MSIPATCHSTATE_APPLIED)) if (!(filter & MSIPATCHSTATE_APPLIED))
{ {
temp = msi_get_patch_state(prodcode, usersid, context, temp = get_patch_state(prodcode, usersid, context, ptr, &state);
ptr, &state);
if (temp == ERROR_BAD_CONFIGURATION) if (temp == ERROR_BAD_CONFIGURATION)
{ {
r = ERROR_BAD_CONFIGURATION; r = ERROR_BAD_CONFIGURATION;
...@@ -1901,11 +1897,10 @@ done: ...@@ -1901,11 +1897,10 @@ done:
return r; return r;
} }
static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid, static UINT enum_patches(const WCHAR *szProductCode, const WCHAR *szUserSid, DWORD dwContext, DWORD dwFilter,
DWORD dwContext, DWORD dwFilter, DWORD dwIndex, DWORD *idx, DWORD dwIndex, DWORD *idx, WCHAR *szPatchCode, WCHAR *szTargetProductCode,
LPWSTR szPatchCode, LPWSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, WCHAR *szTargetUserSid, DWORD *pcchTargetUserSid,
MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid, WCHAR **szTransforms)
LPDWORD pcchTargetUserSid, LPWSTR *szTransforms)
{ {
LPWSTR usersid = NULL; LPWSTR usersid = NULL;
UINT r = ERROR_INVALID_PARAMETER; UINT r = ERROR_INVALID_PARAMETER;
...@@ -1918,36 +1913,27 @@ static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid, ...@@ -1918,36 +1913,27 @@ static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid,
if (dwContext & MSIINSTALLCONTEXT_USERMANAGED) if (dwContext & MSIINSTALLCONTEXT_USERMANAGED)
{ {
r = msi_check_product_patches(szProductCode, szUserSid, r = check_product_patches(szProductCode, szUserSid, MSIINSTALLCONTEXT_USERMANAGED, dwFilter, dwIndex, idx,
MSIINSTALLCONTEXT_USERMANAGED, dwFilter, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid,
dwIndex, idx, szPatchCode, pcchTargetUserSid, szTransforms);
szTargetProductCode,
pdwTargetProductContext, szTargetUserSid,
pcchTargetUserSid, szTransforms);
if (r != ERROR_NO_MORE_ITEMS) if (r != ERROR_NO_MORE_ITEMS)
goto done; goto done;
} }
if (dwContext & MSIINSTALLCONTEXT_USERUNMANAGED) if (dwContext & MSIINSTALLCONTEXT_USERUNMANAGED)
{ {
r = msi_check_product_patches(szProductCode, szUserSid, r = check_product_patches(szProductCode, szUserSid, MSIINSTALLCONTEXT_USERUNMANAGED, dwFilter, dwIndex, idx,
MSIINSTALLCONTEXT_USERUNMANAGED, dwFilter, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid,
dwIndex, idx, szPatchCode, pcchTargetUserSid, szTransforms);
szTargetProductCode,
pdwTargetProductContext, szTargetUserSid,
pcchTargetUserSid, szTransforms);
if (r != ERROR_NO_MORE_ITEMS) if (r != ERROR_NO_MORE_ITEMS)
goto done; goto done;
} }
if (dwContext & MSIINSTALLCONTEXT_MACHINE) if (dwContext & MSIINSTALLCONTEXT_MACHINE)
{ {
r = msi_check_product_patches(szProductCode, szUserSid, r = check_product_patches(szProductCode, szUserSid, MSIINSTALLCONTEXT_MACHINE, dwFilter, dwIndex, idx,
MSIINSTALLCONTEXT_MACHINE, dwFilter, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid,
dwIndex, idx, szPatchCode, pcchTargetUserSid, szTransforms);
szTargetProductCode,
pdwTargetProductContext, szTargetUserSid,
pcchTargetUserSid, szTransforms);
if (r != ERROR_NO_MORE_ITEMS) if (r != ERROR_NO_MORE_ITEMS)
goto done; goto done;
} }
...@@ -1997,10 +1983,8 @@ UINT WINAPI MsiEnumPatchesExW( const WCHAR *szProductCode, const WCHAR *szUserSi ...@@ -1997,10 +1983,8 @@ UINT WINAPI MsiEnumPatchesExW( const WCHAR *szProductCode, const WCHAR *szUserSi
if (dwIndex == 0) if (dwIndex == 0)
last_index = 0; last_index = 0;
r = msi_enum_patches(szProductCode, szUserSid, dwContext, dwFilter, r = enum_patches(szProductCode, szUserSid, dwContext, dwFilter, dwIndex, &idx, szPatchCode, szTargetProductCode,
dwIndex, &idx, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid, pcchTargetUserSid, NULL);
pdwTargetProductContext, szTargetUserSid,
pcchTargetUserSid, NULL);
if (r == ERROR_SUCCESS) if (r == ERROR_SUCCESS)
last_index = dwIndex; last_index = dwIndex;
...@@ -2094,9 +2078,8 @@ UINT WINAPI MsiEnumPatchesW( const WCHAR *szProduct, DWORD iPatchIndex, WCHAR *l ...@@ -2094,9 +2078,8 @@ UINT WINAPI MsiEnumPatchesW( const WCHAR *szProduct, DWORD iPatchIndex, WCHAR *l
RegCloseKey(prod); RegCloseKey(prod);
r = msi_enum_patches(szProduct, NULL, MSIINSTALLCONTEXT_ALL, r = enum_patches(szProduct, NULL, MSIINSTALLCONTEXT_ALL, MSIPATCHSTATE_ALL, iPatchIndex, &idx, lpPatchBuf, NULL,
MSIPATCHSTATE_ALL, iPatchIndex, &idx, lpPatchBuf, NULL, NULL, NULL, &transforms);
NULL, NULL, NULL, NULL, &transforms);
if (r != ERROR_SUCCESS) if (r != ERROR_SUCCESS)
goto done; goto done;
......
dlls/msi/suminfo.c
View file @ 3611398b
...@@ -875,8 +875,8 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type, ...@@ -875,8 +875,8 @@ static UINT set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT type,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static UINT msi_set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT uiDataType, static UINT suminfo_set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT uiDataType, INT iValue, FILETIME *pftValue,
INT iValue, FILETIME *pftValue, awcstring *str ) awcstring *str )
{ {
UINT type = get_type( uiProperty ); UINT type = get_type( uiProperty );
if( type == VT_EMPTY || type != uiDataType ) if( type == VT_EMPTY || type != uiDataType )
...@@ -916,7 +916,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT ...@@ -916,7 +916,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT
str.unicode = TRUE; str.unicode = TRUE;
str.str.w = szValue; str.str.w = szValue;
ret = msi_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); ret = suminfo_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str );
msiobj_release( &si->hdr ); msiobj_release( &si->hdr );
return ret; return ret;
} }
...@@ -946,7 +946,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT ...@@ -946,7 +946,7 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT
str.unicode = FALSE; str.unicode = FALSE;
str.str.a = szValue; str.str.a = szValue;
ret = msi_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str ); ret = suminfo_set_prop( si, uiProperty, uiDataType, iValue, pftValue, &str );
msiobj_release( &si->hdr ); msiobj_release( &si->hdr );
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment