August 2018 - Wine-Devel - list.winehq.org

[PATCH 2/2] shell32: Stop adding AllUsersProfile key to the registry.
by Dmitry Timoshkov Aug. 20, 2018

Aug. 20, 2018

It's no longer needed, and recent Windows versions don't have it either. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shellpath.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d566..37e5a13b77 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -957,7 +957,6 @@ static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a', static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; @@ -3804,17 +3803,8 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) strcpyW(szTemp, szSrc); while (SUCCEEDED(hr) && szTemp[0] == '%') { - if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) - { - WCHAR szAllUsers[MAX_PATH]; - - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); - PathAppendW(szDest, szAllUsers); - PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); - } - else if (!strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) + if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW)) || + !strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) { WCHAR szProgramData[MAX_PATH], def_val[MAX_PATH]; HKEY shellFolderKey; -- 2.17.1

2 1

[PATCH] winegcc: Support distros using plain lib for 32-bit libraries in get_lib_dir.
by Jacek Caban Aug. 20, 2018

Aug. 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v7 2/2] riched20: Call ITextHost_TxGetCharFormat() for setting default charformat.
by Jactry Zeng Aug. 20, 2018

Aug. 20, 2018

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/para.c | 11 +++++++++- dlls/riched20/tests/txtsrv.c | 41 +++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index f2a70e5746..27234b061a 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -35,7 +35,7 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; - CHARFORMAT2W cf; + CHARFORMAT2W cf, cf_tmp; LOGFONTW lf; HFONT hf; ME_TextBuffer *text = editor->pBuffer; @@ -44,6 +44,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Style *style; int eol_len; WCHAR cr_lf[] = {'\r','\n',0}; + CHARFORMATW *host_cf; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); @@ -76,6 +77,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) style = ME_MakeStyle(&cf); text->pDefaultStyle = style; + if (ITextHost_TxGetCharFormat(editor->texthost, (const CHARFORMATW **)&host_cf) == S_OK) + { + ZeroMemory(&cf_tmp, sizeof(cf_tmp)); + cf_tmp.cbSize = sizeof(cf_tmp); + cfany_to_cf2w(&cf_tmp, (CHARFORMAT2W *)host_cf); + ME_SetDefaultCharFormat(editor, &cf_tmp); + } + eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 5d312ca2cd..9d3fc361d6 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,6 +85,7 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + CHARFORMAT2W char_format; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -330,7 +331,8 @@ static HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetCharFormat(%p, ppCF=%p)\n", This, ppCF); - return E_NOTIMPL; + *ppCF = (CHARFORMATW *)&This->char_format; + return S_OK; } static HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface, @@ -624,6 +626,7 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) ITextHostTestImpl *dummyTextHost; IUnknown *init; HRESULT result; + HFONT hf; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -632,6 +635,11 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); + dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); + dummyTextHost->char_format.dwMask = CFM_ALL2; + hf = GetStockObject(DEFAULT_GUI_FONT); + hf_to_cf(hf, &dummyTextHost->char_format); /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a @@ -952,6 +960,36 @@ static void test_QueryInterface(void) ITextHost_Release(host); } +static void test_default_format(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT result; + LRESULT lresult; + CHARFORMAT2W cf2; + CHARFORMATW *host_cf; + DWORD expected_effects; + + if (!init_texthost(&txtserv, &host)) + return; + + cf2.cbSize = sizeof(CHARFORMAT2W); + result = ITextServices_TxSendMessage(txtserv, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM)&cf2, &lresult); + ok(result == S_OK, "ITextServices_TxSendMessage failed: 0x%08x.\n", result); + + ITextHostImpl_TxGetCharFormat(host, (const CHARFORMATW **)&host_cf); + ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); + ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", + cf2.bPitchAndFamily, host_cf->bPitchAndFamily); + ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -982,6 +1020,7 @@ START_TEST( txtsrv ) test_TxGetNaturalSize(); test_TxDraw(); test_QueryInterface(); + test_default_format(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } -- 2.18.0

2 1

[PATCH 1/2] ole32: Try 'dll' extension when looking for registration-free modules.
by Nikolay Sivov Aug. 20, 2018

Aug. 20, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3487cca572..00555bf74f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1442,13 +1442,14 @@ static DWORD COM_RegReadPath(const struct class_reg_data *regdata, WCHAR *dst, D } else { + static const WCHAR dllW[] = {'.','d','l','l',0}; ULONG_PTR cookie; WCHAR *nameW; *dst = 0; nameW = (WCHAR*)((BYTE*)regdata->u.actctx.section + regdata->u.actctx.data->name_offset); ActivateActCtx(regdata->u.actctx.hactctx, &cookie); - ret = SearchPathW(NULL, nameW, NULL, dstlen, dst, NULL); + ret = SearchPathW(NULL, nameW, dllW, dstlen, dst, NULL); DeactivateActCtx(0, cookie); return !*dst; } -- 2.18.0

2 3

[PATCH] msi: Don't assume that WoW64 redirection is enabled in custom_start_server().
by Zebediah Figura Aug. 20, 2018

