March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 60b1fd7e8764ab63d79382c1805d4c007a6be332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b1fd7e8764ab63d79382c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:01 2019 -0500 msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46812 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 13 ++----------- dlls/msi/tests/custom.c | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 4537ed5..1992661 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1993,17 +1993,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) TRACE("%d\n", handle); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote(handle); - if ( !remote_database ) - return MSIDBSTATE_ERROR; - - WARN("MsiGetDatabaseState not allowed during a custom action!\n"); - - return MSIDBSTATE_READ; - } + if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) + return MSIDBSTATE_ERROR; if (db->mode != MSIDBOPEN_READONLY ) ret = MSIDBSTATE_WRITE; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6ae5bfc..9e9e2bf 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1119,7 +1119,7 @@ static void test_invalid_functions(MSIHANDLE hinst) UINT r; r = MsiGetDatabaseState(hinst); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); db = MsiGetActiveDatabase(hinst); ok(hinst, db, "MsiGetActiveDatabase failed\n"); @@ -1147,7 +1147,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiGetDatabaseState(db); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);

1 0

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport( ) is called from a custom action.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 19420f5f7c146f0ade010b9fbfaf21f926ef10a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19420f5f7c146f0ade010b9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:04 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 13 ++----------- dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index d039903..11ed27d 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -870,17 +870,8 @@ UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFil TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename)); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote( handle ); - if ( !remote_database ) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseImport not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseImport( db, szFolder, szFilename ); msiobj_release( &db->hdr ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d9d4689..b8da55e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1138,7 +1138,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseImportA(db, path, "bogus.idt"); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseCommit(db); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r);

1 0

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview () is called from a custom action.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 4bb40d1a95e525c63f1f6f1f20f0c054d46f2fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bb40d1a95e525c63f1f6f1f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:05 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 14 ++------------ dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a3e5481..153ff21 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4216,19 +4216,9 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview ) TRACE("%d %p\n", hdb, phPreview); - db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if (!db) - { - MSIHANDLE remote_database = msi_get_remote( hdb ); - if (!remote_database) - return ERROR_INVALID_HANDLE; - - *phPreview = 0; - - WARN("MsiEnableUIPreview not allowed during a custom action!\n"); + if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; - return ERROR_FUNCTION_FAILED; - } preview = MSI_EnableUIPreview( db ); if (preview) { diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index b8da55e..454966e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1150,7 +1150,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); sprintf(package_name, "#%u", db); r = MsiOpenPackageA(package_name, &package);

1 0

Nikolay Sivov : mfplat: Fix return value for IsCompressedFormat().
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: c46bdc947322f3555cd68487f97047483607df0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46bdc947322f3555cd68487… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 26 08:09:42 2019 +0300 mfplat: Fix return value for IsCompressedFormat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 9 +++++---- dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e64dd3d..2c2c83e 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -318,17 +318,18 @@ static HRESULT WINAPI mediatype_IsCompressedFormat(IMFMediaType *iface, BOOL *co { struct media_type *media_type = impl_from_IMFMediaType(iface); UINT32 value; - HRESULT hr; TRACE("%p, %p.\n", iface, compressed); - hr = IMFAttributes_GetUINT32(&media_type->attributes.IMFAttributes_iface, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); - if (FAILED(hr)) + if (FAILED(IMFAttributes_GetUINT32(&media_type->attributes.IMFAttributes_iface, + &MF_MT_ALL_SAMPLES_INDEPENDENT, &value))) + { value = 0; + } *compressed = !value; - return hr; + return S_OK; } static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, DWORD *flags) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 779a76a..f62136f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -355,7 +355,6 @@ if(0) compressed = FALSE; hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); -todo_wine ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(compressed, "Unexpected value %d.\n", compressed);

1 0

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() is called from a custom action.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: ed5f4bd14f5cece4bca63918b924606a09a3300d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5f4bd14f5cece4bca63918… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:02 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 14 ++------------ dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index bea08c2..862805f 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -884,18 +884,8 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, i if (error_cond) FIXME( "ignoring error conditions\n" ); - db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if (!db) - { - MSIHANDLE remote; - - if (!(remote = msi_get_remote(hdb))) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseApplyTransform not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); msiobj_release( &db->hdr ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 9e9e2bf..526c4a2 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1128,7 +1128,7 @@ static void test_invalid_functions(MSIHANDLE hinst) todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r);

1 0

