February 2023 - Wine-Commits

Alexandre Julliard : Wine release 8.1
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: website Branch: master Commit: 02ae038694eae0b7e25f5b98919dd99d2ee70d52 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/02ae038694eae0b7e25f5b9891… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 22:25:12 2023 +0100 Wine release 8.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023020201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2023020201.xml b/news/en/2023020201.xml new file mode 100644 index 00000000..4facec63 --- /dev/null +++ b/news/en/2023020201.xml @@ -0,0 +1,15 @@ +<news> +<date>February 2, 2023</date> +<title>Wine 8.1 Released</title> +<body> + The Wine development release 8.1 is now available. + <a href="{$root}/announce/8.1">What's new</a> in this release: +<ul> + <li>Windows version set to Windows 10 for new prefixes.</li> + <li>Many code cleanups that were deferred during code freeze. </li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.1 : Alexandre Julliard : Release 8.1
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: refs/tags/wine-8.1 Tag: b16d1eb2b86ff38c9d5298c1b0456134604e0169 URL: https://gitlab.winehq.org/wine/wine/-/tags/b16d1eb2b86ff38c9d5298c1b0456134… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 22:22:23 2023 +0100 Release 8.1

1 0

Alexandre Julliard : Release 8.1.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: a4ed65d57721adade08440b9cabf44e3394fc3ad URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ed65d57721adade08440b9cabf44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 22:17:09 2023 +0100 Release 8.1. --- ANNOUNCE | 736 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 411 insertions(+), 348 deletions(-)

1 0

Alexandre Julliard : kernelbase: Report correct errors in GetModuleHandleExA().
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: a6451971a2f89219b56f47731ca9091c9ff5c24c URL: https://gitlab.winehq.org/wine/wine/-/commit/a6451971a2f89219b56f47731ca909… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 19:09:23 2023 +0100 kernelbase: Report correct errors in GetModuleHandleExA(). --- dlls/kernel32/tests/module.c | 18 ++++++++++++++++++ dlls/kernelbase/loader.c | 13 ++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 9efbdba336d..956595bf2a1 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -953,6 +953,10 @@ static void init_pointers(void) static void testGetModuleHandleEx(void) { + static const char longname[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR nosuchmodW[] = {'n','o','s','u','c','h','m','o','d',0}; BOOL ret; @@ -986,6 +990,20 @@ static void testGetModuleHandleEx(void) ok( error == ERROR_MOD_NOT_FOUND, "got %lu\n", error ); ok( mod == NULL, "got %p\n", mod ); + SetLastError( 0xdeadbeef ); + ret = GetModuleHandleExA( 0, longname, NULL ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExA( 0, longname, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %lu\n", error ); + ok( mod == NULL, "got %p\n", mod ); + SetLastError( 0xdeadbeef ); ret = GetModuleHandleExW( 0, NULL, NULL ); error = GetLastError(); diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 0fd2d7b7c99..22dff7ba56b 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -352,10 +352,21 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExA( DWORD flags, LPCSTR name, HMOD { WCHAR *nameW; + if (!module) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!name || (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) return GetModuleHandleExW( flags, (LPCWSTR)name, module ); - if (!(nameW = file_name_AtoW( name, FALSE ))) return FALSE; + if (!(nameW = file_name_AtoW( name, FALSE ))) + { + *module = NULL; + SetLastError( ERROR_MOD_NOT_FOUND ); + return FALSE; + } return GetModuleHandleExW( flags, nameW, module ); }

1 0

