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

Andrey Gusev : api-ms-win-rtcore-ntuser-private-l1-1-4: Add dll.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: fe7313e09d414aa14e6a7c55a73aceb6f4faa8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe7313e09d414aa14e6a7c55… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Mar 8 15:23:20 2018 +0200 api-ms-win-rtcore-ntuser-private-l1-1-4: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-private-l1-1-4.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 1547862..b83b6a4 100755 --- a/configure +++ b/configure @@ -1066,6 +1066,7 @@ enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +enable_api_ms_win_rtcore_ntuser_private_l1_1_4 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 @@ -18357,6 +18358,7 @@ wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_per wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-4 enable_api_ms_win_rtcore_ntuser_private_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0 enable_api_ms_win_rtcore_ntuser_winevent_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0 enable_api_ms_win_rtcore_ntuser_wmpointer_l1_1_0 diff --git a/configure.ac b/configure.ac index 2adcaf9..6aecf50 100644 --- a/configure.ac +++ b/configure.ac @@ -2998,6 +2998,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-winevent-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in new file mode 100644 index 0000000..4faf345 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-private-l1-1-4.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec new file mode 100644 index 0000000..4a0c462 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-4/api-ms-win-rtcore-ntuser-private-l1-1-4.spec @@ -0,0 +1,2 @@ +2545 stub @ +2595 stub @ diff --git a/tools/make_specfiles b/tools/make_specfiles index 53a4fec..dd8e2d9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -350,6 +350,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", + "api-ms-win-rtcore-ntuser-private-l1-1-4", "api-ms-win-rtcore-ntuser-window-l1-1-0", "api-ms-win-rtcore-ntuser-winevent-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0",

1 0

Zebediah Figura : devenum: Always scan for devices in CreateClassEnumerator().
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 6c30370ef577f7ff31fb6f2ba20354a1dc8583c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c30370ef577f7ff31fb6f2b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 8 23:42:16 2018 -0600 devenum: Always scan for devices in CreateClassEnumerator(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 22 ---------------------- dlls/devenum/tests/devenum.c | 2 -- 2 files changed, 24 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 7cfdbff..7c03852 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -547,12 +547,6 @@ static void register_vfw_codecs(void) RegCloseKey(basekey); } -static HANDLE DEVENUM_populate_handle; -static const WCHAR DEVENUM_populate_handle_nameW[] = - {'_','_','W','I','N','E','_', - 'D','e','v','e','n','u','m','_', - 'P','o','p','u','l','a','t','e',0}; - static HRESULT register_codecs(void) { HRESULT res; @@ -566,21 +560,6 @@ static HRESULT register_codecs(void) REGFILTERPINS2 rfp2; HKEY basekey; - if (DEVENUM_populate_handle) - return S_OK; - DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW); - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - /* Webcams can take some time to scan if the driver is badly written and it enables them, - * so have a 10 s timeout here - */ - if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT) - WARN("Waiting for object timed out\n"); - TRACE("No need to rescan\n"); - return S_OK; - } - TRACE("Scanning for devices\n"); - /* Since devices can change between session, for example because you just plugged in a webcam * or switched from pulseaudio to alsa, delete all old devices first */ @@ -878,6 +857,5 @@ static HRESULT register_codecs(void) register_vfw_codecs(); - SetEvent(DEVENUM_populate_handle); return res; } diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 7e3270f..a08dece 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -445,11 +445,9 @@ static void test_codec(void) /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ -todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); IPropertyBag_Release(prop_bag);

1 0

