March 2018 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 3.5
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: website Branch: master Commit: d6c747175b59ce90672745e24dbe1a5acc386551 URL: https://source.winehq.org/git/website.git/?a=commit;h=d6c747175b59ce9067274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 19:32:54 2018 +0200 Wine release 3.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018033001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018033001.xml b/news/en/2018033001.xml new file mode 100644 index 0000000..09c3caa --- /dev/null +++ b/news/en/2018033001.xml @@ -0,0 +1,16 @@ +<news> +<date>March 30, 2018</date> +<title>Wine 3.5 Released</title> +<body> + The Wine development release 3.5 is now available. + <a href="{$root}/announce/3.5">What's new</a> in this release: +<ul> + <li>More Vulkan support, including the vulkan-1 loader.</li> + <li>Support for RSA and ECDSA cryptographic keys.</li> + <li>Improved manifest file parser.</li> + <li>Support for the Places toolbar in file dialogs.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.5.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

Jacek Caban : windowscodecs: Use common base structure for component info implementations.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 0c8dc2bfba843b0be72c0d592d82e94dafce05d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8dc2bfba843b0be72c0d59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 20:50:23 2018 +0200 windowscodecs: Use common base structure for component info implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 148 ++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c8dc2bfba843b0be72c…

1 0

Jacek Caban : windowscodecs: Cache component info objects.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 8a763d9e2952d2d58078c37bf722b033c9d4109f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a763d9e2952d2d58078c37b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 20:50:35 2018 +0200 windowscodecs: Cache component info objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 47 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 3 +++ dlls/windowscodecs/tests/info.c | 31 +++++++++++++++++++--- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6d3272e..6114eef 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -60,6 +61,7 @@ typedef struct { IWICComponentInfo IWICComponentInfo_iface; LONG ref; CLSID clsid; + struct wine_rb_entry entry; } ComponentInfo; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, @@ -1923,8 +1925,26 @@ static const struct category categories[] = { {0} }; +static int ComponentInfo_Compare(const void *key, const struct wine_rb_entry *entry) +{ + ComponentInfo *info = WINE_RB_ENTRY_VALUE(entry, ComponentInfo, entry); + return memcmp(key, &info->clsid, sizeof(info->clsid)); +} + +static struct wine_rb_tree component_info_cache = { ComponentInfo_Compare }; + +static CRITICAL_SECTION component_info_cache_cs; +static CRITICAL_SECTION_DEBUG component_info_cache_cs_dbg = +{ + 0, 0, &component_info_cache_cs, + { &component_info_cache_cs_dbg.ProcessLocksList, &component_info_cache_cs_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": component_info_cache") } +}; +static CRITICAL_SECTION component_info_cache_cs = { &component_info_cache_cs_dbg, -1, 0, 0, 0, 0 }; + HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) { + struct wine_rb_entry *cache_entry; ComponentInfo *info; HKEY clsidkey; HKEY classkey; @@ -1936,9 +1956,23 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) BOOL found = FALSE; HRESULT hr; + EnterCriticalSection(&component_info_cache_cs); + + cache_entry = wine_rb_get(&component_info_cache, clsid); + if(cache_entry) + { + info = WINE_RB_ENTRY_VALUE(cache_entry, ComponentInfo, entry); + IWICComponentInfo_AddRef(*ppIInfo = &info->IWICComponentInfo_iface); + LeaveCriticalSection(&component_info_cache_cs); + return S_OK; + } + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, KEY_READ, &clsidkey); if (res != ERROR_SUCCESS) + { + LeaveCriticalSection(&component_info_cache_cs); return HRESULT_FROM_WIN32(res); + } for (category=categories; category->type; category++) { @@ -1980,10 +2014,21 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) RegCloseKey(clsidkey); if (SUCCEEDED(hr)) - *ppIInfo = &info->IWICComponentInfo_iface; + { + wine_rb_put(&component_info_cache, clsid, &info->entry); + IWICComponentInfo_AddRef(*ppIInfo = &info->IWICComponentInfo_iface); + } + LeaveCriticalSection(&component_info_cache_cs); return hr; } +void ReleaseComponentInfos(void) +{ + ComponentInfo *info, *next_info; + WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(info, next_info, &component_info_cache, ComponentInfo, entry) + IWICComponentInfo_Release(&info->IWICComponentInfo_iface); +} + typedef struct { IEnumUnknown IEnumUnknown_iface; LONG ref; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 3bed565..6f781b8 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -42,6 +42,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; + case DLL_PROCESS_DETACH: + ReleaseComponentInfos(); + break; } return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 4a9c9c6..d00e9d8 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -139,7 +139,6 @@ static void test_decoder_info(void) decoder_info2 = NULL; hr = IWICBitmapDecoder_GetDecoderInfo(decoder, &decoder_info2); ok(hr == S_OK, "Failed to get decoder info, hr %#x.\n", hr); - todo_wine ok(decoder_info == decoder_info2, "Unexpected decoder info instance.\n"); hr = IWICBitmapDecoderInfo_QueryInterface(decoder_info, &IID_IWICBitmapDecoder, (void **)&decoder2); @@ -470,17 +469,38 @@ static void test_pixelformat_info(void) IWICComponentInfo_Release(info); } +static DWORD WINAPI cache_across_threads_test(void *arg) +{ + IWICComponentInfo *info; + HRESULT hr; + + CoInitialize(NULL); + + hr = get_component_info(&CLSID_WICUnknownMetadataReader, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + ok(info == arg, "unexpected info pointer %p\n", info); + IWICComponentInfo_Release(info); + + CoUninitialize(); + return 0; +} + static void test_reader_info(void) { IWICImagingFactory *factory; - IWICComponentInfo *info; + IWICComponentInfo *info, *info2; IWICMetadataReaderInfo *reader_info; HRESULT hr; CLSID clsid; GUID container_formats[10]; - UINT count, size; + UINT count, size, tid; + HANDLE thread; WICMetadataPattern *patterns; + hr = get_component_info(&CLSID_WICUnknownMetadataReader, &info2); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + IWICComponentInfo_Release(info2); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); @@ -488,6 +508,11 @@ static void test_reader_info(void) hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICUnknownMetadataReader, &info); ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + ok(info == info2, "info != info2\n"); + + thread = CreateThread(NULL, 0, cache_across_threads_test, info, 0, &tid); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); hr = IWICComponentInfo_QueryInterface(info, &IID_IWICMetadataReaderInfo, (void**)&reader_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index c2c5ce4..037bde2 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -124,6 +124,7 @@ extern HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; +extern void ReleaseComponentInfos(void) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN; typedef struct BmpDecoder BmpDecoder;

1 0

Alexandre Julliard : Release 3.5.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 79f93ecf429f42db15bc14f276045fdad35cef13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f93ecf429f42db15bc14f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 19:30:27 2018 +0200 Release 3.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 829 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 436 insertions(+), 418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79f93ecf429f42db15bc…

1 0

Tag wine-3.5 : Alexandre Julliard : Release 3.5
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: refs/tags/wine-3.5 Tag: 8fa5be285ea45fe330326245064a2dce2065ffef URL: https://source.winehq.org/git/wine.git/?a=tag;h=8fa5be285ea45fe330326245064… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 19:30:27 2018 +0200 Release 3.5

1 0

André Hentschel : kernel32/tests: Fix check for invalid type value.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 3d8d811be165cd9586d1389206c568b5c6975305 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8d811be165cd9586d13892… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:50 2018 +0200 kernel32/tests: Fix check for invalid type value. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- include/winnls.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index efb4231..5d5cc17 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4720,7 +4720,7 @@ static void test_GetGeoInfo(void) /* try invalid type value */ SetLastError(0xdeadbeef); - ret = pGetGeoInfoA(203, GEO_CURRENCYSYMBOL + 1, NULL, 0, 0); + ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); } diff --git a/include/winnls.h b/include/winnls.h index 1191111..99a30e4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -826,7 +826,9 @@ enum SYSGEOTYPE GEO_PARENT, GEO_DIALINGCODE, GEO_CURRENCYCODE, - GEO_CURRENCYSYMBOL + GEO_CURRENCYSYMBOL, + GEO_NAME, + GEO_ID }; enum SYSGEOCLASS