Zhiyi Zhang : opengl32/tests: Make context current before calling wglCopyContext().
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 7937596f8fb2a7aef3b61e93ee0c1e3f0062e80c URL: https://gitlab.winehq.org/wine/wine/-/commit/7937596f8fb2a7aef3b61e93ee0c1e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 2 10:34:17 2023 +0800 opengl32/tests: Make context current before calling wglCopyContext(). Otherwise, wglCopyContext() crashes on Windows with a NVIDIA GPU and fails on Windows with a AMD GPU. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51311 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54103 --- dlls/opengl32/tests/opengl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 42c2626a2c2..6979e00792e 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1899,11 +1899,16 @@ static void test_wglChoosePixelFormatARB(HDC hdc) static void test_copy_context(HDC hdc) { - HGLRC ctx, ctx2; + HGLRC ctx, ctx2, old_ctx; BOOL ret; + old_ctx = wglGetCurrentContext(); + ok(!!old_ctx, "wglGetCurrentContext failed, last error %#lx.\n", GetLastError()); + ctx = wglCreateContext(hdc); ok(!!ctx, "Failed to create GL context, last error %#lx.\n", GetLastError()); + ret = wglMakeCurrent(hdc, ctx); + ok(ret, "wglMakeCurrent failed, last error %#lx.\n", GetLastError()); ctx2 = wglCreateContext(hdc); ok(!!ctx2, "Failed to create GL context, last error %#lx.\n", GetLastError()); @@ -1911,10 +1916,15 @@ static void test_copy_context(HDC hdc) todo_wine ok(ret, "Failed to copy GL context, last error %#lx.\n", GetLastError()); + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "wglMakeCurrent failed, last error %#lx.\n", GetLastError()); ret = wglDeleteContext(ctx2); ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); ret = wglDeleteContext(ctx); ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); + + ret = wglMakeCurrent(hdc, old_ctx); + ok(ret, "wglMakeCurrent failed, last error %#lx.\n", GetLastError()); } START_TEST(opengl)

1 0

Zhiyi Zhang : include: Add uiviewsettingsinterop.idl.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 2fbe1f3508cb71d994ad4055bccb2de6fe051ebd URL: https://gitlab.winehq.org/wine/wine/-/commit/2fbe1f3508cb71d994ad4055bccb2d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 20 12:11:37 2022 +0800 include: Add uiviewsettingsinterop.idl. --- include/Makefile.in | 1 + include/uiviewsettingsinterop.idl | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9b5f2a5ae02..8602dd51e42 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -749,6 +749,7 @@ SOURCES = \ uiautomationcore.idl \ uiautomationcoreapi.h \ uiribbon.idl \ + uiviewsettingsinterop.idl \ unexposeenums2managed.h \ unknwn.idl \ urlhist.idl \ diff --git a/include/uiviewsettingsinterop.idl b/include/uiviewsettingsinterop.idl new file mode 100644 index 00000000000..81cfc0e9dd9 --- /dev/null +++ b/include/uiviewsettingsinterop.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +import "inspectable.idl"; + +[ + uuid(3694dbf9-8f68-44be-8ff5-195c98ede8a6), +] +interface IUIViewSettingsInterop : IInspectable +{ + HRESULT GetForWindow([in] HWND hwnd, [in] REFIID riid, [out, retval, iid_is(riid)] void **ppv); +}

1 0

Hans Leidekker : wbemprox: Recognize Windows 11.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 34a797e8784ddaa01857563440c609e33049ef66 URL: https://gitlab.winehq.org/wine/wine/-/commit/34a797e8784ddaa01857563440c609… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 1 12:10:50 2023 +0100 wbemprox: Recognize Windows 11. --- dlls/wbemprox/builtin.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 54a66c2aa8a..9cae1750b73 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3631,6 +3631,7 @@ static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) if (ret) swprintf( ret, 11, L"%u", ver->dwBuildNumber ); return ret; } + static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) { static const WCHAR windowsW[] = L"Microsoft Windows "; @@ -3645,12 +3646,17 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) static const WCHAR win8W[] = L"8 Pro"; static const WCHAR win81W[] = L"8.1 Pro"; static const WCHAR win10W[] = L"10 Pro"; + static const WCHAR win11W[] = L"11 Pro"; int len = ARRAY_SIZE( windowsW ) - 1; WCHAR *ret; if (!(ret = malloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); - if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); + if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) + { + if (ver->dwBuildNumber >= 22000) memcpy( ret + len, win11W, sizeof(win11W) ); + else memcpy( ret + len, win10W, sizeof(win10W) ); + } else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) @@ -3672,6 +3678,7 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) else memcpy( ret + len, win2000W, sizeof(win2000W) ); return ret; } + static WCHAR *get_osname( const WCHAR *caption ) { static const WCHAR partitionW[] = L"|C:\\WINDOWS|\\Device\\Harddisk0\\Partition1"; @@ -3697,6 +3704,7 @@ static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) if (ret) swprintf( ret, 33, L"%u.%u.%u", ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } + static DWORD get_operatingsystemsku(void) { DWORD ret = PRODUCT_UNDEFINED;