Zebediah Figura : devenum: Use version 2 of REGFILTER2 to register legacy filters.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 71bd11bc6bc89f1513e68893fb9c0329ebfb179c URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bd11bc6bc89f1513e68893… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 8 23:42:17 2018 -0600 devenum: Use version 2 of REGFILTER2 to register legacy filters. Since quartz can't read back version 1. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 78 +++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 7c03852..c1e29fc 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -124,7 +124,7 @@ static HKEY open_special_category_key(const CLSID *clsid, BOOL create) return ret; } -static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) +static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) { HKEY hkeyTypes = NULL; DWORD dwMajorTypes, i; @@ -221,7 +221,11 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) { HKEY hkeyPins = NULL; DWORD dwPinsSubkeys, i; - REGFILTERPINS *rgPins = NULL; + REGFILTERPINS2 *rgPins = NULL; + + rgf2->dwVersion = 2; + rgf2->u.s2.cPins2 = 0; + rgf2->u.s2.rgPins2 = NULL; if (RegOpenKeyExW(hkeyFilterClass, wszPins, 0, KEY_READ, &hkeyPins) != ERROR_SUCCESS) return ; @@ -235,7 +239,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) if (dwPinsSubkeys) { - rgPins = CoTaskMemAlloc(sizeof(REGFILTERPINS) * dwPinsSubkeys); + rgPins = CoTaskMemAlloc(sizeof(REGFILTERPINS2) * dwPinsSubkeys); if (!rgPins) { RegCloseKey(hkeyPins); @@ -248,65 +252,64 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) HKEY hkeyPinKey = NULL; WCHAR wszPinName[MAX_PATH]; DWORD cName = sizeof(wszPinName) / sizeof(WCHAR); - DWORD Type, cbData; - REGFILTERPINS *rgPin = &rgPins[rgf2->u.s1.cPins]; + REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2]; + DWORD value, size, Type; LONG lRet; - rgPin->strName = NULL; - rgPin->clsConnectsToFilter = &GUID_NULL; - rgPin->strConnectsToPin = NULL; - rgPin->nMediaTypes = 0; - rgPin->lpMediaType = NULL; + memset(rgPin, 0, sizeof(*rgPin)); if (RegEnumKeyExW(hkeyPins, i, wszPinName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; if (RegOpenKeyExW(hkeyPins, wszPinName, 0, KEY_READ, &hkeyPinKey) != ERROR_SUCCESS) continue; - rgPin->strName = CoTaskMemAlloc((strlenW(wszPinName) + 1) * sizeof(WCHAR)); - if (!rgPin->strName) goto error_cleanup; - - strcpyW(rgPin->strName, wszPinName); - - cbData = sizeof(rgPin->bMany); - lRet = RegQueryValueExW(hkeyPinKey, wszAllowedMany, NULL, &Type, (LPBYTE)&rgPin->bMany, &cbData); + size = sizeof(DWORD); + lRet = RegQueryValueExW(hkeyPinKey, wszAllowedMany, NULL, &Type, (BYTE *)&value, &size); if (lRet != ERROR_SUCCESS || Type != REG_DWORD) goto error_cleanup; + if (value) + rgPin->dwFlags |= REG_PINFLAG_B_MANY; - cbData = sizeof(rgPin->bZero); - lRet = RegQueryValueExW(hkeyPinKey, wszAllowedZero, NULL, &Type, (LPBYTE)&rgPin->bZero, &cbData); + size = sizeof(DWORD); + lRet = RegQueryValueExW(hkeyPinKey, wszAllowedZero, NULL, &Type, (BYTE *)&value, &size); if (lRet != ERROR_SUCCESS || Type != REG_DWORD) goto error_cleanup; + if (value) + rgPin->dwFlags |= REG_PINFLAG_B_ZERO; - cbData = sizeof(rgPin->bOutput); - lRet = RegQueryValueExW(hkeyPinKey, wszDirection, NULL, &Type, (LPBYTE)&rgPin->bOutput, &cbData); + size = sizeof(DWORD); + lRet = RegQueryValueExW(hkeyPinKey, wszDirection, NULL, &Type, (BYTE *)&value, &size); if (lRet != ERROR_SUCCESS || Type != REG_DWORD) goto error_cleanup; + if (value) + rgPin->dwFlags |= REG_PINFLAG_B_OUTPUT; - cbData = sizeof(rgPin->bRendered); - lRet = RegQueryValueExW(hkeyPinKey, wszIsRendered, NULL, &Type, (LPBYTE)&rgPin->bRendered, &cbData); + + size = sizeof(DWORD); + lRet = RegQueryValueExW(hkeyPinKey, wszIsRendered, NULL, &Type, (BYTE *)&value, &size); if (lRet != ERROR_SUCCESS || Type != REG_DWORD) goto error_cleanup; + if (value) + rgPin->dwFlags |= REG_PINFLAG_B_RENDERER; DEVENUM_ReadPinTypes(hkeyPinKey, rgPin); - ++rgf2->u.s1.cPins; + ++rgf2->u.s2.cPins2; continue; error_cleanup: RegCloseKey(hkeyPinKey); - CoTaskMemFree(rgPin->strName); } RegCloseKey(hkeyPins); - if (rgPins && !rgf2->u.s1.cPins) + if (rgPins && !rgf2->u.s2.cPins2) { CoTaskMemFree(rgPins); rgPins = NULL; } - rgf2->u.s1.rgPins = rgPins; + rgf2->u.s2.rgPins2 = rgPins; } static HRESULT DEVENUM_RegisterLegacyAmFilters(void) @@ -374,10 +377,7 @@ static HRESULT DEVENUM_RegisterLegacyAmFilters(void) if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszRegKey, 0, KEY_READ, &hkeyFilterClass) != ERROR_SUCCESS) continue; - rgf2.dwVersion = 1; rgf2.dwMerit = 0; - rgf2.u.s1.cPins = 0; - rgf2.u.s1.rgPins = NULL; cbData = sizeof(wszFilterName); if (RegQueryValueExW(hkeyFilterClass, NULL, NULL, &Type, (LPBYTE)wszFilterName, &cbData) != ERROR_SUCCESS || @@ -403,29 +403,27 @@ static HRESULT DEVENUM_RegisterLegacyAmFilters(void) if (hkeyFilterClass) RegCloseKey(hkeyFilterClass); - if (rgf2.u.s1.rgPins) + if (rgf2.u.s2.rgPins2) { UINT iPin; - for (iPin = 0; iPin < rgf2.u.s1.cPins; iPin++) + for (iPin = 0; iPin < rgf2.u.s2.cPins2; iPin++) { - CoTaskMemFree(rgf2.u.s1.rgPins[iPin].strName); - - if (rgf2.u.s1.rgPins[iPin].lpMediaType) + if (rgf2.u.s2.rgPins2[iPin].lpMediaType) { UINT iType; - for (iType = 0; iType < rgf2.u.s1.rgPins[iPin].nMediaTypes; iType++) + for (iType = 0; iType < rgf2.u.s2.rgPins2[iPin].nMediaTypes; iType++) { - CoTaskMemFree((void*)rgf2.u.s1.rgPins[iPin].lpMediaType[iType].clsMajorType); - CoTaskMemFree((void*)rgf2.u.s1.rgPins[iPin].lpMediaType[iType].clsMinorType); + CoTaskMemFree((void*)rgf2.u.s2.rgPins2[iPin].lpMediaType[iType].clsMajorType); + CoTaskMemFree((void*)rgf2.u.s2.rgPins2[iPin].lpMediaType[iType].clsMinorType); } - CoTaskMemFree((void*)rgf2.u.s1.rgPins[iPin].lpMediaType); + CoTaskMemFree((void*)rgf2.u.s2.rgPins2[iPin].lpMediaType); } } - CoTaskMemFree((void*)rgf2.u.s1.rgPins); + CoTaskMemFree((void*)rgf2.u.s2.rgPins2); } } }

