wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Andrey Gusev : d3dx11: Add D3DX11SaveTextureToMemory stub.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 0951a1b6db1ed219058f82c330e22d9d9bfc8516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0951a1b6db1ed219058f82c33… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 4 15:43:21 2016 +0100 d3dx11: Add D3DX11SaveTextureToMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 3 ++- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/Makefile.in | 3 ++- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 35 +++++++++++++++++++++++++++++++++++ include/d3dx11tex.h | 3 +++ 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 3ed7fd3..d20f660 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -4,6 +4,7 @@ PARENTSRC = ../d3dx11_43 C_SRCS = \ async.c \ - d3dx11_42.c + d3dx11_42.c \ + texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 45e8482..f97ec24 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -41,4 +41,4 @@ @ stub D3DX11SHProjectCubeMap @ stub D3DX11SaveTextureToFileA @ stub D3DX11SaveTextureToFileW -@ stub D3DX11SaveTextureToMemory +@ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index 1cc4911..d5c5b45 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = d3dcompiler C_SRCS = \ async.c \ - d3dx11_43.c + d3dx11_43.c \ + texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 7c3a598..0a6350c 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -41,4 +41,4 @@ @ stub D3DX11SHProjectCubeMap @ stub D3DX11SaveTextureToFileA @ stub D3DX11SaveTextureToFileW -@ stub D3DX11SaveTextureToMemory +@ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c new file mode 100644 index 0000000..832f64f --- /dev/null +++ b/dlls/d3dx11_43/texture.c @@ -0,0 +1,35 @@ +/* + * Copyright 2016 Andrey Gusev + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" +#include "d3dx11.h" +#include "d3dcompiler.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags) +{ + FIXME("context %p, texture %p, format %u, buffer %p, flags %#x stub!\n", + context, texture, format, buffer, flags); + + return E_NOTIMPL; +} diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 0217777..bd22f32 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -92,6 +92,9 @@ HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *s HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags); + #ifdef __cplusplus } #endif

1 0

Jacek Caban : rpcsal.h: Added __RPC__range and __RPC__in_range defines.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 9d348189880a6e7a1e7a6a303915e47af3255972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d348189880a6e7a1e7a6a303… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 15:45:52 2016 +0100 rpcsal.h: Added __RPC__range and __RPC__in_range defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcsal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/rpcsal.h b/include/rpcsal.h index ffa114a..72a61ef 100644 --- a/include/rpcsal.h +++ b/include/rpcsal.h @@ -165,3 +165,6 @@ #define __RPC_ref_pointer #define __RPC_string #define __RPC_unique_pointer + +#define __RPC__range(min,max) +#define __RPC__in_range(min,max)

1 0

Nikolay Sivov : vbscript: Implement StrComp().
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 5c6aa8d6c3436f8b6174fa938e35b12d004ebeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6aa8d6c3436f8b6174fa938… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 16:32:24 2016 +0300 vbscript: Implement StrComp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 37 ++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 20 ++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 129d6ce..a1ffa50 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1027,10 +1027,41 @@ static HRESULT Global_MidB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return E_NOTIMPL; } -static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR left, right; + int mode, ret; + HRESULT hres; + short val; + + TRACE("(%s %s ...)\n", debugstr_variant(args), debugstr_variant(args+1)); + + assert(args_cnt == 2 || args_cnt == 3); + + if(V_VT(args) != VT_BSTR || V_VT(args+1) != VT_BSTR) { + FIXME("args[0] = %s, args[1] = %s\n", debugstr_variant(args), debugstr_variant(args+1)); + return E_NOTIMPL; + } + + if (args_cnt == 3) { + hres = to_int(args+2, &mode); + if(FAILED(hres)) + return hres; + + if (mode != 0 && mode != 1) { + FIXME("unknown compare mode = %d\n", mode); + return E_FAIL; + } + } + else + mode = 0; + + left = V_BSTR(args); + right = V_BSTR(args+1); + + ret = mode ? strcmpiW(left, right) : strcmpW(left, right); + val = ret < 0 ? -1 : (ret > 0 ? 1 : 0); + return return_short(res, val); } static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2a365c7..91d34ce 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -440,6 +440,26 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +Sub TestStrComp(str_left, str_right, mode, ex) + x = StrComp(str_left, str_right, mode) + Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) +End Sub + +TestStrComp "ABC", "abc", 0, -1 +TestStrComp "abc", "ABC", 0, 1 +TestStrComp "ABC", "ABC", 0, 0 +TestStrComp "ABC", "abc", 0, -1 +TestStrComp "abc", "ABC", 0, 1 +TestStrComp "ABC", "ABC", 0, 0 +TestStrComp "ABCD", "ABC", 0, 1 +TestStrComp "ABC", "ABCD", 0, -1 +TestStrComp "ABC", "abc", 1, 0 +TestStrComp "ABC", "ABC", 1, 0 +TestStrComp "ABCD", "ABC", 1, 1 +TestStrComp "ABC", "ABCD", 1, -1 +TestStrComp "ABC", "ABCD", "0", -1 +TestStrComp "ABC", "ABCD", "1", -1 + Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1))

1 0

Hans Leidekker : netapi32/tests: Fix a test failure on Windows 7.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 83af2eec506c65ba4802eab984998aeacede8c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83af2eec506c65ba4802eab98… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:29:29 2016 +0100 netapi32/tests: Fix a test failure on Windows 7. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f44a6d3..f095d77 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -558,7 +558,7 @@ static void test_DavGetUNCFromHTTPPath(void) static const WCHAR path2[] = {'h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; static const WCHAR path3[] = - {'h','t','t','p','s',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; + {'h','t','t','p','s',':','/','/','h','o','s','t','/','p','a','t','h',0}; static const WCHAR path4[] = {'\\','\\','s','e','r','v','e','r',0}; static const WCHAR path5[] = @@ -598,7 +598,7 @@ static void test_DavGetUNCFromHTTPPath(void) static const WCHAR result[] = {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t','\\','p','a','t','h',0}; static const WCHAR result2[] = - {'\\','\\','s','e','r','v','e','r','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', + {'\\','\\','h','o','s','t','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', 'p','a','t','h',0}; static const WCHAR result3[] = {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t',0}; @@ -626,7 +626,7 @@ static void test_DavGetUNCFromHTTPPath(void) { { path, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path2, MAX_PATH, ERROR_SUCCESS, result, 25 }, - { path3, MAX_PATH, ERROR_SUCCESS, result2, 29 }, + { path3, MAX_PATH, ERROR_SUCCESS, result2, 27 }, { path4, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path5, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path6, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH },

1 0

Hans Leidekker : msi: Properly remove the product code from the ugrade codes key.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: d17d54e16d5c3e6a33015bc6675e6554e70902c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17d54e16d5c3e6a33015bc66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:11 2016 +0100 msi: Properly remove the product code from the ugrade codes key. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 47 +++++++++++++++++++++++++++++++++++-------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 12 +++++++++++ dlls/msi/tests/install.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 751462b..4d7e8b9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5285,9 +5285,46 @@ static UINT msi_unpublish_icons( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static void remove_product_upgrade_code( MSIPACKAGE *package ) +{ + WCHAR *code, product[SQUASHED_GUID_SIZE]; + HKEY hkey; + LONG res; + DWORD count; + + squash_guid( package->ProductCode, product ); + if (!(code = msi_dup_property( package->db, szUpgradeCode ))) + { + WARN( "upgrade code not found\n" ); + return; + } + if (!MSIREG_OpenUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteUpgradeCodesKey( code ); + } + if (!MSIREG_OpenUserUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteUserUpgradeCodesKey( code ); + } + if (!MSIREG_OpenClassesUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteClassesUpgradeCodesKey( code ); + } + + msi_free( code ); +} + static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) { - WCHAR *upgrade; MSIPATCHINFO *patch; MSIREG_DeleteProductKey(package->ProductCode); @@ -5299,13 +5336,7 @@ static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) MSIREG_DeleteUserProductKey(package->ProductCode); MSIREG_DeleteUserFeaturesKey(package->ProductCode); - upgrade = msi_dup_property(package->db, szUpgradeCode); - if (upgrade) - { - MSIREG_DeleteUserUpgradeCodesKey(upgrade); - MSIREG_DeleteClassesUpgradeCodesKey(upgrade); - msi_free(upgrade); - } + remove_product_upgrade_code( package ); LIST_FOR_EACH_ENTRY(patch, &package->patches, MSIPATCHINFO, entry) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a2939b3..56ba725 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -919,6 +919,7 @@ extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT) DECLSPEC extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; +extern UINT MSIREG_DeleteUpgradeCodesKey(const WCHAR *) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 8852f57..1f87cbb 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -940,6 +940,18 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL creat return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); } +UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) +{ + WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; + TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); + + strcpyW( keypath, szInstaller_UpgradeCodes ); + strcatW( keypath, squashed_code ); + return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); +} + UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) { WCHAR squashed_uc[SQUASHED_GUID_SIZE], keypath[0x200]; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e1113e7..a377184 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5888,6 +5888,57 @@ static void test_shared_component(void) DeleteFileA(msifile2); } +static void test_remove_upgrade_code(void) +{ + UINT r; + LONG res; + HKEY hkey; + REGSAM access = KEY_ALL_ACCESS; + DWORD type, size; + char buf[1]; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + if (is_wow64) access |= KEY_WOW64_64KEY; + + create_test_files(); + create_database( msifile, icon_base_tables, sizeof(icon_base_tables)/sizeof(icon_base_tables[0]) ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, "FULL=1" ); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", + 0, access, &hkey ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + type = 0xdeadbeef; + buf[0] = 0x55; + size = sizeof(buf); + res = RegQueryValueExA( hkey, "94A88FD7F6998CE40A22FB59F6B9C2BB", NULL, &type, (BYTE *)buf, &size ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + ok( type == REG_SZ, "got %u\n", type ); + ok( size == 1, "got %u\n", size ); + ok( !buf[0], "wrong data\n" ); + RegCloseKey( hkey ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", + 0, access, &hkey ); + ok( res == ERROR_FILE_NOT_FOUND, "got %d\n", res ); + + RemoveDirectoryA( "msitest" ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -5974,6 +6025,7 @@ START_TEST(install) test_mixed_package(); test_volume_props(); test_shared_component(); + test_remove_upgrade_code(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Also roll back changes made in PublishProduct.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: d4814f98c81c42257cc47bd6f579b8cc7278aacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4814f98c81c42257cc47bd6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:10 2016 +0100 msi: Also roll back changes made in PublishProduct. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 57 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 34d1a25..751462b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -145,6 +145,8 @@ static const WCHAR szUnpublishComponents[] = {'U','n','p','u','b','l','i','s','h', 'C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szUnpublishFeatures[] = {'U','n','p','u','b','l','i','s','h','F','e','a','t','u','r','e','s',0}; +static const WCHAR szUnpublishProduct[] = + {'U','n','p','u','b','l','i','s','h','P','r','o','d','u','c','t',0}; static const WCHAR szUnregisterComPlus[] = {'U','n','r','e','g','i','s','t','e','r','C','o','m','P','l','u','s',0}; static const WCHAR szUnregisterTypeLibraries[] = @@ -5283,28 +5285,10 @@ static UINT msi_unpublish_icons( MSIPACKAGE *package ) return ERROR_SUCCESS; } -static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) +static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) { - static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; - WCHAR *upgrade, **features; - BOOL full_uninstall = TRUE; - MSIFEATURE *feature; + WCHAR *upgrade; MSIPATCHINFO *patch; - UINT i; - - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - if (feature->Action == INSTALLSTATE_LOCAL) full_uninstall = FALSE; - } - features = msi_split_string( remove, ',' ); - for (i = 0; features && features[i]; i++) - { - if (!strcmpW( features[i], szAll )) full_uninstall = TRUE; - } - msi_free(features); - - if (!full_uninstall) - return ERROR_SUCCESS; MSIREG_DeleteProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); @@ -5340,10 +5324,32 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) return ERROR_SUCCESS; } +static BOOL is_full_uninstall( MSIPACKAGE *package ) +{ + WCHAR **features, *remove = msi_dup_property( package->db, szRemove ); + MSIFEATURE *feature; + BOOL ret = TRUE; + UINT i; + + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + if (feature->Action == INSTALLSTATE_LOCAL) ret = FALSE; + } + + features = msi_split_string( remove, ',' ); + for (i = 0; features && features[i]; i++) + { + if (!strcmpW( features[i], szAll )) ret = TRUE; + } + + msi_free(features); + msi_free(remove); + return ret; +} + static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; - WCHAR *remove; /* first do the same as an InstallExecute */ rc = execute_script(package, SCRIPT_INSTALL); @@ -5355,9 +5361,9 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; - remove = msi_dup_property(package->db, szRemove); - rc = msi_unpublish_product(package, remove); - msi_free(remove); + if (is_full_uninstall(package)) + rc = ACTION_UnpublishProduct(package); + return rc; } @@ -7673,7 +7679,7 @@ StandardActions[] = { szProcessComponents, ACTION_ProcessComponents, szProcessComponents }, { szPublishComponents, ACTION_PublishComponents, szUnpublishComponents }, { szPublishFeatures, ACTION_PublishFeatures, szUnpublishFeatures }, - { szPublishProduct, ACTION_PublishProduct, NULL }, + { szPublishProduct, ACTION_PublishProduct, szUnpublishProduct }, { szRegisterClassInfo, ACTION_RegisterClassInfo, szUnregisterClassInfo }, { szRegisterComPlus, ACTION_RegisterComPlus, szUnregisterComPlus }, { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo, szUnregisterExtensionInfo }, @@ -7702,6 +7708,7 @@ StandardActions[] = { szStopServices, ACTION_StopServices, szStartServices }, { szUnpublishComponents, ACTION_UnpublishComponents, szPublishComponents }, { szUnpublishFeatures, ACTION_UnpublishFeatures, szPublishFeatures }, + { szUnpublishProduct, ACTION_UnpublishProduct, NULL }, /* for rollback only */ { szUnregisterClassInfo, ACTION_UnregisterClassInfo, szRegisterClassInfo }, { szUnregisterComPlus, ACTION_UnregisterComPlus, szRegisterComPlus }, { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo },

