Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46719 Signed-off-by: Zebediah Figura z.figura12@gmail.com --- It's also possible that the cache itself doesn't need to be a package-specific variable; I don't know enough about fusion to guess whether this is the case.
dlls/msi/assembly.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 73977ee8ac..9052dd46bd 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -40,7 +40,6 @@ static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, D static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID );
static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree; -static BOOL assembly_caches_initialized;
static BOOL init_function_pointers( void ) { @@ -83,7 +82,7 @@ static BOOL init_function_pointers( void )
BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { - if (assembly_caches_initialized) return TRUE; + if (package->cache_sxs) return TRUE; if (!init_function_pointers()) return FALSE;
if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; @@ -92,7 +91,6 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 );
- assembly_caches_initialized = TRUE; return TRUE; }