Aug. 20, 2018

As of 3a884c2ef the server is started on the main thread, so this is no longer a valid assumption. In particular, we disable WoW64 redirection while running standard actions, including the top-level INSTALL action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45663 --- dlls/msi/custom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 950681e..4502ca6 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -601,14 +601,17 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) if (pipe == INVALID_HANDLE_VALUE) ERR("Failed to create custom action client pipe: %u\n", GetLastError()); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (!IsWow64Process(GetCurrentProcess(), &wow64)) + wow64 = FALSE; + + if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); - if (IsWow64Process(GetCurrentProcess(), &wow64) && wow64 && arch == SCS_64BIT_BINARY) + if (wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); -- 2.7.4

2 2

[PATCH] wbemprox: Use WS_AF_INET instead of AF_INET in get_ipsubnet.
by Gerald Pfeifer Aug. 20, 2018

Aug. 20, 2018

This is a revised patch based on Piotr's feedback to my patch yesterday (which doesn't show in the archive yet, so no link). Commit 88d52edcc4d5a81965627905278d1212250ae84d Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 1 17:23:29 2018 +0200 wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke the build on FreeBSD 10.x and likely other versions: builtin.c: In function 'get_ipsubnet': builtin.c:2499:55: error: 'AF_INET' undeclared (first use in this function) 2499 | if (address->Address.lpSockaddr->sa_family == AF_INET) | ^~~~~~~ Using WS_AF_INET (and defining this in the __MINGW32__ case) addresses this. That way including sys/socket.h is also not required. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 72c6b4e933..9fe22d0034 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -37,6 +37,7 @@ #ifdef __MINGW32__ # include "winsock2.h" # include "ws2tcpip.h" +# define WS_AF_INET AF_INET # define WS_AF_UNSPEC AF_UNSPEC # define WS_NI_MAXHOST NI_MAXHOST # define WS_NI_NAMEREQD NI_NAMEREQD @@ -2496,14 +2497,14 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - if (address->Address.lpSockaddr->sa_family == AF_INET) + if (address->Address.lpSockaddr->sa_family == WS_AF_INET) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; ULONG buflen = sizeof(buf)/sizeof(buf[0]); memset( &addr, 0, sizeof(addr) ); - addr.sin_family = AF_INET; + addr.sin_family = WS_AF_INET; if (ConvertLengthToIpv4Mask( address->OnLinkPrefixLength, &addr.sin_addr.S_un.S_addr ) != NO_ERROR || WSAAddressToStringW( (SOCKADDR*)&addr, sizeof(addr), NULL, buf, &buflen)) ptr[i] = NULL; -- 2.17.0

3 2

[PATCH] wmp: Improve URL property handling.
by Nikolay Sivov Aug. 20, 2018