1 0

Hans Leidekker : msi: Run the installer in silent mode in RemoveExistingProducts.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 6233eace9769ecc639b39dab7f41297811669244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6233eace9769ecc639b39dab7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:09 2016 +0100 msi: Run the installer in silent mode in RemoveExistingProducts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b35969b..34d1a25 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7391,7 +7391,8 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { static const WCHAR fmtW[] = - {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; + {'m','s','i','e','x','e','c',' ','/','q','n',' ','/','i',' ','%','s',' ', + 'R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 );

1 0

Hans Leidekker : msi: Take the install context into account when deleting the product key.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 5343a6f445e95f33f2822fadeb92877a4dc496d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5343a6f445e95f33f2822fade… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:08 2016 +0100 msi: Take the install context into account when deleting the product key. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 4 ++-- dlls/msi/msipriv.h | 2 +- dlls/msi/registry.c | 17 +++++++++++------ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ee53684..b35969b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5307,7 +5307,7 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) return ERROR_SUCCESS; MSIREG_DeleteProductKey(package->ProductCode); - MSIREG_DeleteUserDataProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); MSIREG_DeleteUninstallKey(package->ProductCode, package->platform); MSIREG_DeleteLocalClassesProductKey(package->ProductCode); @@ -5524,7 +5524,7 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) if (msi_check_unpublish(package)) { - MSIREG_DeleteUserDataProductKey(package->ProductCode); + MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); goto end; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ce1eb6d..a2939b3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -915,7 +915,7 @@ extern UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL cr extern UINT MSIREG_DeleteProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataPatchKey(LPCWSTR patch, MSIINSTALLCONTEXT context) DECLSPEC_HIDDEN; -extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; +extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 01d8ba7..8852f57 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -852,7 +852,7 @@ UINT MSIREG_OpenInstallProps(LPCWSTR szProduct, MSIINSTALLCONTEXT dwContext, LPC return RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, key); } -UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) +UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context) { REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; WCHAR *usersid, squashed_pc[SQUASHED_GUID_SIZE], keypath[0x200]; @@ -862,13 +862,18 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) if (!squash_guid( szProduct, squashed_pc )) return ERROR_FUNCTION_FAILED; TRACE("%s squashed %s\n", debugstr_w(szProduct), debugstr_w(squashed_pc)); - if (!(usersid = get_user_sid())) + if (context == MSIINSTALLCONTEXT_MACHINE) + sprintfW(keypath, szUserDataProducts_fmt, szLocalSid); + else { - ERR("Failed to retrieve user SID\n"); - return ERROR_FUNCTION_FAILED; + if (!(usersid = get_user_sid())) + { + ERR("Failed to retrieve user SID\n"); + return ERROR_FUNCTION_FAILED; + } + sprintfW(keypath, szUserDataProducts_fmt, usersid); + LocalFree(usersid); } - sprintfW(keypath, szUserDataProducts_fmt, usersid); - LocalFree(usersid); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey)) return ERROR_SUCCESS; r = RegDeleteTreeW( hkey, squashed_pc );