1 0

Zebediah Figura : quartz: Don't fail if the filter CLSID doesn't exist.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: afe14ab9b02b84c72b8eec7710706a538d6375b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe14ab9b02b84c72b8eec77… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 8 23:42:18 2018 -0600 quartz: Don't fail if the filter CLSID doesn't exist. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 7 +++++-- dlls/quartz/tests/filtermapper.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 4e4cb37..20c7e3a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1523,22 +1523,25 @@ static HRESULT WINAPI FilterMapper_UnregisterFilter(IFilterMapper * iface, CLSID strcatW(wszKeyName, wszClsid); lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); + if (lRet == ERROR_FILE_NOT_FOUND) + goto done; hr = HRESULT_FROM_WIN32(lRet); } if (SUCCEEDED(hr)) { lRet = RegDeleteValueW(hKey, wszMeritName); - if (lRet != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND) hr = HRESULT_FROM_WIN32(lRet); lRet = RegDeleteTreeW(hKey, wszPins); - if (lRet != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS && lRet != ERROR_FILE_NOT_FOUND) hr = HRESULT_FROM_WIN32(lRet); RegCloseKey(hKey); } +done: CoTaskMemFree(wszClsid); return hr; diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 829e89b..c9578c6 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -297,6 +297,12 @@ static void test_legacy_filter_registration(void) ret = RegDeleteKeyW(HKEY_CLASSES_ROOT, key_name); ok(!ret, "RegDeleteKeyA failed: %lu\n", ret); + hr = IFilterMapper_RegisterFilter(mapper, clsid, testfilterW, MERIT_UNLIKELY); + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + + hr = IFilterMapper_UnregisterFilter(mapper, clsid); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); + IFilterMapper_Release(mapper); IFilterMapper2_Release(mapper2); }

1 0

Michael Müller : user32: Add stubs for GetWindowDisplayAffinity and SetWindowDisplayAffinity.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 76f135e599a191203c352edd0209b640b2497810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f135e599a191203c352edd… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 9 03:01:33 2018 +0000 user32: Add stubs for GetWindowDisplayAffinity and SetWindowDisplayAffinity. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 4 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 4 +- dlls/user32/tests/win.c | 87 ++++++++++++++++++++++ dlls/user32/user32.spec | 2 + dlls/user32/win.c | 34 +++++++++ include/winuser.h | 5 ++ 6 files changed, 132 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76f135e599a191203c35…

