February 2023 - Wine-commits

Alexandre Julliard : Wine release 8.1
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Alexandre Julliard : kernelbase: Report correct errors in GetModuleHandleExA().
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Alexandre Julliard : Release 8.1.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Tag wine-8.1 : Alexandre Julliard : Release 8.1
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Zhiyi Zhang : include: Add uiviewsettingsinterop.idl.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Zhiyi Zhang : opengl32/tests: Make context current before calling wglCopyContext().
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Hans Leidekker : wbemprox: Recognize Windows 11.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Eric Pouech : winedump: Be stricter about sizes while walking module's list.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: e8777691c8b54f21339fcc268b3a916e8a55fd71 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8777691c8b54f21339fcc268b3a91… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:50 2023 +0100 winedump: Be stricter about sizes while walking module's list. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 787a62fe624..b13161c6c7a 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -637,6 +637,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* Read per-module symbol / linenumber tables */ file = (const char*)symbols + sizeof(PDB_SYMBOLS); while (file - (const char*)symbols < sizeof(PDB_SYMBOLS) + symbols->module_size) + while ((file - (const char*)symbols + sizeof(symbols->version) < sizeof(PDB_SYMBOLS) + symbols->module_size) && + (file - (const char*)symbols + + symbols->version < 19970000 ? sizeof(PDB_SYMBOL_FILE) : sizeof(PDB_SYMBOL_FILE_EX)) < sizeof(PDB_SYMBOLS) + symbols->module_size) { int stream_nr, symbol_size, lineno_size, lineno2_size; const char* file_name;

1 0

Kacper Michajłow : include: Add some DXGI_COLOR_SPACE_TYPE enumeration values.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: 6e7a54f7952317b998d76fe9d7969a10e5f886b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e7a54f7952317b998d76fe9d7969a… Author: Kacper Michajłow <kasper93(a)gmail.com> Date: Thu Feb 2 09:52:28 2023 +0100 include: Add some DXGI_COLOR_SPACE_TYPE enumeration values. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- include/dxgicommon.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dxgicommon.idl b/include/dxgicommon.idl index 99ace03c37d..29c8f6af642 100644 --- a/include/dxgicommon.idl +++ b/include/dxgicommon.idl @@ -45,6 +45,11 @@ typedef enum DXGI_COLOR_SPACE_TYPE DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020 = 0x11, DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020 = 0x12, DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020 = 0x13, + DXGI_COLOR_SPACE_RGB_STUDIO_G24_NONE_P709 = 0x14, + DXGI_COLOR_SPACE_RGB_STUDIO_G24_NONE_P2020 = 0x15, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G24_LEFT_P709 = 0x16, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G24_LEFT_P2020 = 0x17, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G24_TOPLEFT_P2020 = 0x18, DXGI_COLOR_SPACE_CUSTOM = 0xffffffff, } DXGI_COLOR_SPACE_TYPE;

1 0