1 0

Hans Leidekker : msi: Use exact size for squashed GUID buffers.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 2b0d2ec553bc9e51baaf99be99e717113a683470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0d2ec553bc9e51baaf99be9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:07 2016 +0100 msi: Use exact size for squashed GUID buffers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 47 ++++------ dlls/msi/msi.c | 92 ++++++++---------- dlls/msi/msipriv.h | 2 +- dlls/msi/registry.c | 262 +++++++++++++++++++++++++--------------------------- dlls/msi/source.c | 88 ++++++------------ dlls/msi/upgrade.c | 6 +- 6 files changed, 216 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0d2ec553bc9e51baaf9…

1 0

Hans Leidekker : msi/tests: Fix a typo in test data.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 6eae08774c504c154ff62e65ce7d4816e4d5fa6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eae08774c504c154ff62e65c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:06 2016 +0100 msi/tests: Fix a typo in test data. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index d51a3d5..11e244c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -227,7 +227,7 @@ static const char service_install_dat[] = "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService\t\t-a arg\tservice_comp\tdescription\n" - "TestService2\tSERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription"; + "TestService2\t[SERVNAME2]\t[SERVDISP2]\t2\t3\t0\t\tservice1[~]+group1[~]service2[~]+group2[~][~]\tTestService2\t\t-a arg\tservice_comp2\tdescription\n"; static const char service_install2_dat[] = "ServiceInstall\tName\tDisplayName\tServiceType\tStartType\tErrorControl\t"

1 0

← Newer
1
...
39
40
41
42
43
44
45
46
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016