1 0

Nikolay Sivov : comctl32/listview: Do not try to invalidate for invalid item indices.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 74d24b2197651413ff42ef97cd8b7af9952b3e2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d24b2197651413ff42ef97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 19:53:14 2018 +0300 comctl32/listview: Do not try to invalidate for invalid item indices. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4a2df80..d63c23a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1727,7 +1727,9 @@ static inline void LISTVIEW_InvalidateItem(const LISTVIEW_INFO *infoPtr, INT nIt { RECT rcBox; - if(!is_redrawing(infoPtr)) return; + if (!is_redrawing(infoPtr) || nItem < 0 || nItem >= infoPtr->nItemCount) + return; + LISTVIEW_GetItemBox(infoPtr, nItem, &rcBox); LISTVIEW_InvalidateRect(infoPtr, &rcBox); }

1 0

Roderick Colenbrander : winevulkan: Implement physical device core functions.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 7b72f62ac73cbb25a48eb6035dc7b78abb08c69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b72f62ac73cbb25a48eb603… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:46 2018 -0800 winevulkan: Implement physical device core functions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 734 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.c | 220 +++++++++++- dlls/winevulkan/vulkan_thunks.h | 164 +++++++++ 3 files changed, 1105 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b72f62ac73cbb25a48e…

1 0

Roderick Colenbrander : winevulkan: Load device functions from vkGetInstanceProcAddr.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 6dca06d4cf1421c0ce0a6b0ab4ef27986046bca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dca06d4cf1421c0ce0a6b0a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:47 2018 -0800 winevulkan: Load device functions from vkGetInstanceProcAddr. vkGetInstanceProcAddr can load both instance and device functions. A later to get introduced vkGetDeviceProcAddr only supports device functions, which is why there are 2 different function tables. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 41 ++- dlls/winevulkan/vulkan.c | 4 + dlls/winevulkan/vulkan_thunks.c | 793 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 831 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6dca06d4cf1421c0ce0a…

1 0

Roderick Colenbrander : winevulkan: Implement vkCreateDevice.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 6eacdf38e29dcf2d87cb91374fd46987603f5594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eacdf38e29dcf2d87cb9137… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:48 2018 -0800 winevulkan: Implement vkCreateDevice. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 39 +++++- dlls/winevulkan/vulkan.c | 70 ++++++++++- dlls/winevulkan/vulkan_private.h | 8 ++ dlls/winevulkan/vulkan_thunks.c | 6 - dlls/winevulkan/vulkan_thunks.h | 248 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 9 ++ include/wine/vulkan_driver.h | 3 +- 7 files changed, 371 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6eacdf38e29dcf2d87cb…

1 0

Roderick Colenbrander : winevulkan: Implement vkGetDeviceProcAddr.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: a2a53bb6186fba3fae4bc5910eaf1cb8c2b6becd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a53bb6186fba3fae4bc591… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:49 2018 -0800 winevulkan: Implement vkGetDeviceProcAddr. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 22 ++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 6 ------ dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4028ad3..208d26b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -94,7 +94,7 @@ FUNCTION_OVERRIDES = { "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, # Device functions - "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 83c94eb..ee877e0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -352,6 +352,28 @@ VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *d return res; } +PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *name) +{ + void *func; + TRACE("%p, %s\n", device, debugstr_a(name)); + + /* The spec leaves return value undefined for a NULL device, let's just return NULL. */ + if (!device || !name) + return NULL; + + /* Per the spec, we are only supposed to return device functions as in functions + * for which the first parameter is vkDevice or a child of vkDevice like a + * vkCommandBuffer or vkQueue. + * Loader takes are of filtering of extensions which are enabled or not. + */ + func = wine_vk_get_device_proc_addr(name); + if (func) + return func; + + TRACE("Function %s not found\n", debugstr_a(name)); + return NULL; +} + static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f02ee3e..13a5d5d 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -690,12 +690,6 @@ static void WINAPI wine_vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMem FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(memory), pCommittedMemoryInBytes); } -static PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) -{ - FIXME("stub: %p, %p\n", device, pName); - return NULL; -} - static void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) { FIXME("stub: %p, %u, %u, %p\n", device, queueFamilyIndex, queueIndex, pQueue); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f98307c9..9f5edf5 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -17,6 +17,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDev void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; +PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) DECLSPEC_HIDDEN; typedef struct VkImageFormatProperties_host {

1 0