1 0

André Hentschel : kernel32/tests: Allow GetLastError to be unchanged in a test.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: d28628e9204e684bb695d1580abbf06eab89a2ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d28628e9204e684bb695d158… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:57 2018 +0200 kernel32/tests: Allow GetLastError to be unchanged in a test. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5d5cc17..d8f51d3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4660,7 +4660,8 @@ static void test_GetGeoInfo(void) SetLastError(0xdeadbeef); ret = pGetGeoInfoA(344, GEO_ISO2, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef /* Win10 */), "got %d\n", GetLastError()); ret = pGetGeoInfoA(203, GEO_ISO2, NULL, 0, 0); ok(ret == 3, "got %d\n", ret);

1 0

André Hentschel : schedsvc/tests: Recognize newer Windows 10's RPC version.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: b164e4dc8d9b61878a2a6ccacabfd9d223b7290e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b164e4dc8d9b61878a2a6cca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 29 19:28:46 2018 +0200 schedsvc/tests: Recognize newer Windows 10's RPC version. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index be1e5eb..a383538 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -115,7 +115,8 @@ START_TEST(rpcapi) hr = SchRpcHighestVersion(&version); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(version == 0x10002 /* vista */ || version == 0x10003 /* win7 */ || - version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */, + version == 0x10004 /* win8 */ || version == 0x10005 /* win10 */ || + version == 0x10006 /* win10 1709 */, "wrong version %#x\n", version); SetUnhandledExceptionFilter(old_exception_filter);