Aug. 20, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/player.c | 17 ++++++--------- dlls/wmp/tests/media.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index fd8c17d60f..519ffa1d18 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -28,7 +28,7 @@ static ATOM player_msg_class; static INIT_ONCE class_init_once; static UINT WM_WMPEVENT; static const WCHAR WMPmessageW[] = {'_', 'W', 'M', 'P', 'M','e','s','s','a','g','e',0}; - +static const WCHAR emptyW[] = {0}; static void update_state(WindowsMediaPlayer *wmp, LONG type, LONG state) { @@ -135,9 +135,8 @@ static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *url) TRACE("(%p)->(%p)\n", This, url); - if(This->media == NULL) { - return S_FALSE; - } + if (!This->media) + return return_bstr(emptyW, url); return return_bstr(This->media->url, url); } @@ -147,10 +146,8 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); IWMPMedia *media; HRESULT hres; + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - if(url == NULL) { - return E_POINTER; - } hres = create_media_from_url(url, 0.0, &media); @@ -161,9 +158,8 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) } if (SUCCEEDED(hres)) { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsReady); - if (This->auto_start == VARIANT_TRUE) { - hres = IWMPControls_play(&This->IWMPControls_iface); - } + if (This->auto_start == VARIANT_TRUE) + IWMPControls_play(&This->IWMPControls_iface); } return hres; @@ -2025,7 +2021,6 @@ WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) { - static const WCHAR emptyW[] = {0}; WMPMedia *media; media = heap_alloc_zero(sizeof(*media)); diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index bd9aefc975..dd6fdcbc91 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -562,6 +562,54 @@ todo_wine IWMPPlayer4_Release(player); } +static void test_player_url(void) +{ + IWMPPlayer4 *player; + BSTR str, str2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); + return; + } + ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + + hr = IWMPPlayer4_get_URL(player, &str); + ok(hr == S_OK, "Failed to get url, hr %#x.\n", hr); + ok(*str == 0, "Unexpected url %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str2 = SysAllocString(mp3file); + hr = IWMPPlayer4_put_URL(player, str2); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + + hr = IWMPPlayer4_put_URL(player, NULL); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + hr = IWMPPlayer4_get_URL(player, &str); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(*str == 0, "Unexpected url, %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* Empty url */ + hr = IWMPPlayer4_put_URL(player, str2); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + + str = SysAllocStringLen(NULL, 0); + hr = IWMPPlayer4_put_URL(player, str); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + SysFreeString(str); + + hr = IWMPPlayer4_get_URL(player, &str); + ok(hr == S_OK, "Failed to set url, hr %#x.\n", hr); + ok(*str == 0, "Unexpected url, %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + SysFreeString(str2); + IWMPPlayer4_Release(player); +} + START_TEST(media) { CoInitialize(NULL); @@ -571,6 +619,7 @@ START_TEST(media) completed_event = CreateEventW(NULL, FALSE, FALSE, NULL); test_media_item(); + test_player_url(); if (test_wmp()) { test_completion_event(); } else { -- 2.18.0

1 0

[PATCH] winevulkan: Properly retrieve queues that were created with non-zero flags.
by Józef Kucia Aug. 20, 2018

Aug. 20, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 21 ++++++++++++++++++--- dlls/winevulkan/vulkan_thunks.h | 2 ++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 73bba7894f79..3be6a8de3bf1 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -161,7 +161,7 @@ FUNCTION_OVERRIDES = { "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, - "vkGetDeviceQueue2" : {"dispatch": False, "driver" : False, "thunk" : False}, + "vkGetDeviceQueue2" : {"dispatch": True, "driver" : False, "thunk" : False}, "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e588d53f3cab..a1e970daff85 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -171,6 +171,7 @@ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPoo static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) { + VkDeviceQueueInfo2 queue_info; struct VkQueue_T *queues; unsigned int i; @@ -188,10 +189,24 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, queue->device = device; queue->flags = flags; - /* The native device was already allocated with the required number of queues, - * so just fetch them from there. + /* The Vulkan spec says: + * + * "vkGetDeviceQueue must only be used to get queues that were created + * with the flags parameter of VkDeviceQueueCreateInfo set to zero." */ - device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); + if (flags && device->funcs.p_vkGetDeviceQueue2) + { + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2; + queue_info.pNext = NULL; + queue_info.flags = flags; + queue_info.queueFamilyIndex = family_index; + queue_info.queueIndex = i; + device->funcs.p_vkGetDeviceQueue2(device->device, &queue_info, &queue->queue); + } + else + { + device->funcs.p_vkGetDeviceQueue(device->device, family_index, i, &queue->queue); + } } return queues; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index a03d1150c969..94e56bb97300 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -889,6 +889,7 @@ struct vulkan_device_funcs VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); void (*p_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *); void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); + void (*p_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *); VkResult (*p_vkGetEventStatus)(VkDevice, VkEvent); VkResult (*p_vkGetFenceStatus)(VkDevice, VkFence); #if defined(USE_STRUCT_CONVERSION) @@ -1178,6 +1179,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetDeviceGroupSurfacePresentModesKHR) \ USE_VK_FUNC(vkGetDeviceMemoryCommitment) \ USE_VK_FUNC(vkGetDeviceQueue) \ + USE_VK_FUNC(vkGetDeviceQueue2) \ USE_VK_FUNC(vkGetEventStatus) \ USE_VK_FUNC(vkGetFenceStatus) \ USE_VK_FUNC(vkGetImageMemoryRequirements) \ -- 2.16.4

1 0

[PATCH v2] regedit: Dont expand items on initial tree creation.
by Alistair Leslie-Hughes Aug. 20, 2018

Aug. 20, 2018

The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/regedit/childwnd.c | 7 ++++++- programs/regedit/treeview.c | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index d8431f1..04399fe 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -240,15 +240,20 @@ static void get_last_key(HWND hwndTV) if (RegCreateKeyExW(HKEY_CURRENT_USER, wszKeyName, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) { + HTREEITEM selection; if (RegQueryValueExW(hkey, wszLastKey, NULL, NULL, (LPBYTE)wszVal, &dwSize) == ERROR_SUCCESS) { - HTREEITEM selection; if (!strcmpW(wszVal, g_pChildWnd->szPath)) selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); else selection = FindPathInTree(hwndTV, wszVal); SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)selection); } + else + { + selection = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_ROOT, 0); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)selection ); + } RegCloseKey(hkey); } diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d5a6767..15a5136 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; - /* expand and select host name */ - SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } -- 1.9.1

2 1

[PATCH] testbot/build: Allow both commas and colons in the target lists.
by Francois Gouget Aug. 20, 2018

Aug. 20, 2018

This paves the way to a future switch to colons. It is only needed for Build.pl and WineTest.pl since the TestBot does not pass a target list to the Reconfig scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 920fc8204..b729d95f4 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -250,7 +250,7 @@ if (!defined $Usage) } $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /,/, $TargetList) + foreach my $Target (split /[,:]/, $TargetList) { $Target = "exe$1" if ($Target =~ /^(32|64)$/); if (!$AllTargets{$Target}) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 101061917..3310b4c53 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -282,7 +282,7 @@ if (!defined $Usage) { if (defined $TargetList) { - foreach my $Target (split /,/, $TargetList) + foreach my $Target (split /[,:]/, $TargetList) { if (!$AllTargets{$Target}) { -- 2.18.0

1 0