ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: MsiGetComponentPath cannot return INSTALLSTATE_ADVERTISED.

This commit is contained in:
Mike McCormack 2006-07-15 11:05:02 +09:00 committed by Alexandre Julliard
parent df10b7d580
commit baa6efa56f
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/msi/msi.c
View File

@ -986,10 +986,8 @@ INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
{ {
WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE]; WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE];
UINT rc; UINT rc;
INSTALLSTATE rrc = INSTALLSTATE_UNKNOWN;
HKEY hkey = 0; HKEY hkey = 0;
LPWSTR path = NULL; LPWSTR path = NULL;
DWORD sz, type;
TRACE("%s %s %p %p\n", debugstr_w(szProduct), TRACE("%s %s %p %p\n", debugstr_w(szProduct),
debugstr_w(szComponent), lpPathBuf, pcchBuf); debugstr_w(szComponent), lpPathBuf, pcchBuf);
@ -1013,24 +1011,7 @@ INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
if( rc != ERROR_SUCCESS ) if( rc != ERROR_SUCCESS )
return INSTALLSTATE_UNKNOWN; return INSTALLSTATE_UNKNOWN;
sz = 0; path = msi_reg_get_val_str( hkey, squished_pc );
type = 0;
rc = RegQueryValueExW( hkey, squished_pc, NULL, &type, NULL, &sz );
if( rc == ERROR_SUCCESS && type == REG_SZ )
{
sz += sizeof(WCHAR);
path = msi_alloc( sz );
if( path )
{
path[0] = 0;
rc = RegQueryValueExW( hkey, squished_pc, NULL, NULL, (LPVOID) path, &sz );
if( rc != ERROR_SUCCESS )
{
msi_free( path );
path = NULL;
}
}
}
RegCloseKey(hkey); RegCloseKey(hkey);
TRACE("found path of (%s:%s)(%s)\n", debugstr_w(szComponent), TRACE("found path of (%s:%s)(%s)\n", debugstr_w(szComponent),
@ -1040,22 +1021,12 @@ INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent,
return INSTALLSTATE_UNKNOWN; return INSTALLSTATE_UNKNOWN;
if (path[0]=='0') if (path[0]=='0')
{
FIXME("Registry entry.. check entry\n"); FIXME("Registry entry.. check entry\n");
rrc = INSTALLSTATE_LOCAL;
}
else
{
if ( GetFileAttributesW(path) != INVALID_FILE_ATTRIBUTES )
rrc = INSTALLSTATE_LOCAL;
else
rrc = INSTALLSTATE_ABSENT;
}
msi_strcpy_to_awstring( path, lpPathBuf, pcchBuf ); msi_strcpy_to_awstring( path, lpPathBuf, pcchBuf );
msi_free( path ); msi_free( path );
return rrc; return INSTALLSTATE_LOCAL;
} }
/****************************************************************** /******************************************************************