1 0

Stefan Leichter : include: Fix declaration of SelectDeviceDlg.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 208fa59202227f09e5074b06f5ec8aae1fe6becb URL: https://source.winehq.org/git/wine.git/?a=commit;h=208fa59202227f09e5074b06… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Mar 29 23:08:21 2018 +0200 include: Fix declaration of SelectDeviceDlg. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wia_lh.idl | 2 +- include/wia_xp.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 284528a..2e3ecf4 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -47,7 +47,7 @@ interface IWiaDevMgr : IUnknown [in] HWND hwndParent, [in] LONG lDeviceType, [in] LONG lFlags, - [in, out] BSTR *pbstrDeviceID, + [in, out, unique] BSTR *pbstrDeviceID, [retval, out] IWiaItem **ppItemRoot); HRESULT SelectDeviceDlgID( diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 284528a..2e3ecf4 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -47,7 +47,7 @@ interface IWiaDevMgr : IUnknown [in] HWND hwndParent, [in] LONG lDeviceType, [in] LONG lFlags, - [in, out] BSTR *pbstrDeviceID, + [in, out, unique] BSTR *pbstrDeviceID, [retval, out] IWiaItem **ppItemRoot); HRESULT SelectDeviceDlgID(

1 0

Stefan Leichter : wiaservc: Add some tests for SelectDeviceDlg.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: daf7f3c4ae41c5547e88ef40971e3adc1f9aab06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf7f3c4ae41c5547e88ef40… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Mar 29 23:08:29 2018 +0200 wiaservc: Add some tests for SelectDeviceDlg. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/wia.c | 16 ++++++++++++++++ include/wiadef.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index c7c2fd9..6183cef 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -25,6 +25,8 @@ #include "objbase.h" #include "initguid.h" #include "wia_lh.h" +#include "sti.h" +#include "wiadef.h" #include "wine/test.h" @@ -54,6 +56,19 @@ todo_wine IEnumWIA_DEV_INFO_Release(devenum); } +static void test_SelectDeviceDlg(void) +{ + HRESULT hr; + IWiaItem *root; + hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); +todo_wine + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); +todo_wine + ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); +} + START_TEST(wia) { HRESULT hr; @@ -68,6 +83,7 @@ START_TEST(wia) } test_EnumDeviceInfo(); + test_SelectDeviceDlg(); IWiaDevMgr_Release(devmanager); CoUninitialize(); diff --git a/include/wiadef.h b/include/wiadef.h index 28e43e0..bd95872 100644 --- a/include/wiadef.h +++ b/include/wiadef.h @@ -20,3 +20,9 @@ #define WIA_DEVINFO_ENUM_ALL 0x0000000f #define WIA_DEVINFO_ENUM_LOCAL 0x00000010 + +#define FACILITY_WIA 33 + +#define BASE_VAL_WIA_ERROR 0x00000000 + +#define WIA_S_NO_DEVICE_AVAILABLE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIA, (BASE_VAL_WIA_ERROR + 21))

1 0