1 0

Fabian Maurer : dwrite/tests: Prevent "misleading indentation" warnings.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 2d6fdf7c8e85b5c92f7ab5569002d0d9245501e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d6fdf7c8e85b5c92f7ab5569002d0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 21:03:17 2022 +0100 dwrite/tests: Prevent "misleading indentation" warnings. Happens on gcc 12.2.0 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dwrite/tests/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f9f4f46f584..c8c706a7395 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5309,12 +5309,12 @@ static void test_system_fallback(void) if (!font) continue; get_font_name(font, name, ARRAY_SIZE(name)); - todo_wine + todo_wine ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine + todo_wine ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); IDWriteFont_Release(font);

1 0

Hans Leidekker : msi: Get rid of unnecessary typedefs.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 258012742512a4072265fcc47826c52319bd37ab URL: https://gitlab.winehq.org/wine/wine/-/commit/258012742512a4072265fcc47826c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 2 17:43:50 2023 +0100 msi: Get rid of unnecessary typedefs. --- dlls/msi/action.c | 38 ++++----- dlls/msi/alter.c | 22 ++--- dlls/msi/appsearch.c | 38 ++++----- dlls/msi/automation.c | 194 +++++++++++++++++++++--------------------- dlls/msi/create.c | 20 ++--- dlls/msi/custom.c | 10 +-- dlls/msi/database.c | 52 ++++++------ dlls/msi/delete.c | 22 ++--- dlls/msi/dialog.c | 227 ++++++++++++++++++++++++-------------------------- dlls/msi/distinct.c | 40 ++++----- dlls/msi/drop.c | 14 ++-- dlls/msi/files.c | 24 +++--- dlls/msi/font.c | 39 +++++---- dlls/msi/format.c | 94 ++++++++++----------- dlls/msi/insert.c | 26 +++--- dlls/msi/msi.c | 12 +-- dlls/msi/msi_main.c | 17 ++-- dlls/msi/package.c | 6 +- dlls/msi/query.h | 3 +- dlls/msi/script.c | 39 ++++----- dlls/msi/select.c | 35 ++++---- dlls/msi/source.c | 23 +++-- dlls/msi/storages.c | 36 ++++---- dlls/msi/streams.c | 32 +++---- dlls/msi/suminfo.c | 53 ++++++------ dlls/msi/table.c | 186 +++++++++++++++++++++-------------------- dlls/msi/tokenize.c | 12 +-- dlls/msi/update.c | 20 ++--- dlls/msi/where.c | 83 +++++++++--------- 29 files changed, 709 insertions(+), 708 deletions(-)

1 0

