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

Michael Müller : user32: Add stubs for GetWindowDisplayAffinity and SetWindowDisplayAffinity.
by Alexandre Julliard March 9, 2018

March 9, 2018

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

Andrey Gusev : ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 2136ec7e7f70626bf890eeb4470652dbeaa1ce29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2136ec7e7f70626bf890eeb4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Mar 9 13:36:21 2018 +0200 ext-ms-win-ntuser-mouse-l1-1-0: 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/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-mouse-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 345c602..86f3a78 100755 --- a/configure +++ b/configure @@ -1250,6 +1250,7 @@ enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 @@ -18603,6 +18604,7 @@ wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_e wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 diff --git a/configure.ac b/configure.ac index 55e8e45..e1a1a5b 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in new file mode 100644 index 0000000..c408dbb --- /dev/null +++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-mouse-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec new file mode 100644 index 0000000..22128a2 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall GetCapture() user32.GetCapture +@ stdcall GetDoubleClickTime() user32.GetDoubleClickTime +@ stdcall ReleaseCapture() user32.ReleaseCapture +@ stdcall SetCapture(long) user32.SetCapture +@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 96ca63e..d25e970 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -352,6 +352,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-draw-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0",

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-private-l1-1-4: Add dll.
by Alexandre Julliard March 9, 2018

March 9, 2018

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 March 9, 2018

March 9, 2018

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 March 9, 2018

March 9, 2018

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

Roderick Colenbrander : winevulkan: Load device functions from vkGetInstanceProcAddr.
by Alexandre Julliard March 9, 2018

March 9, 2018

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

Henri Verbeet : wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_hwstretch().
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 21e6abc8a0fbd5cff5e3b7b7fd829bc1bcba851e URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e6abc8a0fbd5cff5e3b7b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:53 2018 +0330 wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b5129d5..21511f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1639,14 +1639,11 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig } /* Uses the hardware to stretch and flip the image */ -static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, - const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) +static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, enum wined3d_texture_filter_type filter) { unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; GLenum src_target, dst_target, texture_target; GLuint src, backup = 0; @@ -1718,7 +1715,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glEnable(texture_target)"); /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */ - surface_get_sub_resource(src_surface)->locations &= ~WINED3D_LOCATION_TEXTURE_RGB; + src_texture->sub_resources[src_sub_resource_idx].locations &= ~WINED3D_LOCATION_TEXTURE_RGB; } /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -2053,7 +2050,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE else { TRACE("Using hardware stretching to flip / stretch the texture.\n"); - fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); + fb_copy_to_texture_hwstretch(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, + src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); } return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_direct().
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 628cd4425b512e2ad5463d4ea51b855f5e086b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=628cd4425b512e2ad5463d4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:52 2018 +0330 wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c2b1cd5..b5129d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1522,13 +1522,10 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, /* Does a direct frame buffer -> texture copy. Stretching is done with single * pixel copy calls. */ -static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, - const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) +static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, enum wined3d_texture_filter_type filter) { - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; unsigned int src_height, src_level, dst_level; const struct wined3d_gl_info *gl_info; @@ -2050,7 +2047,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); - fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter); + fb_copy_to_texture_direct(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, + src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); } else {

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_load_fb_texture().
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: wine Branch: master Commit: 2179e99120ae5c77ff8531d971620864f3b7cc28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2179e99120ae5c77ff8531d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 9 10:19:51 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 25 ++++++++++++------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87a233f..23f4d04 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7832,7 +7832,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl * flip in the blitter, we don't actually need that flip anyway. So we * use the surface's texture as scratch texture, and flip the source * rectangle instead. */ - surface_load_fb_texture(src_surface, FALSE, context); + texture2d_load_fb_texture(src_texture, src_sub_resource_idx, FALSE, context); s = *src_rect; s.top = wined3d_texture_get_level_height(src_texture, src_level) - s.top; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 201a563..c2b1cd5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1479,22 +1479,21 @@ error: * * Context activation is done by the caller. This function may temporarily * switch to a different context and restore the original one before return. */ -void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *old_ctx) +void texture2d_load_fb_texture(struct wined3d_texture *texture, + unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; + struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context = old_ctx; - struct wined3d_surface *restore_rt = NULL; - unsigned int level; + unsigned int restore_idx, level; GLenum target; - restore_rt = context_get_rt_surface(old_ctx); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -1502,7 +1501,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - TRACE("Reading back offscreen render target %p.\n", surface); + TRACE("Reading back offscreen render target %p, %u.\n", texture, sub_resource_idx); if (wined3d_resource_is_offscreen(&texture->resource)) gl_info->gl_ops.gl.p_glReadBuffer(context_get_offscreen_gl_buffer(context)); @@ -1517,8 +1516,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_texture_get_level_height(texture, level)); checkGLcall("glCopyTexSubImage2D"); - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture->sub_resources[sub_resource_idx].u.surface); } /* Does a direct frame buffer -> texture copy. Stretching is done with single @@ -2184,7 +2183,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - surface_load_fb_texture(sub_resource->u.surface, srgb, context); + texture2d_load_fb_texture(texture, sub_resource_idx, srgb, context); return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 853f9e2..e3d669a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3236,6 +3236,8 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context) DECLSPEC_HIDDEN; +void texture2d_load_fb_texture(struct wined3d_texture *texture, unsigned int sub_resource_idx, + BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -3346,8 +3348,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wined3d_box *dst_box, struct wined3d_surface *src_surface, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, - struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb,

1 0

Francois Gouget : testbot: Remove an unneeded EnumPropertyDescriptor import.
by Alexandre Julliard March 9, 2018

March 9, 2018

Module: tools Branch: master Commit: fc623cc0e611a7d46226cedb267a055c57a5455b URL: https://source.winehq.org/git/tools.git/?a=commit;h=fc623cc0e611a7d46226ced… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 9 13:34:49 2018 +0100 testbot: Remove an unneeded EnumPropertyDescriptor import. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/RecordGroups.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index cde1a8d..dfa83ae 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -57,7 +57,6 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects =cut use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Records;

1 0