Hans Leidekker : msi: Install and patch global assemblies in InstallFinalize.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: 2c450fd6215c0da4685143f97ece8b6db0f54a0b URL: https://gitlab.winehq.org/wine/wine/-/commit/2c450fd6215c0da4685143f97ece8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 2 11:06:36 2023 +0100 msi: Install and patch global assemblies in InstallFinalize. Installing global assemblies requires assembly caches to be initialized and this is no longer the case after the PE conversion (builtin fusion no longer loads if the dll is not present on disk). The next patch changes msi to perform late initialization of the assembly caches so that native fusion can be loaded once it's installed by .NET installers. However, there's no guarantee that all necessary files and registry keys are installed before the InstallFiles and PatchFiles actions are executed. Therefore this patch moves the parts of these actions handling global assemblies to InstallFinalize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51345 --- dlls/msi/action.c | 43 +++++++++++++++++++++++++++++++++++++++-- dlls/msi/assembly.c | 55 ----------------------------------------------------- dlls/msi/files.c | 40 +++++--------------------------------- dlls/msi/msipriv.h | 2 +- 4 files changed, 47 insertions(+), 93 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d856e94efa7..2bb9604adb8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2068,8 +2068,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) set_target_path( package, file ); - if ((comp->assembly && !comp->assembly->installed) || - msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + if (msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { comp->Cost += file->FileSize; continue; @@ -5134,6 +5133,8 @@ static BOOL is_full_uninstall( MSIPACKAGE *package ) static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; + MSIFILE *file; + MSIFILEPATCH *patch; /* first do the same as an InstallExecute */ rc = execute_script(package, SCRIPT_INSTALL); @@ -5145,6 +5146,44 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; + /* install global assemblies */ + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) + { + MSICOMPONENT *comp = file->Component; + + if (!msi_is_global_assembly( comp ) || (file->state != msifs_missing && file->state != msifs_overwrite)) + continue; + + rc = msi_install_assembly( package, comp ); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to install assembly\n"); + return ERROR_INSTALL_FAILURE; + } + file->state = msifs_installed; + } + + /* patch global assemblies */ + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + MSICOMPONENT *comp = patch->File->Component; + + if (!msi_is_global_assembly( comp ) || !patch->path) continue; + + rc = msi_patch_assembly( package, comp->assembly, patch ); + if (rc && !(patch->Attributes & msidbPatchAttributesNonVital)) + { + ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); + return rc; + } + + if ((rc = msi_install_assembly( package, comp ))) + { + ERR("Failed to install patched assembly\n"); + return rc; + } + } + if (is_full_uninstall(package)) rc = ACTION_UnpublishProduct(package); diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 7f75d225be0..586521342b6 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -219,24 +219,6 @@ done: return display_name; } -static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_name ) -{ - HRESULT hr; - ASSEMBLY_INFO info; - - if (!cache) return FALSE; - - memset( &info, 0, sizeof(info) ); - info.cbAssemblyInfo = sizeof(info); - hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); - if (hr == S_OK /* sxs version */ || hr == E_NOT_SUFFICIENT_BUFFER) - { - return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); - } - TRACE( "QueryAssemblyInfo returned %#lx\n", hr ); - return FALSE; -} - WCHAR *msi_get_assembly_path( MSIPACKAGE *package, const WCHAR *displayname ) { HRESULT hr; @@ -309,13 +291,6 @@ static const WCHAR *clr_version[] = L"v4.0.30319" }; -static const WCHAR *get_clr_version_str( enum clr_version version ) -{ - if (version >= ARRAY_SIZE( clr_version )) return L"unknown"; - return clr_version[version]; -} - -/* assembly caches must be initialized */ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { MSIRECORD *rec; @@ -351,34 +326,6 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) } TRACE("display name %s\n", debugstr_w(a->display_name)); - if (a->application) - { - /* We can't check the manifest here because the target path may still change. - So we assume that the assembly is not installed and lean on the InstallFiles - action to determine which files need to be installed. - */ - a->installed = FALSE; - } - else - { - if (a->attributes == msidbAssemblyAttributesWin32) - a->installed = is_assembly_installed( package->cache_sxs, a->display_name ); - else - { - UINT i; - for (i = 0; i < CLR_VERSION_MAX; i++) - { - a->clr_version[i] = is_assembly_installed( package->cache_net[i], a->display_name ); - if (a->clr_version[i]) - { - TRACE("runtime version %s\n", debugstr_w(get_clr_version_str( i ))); - a->installed = TRUE; - break; - } - } - } - } - TRACE("assembly is %s\n", a->installed ? "installed" : "not installed"); msiobj_release( &rec->hdr ); return a; } @@ -449,7 +396,6 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) return ERROR_FUNCTION_FAILED; } if (feature) feature->Action = INSTALLSTATE_LOCAL; - assembly->installed = TRUE; return ERROR_SUCCESS; } @@ -491,7 +437,6 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) } } if (feature) feature->Action = INSTALLSTATE_ABSENT; - assembly->installed = FALSE; return ERROR_SUCCESS; } diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 75075a37b5f..8267691a94d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -305,7 +305,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil DWORD size; comp->Action = msi_get_component_action( package, comp ); - if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) { TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; @@ -315,8 +315,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (obsoleted by patch)\n", debugstr_w(file->File)); return msifs_skipped; } - if ((msi_is_global_assembly( comp ) && !comp->assembly->installed) || - msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + if (msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("installing %s (missing)\n", debugstr_w(file->File)); return msifs_missing; @@ -650,22 +649,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } - LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) - { - MSICOMPONENT *comp = file->Component; - - if (!msi_is_global_assembly( comp ) || comp->assembly->installed || - (file->state != msifs_missing && file->state != msifs_overwrite)) continue; - - rc = msi_install_assembly( package, comp ); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to install assembly\n"); - rc = ERROR_INSTALL_FAILURE; - break; - } - file->state = msifs_installed; - } done: msi_free_media_info(mi); @@ -740,7 +723,7 @@ static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch ) return r; } -static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATCH *patch ) +UINT msi_patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATCH *patch ) { UINT r = ERROR_FUNCTION_FAILED; IAssemblyName *name; @@ -851,27 +834,14 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) { MSICOMPONENT *comp = patch->File->Component; - if (!patch->path) continue; - - if (msi_is_global_assembly( comp )) - rc = patch_assembly( package, comp->assembly, patch ); - else - rc = patch_file( package, patch ); + if (msi_is_global_assembly( comp ) || !patch->path) continue; + rc = patch_file( package, patch ); if (rc && !(patch->Attributes & msidbPatchAttributesNonVital)) { ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); break; } - - if (msi_is_global_assembly( comp )) - { - if ((rc = msi_install_assembly( package, comp ))) - { - ERR("Failed to install patched assembly\n"); - break; - } - } } done: diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1db770481ef..902dd01205c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -515,7 +515,6 @@ typedef struct tagMSIASSEMBLY DWORD attributes; LPWSTR display_name; LPWSTR tempdir; - BOOL installed; BOOL clr_version[CLR_VERSION_MAX]; } MSIASSEMBLY; @@ -806,6 +805,7 @@ extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si extern UINT msi_apply_patches( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) DECLSPEC_HIDDEN; extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; +extern UINT msi_patch_assembly( MSIPACKAGE *, MSIASSEMBLY *, MSIFILEPATCH * ) DECLSPEC_HIDDEN; /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN;

1 0