Hans Leidekker : msi: Perform late initialization of the assembly caches.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: d9d700f3328f00ec419571df0e02cef208fa1e7b URL: https://gitlab.winehq.org/wine/wine/-/commit/d9d700f3328f00ec419571df0e02ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 2 12:05:20 2023 +0100 msi: Perform late initialization of the assembly caches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51345 --- dlls/msi/assembly.c | 42 ++++++++++++++++++++++-------------------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 7 ------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 586521342b6..47e8071502c 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -30,55 +30,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -static BOOL load_fusion_dlls( MSIPACKAGE *package ) +static void load_fusion_dlls( MSIPACKAGE *package ) { HRESULT (WINAPI *pLoadLibraryShim)( const WCHAR *, const WCHAR *, void *, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); lstrcpyW( path + len, L"\\mscoree.dll" ); - if (package->hmscoree || !(package->hmscoree = LoadLibraryW( path ))) return TRUE; + if (!package->hmscoree && !(package->hmscoree = LoadLibraryW( path ))) return; if (!(pLoadLibraryShim = (void *)GetProcAddress( package->hmscoree, "LoadLibraryShim" ))) { FreeLibrary( package->hmscoree ); package->hmscoree = NULL; - return TRUE; + return; } - pLoadLibraryShim( L"fusion.dll", L"v1.0.3705", NULL, &package->hfusion10 ); - pLoadLibraryShim( L"fusion.dll", L"v1.1.4322", NULL, &package->hfusion11 ); - pLoadLibraryShim( L"fusion.dll", L"v2.0.50727", NULL, &package->hfusion20 ); - pLoadLibraryShim( L"fusion.dll", L"v4.0.30319", NULL, &package->hfusion40 ); - - return TRUE; + if (!package->hfusion10) pLoadLibraryShim( L"fusion.dll", L"v1.0.3705", NULL, &package->hfusion10 ); + if (!package->hfusion11) pLoadLibraryShim( L"fusion.dll", L"v1.1.4322", NULL, &package->hfusion11 ); + if (!package->hfusion20) pLoadLibraryShim( L"fusion.dll", L"v2.0.50727", NULL, &package->hfusion20 ); + if (!package->hfusion40) pLoadLibraryShim( L"fusion.dll", L"v4.0.30319", NULL, &package->hfusion40 ); } -BOOL msi_init_assembly_caches( MSIPACKAGE *package ) +static BOOL init_assembly_caches( MSIPACKAGE *package ) { HRESULT (WINAPI *pCreateAssemblyCache)( IAssemblyCache **, DWORD ); - if (package->cache_sxs) return TRUE; - if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; + if (!package->cache_sxs && CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (!load_fusion_dlls( package )) return FALSE; + load_fusion_dlls( package ); package->pGetFileVersion = (void *)GetProcAddress( package->hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (package->hfusion10) + if (package->hfusion10 && !package->cache_net[CLR_VERSION_V10]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion10, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V10], 0 ); } - if (package->hfusion11) + if (package->hfusion11 && !package->cache_net[CLR_VERSION_V11]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion11, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V11], 0 ); } - if (package->hfusion20) + if (package->hfusion20 && !package->cache_net[CLR_VERSION_V20]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion20, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V20], 0 ); } - if (package->hfusion40) + if (package->hfusion40 && !package->cache_net[CLR_VERSION_V40]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V40], 0 ); @@ -223,9 +220,9 @@ WCHAR *msi_get_assembly_path( MSIPACKAGE *package, const WCHAR *displayname ) { HRESULT hr; ASSEMBLY_INFO info; - IAssemblyCache *cache = package->cache_net[CLR_VERSION_V40]; + IAssemblyCache *cache; - if (!cache) return NULL; + if (!init_assembly_caches( package ) || !(cache = package->cache_net[CLR_VERSION_V40])) return NULL; memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); @@ -252,7 +249,8 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ WCHAR *str; DWORD len = 0; - if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; + if (!init_assembly_caches( package ) || !package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) + return NULL; hr = package->pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); if (FAILED( hr )) return NULL; @@ -363,6 +361,8 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) MSIASSEMBLY *assembly = comp->assembly; MSIFEATURE *feature = NULL; + if (!init_assembly_caches( package )) return ERROR_FUNCTION_FAILED; + if (comp->assembly->feature) feature = msi_get_loaded_feature( package, comp->assembly->feature ); @@ -406,6 +406,8 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) MSIASSEMBLY *assembly = comp->assembly; MSIFEATURE *feature = NULL; + if (!init_assembly_caches( package )) return ERROR_FUNCTION_FAILED; + if (comp->assembly->feature) feature = msi_get_loaded_feature( package, comp->assembly->feature ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 902dd01205c..92c406b8ec5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1052,7 +1052,6 @@ extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) DECLSPEC_ extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; -extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bfbbaadae1b..f09d0c6fc92 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1502,13 +1502,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) package->log_file = CreateFileW( gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - if (!msi_init_assembly_caches( package )) - { - ERR("can't initialize assembly caches\n"); - msiobj_release( &package->hdr ); - return ERROR_FUNCTION_FAILED; - } - /* FIXME: when should these messages be sent? */ data_row = MSI_CreateRecord(3); if (!data_row)

1 0