Nikolay Sivov : winegstreamer: Print current and build version of GStreamer.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: d6fcab825b755137f451f031e1967040e91cc7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fcab825b755137f451f031… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 26 08:57:35 2019 +0300 winegstreamer: Print current and build version of GStreamer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 18154fb..fdc8966 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -267,7 +267,7 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct int argc = 2; GError *err = NULL; - TRACE("initializing\n"); + TRACE("Initializing...\n"); argv[0] = argv0; argv[1] = argv1; @@ -276,6 +276,10 @@ static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ct if (*status) { HINSTANCE newhandle; + + TRACE("Inititialized, version %s. Built with %d.%d.%d.\n", gst_version_string(), + GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + /* Unloading glib is a bad idea.. it installs atexit handlers, * so never unload the dll after loading */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,

1 0

Piotr Caban : ntdll: Fix tolower implementation to not depend on locale.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 4ed792439050c06c1833406ca74924153d9856cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed792439050c06c1833406c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:12 2019 +0100 ntdll: Fix tolower implementation to not depend on locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 18 +++++++++--------- dlls/ntdll/tests/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e0bf5be..d881e85 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -218,6 +218,15 @@ void * __cdecl _memccpy( void *dst, const void *src, int c, size_t n ) /********************************************************************* + * tolower (NTDLL.@) + */ +int __cdecl NTDLL_tolower( int c ) +{ + return (char)c >= 'A' && (char)c <= 'Z' ? c - 'A' + 'a' : c; +} + + +/********************************************************************* * _memicmp (NTDLL.@) * * Compare two blocks of memory as strings, ignoring case. @@ -308,15 +317,6 @@ LPSTR __cdecl _strlwr( LPSTR str ) /********************************************************************* - * tolower (NTDLL.@) - */ -int __cdecl NTDLL_tolower( int c ) -{ - return tolower( c ); -} - - -/********************************************************************* * toupper (NTDLL.@) */ int __cdecl NTDLL_toupper( int c ) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 0ab28ff..84755fd 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -61,6 +61,7 @@ static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(co static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); +static int (__cdecl *p_tolower)(int); static void InitFunctionPtrs(void) { @@ -99,6 +100,8 @@ static void InitFunctionPtrs(void) p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); + + p_tolower = (void *)GetProcAddress(hntdll, "tolower"); } /* if */ } @@ -1327,6 +1330,26 @@ static void test__snprintf(void) ok(!strcmp(buffer, teststring), "_snprintf returned buffer '%s', expected '%s'.\n", buffer, teststring); } +static void test_tolower(void) +{ + int i, ret, exp_ret; + + if (!GetProcAddress(GetModuleHandleA("ntdll"), "NtRemoveIoCompletionEx")) + { + win_skip("tolower tests\n"); + return; + } + + ok(p_tolower != NULL, "tolower is not available\n"); + + for (i = -512; i < 512; i++) + { + exp_ret = (char)i >= 'A' && (char)i <= 'Z' ? i - 'A' + 'a' : i; + ret = p_tolower(i); + ok(ret == exp_ret, "tolower(%d) = %d\n", i, ret); + } +} + START_TEST(string) { InitFunctionPtrs(); @@ -1363,4 +1386,5 @@ START_TEST(string) test_bsearch(); if (p__snprintf) test__snprintf(); + test_tolower(); }

1 0

Alexandre Julliard : imagehlp: Get rid of the custom heap.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: e4b2b82e6c7f84b347a12eaeb314b0026bed87f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b2b82e6c7f84b347a12eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 25 22:09:07 2019 +0100 imagehlp: Get rid of the custom heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/access.c | 7 +++---- dlls/imagehlp/imagehlp_main.c | 21 --------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 66c3036..29315f1 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); */ static LIST_ENTRY image_list = { &image_list, &image_list }; -DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /*********************************************************************** * GetImageConfigInformation (IMAGEHLP.@) @@ -74,12 +73,12 @@ PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) TRACE("(%s, %s)\n", dll_name, dll_path); - image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image)); if (!image) return NULL; if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) { - HeapFree(IMAGEHLP_hHeap, 0, image); + HeapFree(GetProcessHeap(), 0, image); return NULL; } @@ -121,7 +120,7 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) entry->Flink->Blink = entry->Blink; UnMapAndLoad(loaded_image); - HeapFree(IMAGEHLP_hHeap, 0, loaded_image); + HeapFree(GetProcessHeap(), 0, loaded_image); return TRUE; } diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index e505126..183b744 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -25,27 +25,6 @@ #include "imagehlp.h" #include "wine/debug.h" -/**********************************************************************/ -DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; - -/*********************************************************************** - * DllMain (IMAGEHLP.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); - break; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - HeapDestroy(IMAGEHLP_hHeap); - break; - } - return TRUE; -} /*********************************************************************** * MarkImageAsRunFromSwap (IMAGEHLP.@)

1 0

Vincent Povirk : appwiz.cpl: Search /opt/wine for addons.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 2f6896b14d2b1905a25b1ef55bcdc792f9fa02ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f6896b14d2b1905a25b1ef5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 21 10:14:39 2019 -0500 appwiz.cpl: Search /opt/wine for addons. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 225f915..b070307 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -330,6 +330,8 @@ static enum install_res install_from_default_dir(void) ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); + if (ret == INSTALL_NEXT) + ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name); return ret; } @@ -794,6 +796,7 @@ BOOL install_addon(addon_t addon_type) * - $datadir/$addon_subdir/ * - $INSTALL_DATADIR/wine/$addon_subdir/ * - /usr/share/wine/$addon_subdir/ + * - /opt/wine/$addon_subdir/ * - download from URL stored in $url_config_key value of HKCU/Software/Wine/$config_key key */ if (install_from_registered_dir() == INSTALL_NEXT

1 0

Detlef Riekenberg : hid/tests: Do not fail when the device is busy.
by Alexandre Julliard March 25, 2019

March 25, 2019

Module: wine Branch: master Commit: 4640081494533f790c16d3a916a9fa09cb7edaa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4640081494533f790c16d3a9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 21 15:19:49 2019 +0100 hid/tests: Do not fail when the device is busy. Some devices do not allow shared access (mouse, sound device). Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ff17229..4651ced 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -79,6 +79,12 @@ static void run_for_each_device(device_test *test) trace("Not enough permissions to read device %s.\n", wine_dbgstr_w(data->DevicePath)); continue; } + if (file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION) + { + trace("Device is busy: %s.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError());

1 0