- wine-devel - winehq.org

[PATCH 1/3] ntdll: Remove no longer used interlocked_dec_if_nonzero().
by Zebediah Figura 10 Jun '19

10 Jun '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/sync.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index edf081a9e53b..9c62f8eb6c5f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -69,18 +69,6 @@ static const LARGE_INTEGER zero_timeout; #define TICKSPERSEC 10000000 -static inline int interlocked_dec_if_nonzero( int *dest ) -{ - int val, tmp; - for (val = *dest;; val = tmp) - { - if (!val || (tmp = interlocked_cmpxchg( dest, val - 1, val )) == val) - break; - } - return val; -} - - #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ -- 2.20.1

1 2

[PATCH 1/5] dinput: return fake DIPROP_GUIDANDPATH property for linux joysticks
by Alexey Prokhin 10 Jun '19

10 Jun '19

Some Ubisoft titles use the property to check if a dinput gamepad is also an xinput device. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- A similar patch for the SDL backend has been already accepted into Proton. And I have been asked to adapt it for other backends. is_xinput_device() is based on the code from winebus.sys. In future, the xinput device detection should be kept in sync as much as possible. --- dlls/dinput/dinput_main.c | 1 + dlls/dinput/joystick.c | 31 +++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 24 ++++++++++++++++++++++++ dlls/dinput/joystick_private.h | 1 + 4 files changed, 57 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index acf2cf3d23..c02bafad10 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -48,6 +48,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "initguid.h" +#include "devguid.h" #include "dinput_private.h" #include "device_private.h" #include "dinputd.h" diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index f758092dab..433348cd04 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -34,6 +34,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#define VID_MICROSOFT 0x045e + +static const WORD PID_XBOX_CONTROLLERS[] = { + 0x0202, /* Xbox Controller */ + 0x0285, /* Xbox Controller S */ + 0x0289, /* Xbox Controller S */ + 0x028e, /* Xbox360 Controller */ + 0x028f, /* Xbox360 Wireless Controller */ + 0x02d1, /* Xbox One Controller */ + 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ + 0x02e3, /* Xbox One Elite Controller */ + 0x02e6, /* Wireless XBox Controller Dongle */ + 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ + 0x0719, /* Xbox 360 Wireless Adapter */ +}; + static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface), JoystickGenericImpl, base); @@ -281,6 +299,19 @@ BOOL device_disabled_registry(const char* name) return do_disable; } +BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) +{ + int i; + + if (vid == VID_MICROSOFT) + { + for (i = 0; i < ARRAY_SIZE(PID_XBOX_CONTROLLERS); i++) + if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; + } + + return (devcaps->dwAxes == 6 && devcaps->dwButtons >= 14); +} + /****************************************************************************** * SetProperty : change input device properties */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2480bc2b76..7e01f90843 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -59,6 +59,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "devguid.h" #include "dinput.h" #include "dinput_private.h" @@ -742,6 +743,29 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface break; } + case (DWORD_PTR) DIPROP_GUIDANDPATH: + { + static const WCHAR formatW[] = {'\\','\\','?','\\','h','i','d','#','v','i','d','_','%','0','4','x','&', + 'p','i','d','_','%','0','4','x','&','%','s','_','%','h','u',0}; + static const WCHAR miW[] = {'m','i',0}; + static const WCHAR igW[] = {'i','g',0}; + + BOOL is_gamepad; + LPDIPROPGUIDANDPATH pd = (LPDIPROPGUIDANDPATH)pdiph; + WORD vid = This->joydev->vendor_id; + WORD pid = This->joydev->product_id; + + if (!pid || !vid) + return DIERR_UNSUPPORTED; + + is_gamepad = is_xinput_device(&This->generic.devcaps, vid, pid); + pd->guidClass = GUID_DEVCLASS_HIDCLASS; + sprintfW(pd->wszPath, formatW, vid, pid, is_gamepad ? igW : miW, get_joystick_index(&This->generic.base.guid)); + + TRACE("DIPROP_GUIDANDPATH(%s, %s): returning fake path\n", debugstr_guid(&pd->guidClass), debugstr_w(pd->wszPath)); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); } diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index e758cacf6d..b786c84dec 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -96,5 +96,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LP DWORD typeFromGUID(REFGUID guid) DECLSPEC_HIDDEN; void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) DECLSPEC_HIDDEN; #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */ -- 2.17.2 (Apple Git-113)

3 10

[PATCH v4 4/4] explorer: Activate window when restoring from iconic state.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/explorer/systray.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index f9e6661af4..92bc4600db 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -676,6 +676,8 @@ static void click_taskbar_button( HWND button ) if (IsIconic( hwnd )) { + if (IsWindowVisible( hwnd )) + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } -- 2.20.1

2 1

Unreviewed patchset
by Fabian Maurer 10 Jun '19

10 Jun '19

Hello, I have a patchset in queue for about a month now, and I wondered what happened to it. Is it that you just didn't find time to review them or that they're "not obviously right" like the wiki states? Is there something I can do to help here, so my patchsets don't go unreviewed for weeks? Regards, Fabian Maurer

2 5

[PATCH v8 7/7] user32: Implement EnumDisplayDevicesW().
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 202 +++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 8 +- 2 files changed, 205 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 355457098d..5f26cf9af3 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -29,9 +29,13 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" #include "winnls.h" #include "winternl.h" #include "controls.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "user_private.h" #include "wine/unicode.h" @@ -39,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR default_monitor_name[] = {'\\','\\','.','\\', @@ -66,6 +73,36 @@ static const WCHAR default_monitor_interface_id[] = '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR monitor_fmtW[] = + {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR adapter_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR video_keyW[] = + {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; +static const WCHAR video_value_fmtW[] = + {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR monitor_interface_prefixW[] = {'\\','\\','\?','\\',0}; +static const WCHAR guid_devinterface_monitorW[] = + {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', + '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +static const WCHAR backslashW[] = {'\\',0}; +static const WCHAR nt_classW[] = + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_value_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -309,11 +346,174 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO set = INVALID_HANDLE_VALUE; + WCHAR key_nameW[MAX_PATH]; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + LONG adapter_index; + WCHAR *next_charW; + DWORD size; + DWORD type; + HKEY hkey; + BOOL ret = FALSE; + + TRACE("%s %d %p %#x\n", debugstr_w(lpDevice), i, lpDisplayDevice, dwFlags); + + /* Find adapter */ + if (!lpDevice) + { + sprintfW(key_nameW, video_value_fmtW, i); + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + + /* DeviceKey */ + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + lstrcpyW(lpDisplayDevice->DeviceKey, bufferW); + + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, adapter_fmtW, i + 1); + + /* Strip \Registry\Machine\ */ + lstrcpyW(key_nameW, bufferW + 18); + + /* DeviceString */ + size = sizeof(lpDisplayDevice->DeviceString); + if (RegGetValueW(HKEY_LOCAL_MACHINE, key_nameW, driver_descW, RRF_RT_REG_SZ, NULL, + lpDisplayDevice->DeviceString, &size)) + return FALSE; + + /* StateFlags */ + size = sizeof(lpDisplayDevice->StateFlags); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, + &lpDisplayDevice->StateFlags, &size)) + return FALSE; + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ | RRF_ZEROONFAILURE, NULL, + bufferW, &size)) + return FALSE; + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (!SetupDiOpenDeviceInfoW(set, bufferW, NULL, 0, &device_data) + || !SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW(lpDevice, displayW, ARRAY_SIZE(displayW))) + return FALSE; + + adapter_index = strtolW(lpDevice + ARRAY_SIZE(displayW), NULL, 10); + sprintfW(key_nameW, video_value_fmtW, adapter_index - 1); + + size = sizeof(bufferW); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size)) + return FALSE; + /* DeviceName */ + sprintfW(lpDisplayDevice->DeviceName, monitor_fmtW, adapter_index, i); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW(key_nameW, bufferW + 18); + sprintfW(bufferW, mointor_id_value_fmtW, i); + + size = sizeof(instanceW); + if (RegGetValueW(HKEY_CURRENT_CONFIG, key_nameW, bufferW, RRF_RT_REG_SZ, NULL, instanceW, &size)) + return FALSE; + + set = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); + if (!SetupDiOpenDeviceInfoW(set, instanceW, NULL, 0, &device_data)) + goto done; + + /* StateFlags */ + if (!SetupDiGetDevicePropertyW(set, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&lpDisplayDevice->StateFlags, sizeof(lpDisplayDevice->StateFlags), NULL, 0)) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)lpDisplayDevice->DeviceString, + sizeof(lpDisplayDevice->DeviceString), NULL)) + goto done; + + /* DeviceKey */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceKey, nt_classW); + lstrcatW(lpDisplayDevice->DeviceKey, bufferW); + } + + /* DeviceID */ + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW(lpDisplayDevice->DeviceID, monitor_interface_prefixW); + lstrcatW(lpDisplayDevice->DeviceID, instanceW); + lstrcatW(lpDisplayDevice->DeviceID, guid_devinterface_monitorW); + /* Replace '\\' with '#' after prefix */ + for (next_charW = lpDisplayDevice->DeviceID + strlenW(monitor_interface_prefixW); *next_charW; + next_charW++) + { + if (*next_charW == '\\') + *next_charW = '#'; + } + } + else + { + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_HARDWAREID, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcpyW(lpDisplayDevice->DeviceID, bufferW); + lstrcatW(lpDisplayDevice->DeviceID, backslashW); + + if (!SetupDiGetDeviceRegistryPropertyW(set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL)) + goto done; + + lstrcatW(lpDisplayDevice->DeviceID, bufferW); + } + } + } + + ret = TRUE; +done: + SetupDiDestroyDeviceInfoList(set); + if (ret) + return ret; + + /* Fallback to report at least one adapter and monitor, if user driver didn't initialize display device registry */ if (i) return FALSE; + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &hkey)) + { + RegCloseKey(hkey); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + /* Adapter */ if (!lpDevice) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e3e1f38d66..26ee28a122 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -115,7 +115,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else @@ -208,9 +208,9 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceKey */ lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); - todo_wine ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); - todo_wine ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); } static void test_enumdisplaydevices(void) -- 2.20.1

2 1

[PATCH v8 1/7] winex11.drv: Add Xinerama display device handler.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase v4: Merge patches. Rebase. v5: Fix explorer patch triggered user32 test failures. v6: Restructure patches. v7: Add mutex to avoid init race. Remove old adapter keys during reinit. Add fallback monitor data in explorer. Simplify code. v8: Rename mutex. Prefer lstr* functions. Move fallback to EnumDisplayDevicesW(). Minor cleanup. dlls/user32/tests/monitor.c | 6 +-- dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 77 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 15 +++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 7 ++++ 6 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c5e6745322..bee1085a14 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -81,7 +81,7 @@ static int monitor_count = 0; static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) { - char video_name[16]; + char video_name[32]; char video_value[128]; char buffer[128]; int number; @@ -107,7 +107,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de { sprintf(video_name, "\\Device\\Video%d", index); ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); if (!ls) { memset(video_value, 0, sizeof(video_value)); @@ -115,7 +115,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); RegCloseKey(hkey); - ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + todo_wine ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); } } else diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..e3e4dce84d --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,77 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex; + HKEY video_hkey = NULL; + DWORD disposition = 0; + + mutex = CreateMutexW(NULL, FALSE, init_mutexW); + WaitForSingleObject(mutex, INFINITE); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + { + ERR("Failed to create video device key\n"); + goto done; + } + + /* Avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + goto done; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + +done: + RegCloseKey(video_hkey); + ReleaseMutex(mutex); + CloseHandle(mutex); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..fbc5a104f6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,21 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..35dd36049b 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -201,6 +203,7 @@ RECT get_primary_monitor_rect(void) void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +237,10 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

2 1

[PATCH v2 resend 3/3] dxgi: Return DXGI_STATUS_OCCLUDED for minimized window in d3d11_swapchain_Present.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 3 +++ dlls/dxgi/tests/dxgi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df4862d..179e61b233 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -306,6 +306,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return DXGI_ERROR_INVALID_CALL; } + if (IsIconic(d3d11_swapchain_get_hwnd(swapchain))) + return DXGI_STATUS_OCCLUDED; + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 216f03eed8..471a820792 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4044,7 +4044,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Minimized window */ ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); /* Hidden window */ -- 2.20.1

2 1

[PATCH] winex11.drv: Try harder to grab pointer.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Some window managers temporarily grab the pointer during window transition. We need to wait a while for window manager to release its grab, otherwise XGrabPointer may fail with AlreadyGrabbed, causing cursor clipping to fail. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f737a306a5..7501959369 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -378,9 +378,13 @@ static BOOL grab_clipping_window( const RECT *clip ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); + static DWORD timeout = 5000; + static DWORD step = 100; + DWORD time = 0; Window clip_window; HWND msg_hwnd = 0; POINT pos; + INT ret; if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */ @@ -416,13 +420,24 @@ static BOOL grab_clipping_window( const RECT *clip ) clip->right < clip_rect.right || clip->bottom < clip_rect.bottom) data->warp_serial = NextRequest( data->display ); - if (!XGrabPointer( data->display, clip_window, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) + /* Some windows managers temporarily grab the pointer during window transition. Retry grabbing. */ + do + { + ret = XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime ); + if (ret == AlreadyGrabbed || ret == GrabFrozen) + { + time += step; + Sleep(step); + } + } while ((ret == AlreadyGrabbed || ret == GrabFrozen) && time < timeout); + + if (ret == GrabSuccess) clipping_cursor = TRUE; if (!clipping_cursor) { + ERR("Failed to grab pointer\n"); disable_xinput2(); DestroyWindow( msg_hwnd ); return FALSE; -- 2.20.1

1 0

[PATCH v8 6/7] user32: Improve EnumDisplayDevicesW stub.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/misc.c | 74 +++++++++++++++++++++++++++++-------- dlls/user32/tests/monitor.c | 18 ++++----- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 1a03d70dde..355457098d 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -39,6 +39,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +static const WCHAR default_adapter_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR default_monitor_name[] = + {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','1','\\', + 'M','o','n','i','t','o','r','0',0}; +static const WCHAR default_adapter_string[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; +static const WCHAR default_monitor_string[] = + {'G','e','n','e','r','i','c',' ','N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; +static const WCHAR default_adapter_id[] = + {'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR default_monitor_id[] = + {'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '{','4','d','3','6','e','9','6','e','-','e','3','2','5','-','1','1','c','e','-', + 'b','f','c','1','-','0','8','0','0','2','b','e','1','0','3','1','8','}', + '\\','0','0','0','0',0}; +static const WCHAR default_monitor_interface_id[] = + {'\\','\\','\?','\\', + 'D','I','S','P','L','A','Y','#','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','#', + '4','&','1','7','f','0','f','f','5','4','&','0','&','U','I','D','0','#', + '{','e','6','f','0','7','b','5','f','-','e','e','9','7','-','4','a','9','0','-', + 'b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; + #define IMM_INIT_MAGIC 0x19650412 static HWND (WINAPI *imm_get_ui_window)(HKL); BOOL (WINAPI *imm_register_window)(HWND) = NULL; @@ -243,12 +270,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; -static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', - 'S','y','s','t','e','m',0}; -static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', - 'D','E','V','_','0','0','0','0',0}; - /*********************************************************************** * EnumDisplayDevicesA (USER32.@) */ @@ -293,16 +314,39 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lp if (i) return FALSE; - memcpy(lpDisplayDevice->DeviceName, primary_device_name, sizeof(primary_device_name)); - memcpy(lpDisplayDevice->DeviceString, primary_device_string, sizeof(primary_device_string)); - - lpDisplayDevice->StateFlags = - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | - DISPLAY_DEVICE_PRIMARY_DEVICE | - DISPLAY_DEVICE_VGA_COMPATIBLE; + /* Adapter */ + if (!lpDevice) + { + memcpy(lpDisplayDevice->DeviceName, default_adapter_name, sizeof(default_adapter_name)); + memcpy(lpDisplayDevice->DeviceString, default_adapter_string, sizeof(default_adapter_string)); + lpDisplayDevice->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + lpDisplayDevice->DeviceID[0] = 0; + else + memcpy(lpDisplayDevice->DeviceID, default_adapter_id, sizeof(default_adapter_id)); + } + } + /* Monitor */ + else + { + if (lstrcmpiW(default_adapter_name, lpDevice)) + return FALSE; + + memcpy(lpDisplayDevice->DeviceName, default_monitor_name, sizeof(default_monitor_name)); + memcpy(lpDisplayDevice->DeviceString, default_monitor_string, sizeof(default_monitor_string)); + lpDisplayDevice->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) + { + if (dwFlags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy(lpDisplayDevice->DeviceID, default_monitor_interface_id, sizeof(default_monitor_interface_id)); + else + memcpy(lpDisplayDevice->DeviceID, default_monitor_id, sizeof(default_monitor_id)); + } + } - if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) lpDisplayDevice->DeviceKey[0] = 0; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index bee1085a14..e3e1f38d66 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -146,13 +146,13 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on * userland. So here we check the expected format instead. */ if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + ok(strlen(device->DeviceID) == 0 || /* vista+ */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ "#%d: got %s\n", index, device->DeviceID); else { - todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); } @@ -173,14 +173,14 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index /* DeviceName */ lstrcpyA(monitor_name, adapter_name); sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); - todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0) - todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); else ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, device->StateFlags); @@ -191,7 +191,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR * ^ ^ ^ * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ - todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ (!lstrcmpiA(buffer, device_id_prefix) && sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ @@ -201,9 +201,9 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index { /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ /* But we don't know which monitor instance this belongs to, so check format instead */ - todo_wine ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); - todo_wine ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); } /* DeviceKey */ @@ -235,7 +235,7 @@ static void test_enumdisplaydevices(void) /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); - todo_wine ok(!ret, "Expect failure\n"); + ok(!ret, "Expect failure\n"); /* Enumeration */ for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) -- 2.20.1

1 0

[PATCH v8 5/7] winex11.drv: Handle display device changes.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/display.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbdcb3..a0495c44b1 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a85925d1f1..93eacf6110 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -339,7 +339,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -void X11DRV_DisplayDevices_Init(void) +void X11DRV_DisplayDevices_Init(BOOL force) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; @@ -366,7 +366,7 @@ void X11DRV_DisplayDevices_Init(void) } /* Avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) goto done; TRACE("via %s\n", wine_dbgstr_a(handler.name)); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f8f28f0e0b..ba473c3fc5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -736,7 +736,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 69478741f1..21807af3f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(FALSE); return TRUE; } -- 2.20.1

1 0

[PATCH v8 4/7] winex11.drv: Initialize monitor registry data.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 95 +++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 18 +++++++ dlls/winex11.drv/xinerama.c | 51 ++++++++++++++++++++ 3 files changed, 159 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 4502c6b2b1..a85925d1f1 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,10 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -84,6 +88,13 @@ static const WCHAR nt_classW[] = { 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'C','l','a','s','s','\\',0}; +static const WCHAR monitor_instance_fmtW[] = { + 'D','I','S','P','L','A','Y','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '%','0','4','X','&','%','0','4','X',0}; +static const WCHAR monitor_hardware_idW[] = { + 'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; @@ -169,7 +180,7 @@ done: return ret; } -static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, INT monitor_count, const struct x11drv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) { @@ -179,6 +190,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, HKEY hkey = NULL; BOOL ret = FALSE; LSTATUS ls; + INT i; sprintfW(key_nameW, device_video_fmtW, video_index); lstrcpyW(bufferW, machine_prefixW); @@ -213,6 +225,15 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + /* Write all monitor instances paths under this adapter */ + for (i = 0; i < monitor_count; i++) + { + sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(bufferW, monitor_instance_fmtW, video_index, i); + if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + } + /* Write StateFlags */ if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, sizeof(adapter->state_flags))) @@ -226,6 +247,43 @@ done: return ret; } +static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, + int video_index) +{ + SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + WCHAR bufferW[MAX_PATH]; + HKEY hkey; + BOOL ret = FALSE; + + /* Create GUID_DEVCLASS_MONITOR instance */ + sprintfW(bufferW, monitor_instance_fmtW, video_index, monitor_index); + SetupDiCreateDeviceInfoW(devinfo, bufferW, &GUID_DEVCLASS_MONITOR, monitor->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto done; + + /* Write HaredwareID registry property */ + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, + (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) + goto done; + + /* Create driver key */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + RegCloseKey(hkey); + + /* FIXME: + * Following properties are Wine specific, see comments in X11DRV_InitAdapter for details */ + /* StateFlags */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, + (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) + goto done; + + ret = TRUE; +done: + if (!ret) + ERR("Failed to initialize monitor\n"); + return ret; +} + static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; @@ -233,6 +291,15 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; + /* Remove all monitors */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove monitor\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); + /* Clean up old adapter keys for reinitialization */ RegDeleteTreeW(video_hkey, NULL); @@ -241,6 +308,7 @@ static void prepare_devices(HKEY video_hkey) * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain * the same GUID for the same GPU. */ + i = 0; devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { @@ -277,9 +345,10 @@ void X11DRV_DisplayDevices_Init(void) HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; - INT gpu_count, adapter_count; - INT gpu, adapter; - HDEVINFO gpu_devinfo = NULL; + struct x11drv_monitor *monitors = NULL; + INT gpu_count, adapter_count, monitor_count; + INT gpu, adapter, monitor; + HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -305,6 +374,7 @@ void X11DRV_DisplayDevices_Init(void) prepare_devices(video_hkey); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) @@ -321,10 +391,22 @@ void X11DRV_DisplayDevices_Init(void) for (adapter = 0; adapter < adapter_count; adapter++) { - if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + goto done; + + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) goto done; + /* Initialize monitors */ + for (monitor = 0; monitor < monitor_count; monitor++) + { + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + goto done; + } + + handler.pFreeMonitors(monitors); + monitors = NULL; video_index++; } @@ -334,6 +416,7 @@ void X11DRV_DisplayDevices_Init(void) done: cleanup_devices(); + SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); ReleaseMutex(mutex); @@ -342,4 +425,6 @@ done: handler.pFreeGpus(gpus); if (adapters) handler.pFreeAdapters(adapters); + if (monitors) + handler.pFreeMonitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5d99d69eff..f8f28f0e0b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,15 @@ struct x11drv_adapter DWORD state_flags; }; +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -710,11 +719,20 @@ struct x11drv_display_device_handler * Return FALSE on failure with parameters unchanged */ BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + /* pFreeGpus will be called to free a GPU list from pGetGpus */ void (*pFreeGpus)(struct x11drv_gpu *gpus); /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 8b0ee51f7e..fde2e189f6 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -291,6 +291,55 @@ static void xinerama_free_adapters( struct x11drv_adapter *adapters ) heap_free( adapters ); } +static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + INT first = (INT)adapter_id; + INT monitor_count = 0; + INT index = 0; + INT i; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + monitor_count++; + } + + monitor = heap_calloc( monitor_count, sizeof(*monitor) ); + if (!monitor) + return FALSE; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + { + lstrcpyW( monitor[index].name, generic_nonpnp_monitorW ); + /* Xinerama only reports monitors already attached */ + monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[i].rcMonitor )) + monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; + + index++; + } + } + + *new_monitors = monitor; + *count = monitor_count; + return TRUE; +} + +static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -331,8 +380,10 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; + handler.pGetMonitors = xinerama_get_monitors; handler.pFreeGpus = xinerama_free_gpus; handler.pFreeAdapters = xinerama_free_adapters; + handler.pFreeMonitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

1 0

[PATCH v8 3/7] winex11.drv: Initialize adapter registry data.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 128 ++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 18 +++++ dlls/winex11.drv/xinerama.c | 69 +++++++++++++++++++ 3 files changed, 208 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6ff5828b3a..4502c6b2b1 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; @@ -61,6 +64,26 @@ static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'V','I','D','E','O',0}; +static const WCHAR adapter_key_fmtW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '%','s','\\', + '%','0','4','x',0}; +static const WCHAR device_video_fmtW[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR machine_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; +static const WCHAR nt_classW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; static struct x11drv_display_device_handler handler; @@ -73,8 +96,9 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } -/* Initialize a GPU instance */ -static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, + WCHAR *driver) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -116,6 +140,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; RegCloseKey(hkey); + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto done; + lstrcpyW(driver, nt_classW); + lstrcatW(driver, bufferW); + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); @@ -128,6 +159,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; } + lstrcpyW(guid_string, bufferW); ret = TRUE; done: @@ -137,13 +169,73 @@ done: return ret; } -static void prepare_devices(void) +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, + const struct x11drv_gpu *gpu, const WCHAR *guid_string, + const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) +{ + WCHAR adapter_keyW[MAX_PATH]; + WCHAR key_nameW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + BOOL ret = FALSE; + LSTATUS ls; + + sprintfW(key_nameW, device_video_fmtW, video_index); + lstrcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + lstrcatW(bufferW, adapter_keyW); + + /* Write value of \Device\Video? (adapter key) in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW(video_hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + + /* Create HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} link to GPU driver */ + ls = RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (ls == ERROR_ALREADY_EXISTS) + RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (RegSetValueExW(hkey, symbolic_link_valueW, 0, REG_LINK, (const BYTE *)gpu_driver, + strlenW(gpu_driver) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); + hkey = NULL; + + /* FIXME: + * Following information are Wine specific, they don't really exist on Windows. They are used so that we can + * implement EnumDisplayDevices etc by querying registry only. These information are most likely reported by the + * device driver on Windows */ + RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + + /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match + * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto done; + + ret = TRUE; +done: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize adapter\n"); + return ret; +} + +static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; HDEVINFO devinfo; DWORD i = 0; + /* Clean up old adapter keys for reinitialization */ + RegDeleteTreeW(video_hkey, NULL); + /* FIXME: * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result @@ -184,11 +276,15 @@ void X11DRV_DisplayDevices_Init(void) static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; - INT gpu_count; - INT gpu; + struct x11drv_adapter *adapters = NULL; + INT gpu_count, adapter_count; + INT gpu, adapter; HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; + INT video_index = 0; DWORD disposition = 0; + WCHAR guidW[40]; + WCHAR driverW[1024]; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -206,7 +302,7 @@ void X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); - prepare_devices(); + prepare_devices(video_hkey); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); @@ -216,8 +312,24 @@ void X11DRV_DisplayDevices_Init(void) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + goto done; + + /* Initialize adapters */ + if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + &gpus[gpu], guidW, driverW, &adapters[adapter])) + goto done; + + video_index++; + } + + handler.pFreeAdapters(adapters); + adapters = NULL; } done: @@ -228,4 +340,6 @@ done: CloseHandle(mutex); if (gpus) handler.pFreeGpus(gpus); + if (adapters) + handler.pFreeAdapters(adapters); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e50158d282..5d99d69eff 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -681,6 +681,15 @@ struct x11drv_gpu UINT revision_id; }; +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -695,8 +704,17 @@ struct x11drv_display_device_handler * Return FALSE on failure with parameters unchanged */ BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + /* pFreeGpus will be called to free a GPU list from pGetGpus */ void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 900cfd91db..8b0ee51f7e 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -224,6 +224,73 @@ static void xinerama_free_gpus( struct x11drv_gpu *gpus ) heap_free( gpus ); } +static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + INT index = 0; + INT i, j; + INT primary_index; + BOOL mirrored; + + if (gpu_id) + return FALSE; + + /* Being lazy, actual adapter count maybe less */ + adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); + if (!adapters) + return FALSE; + + primary_index = primary_monitor; + if (primary_index >= nb_monitors) + primary_index = 0; + + for (i = 0; i < nb_monitors; i++) + { + mirrored = FALSE; + for (j = 0; j < i; j++) + { + if (EqualRect( &monitors[i].rcMonitor, &monitors[j].rcMonitor) && !IsRectEmpty( &monitors[j].rcMonitor )) + { + mirrored = TRUE; + break; + } + } + + /* Mirrored monitors share the same adapter */ + if (mirrored) + continue; + + /* Use monitor index as id */ + adapters[index].id = (ULONG_PTR)i; + + if (i == primary_index) + adapters[index].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (!IsRectEmpty( &monitors[i].rcMonitor )) + adapters[index].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + index++; + } + + /* Primary adapter has to be first */ + if (primary_index) + { + struct x11drv_adapter tmp; + tmp = adapters[primary_index]; + adapters[primary_index] = adapters[0]; + adapters[0] = tmp; + } + + *new_adapters = adapters; + *count = index; + return TRUE; +} + +static void xinerama_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -263,7 +330,9 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; handler.pGetGpus = xinerama_get_gpus; + handler.pGetAdapters = xinerama_get_adapters; handler.pFreeGpus = xinerama_free_gpus; + handler.pFreeAdapters = xinerama_free_adapters; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

1 0

[PATCH v8 2/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang 10 Jun '19

10 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 154 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 22 +++++ dlls/winex11.drv/xinerama.c | 25 ++++++ 4 files changed, 202 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9ca2fc6efe..72ab1bb77b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 ntoskrnl setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index e3e4dce84d..6ff5828b3a 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -26,11 +26,37 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -47,10 +73,120 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +/* Initialize a GPU instance */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, gpu->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto done; + } + + /* Write HaredwareID registry property, REG_MULTI_SZ */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto done; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto done; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + } + + ret = TRUE; +done: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* FIXME: + * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in + * case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result + * of prefix copying or having devices unplugged. But then we couldn't simply delete GPUs because we need to retain + * the same GUID for the same GPU. */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + void X11DRV_DisplayDevices_Init(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; + struct x11drv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; DWORD disposition = 0; @@ -70,8 +206,26 @@ void X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (!handler.pGetGpus(&gpus, &gpu_count)) + goto done; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + goto done; + } + done: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); ReleaseMutex(mutex); CloseHandle(mutex); + if (gpus) + handler.pFreeGpus(gpus); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbc5a104f6..e50158d282 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -667,6 +667,20 @@ void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; /* X11 display device handler. Used to initialize display device registry data */ +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + /* Required functions for display device registry initialization */ struct x11drv_display_device_handler { @@ -675,6 +689,14 @@ struct x11drv_display_device_handler /* Higher priority can override handlers with lower proprity */ INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 35dd36049b..900cfd91db 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -201,6 +201,29 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + lstrcpyW( gpus[0].name, wine_adapterW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; @@ -239,6 +262,8 @@ void xinerama_init( unsigned int width, unsigned int height ) strcpy( handler.name, "Xinerama" ); handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pFreeGpus = xinerama_free_gpus; X11DRV_DisplayDevices_SetHandler( &handler ); TRACE( "virtual size: %s primary: %s\n", -- 2.20.1

1 0

[PATCH v3 1/2] ntdll/directory: Add support for EXT4 case folding per directory
by Gabriel Ivăncescu 10 Jun '19

10 Jun '19

This adds support for checking the case-insensitive attribute on ext4 with newer kernels so that Wine can rely on it for performance. It has some conditional processing for perf reasons. Checking for the EXT4_CASEFOLD_FL attribute involves an ioctl, which operates on file descriptors, while all the former checks operated directly on the dir pathname (e.g. statfs). Obviously, it's best to avoid looking up the directory multiple times (also for correctness, so it refers to the same dir). So in the case that we *do* have a file descriptor, then use it everywhere, with e.g. fstatfs. However, to avoid a perf regression or downgrade on systems that don't support the EXT2_IOC_GETFLAGS ioctl (e.g. MacOS, FreeBSD), we continue using statfs and the like directly, this shaves off two syscalls (open/close). But in the case the EXT4_CASEFOLD_FL is not supported on Linux (i.e. on current kernels) or the directory doesn't have it, this will unfortunately involve a bit more syscalls now, because it has to open() and close() the fd, but it shouldn't be too much of a problem. (the fstatfs and fstatat make it less impactful somewhat, so they won't have to lookup the directory again, hopefully mitigating some of it) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47099 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Clean up the code and don't have unused parameters in any case. GET_DIR_CASE_SENSITIVITY_USE_FD is used so it can be as generic as possible for fast tweaking and future expansion on other platforms, if they get something similar. As it is now, on Linux, we always set the EXT4_CASEFOLD_FL flag ourselves. Thus, I can of course remove the .ciopfs old code and keep just the fstatat() call by assuming we always use fd on Linux, if you prefer it that way, to keep the code smaller. I didn't remove it because I didn't want to "hardcode" this assumption, so please let me know if that should be done or not. dlls/ntdll/directory.c | 73 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bbdbbe9..354c00f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,12 +132,25 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif #endif /* linux */ +/* Use a file descriptor for the case-sensitivity check if we have to */ +#if defined(EXT2_IOC_GETFLAGS) && defined(EXT4_CASEFOLD_FL) +#define GET_DIR_CASE_SENSITIVITY_USE_FD 1 +#else +#define GET_DIR_CASE_SENSITIVITY_USE_FD 0 +#endif + #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') @@ -1109,18 +1124,35 @@ static int get_dir_case_sensitivity_attr( const char *dir ) } #endif +/*********************************************************************** + * get_dir_case_sensitivity_ioctl + * + * Checks if the specified directory is case sensitive or not. Uses ioctl(2). + */ +static int get_dir_case_sensitivity_ioctl(int fd) +{ +#if defined(EXT2_IOC_GETFLAGS) && defined(EXT4_CASEFOLD_FL) + int flags; + if (ioctl(fd, EXT2_IOC_GETFLAGS, &flags) != -1 && (flags & EXT4_CASEFOLD_FL)) + return FALSE; +#endif + return -1; +} + /*********************************************************************** * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), (f)statvfs(2), or fstatat(2). */ -static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) +static BOOLEAN get_dir_case_sensitivity_stat( const char *dir, int fd ) { #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - if (statfs( dir, &stfs ) == -1) return FALSE; + if (fd != -1 && fstatfs( fd, &stfs ) == -1) return FALSE; + if (fd == -1 && statfs( dir, &stfs ) == -1) return FALSE; + /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -1157,7 +1189,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - if (statvfs( dir, &stfs ) == -1) return FALSE; + if (fd != -1 && fstatvfs( fd, &stfs ) == -1) return FALSE; + if (fd == -1 && statvfs( dir, &stfs ) == -1) return FALSE; + /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) @@ -1170,7 +1204,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) char *cifile; /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; + if (fd != -1 && fstatfs( fd, &stfs ) == -1) return FALSE; + if (fd == -1 && statfs( dir, &stfs ) == -1) return FALSE; + if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) return TRUE; /* Normally, we'd have to parse the mtab to find out exactly what @@ -1180,6 +1216,13 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * This will break if somebody puts a file named ".ciopfs" in a non- * CIOPFS directory. */ + if (fd != -1) + { + if (fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) + return FALSE; + return TRUE; + } + cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); if (!cifile) return TRUE; strcpy( cifile, dir ); @@ -1201,16 +1244,30 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) { + int case_sensitive, fd = -1; + #if defined(HAVE_GETATTRLIST) && defined(ATTR_VOL_CAPABILITIES) && \ defined(VOL_CAPABILITIES_FORMAT) && defined(VOL_CAP_FMT_CASE_SENSITIVE) - int case_sensitive = get_dir_case_sensitivity_attr( dir ); + case_sensitive = get_dir_case_sensitivity_attr( dir ); if (case_sensitive != -1) return case_sensitive; #endif - return get_dir_case_sensitivity_stat( dir ); + + if (GET_DIR_CASE_SENSITIVITY_USE_FD) + { + if ((fd = open(dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE)) == -1) + return TRUE; + if ((case_sensitive = get_dir_case_sensitivity_ioctl(fd)) != -1) + goto end; + } + case_sensitive = get_dir_case_sensitivity_stat(dir, fd); + +end: + if (fd != -1) close(fd); + return case_sensitive; } -- 2.21.0

4 11

[PATCH] ntoskrnl.exe/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 19eeca20bce..267fddb7cc3 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -377,8 +377,10 @@ START_TEST(ntoskrnl) unload_driver(service2); unload_driver(service); - ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); - ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename2); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); test_driver3(); } -- 2.17.1

2 1

[PATCH] comctl32/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/comctl32/tests/pager.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index f48dc039543..4b5dfe6d96b 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -564,9 +564,11 @@ static void test_wm_notifyformat(void) static const INT formats[] = {NFR_UNICODE, NFR_ANSI}; HWND parent, pager, child; LRESULT ret; + BOOL bret; INT i; - ok(register_notifyformat_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + bret = register_notifyformat_class(); + ok(bret, "Register test class failed, error 0x%08x\n", GetLastError()); for (i = 0; i < ARRAY_SIZE(formats); i++) { @@ -1280,9 +1282,11 @@ static void test_wm_notify(void) {&nmtv, sizeof(nmtv), &nmtv.itemOld.mask, TVIF_TEXT, &nmtv.itemOld.pszText, &nmtv.itemOld.cchTextMax, TVN_SELCHANGEDW, TVN_SELCHANGEDA, CONVERT_SEND, TVITEM_OLD_HANDLER} }; + BOOL bret; INT i; - ok(register_test_notify_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + bret = register_test_notify_class(); + ok(bret, "Register test class failed, error 0x%08x\n", GetLastError()); parent = CreateWindowA(class, "parent", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), 0); ok(parent != NULL, "CreateWindow failed\n"); -- 2.17.1

1 0

[PATCH] setupapi/tests: Don't test functions directly when reporting GetLastError()
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/setupapi/tests/devinst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f266592e3f9..430dede6531 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -200,7 +200,8 @@ static void test_install_class(void) ret = SetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "Failed to install class, error %#x.\n", GetLastError()); - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), "Failed to delete class key, error %u.\n", GetLastError()); + ret = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); + ok(!ret, "Failed to delete class key, error %u.\n", GetLastError()); DeleteFileA(tmpfile); } -- 2.17.1

1 0

[PATCH] mpr: Fix some spec file entries
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/mpr/mpr.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 2f102abf3e8..155e4485c38 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -32,8 +32,8 @@ @ stdcall NPSDeviceGetNumberA(str ptr ptr) @ stdcall NPSDeviceGetStringA(long long ptr ptr) @ stdcall NPSGetProviderHandleA(ptr) -@ stdcall NPSGetProviderNameA(long ptr) -@ stdcall NPSGetSectionNameA(long ptr) +@ stdcall NPSGetProviderNameA(ptr ptr) +@ stdcall NPSGetSectionNameA(ptr ptr) @ stdcall NPSNotifyGetContextA(ptr) @ stdcall NPSNotifyRegisterA(long ptr) @ stdcall NPSSetCustomTextA(str) @@ -101,7 +101,7 @@ @ stdcall WNetOpenEnumW(long long long ptr ptr) @ stub WNetPasswordChangeNotify @ stub WNetPropertyDialogA -@ stdcall WNetRemoveCachedPassword(long long long) +@ stdcall WNetRemoveCachedPassword(ptr long long) @ stub WNetRestoreConnection @ stdcall WNetRestoreConnectionA(long str) @ stdcall WNetRestoreConnectionW(long wstr) -- 2.17.1

1 0

[PATCH] rpcrt4: Fix NdrServerContextMarshall spec file entry
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index d8e873d1944..6d7d0fbf7ac 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -275,7 +275,7 @@ @ stdcall NdrServerCall2(ptr) @ stdcall NdrServerCall(ptr) @ stdcall NdrServerCallAll(ptr) -@ stdcall NdrServerContextMarshall(ptr ptr long) +@ stdcall NdrServerContextMarshall(ptr ptr ptr) @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp @ stdcall NdrServerContextUnmarshall(ptr) -- 2.17.1

1 0

[PATCH] shlwapi: Fix some spec file entries
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- .../api-ms-win-core-registryuserspecific-l1-1-0.spec | 4 ++-- .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 4 ++-- .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 4 ++-- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 8 ++++---- dlls/kernelbase/kernelbase.spec | 6 +++--- dlls/shlwapi/shlwapi.spec | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec index 1da93793f18..1e26724af97 100644 --- a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec +++ b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec @@ -13,8 +13,8 @@ @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW @ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA @ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW -@ stdcall SHRegOpenUSKeyA( str long long long long ) shlwapi.SHRegOpenUSKeyA -@ stdcall SHRegOpenUSKeyW( wstr long long long long ) shlwapi.SHRegOpenUSKeyW +@ stdcall SHRegOpenUSKeyA( str long long ptr long ) shlwapi.SHRegOpenUSKeyA +@ stdcall SHRegOpenUSKeyW( wstr long long ptr long ) shlwapi.SHRegOpenUSKeyW @ stdcall SHRegQueryInfoUSKeyA( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyA @ stdcall SHRegQueryInfoUSKeyW( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyW @ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec index 4b969ee3548..a867dfd975d 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -20,10 +20,10 @@ @ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW @ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW @ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCA(str str long) shlwapi.StrCmpNCA @ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW @ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICA(str str long) shlwapi.StrCmpNICA @ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec index be3b9f18133..50661b13760 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec @@ -15,10 +15,10 @@ @ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW @ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW @ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCA(str str long) shlwapi.StrCmpNCA @ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW @ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICA(str str long) shlwapi.StrCmpNICA @ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index 96d44be579e..c8d82ac556d 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -78,8 +78,8 @@ @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW @ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA @ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW -@ stdcall SHRegOpenUSKeyA( str long long long long ) shlwapi.SHRegOpenUSKeyA -@ stdcall SHRegOpenUSKeyW( wstr long long long long ) shlwapi.SHRegOpenUSKeyW +@ stdcall SHRegOpenUSKeyA( str long long ptr long ) shlwapi.SHRegOpenUSKeyA +@ stdcall SHRegOpenUSKeyW( wstr long long ptr long ) shlwapi.SHRegOpenUSKeyW @ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA @ stdcall SHRegQueryUSValueW( long wstr ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueW @ stdcall SHRegSetUSValueA( str str long ptr long long) shlwapi.SHRegSetUSValueA @@ -104,10 +104,10 @@ @ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW @ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW @ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCA(str str long) shlwapi.StrCmpNCA @ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW @ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA -@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICA(str str long) shlwapi.StrCmpNICA @ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 07a40419edc..cce4262ba3a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1371,8 +1371,8 @@ @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) @ stdcall SHRegGetUSValueA(str str ptr ptr ptr long ptr long) @ stdcall SHRegGetUSValueW(wstr wstr ptr ptr ptr long ptr long) -@ stdcall SHRegOpenUSKeyA(str long long long long) -@ stdcall SHRegOpenUSKeyW(wstr long long long long) +@ stdcall SHRegOpenUSKeyA(str long long ptr long) +@ stdcall SHRegOpenUSKeyW(wstr long long ptr long) @ stdcall SHRegQueryInfoUSKeyA(long ptr ptr ptr ptr long) @ stdcall SHRegQueryInfoUSKeyW(long ptr ptr ptr ptr long) @ stdcall SHRegQueryUSValueA(long str ptr ptr ptr long ptr long) @@ -1549,7 +1549,7 @@ @ stdcall StrCmpNCA(str str long) @ stdcall StrCmpNCW(wstr wstr long) @ stdcall StrCmpNIA(str str long) -@ stdcall StrCmpNICA(long long long) +@ stdcall StrCmpNICA(str str long) @ stdcall StrCmpNICW(wstr wstr long) @ stdcall StrCmpNIW(wstr wstr long) @ stdcall StrCmpNW(wstr wstr long) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 060daccf246..672486027db 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -148,9 +148,9 @@ 148 stdcall -noname VkKeyScanWrapW(long) user32.VkKeyScanW 149 stdcall -noname WinHelpWrapW(long wstr long long) user32.WinHelpW 150 stdcall -noname wvsprintfWrapW(ptr wstr ptr) user32.wvsprintfW -151 stdcall -ordinal StrCmpNCA(str ptr long) +151 stdcall -ordinal StrCmpNCA(str str long) 152 stdcall -ordinal StrCmpNCW(wstr wstr long) -153 stdcall -ordinal StrCmpNICA(long long long) +153 stdcall -ordinal StrCmpNICA(str str long) 154 stdcall -ordinal StrCmpNICW(wstr wstr long) 155 stdcall -ordinal StrCmpCA(str str) 156 stdcall -ordinal StrCmpCW(wstr wstr) @@ -733,8 +733,8 @@ @ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long ) @ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) advapi32.RegGetValueA @ stdcall SHRegGetValueW ( long wstr wstr long ptr ptr ptr ) advapi32.RegGetValueW -@ stdcall SHRegOpenUSKeyA ( str long long long long ) -@ stdcall SHRegOpenUSKeyW ( wstr long long long long ) +@ stdcall SHRegOpenUSKeyA ( str long long ptr long ) +@ stdcall SHRegOpenUSKeyW ( wstr long long ptr long ) @ stdcall SHRegQueryInfoUSKeyA ( long ptr ptr ptr ptr long ) @ stdcall SHRegQueryInfoUSKeyW ( long ptr ptr ptr ptr long ) @ stdcall SHRegQueryUSValueA ( long str ptr ptr ptr long ptr long ) -- 2.17.1

1 0

[PATCH] shcore: Fix IUnknown_AtomicRelease spec file entry
by André Hentschel 09 Jun '19

09 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shcore/shcore.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 4c2717948de..6a634bdee5c 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -20,7 +20,7 @@ @ stdcall IStream_Size(ptr ptr) @ stdcall IStream_Write(ptr ptr long) _IStream_Write @ stub IStream_WriteStr -@ stdcall IUnknown_AtomicRelease(long) +@ stdcall IUnknown_AtomicRelease(ptr) @ stdcall IUnknown_GetSite(ptr ptr ptr) @ stdcall IUnknown_QueryService(ptr ptr ptr ptr) @ stdcall IUnknown_Set(ptr ptr) -- 2.17.1

1 0

[PATCH] po: Update on Brazilian Portuguese translation
by Roberto Pungartnik 09 Jun '19

09 Jun '19

1 0

dbghelp detached from wine into standalone windows dll...
by Tarmo Pikaro 09 Jun '19

09 Jun '19

Hi ! I was looking for here and there for portable (windows & linux) call stack determination functionality - but could not find any. I have some experience with call stack determination, but only on windows - made memory leak detection utility for windows once upon a time. But all API's with which I have played around are windows based. Now wanted to go deeper with call stack determination and moreover make functionality portable - to start from windows & linux, later on expanding to android. Brief analysis showed a lot of complexity without any clear / good / portable library. Analysis came upon dbghelp.dll which is implemented in Wine - I have noticed that besides windows PE file format it contains also support for loading debug information for DWARF / ELF file format. I've got curious, and started to prototype. I've made windows project where I have dragged some parts of wine functionality. (LGPL licensed) Something similar was done once in here: https://github.com/vtjnash/dbghelp2 but he have used cross compilation toolchain, I wanted to use Visual studio + microsoft compiler. My own repository is located here:https://github.com/tapika/dbghelp2 My prime target is 64-bit windows, 32-bit is nice-to-have. Well - dll itself is nice, but I needed test application. Quick analysis came upon https://github.com/KjellKod/g3log that logger was using dbghelp - official microsoft distribution. After some fighting with compilation and linking errors I've managed to detach dbghelp from wine into separate .dll, I've called it dbghelp2.dll. But at run-time library refused to work. I'll try to list here problems upon which I've came accross: 32-bit compilation: A lot of unsupported traces in base functionality: 976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 725: Unsupported type 1404 in ENUM field list976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 2038: Unsupported symbol id 1124976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 123: 00000000: 06 00 24 11 73 74 64 00 ..$.std. 976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 2038: Unsupported symbol id 1124976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 123: 00000000: 1a 00 24 11 5f 48 61 73 5f 41 44 4c 5f 73 77 61 ..$._Has_ADL_swa976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 123: 00000010: 70 5f 64 65 74 61 69 6c 00 00 00 00 p_detail.... 976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 2038: Unsupported symbol id 1124976c:fixme:dbghelp_msc:c:\prototyping\dbghelp2\dlls\dbghelp\msc.c 123: 00000000: 0a 00 24 11 72 65 6c 5f 6f 70 73 00 ..$.rel_ops. ... same problems occurs in 64-bit compilation. Finally call stack determination refused to work:976c:fixme:dbghelp:c:\prototyping\dbghelp2\dlls\dbghelp\stack.c 59: Failed to linearize address 771f:7000 (mode 0) 64-bit compilation: I've noticed that addressing uses 32-bit unsigned long, while 64-bit addressing mode requires uint64_t. Besides this g3log also was using incorrect API's - I've ended up replacing SymGetSymFromAddr64 with SymFromAddr. call stack determination seems to work, also function resolving, but not source code position or line information, what Microsoft dbghelp.dll can do out of box. So now dbghelp2.dll can determine stack like this: ******* STACKDUMP *******stack using dbghelp2.dll stack dump [0] std::basic_string<char,std::char_traits<char>,std::allocator<char> >::appendstack dump [1] std::basic_string<char,std::char_traits<char>,std::allocator<char> >::appendstack dump [2] example_fatal::tryToKillWithAccessingIllegalPointerstack dump [3] mainstack dump [4] invoke_mainstack dump [5] __scrt_common_main_sehstack dump [6] __scrt_common_mainstack dump [7] mainCRTStartupstack dump [8] stack dump [9] while Microsoft's implementation determines it like this:stack dump [0] c:\program files (x86)\microsoft visual studio\2017\enterprise\vc\tools\msvc\14.16.27023\include\xstring L: 2571 std::basic_string<char,std::char_traits<char>,std::allocator<char> >::appendstack dump [1] c:\program files (x86)\microsoft visual studio\2017\enterprise\vc\tools\msvc\14.16.27023\include\xstring L: 2593 std::basic_string<char,std::char_traits<char>,std::allocator<char> >::appendstack dump [2] c:\prototyping\dbghelp2\g3log\example\main_sigsegv.cpp L: 52 example_fatal::tryToKillWithAccessingIllegalPointerstack dump [3] c:\prototyping\dbghelp2\g3log\example\main_sigsegv.cpp L: 115 mainstack dump [4] d:\agent\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl L: 79 invoke_mainstack dump [5] d:\agent\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl L: 288 __scrt_common_main_sehstack dump [6] d:\agent\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl L: 331 __scrt_common_mainstack dump [7] d:\agent\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_main.cpp L: 17 mainCRTStartupstack dump [8] BaseThreadInitThunkstack dump [9] RtlUserThreadStart Noticed stack frames [8] & [9] contains additional functions, not available in wine port. Here is 64-bit enabling commit: https://github.com/tapika/dbghelp2/commit/3a3e9daacae14c4f73585aeff4ef53a20… Basically my intention was to prototype that it's possible to determine call stack using wine dbghelp parts. - Does it makes any sense to try to make my dbghelp prototype be more or less official / or create such version which would be suitable for wine and for standalone compilation ? - I would be interested in further development of dbghelp - as standalone dll / so independently from wine. At the moment dbghelp serves like read / parse of existing file formats (PE & ELF), has anyone considered of expanding support towards generation of same file formats ? See also CV2PDB: https://github.com/rainers/cv2pdbclang pdb generation support: http://blog.llvm.org/2017/08/llvm-on-windows-now-supports-pdb-debug.html -- Have a nice day! Tarmo.

2 6

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 08 Jun '19

08 Jun '19

From: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c3ca11049c..31792a8503 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-05-27 14:50+0800\n" -"Last-Translator: Mingcong Bai <jeffbai(a)aosc.io>\n" +"PO-Revision-Date: 2019-06-04 19:24-0600\n" +"Last-Translator: Zixing Liu <liushuyu011(a)gmail.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -6852,10 +6852,8 @@ msgid "Unsupported rate.\n" msgstr "不支持的频率。\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的消减类型。\n" #: mferror.mc:207 msgid "Reversing is not supported.\n" @@ -7131,7 +7129,7 @@ msgstr "缺少源。\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "拓扑加载器不支持输出槽。\n" #: mferror.mc:711 msgid "Clock has no time source set.\n" -- 2.20.1

1 0

[website] zh-cn: Remove dead links.
by Jactry Zeng 08 Jun '19

08 Jun '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- templates/zh-cn/about.template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/zh-cn/about.template b/templates/zh-cn/about.template index 0a75ddde..da1e85bd 100644 --- a/templates/zh-cn/about.template +++ b/templates/zh-cn/about.template @@ -10,10 +10,9 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而程序的办法。不久之后，Alexandre Julliard 开始接手领导 Wine 的开发，从此由他管理这个项目。多年以来，随着 Windows API 和应用为了适应新硬件及软件而不断演变，Wine 也一直不断发展来支持新的特性，移植到更多其他系统，并且更加稳定，提供着更好的用户体验。</p> -<p>通过确立一个宏伟的目标，在2008年项目到达 v1.0 之前，Wine 一直稳健地持续了 15 年之久，那是第一个稳定版。 +<p>通过确立一个宏伟的目标，在 2008 年项目到达 v1.0 之前，Wine 一直稳健地持续了 15 年之久，那是第一个稳定版。多个版本以后，虽然还有许多工作要做，但今天 Wine 仍然在活跃地开发着。 -并且有大约<a href="https://wiki.winehq.org/UsageStatistics" title="Wine Usage -Statistics">数以百万人计的人们</a>使用 Wine 在他们所选择的系统上运行 Windows 软件。</p> +并且有大约数以百万人计的人们使用 Wine 在他们所选择的系统上运行 Windows 软件。</p> <h3>开放源代码和用户驱动的</h3> @@ -33,8 +32,6 @@ may not be up-to-date)</i></p> <ul> <li><a href="https://wiki.winehq.org/ImportanceOfWine"> Wine 的重要性</a> </li> - <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">常见误解</a> - </li> <li><a href="https://wiki.winehq.org/WineHistory"> Wine 项目的历史</a> </li> <li><a href="https://wiki.winehq.org/ProjectOrganization">组织与领导</a> -- 2.20.1

1 0

[PATCH v2 1/4] winehid.inf: Add new INF file and copy it to the INF directory.
by Zebediah Figura 07 Jun '19

07 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/Makefile.in | 3 ++- loader/wine.inf.in | 18 ++++++++++++++---- loader/winehid.inf.in | 25 +++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 loader/winehid.inf.in diff --git a/loader/Makefile.in b/loader/Makefile.in index a776c8542b..3ada656408 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,8 @@ SOURCES = \ wine.inf.in \ wine.man.in \ wine.pl.UTF-8.man.in \ - wine_info.plist.in + wine_info.plist.in \ + winehid.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d28a93c35..e80af7a6a3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -55,7 +55,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -82,7 +82,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -108,7 +108,7 @@ AddReg=\ [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ @@ -3701,3 +3701,13 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x1 HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 + +[DestinationDirs] +l_intl_section = 11 +inf_section = 17 + +[l_intl_section] +l_intl.nls + +[inf_section] +winehid.inf diff --git a/loader/winehid.inf.in b/loader/winehid.inf.in new file mode 100644 index 0000000000..bd42bceeaa --- /dev/null +++ b/loader/winehid.inf.in @@ -0,0 +1,25 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da} +Class=HIDClass + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine hidraw device=device_section,HIDRAW +Wine IOHID device=device_section,IOHID +Wine libevent device=device_section,LNXEV +Wine SDL HID device=device_section,SDLJOY + +[device_section.Services] +AddService = winehid,0x2,svc_section + +[svc_section] +Description="Wine HID Minidriver" +DisplayName="Wine HID" +ServiceBinary="%12%\winehid.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 -- 2.20.1

1 3

[PATCH 1/4] winehid.inf: Add new INF file and copy it to the INF directory.
by Zebediah Figura 07 Jun '19

07 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/Makefile.in | 3 ++- loader/wine.inf.in | 18 ++++++++++++++---- loader/winehid.inf.in | 25 +++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 loader/winehid.inf.in diff --git a/loader/Makefile.in b/loader/Makefile.in index a776c8542b..3ada656408 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -9,7 +9,8 @@ SOURCES = \ wine.inf.in \ wine.man.in \ wine.pl.UTF-8.man.in \ - wine_info.plist.in + wine_info.plist.in \ + winehid.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d28a93c35..e80af7a6a3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -55,7 +55,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -82,7 +82,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section, inf_section AddReg=\ Classes,\ ContentIndex,\ @@ -108,7 +108,7 @@ AddReg=\ [Wow64Install] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDllsWow64 -CopyFiles=(a)l_intl.nls +CopyFiles=l_intl_section AddReg=\ CurrentVersion,\ CurrentVersionWow64,\ @@ -3701,3 +3701,13 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x1 HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 + +[DestinationDirs] +l_intl_section = 11 +inf_section = 17 + +[l_intl_section] +l_intl.nls + +[inf_section] +winehid.inf diff --git a/loader/winehid.inf.in b/loader/winehid.inf.in new file mode 100644 index 0000000000..bd42bceeaa --- /dev/null +++ b/loader/winehid.inf.in @@ -0,0 +1,25 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da} +Class=HIDClass + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine hidraw device=device_section,HIDRAW +Wine IOHID device=device_section,IOHID +Wine libevent device=device_section,LNXEV +Wine SDL HID device=device_section,SDLJOY + +[device_section.Services] +AddService = winehid,0x2,svc_section + +[svc_section] +Description="Wine HID Minidriver" +DisplayName="Wine HID" +ServiceBinary="%12%\winehid.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1 -- 2.20.1

1 3

[PATCH vkd3d 3/5] vkd3d: Introduce helper functions to call ID3D12Device methods.
by Józef Kucia 07 Jun '19

07 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Keeps the current version of ID3D12Device interface in single place. --- libs/vkd3d/command.c | 60 ++++++++++++++++---------------------- libs/vkd3d/resource.c | 52 ++++++++++++++------------------- libs/vkd3d/state.c | 25 +++++++--------- libs/vkd3d/vkd3d_private.h | 21 +++++++++++++ 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index a4659f701ebb..f66bbe90da40 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -885,7 +885,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) ERR("Failed to destroy mutex, error %d.\n", rc); vkd3d_free(fence); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -932,14 +932,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetName(ID3D12Fence *iface, const W return name ? S_OK : E_INVALIDARG; } -static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_fence_GetDevice(ID3D12Fence *iface, REFIID iid, void **device) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&fence->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(fence->device, iid, device); } static UINT64 STDMETHODCALLTYPE d3d12_fence_GetCompletedValue(ID3D12Fence *iface) @@ -1081,8 +1080,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * return hr; } - fence->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(fence->device = device); return S_OK; } @@ -1517,7 +1515,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllo vkd3d_free(allocator); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -1563,14 +1561,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_SetName(ID3D12CommandAl VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT, name); } -static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_GetDevice(ID3D12CommandAllocator *iface, REFIID iid, void **device) { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&allocator->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(allocator->device, iid, device); } static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_Reset(ID3D12CommandAllocator *iface) @@ -1727,8 +1724,7 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; - allocator->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(allocator->device = device); return S_OK; } @@ -2132,7 +2128,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandL vkd3d_free(list); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -2177,14 +2173,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_SetName(ID3D12GraphicsComman return name ? S_OK : E_INVALIDARG; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList1 *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_command_list_GetDevice(ID3D12GraphicsCommandList1 *iface, REFIID iid, void **device) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&list->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(list->device, iid, device); } static D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE d3d12_command_list_GetType(ID3D12GraphicsCommandList1 *iface) @@ -5118,8 +5113,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d if (FAILED(hr = vkd3d_private_store_init(&list->private_store))) return hr; - list->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(list->device = device); list->allocator = allocator; @@ -5130,7 +5124,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d else { vkd3d_private_store_destroy(&list->private_store); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return hr; @@ -5228,7 +5222,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *i vkd3d_free(command_queue); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -5284,14 +5278,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_SetName(ID3D12CommandQueue return hr; } -static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetDevice(ID3D12CommandQueue *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetDevice(ID3D12CommandQueue *iface, REFIID iid, void **device) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&command_queue->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(command_queue->device, iid, device); } static void STDMETHODCALLTYPE d3d12_command_queue_UpdateTileMappings(ID3D12CommandQueue *iface, @@ -5713,8 +5706,7 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (FAILED(hr = vkd3d_private_store_init(&queue->private_store))) return hr; - queue->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(queue->device = device); return S_OK; } @@ -5816,7 +5808,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSign vkd3d_free((void *)signature->desc.pArgumentDescs); vkd3d_free(signature); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -5861,14 +5853,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSi return name ? S_OK : E_INVALIDARG; } -static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetDevice(ID3D12CommandSignature *iface, - REFIID iid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetDevice(ID3D12CommandSignature *iface, REFIID iid, void **device) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&signature->device->ID3D12Device_iface, iid, device); + return d3d12_device_query_interface(signature->device, iid, device); } static const struct ID3D12CommandSignatureVtbl d3d12_command_signature_vtbl = @@ -5942,8 +5933,7 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ return hr; } - object->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(object->device = device); TRACE("Created command signature %p.\n", object); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1e5f5f3c3c38..15dac12abeb6 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -174,7 +174,7 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) vkd3d_free(heap); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -220,14 +220,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCH VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, name); } -static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, REFIID iid, void **device) { struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&heap->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(heap->device, iid, device); } static D3D12_HEAP_DESC * STDMETHODCALLTYPE d3d12_heap_GetDesc(ID3D12Heap *iface, @@ -416,8 +415,7 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } - heap->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(heap->device = device); return S_OK; } @@ -929,7 +927,7 @@ static ULONG STDMETHODCALLTYPE d3d12_resource_AddRef(ID3D12Resource *iface) { struct d3d12_device *device = resource->device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(device); d3d12_resource_incref(resource); } @@ -949,7 +947,7 @@ static ULONG STDMETHODCALLTYPE d3d12_resource_Release(ID3D12Resource *iface) d3d12_resource_decref(resource); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -1007,14 +1005,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, c VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, name); } -static HRESULT STDMETHODCALLTYPE d3d12_resource_GetDevice(ID3D12Resource *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_resource_GetDevice(ID3D12Resource *iface, REFIID iid, void **device) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&resource->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(resource->device, iid, device); } static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT sub_resource, @@ -1419,8 +1416,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 return hr; } - resource->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(resource->device = device); return S_OK; } @@ -1627,8 +1623,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, return hr; } - object->device = d3d12_device; - ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); + d3d12_device_add_ref(object->device = d3d12_device); TRACE("Created resource %p.\n", object); @@ -2953,7 +2948,7 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea vkd3d_free(heap); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -2998,14 +2993,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorH return name ? S_OK : E_INVALIDARG; } -static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetDevice(ID3D12DescriptorHeap *iface, - REFIID riid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetDevice(ID3D12DescriptorHeap *iface, REFIID iid, void **device) { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&heap->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(heap->device, iid, device); } static D3D12_DESCRIPTOR_HEAP_DESC * STDMETHODCALLTYPE d3d12_descriptor_heap_GetDesc(ID3D12DescriptorHeap *iface, @@ -3075,8 +3069,7 @@ static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descript if (FAILED(hr = vkd3d_private_store_init(&descriptor_heap->private_store))) return hr; - descriptor_heap->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(descriptor_heap->device = device); return S_OK; } @@ -3088,7 +3081,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, struct d3d12_descriptor_heap *object; HRESULT hr; - if (!(descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, desc->Type))) + if (!(descriptor_size = d3d12_device_get_descriptor_handle_increment_size(device, desc->Type))) { WARN("No descriptor size for descriptor type %#x.\n", desc->Type); return E_INVALIDARG; @@ -3183,7 +3176,7 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) vkd3d_free(heap); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -3229,14 +3222,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetName(ID3D12QueryHeap *iface VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT, name); } -static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetDevice(ID3D12QueryHeap *iface, - REFIID iid, void **device) +static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetDevice(ID3D12QueryHeap *iface, REFIID iid, void **device) { struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&heap->device->ID3D12Device_iface, iid, device); + return d3d12_device_query_interface(heap->device, iid, device); } static const struct ID3D12QueryHeapVtbl d3d12_query_heap_vtbl = @@ -3345,7 +3337,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return hresult_from_vk_result(vr); } - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(device); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index eb2626d1aef1..514fdc3a74f2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -118,7 +118,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature vkd3d_private_store_destroy(&root_signature->private_store); d3d12_root_signature_cleanup(root_signature, device); vkd3d_free(root_signature); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -164,13 +164,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetName(ID3D12RootSignatur } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_GetDevice(ID3D12RootSignature *iface, - REFIID riid, void **device) + REFIID iid, void **device) { struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&root_signature->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(root_signature->device, iid, device); } static const struct ID3D12RootSignatureVtbl d3d12_root_signature_vtbl = @@ -982,8 +982,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) goto fail; - root_signature->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(root_signature->device = device); return S_OK; @@ -1331,7 +1330,7 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState vkd3d_free(state); - ID3D12Device_Release(&device->ID3D12Device_iface); + d3d12_device_release(device); } return refcount; @@ -1383,13 +1382,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineStat } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetDevice(ID3D12PipelineState *iface, - REFIID riid, void **device) + REFIID iid, void **device) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + TRACE("iface %p, iid %s, device %p.\n", iface, debugstr_guid(iid), device); - return ID3D12Device_QueryInterface(&state->device->ID3D12Device_iface, riid, device); + return d3d12_device_query_interface(state->device, iid, device); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetCachedBlob(ID3D12PipelineState *iface, @@ -1646,8 +1645,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st } state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; - state->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(state->device = device); return S_OK; } @@ -2550,8 +2548,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; - state->device = device; - ID3D12Device_AddRef(&device->ID3D12Device_iface); + d3d12_device_add_ref(state->device = device); return S_OK; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2d31cacc101e..e01e00503081 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1036,6 +1036,27 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; +static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object) +{ + return ID3D12Device_QueryInterface(&device->ID3D12Device_iface, iid, object); +} + +static inline ULONG d3d12_device_add_ref(struct d3d12_device *device) +{ + return ID3D12Device_AddRef(&device->ID3D12Device_iface); +} + +static inline ULONG d3d12_device_release(struct d3d12_device *device) +{ + return ID3D12Device_Release(&device->ID3D12Device_iface); +} + +static inline unsigned int d3d12_device_get_descriptor_handle_increment_size(struct d3d12_device *device, + D3D12_DESCRIPTOR_HEAP_TYPE descriptor_type) +{ + return ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, descriptor_type); +} + /* utils */ struct vkd3d_format { -- 2.21.0

2 1

[PATCH vkd3d 5/5] tests: Add tests for loading stencil values from textures.
by Józef Kucia 07 Jun '19

07 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> With plane slice and component mapping. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 04ee7be99fff..3c1eec59857e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18858,6 +18858,187 @@ static void test_depth_read_only_view(void) destroy_test_context(&context); } +static void test_stencil_load(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D12_ROOT_PARAMETER root_parameters[1]; + ID3D12GraphicsCommandList *command_list; + ID3D12PipelineState *pipeline_state; + struct depth_stencil_resource ds; + struct test_context_desc desc; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + struct uvec4 uvec4 = {0}; + ID3D12Resource *texture; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD cs_code[] = + { +#if 0 + Texture2D<uint4> t; + RWTexture2D<uint4> u; + + [numthreads(1, 1, 1)] + void main(uint2 id : SV_GroupID) + { + u[id] = t[id]; + } +#endif + 0x43425844, 0x0b41fa64, 0xd64df766, 0xc4c98283, 0xb810dc2b, 0x00000001, 0x00000110, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000bc, 0x00050050, 0x0000002f, 0x0100086a, + 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x0400189c, 0x0011e000, 0x00000000, 0x00004444, + 0x0200005f, 0x00021032, 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x04000036, 0x00100032, 0x00000000, 0x00021046, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x060000a4, 0x0011e0f2, 0x00000000, + 0x00021546, 0x00100e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + Texture2D<uint4> t; + + uint4 main(float4 position : SV_Position) : SV_Target + { + return t[int2(position.x, position.y)]; + } +#endif + 0x43425844, 0x9ad18dbc, 0x98de0e54, 0xe3c15d5b, 0xac8b580a, 0x00000001, 0x00000138, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0100086a, 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001b, + 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static unsigned int tests[] = {0, 50, 75, 100, 150, 200, 255}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 0; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[1].NumDescriptors = 1; + descriptor_ranges[1].BaseShaderRegister = 0; + descriptor_ranges[1].RegisterSpace = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 2; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_code, sizeof(cs_code))); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); + + init_depth_stencil(&ds, device, context.render_target_desc.Width, + context.render_target_desc.Height, 1, 1, DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, NULL); + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_X24_TYPELESS_G8_UINT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Shader4ComponentMapping = D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING( + D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1, + D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1, + D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1, + D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1); + srv_desc.Texture2D.MipLevels = 1; + srv_desc.Texture2D.PlaneSlice = 1; + ID3D12Device_CreateShaderResourceView(device, ds.texture, &srv_desc, + get_cpu_descriptor_handle(&context, heap, 0)); + + texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R32G32B32A32_UINT, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12Device_CreateUnorderedAccessView(device, texture, NULL, NULL, + get_cpu_descriptor_handle(&context, heap, 1)); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + vkd3d_test_set_context("Test %u", i); + + uvec4.x = uvec4.y = uvec4.z = uvec4.w = tests[i]; + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_STENCIL, 0.0f, tests[i], 0, NULL); + transition_sub_resource_state(command_list, ds.texture, 0, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 32, 32, 1); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uvec4); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, texture, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uvec4(texture, 0, queue, command_list, &uvec4); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_sub_resource_state(command_list, texture, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + transition_sub_resource_state(command_list, ds.texture, 0, + D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + } + vkd3d_test_set_context(NULL); + + destroy_depth_stencil(&ds); + ID3D12Resource_Release(texture); + ID3D12DescriptorHeap_Release(heap); + ID3D12PipelineState_Release(pipeline_state); + destroy_test_context(&context); +} + static void test_typed_buffer_uav(void) { D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle; @@ -29843,6 +30024,7 @@ START_TEST(d3d12) run_test(test_depth_stencil_sampling); run_test(test_depth_load); run_test(test_depth_read_only_view); + run_test(test_stencil_load); run_test(test_typed_buffer_uav); run_test(test_typed_uav_store); run_test(test_compute_shader_registers); -- 2.21.0

2 1

[PATCH vkd3d 4/5] vkd3d: Fix debug_d3d12_shader_component_mapping().
by Józef Kucia 07 Jun '19

07 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ea468b37d37d..4483a8d456f7 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -409,10 +409,10 @@ static const char *debug_d3d12_shader_component(D3D12_SHADER_COMPONENT_MAPPING c const char *debug_d3d12_shader_component_mapping(unsigned int mapping) { return vkd3d_dbg_sprintf("{%s, %s, %s, %s}", - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 0)), - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 1)), - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 2)), - debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 3))); + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(0, mapping)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(1, mapping)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(2, mapping)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(3, mapping))); } const char *debug_vk_extent_3d(VkExtent3D extent) -- 2.21.0

2 1

[PATCH vkd3d 1/5] vkd3d: Introduce vkd3d_physical_device_info.
by Józef Kucia 07 Jun '19

07 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Simplifies passing around Vulkan physical device properties and features. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 507 +++++++++++++++++++++----------------------- 1 file changed, 247 insertions(+), 260 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a9610ffbfb4a..870b88af8282 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -92,20 +92,6 @@ struct vk_struct struct vk_struct *pNext; }; -#define vk_find_struct(c, t) vk_find_struct_(c, VK_STRUCTURE_TYPE_##t) -static void *vk_find_struct_(struct vk_struct *chain, VkStructureType sType) -{ - while (chain) - { - if (chain->sType == sType) - return chain; - - chain = chain->pNext; - } - - return NULL; -} - static uint32_t vkd3d_get_vk_version(void) { const char *ptr = PACKAGE_VERSION; @@ -676,6 +662,82 @@ VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) return instance->vk_instance; } +struct vkd3d_physical_device_info +{ + /* properties */ + VkPhysicalDeviceDescriptorIndexingPropertiesEXT descriptor_indexing_properties; + VkPhysicalDeviceMaintenance3Properties maintenance3_properties; + VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; + VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; + + VkPhysicalDeviceProperties2KHR properties2; + + /* features */ + VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; + VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; + VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; + + VkPhysicalDeviceFeatures2 features2; +}; + +static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *info, struct d3d12_device *device) +{ + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing_properties; + VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; + VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; + VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; + VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; + VkPhysicalDeviceMaintenance3Properties *maintenance3_properties; + VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb_properties; + VkPhysicalDevice physical_device = device->vk_physical_device; + VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + + memset(info, 0, sizeof(*info)); + depth_clip_features = &info->depth_clip_features; + descriptor_indexing_features = &info->descriptor_indexing_features; + descriptor_indexing_properties = &info->descriptor_indexing_properties; + maintenance3_properties = &info->maintenance3_properties; + vertex_divisor_features = &info->vertex_divisor_features; + vertex_divisor_properties = &info->vertex_divisor_properties; + xfb_features = &info->xfb_features; + xfb_properties = &info->xfb_properties; + + depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; + descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; + descriptor_indexing_features->pNext = depth_clip_features; + xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; + xfb_features->pNext = descriptor_indexing_features; + vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; + vertex_divisor_features->pNext = xfb_features; + + info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; + info->features2.pNext = vertex_divisor_features; + + if (vulkan_info->KHR_get_physical_device_properties2) + VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); + else + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &info->features2.features)); + + maintenance3_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES; + descriptor_indexing_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT; + descriptor_indexing_properties->pNext = maintenance3_properties; + xfb_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT; + xfb_properties->pNext = descriptor_indexing_properties; + vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; + vertex_divisor_properties->pNext = xfb_properties; + + info->properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + info->properties2.pNext = vertex_divisor_properties; + + if (vulkan_info->KHR_get_physical_device_properties2) + VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); + else + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &info->properties2.properties)); +} + static void vkd3d_trace_physical_device_properties(const VkPhysicalDeviceProperties *properties) { const uint32_t driver_version = properties->driverVersion; @@ -691,7 +753,7 @@ static void vkd3d_trace_physical_device_properties(const VkPhysicalDevicePropert } static void vkd3d_trace_physical_device(VkPhysicalDevice device, - const VkPhysicalDeviceProperties *vk_device_properties, + const struct vkd3d_physical_device_info *info, const struct vkd3d_vk_instance_procs *vk_procs) { VkPhysicalDeviceMemoryProperties memory_properties; @@ -699,7 +761,7 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, unsigned int i, j; uint32_t count; - vkd3d_trace_physical_device_properties(vk_device_properties); + vkd3d_trace_physical_device_properties(&info->properties2.properties); VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(device, &count, NULL)); TRACE("Queue families [%u]:\n", count); @@ -733,11 +795,11 @@ static void vkd3d_trace_physical_device(VkPhysicalDevice device, } } -static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2KHR *properties2) +static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_device_info *info) { const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *divisor_properties; + const VkPhysicalDeviceLimits *limits = &info->properties2.properties.limits; const VkPhysicalDeviceDescriptorIndexingPropertiesEXT *descriptor_indexing; - const VkPhysicalDeviceLimits *limits = &properties2->properties.limits; const VkPhysicalDeviceMaintenance3Properties *maintenance3; const VkPhysicalDeviceTransformFeedbackPropertiesEXT *xfb; @@ -858,102 +920,89 @@ static void vkd3d_trace_physical_device_limits(const VkPhysicalDeviceProperties2 TRACE(" optimalBufferCopyRowPitchAlignment: %#"PRIx64".\n", limits->optimalBufferCopyRowPitchAlignment); TRACE(" nonCoherentAtomSize: %#"PRIx64".\n", limits->nonCoherentAtomSize); - descriptor_indexing = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT); - if (descriptor_indexing) - { - TRACE(" VkPhysicalDeviceDescriptorIndexingPropertiesEXT:\n"); - - TRACE(" maxUpdateAfterBindDescriptorsInAllPools: %u.\n", - descriptor_indexing->maxUpdateAfterBindDescriptorsInAllPools); - - TRACE(" shaderUniformBufferArrayNonUniformIndexingNative: %#x.\n", - descriptor_indexing->shaderUniformBufferArrayNonUniformIndexingNative); - TRACE(" shaderSampledImageArrayNonUniformIndexingNative: %#x.\n", - descriptor_indexing->shaderSampledImageArrayNonUniformIndexingNative); - TRACE(" shaderStorageBufferArrayNonUniformIndexingNative: %#x.\n", - descriptor_indexing->shaderStorageBufferArrayNonUniformIndexingNative); - TRACE(" shaderStorageImageArrayNonUniformIndexingNative: %#x.\n", - descriptor_indexing->shaderStorageImageArrayNonUniformIndexingNative); - TRACE(" shaderInputAttachmentArrayNonUniformIndexingNative: %#x.\n", - descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexingNative); - - TRACE(" robustBufferAccessUpdateAfterBind: %#x.\n", - descriptor_indexing->robustBufferAccessUpdateAfterBind); - TRACE(" quadDivergentImplicitLod: %#x.\n", - descriptor_indexing->quadDivergentImplicitLod); - - TRACE(" maxPerStageDescriptorUpdateAfterBindSamplers: %u.\n", - descriptor_indexing->maxPerStageDescriptorUpdateAfterBindSamplers); - TRACE(" maxPerStageDescriptorUpdateAfterBindUniformBuffers: %u.\n", - descriptor_indexing->maxPerStageDescriptorUpdateAfterBindUniformBuffers); - TRACE(" maxPerStageDescriptorUpdateAfterBindStorageBuffers: %u.\n", - descriptor_indexing->maxPerStageDescriptorUpdateAfterBindStorageBuffers); - TRACE(" maxPerStageDescriptorUpdateAfterBindSampledImages: %u.\n", - descriptor_indexing->maxPerStageDescriptorUpdateAfterBindSampledImages); - TRACE(" maxPerStageDescriptorUpdateAfterBindStorageImages: %u.\n", - descriptor_indexing->maxPerStageDescriptorUpdateAfterBindStorageImages); - TRACE(" maxPerStageDescriptorUpdateAfterBindInputAttachments: %u.\n", - descriptor_indexing->maxPerStageDescriptorUpdateAfterBindInputAttachments); - TRACE(" maxPerStageUpdateAfterBindResources: %u.\n", - descriptor_indexing->maxPerStageUpdateAfterBindResources); - - TRACE(" maxDescriptorSetUpdateAfterBindSamplers: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindSamplers); - TRACE(" maxDescriptorSetUpdateAfterBindUniformBuffers: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindUniformBuffers); - TRACE(" maxDescriptorSetUpdateAfterBindUniformBuffersDynamic: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindUniformBuffersDynamic); - TRACE(" maxDescriptorSetUpdateAfterBindStorageBuffers: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindStorageBuffers); - TRACE(" maxDescriptorSetUpdateAfterBindStorageBuffersDynamic: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic); - TRACE(" maxDescriptorSetUpdateAfterBindSampledImages: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindSampledImages); - TRACE(" maxDescriptorSetUpdateAfterBindStorageImages: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindStorageImages); - TRACE(" maxDescriptorSetUpdateAfterBindInputAttachments: %u.\n", - descriptor_indexing->maxDescriptorSetUpdateAfterBindInputAttachments); - } - - maintenance3 = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES); - if (maintenance3) - { - TRACE(" VkPhysicalDeviceMaintenance3Properties:\n"); - TRACE(" maxPerSetDescriptors: %u.\n", maintenance3->maxPerSetDescriptors); - TRACE(" maxMemoryAllocationSize: %#"PRIx64".\n", maintenance3->maxMemoryAllocationSize); - } - - xfb = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT); - if (xfb) - { - TRACE(" VkPhysicalDeviceTransformFeedbackPropertiesEXT:\n"); - TRACE(" maxTransformFeedbackStreams: %u.\n", xfb->maxTransformFeedbackStreams); - TRACE(" maxTransformFeedbackBuffers: %u.\n", xfb->maxTransformFeedbackBuffers); - TRACE(" maxTransformFeedbackBufferSize: %#"PRIx64".\n", xfb->maxTransformFeedbackBufferSize); - TRACE(" maxTransformFeedbackStreamDataSize: %u.\n", xfb->maxTransformFeedbackStreamDataSize); - TRACE(" maxTransformFeedbackBufferDataSize: %u.\n", xfb->maxTransformFeedbackBufferDataSize); - TRACE(" maxTransformFeedbackBufferDataStride: %u.\n", xfb->maxTransformFeedbackBufferDataStride); - TRACE(" transformFeedbackQueries: %#x.\n", xfb->transformFeedbackQueries); - TRACE(" transformFeedbackStreamsLinesTriangles: %#x.\n", xfb->transformFeedbackStreamsLinesTriangles); - TRACE(" transformFeedbackRasterizationStreamSelect: %#x.\n", xfb->transformFeedbackRasterizationStreamSelect); - TRACE(" transformFeedbackDraw: %x.\n", xfb->transformFeedbackDraw); - } - - divisor_properties - = vk_find_struct(properties2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT); - if (divisor_properties) - { - TRACE(" VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT:\n"); - TRACE(" maxVertexAttribDivisor: %u.\n", divisor_properties->maxVertexAttribDivisor); - } -} - -static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2KHR *features2) + descriptor_indexing = &info->descriptor_indexing_properties; + TRACE(" VkPhysicalDeviceDescriptorIndexingPropertiesEXT:\n"); + + TRACE(" maxUpdateAfterBindDescriptorsInAllPools: %u.\n", + descriptor_indexing->maxUpdateAfterBindDescriptorsInAllPools); + + TRACE(" shaderUniformBufferArrayNonUniformIndexingNative: %#x.\n", + descriptor_indexing->shaderUniformBufferArrayNonUniformIndexingNative); + TRACE(" shaderSampledImageArrayNonUniformIndexingNative: %#x.\n", + descriptor_indexing->shaderSampledImageArrayNonUniformIndexingNative); + TRACE(" shaderStorageBufferArrayNonUniformIndexingNative: %#x.\n", + descriptor_indexing->shaderStorageBufferArrayNonUniformIndexingNative); + TRACE(" shaderStorageImageArrayNonUniformIndexingNative: %#x.\n", + descriptor_indexing->shaderStorageImageArrayNonUniformIndexingNative); + TRACE(" shaderInputAttachmentArrayNonUniformIndexingNative: %#x.\n", + descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexingNative); + + TRACE(" robustBufferAccessUpdateAfterBind: %#x.\n", + descriptor_indexing->robustBufferAccessUpdateAfterBind); + TRACE(" quadDivergentImplicitLod: %#x.\n", + descriptor_indexing->quadDivergentImplicitLod); + + TRACE(" maxPerStageDescriptorUpdateAfterBindSamplers: %u.\n", + descriptor_indexing->maxPerStageDescriptorUpdateAfterBindSamplers); + TRACE(" maxPerStageDescriptorUpdateAfterBindUniformBuffers: %u.\n", + descriptor_indexing->maxPerStageDescriptorUpdateAfterBindUniformBuffers); + TRACE(" maxPerStageDescriptorUpdateAfterBindStorageBuffers: %u.\n", + descriptor_indexing->maxPerStageDescriptorUpdateAfterBindStorageBuffers); + TRACE(" maxPerStageDescriptorUpdateAfterBindSampledImages: %u.\n", + descriptor_indexing->maxPerStageDescriptorUpdateAfterBindSampledImages); + TRACE(" maxPerStageDescriptorUpdateAfterBindStorageImages: %u.\n", + descriptor_indexing->maxPerStageDescriptorUpdateAfterBindStorageImages); + TRACE(" maxPerStageDescriptorUpdateAfterBindInputAttachments: %u.\n", + descriptor_indexing->maxPerStageDescriptorUpdateAfterBindInputAttachments); + TRACE(" maxPerStageUpdateAfterBindResources: %u.\n", + descriptor_indexing->maxPerStageUpdateAfterBindResources); + + TRACE(" maxDescriptorSetUpdateAfterBindSamplers: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindSamplers); + TRACE(" maxDescriptorSetUpdateAfterBindUniformBuffers: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindUniformBuffers); + TRACE(" maxDescriptorSetUpdateAfterBindUniformBuffersDynamic: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindUniformBuffersDynamic); + TRACE(" maxDescriptorSetUpdateAfterBindStorageBuffers: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindStorageBuffers); + TRACE(" maxDescriptorSetUpdateAfterBindStorageBuffersDynamic: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic); + TRACE(" maxDescriptorSetUpdateAfterBindSampledImages: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindSampledImages); + TRACE(" maxDescriptorSetUpdateAfterBindStorageImages: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindStorageImages); + TRACE(" maxDescriptorSetUpdateAfterBindInputAttachments: %u.\n", + descriptor_indexing->maxDescriptorSetUpdateAfterBindInputAttachments); + + maintenance3 = &info->maintenance3_properties; + TRACE(" VkPhysicalDeviceMaintenance3Properties:\n"); + TRACE(" maxPerSetDescriptors: %u.\n", maintenance3->maxPerSetDescriptors); + TRACE(" maxMemoryAllocationSize: %#"PRIx64".\n", maintenance3->maxMemoryAllocationSize); + + xfb = &info->xfb_properties; + TRACE(" VkPhysicalDeviceTransformFeedbackPropertiesEXT:\n"); + TRACE(" maxTransformFeedbackStreams: %u.\n", xfb->maxTransformFeedbackStreams); + TRACE(" maxTransformFeedbackBuffers: %u.\n", xfb->maxTransformFeedbackBuffers); + TRACE(" maxTransformFeedbackBufferSize: %#"PRIx64".\n", xfb->maxTransformFeedbackBufferSize); + TRACE(" maxTransformFeedbackStreamDataSize: %u.\n", xfb->maxTransformFeedbackStreamDataSize); + TRACE(" maxTransformFeedbackBufferDataSize: %u.\n", xfb->maxTransformFeedbackBufferDataSize); + TRACE(" maxTransformFeedbackBufferDataStride: %u.\n", xfb->maxTransformFeedbackBufferDataStride); + TRACE(" transformFeedbackQueries: %#x.\n", xfb->transformFeedbackQueries); + TRACE(" transformFeedbackStreamsLinesTriangles: %#x.\n", xfb->transformFeedbackStreamsLinesTriangles); + TRACE(" transformFeedbackRasterizationStreamSelect: %#x.\n", xfb->transformFeedbackRasterizationStreamSelect); + TRACE(" transformFeedbackDraw: %x.\n", xfb->transformFeedbackDraw); + + divisor_properties = &info->vertex_divisor_properties; + TRACE(" VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT:\n"); + TRACE(" maxVertexAttribDivisor: %u.\n", divisor_properties->maxVertexAttribDivisor); +} + +static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; - const VkPhysicalDeviceFeatures *features = &features2->features; + const VkPhysicalDeviceFeatures *features = &info->features2.features; const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; TRACE("Device features:\n"); @@ -1013,80 +1062,68 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 TRACE(" variableMultisampleRate: %#x.\n", features->variableMultisampleRate); TRACE(" inheritedQueries: %#x.\n", features->inheritedQueries); - descriptor_indexing = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT); - if (descriptor_indexing) - { - TRACE(" VkPhysicalDeviceDescriptorIndexingFeaturesEXT:\n"); - - TRACE(" shaderInputAttachmentArrayDynamicIndexing: %#x.\n", - descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing); - TRACE(" shaderUniformTexelBufferArrayDynamicIndexing: %#x.\n", - descriptor_indexing->shaderUniformTexelBufferArrayDynamicIndexing); - TRACE(" shaderStorageTexelBufferArrayDynamicIndexing: %#x.\n", - descriptor_indexing->shaderStorageTexelBufferArrayDynamicIndexing); - - TRACE(" shaderUniformBufferArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderUniformBufferArrayNonUniformIndexing); - TRACE(" shaderSampledImageArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderSampledImageArrayNonUniformIndexing); - TRACE(" shaderStorageBufferArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderStorageBufferArrayNonUniformIndexing); - TRACE(" shaderStorageImageArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderStorageImageArrayNonUniformIndexing); - TRACE(" shaderInputAttachmentArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexing); - TRACE(" shaderUniformTexelBufferArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderUniformTexelBufferArrayNonUniformIndexing); - TRACE(" shaderStorageTexelBufferArrayNonUniformIndexing: %#x.\n", - descriptor_indexing->shaderStorageTexelBufferArrayNonUniformIndexing); - - TRACE(" descriptorBindingUniformBufferUpdateAfterBind: %#x.\n", - descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind); - TRACE(" descriptorBindingSampledImageUpdateAfterBind: %#x.\n", - descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind); - TRACE(" descriptorBindingStorageImageUpdateAfterBind: %#x.\n", - descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind); - TRACE(" descriptorBindingStorageBufferUpdateAfterBind: %#x.\n", - descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind); - TRACE(" descriptorBindingUniformTexelBufferUpdateAfterBind: %#x.\n", - descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind); - TRACE(" descriptorBindingStorageTexelBufferUpdateAfterBind: %#x.\n", - descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind); - - TRACE(" descriptorBindingUpdateUnusedWhilePending: %#x.\n", - descriptor_indexing->descriptorBindingUpdateUnusedWhilePending); - TRACE(" descriptorBindingPartiallyBound: %#x.\n", - descriptor_indexing->descriptorBindingPartiallyBound); - TRACE(" descriptorBindingVariableDescriptorCount: %#x.\n", - descriptor_indexing->descriptorBindingVariableDescriptorCount); - TRACE(" runtimeDescriptorArray: %#x.\n", - descriptor_indexing->runtimeDescriptorArray); - } - - depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); - if (depth_clip_features) - { - TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); - TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); - } - - xfb = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT); - if (xfb) - { - TRACE(" VkPhysicalDeviceTransformFeedbackFeaturesEXT:\n"); - TRACE(" transformFeedback: %#x.\n", xfb->transformFeedback); - TRACE(" geometryStreams: %#x.\n", xfb->geometryStreams); - } - - divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); - if (divisor_features) - { - TRACE(" VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT:\n"); - TRACE(" vertexAttributeInstanceRateDivisor: %#x.\n", - divisor_features->vertexAttributeInstanceRateDivisor); - TRACE(" vertexAttributeInstanceRateZeroDivisor: %#x.\n", - divisor_features->vertexAttributeInstanceRateZeroDivisor); - } + descriptor_indexing = &info->descriptor_indexing_features; + TRACE(" VkPhysicalDeviceDescriptorIndexingFeaturesEXT:\n"); + + TRACE(" shaderInputAttachmentArrayDynamicIndexing: %#x.\n", + descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing); + TRACE(" shaderUniformTexelBufferArrayDynamicIndexing: %#x.\n", + descriptor_indexing->shaderUniformTexelBufferArrayDynamicIndexing); + TRACE(" shaderStorageTexelBufferArrayDynamicIndexing: %#x.\n", + descriptor_indexing->shaderStorageTexelBufferArrayDynamicIndexing); + + TRACE(" shaderUniformBufferArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderUniformBufferArrayNonUniformIndexing); + TRACE(" shaderSampledImageArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderSampledImageArrayNonUniformIndexing); + TRACE(" shaderStorageBufferArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderStorageBufferArrayNonUniformIndexing); + TRACE(" shaderStorageImageArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderStorageImageArrayNonUniformIndexing); + TRACE(" shaderInputAttachmentArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderInputAttachmentArrayNonUniformIndexing); + TRACE(" shaderUniformTexelBufferArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderUniformTexelBufferArrayNonUniformIndexing); + TRACE(" shaderStorageTexelBufferArrayNonUniformIndexing: %#x.\n", + descriptor_indexing->shaderStorageTexelBufferArrayNonUniformIndexing); + + TRACE(" descriptorBindingUniformBufferUpdateAfterBind: %#x.\n", + descriptor_indexing->descriptorBindingUniformBufferUpdateAfterBind); + TRACE(" descriptorBindingSampledImageUpdateAfterBind: %#x.\n", + descriptor_indexing->descriptorBindingSampledImageUpdateAfterBind); + TRACE(" descriptorBindingStorageImageUpdateAfterBind: %#x.\n", + descriptor_indexing->descriptorBindingStorageImageUpdateAfterBind); + TRACE(" descriptorBindingStorageBufferUpdateAfterBind: %#x.\n", + descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind); + TRACE(" descriptorBindingUniformTexelBufferUpdateAfterBind: %#x.\n", + descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind); + TRACE(" descriptorBindingStorageTexelBufferUpdateAfterBind: %#x.\n", + descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind); + + TRACE(" descriptorBindingUpdateUnusedWhilePending: %#x.\n", + descriptor_indexing->descriptorBindingUpdateUnusedWhilePending); + TRACE(" descriptorBindingPartiallyBound: %#x.\n", + descriptor_indexing->descriptorBindingPartiallyBound); + TRACE(" descriptorBindingVariableDescriptorCount: %#x.\n", + descriptor_indexing->descriptorBindingVariableDescriptorCount); + TRACE(" runtimeDescriptorArray: %#x.\n", + descriptor_indexing->runtimeDescriptorArray); + + depth_clip_features = &info->depth_clip_features; + TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); + TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); + + xfb = &info->xfb_features; + TRACE(" VkPhysicalDeviceTransformFeedbackFeaturesEXT:\n"); + TRACE(" transformFeedback: %#x.\n", xfb->transformFeedback); + TRACE(" geometryStreams: %#x.\n", xfb->geometryStreams); + + divisor_features = &info->vertex_divisor_features; + TRACE(" VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT:\n"); + TRACE(" vertexAttributeInstanceRateDivisor: %#x.\n", + divisor_features->vertexAttributeInstanceRateDivisor); + TRACE(" vertexAttributeInstanceRateZeroDivisor: %#x.\n", + divisor_features->vertexAttributeInstanceRateZeroDivisor); } static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, @@ -1181,63 +1218,40 @@ static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, } static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, - const struct vkd3d_device_create_info *create_info, VkPhysicalDeviceFeatures2KHR *features2, + const struct vkd3d_device_create_info *create_info, + struct vkd3d_physical_device_info *physical_device_info, uint32_t *device_extension_count, bool **user_extension_supported) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; - VkPhysicalDeviceDescriptorIndexingPropertiesEXT descriptor_indexing_properties; - VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; - const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const struct vkd3d_optional_device_extensions_info *optional_extensions; - const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; - VkPhysicalDeviceMaintenance3Properties maintenance3_properties; - VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDevice physical_device = device->vk_physical_device; - VkPhysicalDeviceFeatures *features = &features2->features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; - VkPhysicalDeviceProperties2KHR device_properties2; VkExtensionProperties *vk_extensions; + VkPhysicalDeviceFeatures *features; uint32_t count; VkResult vr; *device_extension_count = 0; - memset(&maintenance3_properties, 0, sizeof(maintenance3_properties)); - maintenance3_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES; - memset(&descriptor_indexing_properties, 0, sizeof(descriptor_indexing_properties)); - descriptor_indexing_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT; - descriptor_indexing_properties.pNext = &maintenance3_properties; - memset(&xfb_properties, 0, sizeof(xfb_properties)); - xfb_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT; - xfb_properties.pNext = &descriptor_indexing_properties; - memset(&vertex_divisor_properties, 0, sizeof(vertex_divisor_properties)); - vertex_divisor_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; - vertex_divisor_properties.pNext = &xfb_properties; - device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - device_properties2.pNext = &vertex_divisor_properties; - - if (vulkan_info->KHR_get_physical_device_properties2) - VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &device_properties2)); - else - VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &device_properties2.properties)); + vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); + vkd3d_trace_physical_device_features(physical_device_info); + vkd3d_trace_physical_device_limits(physical_device_info); - vkd3d_trace_physical_device(physical_device, &device_properties2.properties, vk_procs); - vkd3d_trace_physical_device_features(features2); - vkd3d_trace_physical_device_limits(&device_properties2); + features = &physical_device_info->features2.features; if (!features->sparseResidencyBuffer || !features->sparseResidencyImage2D) { features->sparseResidencyBuffer = VK_FALSE; features->sparseResidencyImage2D = VK_FALSE; - device_properties2.properties.sparseProperties.residencyNonResidentStrict = VK_FALSE; + physical_device_info->properties2.properties.sparseProperties.residencyNonResidentStrict = VK_FALSE; } - vulkan_info->device_limits = device_properties2.properties.limits; - vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; - vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; - vulkan_info->transform_feedback_queries = xfb_properties.transformFeedbackQueries; - vulkan_info->max_vertex_attrib_divisor = max(vertex_divisor_properties.maxVertexAttribDivisor, 1); + vulkan_info->device_limits = physical_device_info->properties2.properties.limits; + vulkan_info->sparse_properties = physical_device_info->properties2.properties.sparseProperties; + vulkan_info->rasterization_stream = physical_device_info->xfb_properties.transformFeedbackRasterizationStreamSelect; + vulkan_info->transform_feedback_queries = physical_device_info->xfb_properties.transformFeedbackQueries; + vulkan_info->max_vertex_attrib_divisor = max(physical_device_info->vertex_divisor_properties.maxVertexAttribDivisor, 1); device->feature_options.DoublePrecisionFloatShaderOps = features->shaderFloat64; device->feature_options.OutputMergerLogicOp = features->logicOp; @@ -1281,8 +1295,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = FALSE; device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, - &count, NULL))) < 0) + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); return hresult_from_vk_result(vr); @@ -1294,8 +1307,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, return E_OUTOFMEMORY; TRACE("Enumerating %u device extensions.\n", count); - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, - &count, vk_extensions))) < 0) + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, vk_extensions))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); vkd3d_free(vk_extensions); @@ -1325,16 +1337,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); - depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); - if (depth_clip_features) - { - vulkan_info->EXT_depth_clip_enable = depth_clip_features->depthClipEnable; - } + vulkan_info->EXT_depth_clip_enable = physical_device_info->depth_clip_features.depthClipEnable; - divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); - if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3 - && divisor_features) + if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) { + const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; + divisor_features = &physical_device_info->vertex_divisor_features; if (!divisor_features->vertexAttributeInstanceRateDivisor) vulkan_info->EXT_vertex_attribute_divisor = false; vulkan_info->vertex_attrib_zero_divisor = divisor_features->vertexAttributeInstanceRateZeroDivisor; @@ -1358,7 +1366,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, /* Disable unused Vulkan features. */ features->shaderTessellationAndGeometryPointSize = VK_FALSE; - descriptor_indexing = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT); + descriptor_indexing = &physical_device_info->descriptor_indexing_features; if (descriptor_indexing) { descriptor_indexing->shaderInputAttachmentArrayDynamicIndexing = VK_FALSE; @@ -1375,7 +1383,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, || descriptor_indexing->descriptorBindingStorageBufferUpdateAfterBind || descriptor_indexing->descriptorBindingUniformTexelBufferUpdateAfterBind || descriptor_indexing->descriptorBindingStorageTexelBufferUpdateAfterBind) - && !descriptor_indexing_properties.robustBufferAccessUpdateAfterBind) + && !physical_device_info->descriptor_indexing_properties.robustBufferAccessUpdateAfterBind) { WARN("Disabling robust buffer access for the update after bind feature.\n"); features->robustBufferAccess = VK_FALSE; @@ -1621,15 +1629,10 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; - VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; - VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; const struct vkd3d_optional_device_extensions_info *optional_extensions; - VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; - VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; - struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + struct vkd3d_physical_device_info physical_device_info; struct vkd3d_device_queue_info device_queue_info; bool *user_extension_supported = NULL; - VkPhysicalDeviceFeatures2 features2; VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; unsigned int device_index; @@ -1661,25 +1664,9 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); - memset(&depth_clip_features, 0, sizeof(depth_clip_features)); - depth_clip_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; - memset(&descriptor_indexing_features, 0, sizeof(descriptor_indexing_features)); - descriptor_indexing_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; - descriptor_indexing_features.pNext = &depth_clip_features; - memset(&xfb_features, 0, sizeof(xfb_features)); - xfb_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; - xfb_features.pNext = &descriptor_indexing_features; - memset(&vertex_divisor_features, 0, sizeof(vertex_divisor_features)); - vertex_divisor_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; - vertex_divisor_features.pNext = &xfb_features; - features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; - features2.pNext = &vertex_divisor_features; - if (vulkan_info->KHR_get_physical_device_properties2) - VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &features2)); - else - VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2.features)); + vkd3d_physical_device_info_init(&physical_device_info, device); - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &features2, + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &physical_device_info, &extension_count, &user_extension_supported))) return hr; @@ -1693,7 +1680,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - device_info.pNext = &vertex_divisor_features; + device_info.pNext = physical_device_info.features2.pNext; device_info.flags = 0; device_info.queueCreateInfoCount = device_queue_info.vk_family_count; device_info.pQueueCreateInfos = device_queue_info.vk_queue_create_info; @@ -1707,7 +1694,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, optional_extensions ? optional_extensions->extension_count : 0, user_extension_supported, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; - device_info.pEnabledFeatures = &features2.features; + device_info.pEnabledFeatures = &physical_device_info.features2.features; vkd3d_free(user_extension_supported); vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); -- 2.21.0

2 1

[PATCH vkd3d 2/5] include: Add ID3D12Device1.
by Józef Kucia 07 Jun '19

07 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec78c6652109..2b395aa1bb4e 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1639,6 +1639,23 @@ typedef struct D3D12_SUBRESOURCE_DATA LONG_PTR SlicePitch; } D3D12_SUBRESOURCE_DATA; +typedef enum D3D12_MULTIPLE_FENCE_WAIT_FLAGS +{ + D3D12_MULTIPLE_FENCE_WAIT_FLAG_NONE = 0x0, + D3D12_MULTIPLE_FENCE_WAIT_FLAG_ANY = 0x1, + D3D12_MULTIPLE_FENCE_WAIT_FLAG_ALL = 0x0, +} D3D12_MULTIPLE_FENCE_WAIT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_MULTIPLE_FENCE_WAIT_FLAGS);") + +typedef enum D3D12_RESIDENCY_PRIORITY +{ + D3D12_RESIDENCY_PRIORITY_MINIMUM = 0x28000000, + D3D12_RESIDENCY_PRIORITY_LOW = 0x50000000, + D3D12_RESIDENCY_PRIORITY_NORMAL = 0x78000000, + D3D12_RESIDENCY_PRIORITY_HIGH = 0xa0010000, + D3D12_RESIDENCY_PRIORITY_MAXIMUM = 0xc8000000, +} D3D12_RESIDENCY_PRIORITY; + [ uuid(c4fec28f-7966-4e95-9f94-f431cb56c3b8), object, @@ -2284,6 +2301,23 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } +[ + uuid(77acce80-638e-4e65-8895-c1f23386863e), + object, + local, + pointer_default(unique) +] +interface ID3D12Device1 : ID3D12Device +{ + HRESULT CreatePipelineLibrary(const void *blob, SIZE_T blob_size, REFIID iid, void **lib); + + HRESULT SetEventOnMultipleFenceCompletion(ID3D12Fence * const *fences, + const UINT64 *values, UINT fence_count, D3D12_MULTIPLE_FENCE_WAIT_FLAGS flags, HANDLE event); + + HRESULT SetResidencyPriority(UINT object_count, ID3D12Pageable * const *objects, + const D3D12_RESIDENCY_PRIORITY *priorities); +} + [ uuid(344488b7-6846-474b-b989-f027448245e0), object, -- 2.21.0

2 1

[PATCH 1/5] mf: Raise sample request events for sample grabber stream.
by Nikolay Sivov 07 Jun '19

07 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 3f9644432d..23bfa06fce 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -613,6 +613,11 @@ static struct scheduled_sample *stream_get_next_sample(struct sample_grabber_str return sample; } +static void sample_grabber_stream_request_sample(struct sample_grabber_stream *stream) +{ + IMFStreamSink_QueueEvent(&stream->IMFStreamSink_iface, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); +} + static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); @@ -634,6 +639,7 @@ static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallba if (FAILED(hr = stream_schedule_sample(stream, sample))) WARN("Failed to schedule a sample, hr %#x.\n", hr); } + sample_grabber_stream_request_sample(stream); } LeaveCriticalSection(&stream->cs); @@ -950,6 +956,7 @@ static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_s MEStreamSinkStarted, /* SINK_STATE_RUNNING */ }; BOOL set_state = FALSE; + unsigned int i; EnterCriticalSection(&grabber->cs); @@ -970,6 +977,12 @@ static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_s if (set_state) { grabber->stream->state = state; + if (state == SINK_STATE_RUNNING) + { + /* Every transition to running state sends a bunch requests to build up initial queue. */ + for (i = 0; i < 4; ++i) + sample_grabber_stream_request_sample(grabber->stream); + } IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); } } -- 2.20.1

2 5

[PATCH 5/5] wined3d: Upload texture data through the texture ops in wined3d_cs_exec_blt_sub_resource().
by Henri Verbeet 07 Jun '19

07 Jun '19

Since we want to avoid directly calling GL-specific code here. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/texture.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e1f94f45eed..a95ba502f32 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2242,10 +2242,10 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, &row_pitch, &slice_pitch); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); - wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, - dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), - row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&addr), + dst_texture->resource.format, &op->src_box, row_pitch, slice_pitch, dst_texture, + op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, + op->dst_box.left, op->dst_box.top, op->dst_box.front); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dc60d874bd6..6e1cc047502 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2453,9 +2453,39 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in } } +static void wined3d_texture_gl_upload_data(struct wined3d_context *context, + const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format, + const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch, + struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) +{ + BOOL srgb = FALSE; + + TRACE("context %p, src_bo_addr %s, src_format %s, src_box %s, src_row_pitch %u, src_slice_pitch %u, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_x %u, dst_y %u, dst_z %u.\n", + context, debug_const_bo_address(src_bo_addr), debug_d3dformat(src_format->id), debug_box(src_box), + src_row_pitch, src_slice_pitch, dst_texture, dst_sub_resource_idx, + wined3d_debug_location(dst_location), dst_x, dst_y, dst_z); + + if (dst_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (dst_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(dst_location)); + return; + } + + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), srgb); + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_format, + src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); +} + static const struct wined3d_texture_ops texture2d_ops = { texture2d_load_location, + wined3d_texture_gl_upload_data, }; struct wined3d_texture * __cdecl wined3d_texture_from_resource(struct wined3d_resource *resource) @@ -2829,6 +2859,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture1d_ops = { texture1d_load_location, + wined3d_texture_gl_upload_data, }; static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -3244,6 +3275,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in static const struct wined3d_texture_ops texture3d_ops = { texture3d_load_location, + wined3d_texture_gl_upload_data, }; HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 42140831a0a..70a3c630039 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3382,6 +3382,10 @@ struct wined3d_texture_ops { BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); + void (*texture_upload_data)(struct wined3d_context *context, const struct wined3d_const_bo_address *src_bo_addr, + const struct wined3d_format *src_format, const struct wined3d_box *src_box, unsigned int src_row_pitch, + unsigned int src_slice_pitch, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); }; #define WINED3D_TEXTURE_COND_NP2 0x00000001 -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_copy_bo_address().
by Henri Verbeet 07 Jun '19

07 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context.c | 13 ++++++------- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8dc6d4b6a1b..9fcd96b864a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1218,7 +1218,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - context_copy_bo_address(context, &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, + wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), + &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); context_release(context); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 18a516c606e..933bf13fefc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2634,15 +2634,14 @@ void context_unmap_bo_address(struct wined3d_context *context, checkGLcall("Unmap buffer object"); } -void context_copy_bo_address(struct wined3d_context *context, +void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *dst_ptr, *src_ptr; - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (dst->buffer_object && src->buffer_object) { @@ -2656,13 +2655,13 @@ void context_copy_bo_address(struct wined3d_context *context, } else { - src_ptr = context_map_bo_address(context, src, size, src_binding, WINED3D_MAP_READ); - dst_ptr = context_map_bo_address(context, dst, size, dst_binding, WINED3D_MAP_WRITE); + src_ptr = context_map_bo_address(&context_gl->c, src, size, src_binding, WINED3D_MAP_READ); + dst_ptr = context_map_bo_address(&context_gl->c, dst, size, dst_binding, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); - context_unmap_bo_address(context, dst, dst_binding); - context_unmap_bo_address(context, src, src_binding); + context_unmap_bo_address(&context_gl->c, dst, dst_binding); + context_unmap_bo_address(&context_gl->c, src, src_binding); } } else if (!dst->buffer_object && src->buffer_object) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4456a10a36b..bd32b88e0eb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1096,6 +1096,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_bo_address dst, src; DWORD dst_location; @@ -1108,7 +1109,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = view_gl->counter_bo; src.addr = NULL; - context_copy_bo_address(context, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, + wined3d_context_gl_copy_bo_address(context_gl, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 94623580109..42140831a0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2086,6 +2086,9 @@ void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *con void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; +void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *dst, GLenum dst_binding, + const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; @@ -2239,9 +2242,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_copy_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *dst, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_bind_dummy_textures().
by Henri Verbeet 07 Jun '19

07 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1f187f34769..18a516c606e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1759,10 +1759,10 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_context *context) +void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) { - const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context_gl->c.device)->dummy_textures; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int i; for (i = 0; i < gl_info->limits.combined_samplers; ++i) @@ -2279,7 +2279,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (wined3d_device_gl(device)->dummy_textures.tex_2d) - context_bind_dummy_textures(context); + wined3d_context_gl_bind_dummy_textures(context_gl); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ec4022dce6..3acaee6e70b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -803,7 +803,7 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de checkGLcall("create dummy textures"); - context_bind_dummy_textures(&context_gl->c); + wined3d_context_gl_bind_dummy_textures(context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6402ec13357..94623580109 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2082,6 +2082,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; +void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; @@ -2238,7 +2239,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_bind_bo().
by Henri Verbeet 07 Jun '19

07 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/context.c | 21 ++++++++++++--------- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1069d050813..8dc6d4b6a1b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,7 +135,9 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 87445706b32..1f187f34769 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2514,12 +2514,12 @@ void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, context_gl->active_texture = unit; } -void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) +void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (binding == GL_ELEMENT_ARRAY_BUFFER) - context_invalidate_state(context, STATE_INDEXBUFFER); + context_invalidate_state(&context_gl->c, STATE_INDEXBUFFER); GL_EXTCALL(glBindBuffer(binding, name)); } @@ -2591,6 +2591,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *memory; @@ -2598,7 +2599,7 @@ void *context_map_bo_address(struct wined3d_context *context, return data->addr; gl_info = context->gl_info; - context_bind_bo(context, binding, data->buffer_object); + wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -2611,7 +2612,7 @@ void *context_map_bo_address(struct wined3d_context *context, memory += (INT_PTR)data->addr; } - context_bind_bo(context, binding, 0); + wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Map buffer object"); return memory; @@ -2620,15 +2621,16 @@ void *context_map_bo_address(struct wined3d_context *context, void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; gl_info = context->gl_info; - context_bind_bo(context, binding, data->buffer_object); + wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); - context_bind_bo(context, binding, 0); + wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Unmap buffer object"); } @@ -2636,6 +2638,7 @@ void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *dst_ptr, *src_ptr; @@ -2664,13 +2667,13 @@ void context_copy_bo_address(struct wined3d_context *context, } else if (!dst->buffer_object && src->buffer_object) { - context_bind_bo(context, src_binding, src->buffer_object); + wined3d_context_gl_bind_bo(context_gl, src_binding, src->buffer_object); GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); } else if (dst->buffer_object && !src->buffer_object) { - context_bind_bo(context, dst_binding, dst->buffer_object); + wined3d_context_gl_bind_bo(context_gl, dst_binding, dst->buffer_object); GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b43dcddcdf2..4456a10a36b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1034,6 +1034,7 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format_gl *format; struct wined3d_buffer_gl *buffer_gl; @@ -1067,7 +1068,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4471e7c2634..6402ec13357 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2081,6 +2081,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; @@ -2237,7 +2238,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Move the "tid" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 07 Jun '19

07 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e562844194..87445706b32 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1917,7 +1917,6 @@ static void wined3d_context_init(struct wined3d_context *context, struct wined3d context->swapchain = swapchain; context->current_rt.texture = swapchain->front_buffer; context->current_rt.sub_resource_idx = 0; - context->tid = GetCurrentThreadId(); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) @@ -1956,6 +1955,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info = context->gl_info; d3d_info = context->d3d_info; + context_gl->tid = GetCurrentThreadId(); context_gl->window = context->swapchain->win_handle; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { @@ -2324,7 +2324,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) device_context_remove(device, &context_gl->c); - if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + if (context_gl->c.current && context_gl->tid != GetCurrentThreadId()) { struct wined3d_gl_info *gl_info; @@ -4264,7 +4264,7 @@ struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_g struct wined3d_context *acquired_context; struct wined3d_device *device; - if (!context_gl || context_gl->c.tid != GetCurrentThreadId()) + if (!context_gl || context_gl->tid != GetCurrentThreadId()) return NULL; device = context_gl->c.device; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c18f7304d94..dd9ec123c20 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1126,7 +1126,7 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai for (i = 0; i < swapchain->num_contexts; ++i) { - if (swapchain->context[i]->tid == tid) + if (wined3d_context_gl(swapchain->context[i])->tid == tid) return swapchain->context[i]; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8272a56203b..4471e7c2634 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1900,7 +1900,6 @@ struct wined3d_context struct wined3d_texture *texture; unsigned int sub_resource_idx; } current_rt; - DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ @@ -1967,6 +1966,8 @@ struct wined3d_context_gl { struct wined3d_context c; + DWORD tid; /* Thread ID which owns this context at the moment. */ + uint32_t dc_is_private : 1; uint32_t dc_has_format : 1; /* Only meaningful for private DCs. */ uint32_t fog_enabled : 1; -- 2.11.0

1 0

[PATCH 1/2] user32: Do not call SendMessage() to show a window that is already visible.
by Alexey Prokhin 07 Jun '19

07 Jun '19

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- dlls/user32/winpos.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..8e09455e99 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1231,6 +1231,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; + if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return TRUE; + return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } -- 2.17.2 (Apple Git-113)

3 6

[PATCH v2] dinput: Trace reference count in a consistent way
by Alistair Leslie-Hughes 07 Jun '19

07 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 6 ++++-- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/effect_linuxinput.c | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c9d24a9174..28329d03b5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1140,7 +1140,7 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) releasing from %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (ref) return ref; @@ -1215,7 +1215,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A ifa ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c02bafad10..0855cb41cd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -528,7 +528,7 @@ static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedIncrement(&This->ref); - TRACE( "(%p) incrementing from %d\n", This, ref - 1); + TRACE( "(%p) ref %d\n", This, ref ); return ref; } @@ -543,7 +543,7 @@ static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "(%p) releasing from %d\n", This, ref + 1 ); + TRACE( "(%p) ref %d\n", This, ref ); if (ref == 0) { diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7477bc757d..4b2f317ce3 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -167,7 +167,9 @@ static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - return InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } static HRESULT WINAPI LinuxInputEffectImpl_Download( @@ -759,6 +761,8 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE( "(%p) ref %d\n", This, ref ); + if (ref == 0) { LinuxInputEffectImpl_Stop(iface); -- 2.17.1

1 0

[PATCH] dinput: Trace reference count in a consistent way
by Alistair Leslie-Hughes 07 Jun '19

07 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 4 +++- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/effect_linuxinput.c | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c9d24a9174..0c75a6ec36 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1215,7 +1215,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A ifa ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c02bafad10..0855cb41cd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -528,7 +528,7 @@ static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedIncrement(&This->ref); - TRACE( "(%p) incrementing from %d\n", This, ref - 1); + TRACE( "(%p) ref %d\n", This, ref ); return ref; } @@ -543,7 +543,7 @@ static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "(%p) releasing from %d\n", This, ref + 1 ); + TRACE( "(%p) ref %d\n", This, ref ); if (ref == 0) { diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7477bc757d..4b2f317ce3 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -167,7 +167,9 @@ static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - return InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } static HRESULT WINAPI LinuxInputEffectImpl_Download( @@ -759,6 +761,8 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE( "(%p) ref %d\n", This, ref ); + if (ref == 0) { LinuxInputEffectImpl_Stop(iface); -- 2.17.1

2 1

[PATCH] dinput: Return correct value in IDirectInputDevice2 Release
by Alistair Leslie-Hughes 07 Jun '19

07 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ade79474f6..c9d24a9174 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1168,7 +1168,7 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) HeapFree(GetProcessHeap(), 0, This); - return DI_OK; + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) -- 2.17.1

1 0

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 07 Jun '19

07 Jun '19

1 0

[PATCH 1/6] strmbase: Add a cached implementation of IDispatch and use it in IBasicVideo.
by Zebediah Figura 07 Jun '19

07 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/dispatch.c | 49 +++++++++++++++++++++++++++++++ dlls/strmbase/video.c | 63 +++++++++++++++++++++++----------------- include/wine/strmbase.h | 14 ++++++++- 3 files changed, 98 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index e91b65a94a..1521471889 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -20,6 +20,55 @@ #include "strmbase_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static ITypeLib *control_typelib; +static ITypeInfo *control_typeinfo[last_tid]; + +static REFIID control_tid_id[] = +{ + &IID_IBasicAudio, + &IID_IBasicVideo, + &IID_IMediaControl, + &IID_IMediaEvent, + &IID_IMediaPosition, + &IID_IVideoWindow, +}; + +HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) +{ + HRESULT hr; + + if (!control_typelib) + { + ITypeLib *typelib; + + hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &typelib); + if (FAILED(hr)) + { + ERR("Failed to load typelib, hr %#x.\n", hr); + return hr; + } + if (InterlockedCompareExchangePointer((void **)&control_typelib, typelib, NULL)) + ITypeLib_Release(typelib); + } + if (!control_typeinfo[tid]) + { + ITypeInfo *typeinfo; + + hr = ITypeLib_GetTypeInfoOfGuid(control_typelib, control_tid_id[tid], &typeinfo); + if (FAILED(hr)) + { + ERR("Failed to get type info for %s, hr %#x.\n", debugstr_guid(control_tid_id[tid]), hr); + return hr; + } + if (InterlockedCompareExchangePointer((void **)(control_typeinfo + tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + ITypeInfo_AddRef(*ret = control_typeinfo[tid]); + return S_OK; +} + HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { ITypeLib *pTypeLib; diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 2857932a05..440adc43a8 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -35,14 +35,12 @@ HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBas pControlVideo->pPin = pPin; pControlVideo->pFuncsTable = pFuncsTable; - BaseDispatch_Init(&pControlVideo->baseDispatch, &IID_IBasicVideo); - return S_OK; } HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) { - return BaseDispatch_Destroy(&pControlVideo->baseDispatch); + return S_OK; } static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) @@ -72,40 +70,51 @@ static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *count) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo); } -HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); -} - -HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) -{ - BaseControlVideo *This = impl_from_IBasicVideo(iface); - ITypeInfo *pTypeInfo; + ITypeInfo *typeinfo; HRESULT hr; - hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); - if (SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicVideo_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - ITypeInfo_Release(pTypeInfo); - } + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } + return hr; +} + +HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 56560ed02b..0cbb7c3b78 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -399,6 +399,19 @@ RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); +enum strmbase_type_id +{ + IBasicAudio_tid, + IBasicVideo_tid, + IMediaControl_tid, + IMediaEvent_tid, + IMediaPosition_tid, + IVideoWindow_tid, + last_tid +}; + +HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); + typedef struct{ ITypeInfo *pTypeInfo; } BaseDispatch; @@ -473,7 +486,6 @@ HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *C typedef struct tagBaseControlVideo { IBasicVideo IBasicVideo_iface; - BaseDispatch baseDispatch; BaseFilter* pFilter; CRITICAL_SECTION* pInterfaceLock; -- 2.20.1

2 6

[PATCH 3/3] dbghelp: Use internal flag for loading native files.
by Alistair Leslie-Hughes 06 Jun '19

06 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/dbghelp_private.h | 3 --- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/symbol.c | 4 ++-- programs/winedbg/info.c | 6 +++--- programs/winedbg/symbol.c | 20 ++++++++++---------- programs/winedbg/tgt_module.c | 7 +++++-- programs/winedbg/winedbg.c | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9e76d2dd4b..d083102432 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -116,9 +116,6 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; -/* some more Wine extensions */ -#define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000 - enum location_kind {loc_error, /* reg is the error code */ loc_unavailable, /* location is not available */ loc_absolute, /* offset is the location */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index d9d8417e84..fe8ed35108 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -832,7 +832,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, for (module = pcs->lmodules; module; module = module->next) { - if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && + if (!dbghelp_opt_native && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; if (!EnumModulesCallback(module->modulename, diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index f59e322fef..25169043b6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1062,7 +1062,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, } /* not found in PE modules, retry on the ELF ones */ - if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES)) + if (!pair.requested && dbghelp_opt_native) { for (pair.requested = pair.pcs->lmodules; pair.requested; pair.requested = pair.requested->next) { @@ -1393,7 +1393,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) } /* not found in PE modules, retry on the ELF ones */ - if (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) + if (dbghelp_opt_native) { for (module = pcs->lmodules; module; module = module->next) { diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 72c57a29b4..bf5ba4f6e3 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -214,7 +214,7 @@ void info_win32_module(DWORD64 base) { struct info_modules im; UINT i, j, num_printed = 0; - DWORD opt; + BOOL opt; if (!dbg_curr_process) { @@ -228,9 +228,9 @@ void info_win32_module(DWORD64 base) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index aa88ffcbc7..372ae76c33 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -366,7 +366,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, struct sgv_data sgv; int i; char buffer[512]; - DWORD opt; + BOOL opt; IMAGEHLP_STACK_FRAME ihsf; if (strlen(name) + 4 > sizeof(buffer)) @@ -394,7 +394,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); if (!sgv.num) @@ -419,7 +419,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); } } - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); /* now grab local symbols */ if (stack_get_current_frame(&ihsf) && sgv.num < NUMDBGV) @@ -655,10 +655,10 @@ BOOL symbol_get_line(const char* filename, const char* name, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); return FALSE; } @@ -668,11 +668,11 @@ BOOL symbol_get_line(const char* filename, const char* name, strcpy(&buffer[3], name); if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); return FALSE; } } - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); for (i = 0; i < sgv.num; i++) { @@ -795,7 +795,7 @@ static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) void symbol_info(const char* str) { char buffer[512]; - DWORD opt; + BOOL opt; if (strlen(str) + 3 >= sizeof(buffer)) { @@ -808,7 +808,7 @@ void symbol_info(const char* str) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, symbols_info_cb, NULL); - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); } diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 58c4282689..2fdebc94ed 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -45,13 +45,15 @@ static BOOL tgt_process_module_write(HANDLE hProcess, void* addr, enum dbg_start tgt_module_load(const char* name, BOOL keep) { DWORD opts = SymGetOptions(); + BOOL native; HANDLE hDummy = (HANDLE)0x87654321; enum dbg_start ret = start_ok; WCHAR* nameW; unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | - SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS); + native = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); @@ -76,7 +78,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { dbg_printf("Non supported mode... errors may occur\n" "Use at your own risks\n"); - SymSetOptions(SymGetOptions() | 0x40000000); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy); dbg_curr_pid = 1; dbg_curr_thread = dbg_add_thread(dbg_curr_process, 2, NULL, NULL); @@ -87,6 +89,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { SymCleanup(hDummy); SymSetOptions(opts); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, native); } return ret; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5aeaa0d4a2..92d248c918 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -436,7 +436,7 @@ static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) { struct mod_loader_info mli; - DWORD opt; + BOOL opt; /* this will resynchronize builtin dbghelp's internal ELF module list */ SymLoadModule(hProcess, 0, 0, 0, 0, 0); @@ -447,9 +447,9 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumerateModules64(hProcess, mod_loader_cb, &mli); - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); return imh_mod->BaseOfImage != 0; } -- 2.17.1

1 0

[PATCH 2/3] dbghelp: SymSet/GetExtendedOption support a WINE only option
by Alistair Leslie-Hughes 06 Jun '19

06 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/dbghelp.c | 25 ++++++++++++++++++++++--- dlls/dbghelp/dbghelp_private.h | 2 ++ include/dbghelp.h | 6 +++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 5a0d10d4bd..a5e6beb4a7 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -65,6 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); */ unsigned dbghelp_options = SYMOPT_UNDNAME; +BOOL dbghelp_opt_native = FALSE; static struct process* process_first /* = NULL */; @@ -457,8 +458,19 @@ DWORD WINAPI SymGetOptions(void) */ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) { - FIXME("%d, %d\n", option, value); - return FALSE; + BOOL old = FALSE; + + switch(option) + { + case SYMOPT_EX_WINE_NATIVE_MODULES: + old = dbghelp_opt_native; + dbghelp_opt_native = value; + break; + default: + FIXME("Unsupported option %d with value %d\n", option, value); + } + + return old; } /****************************************************************** @@ -467,7 +479,14 @@ BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) */ BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) { - FIXME("%d\n", option); + switch(option) + { + case SYMOPT_EX_WINE_NATIVE_MODULES: + return dbghelp_opt_native; + default: + FIXME("Unsupported option %d\n", option); + } + return FALSE; } diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 8083408c66..9e76d2dd4b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -114,6 +114,8 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; +extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; + /* some more Wine extensions */ #define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000 diff --git a/include/dbghelp.h b/include/dbghelp.h index a319385b4a..1b23489919 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1427,7 +1427,11 @@ typedef struct _IMAGE_DEBUG_INFORMATION typedef enum { SYMOPT_EX_DISABLEACCESSTIMEUPDATE, - SYMOPT_EX_MAX + SYMOPT_EX_MAX, + +#ifdef __WINESRC__ + SYMOPT_EX_WINE_NATIVE_MODULES = 1000, +#endif } IMAGEHLP_EXTENDED_OPTIONS; PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); -- 2.17.1

1 0

[PATCH 1/3] dbghelp: Add SymGetExtendedOption/SymSetExtendedOption stubs
by Alistair Leslie-Hughes 06 Jun '19

06 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/dbghelp.c | 20 ++++++++++++++++++++ dlls/dbghelp/dbghelp.spec | 2 ++ include/dbghelp.h | 8 ++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index ed4d5f4321..5a0d10d4bd 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -451,6 +451,26 @@ DWORD WINAPI SymGetOptions(void) return dbghelp_options; } +/****************************************************************** + * SymSetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) +{ + FIXME("%d, %d\n", option, value); + return FALSE; +} + +/****************************************************************** + * SymGetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) +{ + FIXME("%d\n", option); + return FALSE; +} + /****************************************************************** * SymSetParentWindow (DBGHELP.@) * diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 3655f8ca95..4c06f87d12 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -83,6 +83,7 @@ @ stub SymGetFileLineOffsets64 @ stub SymGetHomeDirectory @ stub SymGetHomeDirectoryW +@ stdcall SymGetExtendedOption(long) @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stdcall SymGetLineFromAddr64(long int64 ptr ptr) @ stdcall SymGetLineFromAddrW64(long int64 ptr ptr) @@ -153,6 +154,7 @@ @ stdcall SymSearch(long int64 long long str int64 ptr ptr long) @ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) +@ stdcall SymSetExtendedOption(long long) @ stdcall SymSetHomeDirectory(long str) @ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) diff --git a/include/dbghelp.h b/include/dbghelp.h index df105a8c5e..a319385b4a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1424,6 +1424,11 @@ typedef struct _IMAGE_DEBUG_INFORMATION DWORD Reserved[ 2 ]; } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; +typedef enum +{ + SYMOPT_EX_DISABLEACCESSTIMEUPDATE, + SYMOPT_EX_MAX +} IMAGEHLP_EXTENDED_OPTIONS; PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); @@ -1432,6 +1437,9 @@ BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); DWORD WINAPI SymGetOptions(void); DWORD WINAPI SymSetOptions(DWORD); +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option); +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); + BOOL WINAPI SymSetParentWindow(HWND); /************************* -- 2.17.1

1 0

Release 4.10
by Alexandre Julliard 06 Jun '19

06 Jun '19

Folks, I'll be out tomorrow (Friday), so release 4.10 will be a little delayed. I'm planning to release it on Monday. -- Alexandre Julliard julliard(a)winehq.org

1 0

Wine and mingw-w64 cooperation
by Jacek Caban 06 Jun '19

06 Jun '19

Hi all, [I'm addressing it to both mingw-w64-public and wine-devel] As most of you know, Wine and mingw-w64 have a lot in common and cooperate to some extend for quite a while. There have been talks about tightening this relationship for years. Recent Wine move to using PE files for its builds led us to revisit those ideas. My feeling so far is that there is an agreement among people I heard from that it's a good direction for both projects to have mingw-w64 under an umbrella of the Wine project. It would be great to move forward with this. Let me discuss a few aspects of the idea. - Infrastructure mingw-w64 currently mostly depends heavily on SourceForge. While I'm thankful to SF for years of free support, it's doesn't feel like an optimal choice those days. Wine has its own infrastructure that mingw-w64 could use right away. Moving things like mailing list, bug tracker, etc. is straightforward to do, except for one thing... how should it be called? Which brings us to the next item. - mingw-w64 name There have been talks about rebranding mingw-w64 for a long time (longer than I am in joined the project). While it's a good name for a branch, an established project that is no longer related to mingw.org could have a better branding. Kai mentioned that ironcrate was considered as some point, but to my knowledge no action was taken at that time. Alexandre offered lately that Wine brand could be used for mingw-w64 as well. I personally like the idea. Wine is already well recognised brand and brings roughly right associations. So... how about WineSDK? - Source code sharing Technically, we could share much more code than we currently do. Duplicating efforts is quite suboptimal for everyone. Right now mingw-w64 imports a number of platform headers and widl tool from Wine via wine-import.sh script. Wine has a few headers imported from mingw-w64 as well. It works to some extend, but the fact is that we still duplicate more than we share. I'm not yet sure how to fix that entirely, but I'd like us to have a workflow that would limit the duplication. - Testing Wine has a TestBot and a number of test cases, which is a great tool for developers to make sure their patches are right. mingw-w64 does not have such thing and mostly depends on developers doing their own testing and regression reports after the patch is committed. We could integrate mingw-w64 testing with Wine TestBot to make sure that we don't break things (well, at least limit that possibility). I believe that it would nicely accelerate mingw-w64 development workflow as well as ensure that mingw-w64+Wine don't regress. - WineConf The annual Wine conference is a nice chance to meet other contributors in person: https://wiki.winehq.org/WineConf It would be great mingw-w64 developers there as well. Any ideas, comments and thoughts on this topics are welcomed. Thanks, Jacek

9 18

[PATCH v2 1/2] kernel32: Add sxs tests
by Fabian Maurer 06 Jun '19

06 Jun '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2 - Free dlls only once - fail when resource creation fails - better document activation context error on XP --- dlls/kernel32/tests/Makefile.in | 5 + dlls/kernel32/tests/resource.rc | 12 + dlls/kernel32/tests/sxs.c | 312 +++++++++++++++++++++++++ dlls/kernel32/tests/sxs_dll_1.c | 17 ++ dlls/kernel32/tests/sxs_dll_1.manifest | 7 + dlls/kernel32/tests/sxs_dll_1.spec | 1 + dlls/kernel32/tests/sxs_dll_2.c | 17 ++ dlls/kernel32/tests/sxs_dll_2.manifest | 7 + dlls/kernel32/tests/sxs_dll_2.spec | 1 + dlls/kernel32/tests/sxs_exe_1.manifest | 8 + dlls/kernel32/tests/sxs_exe_2.manifest | 8 + 11 files changed, 395 insertions(+) create mode 100644 dlls/kernel32/tests/sxs.c create mode 100644 dlls/kernel32/tests/sxs_dll_1.c create mode 100644 dlls/kernel32/tests/sxs_dll_1.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_1.spec create mode 100644 dlls/kernel32/tests/sxs_dll_2.c create mode 100644 dlls/kernel32/tests/sxs_dll_2.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_2.spec create mode 100644 dlls/kernel32/tests/sxs_exe_1.manifest create mode 100644 dlls/kernel32/tests/sxs_exe_2.manifest diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e06141d9f6..0318cae322 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -29,6 +29,11 @@ SOURCES = \ profile.c \ resource.c \ resource.rc \ + sxs.c \ + sxs_dll_1.c \ + sxs_dll_1.spec \ + sxs_dll_2.c \ + sxs_dll_2.spec \ sync.c \ thread.c \ time.c \ diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index f40a87819e..1512a477aa 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -24,3 +24,15 @@ { MENUITEM "foo", 1 } + +/* @makedep: sxs_exe_1.manifest */ +sxs_exe_1.manifest RCDATA sxs_exe_1.manifest + +/* @makedep: sxs_exe_2.manifest */ +sxs_exe_2.manifest RCDATA sxs_exe_2.manifest + +/* @makedep: sxs_dll_1.manifest */ +sxs_dll_1.manifest RCDATA sxs_dll_1.manifest + +/* @makedep: sxs_dll_2.manifest */ +sxs_dll_2.manifest RCDATA sxs_dll_2.manifest diff --git a/dlls/kernel32/tests/sxs.c b/dlls/kernel32/tests/sxs.c new file mode 100644 index 0000000000..629e3c4991 --- /dev/null +++ b/dlls/kernel32/tests/sxs.c @@ -0,0 +1,312 @@ +/* + * Side by side tests + * + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <winbase.h> +#include <windef.h> +#include "winuser.h" +#include <stdio.h> + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) + { + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)"TESTDLL"); + if (!rsrc) return FALSE; + } + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + sprintf(path_file, "%s%s", path_tmp, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static void get_application_directory(char *buffer, int buffer_size) +{ + char *end; + GetModuleFileNameA(NULL, buffer, buffer_size); + end = strrchr(buffer, '\\'); + end[1] = 0; +} + +typedef struct +{ + char path_tmp[MAX_PATH]; + char path_dll[MAX_PATH]; + char path_manifest_exe[MAX_PATH]; + char path_manifest_dll[MAX_PATH]; + ACTCTXA context; + ULONG_PTR cookie; + HANDLE handle_context; + HMODULE module; + DWORD(WINAPI *test_func)(void); +} sxs_info; + +static BOOL fill_sxs_info(sxs_info *info, const char *temp, const char *path_dll, const char *exe_manifest, const char *dll_manifest) +{ + BOOL success; + + GetTempPathA(MAX_PATH, info->path_tmp); + strcat(info->path_tmp, temp); + strcat(info->path_tmp, "\\"); + CreateDirectoryA(info->path_tmp, NULL); + + success = write_resource_file(info->path_tmp, path_dll, "sxs_dll.dll", info->path_dll); + ok(success, "Failed to create file for testing\n"); + if (!success) + return FALSE; + + success = write_resource_file(info->path_tmp, exe_manifest, exe_manifest, info->path_manifest_exe); + ok(success, "Failed to create file for testing\n"); + if (!success) + return FALSE; + + success = write_resource_file(info->path_tmp, dll_manifest, "sxs_dll.manifest", info->path_manifest_dll); + ok(success, "Failed to create file for testing\n"); + if (!success) + return FALSE; + + info->context.cbSize = sizeof(ACTCTXA); + info->context.lpSource = info->path_manifest_exe; + info->context.lpAssemblyDirectory = info->path_tmp; + info->context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + info->handle_context = CreateActCtxA(&info->context); + ok((info->handle_context != NULL && info->handle_context != INVALID_HANDLE_VALUE ) + || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX), /* XP doesn't support manifests outside of PE files */ + "CreateActCtxA failed: %d\n", GetLastError()); + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + skip("Failed to create activation context.\n"); + return FALSE; + } + + success = ActivateActCtx(info->handle_context, &info->cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + info->module = LoadLibraryA("sxs_dll.dll"); + ok(info->module != NULL, "LoadLibrary failed\n"); + + info->test_func = (void *)GetProcAddress(info->module, "test_func"); + ok(info->test_func != NULL, "GetProcAddress failed\n"); + + DeactivateActCtx(0, info->cookie); + return TRUE; +} + +static void clean_sxs_info(sxs_info *info) +{ + if (info->handle_context) + ReleaseActCtx(info->handle_context); + if (*info->path_dll) + ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + if (*info->path_manifest_exe) + ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + if (*info->path_manifest_dll) + ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + if (*info->path_tmp) + ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); +} + +/* Test loading two sxs dlls at the same time */ +static void test_two_dlls_at_same_time(void) +{ + sxs_info dll_1 = {0}; + sxs_info dll_2 = {0}; + DWORD ret; + + if (!fill_sxs_info(&dll_1, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + if (!fill_sxs_info(&dll_2, "2", "sxs_dll_2.dll", "sxs_exe_2.manifest", "sxs_dll_2.manifest")) + goto cleanup; + + todo_wine + ok(dll_1.module != dll_2.module, "Libraries are the same\n"); + ret = dll_1.test_func(); + ok(ret == 1, "Got %d\n", ret); + ret = dll_2.test_func(); + todo_wine + ok(ret == 2, "Got %d\n", ret); + +cleanup: + if (dll_1.module) + FreeLibrary(dll_1.module); + if (dll_2.module) + FreeLibrary(dll_2.module); + clean_sxs_info(&dll_1); + clean_sxs_info(&dll_2); +} + +/* Test loading a normal dll and then a sxs dll with the same name */ +static void test_one_sxs_and_one_local_1(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + DWORD(WINAPI *test_func)(void); + DWORD ret; + + get_application_directory(path_application, sizeof(path_application)); + + ret = write_resource_file(path_application, "sxs_dll_2.dll", "sxs_dll.dll", path_dll_local); + ok(ret, "Failed to create file for testing\n"); + if (!ret) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + test_func = (void *)GetProcAddress(module, "test_func"); + + if (!fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + + todo_wine + ok(dll.module != module, "Libraries are the same\n"); + ret = dll.test_func(); + todo_wine + ok(ret == 1, "Got %d\n", ret); + ret = test_func(); + ok(ret == 2, "Got %d\n", ret); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +/* Test if sxs dll has priority over normal dll */ +static void test_one_sxs_and_one_local_2(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + DWORD(WINAPI *test_func)(void); + DWORD ret; + + get_application_directory(path_application, sizeof(path_application)); + + ret = write_resource_file(path_application, "sxs_dll_2.dll", "sxs_dll.dll", path_dll_local); + ok (ret, "Failed to create file for testing\n"); + if (!ret) + goto cleanup; + + if (!fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + test_func = (void *)GetProcAddress(module, "test_func"); + + ok(dll.module != module, "Libraries are the same\n"); + ret = dll.test_func(); + ok(ret == 1, "Got %d\n", ret); + ret = test_func(); + ok(ret == 2, "Got %d\n", ret); + +cleanup: + if (module) + FreeLibrary(module); + if (dll.module) + FreeLibrary(dll.module); + if (*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +static void run_sxs_test(int run) +{ + switch(run) + { + case 1: + test_two_dlls_at_same_time(); + break; + case 2: + test_one_sxs_and_one_local_1(); + break; + case 3: + test_one_sxs_and_one_local_2(); + break; + } +} + +static void run_child_process(int run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs( &argv ); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %d", argv[0], argv[1], run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process( pi.hProcess ); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + +START_TEST(sxs) +{ + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + int run = atoi(argv[2]); + run_sxs_test(run); + return; + } + run_child_process(1); + run_child_process(2); + run_child_process(3); +} diff --git a/dlls/kernel32/tests/sxs_dll_1.c b/dlls/kernel32/tests/sxs_dll_1.c new file mode 100644 index 0000000000..908d235059 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.c @@ -0,0 +1,17 @@ +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} + +DWORD WINAPI test_func(void) +{ + return 1; +} diff --git a/dlls/kernel32/tests/sxs_dll_1.manifest b/dlls/kernel32/tests/sxs_dll_1.manifest new file mode 100644 index 0000000000..61e3f4a652 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_1.spec b/dlls/kernel32/tests/sxs_dll_1.spec new file mode 100644 index 0000000000..ebbc584352 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.spec @@ -0,0 +1 @@ +@ stdcall test_func() diff --git a/dlls/kernel32/tests/sxs_dll_2.c b/dlls/kernel32/tests/sxs_dll_2.c new file mode 100644 index 0000000000..262c53a484 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.c @@ -0,0 +1,17 @@ +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} + +DWORD WINAPI test_func(void) +{ + return 2; +} diff --git a/dlls/kernel32/tests/sxs_dll_2.manifest b/dlls/kernel32/tests/sxs_dll_2.manifest new file mode 100644 index 0000000000..37b39bea3b --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="2.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_2.spec b/dlls/kernel32/tests/sxs_dll_2.spec new file mode 100644 index 0000000000..ebbc584352 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.spec @@ -0,0 +1 @@ +@ stdcall test_func() diff --git a/dlls/kernel32/tests/sxs_exe_1.manifest b/dlls/kernel32/tests/sxs_exe_1.manifest new file mode 100644 index 0000000000..633374eca3 --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe_1.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/kernel32/tests/sxs_exe_2.manifest b/dlls/kernel32/tests/sxs_exe_2.manifest new file mode 100644 index 0000000000..f93e497124 --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe_2.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="2.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> -- 2.21.0

3 3

[PATCH 1/5] strmbase: Get rid of BaseRendererImpl_QueryInterface().
by Zebediah Figura 06 Jun '19

06 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 16 ---------------- include/wine/strmbase.h | 1 - 2 files changed, 17 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 6f0bc2dfcd..1017c8c574 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -289,22 +289,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *This, const IBaseFilterVtbl return hr; } -HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, LPVOID * ppv) -{ - BaseRenderer *This = impl_from_IBaseFilter(iface); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->pPosition, riid, ppv); - else if (IsEqualIID(riid, &IID_IQualityControl)) - { - *ppv = &This->qcimpl->IQualityControl_iface; - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - else - return BaseFilterImpl_QueryInterface(iface, riid, ppv); -} - void strmbase_renderer_cleanup(BaseRenderer *filter) { IPin *peer; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 87396fdf58..7ee8be668c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -611,7 +611,6 @@ typedef struct BaseRendererFuncTable { HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; -HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample); HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); -- 2.20.1

2 5

[PATCH 1/5] hidclass.sys: Use PDRIVER_ADD_DEVICE.
by Zebediah Figura 06 Jun '19

06 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hidclass.sys/hid.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index ff2e7eff47..b9bf13579f 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -34,8 +34,6 @@ #define DEFAULT_POLL_INTERVAL 200 #define MAX_POLL_INTERVAL_MSEC 10000 -typedef NTSTATUS (WINAPI *pAddDevice)(DRIVER_OBJECT *DriverObject, DEVICE_OBJECT *PhysicalDeviceObject); - /* Ring buffer functions */ struct ReportRingBuffer; @@ -85,7 +83,7 @@ typedef struct _minidriver PDRIVER_UNLOAD DriverUnload; - pAddDevice AddDevice; + PDRIVER_ADD_DEVICE AddDevice; PDRIVER_DISPATCH PNPDispatch; struct list device_list; } minidriver; -- 2.20.1

1 4

[PATCH] mf: Implement clock-synchronized mode for ProcessSample() in sample grabber sink.
by Nikolay Sivov 06 Jun '19

06 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 228 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 209 insertions(+), 19 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index d19496d7f8..3f9644432d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -25,6 +25,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -36,13 +37,24 @@ enum sink_state struct sample_grabber; +struct scheduled_sample +{ + struct list entry; + IMFSample *sample; +}; + struct sample_grabber_stream { IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; + IMFAsyncCallback timer_callback; LONG refcount; struct sample_grabber *sink; IMFMediaEventQueue *event_queue; + enum sink_state state; + struct list samples; + IUnknown *cancel_key; + CRITICAL_SECTION cs; }; struct sample_grabber @@ -57,8 +69,9 @@ struct sample_grabber struct sample_grabber_stream *stream; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; - enum sink_state state; + IMFTimer *timer; UINT32 ignore_clock; + UINT64 sample_time_offset; CRITICAL_SECTION cs; }; @@ -101,6 +114,11 @@ static struct sample_grabber_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeH return CONTAINING_RECORD(iface, struct sample_grabber_stream, IMFMediaTypeHandler_iface); } +static struct sample_grabber_stream *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber_stream, timer_callback); +} + static HRESULT WINAPI sample_grabber_stream_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); @@ -138,22 +156,41 @@ static ULONG WINAPI sample_grabber_stream_AddRef(IMFStreamSink *iface) return refcount; } +static void stream_release_pending_entry(struct sample_grabber_stream *stream, struct scheduled_sample *sample) +{ + list_remove(&sample->entry); + IMFSample_Release(sample->sample); + heap_free(sample); +} + static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); ULONG refcount = InterlockedDecrement(&stream->refcount); + struct scheduled_sample *sample, *next_sample; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { if (stream->sink) + { IMFMediaSink_Release(&stream->sink->IMFMediaSink_iface); + if (stream->sink->timer && stream->cancel_key) + IMFTimer_CancelTimer(stream->sink->timer, stream->cancel_key); + } + if (stream->cancel_key) + IUnknown_Release(stream->cancel_key); if (stream->event_queue) { IMFMediaEventQueue_Shutdown(stream->event_queue); IMFMediaEventQueue_Release(stream->event_queue); } + LIST_FOR_EACH_ENTRY_SAFE(sample, next_sample, &stream->samples, struct scheduled_sample, entry) + { + stream_release_pending_entry(stream, sample); + } + DeleteCriticalSection(&stream->cs); heap_free(stream); } @@ -284,6 +321,58 @@ static HRESULT sample_grabber_report_sample(struct sample_grabber *grabber, IMFS return hr; } +static HRESULT stream_schedule_sample(struct sample_grabber_stream *stream, struct scheduled_sample *pending) +{ + LONGLONG sampletime; + HRESULT hr; + + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + + if (FAILED(hr = IMFSample_GetSampleTime(pending->sample, &sampletime))) + return hr; + + if (stream->cancel_key) + { + IUnknown_Release(stream->cancel_key); + stream->cancel_key = NULL; + } + + if (FAILED(hr = IMFTimer_SetTimer(stream->sink->timer, 0, sampletime - stream->sink->sample_time_offset, + &stream->timer_callback, NULL, &stream->cancel_key))) + { + stream->cancel_key = NULL; + } + + return hr; +} + +static HRESULT stream_queue_sample(struct sample_grabber_stream *stream, IMFSample *sample) +{ + struct scheduled_sample *pending; + LONGLONG sampletime; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetSampleTime(sample, &sampletime))) + return hr; + + if (!(pending = heap_alloc_zero(sizeof(*pending)))) + return E_OUTOFMEMORY; + + pending->sample = sample; + IMFSample_AddRef(pending->sample); + list_init(&pending->entry); + if (list_empty(&stream->samples)) + hr = stream_schedule_sample(stream, pending); + + if (SUCCEEDED(hr)) + list_add_tail(&stream->samples, &pending->entry); + else + stream_release_pending_entry(stream, pending); + + return hr; +} + static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct sample_grabber_stream *stream = impl_from_IMFStreamSink(iface); @@ -298,9 +387,9 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (!stream->sink) return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&stream->sink->cs); + EnterCriticalSection(&stream->cs); - if (stream->sink->state == SINK_STATE_RUNNING) + if (stream->state == SINK_STATE_RUNNING) { hr = IMFSample_GetSampleTime(sample, &sampletime); @@ -309,11 +398,11 @@ static HRESULT WINAPI sample_grabber_stream_ProcessSample(IMFStreamSink *iface, if (stream->sink->ignore_clock) hr = sample_grabber_report_sample(stream->sink, sample); else - FIXME("Sample scheduling is not implemented.\n"); + hr = stream_queue_sample(stream, sample); } } - LeaveCriticalSection(&stream->sink->cs); + LeaveCriticalSection(&stream->cs); return hr; } @@ -480,6 +569,87 @@ static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = sample_grabber_stream_type_handler_GetMajorType, }; +static HRESULT WINAPI sample_grabber_stream_timer_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, + void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sample_grabber_stream_timer_callback_AddRef(IMFAsyncCallback *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); + return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); +} + +static ULONG WINAPI sample_grabber_stream_timer_callback_Release(IMFAsyncCallback *iface) +{ + struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); + return IMFStreamSink_Release(&stream->IMFStreamSink_iface); +} + +static HRESULT WINAPI sample_grabber_stream_timer_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, + DWORD *queue) +{ + return E_NOTIMPL; +} + +static struct scheduled_sample *stream_get_next_sample(struct sample_grabber_stream *stream) +{ + struct scheduled_sample *sample = NULL; + struct list *e; + + if ((e = list_head(&stream->samples))) + sample = LIST_ENTRY(e, struct scheduled_sample, entry); + + return sample; +} + +static HRESULT WINAPI sample_grabber_stream_timer_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct sample_grabber_stream *stream = impl_from_IMFAsyncCallback(iface); + struct scheduled_sample *sample; + HRESULT hr; + + EnterCriticalSection(&stream->cs); + + /* Report and schedule next. */ + if (stream->sink && (sample = stream_get_next_sample(stream))) + { + if (FAILED(hr = sample_grabber_report_sample(stream->sink, sample->sample))) + WARN("Failed to report a sample, hr %#x.\n", hr); + + stream_release_pending_entry(stream, sample); + + if ((sample = stream_get_next_sample(stream))) + { + if (FAILED(hr = stream_schedule_sample(stream, sample))) + WARN("Failed to schedule a sample, hr %#x.\n", hr); + } + } + + LeaveCriticalSection(&stream->cs); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl sample_grabber_stream_timer_callback_vtbl = +{ + sample_grabber_stream_timer_callback_QueryInterface, + sample_grabber_stream_timer_callback_AddRef, + sample_grabber_stream_timer_callback_Release, + sample_grabber_stream_timer_callback_GetParameters, + sample_grabber_stream_timer_callback_Invoke, +}; + static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct sample_grabber *grabber = impl_from_IMFMediaSink(iface); @@ -539,6 +709,8 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) } if (grabber->clock) IMFPresentationClock_Release(grabber->clock); + if (grabber->timer) + IMFTimer_Release(grabber->timer); DeleteCriticalSection(&grabber->cs); heap_free(grabber); } @@ -661,12 +833,22 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa { IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); IMFPresentationClock_Release(grabber->clock); + if (grabber->timer) + { + IMFTimer_Release(grabber->timer); + grabber->timer = NULL; + } } grabber->clock = clock; if (grabber->clock) { IMFPresentationClock_AddRef(grabber->clock); IMFPresentationClock_AddClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); + if (FAILED(IMFPresentationClock_QueryInterface(grabber->clock, &IID_IMFTimer, (void **)&grabber->timer))) + { + WARN("Failed to get IMFTimer interface.\n"); + grabber->timer = NULL; + } } } @@ -715,7 +897,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(grabber->callback))) { IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); + EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; + LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; } @@ -769,23 +953,25 @@ static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_s EnterCriticalSection(&grabber->cs); - switch (grabber->state) + if (grabber->stream) { - case SINK_STATE_STOPPED: - set_state = state == SINK_STATE_RUNNING; - break; - case SINK_STATE_RUNNING: - set_state = state == SINK_STATE_STOPPED; - break; - default: - ; - } + switch (grabber->stream->state) + { + case SINK_STATE_STOPPED: + set_state = state == SINK_STATE_RUNNING; + break; + case SINK_STATE_RUNNING: + set_state = state == SINK_STATE_STOPPED; + break; + default: + ; + } - if (set_state) - { - grabber->state = state; - if (grabber->stream) + if (set_state) + { + grabber->stream->state = state; IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } } LeaveCriticalSection(&grabber->cs); @@ -929,9 +1115,12 @@ static HRESULT sample_grabber_create_stream(struct sample_grabber *sink, struct object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; + object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; object->refcount = 1; object->sink = sink; IMFMediaSink_AddRef(&object->sink->IMFMediaSink_iface); + list_init(&object->samples); + InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto failed; @@ -972,6 +1161,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); + IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); InitializeCriticalSection(&object->cs); if (FAILED(hr = sample_grabber_create_stream(object, &object->stream))) -- 2.20.1

1 0

[PATCH 5/5] wined3d: Create a blitter for the Vulkan adapter.
by Henri Verbeet 06 Jun '19

06 Jun '19

The CPU blitter isn't the fastest, but it should work. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 00098182c1a..0dc64580702 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -416,12 +416,14 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_device_vk *device_vk; struct wined3d_context *context_vk; HRESULT hr; TRACE("device %p.\n", device); - context_vk = &wined3d_device_vk(device)->context_vk; + device_vk = wined3d_device_vk(device); + context_vk = &device_vk->context_vk; if (FAILED(hr = wined3d_context_vk_init(context_vk, device->swapchains[0]))) { WARN("Failed to initialise context.\n"); @@ -437,6 +439,14 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) TRACE("Initialised context %p.\n", context_vk); + if (!(device_vk->d.blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + device_context_remove(device, context_vk); + wined3d_context_cleanup(context_vk); + return E_FAIL; + } + return WINED3D_OK; } @@ -446,6 +456,8 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); + device->blitter->ops->blitter_destroy(device->blitter, NULL); + context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, context_vk); wined3d_context_cleanup(context_vk); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_reacquire().
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 25 +++---- dlls/wined3d/query.c | 148 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 86 insertions(+), 90 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0f107502f5c..2e562844194 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4259,27 +4259,28 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * return context; } -struct wined3d_context *context_reacquire(struct wined3d_device *device, - struct wined3d_context *context) +struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) { struct wined3d_context *acquired_context; + struct wined3d_device *device; - wined3d_from_cs(device->cs); - - if (!context || context->tid != GetCurrentThreadId()) + if (!context_gl || context_gl->c.tid != GetCurrentThreadId()) return NULL; - if (context->current_rt.texture) + device = context_gl->c.device; + wined3d_from_cs(device->cs); + + if (context_gl->c.current_rt.texture) { - wined3d_context_gl_activate(wined3d_context_gl(context), - context->current_rt.texture, context->current_rt.sub_resource_idx); - return context; + wined3d_context_gl_activate(context_gl, context_gl->c.current_rt.texture, + context_gl->c.current_rt.sub_resource_idx); + return context_gl; } acquired_context = context_acquire(device, NULL, 0); - if (acquired_context != context) - ERR("Acquired context %p instead of %p.\n", acquired_context, context); - return acquired_context; + if (acquired_context != &context_gl->c) + ERR("Acquired context %p instead of %p.\n", acquired_context, &context_gl->c); + return wined3d_context_gl(acquired_context); } void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index eeec8e25098..58e757c855b 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -183,7 +183,7 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * struct wined3d_device *device, DWORD flags) { const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; enum wined3d_fence_result ret; BOOL fence_result; @@ -195,16 +195,16 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * return WINED3D_FENCE_NOT_STARTED; } - if (!(context = context_reacquire(device, &fence->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(fence->context_gl))) { if (!fence->context_gl->c.gl_info->supported[ARB_SYNC]) { WARN("Fence tested from wrong thread.\n"); return WINED3D_FENCE_WRONG_THREAD; } - context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SYNC]) { @@ -253,7 +253,7 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * ret = WINED3D_FENCE_ERROR; } - context_release(context); + context_release(&context_gl->c); return ret; } @@ -261,7 +261,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, struct wined3d_device *device) { const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; enum wined3d_fence_result ret; TRACE("fence %p, device %p.\n", fence, device); @@ -273,7 +273,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, } gl_info = fence->context_gl->c.gl_info; - if (!(context = context_reacquire(device, &fence->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(fence->context_gl))) { /* A glFinish does not reliably wait for draws in other contexts. The caller has * to find its own way to cope with the thread switch @@ -283,9 +283,9 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, WARN("Fence finished from wrong thread.\n"); return WINED3D_FENCE_WRONG_THREAD; } - context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SYNC]) { @@ -310,13 +310,13 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, ret = WINED3D_FENCE_ERROR; } } - else if (context->gl_info->supported[APPLE_FENCE]) + else if (gl_info->supported[APPLE_FENCE]) { GL_EXTCALL(glFinishFenceAPPLE(fence->object.id)); checkGLcall("glFinishFenceAPPLE"); ret = WINED3D_FENCE_OK; } - else if (context->gl_info->supported[NV_FENCE]) + else if (gl_info->supported[NV_FENCE]) { GL_EXTCALL(glFinishFenceNV(fence->object.id)); checkGLcall("glFinishFenceNV"); @@ -328,23 +328,23 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, ret = WINED3D_FENCE_ERROR; } - context_release(context); + context_release(&context_gl->c); return ret; } void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) { - struct wined3d_context *context = NULL; + struct wined3d_context_gl *context_gl = NULL; const struct wined3d_gl_info *gl_info; - if (fence->context_gl && !(context = context_reacquire(device, &fence->context_gl->c)) + if (fence->context_gl && !(context_gl = wined3d_context_gl_reacquire(fence->context_gl)) && !fence->context_gl->c.gl_info->supported[ARB_SYNC]) wined3d_context_gl_free_fence(fence); - if (!context) - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; + if (!context_gl) + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + gl_info = context_gl->c.gl_info; if (!fence->context_gl) - wined3d_context_gl_alloc_fence(wined3d_context_gl(context), fence); + wined3d_context_gl_alloc_fence(context_gl, fence); if (gl_info->supported[ARB_SYNC]) { @@ -365,7 +365,7 @@ void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *dev checkGLcall("glSetFenceNV"); } - context_release(context); + context_release(&context_gl->c); } static void wined3d_fence_free(struct wined3d_fence *fence) @@ -531,20 +531,19 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); - struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &oq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); oq->samples = 1; return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); TRACE("Available %#x.\n", available); @@ -556,7 +555,7 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD } checkGLcall("poll occlusion query"); - context_release(context); + context_release(&context_gl->c); return available; } @@ -631,7 +630,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -642,9 +641,9 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if (oq->started) { - if ((context = context_reacquire(device, &oq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); } @@ -652,23 +651,23 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { FIXME("Wrong thread, can't restart query.\n"); wined3d_context_gl_free_occlusion_query(oq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_occlusion_query(wined3d_context_gl(context), oq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_occlusion_query(context_gl, oq); } } else { if (oq->context_gl) wined3d_context_gl_free_occlusion_query(oq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_occlusion_query(wined3d_context_gl(context), oq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_occlusion_query(context_gl, oq); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); checkGLcall("glBeginQuery()"); - context_release(context); + context_release(&context_gl->c); oq->started = TRUE; } if (flags & WINED3DISSUE_END) @@ -678,14 +677,14 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD * so avoid generating an error. */ if (oq->started) { - if ((context = context_reacquire(device, &oq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(oq->context_gl))) { - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); - wined3d_query_buffer_queue_result(context, query, oq->id); + wined3d_query_buffer_queue_result(&context_gl->c, query, oq->id); - context_release(context); + context_release(&context_gl->c); poll = TRUE; } else @@ -702,21 +701,20 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); - struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; GLuint64 timestamp; GLuint available; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &tq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(tq->context_gl))) { FIXME("%p Wrong thread, returning 1.\n", query); tq->timestamp = 1; return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glGetQueryObjectuiv(tq->id, GL_QUERY_RESULT_AVAILABLE, &available)); checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT_AVAILABLE)"); @@ -730,7 +728,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD tq->timestamp = timestamp; } - context_release(context); + context_release(&context_gl->c); return available; } @@ -781,20 +779,19 @@ static BOOL wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *que static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); - struct wined3d_device *device = query->device; GLuint written_available, generated_available; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &pq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread, returning 0 primitives.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.written, GL_QUERY_RESULT_AVAILABLE, &written_available)); @@ -812,7 +809,7 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW } checkGLcall("poll SO statistics query"); - context_release(context); + context_release(&context_gl->c); return written_available && generated_available; } @@ -840,7 +837,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D struct wined3d_so_statistics_query *pq = wined3d_so_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -849,26 +846,26 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, context); + wined3d_so_statistics_query_end(pq, &context_gl->c); } else { FIXME("Wrong thread, can't restart query.\n"); wined3d_context_gl_free_so_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_so_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_so_statistics_query(context_gl, pq); } } else { if (pq->context_gl) wined3d_context_gl_free_so_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_so_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_so_statistics_query(context_gl, pq); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { @@ -886,18 +883,18 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D } checkGLcall("begin query"); - context_release(context); + context_release(&context_gl->c); pq->started = TRUE; } if (flags & WINED3DISSUE_END) { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, context); + wined3d_so_statistics_query_end(pq, &context_gl->c); - context_release(context); + context_release(&context_gl->c); poll = TRUE; } else @@ -914,21 +911,20 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD flags) { struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); - struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; GLuint available; int i; TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, &pq->context_gl->c))) + if (!(context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { FIXME("%p Wrong thread.\n", query); memset(&pq->statistics, 0, sizeof(pq->statistics)); return TRUE; } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; for (i = 0; i < ARRAY_SIZE(pq->u.id); ++i) { @@ -953,7 +949,7 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f } checkGLcall("poll pipeline statistics query"); - context_release(context); + context_release(&context_gl->c); return available; } @@ -981,7 +977,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD struct wined3d_pipeline_statistics_query *pq = wined3d_pipeline_statistics_query_from_query(query); struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; BOOL poll = FALSE; TRACE("query %p, flags %#x.\n", query, flags); @@ -990,26 +986,26 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, context); + wined3d_pipeline_statistics_query_end(pq, &context_gl->c); } else { FIXME("Wrong thread, can't restart query.\n"); wined3d_context_gl_free_pipeline_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_pipeline_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_pipeline_statistics_query(context_gl, pq); } } else { if (pq->context_gl) wined3d_context_gl_free_pipeline_statistics_query(pq); - context = context_acquire(device, NULL, 0); - wined3d_context_gl_alloc_pipeline_statistics_query(wined3d_context_gl(context), pq); + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + wined3d_context_gl_alloc_pipeline_statistics_query(context_gl, pq); } - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glBeginQuery(GL_VERTICES_SUBMITTED_ARB, pq->u.query.vertices)); GL_EXTCALL(glBeginQuery(GL_PRIMITIVES_SUBMITTED_ARB, pq->u.query.primitives)); @@ -1024,17 +1020,17 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD GL_EXTCALL(glBeginQuery(GL_CLIPPING_OUTPUT_PRIMITIVES_ARB, pq->u.query.clipping_output)); checkGLcall("begin query"); - context_release(context); + context_release(&context_gl->c); pq->started = TRUE; } if (flags & WINED3DISSUE_END) { if (pq->started) { - if ((context = context_reacquire(device, &pq->context_gl->c))) + if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, context); - context_release(context); + wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + context_release(&context_gl->c); poll = TRUE; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 753dc8cb663..8272a56203b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2096,6 +2096,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, @@ -2257,8 +2258,6 @@ void context_invalidate_compute_state(struct wined3d_context *context, DWORD sta void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; -struct wined3d_context *context_reacquire(struct wined3d_device *device, - struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Move the "valid" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++---------------------- dlls/wined3d/cs.c | 10 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 34 +++++++++++++------------- 6 files changed, 53 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb745e2d98e..0f107502f5c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1241,7 +1241,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", context_gl->gl_ctx, context_gl->dc, GetLastError()); - context_gl->c.valid = 0; + context_gl->valid = 0; WARN("Trying fallback to the backup window.\n"); /* FIXME: If the context is destroyed it's no longer associated with @@ -1280,7 +1280,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context return FALSE; } - context_gl->c.valid = 1; + context_gl->valid = 1; } context_gl->needs_set = 0; @@ -1315,12 +1315,12 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ context_gl->dc_is_private = FALSE; context_gl->dc_has_format = FALSE; context_gl->needs_set = 1; - context_gl->c.valid = 1; + context_gl->valid = 1; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { ERR("Failed to get a device context for window %p.\n", context_gl->window); - context_gl->c.valid = 0; + context_gl->valid = 0; } } @@ -1346,10 +1346,10 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (restore_ctx == context_gl->gl_ctx) restore_ctx = NULL; - else if (context_gl->c.valid) + else if (context_gl->valid) wined3d_context_gl_set_gl_context(context_gl); - if (context_gl->c.valid) + if (context_gl->valid) { if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); @@ -1408,7 +1408,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) LIST_FOR_EACH_ENTRY(pipeline_statistics_query, &context_gl->pipeline_statistics_queries, struct wined3d_pipeline_statistics_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(pipeline_statistics_query->u.id), pipeline_statistics_query->u.id)); pipeline_statistics_query->context_gl = NULL; } @@ -1416,21 +1416,21 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) LIST_FOR_EACH_ENTRY(so_statistics_query, &context_gl->so_statistics_queries, struct wined3d_so_statistics_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(so_statistics_query->u.id), so_statistics_query->u.id)); so_statistics_query->context_gl = NULL; } LIST_FOR_EACH_ENTRY(timestamp_query, &context_gl->timestamp_queries, struct wined3d_timestamp_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(1, &timestamp_query->id)); timestamp_query->context_gl = NULL; } LIST_FOR_EACH_ENTRY(fence, &context_gl->fences, struct wined3d_fence, entry) { - if (context_gl->c.valid) + if (context_gl->valid) { if (gl_info->supported[ARB_SYNC]) { @@ -1451,21 +1451,21 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) LIST_FOR_EACH_ENTRY(occlusion_query, &context_gl->occlusion_queries, struct wined3d_occlusion_query, entry) { - if (context_gl->c.valid) + if (context_gl->valid) GL_EXTCALL(glDeleteQueries(1, &occlusion_query->id)); occlusion_query->context_gl = NULL; } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_destroy_list, struct fbo_entry, entry) { - if (!context_gl->c.valid) + if (!context_gl->valid) entry->id = 0; wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_list, struct fbo_entry, entry) { - if (!context_gl->c.valid) + if (!context_gl->valid) entry->id = 0; wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } @@ -1539,7 +1539,7 @@ BOOL context_set_current(struct wined3d_context *ctx) { struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); - if (!ctx->valid) + if (!context_gl->valid) { ERR("Trying to make invalid context %p current\n", ctx); return FALSE; @@ -2129,7 +2129,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context->render_offscreen = wined3d_resource_is_offscreen(target); context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK); - context->valid = 1; + context_gl->valid = 1; context_gl->gl_ctx = ctx; context_gl->dc_has_format = TRUE; @@ -4183,7 +4183,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); context_setup_target(&context_gl->c, texture, sub_resource_idx); - if (!context_gl->c.valid) + if (!context_gl->valid) return; if (&context_gl->c != context_get_current()) @@ -4287,33 +4287,31 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state { const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_context *context; - context = context_acquire(device, NULL, 0); - if (!context->valid) + context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); + if (!context_gl->valid) { - context_release(context); + context_release(&context_gl->c); WARN("Invalid context, skipping dispatch.\n"); return; } - context_gl = wined3d_context_gl(context); - gl_info = context->gl_info; + gl_info = context_gl->c.gl_info; if (!gl_info->supported[ARB_COMPUTE_SHADER]) { - context_release(context); + context_release(&context_gl->c); FIXME("OpenGL implementation does not support compute shaders.\n"); return; } if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + wined3d_buffer_load(parameters->u.indirect.buffer, &context_gl->c, state); wined3d_context_gl_apply_compute_state(context_gl, device, state); if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) { - context_release(context); + context_release(&context_gl->c); WARN("No compute shader bound, skipping dispatch.\n"); return; } @@ -4337,7 +4335,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); - context_release(context); + context_release(&context_gl->c); } /* Context activation is done by the caller. */ @@ -4815,13 +4813,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); else context = context_acquire(device, NULL, 0); - if (!context->valid) + context_gl = wined3d_context_gl(context); + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping draw.\n"); return; } - context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!use_transform_feedback(state)) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2fb361fb677..e1f94f45eed 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1008,12 +1008,12 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) { - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; - context = context_acquire(cs->device, NULL, 0); - if (context->valid) - context->gl_info->gl_ops.gl.p_glFlush(); - context_release(context); + context_gl = wined3d_context_gl(context_acquire(cs->device, NULL, 0)); + if (context_gl->valid) + context_gl->c.gl_info->gl_ops.gl.p_glFlush(); + context_release(&context_gl->c); } void wined3d_cs_emit_flush(struct wined3d_cs *cs) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed77a6e144a..4ec4022dce6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -306,7 +306,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) depth_stencil = texture_from_resource(dsv->resource); - if (!context->valid) + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping clear.\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7d126420d17..7ae4fb81877 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -224,14 +224,14 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont else restore_texture = NULL; - if (!context->valid) + context_gl = wined3d_context_gl(context); + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping blit.\n"); return; } - context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (src_location == WINED3D_LOCATION_DRAWABLE) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2c816218c8e..c18f7304d94 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -434,13 +434,13 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, BOOL render_to_fbo; context = context_acquire(swapchain->device, back_buffer, 0); - if (!context->valid) + context_gl = wined3d_context_gl(context); + if (!context_gl->valid) { context_release(context); WARN("Invalid context, skipping present.\n"); return; } - context_gl = wined3d_context_gl(context); gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b37e96c9d0..753dc8cb663 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1903,40 +1903,39 @@ struct wined3d_context DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ - DWORD render_offscreen : 1; - DWORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ + DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ + DWORD update_shader_resource_bindings : 1; + DWORD update_compute_shader_resource_bindings : 1; + DWORD update_unordered_access_view_bindings : 1; + DWORD update_compute_unordered_access_view_bindings : 1; DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ + DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD fog_coord : 1; - DWORD current : 1; - DWORD destroyed : 1; - DWORD destroy_delayed : 1; - DWORD valid : 1; - + DWORD namedArraysLoaded : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ + DWORD use_immediate_mode_draw : 1; DWORD uses_uavs : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; - - DWORD update_shader_resource_bindings : 1; - DWORD update_compute_shader_resource_bindings : 1; - DWORD update_unordered_access_view_bindings : 1; - DWORD update_compute_unordered_access_view_bindings : 1; - DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ + DWORD fog_coord : 1; + DWORD render_offscreen : 1; + DWORD current : 1; + DWORD destroyed : 1; + DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD padding : 15; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1975,7 +1974,8 @@ struct wined3d_context_gl uint32_t rebind_fbo : 1; uint32_t untracked_material_count : 2; /* Max value 2 */ uint32_t needs_set : 1; - uint32_t padding : 24; + uint32_t valid : 1; + uint32_t padding : 23; uint32_t default_attrib_value_set; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Move the "needs_set" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 129d4da8161..fb745e2d98e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1282,7 +1282,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context context_gl->c.valid = 1; } - context_gl->c.needs_set = 0; + context_gl->needs_set = 0; return TRUE; } @@ -1314,7 +1314,7 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ context_gl->window = context_gl->c.swapchain->win_handle; context_gl->dc_is_private = FALSE; context_gl->dc_has_format = FALSE; - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; context_gl->c.valid = 1; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) @@ -1583,7 +1583,7 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) if (!--context->level) { if (wined3d_context_gl_restore_pixel_format(context_gl)) - context->needs_set = 1; + context_gl->needs_set = 1; if (context_gl->restore_ctx) { TRACE("Restoring GL context %p on device context %p.\n", context_gl->restore_ctx, context_gl->restore_dc); @@ -1629,11 +1629,11 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) current_gl, wglGetCurrentDC()); context_gl->restore_ctx = current_gl; context_gl->restore_dc = wglGetCurrentDC(); - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; } - else if (!context_gl->c.needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) + else if (!context_gl->needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) && context_gl->pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) - context_gl->c.needs_set = 1; + context_gl->needs_set = 1; } } @@ -2133,7 +2133,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->gl_ctx = ctx; context_gl->dc_has_format = TRUE; - context->needs_set = 1; + context_gl->needs_set = 1; /* Set up the context defaults */ if (!context_set_current(context)) @@ -4191,7 +4191,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (!context_set_current(&context_gl->c)) ERR("Failed to activate the new context.\n"); } - else if (context_gl->c.needs_set) + else if (context_gl->needs_set) { wined3d_context_gl_set_gl_context(context_gl); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6652794ca88..5b37e96c9d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1926,7 +1926,7 @@ struct wined3d_context DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; - DWORD needs_set : 1; + DWORD uses_uavs : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; @@ -1934,10 +1934,9 @@ struct wined3d_context DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; - DWORD uses_uavs : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 13; + DWORD padding : 14; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1975,7 +1974,8 @@ struct wined3d_context_gl uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; uint32_t untracked_material_count : 2; /* Max value 2 */ - uint32_t padding : 25; + uint32_t needs_set : 1; + uint32_t padding : 24; uint32_t default_attrib_value_set; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Move the material tracking fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 06 Jun '19

06 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++--- dlls/wined3d/state.c | 49 +++++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 14 ++++++------ 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9784a48f91f..129d4da8161 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4552,7 +4552,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, else gl_info->gl_ops.gl.p_glNormal3f(0.0f, 0.0f, 0.0f); - untracked_material_count = context_gl->c.num_untracked_materials; + untracked_material_count = context_gl->untracked_material_count; if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) { element = &si->elements[WINED3D_FFP_DIFFUSE]; @@ -4665,7 +4665,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, for (i = 0; i < untracked_material_count; ++i) { gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, - context_gl->c.untracked_materials[i], &color.r); + context_gl->untracked_materials[i], &color.r); } } } @@ -4794,6 +4794,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_stream_info si_emulated; struct wined3d_fence *ib_fence = NULL; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; unsigned int i, idx_size = 0; const void *idx_data = NULL; @@ -4820,6 +4821,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s WARN("Invalid context, skipping draw.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!use_transform_feedback(state)) @@ -4898,7 +4900,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!use_vs(state)) { - if (!stream_info->position_transformed && context->num_untracked_materials + if (!stream_info->position_transformed && context_gl->untracked_material_count && state->render_states[WINED3D_RS_LIGHTING]) { static BOOL warned; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b2fcbddd57f..c52e25d6ce2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1297,19 +1297,18 @@ void state_fogdensity(struct wined3d_context *context, const struct wined3d_stat static void state_colormat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum Parm = 0; - /* Depends on the decoded vertex declaration to read the existence of diffuse data. - * The vertex declaration will call this function if the fixed function pipeline is used. - */ - - if(isStateDirty(context, STATE_VDECL)) { + /* Depends on the decoded vertex declaration to read the existence of + * diffuse data. The vertex declaration will call this function if the + * fixed function pipeline is used. */ + if (isStateDirty(&context_gl->c, STATE_VDECL)) return; - } - context->num_untracked_materials = 0; - if ((context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) + context_gl->untracked_material_count = 0; + if ((context_gl->c.stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)) && state->render_states[WINED3D_RS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", @@ -1325,38 +1324,23 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d else Parm = GL_DIFFUSE; if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_AMBIENT; if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1) { Parm = GL_EMISSION; if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) - { - context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; - context->num_untracked_materials++; - } + context_gl->untracked_materials[context_gl->untracked_material_count++] = GL_SPECULAR; } else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1) { @@ -1365,7 +1349,8 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d } /* Nothing changed, return. */ - if (Parm == context->tracking_parm) return; + if (Parm == context_gl->tracking_parm) + return; if (!Parm) { @@ -1382,7 +1367,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d /* Apparently calls to glMaterialfv are ignored for properties we're * tracking with glColorMaterial, so apply those here. */ - switch (context->tracking_parm) + switch (context_gl->tracking_parm) { case GL_AMBIENT_AND_DIFFUSE: gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *)&state->material.ambient); @@ -1421,7 +1406,7 @@ static void state_colormat(struct wined3d_context *context, const struct wined3d break; } - context->tracking_parm = Parm; + context_gl->tracking_parm = Parm; } static void state_linepattern(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 89d3272a091..6652794ca88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,23 +1927,20 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD needs_set : 1; - DWORD num_untracked_materials : 2; /* Max value 2 */ + DWORD transform_feedback_active : 1; + DWORD transform_feedback_paused : 1; DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; DWORD uses_uavs : 1; - DWORD transform_feedback_active : 1; - DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 11; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; - GLenum tracking_parm; /* Which source is tracking current colour */ - GLenum untracked_materials[2]; enum fogsource fog_source; UINT instance_count; @@ -1977,10 +1974,13 @@ struct wined3d_context_gl uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t padding : 27; + uint32_t untracked_material_count : 2; /* Max value 2 */ + uint32_t padding : 25; uint32_t default_attrib_value_set; + GLenum tracking_parm; /* Which source is tracking current colour. */ + GLenum untracked_materials[2]; SIZE blit_size; unsigned int active_texture; -- 2.11.0

1 0

[PATCH v2 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 06 Jun '19

06 Jun '19

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway and didn't help with overflow either, because the line that assigns to descr->wheel_remain operates on integers, so if it overflowed in the initial float operation, it would overflow on this line anyway. In other words, the current code didn't protect from overflow, so we can simply get rid of the float cast (WHEEL_DELTA is too small for overflow to be a concern, though). dlls/comctl32/listbox.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 8fd556c..991baac 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2068,7 +2068,7 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -2082,9 +2082,20 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1u, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (WHEEL_DELTA * cLineScroll) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (WHEEL_DELTA * cLineScroll) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.21.0

2 10

[PATCH] quartz: Avoid LPVOID for VMR9_ImagePresenter_QueryInterface.
by Andrey Gusev 06 Jun '19

06 Jun '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/vmr9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d208b1c53e..751eeeb816 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2326,16 +2326,14 @@ HRESULT VMR9Impl_create(IUnknown *outer_unk, LPVOID *ppv) } -static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID riid, void **ppv) { VMR9DefaultAllocatorPresenterImpl *This = impl_from_IVMRImagePresenter9(iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)&(This->IVMRImagePresenter9_iface); - else if (IsEqualIID(riid, &IID_IVMRImagePresenter9)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IVMRImagePresenter9)) *ppv = &This->IVMRImagePresenter9_iface; else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9)) *ppv = &This->IVMRSurfaceAllocatorEx9_iface; -- 2.21.0

1 0

[PATCH v5 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 10 +++---- include/ddk/d3dkmthk.h | 1 + 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f57dd1231f..96c2f1f129 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1394,3 +1394,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) desc->hDevice = device->handle; return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f5c23dad76..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,9 +194,9 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

3 2

[PATCH v5 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 52 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index da3aad9e7c..f57dd1231f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,10 +59,17 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1342,3 +1349,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI desc->VidPnSourceId = 0; return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + FIXME("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + device->handle = ++handle_start; + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + + desc->hDevice = device->handle; + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f5c23dad76 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); -- 2.20.1

3 2

[PATCH v5 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 01efc6903b..da3aad9e7c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1279,8 +1279,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

3 2

[PATCH v5 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 06 Jun '19

06 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. v3: Fix intermediate test crash. v4: Make d3dkmt_* struct local. v5: Avoid a possible race. Sorry about making to v5. Supersede 166048~166051 .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 50 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..01efc6903b 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -51,9 +52,18 @@ struct graphics_driver const struct gdi_dc_funcs *funcs; }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1282,43 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Support multiple monitors */ + if (lstrcmpiW( desc->DeviceName, display1W )) + { + FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + return STATUS_UNSUCCESSFUL; + } + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + + desc->hAdapter = handle_start; + /* FIXME: Support AdapterLuid */ + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } -- 2.20.1

3 2

[PATCH v4 3/4] winemac.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b7a09634ee..605c0c87f1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data); + SetActiveWindow(hwnd); SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); return; } -- 2.20.1

2 1

[PATCH v2 resend] kernel32: Consider the working directory first when launching executables with CreateProcess.
by Erich E. Hoover 05 Jun '19

05 Jun '19

v2: Fix the logic so that having NoDefaultCurrentDirectoryInExePath set does not break the search *The three most relevant cases* Case 1: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = True Overall = True (stop search) Case 2: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = False Overall = False (continue search) Case 3: NoDefaultCurrentDirectoryInExePath = True NeedCurrentDirectoryForExePathW = False GetCurrentDirectoryW (not called) SearchPathW (not called) Overall = False (continue search) Best, Erich

2 1

[PATCH 2/2] msvcp: Add _Init_locks class implementation.
by Piotr Caban 05 Jun '19

05 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46982 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 16 +++++----- dlls/msvcp110/msvcp110.spec | 20 ++++++------ dlls/msvcp120/msvcp120.spec | 20 ++++++------ dlls/msvcp140/msvcp140.spec | 20 ++++++------ dlls/msvcp60/main.c | 4 +-- dlls/msvcp60/msvcp.h | 8 +++++ dlls/msvcp80/msvcp80.spec | 16 +++++----- dlls/msvcp90/misc.c | 61 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 10 ++++-- dlls/msvcp90/msvcp90.spec | 16 +++++----- dlls/msvcp90/msvcp_main.c | 4 +-- 11 files changed, 127 insertions(+), 68 deletions(-)

1 0

[PATCH 1/2] msvcp: Fix _Lockit::_Lockit_ctor and _Lockit::_Lockit_dtor implementation.
by Piotr Caban 05 Jun '19

05 Jun '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 4 +-- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp140/msvcp140.spec | 4 +-- dlls/msvcp80/msvcp80.spec | 4 +-- dlls/msvcp90/misc.c | 55 ++++++++++++++++++++----------------- dlls/msvcp90/msvcp90.spec | 4 +-- 7 files changed, 42 insertions(+), 37 deletions(-)

1 0

[PATCH v7 1/6] kernel32/tests: Fix NtAllocateVirtualMemory tests results on w1064v1809
by Rémi Bernon 05 Jun '19

05 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..d797df26f6c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -456,12 +456,13 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* 21 zero bits is valid */ + /* 21 zero bits never succeeds */ size = 0x1000; addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + todo_wine + ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); @@ -470,7 +471,8 @@ static void test_VirtualAlloc(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ @@ -484,8 +486,8 @@ static void test_VirtualAlloc(void) addr2 = (char *)addr1 + 0x1000; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } -- 2.20.1

3 11

[PATCH v4 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. v3: Fix intermediate test crash. v4: Make d3dkmt_* struct local. Supersede 165966~165969 .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 51 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..fe66266e18 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -51,9 +52,18 @@ struct graphics_driver const struct gdi_dc_funcs *funcs; }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1282,44 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Support multiple monitors */ + if (lstrcmpiW( desc->DeviceName, display1W )) + { + FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + return STATUS_UNSUCCESSFUL; + } + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + + desc->hAdapter = handle_start; + /* FIXME: Support AdapterLuid */ + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } -- 2.20.1

4 3

[PATCH v2] ddraw/tests: Test lighting with _ProcessVertices() for ddraw7.
by Paul Gofman 05 Jun '19

05 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2 changes: - make process_vertices_todo last parameter in test structure; - fix IDirectDraw7 interface leak in test_lighting(). dlls/ddraw/tests/ddraw7.c | 378 ++++++++++++++++++++++++++++---------- 1 file changed, 282 insertions(+), 96 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 9ba6a06ecc..ce741253ae 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "wine/test.h" +#include "wine/heap.h" #include <limits.h> #include <math.h> #include "d3d.h" @@ -3644,7 +3645,7 @@ static void test_lighting(void) 0.0f, 0.0f, 1.0f, -1.0f, 10.f, 10.0f, 10.0f, 0.0f, }; - static struct + static struct vertex { struct vec3 position; DWORD diffuse; @@ -3663,7 +3664,7 @@ static void test_lighting(void) {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; - static struct + static struct vertex_normal { struct vec3 position; struct vec3 normal; @@ -3709,26 +3710,41 @@ static void test_lighting(void) { D3DMATRIX *world_matrix; void *quad; - DWORD expected; + DWORD expected, expected_process_vertices; const char *message; + BOOL process_vertices_todo; } tests[] = { - {&mat, nquad, 0x000000ff, "Lit quad with light"}, - {&mat_singular, nquad, 0x000000ff, "Lit quad with singular world matrix"}, - {&mat_transf, rotatedquad, 0x000000ff, "Lit quad with transformation matrix"}, - {&mat_nonaffine, translatedquad, 0x00000000, "Lit quad with non-affine matrix"}, + {&mat, nquad, 0x000000ff, 0xff0000ff, "Lit quad with light"}, + {&mat_singular, nquad, 0x000000ff, 0xff000000, "Lit quad with singular world matrix", TRUE}, + {&mat_transf, rotatedquad, 0x000000ff, 0xff0000ff, "Lit quad with transformation matrix"}, + {&mat_nonaffine, translatedquad, 0x00000000, 0xff000000, "Lit quad with non-affine matrix"}, }; - HWND window; + DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; + IDirect3DVertexBuffer7 *src_vb1, *src_vb2, *dst_vb; + DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; + struct vertex_normal *src_data2; + D3DVERTEXBUFFERDESC vb_desc; + struct vertex *src_data1; IDirect3DDevice7 *device; IDirectDrawSurface7 *rt; - HRESULT hr; - DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; - DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; D3DCOLOR color; ULONG refcount; unsigned int i; + BOOL is_warp; + HWND window; + HRESULT hr; + struct + { + struct vec4 position; + DWORD diffuse; + DWORD specular; + } + *dst_data; window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) @@ -3737,97 +3753,199 @@ static void test_lighting(void) DestroyWindow(window); return; } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + is_warp = ddraw_is_warp(ddraw); hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_STENCILENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable stencil buffering, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CULLMODE, D3DCULL_NONE); - ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = fvf; + vb_desc.dwNumVertices = 2; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &src_vb1, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = nfvf; + vb_desc.dwNumVertices = 2; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &src_vb2, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR; + vb_desc.dwNumVertices = 4; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &dst_vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(src_vb1, 0, (void **)&src_data1, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data1, unlitquad, sizeof(*src_data1)); + memcpy(&src_data1[1], litquad, sizeof(*src_data1)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(src_vb2, 0, (void **)&src_data2, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data2, unlitnquad, sizeof(*src_data2)); + memcpy(&src_data2[1], litnquad, sizeof(*src_data2)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* No lights are defined... That means, lit vertices should be entirely black. */ hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM, 0, + 1, src_vb1, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, fvf, unlitquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 1, + 1, src_vb1, 1, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, fvf, litquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM, 2, + 1, src_vb2, 0, device, 0); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, unlitnquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, TRUE); - ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 3, + 1, src_vb2, 1, device, 0); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, litnquad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 160, 360); ok(color == 0x00ff0000, "Unlit quad without normals has color 0x%08x, expected 0x00ff0000.\n", color); + ok(dst_data[0].diffuse == 0xffff0000, + "Unlit quad without normals has color 0x%08x, expected 0xffff0000.\n", dst_data[0].diffuse); + ok(!dst_data[0].specular, + "Unexpected specular color 0x%08x.\n", dst_data[0].specular); color = get_surface_color(rt, 160, 120); - ok(color == 0x00000000, "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + /* Broken on some of WARP drivers. */ + ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); + ok(dst_data[1].diffuse == 0xff000000, + "Lit quad without normals has color 0x%08x, expected 0xff000000.\n", dst_data[1].diffuse); + ok(!dst_data[1].specular, + "Unexpected specular color 0x%08x.\n", dst_data[1].specular); color = get_surface_color(rt, 480, 360); ok(color == 0x000000ff, "Unlit quad with normals has color 0x%08x, expected 0x000000ff.\n", color); + ok(dst_data[2].diffuse == 0xff0000ff, + "Unlit quad with normals has color 0x%08x, expected 0xff0000ff.\n", dst_data[2].diffuse); + ok(!dst_data[2].specular, + "Unexpected specular color 0x%08x.\n", dst_data[2].specular); color = get_surface_color(rt, 480, 120); - ok(color == 0x00000000, "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); + ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); + ok(dst_data[3].diffuse == 0xff000000, + "Lit quad with normals has color 0x%08x, expected 0xff000000.\n", dst_data[3].diffuse); + ok(!dst_data[3].specular, + "Unexpected specular color 0x%08x.\n", dst_data[3].specular); + + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_LightEnable(device, 0, TRUE); - ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { + hr = IDirect3DVertexBuffer7_Lock(src_vb2, 0, (void **)&src_data2, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data2, tests[i].quad, sizeof(*src_data2)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, tests[i].world_matrix); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 0, + 1, src_vb2, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, tests[i].quad, 4, indices, 6, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + ok(color == tests[i].expected || broken(is_warp && color == 0x000000ff), + "%s has color 0x%08x.\n", tests[i].message, color); + todo_wine_if(tests[i].process_vertices_todo) + ok(dst_data[0].diffuse == tests[i].expected_process_vertices, + "%s has color 0x%08x.\n", tests[i].message, dst_data[0].diffuse); + ok(!dst_data[0].specular, + "%s has specular color 0x%08x.\n", tests[i].message, dst_data[0].specular); + + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + IDirect3DVertexBuffer7_Release(src_vb1); + IDirect3DVertexBuffer7_Release(src_vb2); + IDirect3DVertexBuffer7_Release(dst_vb); + IDirectDrawSurface7_Release(rt); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); @@ -3845,6 +3963,24 @@ static void test_specular_lighting(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; + static const struct vertex + { + struct vec3 position; + struct vec3 normal; + } + vertices[] = + { + {{-0.5f, -0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.0f, -0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.5f, -0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{-0.5f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.5f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{-0.5f, 0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.0f, 0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + {{ 0.5f, 0.5f, 1.0f}, {0.0f, 0.0f, -1.0f}}, + }; + static D3DLIGHT7 directional = { D3DLIGHT_DIRECTIONAL, @@ -4006,18 +4142,6 @@ static void test_specular_lighting(void) {320, 360, 0x00000000}, {480, 360, 0x00000000}, }, - expected_directional_0[] = - { - {160, 120, 0x00ffffff}, - {320, 120, 0x00ffffff}, - {480, 120, 0x00ffffff}, - {160, 240, 0x00ffffff}, - {320, 240, 0x00ffffff}, - {480, 240, 0x00ffffff}, - {160, 360, 0x00ffffff}, - {320, 360, 0x00ffffff}, - {480, 360, 0x00ffffff}, - }, expected_directional_local_0[] = { {160, 120, 0x00ffffff}, @@ -4071,41 +4195,56 @@ static void test_specular_lighting(void) D3DLIGHT7 *light; BOOL local_viewer; float specular_power; - const struct expected_color *expected; + const struct expected_color *expected, *expected_process_vertices; unsigned int expected_count; + BOOL todo_process_vertices; } tests[] = { - {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, - {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, - {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, - {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, - {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, - {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, - {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, - {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, - {&directional, FALSE, 0.0f, expected_directional_0, ARRAY_SIZE(expected_directional_0)}, - {&directional, TRUE, 0.0f, expected_directional_local_0, ARRAY_SIZE(expected_directional_local_0)}, - {&point, FALSE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, - {&point, TRUE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, - {&spot, FALSE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, - {&spot, TRUE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, - {&point_range, FALSE, 0.0f, expected_point_range_0, ARRAY_SIZE(expected_point_range_0)}, - }; + {&directional, FALSE, 30.0f, expected_directional, expected_directional, + ARRAY_SIZE(expected_directional)}, + {&directional, TRUE, 30.0f, expected_directional_local, expected_directional_local, + ARRAY_SIZE(expected_directional_local)}, + {&point, FALSE, 30.0f, expected_point, expected_point, ARRAY_SIZE(expected_point)}, + {&point, TRUE, 30.0f, expected_point_local, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, FALSE, 30.0f, expected_spot, expected_spot, ARRAY_SIZE(expected_spot)}, + {&spot, TRUE, 30.0f, expected_spot_local, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&point_range, FALSE, 30.0f, expected_point_range, expected_point_range, + ARRAY_SIZE(expected_point_range)}, + + /* For zero material shininess _ProcessVertices() seem to keep non-zero material shininess set previously. */ + {&point_side, TRUE, 0.0f, expected_point_side, expected_point_side, ARRAY_SIZE(expected_point_side), TRUE}, + {&directional, FALSE, 0.0f, expected_directional, expected_directional, + ARRAY_SIZE(expected_directional), TRUE}, + {&directional, TRUE, 0.0f, expected_directional_local_0, expected_directional_local, + ARRAY_SIZE(expected_directional_local_0), TRUE}, + {&point, FALSE, 0.0f, expected_point_0, expected_point, ARRAY_SIZE(expected_point_0), TRUE}, + {&point, TRUE, 0.0f, expected_point_0, expected_point_local, ARRAY_SIZE(expected_point_0), TRUE}, + {&spot, FALSE, 0.0f, expected_spot_0, expected_spot, ARRAY_SIZE(expected_spot_0), TRUE}, + {&spot, TRUE, 0.0f, expected_spot_0, expected_spot_local, ARRAY_SIZE(expected_spot_0), TRUE}, + {&point_range, FALSE, 0.0f, expected_point_range_0, expected_point_range, ARRAY_SIZE(expected_point_range_0), TRUE}, + }; + + IDirect3DVertexBuffer7 *src_vb, *dst_vb; + D3DCOLOR color, expected_color; + D3DVERTEXBUFFERDESC vb_desc; IDirect3DDevice7 *device; + unsigned int i, j, x, y; IDirectDrawSurface7 *rt; D3DMATERIAL7 material; - D3DCOLOR color; + struct vec3 *src_data; + struct vertex *quad; + IDirect3D7 *d3d; ULONG refcount; + WORD *indices; HWND window; HRESULT hr; - unsigned int i, j, x, y; struct { - struct vec3 position; - struct vec3 normal; - } *quad; - WORD *indices; + struct vec4 position; + DWORD diffuse; + DWORD specular; + } *dst_data; window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) @@ -4114,9 +4253,11 @@ static void test_specular_lighting(void) DestroyWindow(window); return; } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); - indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); + quad = heap_alloc(vertices_side * vertices_side * sizeof(*quad)); + indices = heap_alloc(indices_count * sizeof(*indices)); for (i = 0, y = 0; y < vertices_side; ++y) { for (x = 0; x < vertices_side; ++x) @@ -4143,56 +4284,89 @@ static void test_specular_lighting(void) } hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, &mat); - ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, &mat); - ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, &mat); - ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_LightEnable(device, 0, TRUE); - ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SPECULARENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = fvf; + vb_desc.dwNumVertices = ARRAY_SIZE(vertices); + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &src_vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(src_vb, 0, (void **)&src_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(src_data, vertices, sizeof(vertices)); + hr = IDirect3DVertexBuffer7_Unlock(src_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + memset(&vb_desc, 0, sizeof(vb_desc)); + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwFVF = D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR; + vb_desc.dwNumVertices = ARRAY_SIZE(vertices); + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &dst_vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice7_SetLight(device, 0, tests[i].light); - ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LOCALVIEWER, tests[i].local_viewer); - ok(SUCCEEDED(hr), "Failed to set local viewer state, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); U1(U2(material).specular).r = 1.0f; U2(U2(material).specular).g = 1.0f; U3(U2(material).specular).b = 1.0f; - U4(U2(material).specular).a = 1.0f; + U4(U2(material).specular).a = 0.5f; U4(material).power = tests[i].specular_power; hr = IDirect3DDevice7_SetMaterial(device, &material); - ok(SUCCEEDED(hr), "Failed to set material, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memset(dst_data, 0, sizeof(*dst_data) * ARRAY_SIZE(vertices)); + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 0, + ARRAY_SIZE(vertices), src_vb, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, fvf, quad, vertices_side * vertices_side, indices, indices_count, 0); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(dst_vb, 0, (void **)&dst_data, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ok(tests[i].expected_count == ARRAY_SIZE(vertices), "Array size mismatch.\n"); for (j = 0; j < tests[i].expected_count; ++j) { color = get_surface_color(rt, tests[i].expected[j].x, tests[i].expected[j].y); @@ -4200,16 +4374,28 @@ static void test_specular_lighting(void) "Expected color 0x%08x at location (%u, %u), got 0x%08x, case %u.\n", tests[i].expected[j].color, tests[i].expected[j].x, tests[i].expected[j].y, color, i); + ok(!dst_data[j].diffuse, "Expected color 0x00000000 for vertex %u, got 0x%08x, case %u.\n", + j, dst_data[j].diffuse, i); + expected_color = tests[i].expected_process_vertices[j].color | 0x80000000; + todo_wine_if(tests[i].todo_process_vertices && dst_data[j].specular != expected_color) + ok(compare_color(dst_data[j].specular, expected_color, 1), + "Expected color 0x%08x for vertex %u, got 0x%08x, case %u.\n", + expected_color, j, dst_data[j].specular, i); } + hr = IDirect3DVertexBuffer7_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + IDirect3DVertexBuffer7_Release(dst_vb); + IDirect3DVertexBuffer7_Release(src_vb); IDirectDrawSurface7_Release(rt); + IDirect3D7_Release(d3d); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); - HeapFree(GetProcessHeap(), 0, indices); - HeapFree(GetProcessHeap(), 0, quad); + heap_free(indices); + heap_free(quad); } static void test_clear_rect_count(void) -- 2.21.0

3 2

[PATCH v2 1/5] ntoskrnl.exe: Free device IDs from pool.
by Zebediah Figura 05 Jun '19

05 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 23ae4ca..d8f74e0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -301,7 +301,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) if (get_driver_for_id( ptr, driver )) break; } - RtlFreeHeap( GetProcessHeap(), 0, ids ); + ExFreePool( ids ); if (!driver[0]) { @@ -409,7 +409,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP else status = STATUS_BUFFER_TOO_SMALL; - HeapFree( GetProcessHeap(), 0, id ); + ExFreePool( id ); break; } case DevicePropertyPhysicalDeviceObjectName: @@ -658,17 +658,17 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla HeapFree( GetProcessHeap(), 0, id ); if (!rc) { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } else { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; -- 2.7.4

1 4

[PATCH vkd3d 4/4] vkd3d: Add initial checks for feature levels 12_0+.
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 06b58215339d..a9610ffbfb4a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1090,7 +1090,8 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 } static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, - const VkPhysicalDeviceFeatures *features) + const VkPhysicalDeviceFeatures *features, + const D3D12_FEATURE_DATA_D3D12_OPTIONS *d3d12_options) { bool have_11_0 = true; @@ -1158,12 +1159,24 @@ static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_0; if (have_11_0 - && features->logicOp + && d3d12_options->OutputMergerLogicOp && features->vertexPipelineStoresAndAtomics && vk_info->device_limits.maxPerStageDescriptorStorageBuffers >= D3D12_UAV_SLOT_COUNT && vk_info->device_limits.maxPerStageDescriptorStorageImages >= D3D12_UAV_SLOT_COUNT) vk_info->max_feature_level = D3D_FEATURE_LEVEL_11_1; + /* TODO: MinMaxFiltering */ + if (vk_info->max_feature_level >= D3D_FEATURE_LEVEL_11_1 + && d3d12_options->TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2 + && d3d12_options->ResourceBindingTier >= D3D12_RESOURCE_BINDING_TIER_2 + && d3d12_options->TypedUAVLoadAdditionalFormats) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_12_0; + + if (vk_info->max_feature_level >= D3D_FEATURE_LEVEL_12_0 + && d3d12_options->ROVsSupported + && d3d12_options->ConservativeRasterizationTier >= D3D12_CONSERVATIVE_RASTERIZATION_TIER_1) + vk_info->max_feature_level = D3D_FEATURE_LEVEL_12_1; + TRACE("Max feature level: %#x.\n", vk_info->max_feature_level); } @@ -1333,7 +1346,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_free(vk_extensions); - vkd3d_init_feature_level(vulkan_info, features); + vkd3d_init_feature_level(vulkan_info, features, &device->feature_options); if (vulkan_info->max_feature_level < create_info->minimum_feature_level) { WARN("Feature level %#x is not supported.\n", create_info->minimum_feature_level); -- 2.21.0

2 1

[PATCH vkd3d 3/4] vkd3d: Use sparse resources for emulating NULL UAVs.
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> If residencyNonResidentStrict is supported. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 7 +++ libs/vkd3d/resource.c | 112 +++++++++++++++++++++++++++--------------- 2 files changed, 79 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e83b7fa9258c..06b58215339d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1213,6 +1213,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_trace_physical_device_features(features2); vkd3d_trace_physical_device_limits(&device_properties2); + if (!features->sparseResidencyBuffer || !features->sparseResidencyImage2D) + { + features->sparseResidencyBuffer = VK_FALSE; + features->sparseResidencyImage2D = VK_FALSE; + device_properties2.properties.sparseProperties.residencyNonResidentStrict = VK_FALSE; + } + vulkan_info->device_limits = device_properties2.properties.limits; vulkan_info->sparse_properties = device_properties2.properties.sparseProperties; vulkan_info->rasterization_stream = xfb_properties.transformFeedbackRasterizationStreamSelect; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 30ef9018d775..1e5f5f3c3c38 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3357,6 +3357,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_resource, struct d3d12_device *device) { + const bool use_sparse_resources = device->vk_info.sparse_properties.residencyNonResidentStrict; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; static const VkClearColorValue clear_color = {{0}}; VkCommandBufferAllocateInfo command_buffer_info; @@ -3413,37 +3414,63 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ /* fill buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); - /* fill UAV buffer */ - VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); - - /* clear 2D UAV image */ - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - barrier.pNext = NULL; - barrier.srcAccessMask = 0; - barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; - barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; - barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier.image = null_resource->vk_2d_storage_image; - barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - barrier.subresourceRange.baseMipLevel = 0; - barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; - barrier.subresourceRange.baseArrayLayer = 0; - barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; - - VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, - VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, - 0, NULL, 0, NULL, 1, &barrier)); - - range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - range.baseMipLevel = 0; - range.levelCount = 1; - range.baseArrayLayer = 0; - range.layerCount = 1; - - VK_CALL(vkCmdClearColorImage(vk_command_buffer, - null_resource->vk_2d_storage_image, VK_IMAGE_LAYOUT_GENERAL, &clear_color, 1, &range)); + if (use_sparse_resources) + { + /* transition 2D UAV image */ + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = 0; + barrier.dstAccessMask = 0; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = null_resource->vk_2d_storage_image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, + 0, NULL, 0, NULL, 1, &barrier)); + } + else + { + /* fill UAV buffer */ + VK_CALL(vkCmdFillBuffer(vk_command_buffer, + null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + + /* clear 2D UAV image */ + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = 0; + barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = null_resource->vk_2d_storage_image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, + 0, NULL, 0, NULL, 1, &barrier)); + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = 0; + range.levelCount = 1; + range.baseArrayLayer = 0; + range.layerCount = 1; + + VK_CALL(vkCmdClearColorImage(vk_command_buffer, + null_resource->vk_2d_storage_image, VK_IMAGE_LAYOUT_GENERAL, &clear_color, 1, &range)); + } /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -3516,6 +3543,7 @@ done: HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, struct d3d12_device *device) { + const bool use_sparse_resources = device->vk_info.sparse_properties.residencyNonResidentStrict; D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; HRESULT hr; @@ -3550,10 +3578,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, /* buffer UAV */ resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + if (FAILED(hr = vkd3d_create_buffer(device, use_sparse_resources ? NULL : &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, &null_resources->vk_storage_buffer))) goto fail; - if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, + if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory))) goto fail; @@ -3587,13 +3615,14 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.Format = VKD3D_NULL_VIEW_FORMAT; resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Layout = use_sparse_resources + ? D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE : D3D12_TEXTURE_LAYOUT_UNKNOWN; resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - if (FAILED(hr = vkd3d_create_image(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + if (FAILED(hr = vkd3d_create_image(device, use_sparse_resources ? NULL : &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, &null_resources->vk_2d_storage_image))) goto fail; - if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, + if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory))) goto fail; @@ -3604,16 +3633,19 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL UAV buffer"); - vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory, - VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL UAV buffer memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D SRV memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D UAV image"); - vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_memory, - VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D UAV memory"); + if (!use_sparse_resources) + { + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL UAV buffer memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D UAV memory"); + } return vkd3d_init_null_resources_data(null_resources, device); -- 2.21.0

2 1

[PATCH vkd3d 2/4] tests: Add test for creating reserved resources.
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d6cd4e014660..04ee7be99fff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -616,6 +616,36 @@ static bool is_min_max_filtering_supported(ID3D12Device *device) return options.TiledResourcesTier >= D3D12_TILED_RESOURCES_TIER_2; } +static D3D12_TILED_RESOURCES_TIER get_tiled_resources_tier(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED; + } + + return options.TiledResourcesTier; +} + +static bool is_standard_swizzle_64kb_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.StandardSwizzle64KBSupported; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -2126,6 +2156,138 @@ static void test_create_placed_resource(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_reserved_resource(void) +{ + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + D3D12_CLEAR_VALUE clear_value; + D3D12_HEAP_FLAGS heap_flags; + ID3D12Resource *resource; + bool standard_swizzle; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + if (get_tiled_resources_tier(device) == D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED) + { + skip("Tiled resources are not supported.\n"); + goto done; + } + + standard_swizzle = is_standard_swizzle_64kb_supported(device); + trace("Standard swizzle 64KB: %#x.\n", standard_swizzle); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = 0; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); + + check_interface(resource, &IID_ID3D12Object, TRUE); + check_interface(resource, &IID_ID3D12DeviceChild, TRUE); + check_interface(resource, &IID_ID3D12Pageable, TRUE); + check_interface(resource, &IID_ID3D12Resource, TRUE); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); + ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + heap_flags = 0xdeadbeef; + hr = ID3D12Resource_GetHeapProperties(resource, &heap_properties, &heap_flags); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(heap_flags == 0xdeadbeef, "Got unexpected heap flags %#x.\n", heap_flags); + + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + /* The clear value must be NULL for buffers. */ + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* D3D12_TEXTURE_LAYOUT_ROW_MAJOR must be used for buffers. */ + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE must be used for textures. */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 64; + resource_desc.Height = 64; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 4; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; + resource_desc.Flags = 0; + + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create reserved resource, hr %#x.\n", hr); + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.MipLevels = 1; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE; + hr = ID3D12Device_CreateReservedResource(device, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == (standard_swizzle ? S_OK : E_INVALIDARG) || broken(use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + +done: + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_descriptor_heap(void) { D3D12_DESCRIPTOR_HEAP_DESC heap_desc; @@ -29603,6 +29765,7 @@ START_TEST(d3d12) run_test(test_create_committed_resource); run_test(test_create_heap); run_test(test_create_placed_resource); + run_test(test_create_reserved_resource); run_test(test_create_descriptor_heap); run_test(test_create_sampler); run_test(test_create_unordered_access_view); -- 2.21.0

2 1

[PATCH vkd3d 1/4] vkd3d: Implement d3d12_device_CreateReservedResource().
by Józef Kucia 05 Jun '19

05 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 18 ++++-- libs/vkd3d/resource.c | 129 ++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 3 + 3 files changed, 119 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ddec0f7cae67..e83b7fa9258c 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2780,14 +2780,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device static HRESULT STDMETHODCALLTYPE d3d12_device_CreateReservedResource(ID3D12Device *iface, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, - REFIID riid, void **resource) + const D3D12_CLEAR_VALUE *optimized_clear_value, REFIID iid, void **resource) { - FIXME("iface %p, desc %p, initial_state %#x, optimized_clear_value %p, " - "riid %s, resource %p stub!\n", - iface, desc, initial_state, optimized_clear_value, debugstr_guid(riid), resource); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + struct d3d12_resource *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, initial_state %#x, optimized_clear_value %p, iid %s, resource %p.\n", + iface, desc, initial_state, optimized_clear_value, debugstr_guid(iid), resource); + + if (FAILED(hr = d3d12_reserved_resource_create(device, + desc, initial_state, optimized_clear_value, &object))) + return hr; + + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, iid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateSharedHandle(ID3D12Device *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c3c92386da08..30ef9018d775 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -21,6 +21,8 @@ #define VKD3D_NULL_BUFFER_SIZE 16 #define VKD3D_NULL_VIEW_FORMAT DXGI_FORMAT_R8G8B8A8_UNORM +#define VKD3D_HEAP_TYPE_INVALID ((D3D12_HEAP_TYPE)~0u) + static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { @@ -497,14 +499,25 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const bool sparse_resource = !heap_properties; VkBufferCreateInfo buffer_info; + D3D12_HEAP_TYPE heap_type; VkResult vr; + heap_type = heap_properties ? heap_properties->Type : D3D12_HEAP_TYPE_DEFAULT; + buffer_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; buffer_info.pNext = NULL; buffer_info.flags = 0; buffer_info.size = desc->Width; + if (sparse_resource) + { + buffer_info.flags |= VK_BUFFER_CREATE_SPARSE_BINDING_BIT; + if (device->vk_info.sparse_properties.residencyNonResidentStrict) + buffer_info.flags |= VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT; + } + buffer_info.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT @@ -512,16 +525,15 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_properties->Type == D3D12_HEAP_TYPE_DEFAULT - && device->vk_info.EXT_transform_feedback) + if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) { buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; } - if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD) + if (heap_type == D3D12_HEAP_TYPE_UPLOAD) buffer_info.usage &= ~VK_BUFFER_USAGE_TRANSFER_DST_BIT; - else if (heap_properties->Type == D3D12_HEAP_TYPE_READBACK) + else if (heap_type == D3D12_HEAP_TYPE_READBACK) buffer_info.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT; if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS) @@ -573,6 +585,7 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, VkImage *vk_image) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const bool sparse_resource = !heap_properties; const struct vkd3d_format *format; VkImageCreateInfo image_info; VkResult vr; @@ -595,6 +608,13 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; + if (sparse_resource) + { + image_info.flags |= VK_IMAGE_CREATE_SPARSE_BINDING_BIT; + if (device->vk_info.sparse_properties.residencyNonResidentStrict) + image_info.flags |= VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT; + } + image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; image_info.extent.width = desc->Width; @@ -614,7 +634,17 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.mipLevels = min(desc->MipLevels, max_miplevel_count(desc)); image_info.samples = vk_samples_from_dxgi_sample_desc(&desc->SampleDesc); - if (desc->Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN) + if (sparse_resource) + { + if (desc->Layout != D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE) + { + WARN("D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE must be used for reserved texture.\n"); + return E_INVALIDARG; + } + + image_info.tiling = VK_IMAGE_TILING_OPTIMAL; + } + else if (desc->Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN) { image_info.tiling = VK_IMAGE_TILING_OPTIMAL; } @@ -652,7 +682,7 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, image_info.pQueueFamilyIndices = NULL; } - image_info.initialLayout = is_cpu_accessible_heap(heap_properties) ? + image_info.initialLayout = heap_properties && is_cpu_accessible_heap(heap_properties) ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if ((vr = VK_CALL(vkCreateImage(device->vk_device, &image_info, NULL, vk_image))) < 0) @@ -1155,6 +1185,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_GetHeapProperties(ID3D12Resource TRACE("iface %p, heap_properties %p, flags %p.\n", iface, heap_properties, flags); + if (resource->heap_properties.Type == VKD3D_HEAP_TYPE_INVALID) + { + WARN("Cannot get heap properties for reserved resources.\n"); + return E_INVALIDARG; + } + if (heap_properties) *heap_properties = resource->heap_properties; if (flags) @@ -1255,46 +1291,55 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) return S_OK; } -static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value) +static bool d3d12_resource_validate_heap_properties(const struct d3d12_resource *resource, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_RESOURCE_STATES initial_state) { - HRESULT hr; - - resource->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; - resource->refcount = 1; - resource->internal_refcount = 1; - - resource->desc = *desc; - if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD || heap_properties->Type == D3D12_HEAP_TYPE_READBACK) { if (d3d12_resource_is_texture(resource)) { WARN("Textures cannot be created on upload/readback heaps.\n"); - return E_INVALIDARG; + return false; } - if (desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)) + if (resource->desc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)) { WARN("Render target and unordered access buffers cannot be created on upload/readback heaps.\n"); - return E_INVALIDARG; + return false; } } if (heap_properties->Type == D3D12_HEAP_TYPE_UPLOAD && initial_state != D3D12_RESOURCE_STATE_GENERIC_READ) { WARN("For D3D12_HEAP_TYPE_UPLOAD the state must be D3D12_RESOURCE_STATE_GENERIC_READ.\n"); - return E_INVALIDARG; + return false; } if (heap_properties->Type == D3D12_HEAP_TYPE_READBACK && initial_state != D3D12_RESOURCE_STATE_COPY_DEST) { WARN("For D3D12_HEAP_TYPE_READBACK the state must be D3D12_RESOURCE_STATE_COPY_DEST.\n"); - return E_INVALIDARG; + return false; } + return true; +} + +static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12_device *device, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value) +{ + HRESULT hr; + + resource->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; + resource->refcount = 1; + resource->internal_refcount = 1; + + resource->desc = *desc; + + if (heap_properties && !d3d12_resource_validate_heap_properties(resource, heap_properties, initial_state)) + return E_INVALIDARG; + if (!is_valid_resource_state(initial_state)) { WARN("Invalid initial resource state %#x.\n", initial_state); @@ -1351,8 +1396,18 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->map_count = 0; resource->map_ptr = NULL; - resource->heap_properties = *heap_properties; - resource->heap_flags = heap_flags; + if (heap_properties) + { + resource->heap_properties = *heap_properties; + resource->heap_flags = heap_flags; + } + else + { + memset(&resource->heap_properties, 0, sizeof(resource->heap_properties)); + resource->heap_properties.Type = VKD3D_HEAP_TYPE_INVALID; + resource->heap_flags = 0; + } + resource->initial_state = initial_state; resource->heap = NULL; @@ -1417,6 +1472,12 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, struct d3d12_resource *object; HRESULT hr; + if (!heap_properties) + { + WARN("Heap properties are NULL.\n"); + return E_INVALIDARG; + } + if (FAILED(hr = d3d12_resource_create(device, heap_properties, heap_flags, desc, initial_state, optimized_clear_value, &object))) return hr; @@ -1503,6 +1564,24 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h return S_OK; } +HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) +{ + struct d3d12_resource *object; + HRESULT hr; + + if (FAILED(hr = d3d12_resource_create(device, NULL, 0, + desc, initial_state, optimized_clear_value, &object))) + return hr; + + TRACE("Created reserved resource %p.\n", object); + + *resource = object; + + return S_OK; +} + HRESULT vkd3d_create_image_resource(ID3D12Device *device, const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 71e05b245230..2d31cacc101e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -402,6 +402,9 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, UINT64 heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; +HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DECLSPEC_HIDDEN; HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, -- 2.21.0

2 1

[PATCH 5/5] wined3d: Make the adapter responsible for acquiring and releasing contexts.
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 49 ++++----------------------- dlls/wined3d/adapter_vk.c | 60 ++++++++++++++++++++------------- dlls/wined3d/context.c | 75 ++++++++++++++++++------------------------ dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 69 +++++++++++++++++++++++--------------- dlls/wined3d/query.c | 6 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 39 ++++++++++++++++------ dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 46 +++++++++++++++++++------- 10 files changed, 190 insertions(+), 160 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 110771f8ea9..c8ebe346431 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4338,50 +4338,15 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) heap_free(device_gl); } -static HRESULT adapter_gl_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) +struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context_gl *context_gl; - HRESULT hr; - - TRACE("swapchain %p, context %p.\n", swapchain, context); - - if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = wined3d_context_gl_init(context_gl, swapchain))) - { - WARN("Failed to initialise context.\n"); - heap_free(context_gl); - return hr; - } - - TRACE("Created context %p.\n", context_gl); - *context = &context_gl->c; - - return WINED3D_OK; + return wined3d_context_gl_acquire(device, texture, sub_resource_idx); } -static void adapter_gl_destroy_context(struct wined3d_context *context) +void adapter_gl_release_context(struct wined3d_context *context) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) - { - struct wined3d_gl_info *gl_info; - - /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the - * one in wined3d_adapter may go away in the meantime. */ - gl_info = heap_alloc(sizeof(*gl_info)); - *gl_info = *context_gl->c.gl_info; - context_gl->c.gl_info = gl_info; - context_gl->c.destroyed = 1; - - return; - } - - wined3d_context_gl_cleanup(context_gl); - TlsSetValue(context_get_tls_idx(), NULL); - heap_free(context_gl); + return wined3d_context_gl_release(wined3d_context_gl(context)); } static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) @@ -4672,8 +4637,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy, adapter_gl_create_device, adapter_gl_destroy_device, - adapter_gl_create_context, - adapter_gl_destroy_context, + adapter_gl_acquire_context, + adapter_gl_release_context, adapter_gl_get_wined3d_caps, adapter_gl_check_format, adapter_gl_init_3d, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b944b2fb32a..00098182c1a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -28,6 +28,8 @@ struct wined3d_device_vk { struct wined3d_device d; + struct wined3d_context context_vk; + VkDevice vk_device; VkQueue vk_queue; @@ -288,33 +290,22 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -static HRESULT adapter_vk_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) +struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context *context_vk; - HRESULT hr; - - TRACE("swapchain %p, context %p.\n", swapchain, context); + TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - if (!(context_vk = heap_alloc_zero(sizeof(*context_vk)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = wined3d_context_vk_init(context_vk, swapchain))) - { - WARN("Failed to initialise context.\n"); - heap_free(context_vk); - return hr; - } + wined3d_from_cs(device->cs); - TRACE("Created context %p.\n", context_vk); - *context = context_vk; + if (!device->context_count) + return NULL; - return WINED3D_OK; + return &wined3d_device_vk(device)->context_vk; } -static void adapter_vk_destroy_context(struct wined3d_context *context) +void adapter_vk_release_context(struct wined3d_context *context) { - wined3d_context_cleanup(context); - heap_free(context); + TRACE("context %p.\n", context); } static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) @@ -425,14 +416,39 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_context *context_vk; + HRESULT hr; + TRACE("device %p.\n", device); + context_vk = &wined3d_device_vk(device)->context_vk; + if (FAILED(hr = wined3d_context_vk_init(context_vk, device->swapchains[0]))) + { + WARN("Failed to initialise context.\n"); + return hr; + } + + if (!device_context_add(device, context_vk)) + { + ERR("Failed to add the newly created context to the context list.\n"); + wined3d_context_cleanup(context_vk); + return E_FAIL; + } + + TRACE("Initialised context %p.\n", context_vk); + return WINED3D_OK; } static void adapter_vk_uninit_3d(struct wined3d_device *device) { + struct wined3d_context *context_vk; + TRACE("device %p.\n", device); + + context_vk = &wined3d_device_vk(device)->context_vk; + device_context_remove(device, context_vk); + wined3d_context_cleanup(context_vk); } static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = @@ -440,8 +456,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy, adapter_vk_create_device, adapter_vk_destroy_device, - adapter_vk_create_context, - adapter_vk_destroy_context, + adapter_vk_acquire_context, + adapter_vk_release_context, adapter_vk_get_wined3d_caps, adapter_vk_check_format, adapter_vk_init_3d, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2a2b2e8a87c..9784a48f91f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1328,7 +1328,7 @@ void wined3d_context_cleanup(struct wined3d_context *context) { } -void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) +static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; @@ -1566,9 +1566,9 @@ BOOL context_set_current(struct wined3d_context *ctx) return TlsSetValue(wined3d_context_tls_idx, ctx); } -void context_release(struct wined3d_context *context) +void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_context *context = &context_gl->c; TRACE("Releasing context %p, level %u.\n", context_gl, context->level); @@ -1594,8 +1594,8 @@ void context_release(struct wined3d_context *context) if (context->destroy_delayed) { - TRACE("Destroying context %p.\n", context); - wined3d_context_destroy(context); + TRACE("Destroying context %p.\n", context_gl); + wined3d_context_gl_destroy(context_gl); } } } @@ -2302,54 +2302,45 @@ HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined return WINED3D_OK; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain) +void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) { - struct wined3d_device *device = swapchain->device; - struct wined3d_context *context; - HRESULT hr; + struct wined3d_device *device = context_gl->c.device; - TRACE("swapchain %p.\n", swapchain); + TRACE("Destroying context %p.\n", context_gl); wined3d_from_cs(device->cs); - if (FAILED(hr = device->adapter->adapter_ops->adapter_create_context(swapchain, &context))) - return NULL; - - if (!device_context_add(device, context)) + /* We delay destroying a context when it is active. The context_release() + * function invokes wined3d_context_gl_destroy() again while leaving the + * last level. */ + if (context_gl->c.level) { - ERR("Failed to add the newly created context to the context list.\n"); - device->adapter->adapter_ops->adapter_destroy_context(context); - return NULL; + TRACE("Delaying destruction of context %p.\n", context_gl); + context_gl->c.destroy_delayed = 1; + /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ + context_gl->c.swapchain = NULL; + return; } - TRACE("Created context %p.\n", context); + device_context_remove(device, &context_gl->c); - return context; -} - -void wined3d_context_destroy(struct wined3d_context *context) -{ - struct wined3d_device *device = context->device; - - TRACE("Destroying ctx %p\n", context); + if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + { + struct wined3d_gl_info *gl_info; - wined3d_from_cs(device->cs); + /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the + * one in wined3d_adapter may go away in the meantime. */ + gl_info = heap_alloc(sizeof(*gl_info)); + *gl_info = *context_gl->c.gl_info; + context_gl->c.gl_info = gl_info; + context_gl->c.destroyed = 1; - /* We delay destroying a context when it is active. The context_release() - * function invokes wined3d_context_destroy() again while leaving the last - * level. */ - if (context->level) - { - TRACE("Delaying destruction of context %p.\n", context); - context->destroy_delayed = 1; - /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ - context->swapchain = NULL; return; } - device_context_remove(device, context); - - device->adapter->adapter_ops->adapter_destroy_context(context); + wined3d_context_gl_cleanup(context_gl); + TlsSetValue(context_get_tls_idx(), NULL); + heap_free(context_gl); } const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, @@ -4206,7 +4197,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, } } -struct wined3d_context *context_acquire(const struct wined3d_device *device, +struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { struct wined3d_context *current_context = context_get_current(); @@ -4215,8 +4206,6 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); - if (current_context && current_context->destroyed) current_context = NULL; @@ -4270,7 +4259,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, return context; } -struct wined3d_context *context_reacquire(const struct wined3d_device *device, +struct wined3d_context *context_reacquire(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_context *acquired_context; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 683401bd1da..ed77a6e144a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1075,7 +1075,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) if (device->contexts[0]->swapchain) swapchain_destroy_contexts(device->contexts[0]->swapchain); else - wined3d_context_destroy(device->contexts[0]); + wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 49fa3a35f74..313e522f4a5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2233,21 +2233,22 @@ static HRESULT adapter_no3d_create_device(struct wined3d *wined3d, const struct const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - struct wined3d_device *object; + struct wined3d_device_no3d *device_no3d; HRESULT hr; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(device_no3d = heap_alloc_zero(sizeof(*device_no3d)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_device_init(object, wined3d, adapter->ordinal, device_type, + if (FAILED(hr = wined3d_device_init(&device_no3d->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(object); + heap_free(device_no3d); return hr; } - *device = object; + *device = &device_no3d->d; + return WINED3D_OK; } @@ -2257,32 +2258,22 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) heap_free(device); } -static HRESULT adapter_no3d_create_context(struct wined3d_swapchain *swapchain, struct wined3d_context **context) +struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context *context_no3d; - - TRACE("swapchain %p, context %p.\n", swapchain, context); - - if (!(context_no3d = heap_alloc_zero(sizeof(*context_no3d)))) - return E_OUTOFMEMORY; + TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - if (FAILED(wined3d_context_no3d_init(context_no3d, swapchain))) - { - WARN("Failed to initialise context.\n"); - heap_free(context_no3d); - return E_FAIL; - } + wined3d_from_cs(device->cs); - TRACE("Created context %p.\n", context_no3d); - *context = context_no3d; + if (!device->context_count) + return NULL; - return WINED3D_OK; + return &wined3d_device_no3d(device)->context_no3d; } -static void adapter_no3d_destroy_context(struct wined3d_context *context) +void adapter_no3d_release_context(struct wined3d_context *context) { - wined3d_context_cleanup(context); - heap_free(context); + TRACE("context %p.\n", context); } static void adapter_no3d_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) @@ -2298,11 +2289,32 @@ static BOOL adapter_no3d_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_no3d_init_3d(struct wined3d_device *device) { + struct wined3d_context *context_no3d; + HRESULT hr; + TRACE("device %p.\n", device); + context_no3d = &wined3d_device_no3d(device)->context_no3d; + if (FAILED(hr = wined3d_context_no3d_init(context_no3d, device->swapchains[0]))) + { + WARN("Failed to initialise context.\n"); + return hr; + } + + if (!device_context_add(device, context_no3d)) + { + ERR("Failed to add the newly created context to the context list.\n"); + wined3d_context_cleanup(context_no3d); + return E_FAIL; + } + + TRACE("Initialised context %p.\n", context_no3d); + if (!(device->blitter = wined3d_cpu_blitter_create())) { ERR("Failed to create CPU blitter.\n"); + device_context_remove(device, context_no3d); + wined3d_context_cleanup(context_no3d); return E_FAIL; } @@ -2311,9 +2323,14 @@ static HRESULT adapter_no3d_init_3d(struct wined3d_device *device) static void adapter_no3d_uninit_3d(struct wined3d_device *device) { + struct wined3d_context *context_no3d; + TRACE("device %p.\n", device); + context_no3d = &wined3d_device_no3d(device)->context_no3d; device->blitter->ops->blitter_destroy(device->blitter, NULL); + device_context_remove(device, context_no3d); + wined3d_context_cleanup(context_no3d); } static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = @@ -2321,8 +2338,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy, adapter_no3d_create_device, adapter_no3d_destroy_device, - adapter_no3d_create_context, - adapter_no3d_destroy_context, + adapter_no3d_acquire_context, + adapter_no3d_release_context, adapter_no3d_get_wined3d_caps, adapter_no3d_check_format, adapter_no3d_init_3d, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 87c50eebe51..eeec8e25098 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -180,7 +180,7 @@ static BOOL wined3d_fence_supported(const struct wined3d_gl_info *gl_info) } static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence *fence, - const struct wined3d_device *device, DWORD flags) + struct wined3d_device *device, DWORD flags) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -258,7 +258,7 @@ static enum wined3d_fence_result wined3d_fence_test(const struct wined3d_fence * } enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, - const struct wined3d_device *device) + struct wined3d_device *device) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -332,7 +332,7 @@ enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, return ret; } -void wined3d_fence_issue(struct wined3d_fence *fence, const struct wined3d_device *device) +void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) { struct wined3d_context *context = NULL; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a30605b912a..7d126420d17 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -149,7 +149,7 @@ static BOOL is_multisample_location(const struct wined3d_texture_gl *texture_gl, /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ -static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3d_context *context, +static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 481b3b718ed..2c816218c8e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1059,32 +1059,51 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain *swapchain) { + struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; struct wined3d_context **ctx_array; - struct wined3d_context *ctx; TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(swapchain))) + wined3d_from_cs(device->cs); + + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) + { + ERR("Failed to allocate context memory.\n"); + return NULL; + } + + if (FAILED(wined3d_context_gl_init(context_gl, swapchain))) { - ERR("Failed to create a new context for the swapchain\n"); + WARN("Failed to initialise context.\n"); + heap_free(context_gl); return NULL; } - context_release(ctx); + + if (!device_context_add(device, &context_gl->c)) + { + ERR("Failed to add the newly created context to the context list.\n"); + wined3d_context_gl_destroy(context_gl); + return NULL; + } + + TRACE("Created context %p.\n", context_gl); + + context_release(&context_gl->c); if (!(ctx_array = heap_calloc(swapchain->num_contexts + 1, sizeof(*ctx_array)))) { - ERR("Out of memory when trying to allocate a new context array\n"); - wined3d_context_destroy(ctx); + ERR("Failed to allocate new context array memory.\n"); + wined3d_context_gl_destroy(context_gl); return NULL; } memcpy(ctx_array, swapchain->context, sizeof(*ctx_array) * swapchain->num_contexts); heap_free(swapchain->context); - ctx_array[swapchain->num_contexts] = ctx; + ctx_array[swapchain->num_contexts] = &context_gl->c; swapchain->context = ctx_array; swapchain->num_contexts++; - TRACE("Returning context %p\n", ctx); - return ctx; + return &context_gl->c; } void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) @@ -1093,7 +1112,7 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) for (i = 0; i < swapchain->num_contexts; ++i) { - wined3d_context_destroy(swapchain->context[i]); + wined3d_context_gl_destroy(wined3d_context_gl(swapchain->context[i])); } heap_free(swapchain->context); swapchain->num_contexts = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index beda90093c3..dc60d874bd6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -490,7 +490,7 @@ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; - const struct wined3d_device *device = texture->resource.device; + struct wined3d_device *device = texture->resource.device; DWORD map_binding = texture->update_map_binding; struct wined3d_context *context = NULL; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 864476c6f07..89d3272a091 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1733,9 +1733,9 @@ struct wined3d_fence HRESULT wined3d_fence_create(struct wined3d_device *device, struct wined3d_fence **fence) DECLSPEC_HIDDEN; void wined3d_fence_destroy(struct wined3d_fence *fence) DECLSPEC_HIDDEN; -void wined3d_fence_issue(struct wined3d_fence *fence, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_fence_issue(struct wined3d_fence *fence, struct wined3d_device *device) DECLSPEC_HIDDEN; enum wined3d_fence_result wined3d_fence_wait(const struct wined3d_fence *fence, - const struct wined3d_device *device) DECLSPEC_HIDDEN; + struct wined3d_device *device) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued * state because only the driver knows about it, but we have a created state @@ -2057,6 +2057,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_fence(struct wined3d_context_gl *context_gl, @@ -2081,7 +2083,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; -void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) DECLSPEC_HIDDEN; @@ -2094,6 +2096,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; @@ -2232,16 +2235,12 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -struct wined3d_context *context_acquire(const struct wined3d_device *device, - struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; @@ -2258,9 +2257,8 @@ void context_invalidate_compute_state(struct wined3d_context *context, DWORD sta void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; -struct wined3d_context *context_reacquire(const struct wined3d_device *device, +struct wined3d_context *context_reacquire(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -2745,8 +2743,9 @@ struct wined3d_adapter_ops BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); void (*adapter_destroy_device)(struct wined3d_device *device); - HRESULT (*adapter_create_context)(struct wined3d_swapchain *swapchain, struct wined3d_context **context); - void (*adapter_destroy_context)(struct wined3d_context *context); + struct wined3d_context *(*adapter_acquire_context)(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx); + void (*adapter_release_context)(struct wined3d_context *context); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); BOOL (*adapter_check_format)(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, @@ -3240,6 +3239,18 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN; +struct wined3d_device_no3d +{ + struct wined3d_device d; + + struct wined3d_context context_no3d; +}; + +static inline struct wined3d_device_no3d *wined3d_device_no3d(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_no3d, d); +} + struct wined3d_device_gl { struct wined3d_device d; @@ -4899,6 +4910,19 @@ BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) D void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting, const struct wined3d_matrix *modelview) DECLSPEC_HIDDEN; +static inline struct wined3d_context *context_acquire(struct wined3d_device *device, + struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + wined3d_from_cs(device->cs); + + return device->adapter->adapter_ops->adapter_acquire_context(device, texture, sub_resource_idx); +} + +static inline void context_release(struct wined3d_context *context) +{ + context->device->adapter->adapter_ops->adapter_release_context(context); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the blit dimension fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 +++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 86003610023..2a2b2e8a87c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2791,12 +2791,11 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (context->last_was_blit) { - if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) { gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); context->viewport_count = WINED3D_MAX_VIEWPORTS; - context->blit_w = rt_size.cx; - context->blit_h = rt_size.cy; + context_gl->blit_size = rt_size; /* No need to dirtify here, the states are still dirtified because * they weren't applied since the last context_apply_blit_state() * call. */ @@ -2870,8 +2869,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, device->shader_backend->shader_disable(device->shader_priv, context); - context->blit_w = rt_size.cx; - context->blit_h = rt_size.cy; + context_gl->blit_size = rt_size; checkGLcall("blit state application"); } @@ -2909,7 +2907,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ SIZE rt_size; wined3d_context_gl_get_rt_size(context_gl, &rt_size); - if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) context_apply_blit_projection(context, rt_size.cx, rt_size.cy); wined3d_context_gl_apply_blit_state(context_gl, device); @@ -2964,7 +2962,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glLoadIdentity(); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - context_apply_blit_projection(context, context->blit_w, context->blit_h); + context_apply_blit_projection(context, context_gl->blit_size.cx, context_gl->blit_size.cy); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); /* Other misc states. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4eddc55cd5b..864476c6f07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1944,8 +1944,7 @@ struct wined3d_context DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */ GLenum untracked_materials[2]; - UINT blit_w, blit_h; - enum fogsource fog_source; + enum fogsource fog_source; UINT instance_count; @@ -1982,6 +1981,7 @@ struct wined3d_context_gl uint32_t default_attrib_value_set; + SIZE blit_size; unsigned int active_texture; GLenum *texture_type; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Move the "active_texture" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7988eb6dd9d..86003610023 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2520,7 +2520,7 @@ void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); checkGLcall("glActiveTexture"); - context_gl->c.active_texture = unit; + context_gl->active_texture = unit; } void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) @@ -2545,7 +2545,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen else target = GL_NONE; - unit = context_gl->c.active_texture; + unit = context_gl->active_texture; old_texture_type = context_gl->texture_type[unit]; if (old_texture_type != target) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e3d9d54900c..beda90093c3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1061,9 +1061,9 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we * would risk marking already applied sampler states dirty again. */ - if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1d61d09c25f..b43dcddcdf2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -858,9 +858,9 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } @@ -912,7 +912,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - GL_EXTCALL(glBindSampler(context->active_texture, 0)); + GL_EXTCALL(glBindSampler(context_gl->active_texture, 0)); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); if (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec40e3bd48c..4eddc55cd5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1946,7 +1946,6 @@ struct wined3d_context GLenum untracked_materials[2]; UINT blit_w, blit_h; enum fogsource fog_source; - DWORD active_texture; UINT instance_count; @@ -1983,6 +1982,8 @@ struct wined3d_context_gl uint32_t default_attrib_value_set; + unsigned int active_texture; + GLenum *texture_type; /* The WGL context. */ -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_active_texture().
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 15 ++++++++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 8 ++++---- dlls/wined3d/state.c | 22 +++++++++++++--------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e6546abf842..29908b8bae9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7379,7 +7379,7 @@ static void arbfp_blitter_upload_palette(struct wined3d_arbfp_blitter *blitter, } /* Switch back to unit 0 in which the 2D texture will be stored. */ - context_active_texture(&context_gl->c, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 0a7b832c7f9..e166d99bf1f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1055,7 +1055,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined mapped_stage = context_gl->tex_unit_map[i]; if (mapped_stage != WINED3D_UNMAPPED_STAGE) { - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); texture_activate_dimensions(state->textures[i], gl_info); } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9dbdd945f09..7988eb6dd9d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2209,7 +2209,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi */ for (i = 1; i < gl_info->limits.textures; ++i) { - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + i - 1); checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ..."); @@ -2240,7 +2240,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { for (i = 0; i < gl_info->limits.textures; ++i) { - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } @@ -2515,11 +2515,12 @@ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, G } /* Context activation is done by the caller. */ -void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) +void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, + const struct wined3d_gl_info *gl_info, unsigned int unit) { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); checkGLcall("glActiveTexture"); - context->active_texture = unit; + context_gl->c.active_texture = unit; } void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) @@ -2808,7 +2809,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(0, 0)); - context_active_texture(context, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); sampler = context_gl->rev_tex_unit_map[0]; if (sampler != WINED3D_UNMAPPED_STAGE) @@ -2923,7 +2924,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ * from. */ for (i = gl_info->limits.textures - 1; i > 0 ; --i) { - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); @@ -2943,7 +2944,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ } } - context_active_texture(context, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6cfc2b23d6c..683401bd1da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -690,7 +690,7 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - context_active_texture(&context_gl->c, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d); TRACE("Dummy 1D texture given name %u.\n", textures->tex_1d); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fe8812bcbb5..ab62c1ca599 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12779,7 +12779,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); - context_active_texture(&context_gl->c, gl_info, 1); + wined3d_context_gl_active_texture(context_gl, gl_info, 1); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, blitter->palette_texture); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -12799,7 +12799,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, GL_UNSIGNED_INT_8_8_8_8_REV, &black); } - context_active_texture(&context_gl->c, gl_info, 0); + wined3d_context_gl_active_texture(context_gl, gl_info, 0); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index c95a6cb3539..f4b0791f47d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -501,7 +501,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s FIXME("Attempt to enable unsupported stage!\n"); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } if (context->lowest_disabled_stage > 0) @@ -579,9 +579,9 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s BOOL usedBump = !!(context->texShaderBumpMap & 1u << (stage + 1)); if (usesBump != usedBump) { - context_active_texture(context, gl_info, mapped_stage + 1); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); nvts_activate_dimensions(state, stage + 1, context); - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } } } @@ -639,7 +639,7 @@ static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3 */ if (mapped_stage < gl_info->limits.textures) { - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); /* We can't just pass a pointer to the state to GL due to the * different matrix format (column major vs row major). */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 08423e831fd..b2fcbddd57f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -827,6 +827,7 @@ static void state_specularenable(struct wined3d_context *context, const struct w static void state_texfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_color color; unsigned int i; @@ -840,7 +841,7 @@ static void state_texfactor(struct wined3d_context *context, const struct wined3 { /* Note the WINED3D_RS value applies to all textures, but GL has one * per texture, so apply it now ready to be used! */ - context_active_texture(context, gl_info, i); + wined3d_context_gl_active_texture(context_gl, gl_info, i); gl_info->gl_ops.gl.p_glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &color.r); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); @@ -3128,8 +3129,9 @@ static void set_tex_op(const struct wined3d_gl_info *gl_info, const struct wined static void tex_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - unsigned int mapped_stage = wined3d_context_gl(context)->tex_unit_map[stage]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); BOOL tex_used = context->fixed_function_usage_map & (1u << stage); + unsigned int mapped_stage = context_gl->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Setting color op for stage %d\n", stage); @@ -3146,7 +3148,7 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st FIXME("Attempt to enable unsupported stage!\n"); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } if (stage >= context->lowest_disabled_stage) @@ -3189,8 +3191,9 @@ static void tex_colorop(struct wined3d_context *context, const struct wined3d_st void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - unsigned int mapped_stage = wined3d_context_gl(context)->tex_unit_map[stage]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); BOOL tex_used = context->fixed_function_usage_map & (1u << stage); + unsigned int mapped_stage = context_gl->tex_unit_map[stage]; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD op, arg1, arg2, arg0; @@ -3203,7 +3206,7 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st FIXME("Attempt to enable unsupported stage!\n"); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } op = state->texture_states[stage][WINED3D_TSS_ALPHA_OP]; @@ -3288,7 +3291,8 @@ void tex_alphaop(struct wined3d_context *context, const struct wined3d_state *st static void transform_texture(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { unsigned int tex = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - unsigned int mapped_stage = wined3d_context_gl(context)->tex_unit_map[tex]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + unsigned int mapped_stage = context_gl->tex_unit_map[tex]; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_matrix mat; @@ -3302,7 +3306,7 @@ static void transform_texture(struct wined3d_context *context, const struct wine if (mapped_stage == WINED3D_UNMAPPED_STAGE) return; if (mapped_stage >= gl_info->limits.textures) return; - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); checkGLcall("glMatrixMode(GL_TEXTURE)"); @@ -3335,7 +3339,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d WARN("stage %u not mapped to a valid texture unit (%u)\n", stage, mapped_stage); return; } - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); /* Values 0-7 are indexes into the FVF tex coords - See comments in DrawPrimitive * @@ -3613,7 +3617,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (mapped_stage >= gl_info->limits.graphics_samplers) return; - context_active_texture(context, gl_info, mapped_stage); + wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); if (state->textures[sampler_idx]) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8f319f06a1..1d61d09c25f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -834,7 +834,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_gl *texture_gl; - context_active_texture(context, gl_info, unit); + wined3d_context_gl_active_texture(context_gl, gl_info, unit); if (view_gl->gl_view.name) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a373cc97b9b..ec40e3bd48c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2056,6 +2056,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, + const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_fence(struct wined3d_context_gl *context_gl, struct wined3d_fence *fence) DECLSPEC_HIDDEN; void wined3d_context_gl_alloc_occlusion_query(struct wined3d_context_gl *context_gl, @@ -2231,8 +2233,6 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSP struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, - unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_resource_view_gl_bind_and_dirtify().
by Henri Verbeet 05 Jun '19

05 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f3de77022b6..a8f319f06a1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -856,20 +856,18 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl /* Context activation is done by the caller. */ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (context->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context->active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } /* FIXME: Ideally we'd only do this when touching a binding that's used by * a shader. */ - context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); - context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); + context_invalidate_compute_state(&context_gl->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); } @@ -880,6 +878,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * unsigned int i, j, layer_count, level_count, base_level, max_level; const struct wined3d_gl_info *gl_info; struct wined3d_texture_gl *texture_gl; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; struct gl_texture *gl_tex; DWORD location; @@ -888,6 +887,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); context = context_acquire(view_gl->v.resource->device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; @@ -902,11 +902,11 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * if (view_gl->gl_view.name) { - shader_resource_view_gl_bind_and_dirtify(view_gl, context); + shader_resource_view_gl_bind_and_dirtify(view_gl, context_gl); } else { - wined3d_texture_gl_bind_and_dirtify(texture_gl, wined3d_context_gl(context), srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); } -- 2.11.0

1 0

[PATCH] mf/tests: Add some more Video Processor tests.
by Nikolay Sivov 05 Jun '19

05 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 81 +++++++++++++++++++++++++++++++++-------- include/mftransform.idl | 5 +++ 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index cc85221dc0..f55104c039 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2062,7 +2062,8 @@ static void test_video_processor(void) DWORD input_count, output_count, input_id, output_id, flags; DWORD input_min, input_max, output_min, output_max, i, count; IMFAttributes *attributes, *attributes2; - IMFMediaType *media_type; + IMFMediaType *media_type, *media_type2; + MFT_INPUT_STREAM_INFO input_info; IMFTransform *transform; HRESULT hr; GUID guid; @@ -2123,20 +2124,6 @@ todo_wine IMFAttributes_Release(attributes); IMFAttributes_Release(attributes2); - for (i = 0;;++i) - { - hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type); - if (hr == MF_E_NO_MORE_TYPES) - break; - ok(hr == S_OK, "Failed to get supported input type, hr %#x.\n", hr); - - hr = IMFMediaType_GetMajorType(media_type, &guid); - ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); - ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type.\n"); - - IMFMediaType_Release(media_type); - } - hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); @@ -2152,11 +2139,33 @@ todo_wine hr = IMFTransform_GetOutputCurrentType(transform, 1, &media_type); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputStreamInfo(transform, 1, &input_info); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); + ok(input_info.dwFlags == 0, "Unexpected flag %#x.\n", input_info.dwFlags); + ok(input_info.cbSize == 0, "Unexpected size %u.\n", input_info.cbSize); + ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); + /* Configure stream types. */ for (i = 0;;++i) { if (FAILED(hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type))) + { + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); break; + } + + hr = IMFTransform_GetInputAvailableType(transform, 0, i, &media_type2); + ok(hr == S_OK, "Failed to get available type, hr %#x.\n", hr); + ok(media_type != media_type2, "Unexpected instance.\n"); + IMFMediaType_Release(media_type2); + + hr = IMFMediaType_GetMajorType(media_type, &guid); + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type.\n"); hr = IMFMediaType_GetCount(media_type, &count); ok(hr == S_OK, "Failed to get attributes count, hr %#x.\n", hr); @@ -2166,6 +2175,48 @@ todo_wine ok(hr == S_OK, "Failed to get subtype, hr %#x.\n", hr); ok(is_supported_video_type(&guid), "Unexpected media type %s.\n", wine_dbgstr_guid(&guid)); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type2); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + + /* FIXME: figure out if those require additional attributes or simply advertised but not supported */ + if (IsEqualGUID(&guid, &MFVideoFormat_L8) || IsEqualGUID(&guid, &MFVideoFormat_L16) + || IsEqualGUID(&guid, &MFVideoFormat_D16) || IsEqualGUID(&guid, &MFVideoFormat_420O) + || IsEqualGUID(&guid, &MFVideoFormat_A16B16G16R16F)) + { + IMFMediaType_Release(media_type); + continue; + } + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, ((UINT64)16 << 32) | 16); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == S_OK, "Failed to test input type %s, hr %#x.\n", wine_dbgstr_guid(&guid), hr); + + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == S_OK, "Failed to test input type, hr %#x.\n", hr); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); + ok(media_type != media_type2, "Unexpected instance.\n"); + IMFMediaType_Release(media_type2); + + hr = IMFTransform_GetInputStatus(transform, 0, &flags); + ok(hr == S_OK, "Failed to get input status, hr %#x.\n", hr); + ok(flags == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected input status %#x.\n", flags); + + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "Failed to get stream info, hr %#x.\n", hr); + ok(input_info.dwFlags == 0, "Unexpected flag %#x.\n", input_info.dwFlags); + ok(input_info.cbMaxLookahead == 0, "Unexpected lookahead length %u.\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 0, "Unexpected alignment %u.\n", input_info.cbAlignment); + IMFMediaType_Release(media_type); } diff --git a/include/mftransform.idl b/include/mftransform.idl index 4321d002be..ca2f781a6b 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -61,6 +61,11 @@ enum _MFT_SET_TYPE_FLAGS MFT_SET_TYPE_TEST_ONLY = 0x00000001, }; +enum _MFT_INPUT_STATUS_FLAGS +{ + MFT_INPUT_STATUS_ACCEPT_DATA = 0x00000001, +}; + [ object, uuid(bf94c121-5b05-4e6f-8000-ba598961414d) -- 2.20.1

1 0

[PATCH v4 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 10 +++---- include/ddk/d3dkmthk.h | 1 + 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d5765af2a1..9208f6ecd5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1395,3 +1395,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f5c23dad76..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,9 +194,9 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

3 2

[PATCH v4 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 52 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e021856b0a..d5765af2a1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,10 +59,17 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1343,3 +1350,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + FIXME("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + device->handle = ++handle_start; + desc->hDevice = device->handle; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f5c23dad76 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); -- 2.20.1

3 2

[PATCH v4 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fe66266e18..e021856b0a 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1279,8 +1279,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

3 2

[PATCH] ntdll: Make NtGetTickCount patchable
by Alistair Leslie-Hughes 05 Jun '19

05 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 20de627c28..efe260326c 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -557,7 +557,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONG WINAPI NtGetTickCount(void) +ULONG WINAPI DECLSPEC_HOTPATCH NtGetTickCount(void) { return monotonic_counter() / TICKSPERMSEC; } -- 2.20.1

3 3

[PATCH v4 1/4] user32/tests: Test restore window messages.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Mostly to show that there is a WM_ACTIVATE message before WM_SYSCOMMAND SC_RESTORE and after WM_WINDOWPOSCHANGED The Alt+Tab test won't work on non-Windows because the emulated key inputs doesn't reach the host, unless we required user interaction. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SetActiveWindow only when restoring from iconic state and window is visible. v3: Add a test to verify message sequence. v4: Add DefWindowProcA test to compare results. Add explorer patch. Supersede 165927~165929 dlls/user32/tests/msg.c | 141 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..cf491ad1c0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15345,6 +15345,46 @@ static const struct message NCXBUTTONUPSeq2[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to minimized visible window */ +static const struct message WmRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_NCACTIVATE, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_ACTIVATEAPP, sent|wparam, TRUE }, + { WM_NCACTIVATE, sent|wparam, TRUE }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, TRUE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_FRAMECHANGED|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_ACTIVATE, sent|wparam, TRUE }, + { WM_SYNCPAINT, sent|optional }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15399,6 +15439,15 @@ static void test_defwinproc(void) GetWindowTextA(hwnd, buffA, ARRAY_SIZE(buffA)); ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + flush_sequence(); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2; @@ -17522,6 +17571,97 @@ static void test_DoubleSetCapture(void) DestroyWindow(hwnd); } +static const struct message WmRestoreMinimizedSeq[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent|wparam, 0x200001 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0x200001 }, /* Note that activate messages are after WM_WINDOWPOSCHANGED and before WM_SYSCOMMAND */ + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { WM_SYSCOMMAND, sent|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|wparam, SC_RESTORE }, + { HCBT_SYSCOMMAND, hook|wparam|optional, SC_RESTORE }, + { HCBT_MINMAX, hook }, + { HCBT_MINMAX, hook|optional }, + { WM_QUERYOPEN, sent|defwinproc }, + { WM_QUERYOPEN, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|defwinproc }, + { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, + { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_ACTIVATE, sent|wparam|defwinproc, 1 }, + { WM_PAINT, sent| optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, + { WM_PAINT, sent| optional }, + { 0 } +}; + +static void test_restore_messages(void) +{ + INPUT ip = {0}; + HWND hwnd; + INT i; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + SetForegroundWindow(hwnd); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + for (i = 0; i < 5; i++) + { + /* Send Alt+Tab to restore test window from minimized state */ + ip.type = INPUT_KEYBOARD; + ip.ki.wVk = VK_MENU; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_MENU; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + flush_events(); + if (!IsIconic(hwnd)) + break; + Sleep(500); + } + + if (IsIconic(hwnd)) + { + skip("Alt+Tab failed to bring up test window.\n"); + goto done; + } + ok_sequence(WmRestoreMinimizedSeq, "Restore minimized window", TRUE); + +done: + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17646,6 +17786,7 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -- 2.20.1

2 1

[PATCH v4 2/4] winex11.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 05 Jun '19

05 Jun '19

Some games, e.g., Project CARS waits for WM_ACTIVATE when restoring from iconic state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f645c4..5c465aa033 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1266,6 +1266,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } -- 2.20.1

1 0

[PATCH] qcap: release filter only if allocated
by Marcus Meissner 05 Jun '19

05 Jun '19

fixes test crash when built without v4l2 Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/qcap/tests/videocapture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index b80b0f2624..062138e885 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -118,12 +118,12 @@ START_TEST(videocapture) { test_capture(filter); IBaseFilter_Release(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } else skip("Failed to open capture device, hr=%#x.\n", hr); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); IMoniker_Release(moniker); } -- 2.21.0

1 0

[PATCH 1/3] dbghelp: Reimplement SymGetLineFromAddrW64
by Alistair Leslie-Hughes 05 Jun '19

05 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 75 +++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index f59e322fef..177c66480d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1485,6 +1485,47 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun return FALSE; } +/****************************************************************** + * sym_fill_func_line_info64W + * + * fills information about a file + */ +static BOOL symt_fill_func_line_info64W(const struct module* module, const struct symt_function* func, + DWORD64 addr, IMAGEHLP_LINEW64* line) +{ + struct line_info* dli = NULL; + BOOL found = FALSE; + int i; + + assert(func->symt.tag == SymTagFunction); + + for (i=vector_length(&func->vlines)-1; i>=0; i--) + { + dli = vector_at(&func->vlines, i); + if (!dli->is_source_file) + { + if (found || dli->u.pc_offset > addr) continue; + line->LineNumber = dli->line_number; + line->Address = dli->u.pc_offset; + line->Key = dli; + found = TRUE; + continue; + } + if (found) + { + char *filename = (char*)source_get(module, dli->u.source_file); + int len = lstrlenA(filename)+1; + + line->FileName = fetch_buffer(module->process, len * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, filename, -1, line->FileName, len); + + return TRUE; + } + } + return FALSE; +} + /*********************************************************************** * SymGetSymNext64 (DBGHELP.@) */ @@ -1544,22 +1585,6 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) l64->Address = l32->Address; } -/****************************************************************** - * copy_line_W64_from_32 (internal) - * - */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) -{ - unsigned len; - - l64w->Key = l64->Key; - l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); - l64w->Address = l64->Address; -} - /****************************************************************** * copy_line_32_from_64 (internal) * @@ -1623,12 +1648,20 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line) { - IMAGEHLP_LINE64 il64; + struct module_pair pair; + struct symt_ht* symt; + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; + + if (symt->symt.tag != SymTagFunction) return FALSE; + if (!symt_fill_func_line_info64W(pair.effective, (struct symt_function*)symt, + dwAddr, Line)) return FALSE; + *pdwDisplacement = dwAddr - Line->Address; - il64.SizeOfStruct = sizeof(il64); - if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) - return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); return TRUE; } -- 2.17.1

2 3

[PATCH 1/6] qcap/smartteefilter: Use strmbase filter aggregation support.
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/smartteefilter.c | 116 ++++++++------------------------------------- 1 file changed, 20 insertions(+), 96 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index a79e4bb..4095d95 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -36,19 +36,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { - IUnknown IUnknown_iface; - IUnknown *outerUnknown; BaseFilter filter; BaseInputPin *input; BaseOutputPin *capture; BaseOutputPin *preview; } SmartTeeFilter; -static inline SmartTeeFilter *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, SmartTeeFilter, IUnknown_iface); -} - static inline SmartTeeFilter *impl_from_BaseFilter(BaseFilter *filter) { return CONTAINING_RECORD(filter, SmartTeeFilter, filter); @@ -71,80 +64,6 @@ static inline SmartTeeFilter *impl_from_IPin(IPin *iface) return impl_from_IBaseFilter(bp->pinInfo.pFilter); } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - if (IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; - } else if (IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else if (IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - } else { - FIXME("(%p): no interface for %s\n", This, debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - return BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - SmartTeeFilter *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->filter.refcount); - - TRACE("(%p)->() ref=%d\n", This, ref); - - if (!ref) { - if(This->input) - BaseInputPinImpl_Release(&This->input->pin.IPin_iface); - if(This->capture) - BaseOutputPinImpl_Release(&This->capture->pin.IPin_iface); - if(This->preview) - BaseOutputPinImpl_Release(&This->preview->pin.IPin_iface); - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - return ref; -} - -static const IUnknownVtbl UnknownVtbl = { - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; - -static HRESULT WINAPI SmartTeeFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(This->outerUnknown, riid, ppv); -} - -static ULONG WINAPI SmartTeeFilter_AddRef(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_AddRef(This->outerUnknown); -} - -static ULONG WINAPI SmartTeeFilter_Release(IBaseFilter *iface) -{ - SmartTeeFilter *This = impl_from_IBaseFilter(iface); - return IUnknown_Release(This->outerUnknown); -} - static HRESULT WINAPI SmartTeeFilter_Stop(IBaseFilter *iface) { SmartTeeFilter *This = impl_from_IBaseFilter(iface); @@ -182,9 +101,9 @@ static HRESULT WINAPI SmartTeeFilter_Run(IBaseFilter *iface, REFERENCE_TIME tSta } static const IBaseFilterVtbl SmartTeeFilterVtbl = { - SmartTeeFilter_QueryInterface, - SmartTeeFilter_AddRef, - SmartTeeFilter_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, SmartTeeFilter_Stop, SmartTeeFilter_Pause, @@ -217,8 +136,23 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) return ret; } +static void smart_tee_destroy(BaseFilter *iface) +{ + SmartTeeFilter *filter = impl_from_BaseFilter(iface); + + if (filter->input) + BaseInputPinImpl_Release(&filter->input->pin.IPin_iface); + if (filter->capture) + BaseOutputPinImpl_Release(&filter->capture->pin.IPin_iface); + if (filter->preview) + BaseOutputPinImpl_Release(&filter->preview->pin.IPin_iface); + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable SmartTeeFilterFuncs = { .filter_get_pin = smart_tee_get_pin, + .filter_destroy = smart_tee_destroy, }; static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) @@ -586,21 +520,14 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) HRESULT hr; SmartTeeFilter *This = NULL; - TRACE("(%p, %p)\n", outer, phr); - This = CoTaskMemAlloc(sizeof(*This)); if (This == NULL) { *phr = E_OUTOFMEMORY; return NULL; } memset(This, 0, sizeof(*This)); - This->IUnknown_iface.lpVtbl = &UnknownVtbl; - if (outer) - This->outerUnknown = outer; - else - This->outerUnknown = &This->IUnknown_iface; - strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, NULL, &CLSID_SmartTee, + strmbase_filter_init(&This->filter, &SmartTeeFilterVtbl, outer, &CLSID_SmartTee, (DWORD_PTR)(__FILE__ ": SmartTeeFilter.csFilter"), &SmartTeeFilterFuncs); inputPinInfo.pFilter = &This->filter.IBaseFilter_iface; @@ -626,10 +553,7 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) end: *phr = hr; if (SUCCEEDED(hr)) { - if (outer) - return &This->IUnknown_iface; - else - return (IUnknown*)&This->filter.IBaseFilter_iface; + return &This->filter.IUnknown_inner; } else { strmbase_filter_cleanup(&This->filter); return NULL; -- 2.7.4

1 5

[PATCH 1/5] ntoskrnl.exe: Free device IDs from pool.
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 23ae4ca..d8f74e0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -301,7 +301,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) if (get_driver_for_id( ptr, driver )) break; } - RtlFreeHeap( GetProcessHeap(), 0, ids ); + ExFreePool( ids ); if (!driver[0]) { @@ -409,7 +409,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP else status = STATUS_BUFFER_TOO_SMALL; - HeapFree( GetProcessHeap(), 0, id ); + ExFreePool( id ); break; } case DevicePropertyPhysicalDeviceObjectName: @@ -658,17 +658,17 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla HeapFree( GetProcessHeap(), 0, id ); if (!rc) { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } else { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; -- 2.7.4

1 4

[PATCH] mshtml: Print the debug strings and not the pointers to them
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 87147df6eb..ba29b56a23 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -1176,7 +1176,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjec HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); RECT r; - TRACE("(%p)->(%p %p)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); + TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); if(clip && !EqualRect(clip, pos)) FIXME("Ignoring clip rect %s\n", wine_dbgstr_rect(clip)); -- 2.20.1

2 1

[PATCH] msvcp: Add _Strxfrm implementation.
by Piotr Caban 04 Jun '19

04 Jun '19

1 0

[PATCH] winedbg: Fix the spelling of a comment
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Of course the comment could be just dropped programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index f3585f2b4e..053ace94ac 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -491,7 +491,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) WideCharToMultiByte(CP_ACP, 0, ptr, -1, tmp, sizeof(tmp), NULL, NULL); HeapFree(GetProcessHeap(), 0, ptr); dbg_printf("%s", tmp); - count = 0; /* so that we'll get away from outter loop */ + count = 0; /* so that we'll get away from outer loop */ break; } } -- 2.20.1

1 0

[PATCH] winedump: Fix the spelling of a string
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5f7765f4d3..fbe7f9e541 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -825,7 +825,7 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type int count = *(const unsigned short*)((const char*)type + 4); int shift = 0; const char* ptr = (const char*)type + 6; - const char* desc[] = {"Near", "Far", "Thin", "Disp to outtermost", + const char* desc[] = {"Near", "Far", "Thin", "Disp to outermost", "Pointer to metaclass", "Near32", "Far32"}; printf("\t%x => VT Shape #%d: ", curr_type, count); while (count--) -- 2.20.1

1 0

[PATCH] dbghelp: Fix the spelling of a parameter
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/module.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cfbb58683f..d9d8417e84 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -334,16 +334,15 @@ static struct module* module_get_container(const struct process* pcs, * module_get_containee * */ -struct module* module_get_containee(const struct process* pcs, - const struct module* outter) +struct module* module_get_containee(const struct process* pcs, const struct module* outer) { struct module* module; - + for (module = pcs->lmodules; module; module = module->next) { - if (module != outter && - outter->module.BaseOfImage <= module->module.BaseOfImage && - outter->module.BaseOfImage + outter->module.ImageSize >= + if (module != outer && + outer->module.BaseOfImage <= module->module.BaseOfImage && + outer->module.BaseOfImage + outer->module.ImageSize >= module->module.BaseOfImage + module->module.ImageSize) return module; } -- 2.20.1

1 0

[PATCH v2 1/3] ntoskrnl.exe: Fix handling of reference string in IoRegisterDeviceInterface().
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 85bb9f4..23ae4ca 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -613,26 +613,22 @@ static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, - UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) + UNICODE_STRING *refstr, UNICODE_STRING *symbolic_link) { SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; struct device_interface *iface; - WCHAR *referenceW = NULL; WCHAR *instance_id; DWORD required; HDEVINFO set; BOOL rc; - TRACE("device %p, class_guid %s, reference_string %s, symbolic_link %p.\n", - device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link); + TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", + device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); - if (reference_string != NULL) - referenceW = reference_string->Buffer; - - set = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + set = SetupDiGetClassDevsW( class_guid, NULL, NULL, DIGCF_DEVICEINTERFACE ); if (set == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; status = get_instance_id( device, &instance_id ); @@ -674,7 +670,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla } HeapFree( GetProcessHeap(), 0, instance_id ); - if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, NULL, 0, &sp_iface )) + if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; required = 0; -- 2.7.4

1 2

[PATCH 1/3] ntoskrnl.exe: Fix handling of reference string in IoRegisterDeviceInterface().
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 85bb9f4..23ae4ca 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -613,26 +613,22 @@ static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, - UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) + UNICODE_STRING *refstr, UNICODE_STRING *symbolic_link) { SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; struct device_interface *iface; - WCHAR *referenceW = NULL; WCHAR *instance_id; DWORD required; HDEVINFO set; BOOL rc; - TRACE("device %p, class_guid %s, reference_string %s, symbolic_link %p.\n", - device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link); + TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", + device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); - if (reference_string != NULL) - referenceW = reference_string->Buffer; - - set = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + set = SetupDiGetClassDevsW( class_guid, NULL, NULL, DIGCF_DEVICEINTERFACE ); if (set == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; status = get_instance_id( device, &instance_id ); @@ -674,7 +670,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla } HeapFree( GetProcessHeap(), 0, instance_id ); - if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, NULL, 0, &sp_iface )) + if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL; required = 0; -- 2.7.4

3 4

[PATCH 1/5] qcap/avico: Use BaseFilterImpl_QueryInterface().
by Zebediah Figura 04 Jun '19

04 Jun '19

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avico.c | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 67e7f50..cfb23e8 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -117,36 +117,6 @@ static HRESULT fill_format_info(AVICompressor *This, VIDEOINFOHEADER *src_videoi return S_OK; } -static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - AVICompressor *This = impl_from_IBaseFilter(iface); - - if(IsEqualIID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IPersist)) { - TRACE("(%p)->(IID_IPersist %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IMediaFilter)) { - TRACE("(%p)->(IID_IMediaFilter %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IBaseFilter)) { - TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; - }else if(IsEqualIID(riid, &IID_IPersistPropertyBag)) { - TRACE("(%p)->(IID_IPersistPropertyBag %p)\n", This, ppv); - *ppv = &This->IPersistPropertyBag_iface; - }else { - FIXME("no interface for %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - -} - static HRESULT WINAPI AVICompressor_Stop(IBaseFilter *iface) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -205,7 +175,7 @@ static HRESULT WINAPI AVICompressor_QueryVendorInfo(IBaseFilter *iface, LPWSTR * } static const IBaseFilterVtbl AVICompressorVtbl = { - AVICompressor_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -253,9 +223,23 @@ static void avi_compressor_destroy(BaseFilter *iface) heap_free(filter); } +static HRESULT avi_compressor_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + AVICompressor *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_IPersistPropertyBag)) + *out = &filter->IPersistPropertyBag_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseFilterFuncTable filter_func_table = { .filter_get_pin = avi_compressor_get_pin, .filter_destroy = avi_compressor_destroy, + .filter_query_interface = avi_compressor_query_interface, }; static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) -- 2.7.4

2 5

[PATCH] ucrtbase: Implement _o__stricmp().
by Józef Kucia 04 Jun '19

04 Jun '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Would it make sense to wire up other _o__ functions instead of adding them on case by case basis? --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 7a9ccfa7faf5..f010434a8585 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -696,7 +696,7 @@ @ stub _o__strerror @ stub _o__strerror_s @ stub _o__strftime_l -@ stub _o__stricmp +@ cdecl _o__stricmp(str str) ucrtbase._o__stricmp @ stub _o__stricmp_l @ stub _o__stricoll @ stub _o__stricoll_l diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 441ef708e5bf..35727fd8633f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1360,7 +1360,7 @@ @ stub _o__strerror @ stub _o__strerror_s @ stub _o__strftime_l -@ stub _o__stricmp +@ cdecl _o__stricmp(str str) MSVCRT__stricmp @ stub _o__stricmp_l @ stub _o__stricoll @ stub _o__stricoll_l -- 2.21.0

3 2

[PATCH] include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL.
by Stefan Dösinger 04 Jun '19

04 Jun '19

Fixes building this .idl file with midl.exe. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- include/d3d12.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d12.idl b/include/d3d12.idl index 307a4fd375c..201e01f07ef 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -1300,8 +1300,8 @@ typedef enum D3D12_COLOR_WRITE_ENABLE D3D12_COLOR_WRITE_ENABLE_GREEN = 0x2, D3D12_COLOR_WRITE_ENABLE_BLUE = 0x4, D3D12_COLOR_WRITE_ENABLE_ALPHA = 0x8, - D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED\ - | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE\ + D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED + | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE | D3D12_COLOR_WRITE_ENABLE_ALPHA), } D3D12_COLOR_WRITE_ENABLE; -- 2.15.2 (Apple Git-101.1)

1 0

Heimdal Support
by zerous 04 Jun '19

04 Jun '19

Hi, Christos has written a patch for heimdal support in NetBSD. I would like what upstream thinks of it. -- zerous

2 1

[PATCH v3 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 10 +++---- include/ddk/d3dkmthk.h | 1 + 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0518f1e65f..0e421492aa 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1378,3 +1378,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f5c23dad76..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,9 +194,9 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

2 1

[PATCH vkd3d 2/7] vkd3d: Introduce vkd3d_create_buffer_view_for_resource().
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 57 +++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 70a04ebac721..79d4fef04607 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1659,7 +1659,7 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, } static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, - struct d3d12_resource *resource, const struct vkd3d_format *format, + VkBuffer vk_buffer, const struct vkd3d_format *format, VkDeviceSize offset, VkDeviceSize range, VkBufferView *vk_view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1667,8 +1667,6 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, struct VkBufferViewCreateInfo view_desc; VkResult vr; - assert(d3d12_resource_is_buffer(resource)); - if (vkd3d_format_is_compressed(format)) { WARN("Invalid format for buffer view %#x.\n", format->dxgi_format); @@ -1684,7 +1682,7 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, view_desc.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; view_desc.pNext = NULL; view_desc.flags = 0; - view_desc.buffer = resource->u.vk_buffer; + view_desc.buffer = vk_buffer; view_desc.format = format->vk_format; view_desc.offset = offset; view_desc.range = range; @@ -1693,18 +1691,37 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, return vr == VK_SUCCESS; } +static bool vkd3d_create_buffer_view(struct d3d12_device *device, + VkBuffer vk_buffer, const struct vkd3d_format *format, + VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_view *object; + VkBufferView vk_view; + + if (!vkd3d_create_vk_buffer_view(device, vk_buffer, format, offset, size, &vk_view)) + return false; + + if (!(object = vkd3d_view_create())) + { + VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); + return false; + } + + object->u.vk_buffer_view = vk_view; + *view = object; + return true; +} + #define VKD3D_VIEW_RAW_BUFFER 0x1 -static bool vkd3d_create_buffer_view(struct d3d12_device *device, +static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, struct d3d12_resource *resource, DXGI_FORMAT view_format, unsigned int offset, unsigned int size, unsigned int structure_stride, unsigned int flags, struct vkd3d_view **view) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; VkDeviceSize element_size; - struct vkd3d_view *object; - VkBufferView vk_view; if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER)) { @@ -1726,19 +1743,10 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, return false; } - if (!vkd3d_create_vk_buffer_view(device, resource, format, - offset * element_size, size * element_size, &vk_view)) - return false; - - if (!(object = vkd3d_view_create())) - { - VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); - return false; - } + assert(d3d12_resource_is_buffer(resource)); - object->u.vk_buffer_view = vk_view; - *view = object; - return true; + return vkd3d_create_buffer_view(device, resource->u.vk_buffer, + format, offset * element_size, size * element_size, view); } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -2101,7 +2109,7 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, } flags = vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags); - if (!vkd3d_create_buffer_view(device, resource, desc->Format, + if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, desc->u.Buffer.StructureByteStride, flags, &view)) return; @@ -2249,7 +2257,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); - if (!vkd3d_create_buffer_view(device, resource, desc->Format, + if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, desc->u.Buffer.StructureByteStride, flags, &view)) return; @@ -2266,7 +2274,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ assert(desc->u.Buffer.StructureByteStride); format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); - if (!vkd3d_create_vk_buffer_view(device, counter_resource, format, + if (!vkd3d_create_vk_buffer_view(device, counter_resource->u.vk_buffer, format, desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) { WARN("Failed to create counter buffer view.\n"); @@ -2376,7 +2384,8 @@ bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, format = vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); resource = vkd3d_gpu_va_allocator_dereference(&device->gpu_va_allocator, gpu_address); - return vkd3d_create_vk_buffer_view(device, resource, format, + assert(d3d12_resource_is_buffer(resource)); + return vkd3d_create_vk_buffer_view(device, resource->u.vk_buffer, format, gpu_address - resource->gpu_address, VK_WHOLE_SIZE, vk_buffer_view); } -- 2.21.0

2 1

[PATCH vkd3d 7/7] tests: Add basic test for NULL UAVs.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 024a956a4cdd..d6cd4e014660 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17176,6 +17176,169 @@ static void test_null_srv(void) destroy_test_context(&context); } +static void test_null_uav(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + D3D12_ROOT_PARAMETER root_parameters[2]; + const D3D12_SHADER_BYTECODE *current_ps; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + ID3D12DescriptorHeap *uav_heap; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_ld_texture_code[] = + { +#if 0 + RWTexture2D<float> u; + + float4 main(float4 position : SV_Position) : SV_Target + { + float2 s; + u.GetDimensions(s.x, s.y); + return u[s * float2(position.x / 640.0f, position.y / 480.0f)]; + } +#endif + 0x43425844, 0x85c096ab, 0x210d7572, 0xdb1951af, 0x4dadced7, 0x00000001, 0x00000194, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050, + 0x0000003e, 0x0100086a, 0x0400189c, 0x0011e000, 0x00000001, 0x00005555, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x8900003d, + 0x800000c2, 0x00155543, 0x00100032, 0x00000000, 0x00004001, 0x00000000, 0x0011ee46, 0x00000001, + 0x07000038, 0x001000f2, 0x00000000, 0x00100546, 0x00000000, 0x00101546, 0x00000000, 0x0a000038, + 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3b088889, + 0x3b088889, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x890000a3, 0x800000c2, + 0x00155543, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, 0x00000001, 0x05000036, + 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld_texture = {ps_ld_texture_code, sizeof(ps_ld_texture_code)}; + static const DWORD ps_ld_buffer_code[] = + { +#if 0 + RWByteAddressBuffer u; + + uint location; + + float4 main(float4 position : SV_Position) : SV_Target + { + return u.Load(4 * location); + } +#endif + 0x43425844, 0xde636789, 0x7bc99233, 0x8b0609b6, 0x4b9a958e, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000098, 0x00000050, + 0x00000026, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300009d, 0x0011e000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000029, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x890000a5, 0x800002c2, + 0x00199983, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0011e006, 0x00000001, 0x05000056, + 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ld_buffer = {ps_ld_buffer_code, sizeof(ps_ld_buffer_code)}; + static const struct test + { + const D3D12_SHADER_BYTECODE *ps; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + uint32_t location; + } + tests[] = + { + {&ps_ld_texture, {DXGI_FORMAT_R32_UINT, D3D12_UAV_DIMENSION_TEXTURE2D}, 0}, + {&ps_ld_buffer, + {DXGI_FORMAT_R32_TYPELESS, D3D12_UAV_DIMENSION_BUFFER, .Buffer = {0, 1024, .Flags = D3D12_BUFFER_UAV_FLAG_RAW}}, + 0}, + {&ps_ld_buffer, + {DXGI_FORMAT_R32_TYPELESS, D3D12_UAV_DIMENSION_BUFFER, .Buffer = {0, 1024, .Flags = D3D12_BUFFER_UAV_FLAG_RAW}}, + 1024}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 1; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[1].Constants.ShaderRegister = 0; + root_parameters[1].Constants.RegisterSpace = 0; + root_parameters[1].Constants.Num32BitValues = 1; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + uav_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + current_ps = NULL; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + const struct test *test = &tests[i]; + + vkd3d_test_set_context("Test %u", i); + + if (current_ps != test->ps) + { + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); + current_ps = tests[i].ps; + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, current_ps, NULL); + } + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(uav_heap); + ID3D12Device_CreateUnorderedAccessView(device, NULL, NULL, &test->uav_desc, cpu_handle); + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &uav_heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(uav_heap)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 1, test->location, 0); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + vkd3d_test_set_context(NULL); + + ID3D12DescriptorHeap_Release(uav_heap); + destroy_test_context(&context); +} + static void test_null_vbv(void) { ID3D12GraphicsCommandList *command_list; @@ -29510,6 +29673,7 @@ START_TEST(d3d12) run_test(test_create_null_descriptors); run_test(test_null_cbv); run_test(test_null_srv); + run_test(test_null_uav); run_test(test_null_vbv); run_test(test_get_copyable_footprints); run_test(test_depth_clip); -- 2.21.0

2 1

[PATCH vkd3d 6/7] tests: Add test for buffer NULL SRV.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5c445632dbc9..024a956a4cdd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17007,6 +17007,29 @@ static void test_null_srv(void) 0x001020f2, 0x00000000, 0x00208a46, 0x00000000, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; + static const DWORD ps_buffer_code[] = + { +#if 0 + ByteAddressBuffer t; + + uint location; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.Load(location); + } +#endif + 0x43425844, 0x70170f6b, 0x16097169, 0x714f155c, 0x1e3d860f, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000007c, 0x00000050, + 0x0000001f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x030000a1, 0x00107000, + 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x8a0000a5, 0x800002c2, + 0x00199983, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00107006, 0x00000000, + 0x05000056, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_buffer = {ps_buffer_code, sizeof(ps_buffer_code)}; static const DXGI_FORMAT formats[] = { DXGI_FORMAT_R32_FLOAT, @@ -17112,6 +17135,43 @@ static void test_null_srv(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + /* buffer */ + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps_buffer, NULL); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_R32_TYPELESS; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1024; + srv_desc.Buffer.Flags = D3D12_BUFFER_SRV_FLAG_RAW; + ID3D12Device_CreateShaderResourceView(device, NULL, &srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + location.x = 0; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &location, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); } -- 2.21.0

2 1

[PATCH vkd3d 5/7] vkd3d: Add partial support for 2D NULL UAV.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 93 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cd3f57251f3a..c3c92386da08 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2251,7 +2251,9 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_null_resources *null_resources = &device->null_resources; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; + VkImage vk_image; if (!desc) { @@ -2262,7 +2264,7 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_UAV_DIMENSION_BUFFER: - WARN("Creating NULL UAV %#x.\n", desc->Format); + WARN("Creating NULL buffer UAV %#x.\n", desc->Format); if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), @@ -2272,12 +2274,41 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; descriptor->u.view = view; } + return; + + case D3D12_UAV_DIMENSION_TEXTURE2D: + vk_image = null_resources->vk_2d_storage_image; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vk_image = null_resources->vk_2d_storage_image; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); - break; + return; } + + WARN("Creating NULL UAV %#x.\n", desc->ViewDimension); + + vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); + vkd3d_desc.miplevel_idx = 0; + vkd3d_desc.miplevel_count = 1; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = 1; + vkd3d_desc.components.r = VK_COMPONENT_SWIZZLE_R; + vkd3d_desc.components.g = VK_COMPONENT_SWIZZLE_G; + vkd3d_desc.components.b = VK_COMPONENT_SWIZZLE_B; + vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_A; + vkd3d_desc.allowed_swizzle = false; + + if (!vkd3d_create_texture_view(device, vk_image, &vkd3d_desc, &view)) + return; + + descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; + descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; + descriptor->u.view = view; } static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, @@ -3248,6 +3279,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + static const VkClearColorValue clear_color = {{0}}; VkCommandBufferAllocateInfo command_buffer_info; VkCommandPool vk_command_pool = VK_NULL_HANDLE; VkCommandPoolCreateInfo command_pool_info; @@ -3255,6 +3287,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ VkCommandBufferBeginInfo begin_info; VkCommandBuffer vk_command_buffer; VkFence vk_fence = VK_NULL_HANDLE; + VkImageSubresourceRange range; VkImageMemoryBarrier barrier; VkFenceCreateInfo fence_info; struct vkd3d_queue *queue; @@ -3304,6 +3337,35 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ /* fill UAV buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + /* clear 2D UAV image */ + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = 0; + barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = null_resource->vk_2d_storage_image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, + 0, NULL, 0, NULL, 1, &barrier)); + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = 0; + range.levelCount = 1; + range.baseArrayLayer = 0; + range.layerCount = 1; + + VK_CALL(vkCmdClearColorImage(vk_command_buffer, + null_resource->vk_2d_storage_image, VK_IMAGE_LAYOUT_GENERAL, &clear_color, 1, &range)); + /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -3436,6 +3498,26 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory))) goto fail; + /* 2D UAV */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 1; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = VKD3D_NULL_VIEW_FORMAT; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + + if (FAILED(hr = vkd3d_create_image(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, &null_resources->vk_2d_storage_image))) + goto fail; + if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory))) + goto fail; + /* set Vulkan object names */ vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL buffer"); @@ -3449,6 +3531,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D SRV memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image, + VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D UAV image"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_storage_image_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL 2D UAV memory"); return vkd3d_init_null_resources_data(null_resources, device); @@ -3472,5 +3558,8 @@ void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_image, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_image_memory, NULL)); + VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_storage_image, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_storage_image_memory, NULL)); + memset(null_resources, 0, sizeof(*null_resources)); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9a73ab4eedac..71e05b245230 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -968,6 +968,9 @@ struct vkd3d_null_resources VkImage vk_2d_image; VkDeviceMemory vk_2d_image_memory; + + VkImage vk_2d_storage_image; + VkDeviceMemory vk_2d_storage_image_memory; }; HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, -- 2.21.0

2 1

[PATCH vkd3d 4/7] vkd3d: Add partial support for buffer NULL UAVs.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 57 +++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6602a129e42d..cd3f57251f3a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2247,6 +2247,39 @@ static unsigned int vkd3d_view_flags_from_d3d12_buffer_uav_flags(D3D12_BUFFER_UA return 0; } +static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, + struct d3d12_device *device, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) +{ + struct vkd3d_null_resources *null_resources = &device->null_resources; + struct vkd3d_view *view; + + if (!desc) + { + WARN("View desc is required for NULL view.\n"); + return; + } + + switch (desc->ViewDimension) + { + case D3D12_UAV_DIMENSION_BUFFER: + WARN("Creating NULL UAV %#x.\n", desc->Format); + + if (vkd3d_create_buffer_view(device, null_resources->vk_storage_buffer, + vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), + 0, VKD3D_NULL_BUFFER_SIZE, &view)) + { + descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; + descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; + descriptor->u.view = view; + } + break; + + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + break; + } +} + static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) @@ -2373,7 +2406,9 @@ void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *d if (!resource) { - FIXME("NULL resource UAV not implemented.\n"); + if (counter_resource) + FIXME("Ignoring counter resource %p.\n", counter_resource); + vkd3d_create_null_uav(descriptor, device, desc); return; } @@ -3266,6 +3301,9 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ /* fill buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + /* fill UAV buffer */ + VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_storage_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -3368,6 +3406,16 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory))) goto fail; + /* buffer UAV */ + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; + + if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, &null_resources->vk_storage_buffer))) + goto fail; + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory))) + goto fail; + /* 2D SRV */ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_desc.Alignment = 0; @@ -3393,6 +3441,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL buffer"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer_memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL UAV buffer"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_storage_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL UAV buffer memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, @@ -3414,6 +3466,9 @@ void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_buffer, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_buffer_memory, NULL)); + VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_storage_buffer, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_storage_buffer_memory, NULL)); + VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_image, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_image_memory, NULL)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 036b9eba96cf..9a73ab4eedac 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -963,6 +963,9 @@ struct vkd3d_null_resources VkBuffer vk_buffer; VkDeviceMemory vk_buffer_memory; + VkBuffer vk_storage_buffer; + VkDeviceMemory vk_storage_buffer_memory; + VkImage vk_2d_image; VkDeviceMemory vk_2d_image_memory; }; -- 2.21.0

2 1

[PATCH vkd3d 3/7] vkd3d: Add partial support for buffer NULL SRVs.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 79d4fef04607..6602a129e42d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2054,6 +2054,19 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_BUFFER: + WARN("Creating NULL buffer SRV %#x.\n", desc->Format); + + if (vkd3d_create_buffer_view(device, null_resources->vk_buffer, + vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false), + 0, VKD3D_NULL_BUFFER_SIZE, &view)) + { + descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; + descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; + descriptor->u.view = view; + } + return; + case D3D12_SRV_DIMENSION_TEXTURE2D: vk_image = null_resources->vk_2d_image; vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -2070,7 +2083,7 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, WARN("Creating NULL SRV %#x.\n", desc->ViewDimension); - vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, 0); + vkd3d_desc.format = vkd3d_get_format(device, VKD3D_NULL_VIEW_FORMAT, false); vkd3d_desc.miplevel_idx = 0; vkd3d_desc.miplevel_count = 1; vkd3d_desc.layer_idx = 0; @@ -3250,7 +3263,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ goto done; } - /* fill CBV buffer */ + /* fill buffer */ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); /* transition 2D SRV image */ @@ -3335,7 +3348,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, memset(&heap_properties, 0, sizeof(heap_properties)); heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; - /* CBV */ + /* buffer */ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; resource_desc.Alignment = 0; resource_desc.Width = VKD3D_NULL_BUFFER_SIZE; @@ -3346,7 +3359,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; - resource_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE; + resource_desc.Flags = D3D12_RESOURCE_FLAG_NONE; if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, &null_resources->vk_buffer))) -- 2.21.0

2 1

[PATCH vkd3d 1/7] vkd3d: Check texel buffer view alignment requirements.
by Józef Kucia 04 Jun '19

04 Jun '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4a6af7fe102a..70a04ebac721 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1663,6 +1663,7 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, VkDeviceSize offset, VkDeviceSize range, VkBufferView *vk_view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_vulkan_info *vk_info = &device->vk_info; struct VkBufferViewCreateInfo view_desc; VkResult vr; @@ -1674,6 +1675,12 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, return false; } + if (offset % vk_info->device_limits.minTexelBufferOffsetAlignment) + { + FIXME("Offset %#"PRIx64" violates the minimum required alignment %#"PRIx64".\n", + offset, vk_info->device_limits.minTexelBufferOffsetAlignment); + } + view_desc.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; view_desc.pNext = NULL; view_desc.flags = 0; -- 2.21.0

2 1

[PATCH v3 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 46 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 6 +++ 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e20621f873..0518f1e65f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -56,6 +56,7 @@ static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1332,3 +1333,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + WARN("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + device->handle = ++handle_start; + desc->hDevice = device->handle; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f5c23dad76 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5d09462774..2da25cc2f5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -72,6 +72,12 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH] dinput: Handle case where IOHIDDeviceGetValue fails
by Aric Stewart 04 Jun '19

04 Jun '19

This prevents crashes if a controller disconnects from OS/X Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/dinput/joystick_osx.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)

1 0

[PATCH v3 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 047209a938..e20621f873 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1272,8 +1272,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

2 1

[PATCH v3 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. Supersede 165931~165934 v3: Fix intermediate test crash. Supersede 165950~165953. .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 40 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 9 +++++ 7 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..047209a938 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -54,6 +55,8 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1275,40 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + /* FIXME: + * 1. Multiple monitor support. + * 2. AdapterLuid + */ + if (!desc || lstrcmpiW( desc->DeviceName, display1W )) + return STATUS_UNSUCCESSFUL; + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + + desc->hAdapter = handle_start; + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d3e5bcefb4..5d09462774 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -21,6 +21,8 @@ #ifndef __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/list.h" struct gdi_dc_funcs; @@ -63,6 +65,13 @@ struct brush_pattern UINT usage; /* color usage for DIB info */ }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH] d3drm: CreateDevice is unimplemented on Windows.
by Jeff Smith 04 Jun '19

04 Jun '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/d3drm.c | 44 +++++++++++--------------------- dlls/d3drm/tests/d3drm.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 29 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index d0f20235a8..cba89e40cc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -416,17 +416,13 @@ static HRESULT WINAPI d3drm1_CreateMaterial(IDirect3DRM *iface, static HRESULT WINAPI d3drm1_CreateDevice(IDirect3DRM *iface, DWORD width, DWORD height, IDirect3DRMDevice **device) { - struct d3drm_device *object; - HRESULT hr; - - FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); + TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - if (FAILED(hr = d3drm_device_create(&object, iface))) - return hr; - - *device = &object->IDirect3DRMDevice_iface; + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; - return D3DRM_OK; + return D3DRMERR_BADDEVICE; } static HRESULT WINAPI d3drm1_CreateDeviceFromSurface(IDirect3DRM *iface, GUID *guid, @@ -972,18 +968,13 @@ static HRESULT WINAPI d3drm2_CreateMaterial(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_CreateDevice(IDirect3DRM2 *iface, DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); - struct d3drm_device *object; - HRESULT hr; - - FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); - - if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface))) - return hr; + TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - *device = &object->IDirect3DRMDevice2_iface; + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; - return D3DRM_OK; + return D3DRMERR_BADDEVICE; } static HRESULT WINAPI d3drm2_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *guid, @@ -1611,18 +1602,13 @@ static HRESULT WINAPI d3drm3_CreateMaterial(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateDevice(IDirect3DRM3 *iface, DWORD width, DWORD height, IDirect3DRMDevice3 **device) { - struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); - struct d3drm_device *object; - HRESULT hr; - - FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); + TRACE("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - if (FAILED(hr = d3drm_device_create(&object, &d3drm->IDirect3DRM_iface))) - return hr; - - *device = &object->IDirect3DRMDevice3_iface; + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; - return D3DRM_OK; + return D3DRMERR_BADDEVICE; } static HRESULT WINAPI d3drm3_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *guid, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 2fb2699f36..cc4f8fe16a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -5370,6 +5370,68 @@ static void test_create_device_from_d3d3(void) DestroyWindow(window); } +static void test_create_device_1(void) +{ + IDirect3DRM *d3drm = NULL; + IDirect3DRMDevice *device = (IDirect3DRMDevice *)0xdeadbeef; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + + hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, &device); + ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr); + ok(device == NULL, "Expected device returned == NULL, got %p.\n", device); + hr = IDirect3DRM_CreateDevice(d3drm, 640, 480, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + IDirect3DRM_Release(d3drm); +} + +static void test_create_device_2(void) +{ + IDirect3DRM *d3drm = NULL; + IDirect3DRM2 *d3drm2 = NULL; + IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, &device2); + ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr); + ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", device2); + hr = IDirect3DRM2_CreateDevice(d3drm2, 640, 480, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm); +} + +static void test_create_device_3(void) +{ + IDirect3DRM *d3drm = NULL; + IDirect3DRM3 *d3drm3 = NULL; + IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef; + HRESULT hr; + + hr = Direct3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, &device3); + ok(hr == D3DRMERR_BADDEVICE, "Expected hr == D3DRMERR_BADDEVICE, got %x.\n", hr); + ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", device3); + hr = IDirect3DRM3_CreateDevice(d3drm3, 640, 480, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm); +} + static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) { unsigned int bpp = palettized ? 8 : 24; @@ -7432,6 +7494,9 @@ START_TEST(d3drm) test_create_device_from_d3d1(); test_create_device_from_d3d2(); test_create_device_from_d3d3(); + test_create_device_1(); + test_create_device_2(); + test_create_device_3(); test_load_texture(); test_texture_qi(); test_viewport_qi(); -- 2.14.3

6 10

[PATCH 1/5] wined3d: Scale transformed position in compute_light().
by Paul Gofman 04 Jun '19

04 Jun '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91ae2e34ae..925ae96aa7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3441,8 +3441,8 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d float att; wined3d_vec4_transform(&position_transformed, position, &ls->modelview_matrix); + wined3d_vec3_scale((struct wined3d_vec3 *)&position_transformed, 1.0f / position_transformed.w); position_transformed_normalised = *(const struct wined3d_vec3 *)&position_transformed; - wined3d_vec3_scale(&position_transformed_normalised, 1.0f / position_transformed.w); wined3d_vec3_normalise(&position_transformed_normalised); if (normal) -- 2.21.0

4 12

[PATCH v2 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 6 ++-- include/ddk/d3dkmthk.h | 1 + 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0518f1e65f..0e421492aa 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1378,3 +1378,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f8cd1d14bd..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

2 1

[PATCH v2 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 46 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 6 +++ 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e20621f873..0518f1e65f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -56,6 +56,7 @@ static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1332,3 +1333,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + WARN("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + device->handle = ++handle_start; + desc->hDevice = device->handle; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f8cd1d14bd 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -196,7 +196,7 @@ static void test_D3DKMTCreateDevice(void) if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5d09462774..2da25cc2f5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -72,6 +72,12 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH v2 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 047209a938..e20621f873 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1272,8 +1272,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

2 1

[PATCH v2 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use non-safe list iteration macros. Supersede 165931~165934 .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 40 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 9 +++++ 7 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..047209a938 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -54,6 +55,8 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1275,40 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + /* FIXME: + * 1. Multiple monitor support. + * 2. AdapterLuid + */ + if (!desc || lstrcmpiW( desc->DeviceName, display1W )) + return STATUS_UNSUCCESSFUL; + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + + desc->hAdapter = handle_start; + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d3e5bcefb4..5d09462774 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -21,6 +21,8 @@ #ifndef __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/list.h" struct gdi_dc_funcs; @@ -63,6 +65,13 @@ struct brush_pattern UINT usage; /* color usage for DIB info */ }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH 5/5] wined3d: Use wined3d_texture_get_level_box() in wined3d_device_copy_resource().
by Henri Verbeet 04 Jun '19

04 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fe7d0e9701a..702fda2564b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4646,10 +4646,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, for (i = 0; i < dst_texture->level_count; ++i) { - wined3d_box_set(&box, 0, 0, - wined3d_texture_get_level_width(dst_texture, i), - wined3d_texture_get_level_height(dst_texture, i), - 0, wined3d_texture_get_level_depth(dst_texture, i)); + wined3d_texture_get_level_box(dst_texture, i, &box); for (j = 0; j < dst_texture->layer_count; ++j) { unsigned int idx = j * dst_texture->level_count + i; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to glsl_blitter_upload_palette().
by Henri Verbeet 04 Jun '19

04 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54dfd964cd9..fe8812bcbb5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12769,17 +12769,17 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter /* Context activation is done by the caller. */ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture *texture) + struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_palette *palette; - palette = texture->swapchain ? texture->swapchain->palette : NULL; + palette = texture_gl->t.swapchain ? texture_gl->t.swapchain->palette : NULL; if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); - context_active_texture(context, gl_info, 1); + context_active_texture(&context_gl->c, gl_info, 1); gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, blitter->palette_texture); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -12799,7 +12799,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, GL_UNSIGNED_INT_8_8_8_8_REV, &black); } - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); } /* Context activation is done by the caller. */ @@ -13062,7 +13062,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli switch (get_complex_fixup(program->args.fixup)) { case COMPLEX_FIXUP_P8: - glsl_blitter_upload_palette(glsl_blitter, context, src_texture); + glsl_blitter_upload_palette(glsl_blitter, context_gl, src_texture_gl); break; case COMPLEX_FIXUP_YUY2: -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to create_dummy_textures().
by Henri Verbeet 04 Jun '19

04 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751676b75ac..fe7d0e9701a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -672,11 +672,12 @@ out: } /* Context activation is done by the caller. */ -static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) +static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_dummy_textures *textures = &wined3d_device_gl(device)->dummy_textures; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_dummy_textures *textures = &device_gl->dummy_textures; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int i; DWORD color; @@ -689,7 +690,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ * OpenGL will only allow that when a valid texture is bound. * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); gl_info->gl_ops.gl.p_glGenTextures(1, &textures->tex_1d); TRACE("Dummy 1D texture given name %u.\n", textures->tex_1d); @@ -802,7 +803,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("create dummy textures"); - context_bind_dummy_textures(context); + context_bind_dummy_textures(&context_gl->c); } /* Context activation is done by the caller. */ @@ -1081,6 +1082,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) void wined3d_device_create_primary_opengl_context_cs(void *object) { struct wined3d_device *device = object; + struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; @@ -1108,7 +1110,8 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; context = context_acquire(device, target, 0); - create_dummy_textures(device, context); + context_gl = wined3d_context_gl(context); + wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); create_default_samplers(device, context); context_release(context); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to arbfp_blit_set().
by Henri Verbeet 04 Jun '19

04 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05c4519add6..e6546abf842 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7548,11 +7548,10 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context *context, +static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const struct wined3d_color_key *color_key) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; enum complex_fixup fixup; struct wine_rb_entry *entry; @@ -7913,7 +7912,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl color_key = &alpha_test_key; } - arbfp_blit_set(arbfp_blitter, context, src_texture_gl, src_sub_resource_idx, color_key); + arbfp_blit_set(arbfp_blitter, context_gl, src_texture_gl, src_sub_resource_idx, color_key); /* Draw a textured quad */ context_draw_textured_quad(context, src_texture_gl, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to arbfp_blitter_upload_palette().
by Henri Verbeet 04 Jun '19

04 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e4a0b42de68..05c4519add6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7346,11 +7346,11 @@ static GLuint gen_p8_shader(const struct wined3d_gl_info *gl_info, const struct } /* Context activation is done by the caller. */ -static void upload_palette(struct wined3d_arbfp_blitter *blitter, - const struct wined3d_texture *texture, struct wined3d_context *context) +static void arbfp_blitter_upload_palette(struct wined3d_arbfp_blitter *blitter, + const struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl) { - const struct wined3d_palette *palette = texture->swapchain ? texture->swapchain->palette : NULL; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_palette *palette = texture_gl->t.swapchain ? texture_gl->t.swapchain->palette : NULL; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!blitter->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &blitter->palette_texture); @@ -7379,7 +7379,7 @@ static void upload_palette(struct wined3d_arbfp_blitter *blitter, } /* Switch back to unit 0 in which the 2D texture will be stored. */ - context_active_texture(context, gl_info, 0); + context_active_texture(&context_gl->c, gl_info, 0); } /* Context activation is done by the caller. */ @@ -7552,8 +7552,9 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const struct wined3d_color_key *color_key) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; enum complex_fixup fixup; - const struct wined3d_gl_info *gl_info = context->gl_info; struct wine_rb_entry *entry; struct arbfp_blit_type type; struct arbfp_blit_desc *desc; @@ -7655,7 +7656,7 @@ err_out: } if (fixup == COMPLEX_FIXUP_P8) - upload_palette(blitter, &texture_gl->t, context); + arbfp_blitter_upload_palette(blitter, texture_gl, context_gl); gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); -- 2.11.0

1 0

[v2 PATCH] mshtml: Implement IHTMLDocument2 put/get_bgColor
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/htmldoc.c | 42 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 30 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5b14678a6f..160834cd5b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -680,15 +680,49 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsresult nsres; + nsAString nsstr; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) + { + FIXME("Unsupported type (%d)\n", V_VT(&v)); + return E_INVALIDARG; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + nsres = nsIDOMHTMLDocument_SetBgColor(This->doc_node->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetBgColor failed: %08x\n", nsres); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + hres = return_nsstr_variant(nsres, &nsstr, p); + if(hres == S_OK) + { + static const WCHAR defaultcolor[] = {'#','f','f','f','f','f','f',0}; + if(!V_BSTR(p)) + V_BSTR(p) = SysAllocString(defaultcolor); + } + return hres; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d46c232f9b..d5aecfc57d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9868,6 +9868,35 @@ static void test_doctype(IHTMLDocument2 *doc) IHTMLDOMNode_Release(doctype); } +static void test_background_color(IHTMLDocument2 *doc) +{ + static WCHAR newcolor[] = {'#','f','f','0','0','0','0',0}; + HRESULT hres; + IHTMLDocument2 *doc_node; + VARIANT color; + + doc_node = get_doc_node(doc); + hres = IHTMLDocument2_get_bgColor(doc_node, &color); + ok(hres == S_OK, "failed: %08x\n", hres); + ok(V_VT(&color) == VT_BSTR, "type failed: %d\n", V_VT(&color)); + ok(!strcmp_wa(V_BSTR(&color), "#ffffff"), "str=%s\n", wine_dbgstr_w(V_BSTR(&color))); + VariantClear(&color); + + V_VT(&color) = VT_BSTR; + V_BSTR(&color) = SysAllocString(newcolor); + hres = IHTMLDocument2_put_bgColor(doc_node, color); + ok(hres == S_OK, "failed: %08x\n", hres); + VariantClear(&color); + + hres = IHTMLDocument2_get_bgColor(doc_node, &color); + ok(hres == S_OK, "failed: %08x\n", hres); + ok(V_VT(&color) == VT_BSTR, "type failed: %d\n", V_VT(&color)); + ok(!strcmp_wa(V_BSTR(&color), "#ff0000"), "str=%s\n", wine_dbgstr_w(V_BSTR(&color))); + VariantClear(&color); + + IHTMLDocument2_Release(doc_node); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -11032,6 +11061,7 @@ START_TEST(dom) run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + run_domtest(doctype_str, test_background_color); test_quirks_mode(); -- 2.17.1

2 1

[PATCH] urlmon: Use the standard field name for an inner IUnknown
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/file.c | 12 ++++++------ dlls/urlmon/ftp.c | 12 ++++++------ dlls/urlmon/http.c | 12 ++++++------ dlls/urlmon/mk.c | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index cc1ba81606..e703e727b0 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; @@ -40,7 +40,7 @@ typedef struct { static inline FileProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FileProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, FileProtocol, IUnknown_inner); } static inline FileProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -60,7 +60,7 @@ static HRESULT WINAPI FileProtocolUnk_QueryInterface(IUnknown *iface, REFIID rii *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -428,14 +428,14 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) ret = heap_alloc(sizeof(FileProtocol)); - ret->IUnknown_outer.lpVtbl = &FileProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &FileProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &FileProtocolExVtbl; ret->IInternetPriority_iface.lpVtbl = &FilePriorityVtbl; ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IUnknown_outer; + *ppobj = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 75704ce120..8e6ec4eaf8 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; IWinInetHttpInfo IWinInetHttpInfo_iface; @@ -39,7 +39,7 @@ typedef struct { static inline FtpProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_inner); } static inline FtpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -131,7 +131,7 @@ static HRESULT WINAPI FtpProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -462,13 +462,13 @@ HRESULT FtpProtocol_Construct(IUnknown *outer, void **ppv) ret = heap_alloc_zero(sizeof(FtpProtocol)); ret->base.vtbl = &AsyncProtocolVtbl; - ret->IUnknown_outer.lpVtbl = &FtpProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &FtpProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &FtpProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &FtpPriorityVtbl; ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppv = &ret->IUnknown_outer; + *ppv = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 1762787d09..ad1d0d8668 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; IWinInetHttpInfo IWinInetHttpInfo_iface; @@ -47,7 +47,7 @@ typedef struct { static inline HttpProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_inner); } static inline HttpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -637,7 +637,7 @@ static HRESULT WINAPI HttpProtocolUnk_QueryInterface(IUnknown *iface, REFIID rii if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -967,16 +967,16 @@ static HRESULT create_http_protocol(BOOL https, IUnknown *outer, void **ppobj) return E_OUTOFMEMORY; ret->base.vtbl = &AsyncProtocolVtbl; - ret->IUnknown_outer.lpVtbl = &HttpProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &HttpProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &HttpProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &HttpPriorityVtbl; ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->https = https; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IUnknown_outer; + *ppobj = &ret->IUnknown_inner; URLMON_LockModule(); return S_OK; diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index d73a00c771..7af8f0c600 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; IInternetProtocolEx IInternetProtocolEx_iface; LONG ref; @@ -36,7 +36,7 @@ typedef struct { static inline MkProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, MkProtocol, IUnknown_outer); + return CONTAINING_RECORD(iface, MkProtocol, IUnknown_inner); } static inline MkProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) @@ -50,7 +50,7 @@ static HRESULT WINAPI MkProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -372,15 +372,15 @@ HRESULT MkProtocol_Construct(IUnknown *outer, void **ppv) ret = heap_alloc(sizeof(MkProtocol)); - ret->IUnknown_outer.lpVtbl = &MkProtocolUnkVtbl; + ret->IUnknown_inner.lpVtbl = &MkProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &MkProtocolVtbl; ret->ref = 1; - ret->outer = outer ? outer : &ret->IUnknown_outer; + ret->outer = outer ? outer : &ret->IUnknown_inner; ret->stream = NULL; /* NOTE: * Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid and no outer. */ - *ppv = &ret->IUnknown_outer; + *ppv = &ret->IUnknown_inner; return S_OK; } -- 2.20.1

3 2

[PATCH] mshtml: Use the standard field name for an inner IUnknown
by Michael Stefaniuc 04 Jun '19

04 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/mshtml_private.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9dec890d1a..1265e3dd1b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5560,7 +5560,7 @@ HRESULT get_document_node(nsIDOMDocument *dom_document, HTMLDocumentNode **ret) static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_outer); + return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_inner); } static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -5570,7 +5570,7 @@ static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID rii TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IUnknown_outer; + *ppv = &This->IUnknown_inner; }else if(htmldoc_qi(&This->basedoc, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else if(IsEqualGUID(&IID_ICustomDoc, riid)) { @@ -5762,11 +5762,11 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii return E_OUTOFMEMORY; doc->ref = 1; - doc->IUnknown_outer.lpVtbl = &HTMLDocumentObjVtbl; + doc->IUnknown_inner.lpVtbl = &HTMLDocumentObjVtbl; doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); - init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_outer, &doc->dispex.IDispatchEx_iface); + init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_inner, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); doc->basedoc.doc_obj = doc; doc->is_mhtml = is_mhtml; @@ -5783,7 +5783,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii } if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &doc->IUnknown_outer; + *ppv = &doc->IUnknown_inner; }else { hres = htmldoc_query_interface(&doc->basedoc, riid, ppv); htmldoc_release(&doc->basedoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dc9367493..d01fae0e06 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -655,7 +655,7 @@ static inline ULONG htmldoc_release(HTMLDocument *This) struct HTMLDocumentObj { HTMLDocument basedoc; DispatchEx dispex; - IUnknown IUnknown_outer; + IUnknown IUnknown_inner; ICustomDoc ICustomDoc_iface; IOleDocumentView IOleDocumentView_iface; IViewObjectEx IViewObjectEx_iface; -- 2.20.1

2 1

[PATCH v3 2/3] winex11.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Some games, e.g., Project CARS waits for WM_ACTIVATE when restoring from iconic state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6054f645c4..5c465aa033 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1266,6 +1266,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); + if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) + SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); return; } -- 2.20.1

2 4

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 04 Jun '19

04 Jun '19

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 414 +++++++++++++--------------------------------------- 1 file changed, 103 insertions(+), 311 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 996e7843ea..c3ca11049c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-12-21 11:21-0600\n" +"PO-Revision-Date: 2019-05-27 14:50+0800\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.io>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.2.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -6757,139 +6757,99 @@ msgstr "发送邮件" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "已创建起始请求。\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "未找到对象 UUID。\n" +msgstr "池尚未完成。\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "安装平台不支持。\n" +msgstr "Media Foundation 平台尚未初始化。\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "字节数太小。\n" +msgstr "缓冲区太小。\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "请求语法无效。\n" +msgstr "请求无效。\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "段编号无效。\n" +msgstr "流数量无效。\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "日期格式无效。\n" +msgstr "媒体类型无效。\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "无更多条目。\n" +msgstr "不接受更多输入。\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "未找到对象 UUID。\n" +msgstr "对象未初始化。\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "不支持此操作。\n" +msgstr "不支持重展示。\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "建议媒体类型列表中没有其他类型。\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的服务。\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "未预期的网络错误。\n" +msgstr "未知错误。\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "时间无效。\n" +msgstr "类型无效。\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "像素格式无效。\n" +msgstr "文件格式无效。\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "时间无效。\n" +msgstr "时间戳无效。\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的方案。\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的字节流类型。\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的时间格式。\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "未设置样本时间戳。\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "未设置样本长度。\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "无效的数据。\n" +msgstr "流数据无效。\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "没有可用的帮助信息。" +msgstr "实时支持不可用。\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的频率。\n" #: mferror.mc:200 #, fuzzy @@ -6898,386 +6858,276 @@ msgid "Unsupported thinning.\n" msgstr "不支持的类型。\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "请求不被支持。\n" +msgstr "不支持反相。\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "不支持的认证级别。\n" +msgstr "不支持的频率过渡。\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "预先判断到频率变化。\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "未找到对象 UUID。\n" +msgstr "未找到对象或值。\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "没有可用的帮助信息。" +msgstr "值不可用。\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "没有可用的帮助信息。" +msgstr "时钟不可用。\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "不支持扩展属性。\n" +msgstr "不支持多订阅者。\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "驱动程序没有启用。" +msgstr "计时器被弃用。\n" #: mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "无法打开字符翻译表。\n" +msgstr "正在等待状态过渡。\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "不支持的认证级别。\n" +msgstr "不支持的状态过渡。\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "发生内部错误。\n" +msgstr "发生致命错误。\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "样本包含过多缓冲区。\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "临时文件目录不可写。\n" +msgstr "样本不可写。\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "路径无效。\n" +msgstr "键值无效。\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "stub 版本错误。\n" +msgstr "启动版本无效。\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的标注。\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "无效工作站。\n" +msgstr "位置无效。\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "找不到文件。\n" +msgstr "未找到属性。\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "不允许的钩子类型。\n" +msgstr "不允许填入属性类型。\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "不支持此操作。\n" +msgstr "不支持属性类型。\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "目录非空。\n" +msgstr "属性为空。\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "目录非空。\n" +msgstr "属性非空。\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "不允许的钩子类型。\n" +msgstr "不允许填入矢量属性。\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "要求矢量属性。\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "操作被用户取消。\n" +msgstr "操作被取消。\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "服务器未停用。\n" +msgstr "字节流不可寻道。\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "安全模式下平台被禁用。\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "无法创建服务线程。\n" +msgstr "无法解析字节流。\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "互斥参数被传递至来源解析器。\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "未知接口。\n" +msgstr "未知字节流长度。\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "无效索引。\n" +msgstr "工作队列索引无效。\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "无可用的登录服务器。\n" +msgstr "无可用事件。\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "不支持的认证级别。\n" +msgstr "媒体源状态过渡无效。\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "注册表已恢复。\n" +msgstr "到达媒体流结尾。\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown() 函数被调用。\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "注册表已恢复。\n" +msgstr "未设置媒体流长度。\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "媒体格式已知但无效。\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "找不到属性集。\n" +msgstr "未找到属性。\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "目录非空。\n" +msgstr "属性为只读。\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "不允许的钩子类型。\n" +msgstr "不允许填入属性。\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "资源已被占用。\n" +msgstr "媒体源未启动。\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的媒体格式。\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "资源已被占用。\n" +msgstr "媒体流状态不正确。\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "未检测到数据。\n" +msgstr "未选中媒体流。\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "不支持的类型。\n" +msgstr "不支持的媒体流特性。\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "媒体池被移除。\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "媒体池不同步。\n" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "注册表已恢复。\n" +msgstr "媒体池的串流池组不可变。\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "域名已存在。\n" +msgstr "串流池已存在。\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "操作被用户取消。\n" +msgstr "样本分配已取消。\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "目录非空。\n" +msgstr "样本分配器为空。\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "该类已存在。\n" +msgstr "池已被停止。\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "ASF 文件池的比特率未知。\n" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "未检测到数据。\n" +msgstr "未为此池选中任何流。\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "文件名过长。\n" +msgstr "元数据过长。\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "池未处理任何样本。\n" #: mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "池未包含必要的报头。\n" #: mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "连接无效。\n" +msgstr "可选节点无效。\n" #: mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "找不到打印机。" +msgstr "找不到解密器。\n" #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "找不到模块。\n" +msgstr "未找到编解码器。\n" #: mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "无法获取调用句柄。\n" +msgstr "无法连接拓扑节点。\n" #: mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "请求不被支持。\n" +msgstr "不支持拓扑请求。\n" #: mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "无效的组属性。\n" +msgstr "拓扑的时间属性无效。\n" #: mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "拓扑结构中发现循环。\n" #: mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "安装源不存在。\n" +msgstr "展示描述符缺失。\n" #: mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "缺少索引。\n" +msgstr "串流描述符缺失。\n" #: mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "设备未连接。\n" +msgstr "未选中串流描述符。\n" #: mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "缺少索引。\n" +msgstr "缺少源。\n" #: mferror.mc:704 msgid "Topology loader does not support sink activates.\n" @@ -7285,13 +7135,11 @@ msgstr "" #: mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "时钟未设置时间源。\n" #: mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "该类已存在。\n" +msgstr "已设置时钟状态。\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -10985,10 +10833,6 @@ msgid "" msgstr "“song pointer”和 SMPTE 时间格式互斥。您不能同时使用这两种格式。" #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -11005,14 +10849,10 @@ msgid "An error occurred with the specified port." msgstr "指定的端口出错。" #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." -msgstr "所有多媒体计时器均正被其他应用程序占用。退出其中一个应用程序后重试。" +msgstr "所有多媒体计时器均被其他应用程序占用。退出其中一个应用程序后重试。" #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -15077,7 +14917,7 @@ msgstr "普通 Metafile 阅读器" #: view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "元文件 (*.wmf, *.emf)" #: wineboot.rc:31 msgid "Waiting for Program" @@ -15244,14 +15084,10 @@ msgid "Drive configuration" msgstr "驱动器设置" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." -msgstr "无法连接到挂载管理器。不能修改驱动器配置。" +msgstr "无法连接到挂载管理器；不能修改驱动器配置。" #: winecfg.rc:236 msgid "A&dd..." @@ -15536,12 +15372,6 @@ msgid "System drive" msgstr "系统驱动器" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -15550,8 +15380,8 @@ msgid "" msgstr "" "你确定要删除 C 盘吗？\n" "\n" -"大部分 Windows 程序都假定 C 盘存在，在没有它时会死得很难看。如果要继续，请记" -"得重新建立一个！" +"大部分 Windows 程序都假定 C 盘存在，如找不到 C 盘可能会导致严重错误。如果要继" +"续，请重新建立此盘！" #: winecfg.rc:77 msgctxt "Drive letter" @@ -16613,8 +16443,6 @@ msgid "Text documents (*.txt)" msgstr "文本文件 (*.txt)" #: wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "Unicode 文本文件 (*.txt)" @@ -16816,42 +16644,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -16889,11 +16681,11 @@ msgid "" msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" -"语法:\n" +"语法：\n" "XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"说明:\n" +"说明：\n" "[/I] 如果目标位置不存在，并且操作会拷贝两个或更多的文件，就假设目标\n" "\t是目录。\n" "[/S] 拷贝目录和子目录。\n" -- 2.20.1

1 0

[PATCH 4/4] gdi32: Implement D3DKMTDestroyDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 6 ++-- include/ddk/d3dkmthk.h | 1 + 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935bbbc..43452cda74 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ace9c..01bc8bfebc 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bf5db9d58c..075dac2337 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1378,3 +1378,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + struct d3dkmt_device *device, *device2; + NTSTATUS status = STATUS_INVALID_PARAMETER; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY_SAFE( device, device2, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846eb8..9abd82173c 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f8cd1d14bd..b5f6f75a83 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907e30..081758bf5d 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus -- 2.20.1

2 1

[PATCH 3/4] gdi32: Implement D3DKMTCreateDevice.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 46 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 6 +++ 7 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8fcc..cb7935bbbc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7c13..e4692ace9c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index cb8c1df2e5..bf5db9d58c 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -56,6 +56,7 @@ static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1332,3 +1333,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + WARN("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + device->handle = ++handle_start; + desc->hDevice = device->handle; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9ee8..88fe846eb8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27aef..f8cd1d14bd 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -196,7 +196,7 @@ static void test_D3DKMTCreateDevice(void) if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6612..90bf907e30 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5d09462774..2da25cc2f5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -72,6 +72,12 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH 2/4] gdi32: Implement D3DKMTCloseAdapter.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7c0c..87304b7c13 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 047209a938..cb8c1df2e5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1272,8 +1272,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + struct d3dkmt_adapter *adapter, *adapter2; + NTSTATUS status = STATUS_INVALID_PARAMETER; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY_SAFE( adapter, adapter2, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162838..caded27aef 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void) -- 2.20.1

2 1

[PATCH 1/4] gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 40 +++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + include/wine/gdi_driver.h | 9 +++++ 7 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38edf4..43186e8fcc 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778ab14..365e5d7c0c 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a03b6..047209a938 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -54,6 +55,8 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1275,40 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + /* FIXME: + * 1. Multiple monitor support. + * 2. AdapterLuid + */ + if (!desc || lstrcmpiW( desc->DeviceName, display1W )) + return STATUS_UNSUCCESSFUL; + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + + desc->hAdapter = handle_start; + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + + EnterCriticalSection( &driver_section ); + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0f1b..5c17ed9ee8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b4c3..067c162838 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c87321058c..5436cb6612 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d3e5bcefb4..5d09462774 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -21,6 +21,8 @@ #ifndef __WINE_WINE_GDI_DRIVER_H #define __WINE_WINE_GDI_DRIVER_H +#include "winternl.h" +#include "ddk/d3dkmthk.h" #include "wine/list.h" struct gdi_dc_funcs; @@ -63,6 +65,13 @@ struct brush_pattern UINT usage; /* color usage for DIB info */ }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + struct gdi_dc_funcs { INT (*pAbortDoc)(PHYSDEV); -- 2.20.1

2 1

[PATCH v3 1/3] user32/tests: Test restore window messages.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Mostly to show that there is a WM_ACTIVATE message before WM_SYSCOMMAND SC_RESTORE and after WM_WINDOWPOSCHANGED This test won't work on non-Windows because the emulated key inputs doesn't reach the host, unless we required user interaction, e.g., clicking on the taskbar icon or Alt+Tab manually. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: SetActiveWindow only when restoring from iconic state and window is visible. v3: Add a test to verify message sequence. Previous comments say the fix is for Mirror's Edge, but in fact it is for Project CARS. I remember incorrectly. Supersede 165435~165436 dlls/user32/tests/msg.c | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..71b7f9f156 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17522,6 +17522,96 @@ static void test_DoubleSetCapture(void) DestroyWindow(hwnd); } +static const struct message WmRestoreMinimizedSeq[] = { + {HCBT_ACTIVATE, hook}, + {WM_WINDOWPOSCHANGING, sent | wparam, SWP_NOSIZE | SWP_NOMOVE}, + {WM_WINDOWPOSCHANGED, sent | wparam, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE}, + {WM_ACTIVATEAPP, sent | wparam, 1}, + {WM_NCACTIVATE, sent | wparam, 0x200001}, + {WM_GETTEXT, sent | defwinproc | optional}, + {WM_ACTIVATE, sent | wparam, 0x200001}, /* Note that activate messages are after WM_WINDOWPOSCHANGED and before WM_SYSCOMMAND */ + {HCBT_KEYSKIPPED, hook | optional}, + {WM_SYSKEYUP, sent | optional}, + {WM_SYSCOMMAND, sent | wparam, SC_RESTORE}, + {HCBT_SYSCOMMAND, hook | wparam, SC_RESTORE}, + {HCBT_SYSCOMMAND, hook | wparam | optional, SC_RESTORE}, + {HCBT_MINMAX, hook}, + {HCBT_MINMAX, hook | optional}, + {WM_QUERYOPEN, sent | defwinproc}, + {WM_QUERYOPEN, sent | optional}, + {WM_GETTEXT, sent | defwinproc | optional}, + {WM_WINDOWPOSCHANGING, sent | wparam | defwinproc, SWP_FRAMECHANGED | SWP_NOCOPYBITS | SWP_STATECHANGED}, + {WM_GETMINMAXINFO, sent | defwinproc}, + {WM_NCCALCSIZE, sent | wparam | defwinproc, 1}, + {WM_NCPAINT, sent | wparam | defwinproc | optional, 1}, + {WM_GETTEXT, sent | defwinproc | optional}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_WINDOWPOSCHANGED, sent | wparam | defwinproc, SWP_FRAMECHANGED | SWP_NOCOPYBITS | SWP_STATECHANGED}, + {WM_MOVE, sent | defwinproc}, + {WM_SIZE, sent | defwinproc}, + {WM_NCCALCSIZE, sent | wparam | defwinproc | optional, 1}, + {WM_NCPAINT, sent | wparam | defwinproc | optional, 1}, + {WM_ERASEBKGND, sent | defwinproc | optional}, + {HCBT_SETFOCUS, hook}, + {WM_SETFOCUS, sent | defwinproc}, + {WM_ACTIVATE, sent | wparam | defwinproc, 1}, + {WM_PAINT, sent| optional}, + {WM_SETFOCUS, sent | defwinproc | optional}, + {HCBT_KEYSKIPPED, hook | optional}, + {WM_KEYUP, sent | optional}, + {HCBT_KEYSKIPPED, hook | optional}, + {WM_SYSKEYUP, sent | optional}, + {HCBT_KEYSKIPPED, hook | optional}, + {WM_KEYUP, sent | optional}, + {WM_PAINT, sent| optional}, + {0} +}; + +static void test_restore_messages(void) +{ + INPUT ip = {0}; + HWND hwnd; + INT i; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + SetForegroundWindow(hwnd); + ShowWindow(hwnd, SW_MINIMIZE); + flush_events(); + flush_sequence(); + + for (i = 0; i < 5; i++) + { + /* Send Alt+Tab to restore test window from minimized state */ + ip.type = INPUT_KEYBOARD; + ip.ki.wVk = VK_MENU; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_MENU; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + ip.ki.wVk = VK_TAB; + ip.ki.dwFlags = KEYEVENTF_KEYUP; + SendInput(1, &ip, sizeof(INPUT)); + flush_events(); + if (!IsIconic(hwnd)) + break; + Sleep(500); + } + + if (IsIconic(hwnd)) + { + skip("Alt+Tab failed to bring up test window.\n"); + goto done; + } + ok_sequence(WmRestoreMinimizedSeq, "Restore minimized window", TRUE); + +done: + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17646,6 +17736,7 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -- 2.20.1

2 1

[PATCH 1/3] ole32: Add VT_ARRAY support to PropVariant.
by Sven Baars 04 Jun '19

04 Jun '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This should fix some memory leaks where PropVariantClear is expected to destroy the safearray. dlls/ole32/ole2.c | 26 ++++++++++++++ dlls/ole32/tests/propvariant.c | 63 ++++++++++++++++++++++++---------- 2 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2de9edbb80..fa39abe2de 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2797,6 +2797,25 @@ static inline HRESULT PROPVARIANT_ValidateType(VARTYPE vt) case VT_FILETIME|VT_VECTOR: case VT_CF|VT_VECTOR: case VT_CLSID|VT_VECTOR: + case VT_ARRAY|VT_I1: + case VT_ARRAY|VT_UI1: + case VT_ARRAY|VT_I2: + case VT_ARRAY|VT_UI2: + case VT_ARRAY|VT_I4: + case VT_ARRAY|VT_UI4: + case VT_ARRAY|VT_INT: + case VT_ARRAY|VT_UINT: + case VT_ARRAY|VT_R4: + case VT_ARRAY|VT_R8: + case VT_ARRAY|VT_CY: + case VT_ARRAY|VT_DATE: + case VT_ARRAY|VT_BSTR: + case VT_ARRAY|VT_BOOL: + case VT_ARRAY|VT_DECIMAL: + case VT_ARRAY|VT_DISPATCH: + case VT_ARRAY|VT_UNKNOWN: + case VT_ARRAY|VT_ERROR: + case VT_ARRAY|VT_VARIANT: return S_OK; } WARN("Bad type %d\n", vt); @@ -2908,6 +2927,8 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ CoTaskMemFree(pvar->u.capropvar.pElems); } } + else if (pvar->vt & VT_ARRAY) + hr = SafeArrayDestroy(pvar->u.parray); else { WARN("Invalid/unsupported type %d\n", pvar->vt); @@ -3088,6 +3109,11 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ else CopyMemory(pvarDest->u.capropvar.pElems, pvarSrc->u.capropvar.pElems, len * elemSize); } + else if (pvarSrc->vt & VT_ARRAY) + { + pvarDest->u.uhVal.QuadPart = 0; + return SafeArrayCopy(pvarSrc->u.parray, &pvarDest->u.parray); + } else WARN("Invalid/unsupported type %d\n", pvarSrc->vt); } diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 8c9f79e8d6..18ecfa6528 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -46,28 +46,28 @@ static const struct valid_mapping { { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_EMPTY */ { PROP_V0 , PROP_INV, PROP_INV, PROP_INV }, /* VT_NULL */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ - { PROP_V1 | PROP_TODO , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_I4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R4 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_R8 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_CY */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_DATE */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BSTR */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DISPATCH */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_ERROR */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_BOOL */ + { PROP_V1 | PROP_TODO , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_VARIANT */ + { PROP_V1 , PROP_V1, PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UNKNOWN */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_DECIMAL */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* 15 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ - { PROP_V0 , PROP_V1 | PROP_TODO , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ + { PROP_V1 , PROP_V1 , PROP_V1 , PROP_V1 | PROP_TODO }, /* VT_I1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI1 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI2 */ + { PROP_V0 , PROP_V1 , PROP_V0 , PROP_V1 | PROP_TODO }, /* VT_UI4 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_I8 */ { PROP_V0 , PROP_V1A | PROP_TODO, PROP_V0 , PROP_V1A | PROP_TODO }, /* VT_UI8 */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ - { PROP_V1 , PROP_V1 | PROP_TODO , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_INT */ + { PROP_V1 , PROP_V1 , PROP_INV, PROP_V1 | PROP_TODO }, /* VT_UINT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_VOID */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_HRESULT */ { PROP_INV, PROP_INV, PROP_INV, PROP_INV }, /* VT_PTR */ @@ -351,6 +351,9 @@ static void test_copy(void) struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; + SAFEARRAY *sa; + SAFEARRAYBOUND sabound; + LONG saindex; HRESULT hr; propvarSrc.vt = VT_BSTR; @@ -392,6 +395,28 @@ static void test_copy(void) ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + sabound.lLbound = 0; + sabound.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sabound); + saindex = 0; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + saindex = 1; + SafeArrayPutElement(sa, &saindex, &unk_obj.IUnknown_iface); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + propvarSrc.vt = VT_ARRAY | VT_UNKNOWN; + U(propvarSrc).parray = sa; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 5, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarSrc); + ok(hr == S_OK, "PropVariantClear(...VT_ARRAY|VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.17.1

2 3

[PATCH v3 3/3] winemac.drv: Activate window when restoring from iconic state.
by Zhiyi Zhang 04 Jun '19

04 Jun '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b7a09634ee..605c0c87f1 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd) { TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window); release_win_data(data); + SetActiveWindow(hwnd); SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); return; } -- 2.20.1

1 0

[PATCH] dbghelp: Add SymGetExtendedOption/SymSetExtendedOption stubs
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/dbghelp.c | 20 ++++++++++++++++++++ dlls/dbghelp/dbghelp.spec | 2 ++ include/dbghelp.h | 8 ++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index ed4d5f4321..5a0d10d4bd 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -451,6 +451,26 @@ DWORD WINAPI SymGetOptions(void) return dbghelp_options; } +/****************************************************************** + * SymSetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value) +{ + FIXME("%d, %d\n", option, value); + return FALSE; +} + +/****************************************************************** + * SymGetExtendedOption (DBGHELP.@) + * + */ +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option) +{ + FIXME("%d\n", option); + return FALSE; +} + /****************************************************************** * SymSetParentWindow (DBGHELP.@) * diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 3655f8ca95..4c06f87d12 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -83,6 +83,7 @@ @ stub SymGetFileLineOffsets64 @ stub SymGetHomeDirectory @ stub SymGetHomeDirectoryW +@ stdcall SymGetExtendedOption(long) @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stdcall SymGetLineFromAddr64(long int64 ptr ptr) @ stdcall SymGetLineFromAddrW64(long int64 ptr ptr) @@ -153,6 +154,7 @@ @ stdcall SymSearch(long int64 long long str int64 ptr ptr long) @ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) +@ stdcall SymSetExtendedOption(long long) @ stdcall SymSetHomeDirectory(long str) @ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) diff --git a/include/dbghelp.h b/include/dbghelp.h index df105a8c5e..a319385b4a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1424,6 +1424,11 @@ typedef struct _IMAGE_DEBUG_INFORMATION DWORD Reserved[ 2 ]; } IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; +typedef enum +{ + SYMOPT_EX_DISABLEACCESSTIMEUPDATE, + SYMOPT_EX_MAX +} IMAGEHLP_EXTENDED_OPTIONS; PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(HANDLE, PCSTR, PCSTR, ULONG); @@ -1432,6 +1437,9 @@ BOOL WINAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); DWORD WINAPI SymGetOptions(void); DWORD WINAPI SymSetOptions(DWORD); +BOOL WINAPI SymGetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option); +BOOL WINAPI SymSetExtendedOption(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); + BOOL WINAPI SymSetParentWindow(HWND); /************************* -- 2.17.1

1 0

[PATCH v2 2/2] winedbg: Replace magic number
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/winedbg/info.c | 2 +- programs/winedbg/symbol.c | 6 +++--- programs/winedbg/tgt_module.c | 4 ++-- programs/winedbg/winedbg.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 72c57a29b4..11c141314a 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -228,7 +228,7 @@ void info_win32_module(DWORD64 base) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index aa88ffcbc7..81fad51b64 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -394,7 +394,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); if (!sgv.num) @@ -655,7 +655,7 @@ BOOL symbol_get_line(const char* filename, const char* name, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { SymSetOptions(opt); @@ -808,7 +808,7 @@ void symbol_info(const char* str) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, symbols_info_cb, NULL); SymSetOptions(opt); } diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 58c4282689..7230658e25 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -51,7 +51,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | - SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); @@ -76,7 +76,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { dbg_printf("Non supported mode... errors may occur\n" "Use at your own risks\n"); - SymSetOptions(SymGetOptions() | 0x40000000); + SymSetOptions(SymGetOptions() | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy); dbg_curr_pid = 1; dbg_curr_thread = dbg_add_thread(dbg_curr_process, 2, NULL, NULL); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5aeaa0d4a2..cb34684277 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -447,7 +447,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); -- 2.17.1

1 1

[PATCH v2 1/2] include: Add missing SYMOPT_* defines
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 42106165ca..df105a8c5e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -500,8 +500,16 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - -#define SYMOPT_DEBUG 0x80000000 +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 +#define SYMOPT_DISABLE_FAST_SYMBOLS 0x10000000 +#define SYMOPT_DISABLE_SYMSRV_TIMEOUT 0x20000000 +#define SYMOPT_DISABLE_SRVSTAR_ON_STARTUP 0x40000000 +#define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME { -- 2.17.1

1 0

[PATCH 2/2] winedbg: Replace magic number
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/winedbg/tgt_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 58c4282689..1e21e6b4b7 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -51,7 +51,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | - SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); -- 2.17.1

1 0

[PATCH 1/2] include: Add missing SYMOPT_* defines
by Alistair Leslie-Hughes 04 Jun '19

04 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbghelp.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 42106165ca..df105a8c5e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -500,8 +500,16 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - -#define SYMOPT_DEBUG 0x80000000 +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 +#define SYMOPT_DISABLE_FAST_SYMBOLS 0x10000000 +#define SYMOPT_DISABLE_SYMSRV_TIMEOUT 0x20000000 +#define SYMOPT_DISABLE_SRVSTAR_ON_STARTUP 0x40000000 +#define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME { -- 2.17.1

1 0

[PATCH] dbghelp: Support S_HEAPALLOCSITE entry
by Alistair Leslie-Hughes 03 Jun '19

03 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/msc.c | 5 +++++ include/wine/mscvpdb.h | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 54fbe36596..4be0cb244d 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2011,6 +2011,11 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_ALIGN_V1: TRACE("S-Align V1\n"); break; + case S_HEAPALLOCSITE: + TRACE("heap site: offset=0x%08x at sect_idx 0x%04x, inst_len 0x%08x, index 0x%08x\n", + sym->heap_alloc_site.offset, sym->heap_alloc_site.sect_idx, + sym->heap_alloc_site.inst_len, sym->heap_alloc_site.index); + break; /* the symbols we can safely ignore for now */ case S_TRAMPOLINE: diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index a44331bb5c..2301e80d86 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1644,6 +1644,16 @@ union codeview_symbol unsigned short eh_sect; /* section for exception handler */ unsigned int flags; } frame_info_v2; + + struct + { + unsigned short len; + unsigned short id; + unsigned int offset; + unsigned short sect_idx; + unsigned short inst_len; + unsigned int index; + } heap_alloc_site; }; #define S_COMPILAND_V1 0x0001 -- 2.17.1

1 0

[PATCH] taskschd: Fix some server binding handle leaks (Valgrind).
by Sven Baars 03 Jun '19

03 Jun '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/taskschd/task.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 54b678244b..2a1d0d42b3 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3691,6 +3691,8 @@ static ULONG WINAPI TaskService_Release(ITaskService *iface) { TRACE("destroying %p\n", iface); heap_free(task_svc); + if (rpc_handle) + RpcBindingFree(&rpc_handle); } return ref; @@ -3881,11 +3883,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = start_schedsvc(); if (hr != S_OK) return hr; - hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); - if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); - RpcStringFreeW(&binding_str); - if (hr != RPC_S_OK) return hr; + if (!rpc_handle) + { + hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + if (hr != RPC_S_OK) return hr; + hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + RpcStringFreeW(&binding_str); + if (hr != RPC_S_OK) return hr; + } /* Make sure that the connection works */ hr = SchRpcHighestVersion(&task_svc->version); -- 2.17.1

2 2

[PATCH] mshtml: Add IDisplayServices interface stub.
by Dmitry Timoshkov 03 Jun '19

03 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 96 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 99 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9dec890d1a..3d82dd4f53 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5014,6 +5014,99 @@ static const IMarkupContainerVtbl MarkupContainerVtbl = { MarkupContainer_OwningDoc }; +/********************************************************** + * IDisplayServices implementation + */ +static inline HTMLDocument *impl_from_IDisplayServices(IDisplayServices *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDisplayServices_iface); +} + +static HRESULT WINAPI DisplayServices_QueryInterface(IDisplayServices *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI DisplayServices_AddRef(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DisplayServices_Release(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DisplayServices_CreateDisplayPointer(IDisplayServices *iface, IDisplayPointer **ppDispPointer) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppDispPointer); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformRect(IDisplayServices *iface, + RECT *pRect, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_rect(pRect), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformPoint(IDisplayServices *iface, + POINT *pPoint, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_point(pPoint), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetCaret(IDisplayServices *iface, IHTMLCaret **ppCaret) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppCaret); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetComputedStyle(IDisplayServices *iface, + IMarkupPointer *pPointer, IHTMLComputedStyle **ppComputedStyle) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pPointer, ppComputedStyle); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_ScrollRectIntoView(IDisplayServices *iface, + IHTMLElement *pIElement, RECT rect) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%s)\n", This, pIElement, wine_dbgstr_rect(&rect)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_HasFlowLayout(IDisplayServices *iface, + IHTMLElement *pIElement, BOOL *pfHasFlowLayout) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pIElement, pfHasFlowLayout); + return E_NOTIMPL; +} + +static const IDisplayServicesVtbl DisplayServicesVtbl = { + DisplayServices_QueryInterface, + DisplayServices_AddRef, + DisplayServices_Release, + DisplayServices_CreateDisplayPointer, + DisplayServices_TransformRect, + DisplayServices_TransformPoint, + DisplayServices_GetCaret, + DisplayServices_GetComputedStyle, + DisplayServices_ScrollRectIntoView, + DisplayServices_HasFlowLayout +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5096,6 +5189,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupServices_iface; else if(IsEqualGUID(&IID_IMarkupContainer, riid)) *ppv = &This->IMarkupContainer_iface; + else if(IsEqualGUID(&IID_IDisplayServices, riid)) + *ppv = &This->IDisplayServices_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5145,6 +5240,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; + doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dc9367493..8beea346e8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -625,6 +625,7 @@ struct HTMLDocument { IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; + IDisplayServices IDisplayServices_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8a08282957..01c6191a6e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -173,6 +173,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, &IID_IMarkupContainer, @@ -191,6 +192,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_ICustomDoc, &IID_IMarkupContainer, -- 2.20.1

2 1

[PATCH] mshtml.idl: Add forward declaration for IHTMLWindow flavours.
by Dmitry Timoshkov 03 Jun '19

03 Jun '19

This helps to make sure that getComputedStyle() gets picked up before GetComputedStyle(), and correct tlb is generated as a result. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/mshtml.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index de15c6c2ce..f7ebd9e71a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -407,6 +407,12 @@ interface IHTMLFrameBase; interface IHTMLStorage; interface IHTMLStyleSheetsCollection; interface IHTMLTableSection; +interface IHTMLWindow2; +interface IHTMLWindow3; +interface IHTMLWindow4; +interface IHTMLWindow5; +interface IHTMLWindow6; +interface IHTMLWindow7; interface IDOMEvent; interface IDisplayPointer; interface IDisplayServices; -- 2.20.1

2 1

[PATCH] mshtml.idl: Work around IDisplayServices and IHTMLWindow7 conflict for getComputedStyle.
by Jacek Caban 03 Jun '19

03 Jun '19

Generated typelib will use one name entry for both interface (although they differ in 'g' case). Make sure the right variant is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtml.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

2 5

winetricks gmdls directmusic dsdmo doesn't work.
by Dr. Makoto Sakurai 03 Jun '19

03 Jun '19

Dear all, I have imported gm.dls and dsdmo works fine. But, winetricks directmusic doesn't work. regsvr32: 'DLLRegisterServer' is not implemented in DLL 'dsound.dll' (translated form Japanese to English) What should I do? I need it to play MIDI on wine. Best, Makoto Sakurai

2 1

[PATCH 1/3] include/mshtml.idl: Add more interface declarations.
by Dmitry Timoshkov 03 Jun '19

03 Jun '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/mshtmdid.h | 32 ++++- include/mshtml.idl | 342 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 356 insertions(+), 18 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a8c010d3b1..82055f690b 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -38,9 +38,11 @@ #define DISPID_HEADER DISPID_NORMAL_FIRST #define DISPID_HEDELEMS DISPID_NORMAL_FIRST #define DISPID_HR DISPID_NORMAL_FIRST +#define DISPID_IHTMLCOMPUTEDSTYLE DISPID_NORMAL_FIRST +#define DISPID_ILINEINFO DISPID_NORMAL_FIRST +#define DISPID_IMGBASE DISPID_NORMAL_FIRST #define DISPID_LABEL DISPID_NORMAL_FIRST #define DISPID_LI DISPID_NORMAL_FIRST -#define DISPID_IMGBASE DISPID_NORMAL_FIRST #define DISPID_MENU DISPID_NORMAL_FIRST #define DISPID_OL DISPID_NORMAL_FIRST #define DISPID_PARA DISPID_NORMAL_FIRST @@ -1683,6 +1685,34 @@ #define DISPID_IHTMLDOCUMENT8_ONMSMANIPULATIONSTATECHANGED DISPID_EVPROP_ONMSMANIPULATIONSTATECHANGED #define DISPID_IHTMLDOCUMENT8_MSCAPSLOCKWARNINGOFF DISPID_OMDOCUMENT+141 +/* ILineInfo */ +#define DISPID_ILINEINFO_X (DISPID_ILINEINFO+1) +#define DISPID_ILINEINFO_BASELINE (DISPID_ILINEINFO+2) +#define DISPID_ILINEINFO_TEXTDESCENT (DISPID_ILINEINFO+3) +#define DISPID_ILINEINFO_TEXTHEIGHT (DISPID_ILINEINFO+4) +#define DISPID_ILINEINFO_LINEDIRECTION (DISPID_ILINEINFO+5) + +/* IHTMLComputedStyle */ +#define DISPID_IHTMLCOMPUTEDSTYLE_BOLD (DISPID_IHTMLCOMPUTEDSTYLE+1) +#define DISPID_IHTMLCOMPUTEDSTYLE_ITALIC (DISPID_IHTMLCOMPUTEDSTYLE+2) +#define DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE (DISPID_IHTMLCOMPUTEDSTYLE+3) +#define DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE (DISPID_IHTMLCOMPUTEDSTYLE+4) +#define DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT (DISPID_IHTMLCOMPUTEDSTYLE+5) +#define DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT (DISPID_IHTMLCOMPUTEDSTYLE+6) +#define DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT (DISPID_IHTMLCOMPUTEDSTYLE+7) +#define DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE (DISPID_IHTMLCOMPUTEDSTYLE+8) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT (DISPID_IHTMLCOMPUTEDSTYLE+9) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE (DISPID_IHTMLCOMPUTEDSTYLE+10) +#define DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME (DISPID_IHTMLCOMPUTEDSTYLE+11) +#define DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+12) +#define DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+13) +#define DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR (DISPID_IHTMLCOMPUTEDSTYLE+14) +#define DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED (DISPID_IHTMLCOMPUTEDSTYLE+15) +#define DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION (DISPID_IHTMLCOMPUTEDSTYLE+16) +#define DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION (DISPID_IHTMLCOMPUTEDSTYLE+17) +#define DISPID_IHTMLCOMPUTEDSTYLE_OL (DISPID_IHTMLCOMPUTEDSTYLE+18) +#define DISPID_IHTMLCOMPUTEDSTYLE_ISEQUAL + /* DWebBridgeEvents */ #define DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT 1 #define DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE DISPID_HTMLDOCUMENTEVENTS_ONREADYSTATECHANGE diff --git a/include/mshtml.idl b/include/mshtml.idl index 7cc9e93af2..de15c6c2ce 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -45,6 +45,15 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef FindText") cpp_quote("#endif") +[ + version(4.0), + uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) +] +library MSHTML +{ + +importlib("stdole2.tlb"); + typedef enum { POINTER_GRAVITY_Left, POINTER_GRAVITY_Right, @@ -100,14 +109,155 @@ typedef enum _SELECTION_TYPE { SELECTION_TYPE_Max = 2147483647 } SELECTION_TYPE; -[ - version(4.0), - uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) -] -library MSHTML -{ - -importlib("stdole2.tlb"); +typedef enum _ELEMENT_TAG_ID { + TAGID_NULL, + TAGID_UNKNOWN, + TAGID_A, + TAGID_ACRONYM, + TAGID_ADDRESS, + TAGID_APPLET, + TAGID_AREA, + TAGID_B, + TAGID_BASE, + TAGID_BASEFONT, + TAGID_BDO, + TAGID_BGSOUND, + TAGID_BIG, + TAGID_BLINK, + TAGID_BLOCKQUOTE, + TAGID_BODY, + TAGID_BR, + TAGID_BUTTON, + TAGID_CAPTION, + TAGID_CENTER, + TAGID_CITE, + TAGID_CODE, + TAGID_COL, + TAGID_COLGROUP, + TAGID_COMMENT, + TAGID_COMMENT_RAW, + TAGID_DD, + TAGID_DEL, + TAGID_DFN, + TAGID_DIR, + TAGID_DIV, + TAGID_DL, + TAGID_DT, + TAGID_EM, + TAGID_EMBED, + TAGID_FIELDSET, + TAGID_FONT, + TAGID_FORM, + TAGID_FRAME, + TAGID_FRAMESET, + TAGID_GENERIC, + TAGID_H1, + TAGID_H2, + TAGID_H3, + TAGID_H4, + TAGID_H5, + TAGID_H6, + TAGID_HEAD, + TAGID_HR, + TAGID_HTML, + TAGID_I, + TAGID_IFRAME, + TAGID_IMG, + TAGID_INPUT, + TAGID_INS, + TAGID_KBD, + TAGID_LABEL, + TAGID_LEGEND, + TAGID_LI, + TAGID_LINK, + TAGID_LISTING, + TAGID_MAP, + TAGID_MARQUEE, + TAGID_MENU, + TAGID_META, + TAGID_NEXTID, + TAGID_NOBR, + TAGID_NOEMBED, + TAGID_NOFRAMES, + TAGID_NOSCRIPT, + TAGID_OBJECT, + TAGID_OL, + TAGID_OPTION, + TAGID_P, + TAGID_PARAM, + TAGID_PLAINTEXT, + TAGID_PRE, + TAGID_Q, + TAGID_RP, + TAGID_RT, + TAGID_RUBY, + TAGID_S, + TAGID_SAMP, + TAGID_SCRIPT, + TAGID_SELECT, + TAGID_SMALL, + TAGID_SPAN, + TAGID_STRIKE, + TAGID_STRONG, + TAGID_STYLE, + TAGID_SUB, + TAGID_SUP, + TAGID_TABLE, + TAGID_TBODY, + TAGID_TC, + TAGID_TD, + TAGID_TEXTAREA, + TAGID_TFOOT, + TAGID_TH, + TAGID_THEAD, + TAGID_TITLE, + TAGID_TR, + TAGID_TT, + TAGID_U, + TAGID_UL, + TAGID_VAR, + TAGID_WBR, + TAGID_XMP, + TAGID_ROOT, + TAGID_OPTGROUP, + TAGID_ABBR, + TAGID_COUNT, + TAGID_LAST_PREDEFINED = 10000, + ELEMENT_TAG_ID_Max = 2147483647 +} ELEMENT_TAG_ID; + +typedef enum _COORD_SYSTEM { + COORD_SYSTEM_GLOBAL, + COORD_SYSTEM_PARENT, + COORD_SYSTEM_CONTAINER, + COORD_SYSTEM_CONTENT, + COORD_SYSTEM_FRAME, + COORD_SYSTEM_Max = 2147483647 +} COORD_SYSTEM; + +typedef enum _DISPLAY_MOVEUNIT { + DISPLAY_MOVEUNIT_PreviousLine = 1, + DISPLAY_MOVEUNIT_NextLine, + DISPLAY_MOVEUNIT_CurrentLineStart, + DISPLAY_MOVEUNIT_CurrentLineEnd, + DISPLAY_MOVEUNIT_TopOfWindow, + DISPLAY_MOVEUNIT_BottomOfWindow, + DISPLAY_MOVEUNIT_Max = 2147483647 +} DISPLAY_MOVEUNIT; + +typedef enum _DISPLAY_GRAVITY { + DISPLAY_GRAVITY_PreviousLine = 1, + DISPLAY_GRAVITY_NextLine, + DISPLAY_GRAVITY_Max = 2147483647 +} DISPLAY_GRAVITY; + +typedef enum _CARET_DIRECTION { + CARET_DIRECTION_INDETERMINATE, + CARET_DIRECTION_SAME, + CARET_DIRECTION_BACKWARD, + CARET_DIRECTION_FORWARD, + CARET_DIRECTION_Max = 2147483647 +} CARET_DIRECTION; typedef enum _DomConstructor { DomConstructorObject = 0, @@ -245,13 +395,25 @@ interface IHTMLDOMConstructor : IDispatch [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] \ IDispatch *constructor() +interface IHTMLCaret; +interface IHTMLComputedStyle; interface IHTMLDocument2; interface IHTMLDocument7; +interface IHTMLElement; interface IHTMLElement2; -interface IHTMLStyleSheetsCollection; +interface IHTMLElementCollection; +interface IHTMLEventObj; interface IHTMLFrameBase; interface IHTMLStorage; +interface IHTMLStyleSheetsCollection; +interface IHTMLTableSection; interface IDOMEvent; +interface IDisplayPointer; +interface IDisplayServices; +interface ILineInfo; +interface IMarkupPointer; +interface IMarkupContainer; +interface ISVGSVGElement; /***************************************************************************** * IHTMLCSSStyleDeclaration interface @@ -8706,8 +8868,6 @@ methods: IDispatch *item([in] LONG index); } -interface IHTMLElementCollection; - /***************************************************************************** * IHTMLElement interface */ @@ -12518,8 +12678,6 @@ methods: VARIANT_BOOL onreset(); } -interface IHTMLEventObj; - [ hidden, uuid(3050F614-98B5-11CF-BB82-00AA00BDCE0B) @@ -16122,8 +16280,6 @@ interface ISVGAnimatedEnumeration : IDispatch HRESULT animVal([out, retval] USHORT *p); } -interface ISVGSVGElement; - /***************************************************************************** * ISVGElement interface */ @@ -25111,8 +25267,6 @@ interface IHTMLTableCaption : IDispatch HRESULT vAlign([retval, out] BSTR *p); } -interface IHTMLTableSection; - /***************************************************************************** * IHTMLTable interface */ @@ -27871,6 +28025,160 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } +/***************************************************************************** + * ILineInfo interface + */ +[ + object, + pointer_default(unique), + uuid(3050f7e2-98b5-11cf-bb82-00aa00bdce0b) +] +interface ILineInfo : IUnknown +{ + [propget, id(DISPID_ILINEINFO_X)] HRESULT x([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_BASELINE)] HRESULT baseLine([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_TEXTDESCENT)] HRESULT textDescent([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_TEXTHEIGHT)] HRESULT textHeight([retval, out] long *p); + [propget, id(DISPID_ILINEINFO_LINEDIRECTION)] HRESULT lineDirection([retval, out] long *p); +}; + +/***************************************************************************** + * IHTMLComputedStyle interface + */ +[ + object, + pointer_default(unique), + uuid(3050f6c3-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLComputedStyle : IUnknown +{ + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT *preFormatted([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OL)] HRESULT OL([retval, out] VARIANT_BOOL *p); + HRESULT IsEqual([in] IHTMLComputedStyle *pComputedStyle,[out] VARIANT_BOOL *pfEqual); +}; + +/***************************************************************************** + * IDisplayPointer interface + */ +[ + object, + pointer_default(unique), + uuid(3050f69e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDisplayPointer : IUnknown +{ + HRESULT MoveToPoint([in] POINT ptPoint,[in] COORD_SYSTEM eCoordSystem,[in] IHTMLElement *pElementContext,[in] DWORD dwHitTestOptions,[out] DWORD *pdwHitTestResults); + HRESULT MoveUnit([in] DISPLAY_MOVEUNIT eMoveUnit,[in] LONG lXPos); + HRESULT PositionMarkupPointer([in] IMarkupPointer *pMarkupPointer); + HRESULT MoveToPointer([in] IDisplayPointer *pDispPointer); + HRESULT SetPointerGravity([in] POINTER_GRAVITY eGravity); + HRESULT GetPointerGravity([out] POINTER_GRAVITY *peGravity); + HRESULT SetDisplayGravity([in] DISPLAY_GRAVITY eGravity); + HRESULT GetDisplayGravity([out] DISPLAY_GRAVITY *peGravity); + HRESULT IsPositioned([out] BOOL *pfPositioned); + HRESULT Unposition(); + HRESULT IsEqualTo([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsEqual); + HRESULT IsLeftOf([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsLeftOf); + HRESULT IsRightOf([in] IDisplayPointer *pDispPointer,[out] BOOL *pfIsRightOf); + HRESULT IsAtBOL([out] BOOL *pfBOL); + HRESULT MoveToMarkupPointer([in] IMarkupPointer *pPointer,[in] IDisplayPointer *pDispLineContext); + HRESULT ScrollIntoView(); + HRESULT GetLineInfo([out] ILineInfo **ppLineInfo); + HRESULT GetFlowElement([out] IHTMLElement **ppLayoutElement); + HRESULT QueryBreaks([out] DWORD *pdwBreaks); +}; + +/***************************************************************************** + * IHTMLCaret interface + */ +[ + object, + pointer_default(unique), + uuid(3050f604-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLCaret : IUnknown +{ + HRESULT MoveCaretToPointer([in] IDisplayPointer *pDispPointer,[in] BOOL fScrollIntoView,[in] CARET_DIRECTION eDir); + HRESULT MoveCaretToPointerEx([in] IDisplayPointer *pDispPointer,[in] BOOL fVisible,[in] BOOL fScrollIntoView,[in] CARET_DIRECTION eDir); + HRESULT MoveMarkupPointerToCaret([in] IMarkupPointer *pIMarkupPointer); + HRESULT MoveDisplayPointerToCaret([in] IDisplayPointer *pDispPointer); + HRESULT IsVisible([out] BOOL *pIsVisible); + HRESULT Show([in] BOOL fScrollIntoView); + HRESULT Hide(); + HRESULT InsertText([in] OLECHAR *pText,[in] LONG lLen); + HRESULT ScrollIntoView(); + HRESULT GetLocation([out] POINT *pPoint,[in] BOOL fTranslate); + HRESULT GetCaretDirection([out] CARET_DIRECTION *peDir); + HRESULT SetCaretDirection([in] CARET_DIRECTION eDir); +}; + +/***************************************************************************** + * IDisplayServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f69d-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDisplayServices : IUnknown +{ + HRESULT CreateDisplayPointer([out] IDisplayPointer **ppDispPointer); + HRESULT TransformRect([in, out] RECT *pRect,[in] COORD_SYSTEM eSource,[in] COORD_SYSTEM eDestination,[in] IHTMLElement *pIElement); + HRESULT TransformPoint([in, out] POINT *pPoint,[in] COORD_SYSTEM eSource,[in] COORD_SYSTEM eDestination,[in] IHTMLElement *pIElement); + HRESULT GetCaret([out] IHTMLCaret **ppCaret); + HRESULT GetComputedStyle([in] IMarkupPointer *pPointer,[out] IHTMLComputedStyle **ppComputedStyle); + HRESULT ScrollRectIntoView([in] IHTMLElement *pIElement,[in] RECT rect); + HRESULT HasFlowLayout([in] IHTMLElement *pIElement,[out] BOOL *pfHasFlowLayout); +}; + +/***************************************************************************** + * IMarkupServices interface + */ +[ + object, + pointer_default(unique), + uuid(3050f4a0-98b5-11cf-bb82-00aa00bdce0b) +] +interface IMarkupServices : IUnknown +{ + HRESULT CreateMarkupPointer([out] IMarkupPointer **ppPointer); + HRESULT CreateMarkupContainer([out] IMarkupContainer **ppMarkupContainer); + HRESULT CreateElement([in] ELEMENT_TAG_ID tagID,[in] OLECHAR *pchAttributes,[out] IHTMLElement **ppElement); + HRESULT CloneElement([in] IHTMLElement *pElemCloneThis,[out] IHTMLElement **ppElementTheClone); + HRESULT InsertElement([in] IHTMLElement *pElementInsert,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT RemoveElement([in] IHTMLElement *pElementRemove); + HRESULT Remove([in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT Copy([in] IMarkupPointer *pPointerSourceStart,[in] IMarkupPointer *pPointerSourceFinish,[in] IMarkupPointer *pPointerTarget); + HRESULT Move([in] IMarkupPointer *pPointerSourceStart,[in] IMarkupPointer *pPointerSourceFinish,[in] IMarkupPointer *pPointerTarget); + HRESULT InsertText([in] OLECHAR *pchText,[in] long cch,[in] IMarkupPointer *pPointerTarget); + HRESULT ParseString([in] OLECHAR *pchHTML,[in] DWORD dwFlags,[out] IMarkupContainer **ppContainerResult,[in] IMarkupPointer *ppPointerStart,[in] IMarkupPointer *ppPointerFinish); + HRESULT ParseGlobal([in] HGLOBAL hglobalHTML,[in] DWORD dwFlags,[out] IMarkupContainer **ppContainerResult,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT IsScopedElement([in] IHTMLElement *pElement,[out] BOOL *pfScoped); + HRESULT GetElementTagId([in] IHTMLElement *pElement,[out] ELEMENT_TAG_ID *ptagId); + HRESULT GetTagIDForName([in] BSTR bstrName,[out] ELEMENT_TAG_ID *ptagId); + HRESULT GetNameForTagID([in] ELEMENT_TAG_ID tagId,[out] BSTR *pbstrName); + HRESULT MovePointersToRange([in] IHTMLTxtRange *pIRange,[in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish); + HRESULT MoveRangeToPointers([in] IMarkupPointer *pPointerStart,[in] IMarkupPointer *pPointerFinish,[in] IHTMLTxtRange *pIRange); + HRESULT BeginUndoUnit([in] OLECHAR *pchTitle); + HRESULT EndUndoUnit(); +}; + /***************************************************************************** * IMarkupContainer interface */ -- 2.20.1

3 5

[PATCH 1/2] wined3d: Zero-initialize the swapchain context array.
by Matteo Bruni 03 Jun '19

03 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47255 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Fixes a regression from commit db201072655946662c041a66ee434c30c245e5b0. dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470df..48d0920554d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -892,7 +892,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 if (!(device->wined3d->flags & WINED3D_NO3D)) { - if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context)))) + if (!(swapchain->context = heap_alloc_zero(sizeof(*swapchain->context)))) { ERR("Failed to create the context array.\n"); hr = E_OUTOFMEMORY; -- 2.21.0

2 2

[PATCH] mmdevapi/tests: Use PropVariantClear after calling IPropertyStore_GetValue (Valgrind).
by Sven Baars 03 Jun '19

03 Jun '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mmdevapi/tests/propstore.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 02340ba1f6..bbd4ffe10f 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -58,23 +58,26 @@ static void test_propertystore(IPropertyStore *store) { WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); trace("guid: %s\n", temp); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); } static void test_deviceinterface(IPropertyStore *store) @@ -91,7 +94,7 @@ static void test_deviceinterface(IPropertyStore *store) ok(hr == S_OK, "GetValue failed: %08x\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } static void test_getat(IPropertyStore *store) -- 2.17.1

2 1

[PATCH 1/2] ddraw: Remove const from ddraw1_vtbl and ddraw_surface1_vtbl.
by Alistair Leslie-Hughes 03 Jun '19

03 Jun '19

From: Michael Müller <michael(a)fds-team.de> Bad Mojo Redux tries to hook ddraw1 and expects both interfaces to be writable. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=39534 Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6978..a26c380839 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4655,7 +4655,7 @@ static const struct IDirectDraw2Vtbl ddraw2_vtbl = ddraw2_GetAvailableVidMem, }; -static const struct IDirectDrawVtbl ddraw1_vtbl = +static struct IDirectDrawVtbl ddraw1_vtbl = { /* IUnknown */ ddraw1_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e2faef867..63f276a2a9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5597,7 +5597,7 @@ static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = ddraw_surface2_PageUnlock, }; -static const struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = +static struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = { /* IUnknown */ ddraw_surface1_QueryInterface, -- 2.17.1

2 1

[PATCH 5/5] wined3d: Properly check whether a context was created in swapchain_init().
by Henri Verbeet 03 Jun '19

03 Jun '19

This fixes commit db201072655946662c041a66ee434c30c245e5b0, but the underlying issue was of course present before that commit. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4cefd80f802..481b3b718ed 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -904,7 +904,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - if (!swapchain->context[0]) + if (!swapchain->num_contexts) { hr = WINED3DERR_NOTAVAILABLE; goto err; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the WGL fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 03 Jun '19

03 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 240 +++++++++++++++++--------------------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 10 +- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/wined3d_private.h | 31 ++--- 6 files changed, 135 insertions(+), 156 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dadeafd8e98..e4a0b42de68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7879,7 +7879,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (dst_location == WINED3D_LOCATION_DRAWABLE) { d = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2f3ed39a750..9dbdd945f09 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1125,45 +1125,45 @@ static BOOL wined3d_context_gl_restore_pixel_format(struct wined3d_context_gl *c const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; BOOL ret = FALSE; - if (context_gl->c.restore_pf && IsWindow(context_gl->c.restore_pf_win)) + if (context_gl->restore_pf && IsWindow(context_gl->restore_pf_win)) { if (context_gl->c.gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HDC dc = GetDCEx(context_gl->c.restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); + HDC dc = GetDCEx(context_gl->restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); if (dc) { - if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, context_gl->c.restore_pf)))) + if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, context_gl->restore_pf)))) { ERR("Failed to restore pixel format %d on window %p.\n", - context_gl->c.restore_pf, context_gl->c.restore_pf_win); + context_gl->restore_pf, context_gl->restore_pf_win); } - ReleaseDC(context_gl->c.restore_pf_win, dc); + ReleaseDC(context_gl->restore_pf_win, dc); } } else { ERR("Unable to restore pixel format %d on window %p.\n", - context_gl->c.restore_pf, context_gl->c.restore_pf_win); + context_gl->restore_pf, context_gl->restore_pf_win); } } - context_gl->c.restore_pf = 0; - context_gl->c.restore_pf_win = NULL; + context_gl->restore_pf = 0; + context_gl->restore_pf_win = NULL; return ret; } static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - BOOL private = context_gl->c.hdc_is_private; - int format = context_gl->c.pixel_format; - HDC dc = context_gl->c.hdc; + BOOL private = context_gl->dc_is_private; + int format = context_gl->pixel_format; + HDC dc = context_gl->dc; int current; - if (private && context_gl->c.hdc_has_format) + if (private && context_gl->dc_has_format) return TRUE; - if (!private && WindowFromDC(dc) != context_gl->c.win_handle) + if (!private && WindowFromDC(dc) != context_gl->window) return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); @@ -1179,8 +1179,8 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte return FALSE; } - context_gl->c.restore_pf = 0; - context_gl->c.restore_pf_win = private ? NULL : WindowFromDC(dc); + context_gl->restore_pf = 0; + context_gl->restore_pf_win = private ? NULL : WindowFromDC(dc); goto success; } @@ -1200,12 +1200,12 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte } win = private ? NULL : WindowFromDC(dc); - if (win != context_gl->c.restore_pf_win) + if (win != context_gl->restore_pf_win) { wined3d_context_gl_restore_pixel_format(context_gl); - context_gl->c.restore_pf = private ? 0 : current; - context_gl->c.restore_pf_win = win; + context_gl->restore_pf = private ? 0 : current; + context_gl->restore_pf_win = win; } goto success; @@ -1221,7 +1221,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte success: if (private) - context_gl->c.hdc_has_format = TRUE; + context_gl->dc_has_format = TRUE; return TRUE; } @@ -1233,14 +1233,14 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (!wined3d_context_gl_set_pixel_format(context_gl)) { WARN("Failed to set pixel format %d on device context %p.\n", - context_gl->c.pixel_format, context_gl->c.hdc); + context_gl->pixel_format, context_gl->dc); backup = TRUE; } - if (backup || !wglMakeCurrent(context_gl->c.hdc, context_gl->c.glCtx)) + if (backup || !wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) { WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", - context_gl->c.glCtx, context_gl->c.hdc, GetLastError()); + context_gl->gl_ctx, context_gl->dc, GetLastError()); context_gl->c.valid = 0; WARN("Trying fallback to the backup window.\n"); @@ -1255,27 +1255,27 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context return FALSE; } - if (!(context_gl->c.hdc = swapchain_get_backup_dc(swapchain))) + if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL); return FALSE; } - context_gl->c.hdc_is_private = TRUE; - context_gl->c.hdc_has_format = FALSE; + context_gl->dc_is_private = TRUE; + context_gl->dc_has_format = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) { ERR("Failed to set pixel format %d on device context %p.\n", - context_gl->c.pixel_format, context_gl->c.hdc); + context_gl->pixel_format, context_gl->dc); context_set_current(NULL); return FALSE; } - if (!wglMakeCurrent(context_gl->c.hdc, context_gl->c.glCtx)) + if (!wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - context_gl->c.hdc, GetLastError()); + context_gl->dc, GetLastError()); context_set_current(NULL); return FALSE; } @@ -1302,60 +1302,30 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ if (!context_gl->c.swapchain) return; - if (context_gl->c.win_handle == context_gl->c.swapchain->win_handle) + if (context_gl->window == context_gl->c.swapchain->win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context_gl, context_gl->c.win_handle, context_gl->c.swapchain->win_handle); + context_gl, context_gl->window, context_gl->c.swapchain->win_handle); - if (context_gl->c.hdc) - wined3d_release_dc(context_gl->c.win_handle, context_gl->c.hdc); + if (context_gl->dc) + wined3d_release_dc(context_gl->window, context_gl->dc); - context_gl->c.win_handle = context_gl->c.swapchain->win_handle; - context_gl->c.hdc_is_private = FALSE; - context_gl->c.hdc_has_format = FALSE; + context_gl->window = context_gl->c.swapchain->win_handle; + context_gl->dc_is_private = FALSE; + context_gl->dc_has_format = FALSE; context_gl->c.needs_set = 1; context_gl->c.valid = 1; - if (!(context_gl->c.hdc = GetDCEx(context_gl->c.win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { - ERR("Failed to get a device context for window %p.\n", context_gl->c.win_handle); + ERR("Failed to get a device context for window %p.\n", context_gl->window); context_gl->c.valid = 0; } } void wined3d_context_cleanup(struct wined3d_context *context) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; - HGLRC restore_ctx; - HDC restore_dc; - - restore_ctx = wglGetCurrentContext(); - restore_dc = wglGetCurrentDC(); - - if (restore_ctx == context->glCtx) - restore_ctx = NULL; - else if (context->valid) - wined3d_context_gl_set_gl_context(context_gl); - - wined3d_context_gl_restore_pixel_format(context_gl); - if (restore_ctx) - { - context_restore_gl_context(gl_info, restore_dc, restore_ctx); - } - else if (wglGetCurrentContext() && !wglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable GL context.\n"); - } - - wined3d_release_dc(context->win_handle, context->hdc); - - if (!wglDeleteContext(context->glCtx)) - { - DWORD err = GetLastError(); - ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); - } } void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) @@ -1374,7 +1344,7 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) restore_ctx = wglGetCurrentContext(); restore_dc = wglGetCurrentDC(); - if (restore_ctx == context_gl->c.glCtx) + if (restore_ctx == context_gl->gl_ctx) restore_ctx = NULL; else if (context_gl->c.valid) wined3d_context_gl_set_gl_context(context_gl); @@ -1505,6 +1475,16 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_gl_restore_pixel_format(context_gl); if (restore_ctx) context_restore_gl_context(gl_info, restore_dc, restore_ctx); + else if (wglGetCurrentContext() && !wglMakeCurrent(NULL, NULL)) + ERR("Failed to disable GL context.\n"); + + wined3d_release_dc(context_gl->window, context_gl->dc); + + if (!wglDeleteContext(context_gl->gl_ctx)) + { + DWORD err = GetLastError(); + ERR("Failed to delete GL context %p, last error %#x.\n", context_gl->gl_ctx, err); + } wined3d_context_cleanup(&context_gl->c); } @@ -1565,7 +1545,8 @@ BOOL context_set_current(struct wined3d_context *ctx) return FALSE; } - TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); + TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", + context_gl, context_gl->gl_ctx, context_gl->dc); if (!wined3d_context_gl_set_gl_context(context_gl)) return FALSE; ctx->current = 1; @@ -1589,7 +1570,7 @@ void context_release(struct wined3d_context *context) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - TRACE("Releasing context %p, level %u.\n", context, context->level); + TRACE("Releasing context %p, level %u.\n", context_gl, context->level); if (WARN_ON(d3d)) { @@ -1603,12 +1584,12 @@ void context_release(struct wined3d_context *context) { if (wined3d_context_gl_restore_pixel_format(context_gl)) context->needs_set = 1; - if (context->restore_ctx) + if (context_gl->restore_ctx) { - TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); - context_restore_gl_context(context->gl_info, context->restore_dc, context->restore_ctx); - context->restore_ctx = NULL; - context->restore_dc = NULL; + TRACE("Restoring GL context %p on device context %p.\n", context_gl->restore_ctx, context_gl->restore_dc); + context_restore_gl_context(context_gl->c.gl_info, context_gl->restore_dc, context_gl->restore_ctx); + context_gl->restore_ctx = NULL; + context_gl->restore_dc = NULL; } if (context->destroy_delayed) @@ -1642,16 +1623,16 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) const struct wined3d_context *current_context = context_get_current(); HGLRC current_gl = wglGetCurrentContext(); - if (current_gl && (!current_context || current_context->glCtx != current_gl)) + if (current_gl && (!current_context || wined3d_context_gl_const(current_context)->gl_ctx != current_gl)) { TRACE("Another GL context (%p on device context %p) is already current.\n", current_gl, wglGetCurrentDC()); - context_gl->c.restore_ctx = current_gl; - context_gl->c.restore_dc = wglGetCurrentDC(); + context_gl->restore_ctx = current_gl; + context_gl->restore_dc = wglGetCurrentDC(); context_gl->c.needs_set = 1; } - else if (!context_gl->c.needs_set && !(context_gl->c.hdc_is_private && context_gl->c.hdc_has_format) - && context_gl->c.pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->c.hdc)) + else if (!context_gl->c.needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) + && context_gl->pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) context_gl->c.needs_set = 1; } } @@ -1915,24 +1896,11 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) +static void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; DWORD state; - if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) - { - WARN("Failed to retrieve device context, trying swapchain backup.\n"); - - if (!(context->hdc = swapchain_get_backup_dc(swapchain))) - { - ERR("Failed to retrieve a device context.\n"); - return FALSE; - } - context->hdc_is_private = TRUE; - } - - context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; context->state_table = device->state_table; @@ -1957,16 +1925,13 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d | (1u << WINED3D_SHADER_TYPE_HULL) | (1u << WINED3D_SHADER_TYPE_DOMAIN) | (1u << WINED3D_SHADER_TYPE_COMPUTE); - - return TRUE; } HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) { TRACE("context_no3d %p, swapchain %p.\n", context_no3d, swapchain); - if (!wined3d_context_init(context_no3d, swapchain)) - return E_FAIL; + wined3d_context_init(context_no3d, swapchain); return WINED3D_OK; } @@ -1985,13 +1950,25 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain); - if (!wined3d_context_init(&context_gl->c, swapchain)) - return E_FAIL; + wined3d_context_init(&context_gl->c, swapchain); device = context->device; gl_info = context->gl_info; d3d_info = context->d3d_info; + context_gl->window = context->swapchain->win_handle; + if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) + { + WARN("Failed to retrieve device context, trying swapchain backup.\n"); + + if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) + { + ERR("Failed to retrieve a device context.\n"); + return E_FAIL; + } + context_gl->dc_is_private = TRUE; + } + list_init(&context_gl->fbo_list); list_init(&context_gl->fbo_destroy_list); @@ -2014,7 +1991,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); - return E_FAIL; + goto fail; } for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i) { @@ -2026,7 +2003,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) { ERR("Unexpected texture unit base index %u.\n", base); - return E_FAIL; + goto fail; } for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) { @@ -2037,7 +2014,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, sizeof(*context_gl->texture_type)))) - return E_FAIL; + goto fail; target = &context->current_rt.texture->resource; target_bind_flags = target->bind_flags; @@ -2077,8 +2054,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi for (i = 0; i < ARRAY_SIZE(ds_formats); ++i) { ds_format = wined3d_get_format(device->adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL); - if ((context->pixel_format = context_choose_pixel_format(device, - context->hdc, color_format, ds_format, TRUE))) + if ((context_gl->pixel_format = context_choose_pixel_format(device, + context_gl->dc, color_format, ds_format, TRUE))) { swapchain->ds_format = ds_format; break; @@ -2090,8 +2067,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } else { - context->pixel_format = context_choose_pixel_format(device, - context->hdc, color_format, swapchain->ds_format, TRUE); + context_gl->pixel_format = context_choose_pixel_format(device, + context_gl->dc, color_format, swapchain->ds_format, TRUE); } } else @@ -2106,41 +2083,38 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi * conflicting pixel formats. */ color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL); - context->pixel_format = context_choose_pixel_format(device, - context->hdc, color_format, ds_format, FALSE); + context_gl->pixel_format = context_choose_pixel_format(device, + context_gl->dc, color_format, ds_format, FALSE); } - if (!context->pixel_format) - return E_FAIL; + if (!context_gl->pixel_format) + goto fail; wined3d_context_gl_enter(context_gl); if (!wined3d_context_gl_set_pixel_format(context_gl)) { - ERR("Failed to set pixel format %d on device context %p.\n", context->pixel_format, context->hdc); + ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); context_release(context); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } - share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; + share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = context_create_wgl_attribs(gl_info, context->hdc, share_ctx))) + if (!(ctx = context_create_wgl_attribs(gl_info, context_gl->dc, share_ctx))) { context_release(context); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } } else { - if (!(ctx = wglCreateContext(context->hdc))) + if (!(ctx = wglCreateContext(context_gl->dc))) { ERR("Failed to create a WGL context.\n"); context_release(context); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } if (share_ctx && !wglShareLists(share_ctx, ctx)) @@ -2149,8 +2123,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } } @@ -2158,8 +2131,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK); context->valid = 1; - context->glCtx = ctx; - context->hdc_has_format = TRUE; + context_gl->gl_ctx = ctx; + context_gl->dc_has_format = TRUE; context->needs_set = 1; /* Set up the context defaults */ @@ -2169,8 +2142,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - heap_free(context_gl->texture_type); - return E_FAIL; + goto fail; } if (context_debug_output_enabled(gl_info)) @@ -2201,7 +2173,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &context->aux_buffers); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &context_gl->aux_buffers); TRACE("Setting up the screen\n"); @@ -2314,14 +2286,18 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi checkGLcall("glScissor"); return WINED3D_OK; + +fail: + heap_free(context_gl->texture_type); + wined3d_release_dc(context_gl->window, context_gl->dc); + return E_FAIL; } HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) { TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - if (!wined3d_context_init(context_vk, swapchain)) - return E_FAIL; + wined3d_context_init(context_vk, swapchain); return WINED3D_OK; } @@ -2422,7 +2398,7 @@ static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *cont { RECT window_size; - GetClientRect(context_gl->c.win_handle, &window_size); + GetClientRect(context_gl->window, &window_size); size->cx = window_size.right - window_size.left; size->cy = window_size.bottom - window_size.top; @@ -2739,7 +2715,7 @@ GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_g return GL_COLOR_ATTACHMENT0; case ORM_BACKBUFFER: - return context_gl->c.aux_buffers > 0 ? GL_AUX0 : GL_BACK; + return context_gl->aux_buffers > 0 ? GL_AUX0 : GL_BACK; default: FIXME("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index baafaf8e3c3..54dfd964cd9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13015,7 +13015,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli if (dst_location == WINED3D_LOCATION_DRAWABLE) { d = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40e8bc17f24..a30605b912a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -239,7 +239,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 TRACE("Source texture %p is onscreen.\n", src_texture); buffer = wined3d_texture_get_gl_buffer(src_texture); s = *src_rect; - wined3d_texture_translate_drawable_coords(src_texture, context->win_handle, &s); + wined3d_texture_translate_drawable_coords(src_texture, context_gl->window, &s); src_rect = &s; } else @@ -259,7 +259,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 TRACE("Destination texture %p is onscreen.\n", dst_texture); buffer = wined3d_texture_get_gl_buffer(dst_texture); d = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &d); dst_rect = &d; } else @@ -1056,12 +1056,12 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. * This way we don't have to wait for the 2nd readback to finish to leave this function. */ - if (context->aux_buffers >= 2) + if (context_gl->aux_buffers >= 2) { /* Got more than one aux buffer? Use the 2nd aux buffer */ drawBuffer = GL_AUX1; } - else if ((!src_offscreen || offscreen_buffer == GL_BACK) && context->aux_buffers >= 1) + else if ((!src_offscreen || offscreen_buffer == GL_BACK) && context_gl->aux_buffers >= 1) { /* Only one aux buffer, but it isn't used (Onscreen rendering, or non-aux orm)? Use it! */ drawBuffer = GL_AUX0; @@ -2241,7 +2241,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (dst_location == WINED3D_LOCATION_DRAWABLE) { r = *dst_rect; - wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &r); + wined3d_texture_translate_drawable_coords(dst_texture, context_gl->window, &r); dst_rect = &r; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470df..4cefd80f802 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -428,6 +428,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; @@ -439,6 +440,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WARN("Invalid context, skipping present.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; @@ -481,7 +483,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } - TRACE("Presenting HDC %p.\n", context->hdc); + TRACE("Presenting DC %p.\n", context_gl->dc); if (!(render_to_fbo = swapchain->render_to_fbo) && (src_rect->left || src_rect->top @@ -518,7 +520,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glFinish(); /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ - gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); + gl_info->gl_ops.wgl.p_wglSwapBuffers(context_gl->dc); wined3d_swapchain_gl_rotate(swapchain, context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c945d9b4daf..a373cc97b9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,8 +1927,7 @@ struct wined3d_context DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD needs_set : 1; - DWORD hdc_is_private : 1; - DWORD hdc_has_format : 1; /* only meaningful if hdc_is_private */ + DWORD num_untracked_materials : 2; /* Max value 2 */ DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; @@ -1939,8 +1938,7 @@ struct wined3d_context DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD num_untracked_materials : 2; /* Max value 2 */ - DWORD padding : 9; + DWORD padding : 11; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1952,17 +1950,7 @@ struct wined3d_context UINT instance_count; - /* The actual opengl context */ UINT level; - HGLRC restore_ctx; - HDC restore_dc; - int restore_pf; - HWND restore_pf_win; - HGLRC glCtx; - HWND win_handle; - HDC hdc; - int pixel_format; - GLint aux_buffers; void *shader_backend_data; void *fragment_pipe_data; @@ -1986,15 +1974,28 @@ struct wined3d_context_gl { struct wined3d_context c; + uint32_t dc_is_private : 1; + uint32_t dc_has_format : 1; /* Only meaningful for private DCs. */ uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t padding : 29; + uint32_t padding : 27; uint32_t default_attrib_value_set; GLenum *texture_type; + /* The WGL context. */ + HGLRC restore_ctx; + HDC restore_dc; + int restore_pf; + HWND restore_pf_win; + HGLRC gl_ctx; + HDC dc; + int pixel_format; + HWND window; + GLint aux_buffers; + /* FBOs. */ unsigned int fbo_entry_count; struct list fbo_list; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_activate().
by Henri Verbeet 03 Jun '19

03 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ba3ac807ac3..2f3ed39a750 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4211,23 +4211,21 @@ static void context_setup_target(struct wined3d_context *context, context_set_render_offscreen(context, render_offscreen); } -static void context_activate(struct wined3d_context *context, +static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); - context_setup_target(context, texture, sub_resource_idx); - if (!context->valid) + context_setup_target(&context_gl->c, texture, sub_resource_idx); + if (!context_gl->c.valid) return; - if (context != context_get_current()) + if (&context_gl->c != context_get_current()) { - if (!context_set_current(context)) + if (!context_set_current(&context_gl->c)) ERR("Failed to activate the new context.\n"); } - else if (context->needs_set) + else if (context_gl->c.needs_set) { wined3d_context_gl_set_gl_context(context_gl); } @@ -4292,7 +4290,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, return NULL; } - context_activate(context, texture, sub_resource_idx); + wined3d_context_gl_activate(wined3d_context_gl(context), texture, sub_resource_idx); return context; } @@ -4309,7 +4307,8 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, if (context->current_rt.texture) { - context_activate(context, context->current_rt.texture, context->current_rt.sub_resource_idx); + wined3d_context_gl_activate(wined3d_context_gl(context), + context->current_rt.texture, context->current_rt.sub_resource_idx); return context; } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl strcuture to find_draw_buffers_mask().
by Henri Verbeet 03 Jun '19

03 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c0697408331..ba3ac807ac3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3141,18 +3141,17 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, return TRUE; } -static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) +static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); - else if (!context->render_offscreen) + else if (!context_gl->c.render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; @@ -3173,7 +3172,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int rt_mask = find_draw_buffers_mask(context, state); + uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; DWORD *cur_mask; @@ -3473,12 +3472,12 @@ static void wined3d_context_gl_update_tex_unit_map(struct wined3d_context_gl *co void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - DWORD rt_mask, *cur_mask; + uint32_t rt_mask, *cur_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - rt_mask = find_draw_buffers_mask(context, state); + rt_mask = find_draw_buffers_mask(context_gl, state); if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_generate_rt_mask_no_fbo().
by Henri Verbeet 03 Jun '19

03 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 796030561cb..c0697408331 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2747,10 +2747,9 @@ GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_g } } -static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_resource *rt) +static uint32_t wined3d_context_gl_generate_rt_mask_no_fbo(const struct wined3d_context_gl *context_gl, + struct wined3d_resource *rt) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - if (!rt || rt->format->id == WINED3DFMT_NULL) return 0; else if (rt->type != WINED3D_RTYPE_BUFFER && texture_from_resource(rt)->swapchain) @@ -2764,8 +2763,8 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, { struct wined3d_context *context = &context_gl->c; const struct wined3d_gl_info *gl_info; + uint32_t rt_mask, *cur_mask; struct wined3d_texture *rt; - DWORD rt_mask, *cur_mask; unsigned int sampler; SIZE rt_size; @@ -2796,7 +2795,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(context, &rt->resource); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, &rt->resource); } cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; @@ -3029,7 +3028,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, struct wined3d_rendertarget_view * const *rts = fb->render_targets; const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - DWORD rt_mask = 0, *cur_mask; + uint32_t rt_mask = 0, *cur_mask; unsigned int i; if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != state->fb @@ -3088,7 +3087,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(&context_gl->c, rt_count ? rts[0]->resource : NULL); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -3102,7 +3101,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, } else { - rt_mask = context_generate_rt_mask_no_fbo(&context_gl->c, rt_count ? rts[0]->resource : NULL); + rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); } cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; @@ -3144,6 +3143,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -3151,7 +3151,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, rts[0]->resource); + return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource); -- 2.11.0

1 0

[PATCH 1/2] mf: Add rate support for presentation clock.
by Nikolay Sivov 03 Jun '19

03 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 107 +++++++++++++++++++++++++++++++++------------ dlls/mf/tests/mf.c | 52 ++++++++++++++++++++++ 2 files changed, 131 insertions(+), 28 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8e41942448..3a33a88a4b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -85,6 +85,7 @@ enum clock_command CLOCK_CMD_START = 0, CLOCK_CMD_STOP, CLOCK_CMD_PAUSE, + CLOCK_CMD_SET_RATE, CLOCK_CMD_MAX, }; @@ -94,6 +95,16 @@ enum clock_notification CLOCK_NOTIFY_STOP, CLOCK_NOTIFY_PAUSE, CLOCK_NOTIFY_RESTART, + CLOCK_NOTIFY_SET_RATE, +}; + +struct clock_state_change_param +{ + union + { + LONGLONG offset; + float rate; + } u; }; struct sink_notification @@ -101,7 +112,7 @@ struct sink_notification IUnknown IUnknown_iface; LONG refcount; MFTIME system_time; - LONGLONG offset; + struct clock_state_change_param param; enum clock_notification notification; IMFClockStateSink *sink; }; @@ -118,6 +129,7 @@ struct presentation_clock IMFClockStateSink *time_source_sink; MFCLOCK_STATE state; struct list sinks; + float rate; CRITICAL_SECTION cs; }; @@ -1092,8 +1104,8 @@ static const IUnknownVtbl sinknotificationvtbl = sink_notification_Release, }; -static HRESULT create_sink_notification(MFTIME system_time, LONGLONG offset, enum clock_notification notification, - IMFClockStateSink *sink, IUnknown **out) +static HRESULT create_sink_notification(MFTIME system_time, struct clock_state_change_param param, + enum clock_notification notification, IMFClockStateSink *sink, IUnknown **out) { struct sink_notification *object; @@ -1104,7 +1116,7 @@ static HRESULT create_sink_notification(MFTIME system_time, LONGLONG offset, enu object->IUnknown_iface.lpVtbl = &sinknotificationvtbl; object->refcount = 1; object->system_time = system_time; - object->offset = offset; + object->param = param; object->notification = notification; object->sink = sink; IMFClockStateSink_AddRef(object->sink); @@ -1114,15 +1126,15 @@ static HRESULT create_sink_notification(MFTIME system_time, LONGLONG offset, enu return S_OK; } -static HRESULT clock_call_state_change(MFTIME system_time, LONGLONG offset, enum clock_notification notification, - IMFClockStateSink *sink) +static HRESULT clock_call_state_change(MFTIME system_time, struct clock_state_change_param param, + enum clock_notification notification, IMFClockStateSink *sink) { HRESULT hr = S_OK; switch (notification) { case CLOCK_NOTIFY_START: - hr = IMFClockStateSink_OnClockStart(sink, system_time, offset); + hr = IMFClockStateSink_OnClockStart(sink, system_time, param.u.offset); break; case CLOCK_NOTIFY_STOP: hr = IMFClockStateSink_OnClockStop(sink, system_time); @@ -1133,6 +1145,10 @@ static HRESULT clock_call_state_change(MFTIME system_time, LONGLONG offset, enum case CLOCK_NOTIFY_RESTART: hr = IMFClockStateSink_OnClockRestart(sink, system_time); break; + case CLOCK_NOTIFY_SET_RATE: + /* System time source does not allow 0.0 rate, presentation clock allows it without raising errors. */ + IMFClockStateSink_OnClockSetRate(sink, system_time, param.u.rate); + break; default: ; } @@ -1140,20 +1156,22 @@ static HRESULT clock_call_state_change(MFTIME system_time, LONGLONG offset, enum return hr; } -static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_command command, LONGLONG offset) +static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_command command, + struct clock_state_change_param param) { static const BYTE state_change_is_allowed[MFCLOCK_STATE_PAUSED+1][CLOCK_CMD_MAX] = - { /* S S* P */ - /* INVALID */ { 1, 1, 1 }, - /* RUNNING */ { 1, 1, 1 }, - /* STOPPED */ { 1, 1, 0 }, - /* PAUSED */ { 1, 1, 0 }, + { /* S S* P, R */ + /* INVALID */ { 1, 1, 1, 1 }, + /* RUNNING */ { 1, 1, 1, 1 }, + /* STOPPED */ { 1, 1, 0, 1 }, + /* PAUSED */ { 1, 1, 0, 1 }, }; static const MFCLOCK_STATE states[CLOCK_CMD_MAX] = { - /* CLOCK_CMD_START */ MFCLOCK_STATE_RUNNING, - /* CLOCK_CMD_STOP */ MFCLOCK_STATE_STOPPED, - /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, + /* CLOCK_CMD_START */ MFCLOCK_STATE_RUNNING, + /* CLOCK_CMD_STOP */ MFCLOCK_STATE_STOPPED, + /* CLOCK_CMD_PAUSE */ MFCLOCK_STATE_PAUSED, + /* CLOCK_CMD_SET_RATE */ 0, /* Unused */ }; enum clock_notification notification; struct clock_sink *sink; @@ -1162,7 +1180,7 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c MFTIME system_time; HRESULT hr; - if (clock->state == states[command] && clock->state != MFCLOCK_STATE_RUNNING) + if (command != CLOCK_CMD_SET_RATE && clock->state == states[command] && clock->state != MFCLOCK_STATE_RUNNING) return MF_E_CLOCK_STATE_ALREADY_SET; if (!state_change_is_allowed[clock->state][command]) @@ -1173,7 +1191,7 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c switch (command) { case CLOCK_CMD_START: - if (clock->state == MFCLOCK_STATE_PAUSED && offset == PRESENTATION_CURRENT_POSITION) + if (clock->state == MFCLOCK_STATE_PAUSED && param.u.offset == PRESENTATION_CURRENT_POSITION) notification = CLOCK_NOTIFY_RESTART; else notification = CLOCK_NOTIFY_START; @@ -1184,18 +1202,21 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c case CLOCK_CMD_PAUSE: notification = CLOCK_NOTIFY_PAUSE; break; + case CLOCK_CMD_SET_RATE: + notification = CLOCK_NOTIFY_SET_RATE; + break; default: ; } - if (FAILED(hr = clock_call_state_change(system_time, offset, notification, clock->time_source_sink))) + if (FAILED(hr = clock_call_state_change(system_time, param, notification, clock->time_source_sink))) return hr; clock->state = states[command]; LIST_FOR_EACH_ENTRY(sink, &clock->sinks, struct clock_sink, entry) { - if (SUCCEEDED(create_sink_notification(system_time, offset, notification, sink->state_sink, &notify_object))) + if (SUCCEEDED(create_sink_notification(system_time, param, notification, sink->state_sink, &notify_object))) { hr = MFCreateAsyncResult(notify_object, &clock->IMFAsyncCallback_iface, NULL, &result); IUnknown_Release(notify_object); @@ -1213,12 +1234,14 @@ static HRESULT clock_change_state(struct presentation_clock *clock, enum clock_c static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG start_offset) { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + struct clock_state_change_param param = { 0 }; HRESULT hr; TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); EnterCriticalSection(&clock->cs); - hr = clock_change_state(clock, CLOCK_CMD_START, start_offset); + param.u.offset = start_offset; + hr = clock_change_state(clock, CLOCK_CMD_START, param); LeaveCriticalSection(&clock->cs); return hr; @@ -1227,12 +1250,13 @@ static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG static HRESULT WINAPI present_clock_Stop(IMFPresentationClock *iface) { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + struct clock_state_change_param param = { 0 }; HRESULT hr; TRACE("%p.\n", iface); EnterCriticalSection(&clock->cs); - hr = clock_change_state(clock, CLOCK_CMD_STOP, 0); + hr = clock_change_state(clock, CLOCK_CMD_STOP, param); LeaveCriticalSection(&clock->cs); return hr; @@ -1241,12 +1265,13 @@ static HRESULT WINAPI present_clock_Stop(IMFPresentationClock *iface) static HRESULT WINAPI present_clock_Pause(IMFPresentationClock *iface) { struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + struct clock_state_change_param param = { 0 }; HRESULT hr; TRACE("%p.\n", iface); EnterCriticalSection(&clock->cs); - hr = clock_change_state(clock, CLOCK_CMD_PAUSE, 0); + hr = clock_change_state(clock, CLOCK_CMD_PAUSE, param); LeaveCriticalSection(&clock->cs); return hr; @@ -1292,16 +1317,41 @@ static ULONG WINAPI present_clock_rate_control_Release(IMFRateControl *iface) static HRESULT WINAPI present_clock_rate_SetRate(IMFRateControl *iface, BOOL thin, float rate) { - FIXME("%p, %d, %f.\n", iface, thin, rate); + struct presentation_clock *clock = impl_from_IMFRateControl(iface); + struct clock_state_change_param param; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %d, %f.\n", iface, thin, rate); + + if (thin) + return MF_E_THINNING_UNSUPPORTED; + + EnterCriticalSection(&clock->cs); + param.u.rate = rate; + if (SUCCEEDED(hr = clock_change_state(clock, CLOCK_CMD_SET_RATE, param))) + clock->rate = rate; + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_rate_GetRate(IMFRateControl *iface, BOOL *thin, float *rate) { - FIXME("%p, %p, %p.\n", iface, thin, rate); + struct presentation_clock *clock = impl_from_IMFRateControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, thin, rate); + + if (!rate) + return E_INVALIDARG; + + if (thin) + *thin = FALSE; + + EnterCriticalSection(&clock->cs); + *rate = clock->rate; + LeaveCriticalSection(&clock->cs); + + return S_OK; } static const IMFRateControlVtbl presentclockratecontrolvtbl = @@ -1439,7 +1489,7 @@ static HRESULT WINAPI present_clock_sink_callback_Invoke(IMFAsyncCallback *iface data = impl_from_IUnknown(object); - clock_call_state_change(data->system_time, data->offset, data->notification, data->sink); + clock_call_state_change(data->system_time, data->param, data->notification, data->sink); IUnknown_Release(object); @@ -1475,6 +1525,7 @@ HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) object->IMFAsyncCallback_iface.lpVtbl = &presentclocksinkcallbackvtbl; object->refcount = 1; list_init(&object->sinks); + object->rate = 1.0f; InitializeCriticalSection(&object->cs); *clock = &object->IMFPresentationClock_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8f9a97d497..cb2db22d93 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1430,6 +1430,7 @@ static void test_presentation_clock(void) MFCLOCK_PROPERTIES props, props2; IMFRateControl *rate_control; IMFPresentationClock *clock; + MFSHUTDOWN_STATUS status; IMFShutdown *shutdown; MFTIME systime, time; LONGLONG clock_time; @@ -1437,7 +1438,9 @@ static void test_presentation_clock(void) IMFTimer *timer; unsigned int i; DWORD value; + float rate; HRESULT hr; + BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); @@ -1577,6 +1580,40 @@ static void test_presentation_clock(void) hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); + + hr = IMFRateControl_GetRate(rate_control, NULL, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + + hr = IMFRateControl_GetRate(rate_control, &thin, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate.\n"); + ok(!thin, "Unexpected thinning.\n"); + + hr = IMFPresentationClock_Start(clock, 0); + ok(hr == S_OK, "Failed to stop, hr %#x.\n", hr); + + hr = IMFRateControl_SetRate(rate_control, FALSE, 0.0f); + ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate.\n"); + hr = IMFRateControl_SetRate(rate_control, FALSE, 1.0f); + ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); + hr = IMFRateControl_SetRate(rate_control, FALSE, 0.0f); + ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); + hr = IMFRateControl_SetRate(rate_control, FALSE, 0.5f); + ok(hr == S_OK, "Failed to set clock rate, hr %#x.\n", hr); + hr = IMFRateControl_SetRate(rate_control, TRUE, -1.0f); + ok(hr == MF_E_THINNING_UNSUPPORTED, "Unexpected hr %#x.\n", hr); + + hr = IMFRateControl_GetRate(rate_control, &thin, &rate); + ok(hr == S_OK, "Failed to get clock rate, hr %#x.\n", hr); + ok(rate == 0.5f, "Unexpected rate.\n"); + ok(!thin, "Unexpected thinning.\n"); + IMFRateControl_Release(rate_control); hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFTimer, (void **)&timer); @@ -1585,6 +1622,21 @@ static void test_presentation_clock(void) hr = IMFPresentationClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); ok(hr == S_OK, "Failed to get shutdown interface, hr %#x.\n", hr); + + /* Shutdown behavior. */ + hr = IMFShutdown_GetShutdownStatus(shutdown, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFShutdown_Shutdown(shutdown); +todo_wine + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); +todo_wine { + ok(hr == S_OK, "Failed to get status, hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected status.\n"); +} IMFShutdown_Release(shutdown); IMFPresentationClock_Release(clock); -- 2.20.1

1 1

[PATCH] comctl32/trackbar: Do not consider window size when initializing fixed length thumb.
by Nikolay Sivov 03 Jun '19

03 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47143 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/trackbar.c | 18 +++++++++++++++++- dlls/comctl32/trackbar.c | 19 +++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7f17e9e4b6..eb5464483d 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -931,7 +931,7 @@ static void test_selection(void) static void test_thumb_length(void) { HWND hWndTrackbar; - int r; + int r, r2; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -963,6 +963,22 @@ static void test_thumb_length(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb length test sequence", TRUE); DestroyWindow(hWndTrackbar); + + /* Fixed thumb length does not depend on window size. */ + hWndTrackbar = CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", WS_VISIBLE | TBS_ENABLESELRANGE + | TBS_FIXEDLENGTH, 0, 0, 0, 0, hWndParent, NULL, GetModuleHandleA(NULL), NULL); + + r = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0, 0); + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", WS_VISIBLE | TBS_ENABLESELRANGE + | TBS_FIXEDLENGTH, 0, 0, 200, 200, hWndParent, NULL, GetModuleHandleA(NULL), NULL); + + r2 = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0, 0); + ok(r2 == r, "Unexpected thumb length %d.\n", r); + + DestroyWindow(hWndTrackbar); } static void test_tic_settings(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c3b9b27741..de3f93e8eb 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1481,15 +1481,18 @@ TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) infoPtr->uThumbLen = get_scaled_metric(infoPtr, infoPtr->dwStyle & TBS_ENABLESELRANGE ? 23 : 21); - GetClientRect(infoPtr->hwndSelf,&rect); - if (infoPtr->dwStyle & TBS_VERT) - client_size = rect.right - rect.left; - else - client_size = rect.bottom - rect.top; + if (!(infoPtr->dwStyle & TBS_FIXEDLENGTH)) + { + GetClientRect(infoPtr->hwndSelf, &rect); + if (infoPtr->dwStyle & TBS_VERT) + client_size = rect.right - rect.left; + else + client_size = rect.bottom - rect.top; - if (client_size < infoPtr->uThumbLen) - infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? - client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); + if (client_size < infoPtr->uThumbLen) + infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? + client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); + } TRACKBAR_CalcChannel (infoPtr); TRACKBAR_UpdateThumb (infoPtr); -- 2.20.1

1 0

[PATCH v7 1/7] winex11.drv: Add Xinerama display device handler.
by Zhiyi Zhang 03 Jun '19

03 Jun '19

Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 162308~162314, fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase v4: Merge patches. Rebase. Supersede 164594~164599, 164612~164613 v5: Fix explorer patch triggered user32 test failures. Supersede 165122~165128. v6: Restructure patches. Supersede 165134~165140 v7: Supersede 165307~165313. Add mutex to avoid init race. Remove old adapter keys during reinit. Add fallback monitor data in explorer. Simplify code. dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 82 ++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 15 +++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 7 +++ 5 files changed, 106 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..a82975bfb9 --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,82 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + static const WCHAR init_mutexW[] = + {'_','_','x','1','1','_','d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex; + HKEY video_hkey = NULL; + DWORD disposition = 0; + BOOL success = FALSE; + + mutex = CreateMutexW(NULL, FALSE, init_mutexW); + WaitForSingleObject(mutex, INFINITE); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + goto fail; + + /* Avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + { + success = TRUE; + goto fail; + } + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + + success = TRUE; +fail: + RegCloseKey(video_hkey); + ReleaseMutex(mutex); + CloseHandle(mutex); + if (!success) + ERR("Failed to initialize display devices\n"); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..fbc5a104f6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,21 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..35dd36049b 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -201,6 +203,7 @@ RECT get_primary_monitor_rect(void) void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +237,10 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

2 4

[PATCH 3/3] dbghelp: Reimplement SymGetLineFromAddr64 using SymGetLineFromAddrW64.
by Alistair Leslie-Hughes 03 Jun '19

03 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0f133c0d34..fec82950bb 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1598,6 +1598,23 @@ static void copy_line_32_from_64(IMAGEHLP_LINE* l32, const IMAGEHLP_LINE64* l64) l32->Address = l64->Address; } +/****************************************************************** + * copy_line_64_from_W64 (internal) + * + */ +static void copy_line_64_from_W64(struct process* pcs, IMAGEHLP_LINE64* l64, const IMAGEHLP_LINEW64* l64w) +{ + char path[MAX_PATH]; + unsigned len = WideCharToMultiByte(CP_ACP, 0, l64w->FileName, -1, path, MAX_PATH, NULL, NULL); + + l64->Key = l64w->Key; + l64->LineNumber = l64w->LineNumber; + l64->FileName = fetch_buffer(pcs, len + 1); + lstrcpyA(l64->FileName, path); + + l64->Address = l64w->Address; +} + /****************************************************************** * copy_line_32_from_64W (internal) * @@ -1637,23 +1654,16 @@ BOOL WINAPI SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr, BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE64 Line) { - struct module_pair pair; - struct symt_ht* symt; + IMAGEHLP_LINEW64 line64; TRACE("%p %s %p %p\n", hProcess, wine_dbgstr_longlong(dwAddr), pdwDisplacement, Line); if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; - if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; - - if (symt->symt.tag != SymTagFunction) return FALSE; - if (!symt_fill_func_line_info(pair.effective, (struct symt_function*)symt, - dwAddr, Line)) return FALSE; - *pdwDisplacement = dwAddr - Line->Address; + line64.SizeOfStruct = sizeof(line64); + if(!SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, &line64)) + return FALSE; + copy_line_64_from_W64(process_find_by_handle(hProcess), Line, &line64); return TRUE; } -- 2.17.1

1 0

[PATCH 2/3] dbghelp: Reimplement SymGetLineFromAddr using SymGetLineFromAddrW64.
by Alistair Leslie-Hughes 03 Jun '19

03 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 177c66480d..0f133c0d34 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1598,6 +1598,22 @@ static void copy_line_32_from_64(IMAGEHLP_LINE* l32, const IMAGEHLP_LINE64* l64) l32->Address = l64->Address; } +/****************************************************************** + * copy_line_32_from_64W (internal) + * + */ +static void copy_line_32_from_64W(struct process* pcs, IMAGEHLP_LINE* l32, const IMAGEHLP_LINEW64* l64w) +{ + char path[MAX_PATH]; + unsigned len = WideCharToMultiByte(CP_ACP, 0, l64w->FileName, -1, path, MAX_PATH, NULL, NULL); + + l32->Key = l64w->Key; + l32->LineNumber = l64w->LineNumber; + l32->FileName = fetch_buffer(pcs, len + 1); + lstrcpyA(l32->FileName, path); + l32->Address = l64w->Address; +} + /****************************************************************** * SymGetLineFromAddr (DBGHELP.@) * @@ -1605,12 +1621,12 @@ static void copy_line_32_from_64(IMAGEHLP_LINE* l32, const IMAGEHLP_LINE64* l64) BOOL WINAPI SymGetLineFromAddr(HANDLE hProcess, DWORD dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINE Line) { - IMAGEHLP_LINE64 il64; + IMAGEHLP_LINEW64 il64w; - il64.SizeOfStruct = sizeof(il64); - if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) + il64w.SizeOfStruct = sizeof(il64w); + if (!SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, &il64w)) return FALSE; - copy_line_32_from_64(Line, &il64); + copy_line_32_from_64W(process_find_by_handle(hProcess), Line, &il64w); return TRUE; } -- 2.17.1

1 0

[PATCH] winemac.drv: Avoid casts from COM objects to interfaces
by Michael Stefaniuc 03 Jun '19

03 Jun '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Not compile tested dlls/winemac.drv/dragdrop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index e0890183bc..c1f542f324 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -60,8 +60,8 @@ static HRESULT WINAPI dddo_QueryInterface(IDataObject* iface, REFIID riid, LPVOI if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IDataObject))) { - *ppvObj = This; - IUnknown_AddRef((IUnknown*)This); + *ppvObj = iface; + IDataObject_AddRef(iface); return S_OK; } -- 2.20.1

2 1

[PATCH v2 1/2] msscript: Cache state of IActiveScript in ScriptHost struct.
by Jactry Zeng 02 Jun '19

02 Jun '19

Superseded patch 165831. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 23 ++++++-- dlls/msscript.ocx/tests/msscript.c | 91 +++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 459c35aacf..7df5bd6f2f 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -71,6 +71,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + SCRIPTSTATE script_state; CLSID clsid; struct list named_items; @@ -568,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) WARN("InitNew failed, %#x\n", hr); goto failed; } + host->script_state = SCRIPTSTATE_INITIALIZED; *ret = host; return S_OK; @@ -952,6 +954,16 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, return hr; } +static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) +{ + HRESULT hr; + + hr = IActiveScript_SetScriptState(host->script, state); + if (SUCCEEDED(hr)) + host->script_state = state; + return hr; +} + static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -962,7 +974,7 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return E_FAIL; clear_named_items(This->host); - return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) @@ -987,9 +999,12 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!This->host || This->state != Initialized) return E_FAIL; - hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; + if (This->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(This->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2d500d8308..8ed4af2e6f 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -95,6 +95,8 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); DEFINE_EXPECT(SetScriptState_INITIALIZED); +DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -147,8 +149,8 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(ParseScriptText); + return S_OK; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -304,6 +306,10 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; } + else if (ss == SCRIPTSTATE_STARTED) { + CHECK_EXPECT(SetScriptState_STARTED); + return S_OK; + } else ok(0, "unexpected call, state %u\n", ss); @@ -1381,7 +1387,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) { error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); @@ -1485,6 +1491,85 @@ static void test_IScriptControl_Eval(void) SysFreeString(script_str); IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language= a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine.\n"); } START_TEST(msscript) -- 2.20.1

2 2

[PATCH] msrle32: Fix a memory leak (Valgrind).
by Sven Baars 02 Jun '19

02 Jun '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/msrle32/msrle32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5bcfa86f97..5b17b25a0b 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1544,6 +1544,11 @@ static LRESULT CompressEnd(CodecInfo *pi) pi->pCurFrame = NULL; pi->nPrevFrame = -1; pi->bCompress = FALSE; + + if (pi->palette_map != NULL) { + LocalFree(pi->palette_map); + pi->palette_map = NULL; + } } return ICERR_OK; -- 2.17.1

1 1

[PATCH 1/3] msscript: Cache state of IActiveScript in ScriptHost struct.
by Jactry Zeng 01 Jun '19

01 Jun '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 18 ++++-- dlls/msscript.ocx/tests/msscript.c | 91 +++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9044c4988b..39e71b8b0c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -71,6 +71,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + SCRIPTSTATE script_state; CLSID clsid; struct list named_items; @@ -568,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) WARN("InitNew failed, %#x\n", hr); goto failed; } + host->script_state = SCRIPTSTATE_INITIALIZED; *ret = host; return S_OK; @@ -953,6 +955,7 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); + HRESULT hr; TRACE("(%p)\n", This); @@ -960,7 +963,10 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return E_FAIL; clear_named_items(This->host); - return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + if (SUCCEEDED(hr)) + This->host->script_state = SCRIPTSTATE_INITIALIZED; + return hr; } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) @@ -985,9 +991,13 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!This->host || This->state != Initialized) return E_FAIL; - hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; + if (This->host->script_state != SCRIPTSTATE_STARTED) + { + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + This->host->script_state = SCRIPTSTATE_STARTED; + } hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2d500d8308..8ed4af2e6f 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -95,6 +95,8 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); DEFINE_EXPECT(SetScriptState_INITIALIZED); +DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -147,8 +149,8 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(ParseScriptText); + return S_OK; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -304,6 +306,10 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; } + else if (ss == SCRIPTSTATE_STARTED) { + CHECK_EXPECT(SetScriptState_STARTED); + return S_OK; + } else ok(0, "unexpected call, state %u\n", ss); @@ -1381,7 +1387,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) { error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); @@ -1485,6 +1491,85 @@ static void test_IScriptControl_Eval(void) SysFreeString(script_str); IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language= a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine.\n"); } START_TEST(msscript) -- 2.20.1

2 2

[PATCH v2 2/2] msscript: Partially implement IScriptControl::AddCode().
by Jactry Zeng 01 Jun '19

01 Jun '19

Superseded patch 165832. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 43 +++++++----- dlls/msscript.ocx/tests/msscript.c | 105 +++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 18 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 7df5bd6f2f..4bc745c84b 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -977,18 +977,39 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } +static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } + + hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error hanlding */ + return hr; +} + static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + + return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - EXCEPINFO excepinfo; - HRESULT hr; FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); @@ -996,21 +1017,7 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, return E_POINTER; V_VT(res) = VT_EMPTY; - if (!This->host || This->state != Initialized) - return E_FAIL; - - if (This->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(This->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; - } - - hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, - 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); - /* FIXME: more error hanlding */ - - return hr; + return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8ed4af2e6f..0bdca22f43 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1572,6 +1572,110 @@ static void test_IScriptControl_Eval(void) skip("Could not register TestScript engine.\n"); } +static void test_IScriptControl_AddCode(void) +{ + BSTR code_str, language; + IScriptControl *sc; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + + hr = IScriptControl_AddCode(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 0); + + code_str = a2bstr("invalid syntax"); + hr = IScriptControl_AddCode(sc, code_str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + code_str = a2bstr("0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + /* Call Eval() after AddCode() for checking if it will call SetScriptState() again. */ + SET_EXPECT(ParseScriptText); + code_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, code_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine.\n"); +} + START_TEST(msscript) { IUnknown *unk; @@ -1602,6 +1706,7 @@ START_TEST(msscript) test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); + test_IScriptControl_AddCode(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH] dinput/linuxinput: Remap wheel axes to X, Y, and Z.
by Tim Schumacher 01 Jun '19

01 Jun '19

Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/dinput/joystick_linuxinput.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8d80b34812..fdfbc7f372 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -502,14 +502,18 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig /* Count number of available axes - supported Axis & POVs */ for (i = 0; i < ABS_MAX; i++) { - if (i < WINE_JOYSTICK_MAX_AXES && + if (idx < WINE_JOYSTICK_MAX_AXES && + i < ABS_HAT0X && test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx; newDevice->generic.props[idx].lDevMin = newDevice->joydev->axes[i].minimum; newDevice->generic.props[idx].lDevMax = newDevice->joydev->axes[i].maximum; - default_axis_map[idx] = i; + if (i >= 8 && i <= 10) /* If it's a wheel axis... */ + default_axis_map[idx] = i - 8; /* ... remap to X/Y/Z */ + else + default_axis_map[idx] = i; idx++; } else -- 2.21.0

1 0

[PATCH v6 1/7] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32
by Rémi Bernon 01 Jun '19

01 Jun '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 47 ------------------- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/virtual.c | 88 +++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 48 deletions(-) create mode 100644 dlls/ntdll/tests/virtual.c diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..0b718606d0e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -52,8 +52,6 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); -static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); -static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); /* ############################### */ @@ -230,8 +228,6 @@ static void test_VirtualAlloc(void) void *addr1, *addr2; DWORD old_prot; MEMORY_BASIC_INFORMATION info; - NTSTATUS status; - SIZE_T size; SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -440,53 +436,12 @@ static void test_VirtualAlloc(void) addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1); - /* allocation conflicts because of 64k align */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - - /* it should conflict, even when zero_bits is explicitly set */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 12, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 21 zero bits is valid */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, - "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - - /* 22 zero bits is invalid */ - size = 0x1000; - addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); ok(!addr2, "VirtualAlloc unexpectedly succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); - /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ - size = 0x1000; - addr2 = (char *)addr1 + 0x1000; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | - MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); - ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } @@ -4436,8 +4391,6 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); - pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); - pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 5c70f3f01a0..ed15c51339f 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -22,4 +22,5 @@ C_SRCS = \ rtlstr.c \ string.c \ threadpool.c \ - time.c + time.c \ + virtual.c diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c new file mode 100644 index 00000000000..63300ac9460 --- /dev/null +++ b/dlls/ntdll/tests/virtual.c @@ -0,0 +1,88 @@ +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "winerror.h" +#include "winuser.h" +#include "excpt.h" +#include "wine/test.h" + +static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); + +static void test_AllocateVirtualMemory(void) +{ + void *addr1, *addr2; + NTSTATUS status; + SIZE_T size; + + /* simple allocation should success */ + size = 0x1000; + addr1 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr1, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS, "NtAllocateVirtualMemory returned %08x\n", status); + + /* allocation conflicts because of 64k align */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + + /* it should conflict, even when zero_bits is explicitly set */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 12, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 21 zero bits is valid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */ + size = 0x1000; + addr2 = (char *)addr1 + 0x1000; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | + MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); + + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); +} + +START_TEST(virtual) +{ + SYSTEM_INFO si; + HMODULE hntdll; + + hntdll = GetModuleHandleA("ntdll.dll"); + + pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); + pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + test_AllocateVirtualMemory(); +} -- 2.20.1

6 20

[PATCH] shell32: Don't cast from COM object to interface
by Michael Stefaniuc 31 May '19

31 May '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- dlls/shell32/shellole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 3e718a3afe..5c0dbc6bf8 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -187,7 +187,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) } TRACE("(%p)->(%u,%p)\n",ef, cfmt, afmt); - return (LPENUMFORMATETC)ef; + return &ef->IEnumFORMATETC_iface; } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3fe96801aa..1ab8f386c2 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -401,7 +401,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc lpclf->riidInst = riidInst; TRACE("(%p)%s\n",lpclf, shdebugstr_guid(riidInst)); - return (LPCLASSFACTORY)lpclf; + return &lpclf->IClassFactory_iface; } /************************************************************************** * IDefClF_fnQueryInterface -- 2.20.1

1 0

[PATCH] shell32/tests: Fix a memory leak (Valgrind).
by Sven Baars 31 May '19

31 May '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index beee31f2ca..87e9141987 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3856,6 +3856,8 @@ static void test_ShellItemArrayEnumItems(void) for(i = 0; i < done; i++) ILFree(apidl[i]); } + + IShellFolder_Release(psf); } -- 2.17.1

2 1

[PATCH] ntdll/tests: Fix a string leak (Valgrind).
by Sven Baars 31 May '19

31 May '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ntdll/tests/om.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 84f97d4028..931628b69d 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1335,6 +1335,8 @@ static void _test_object_type(unsigned line, HANDLE handle, const char *expected ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok_(__FILE__,line)( str->Length == expect.Length && !memcmp( str->Buffer, expect.Buffer, expect.Length ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + + pRtlFreeUnicodeString( &expect ); } static void test_query_object(void) -- 2.17.1

2 1

[PATCH] shell32: Fix an item identifier list leak (Valgrind).
by Sven Baars 31 May '19

31 May '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 37363a1cec..d71ec62099 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -783,6 +783,8 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); + ILFree(computer_pidl); + return TRUE; } -- 2.17.1

2 1

[PATCH 3/3] mshtml: Add IMarkupContainer interface stub.
by Jacek Caban 31 May '19

31 May '19

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 46 insertions(+)

1 0

[PATCH 2/3] mshtml: Add IMarkupServices interface stub.
by Jacek Caban 31 May '19

31 May '19

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 215 +++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 218 insertions(+)

1 0

[PATCH 1/3] include/mshtml.idl: Add more interface declarations.
by Jacek Caban 31 May '19

31 May '19

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 32 ++++- include/mshtml.idl | 342 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 356 insertions(+), 18 deletions(-)

1 0

[PATCH 3/3] msscript: Return S_OK in IScriptControl::put_SitehWnd().
by Jactry Zeng 31 May '19

31 May '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index d9ffd98cb7..74ffc47bbf 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -794,8 +794,10 @@ static HRESULT WINAPI ScriptControl_put_State(IScriptControl *iface, ScriptContr static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwnd) { ScriptControl *This = impl_from_IScriptControl(iface); + FIXME("(%p)->(%x)\n", This, hwnd); - return E_NOTIMPL; + + return S_OK; } static HRESULT WINAPI ScriptControl_get_SitehWnd(IScriptControl *iface, LONG *p) -- 2.20.1

2 1

[PATCH] mshtml: Handle NULL aNode in nsContextMenuListener_OnShowContextMenu
by Aric Stewart 31 May '19

31 May '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 3 +++ 1 file changed, 3 insertions(+)

2 1

[PATCH] dinput: Check for wheel axes/buttons when finding joysticks
by Tim Schumacher 31 May '19

31 May '19

Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> --- dlls/dinput/joystick_linuxinput.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e4f5db848c..8d80b34812 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -234,10 +234,16 @@ static void find_joydevs(void) /* A true joystick has at least axis X and Y, and at least 1 * button. copied from linux/drivers/input/joydev.c */ - if (!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y) || + if (((!test_bit(joydev.absbits, ABS_X) || !test_bit(joydev.absbits, ABS_Y)) && + !test_bit(joydev.absbits, ABS_WHEEL) && + !test_bit(joydev.absbits, ABS_GAS) && + !test_bit(joydev.absbits, ABS_BRAKE)) || !(test_bit(joydev.keybits, BTN_TRIGGER) || test_bit(joydev.keybits, BTN_A) || - test_bit(joydev.keybits, BTN_1))) + test_bit(joydev.keybits, BTN_1) || + test_bit(joydev.keybits, BTN_BASE) || + test_bit(joydev.keybits, BTN_GEAR_UP) || + test_bit(joydev.keybits, BTN_GEAR_DOWN))) { close(fd); continue; @@ -259,6 +265,8 @@ static void find_joydevs(void) test_bit(joydev.keybits, BTN_BASE4) || test_bit(joydev.keybits, BTN_BASE5) || test_bit(joydev.keybits, BTN_BASE6) || + test_bit(joydev.keybits, BTN_GEAR_UP) || + test_bit(joydev.keybits, BTN_GEAR_DOWN) || test_bit(joydev.keybits, BTN_DEAD); if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) -- 2.21.0

2 1

[PATCH 1/2] kernel32: Add sxs tests
by Fabian Maurer 31 May '19

31 May '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/Makefile.in | 5 + dlls/kernel32/tests/resource.rc | 12 + dlls/kernel32/tests/sxs.c | 313 +++++++++++++++++++++++++ dlls/kernel32/tests/sxs_dll_1.c | 17 ++ dlls/kernel32/tests/sxs_dll_1.manifest | 7 + dlls/kernel32/tests/sxs_dll_1.spec | 1 + dlls/kernel32/tests/sxs_dll_2.c | 17 ++ dlls/kernel32/tests/sxs_dll_2.manifest | 7 + dlls/kernel32/tests/sxs_dll_2.spec | 1 + dlls/kernel32/tests/sxs_exe_1.manifest | 8 + dlls/kernel32/tests/sxs_exe_2.manifest | 8 + 11 files changed, 396 insertions(+) create mode 100644 dlls/kernel32/tests/sxs.c create mode 100644 dlls/kernel32/tests/sxs_dll_1.c create mode 100644 dlls/kernel32/tests/sxs_dll_1.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_1.spec create mode 100644 dlls/kernel32/tests/sxs_dll_2.c create mode 100644 dlls/kernel32/tests/sxs_dll_2.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_2.spec create mode 100644 dlls/kernel32/tests/sxs_exe_1.manifest create mode 100644 dlls/kernel32/tests/sxs_exe_2.manifest diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e06141d9f6..0318cae322 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -29,6 +29,11 @@ SOURCES = \ profile.c \ resource.c \ resource.rc \ + sxs.c \ + sxs_dll_1.c \ + sxs_dll_1.spec \ + sxs_dll_2.c \ + sxs_dll_2.spec \ sync.c \ thread.c \ time.c \ diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index f40a87819e..1512a477aa 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -24,3 +24,15 @@ { MENUITEM "foo", 1 } + +/* @makedep: sxs_exe_1.manifest */ +sxs_exe_1.manifest RCDATA sxs_exe_1.manifest + +/* @makedep: sxs_exe_2.manifest */ +sxs_exe_2.manifest RCDATA sxs_exe_2.manifest + +/* @makedep: sxs_dll_1.manifest */ +sxs_dll_1.manifest RCDATA sxs_dll_1.manifest + +/* @makedep: sxs_dll_2.manifest */ +sxs_dll_2.manifest RCDATA sxs_dll_2.manifest diff --git a/dlls/kernel32/tests/sxs.c b/dlls/kernel32/tests/sxs.c new file mode 100644 index 0000000000..ed3bb06514 --- /dev/null +++ b/dlls/kernel32/tests/sxs.c @@ -0,0 +1,313 @@ +/* + * Side by side tests + * + * Copyright 2019 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <winbase.h> +#include <windef.h> +#include "winuser.h" +#include <stdio.h> + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) + { + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)"TESTDLL"); + if (!rsrc) return FALSE; + } + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + sprintf(path_file, "%s%s", path_tmp, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static void get_application_directory(char *buffer, int buffer_size) +{ + char *end; + GetModuleFileNameA(NULL, buffer, buffer_size); + end = strrchr(buffer, '\\'); + end[1] = 0; +} + +typedef struct +{ + char path_tmp[MAX_PATH]; + char path_dll[MAX_PATH]; + char path_manifest_exe[MAX_PATH]; + char path_manifest_dll[MAX_PATH]; + ACTCTXA context; + ULONG_PTR cookie; + HANDLE handle_context; + HMODULE module; + DWORD(WINAPI *test_func)(void); +} sxs_info; + +static int fill_sxs_info(sxs_info *info, const char *temp, const char *path_dll, const char *exe_manifest, const char *dll_manifest) +{ + BOOL success; + + GetTempPathA(MAX_PATH, info->path_tmp); + strcat(info->path_tmp, temp); + strcat(info->path_tmp, "\\"); + CreateDirectoryA(info->path_tmp, NULL); + + if (!write_resource_file(info->path_tmp, path_dll, "sxs_dll.dll", info->path_dll)) + { + skip("Failed to create file for testing\n"); + return 1; + } + + if (!write_resource_file(info->path_tmp, exe_manifest, exe_manifest, info->path_manifest_exe)) + { + skip("Failed to create file for testing\n"); + return 1; + } + + if (!write_resource_file(info->path_tmp, dll_manifest, "sxs_dll.manifest", info->path_manifest_dll)) + { + skip("Failed to create file for testing\n"); + return 1; + } + + info->context.cbSize = sizeof(ACTCTXA); + info->context.lpSource = info->path_manifest_exe; + info->context.lpAssemblyDirectory = info->path_tmp; + info->context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + info->handle_context = CreateActCtxA(&info->context); + ok((info->handle_context != NULL && info->handle_context != INVALID_HANDLE_VALUE )|| broken(GetLastError() == 14001), + "CreateActCtxA failed: %d\n", GetLastError()); + if (GetLastError() == 14001) + { + skip("Failed to create activation context.\n"); + return 1; + } + + success = ActivateActCtx(info->handle_context, &info->cookie); + ok(success, "ActivateActCtx failed: %d\n", GetLastError()); + + info->module = LoadLibraryA("sxs_dll.dll"); + ok(info->module != NULL, "LoadLibrary failed\n"); + + info->test_func = (void *)GetProcAddress(info->module, "test_func"); + ok(info->test_func != NULL, "GetProcAddress failed\n"); + + DeactivateActCtx(0, info->cookie); + return 0; +} + +static void clean_sxs_info(sxs_info *info) +{ + if (info->module) + { + FreeLibrary(info->module); + FreeLibrary(info->module); /* Make sure it's freed in any case */ + } + if (info->handle_context) + ReleaseActCtx(info->handle_context); + if(*info->path_dll) + ok(DeleteFileA(info->path_dll), "DeleteFileA failed for %s: %d\n", info->path_dll, GetLastError()); + if(*info->path_manifest_exe) + ok(DeleteFileA(info->path_manifest_exe), "DeleteFileA failed for %s: %d\n", info->path_manifest_exe, GetLastError()); + if(*info->path_manifest_dll) + ok(DeleteFileA(info->path_manifest_dll), "DeleteFileA failed for %s: %d\n", info->path_manifest_dll, GetLastError()); + if(*info->path_tmp) + ok(RemoveDirectoryA(info->path_tmp), "RemoveDirectoryA failed for %s: %d\n", info->path_tmp, GetLastError()); +} + +/* Test loading two sxs dlls at the same time */ +static void test_two_dlls_at_same_time(void) +{ + sxs_info dll_1 = {0}; + sxs_info dll_2 = {0}; + DWORD ret; + + if(fill_sxs_info(&dll_1, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + if(fill_sxs_info(&dll_2, "2", "sxs_dll_2.dll", "sxs_exe_2.manifest", "sxs_dll_2.manifest")) + goto cleanup; + + todo_wine + ok(dll_1.module != dll_2.module, "Libraries are the same\n"); + ret = dll_1.test_func(); + ok(ret == 1, "Got %d\n", ret); + ret = dll_2.test_func(); + todo_wine + ok(ret == 2, "Got %d\n", ret); + +cleanup: + clean_sxs_info(&dll_1); + clean_sxs_info(&dll_2); +} + +/* Test loading a normal dll and then a sxs dll with the same name */ +static void test_one_sxs_and_one_local_1(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + DWORD(WINAPI *test_func)(void); + DWORD ret; + + get_application_directory(path_application, sizeof(path_application)); + + if (!write_resource_file(path_application, "sxs_dll_2.dll", "sxs_dll.dll", path_dll_local)) + { + skip("Failed to create file for testing\n"); + goto cleanup; + } + + module = LoadLibraryA(path_dll_local); + test_func = (void *)GetProcAddress(module, "test_func"); + + if(fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + + todo_wine + ok(dll.module != module, "Libraries are the same\n"); + ret = dll.test_func(); + todo_wine + ok(ret == 1, "Got %d\n", ret); + ret = test_func(); + ok(ret == 2, "Got %d\n", ret); + +cleanup: + FreeLibrary(module); + FreeLibrary(module); /* Make sure it's freed in any case */ + if(*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +/* Test if sxs dll has priority over normal dll */ +static void test_one_sxs_and_one_local_2(void) +{ + sxs_info dll = {0}; + char path_dll_local[MAX_PATH] = {0}; + char path_application[MAX_PATH]; + HMODULE module = NULL; + DWORD(WINAPI *test_func)(void); + DWORD ret; + + get_application_directory(path_application, sizeof(path_application)); + + if (!write_resource_file(path_application, "sxs_dll_2.dll", "sxs_dll.dll", path_dll_local)) + { + skip("Failed to create file for testing\n"); + goto cleanup; + } + + if(fill_sxs_info(&dll, "1", "sxs_dll_1.dll", "sxs_exe_1.manifest", "sxs_dll_1.manifest")) + goto cleanup; + + module = LoadLibraryA(path_dll_local); + test_func = (void *)GetProcAddress(module, "test_func"); + + ok(dll.module != module, "Libraries are the same\n"); + ret = dll.test_func(); + ok(ret == 1, "Got %d\n", ret); + ret = test_func(); + ok(ret == 2, "Got %d\n", ret); + +cleanup: + FreeLibrary(module); + FreeLibrary(module); /* Make sure it's freed in any case */ + if(*path_dll_local) + ok(DeleteFileA(path_dll_local), "DeleteFileA failed for %s: %d\n", path_dll_local, GetLastError()); + clean_sxs_info(&dll); +} + +static void run_sxs_test(int run) +{ + switch(run) + { + case 1: + test_two_dlls_at_same_time(); + break; + case 2: + test_one_sxs_and_one_local_1(); + break; + case 3: + test_one_sxs_and_one_local_2(); + break; + } +} + +static void run_child_process(int run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs( &argv ); + + if(strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %d", argv[0], argv[1], run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process( pi.hProcess ); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + +START_TEST(sxs) +{ + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); + if(argc > 2) + { + int run = atoi(argv[2]); + run_sxs_test(run); + return; + } + run_child_process(1); + run_child_process(2); + run_child_process(3); +} diff --git a/dlls/kernel32/tests/sxs_dll_1.c b/dlls/kernel32/tests/sxs_dll_1.c new file mode 100644 index 0000000000..908d235059 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.c @@ -0,0 +1,17 @@ +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} + +DWORD WINAPI test_func(void) +{ + return 1; +} diff --git a/dlls/kernel32/tests/sxs_dll_1.manifest b/dlls/kernel32/tests/sxs_dll_1.manifest new file mode 100644 index 0000000000..61e3f4a652 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_1.spec b/dlls/kernel32/tests/sxs_dll_1.spec new file mode 100644 index 0000000000..ebbc584352 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.spec @@ -0,0 +1 @@ +@ stdcall test_func() diff --git a/dlls/kernel32/tests/sxs_dll_2.c b/dlls/kernel32/tests/sxs_dll_2.c new file mode 100644 index 0000000000..262c53a484 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.c @@ -0,0 +1,17 @@ +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + break; + } + + return TRUE; +} + +DWORD WINAPI test_func(void) +{ + return 2; +} diff --git a/dlls/kernel32/tests/sxs_dll_2.manifest b/dlls/kernel32/tests/sxs_dll_2.manifest new file mode 100644 index 0000000000..37b39bea3b --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="2.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_2.spec b/dlls/kernel32/tests/sxs_dll_2.spec new file mode 100644 index 0000000000..ebbc584352 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.spec @@ -0,0 +1 @@ +@ stdcall test_func() diff --git a/dlls/kernel32/tests/sxs_exe_1.manifest b/dlls/kernel32/tests/sxs_exe_1.manifest new file mode 100644 index 0000000000..633374eca3 --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe_1.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/kernel32/tests/sxs_exe_2.manifest b/dlls/kernel32/tests/sxs_exe_2.manifest new file mode 100644 index 0000000000..f93e497124 --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe_2.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="2.0.0.0" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> -- 2.21.0

3 6

[PATCH 2/2] comctl32: Paint 32-bpp bitmaps with an alpha channel using GdiAlphaBlend.
by Dmitry Timoshkov 31 May '19

31 May '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/static.c | 80 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index d08710c06f..38c1d5299c 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -60,6 +60,7 @@ struct static_extra_info HBITMAP hbitmap; HENHMETAFILE hemf; } image; + BOOL image_has_alpha; }; typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -163,6 +164,56 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) return prevIcon; } +static HBITMAP create_alpha_bitmap( HBITMAP hbitmap ) +{ + HBITMAP alpha = 0; + BITMAPINFO *info = NULL; + BITMAP bm; + HDC src, dst; + void *bits; + DWORD i; + const unsigned char *ptr; + BOOL has_alpha = FALSE; + + if (!GetObjectW( hbitmap, sizeof(bm), &bm )) return 0; + if (bm.bmBitsPixel != 32) return 0; + + if (!(src = CreateCompatibleDC( 0 ))) return 0; + if (!(dst = CreateCompatibleDC( src ))) goto done; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = -bm.bmHeight; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(alpha = CreateDIBSection( dst, info, DIB_RGB_COLORS, &bits, NULL, 0 ))) goto done; + + SelectObject( src, hbitmap ); + SelectObject( dst, alpha ); + BitBlt(dst, 0, 0, bm.bmWidth, bm.bmHeight, src, 0, 0, SRCCOPY); + + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + if ((has_alpha = (ptr[3] != 0))) break; + +done: + DeleteDC( src ); + DeleteDC( dst ); + HeapFree( GetProcessHeap(), 0, info ); + + if (!has_alpha) + { + DeleteObject( alpha ); + alpha = 0; + } + return alpha; +} + /*********************************************************************** * STATIC_SetBitmap * @@ -170,7 +221,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) */ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { - HBITMAP hOldBitmap; + HBITMAP hOldBitmap, alpha; struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; @@ -184,7 +235,15 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) if (!extra) return 0; hOldBitmap = extra->image.hbitmap; - extra->image.hbitmap = hBitmap; + alpha = create_alpha_bitmap( hBitmap ); + if (alpha) + { + extra->image.hbitmap = alpha; + extra->image_has_alpha = TRUE; + } + else + extra->image.hbitmap = hBitmap; + if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; @@ -386,7 +445,12 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, if (style == SS_ICON) { struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); - heap_free( extra ); + if (extra) + { + if (extra->image_has_alpha) + DeleteObject( extra->image.hbitmap ); + heap_free( extra ); + } /* * FIXME * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); @@ -765,6 +829,8 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) BITMAP bm; RECT rcClient; LOGBRUSH brush; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); GetObjectW(hBitmap, sizeof(bm), &bm); oldbitmap = SelectObject(hMemDC, hBitmap); @@ -785,7 +851,13 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) rcClient.right = rcClient.left + bm.bmWidth; rcClient.bottom = rcClient.top + bm.bmHeight; } - StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + + if (extra->image_has_alpha) + GdiAlphaBlend(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, blend); + else + StretchBlt(hdc, rcClient.left, rcClient.top, rcClient.right - rcClient.left, rcClient.bottom - rcClient.top, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, oldbitmap); -- 2.20.1

2 12

[PATCH 2/3] msscript: Partially implement IScriptControl::AddCode().
by Jactry Zeng 31 May '19

31 May '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 21 +++++- dlls/msscript.ocx/tests/msscript.c | 105 +++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 39e71b8b0c..d9ffd98cb7 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -972,8 +972,27 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); + EXCEPINFO excepinfo; + HRESULT hr; + FIXME("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + + if (!This->host || This->state != Initialized) + return E_FAIL; + + if (This->host->script_state != SCRIPTSTATE_STARTED) + { + hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + This->host->script_state = SCRIPTSTATE_STARTED; + } + + hr = IActiveScriptParse_ParseScriptText(This->host->parse, code, NULL, NULL, NULL, + 0, 1, SCRIPTTEXT_ISVISIBLE, NULL, &excepinfo); + /* FIXME: more error hanlding */ + + return hr; } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8ed4af2e6f..0bdca22f43 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1572,6 +1572,110 @@ static void test_IScriptControl_Eval(void) skip("Could not register TestScript engine.\n"); } +static void test_IScriptControl_AddCode(void) +{ + BSTR code_str, language; + IScriptControl *sc; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + + hr = IScriptControl_AddCode(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 0); + + code_str = a2bstr("invalid syntax"); + hr = IScriptControl_AddCode(sc, code_str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (register_script_engine()) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + code_str = a2bstr("0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + /* Call Eval() after AddCode() for checking if it will call SetScriptState() again. */ + SET_EXPECT(ParseScriptText); + code_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, code_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + init_registry(FALSE); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } + else + skip("Could not register TestScript engine.\n"); +} + START_TEST(msscript) { IUnknown *unk; @@ -1602,6 +1706,7 @@ START_TEST(msscript) test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); + test_IScriptControl_AddCode(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH 1/6] mf: Partially implement Shutdown() for media session.
by Nikolay Sivov 31 May '19

31 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 14 ++++++++++++-- dlls/mf/tests/mf.c | 1 - 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e92ae401f6..0c283c4392 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -62,6 +62,7 @@ struct media_session IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; struct list topologies; + BOOL is_shut_down; CRITICAL_SECTION cs; }; @@ -412,12 +413,21 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) { struct media_session *session = impl_from_IMFMediaSession(iface); + HRESULT hr = S_OK; FIXME("(%p)\n", iface); - IMFMediaEventQueue_Shutdown(session->event_queue); + EnterCriticalSection(&session->cs); + if (session->is_shut_down) + hr = MF_E_SHUTDOWN; + else + { + session->is_shut_down = TRUE; + IMFMediaEventQueue_Shutdown(session->event_queue); + } + LeaveCriticalSection(&session->cs); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f37ac7c3ff..bae80203c5 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -944,7 +944,6 @@ static void test_session_events(IMFMediaSession *session) /* Shutdown behavior. */ hr = IMFMediaSession_Shutdown(session); -todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } -- 2.20.1

1 5

[PATCH 3/3] mshtml: Add IMarkupContainer interface stub.
by Dmitry Timoshkov 31 May '19

31 May '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 46 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 665e7ffdcb..492216b426 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4974,6 +4974,46 @@ static const IMarkupServicesVtbl MarkupServicesVtbl = { markupsvcs_EndUndoUnit }; +/********************************************************** + * IMarkupContainer implementation + */ +static inline HTMLDocument *impl_from_IMarkupContainer(IMarkupContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IMarkupContainer_iface); +} + +static HRESULT WINAPI markupcontainer_QueryInterface(IMarkupContainer *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI markupcontainer_AddRef(IMarkupContainer *iface) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI markupcontainer_Release(IMarkupContainer *iface) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI markupcontainer_OwningDoc(IMarkupContainer *iface, IHTMLDocument2 **ppDoc) +{ + HTMLDocument *This = impl_from_IMarkupContainer(iface); + FIXME("(%p)->(%p)\n", This, ppDoc); + return E_NOTIMPL; +} + +static const IMarkupContainerVtbl MarkupContainerVtbl = { + markupcontainer_QueryInterface, + markupcontainer_AddRef, + markupcontainer_Release, + markupcontainer_OwningDoc +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5054,6 +5094,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; else if(IsEqualGUID(&IID_IMarkupServices, riid)) *ppv = &This->IMarkupServices_iface; + else if(IsEqualGUID(&IID_IMarkupContainer, riid)) + *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5102,6 +5144,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; + doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9ed2e5f4e6..7dc9367493 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -624,6 +624,7 @@ struct HTMLDocument { IObjectSafety IObjectSafety_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IMarkupServices IMarkupServices_iface; + IMarkupContainer IMarkupContainer_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d4ef42e94e..8a08282957 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -175,6 +175,7 @@ static const IID * const doc_node_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, + &IID_IMarkupContainer, &IID_IMarkupServices, &IID_IOleContainer, &IID_IObjectSafety, @@ -192,6 +193,7 @@ static const IID * const doc_obj_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, + &IID_IMarkupContainer, &IID_IMarkupServices, &IID_IOleContainer, &IID_IObjectSafety, -- 2.20.1

1 0

[PATCH 2/3] mshtml: Add IMarkupServices interface stub.
by Dmitry Timoshkov 31 May '19

31 May '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mshtml/htmldoc.c | 215 +++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 218 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5b14678a6f..665e7ffdcb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4762,6 +4762,218 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = { ProvideMultipleClassInfo_GetInfoOfIndex }; +/********************************************************** + * IMarkupServices implementation + */ +static inline HTMLDocument *impl_from_IMarkupServices(IMarkupServices *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IMarkupServices_iface); +} + +static HRESULT WINAPI markupsvcs_QueryInterface(IMarkupServices *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI markupsvcs_AddRef(IMarkupServices *iface) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI markupsvcs_Release(IMarkupServices *iface) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI markupsvcs_CreateMarkupPointer(IMarkupServices *iface, IMarkupPointer **ppPointer) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p)\n", This, ppPointer); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_CreateMarkupContainer(IMarkupServices *iface, IMarkupContainer **ppMarkupContainer) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p)\n", This, ppMarkupContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_CreateElement(IMarkupServices *iface, + ELEMENT_TAG_ID tagID, OLECHAR *pchAttributes, IHTMLElement **ppElement) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%d,%s,%p)\n", This, tagID, debugstr_w(pchAttributes), ppElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_CloneElement(IMarkupServices *iface, + IHTMLElement *pElemCloneThis, IHTMLElement **ppElementTheClone) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pElemCloneThis, ppElementTheClone); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_InsertElement(IMarkupServices *iface, + IHTMLElement *pElementInsert, IMarkupPointer *pPointerStart, + IMarkupPointer *pPointerFinish) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p,%p)\n", This, pElementInsert, pPointerStart, pPointerFinish); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_RemoveElement(IMarkupServices *iface, IHTMLElement *pElementRemove) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p)\n", This, pElementRemove); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_Remove(IMarkupServices *iface, + IMarkupPointer *pPointerStart, IMarkupPointer *pPointerFinish) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pPointerStart, pPointerFinish); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_Copy(IMarkupServices *iface, + IMarkupPointer *pPointerSourceStart, IMarkupPointer *pPointerSourceFinish, + IMarkupPointer *pPointerTarget) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p,%p)\n", This, pPointerSourceStart, pPointerSourceFinish, pPointerTarget); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_Move(IMarkupServices *iface, + IMarkupPointer *pPointerSourceStart, IMarkupPointer *pPointerSourceFinish, + IMarkupPointer *pPointerTarget) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p,%p)\n", This, pPointerSourceStart, pPointerSourceFinish, pPointerTarget); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_InsertText(IMarkupServices *iface, + OLECHAR *pchText, LONG cch, IMarkupPointer *pPointerTarget) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%s,%x,%p)\n", This, debugstr_w(pchText), cch, pPointerTarget); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_ParseString(IMarkupServices *iface, + OLECHAR *pchHTML, DWORD dwFlags, IMarkupContainer **ppContainerResult, + IMarkupPointer *pPointerStart, IMarkupPointer *pPointerFinish) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%s,%x,%p,%p,%p)\n", This, debugstr_w(pchHTML), dwFlags, ppContainerResult, pPointerStart, pPointerFinish); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_ParseGlobal(IMarkupServices *iface, + HGLOBAL hglobalHTML, DWORD dwFlags, IMarkupContainer **ppContainerResult, + IMarkupPointer *pPointerStart, IMarkupPointer *pPointerFinish) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%s,%x,%p,%p,%p)\n", This, debugstr_w(hglobalHTML), dwFlags, ppContainerResult, pPointerStart, pPointerFinish); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_IsScopedElement(IMarkupServices *iface, + IHTMLElement *pElement, BOOL *pfScoped) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pElement, pfScoped); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_GetElementTagId(IMarkupServices *iface, + IHTMLElement *pElement, ELEMENT_TAG_ID *ptagId) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pElement, ptagId); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_GetTagIDForName(IMarkupServices *iface, + BSTR bstrName, ELEMENT_TAG_ID *ptagId) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), ptagId); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_GetNameForTagID(IMarkupServices *iface, + ELEMENT_TAG_ID tagId, BSTR *pbstrName) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%d,%p)\n", This, tagId, pbstrName); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_MovePointersToRange(IMarkupServices *iface, + IHTMLTxtRange *pIRange, IMarkupPointer *pPointerStart, IMarkupPointer *pPointerFinish) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p,%p)\n", This, pIRange, pPointerStart, pPointerFinish); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_MoveRangeToPointers(IMarkupServices *iface, + IMarkupPointer *pPointerStart, IMarkupPointer *pPointerFinish, IHTMLTxtRange *pIRange) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%p,%p,%p)\n", This, pPointerStart, pPointerFinish, pIRange); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_BeginUndoUnit(IMarkupServices *iface, OLECHAR *pchTitle) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pchTitle)); + return E_NOTIMPL; +} + +static HRESULT WINAPI markupsvcs_EndUndoUnit(IMarkupServices *iface) +{ + HTMLDocument *This = impl_from_IMarkupServices(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IMarkupServicesVtbl MarkupServicesVtbl = { + markupsvcs_QueryInterface, + markupsvcs_AddRef, + markupsvcs_Release, + markupsvcs_CreateMarkupPointer, + markupsvcs_CreateMarkupContainer, + markupsvcs_CreateElement, + markupsvcs_CloneElement, + markupsvcs_InsertElement, + markupsvcs_RemoveElement, + markupsvcs_Remove, + markupsvcs_Copy, + markupsvcs_Move, + markupsvcs_InsertText, + markupsvcs_ParseString, + markupsvcs_ParseGlobal, + markupsvcs_IsScopedElement, + markupsvcs_GetElementTagId, + markupsvcs_GetTagIDForName, + markupsvcs_GetNameForTagID, + markupsvcs_MovePointersToRange, + markupsvcs_MoveRangeToPointers, + markupsvcs_BeginUndoUnit, + markupsvcs_EndUndoUnit +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -4840,6 +5052,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) *ppv = &This->IProvideMultipleClassInfo_iface; + else if(IsEqualGUID(&IID_IMarkupServices, riid)) + *ppv = &This->IMarkupServices_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -4887,6 +5101,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IDocumentEvent_iface.lpVtbl = &DocumentEventVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5b94d075cb..9ed2e5f4e6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -623,6 +623,7 @@ struct HTMLDocument { IOleContainer IOleContainer_iface; IObjectSafety IObjectSafety_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IMarkupServices IMarkupServices_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d46c232f9b..d4ef42e94e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -175,6 +175,7 @@ static const IID * const doc_node_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, + &IID_IMarkupServices, &IID_IOleContainer, &IID_IObjectSafety, &IID_IProvideClassInfo, @@ -191,6 +192,7 @@ static const IID * const doc_obj_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, + &IID_IMarkupServices, &IID_IOleContainer, &IID_IObjectSafety, &IID_IProvideClassInfo, -- 2.20.1

1 0

[PATCH] user32: Fix some leaks on error path (Coverity).
by Sven Baars 31 May '19

31 May '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/user32/rawinput.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2085fd3f9f..56ea2497d1 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -141,6 +141,8 @@ static void find_hid_devices(void) if (!hid_devices) { ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); goto done; } } -- 2.17.1

2 1

[PATCH] kernel32: Move the implementation of GetTickCount() to kernel32.
by Huw Davies 31 May '19

31 May '19

Fixes regression caused by 3e927c4aec9dbeef930b83f62ee0651b8c147247 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47265 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/time.c | 57 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +-- dlls/ntdll/ntdll_misc.h | 4 --- dlls/ntdll/time.c | 2 +- 5 files changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5f3f1fa65b..c01f132371 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -858,8 +858,8 @@ @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stdcall GetTickCount() ntdll.NtGetTickCount -@ stdcall -ret64 GetTickCount64() ntdll.NtGetTickCount +@ stdcall GetTickCount() +@ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 00fcc6bde7..737affcb38 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -38,6 +38,9 @@ #elif defined(HAVE_MACHINE_LIMITS_H) #include <machine/limits.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -64,6 +67,33 @@ static inline LONGLONG filetime_to_longlong( const FILETIME *ft ) return (((LONGLONG)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; } +#define TICKSPERSEC 10000000 +#define TICKSPERMSEC 10000 + +/* return a monotonic time counter, in Win32 ticks */ +static inline ULONGLONG monotonic_counter(void) +{ + LARGE_INTEGER counter; + +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + + NtQueryPerformanceCounter( &counter, NULL ); + return counter.QuadPart; +} + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -1528,3 +1558,30 @@ BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) RtlQueryUnbiasedInterruptTime(time); return TRUE; } + +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} + +/*********************************************************************** + * GetTickCount (KERNEL32.@) + * + * Get the number of milliseconds the system has been running. + * + * PARAMS + * None. + * + * RETURNS + * The current tick count. + * + * NOTES + * The value returned will wrap around every 2^32 milliseconds. + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 050ebc7641..aeb9735ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -194,7 +194,7 @@ @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent -@ stdcall -ret64 NtGetTickCount() get_tick_count64 +@ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(long) @ stub NtImpersonateClientOfPort @@ -1142,7 +1142,7 @@ @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent -@ stdcall -private -ret64 ZwGetTickCount() get_tick_count64 +@ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 2d83f541bd..3463ebd38a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -268,8 +268,4 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); /* string functions */ int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); - -/* time functions */ -ULONGLONG WINAPI get_tick_count64( void ); -#define NtGetTickCount get_tick_count64 #endif diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 41e456398e..20de627c28 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -557,7 +557,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH get_tick_count64(void) +ULONG WINAPI NtGetTickCount(void) { return monotonic_counter() / TICKSPERMSEC; } -- 2.17.1

2 2

[PATCH 2/2] ddraw: Allow writing to vtable for surface and palette
by Alistair Leslie-Hughes 31 May '19

31 May '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46949 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 87aec96443..7cfd662f2e 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -218,7 +218,7 @@ static HRESULT WINAPI ddraw_palette_GetEntries(IDirectDrawPalette *iface, return hr; } -static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = +static struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = { /*** IUnknown ***/ ddraw_palette_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 63f276a2a9..275c6a17f5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5390,7 +5390,7 @@ static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTextur * The VTable *****************************************************************************/ -static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = +static struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = { /* IUnknown */ ddraw_surface7_QueryInterface, @@ -5449,7 +5449,7 @@ static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = ddraw_surface7_GetLOD, }; -static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = +static struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = { /* IUnknown */ ddraw_surface4_QueryInterface, @@ -5503,7 +5503,7 @@ static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = ddraw_surface4_ChangeUniquenessValue, }; -static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = +static struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = { /* IUnknown */ ddraw_surface3_QueryInterface, @@ -5551,7 +5551,7 @@ static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = ddraw_surface3_SetSurfaceDesc, }; -static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = +static struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = { /* IUnknown */ ddraw_surface2_QueryInterface, -- 2.17.1

2 1

[PATCH 1/5] quartz/mpegsplit: Use BaseFilterImpl_QueryInterface().
by Zebediah Figura 31 May '19

31 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/mpegsplit.c | 44 +++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 0afdcbdf3b0..25e1b0d9d74 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -764,36 +764,9 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) return hr; } -static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - MPEGSplitterImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if ( IsEqualIID(riid, &IID_IUnknown) - || IsEqualIID(riid, &IID_IPersist) - || IsEqualIID(riid, &IID_IMediaFilter) - || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = iface; - else if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) - *ppv = &This->IAMStreamSelect_iface; - - if (*ppv) - { - IBaseFilter_AddRef(iface); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IBaseFilterVtbl MPEGSplitter_Vtbl = { - MPEGSplitter_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -874,10 +847,25 @@ static void mpeg_splitter_destroy(BaseFilter *iface) Parser_Destroy(&filter->Parser); } +static HRESULT mpeg_splitter_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + MPEGSplitterImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + + if (IsEqualGUID(iid, &IID_IAMStreamSelect)) + { + *out = &filter->IAMStreamSelect_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static const BaseFilterFuncTable mpeg_splitter_func_table = { .filter_get_pin = parser_get_pin, .filter_destroy = mpeg_splitter_destroy, + .filter_query_interface = mpeg_splitter_query_interface, }; HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) -- 2.21.0

2 9

[PATCH] ntoskrnl.exe: Move PNP code to a separate file.
by Zebediah Figura 31 May '19

31 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/Makefile.in | 1 + dlls/ntoskrnl.exe/ntoskrnl.c | 705 +------------------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 14 + dlls/ntoskrnl.exe/pnp.c | 718 +++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 5 files changed, 735 insertions(+), 704 deletions(-) create mode 100644 dlls/ntoskrnl.exe/pnp.c diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 3861d26a4af..859d53a0b8a 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -6,6 +6,7 @@ DELAYIMPORTS = setupapi user32 C_SRCS = \ instr.c \ ntoskrnl.c \ + pnp.c \ sync.c RC_SRCS = ntoskrnl.rc diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d9ede271119..4b76ff1fc2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -38,10 +38,7 @@ #include "excpt.h" #include "winioctl.h" #include "winbase.h" -#include "winuser.h" -#include "dbt.h" #include "winreg.h" -#include "setupapi.h" #include "ntsecapi.h" #include "ddk/csq.h" #include "ddk/ntddk.h" @@ -58,7 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); -WINE_DECLARE_DEBUG_CHANNEL(plugplay); BOOLEAN KdDebuggerEnabled = FALSE; ULONG InitSafeBootMode = 0; @@ -78,13 +74,6 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; -static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\',0}; - #define MAX_SERVICE_NAME 260 /* tid of the thread running client request */ @@ -101,18 +90,6 @@ struct wine_driver struct wine_rb_entry entry; }; -struct device_interface -{ - struct wine_rb_entry entry; - - UNICODE_STRING symbolic_link; - DEVICE_OBJECT *device; - GUID interface_class; - BOOL enabled; -}; - -static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); - static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -123,95 +100,8 @@ static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; -static int interface_rb_compare( const void *key, const struct wine_rb_entry *entry) -{ - const struct device_interface *iface = WINE_RB_ENTRY_VALUE( entry, const struct device_interface, entry ); - const UNICODE_STRING *k = key; - - return RtlCompareUnicodeString( k, &iface->symbolic_link, FALSE ); -} - -static struct wine_rb_tree device_interfaces = { interface_rb_compare }; - DECLARE_CRITICAL_SECTION(drivers_cs); -static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) -{ - if (!us) return "<null>"; - return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); -} - -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -static BOOL guid_from_string(const WCHAR *s, GUID *id) -{ - int i; - - if (!s || s[0] != '{') - { - memset( id, 0, sizeof (CLSID) ); - return FALSE; - } - - id->Data1 = 0; - for (i = 1; i < 9; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9] != '-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14] != '-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19] != '-') return FALSE; - - for (i = 20; i < 37; i += 2) - { - if (i == 24) - { - if (s[i] != '-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}') - return TRUE; - - return FALSE; -} - static HANDLE get_device_manager(void) { static HANDLE device_manager; @@ -320,7 +210,7 @@ void WINAPI ObDereferenceObject( void *obj ) LeaveCriticalSection( &obref_cs ); } -static void ObReferenceObject( void *obj ) +void ObReferenceObject( void *obj ) { struct object_header *header = (struct object_header*)obj - 1; LONG ref; @@ -1304,7 +1194,6 @@ PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack( DEVICE_OBJECT *source, return target; } - /*********************************************************************** * IoBuildDeviceIoControlRequest (NTOSKRNL.EXE.@) */ @@ -1692,147 +1581,6 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) return status; } -static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *symlink_name ) -{ - UNICODE_STRING device_nameU; - WCHAR *device_name; - ULONG len = 0; - NTSTATUS ret; - - ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, 0, NULL, &len ); - if (ret != STATUS_BUFFER_TOO_SMALL) - return ret; - - device_name = heap_alloc( len ); - ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, len, device_name, &len ); - if (ret) - { - heap_free( device_name ); - return ret; - } - - RtlInitUnicodeString( &device_nameU, device_name ); - ret = IoCreateSymbolicLink( symlink_name, &device_nameU ); - heap_free( device_name ); - return ret; -} - -/*********************************************************************** - * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) -{ - static const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; - static const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; - static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR hashW[] = {'#',0}; - - size_t namelen = name->Length / sizeof(WCHAR); - DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; - struct device_interface *iface; - HANDLE iface_key, control_key; - OBJECT_ATTRIBUTES attr = {0}; - struct wine_rb_entry *entry; - WCHAR *path, *refstr, *p; - UNICODE_STRING string; - DWORD data = enable; - NTSTATUS ret; - GUID class; - ULONG len; - - TRACE("(%s, %d)\n", debugstr_us(name), enable); - - entry = wine_rb_get( &device_interfaces, name ); - if (!entry) - return STATUS_OBJECT_NAME_NOT_FOUND; - - iface = WINE_RB_ENTRY_VALUE( entry, struct device_interface, entry ); - - if (!enable && !iface->enabled) - return STATUS_OBJECT_NAME_NOT_FOUND; - - if (enable && iface->enabled) - return STATUS_OBJECT_NAME_EXISTS; - - refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); - - if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) - return STATUS_INVALID_PARAMETER; - - len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; - - if (!(path = heap_alloc( len * sizeof(WCHAR) ))) - return STATUS_NO_MEMORY; - - strcpyW( path, DeviceClassesW ); - lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); - strcatW( path, slashW ); - p = path + strlenW( path ); - lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); - p[0] = p[1] = p[3] = '#'; - strcatW( path, slashW ); - strcatW( path, hashW ); - if (refstr) - lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); - - attr.Length = sizeof(attr); - attr.ObjectName = &string; - RtlInitUnicodeString( &string, path ); - ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); - heap_free(path); - if (ret) - return ret; - - attr.RootDirectory = iface_key; - RtlInitUnicodeString( &string, controlW ); - ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); - NtClose( iface_key ); - if (ret) - return ret; - - RtlInitUnicodeString( &string, linkedW ); - ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); - if (ret) - { - NtClose( control_key ); - return ret; - } - - if (enable) - ret = create_device_symlink( iface->device, name ); - else - ret = IoDeleteSymbolicLink( name ); - if (ret) - { - NtDeleteValueKey( control_key, &string ); - NtClose( control_key ); - return ret; - } - - iface->enabled = enable; - - len = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[namelen + 1]); - - if ((broadcast = heap_alloc( len ))) - { - broadcast->dbcc_size = len; - broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = class; - lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, - enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); - - heap_free( broadcast ); - } - return ret; -} - - /*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ @@ -1865,83 +1613,6 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc return STATUS_SUCCESS; } -/*********************************************************************** - * IoGetDeviceProperty (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROPERTY device_property, - ULONG buffer_length, PVOID property_buffer, PULONG result_length ) -{ - NTSTATUS status = STATUS_NOT_IMPLEMENTED; - TRACE( "%p %d %u %p %p\n", device, device_property, buffer_length, - property_buffer, result_length ); - switch (device_property) - { - case DevicePropertyEnumeratorName: - { - WCHAR *id, *ptr; - - status = get_device_id( device, BusQueryInstanceID, &id ); - if (status != STATUS_SUCCESS) - { - ERR( "Failed to get device id\n" ); - break; - } - - struprW( id ); - ptr = strchrW( id, '\\' ); - if (ptr) *ptr = 0; - - *result_length = sizeof(WCHAR) * (strlenW(id) + 1); - if (buffer_length >= *result_length) - memcpy( property_buffer, id, *result_length ); - else - status = STATUS_BUFFER_TOO_SMALL; - - HeapFree( GetProcessHeap(), 0, id ); - break; - } - case DevicePropertyPhysicalDeviceObjectName: - { - ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION); - OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, len); - HANDLE handle; - - status = ObOpenObjectByPointer( device, OBJ_KERNEL_HANDLE, NULL, 0, NULL, KernelMode, &handle ); - if (!status) - { - status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); - NtClose( handle ); - } - if (status == STATUS_SUCCESS) - { - /* Ensure room for NULL termination */ - if (buffer_length >= name->Name.MaximumLength) - memcpy(property_buffer, name->Name.Buffer, name->Name.MaximumLength); - else - status = STATUS_BUFFER_TOO_SMALL; - *result_length = name->Name.MaximumLength; - } - else - { - if (status == STATUS_INFO_LENGTH_MISMATCH || - status == STATUS_BUFFER_OVERFLOW) - { - status = STATUS_BUFFER_TOO_SMALL; - *result_length = used_len - sizeof(OBJECT_NAME_INFORMATION); - } - else - *result_length = 0; - } - HeapFree(GetProcessHeap(), 0, name); - break; - } - default: - FIXME("unhandled property %d\n", device_property); - } - return status; -} - - /*********************************************************************** * IoCallDriver (NTOSKRNL.EXE.@) */ @@ -2065,7 +1736,6 @@ NTSTATUS WINAPI IoIsWdmVersionAvailable(UCHAR MajorVersion, UCHAR MinorVersion) return major > MajorVersion || (major == MajorVersion && minor >= MinorVersion); } - /*********************************************************************** * IoQueryDeviceDescription (NTOSKRNL.EXE.@) */ @@ -2077,124 +1747,6 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE itype, PULONG bus, PCON return STATUS_NOT_IMPLEMENTED; } - -static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) -{ - WCHAR *id, *ptr; - NTSTATUS status; - - status = get_device_id( device, BusQueryInstanceID, &id ); - if (status != STATUS_SUCCESS) return status; - - struprW( id ); - for (ptr = id; *ptr; ptr++)if (*ptr == '\\') *ptr = '#'; - - *instance_id = id; - return STATUS_SUCCESS; -} - - -/***************************************************** - * IoRegisterDeviceInterface(NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) -{ - WCHAR *instance_id; - NTSTATUS status = STATUS_SUCCESS; - HDEVINFO infoset; - WCHAR *referenceW = NULL; - SP_DEVINFO_DATA devInfo; - SP_DEVICE_INTERFACE_DATA infoData; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; - DWORD required; - BOOL rc; - struct device_interface *iface; - - TRACE( "(%p, %s, %s, %p)\n", device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link ); - - if (reference_string != NULL) - referenceW = reference_string->Buffer; - - infoset = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); - if (infoset == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; - - status = get_instance_id( device, &instance_id ); - if (status != STATUS_SUCCESS) return status; - - devInfo.cbSize = sizeof( devInfo ); - rc = SetupDiCreateDeviceInfoW( infoset, instance_id, class_guid, NULL, NULL, 0, &devInfo ); - if (rc == 0) - { - if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) - { - DWORD index = 0; - DWORD size = strlenW(instance_id) + 2; - WCHAR *id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); - do - { - rc = SetupDiEnumDeviceInfo( infoset, index, &devInfo ); - if (rc && IsEqualGUID( &devInfo.ClassGuid, class_guid )) - { - BOOL check; - check = SetupDiGetDeviceInstanceIdW( infoset, &devInfo, id, size, &required ); - if (check && strcmpW( id, instance_id ) == 0) - break; - } - index++; - } while (rc); - - HeapFree( GetProcessHeap(), 0, id ); - if (!rc) - { - HeapFree( GetProcessHeap(), 0, instance_id ); - return STATUS_UNSUCCESSFUL; - } - } - else - { - HeapFree( GetProcessHeap(), 0, instance_id ); - return STATUS_UNSUCCESSFUL; - } - } - HeapFree( GetProcessHeap(), 0, instance_id ); - - infoData.cbSize = sizeof( infoData ); - rc = SetupDiCreateDeviceInterfaceW( infoset, &devInfo, class_guid, NULL, 0, &infoData ); - if (!rc) return STATUS_UNSUCCESSFUL; - - required = 0; - SetupDiGetDeviceInterfaceDetailW( infoset, &infoData, NULL, 0, &required, NULL ); - if (required == 0) return STATUS_UNSUCCESSFUL; - - data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY , required ); - data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); - - rc = SetupDiGetDeviceInterfaceDetailW( infoset, &infoData, data, required, NULL, NULL ); - if (!rc) - { - HeapFree( GetProcessHeap(), 0, data ); - return STATUS_UNSUCCESSFUL; - } - - data->DevicePath[1] = '?'; - TRACE( "Device path %s\n",debugstr_w(data->DevicePath) ); - - iface = heap_alloc_zero( sizeof(struct device_interface) ); - iface->device = device; - iface->interface_class = *class_guid; - RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); - if (symbolic_link) - RtlCreateUnicodeString( symbolic_link, data->DevicePath); - - if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) - ERR( "failed to insert interface %s into tree\n", debugstr_us(&iface->symbolic_link) ); - - HeapFree( GetProcessHeap(), 0, data ); - - return status; -} - - /*********************************************************************** * IoRegisterDriverReinitialization (NTOSKRNL.EXE.@) */ @@ -3407,15 +2959,6 @@ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Cou FIXME("stub\n"); } -/***************************************************** - * PoSetPowerState (NTOSKRNL.EXE.@) - */ -POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT DeviceObject, POWER_STATE_TYPE Type, POWER_STATE State) -{ - FIXME("(%p %u %u) stub\n", DeviceObject, Type, State.DeviceState); - return State; -} - /***************************************************** * IoWMIRegistrationControl (NTOSKRNL.EXE.@) */ @@ -4078,252 +3621,6 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) return STATUS_SUCCESS; } - -static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) -{ - HANDLE event = context; - SetEvent( event ); - return STATUS_MORE_PROCESSING_REQUIRED; -} - - -static NTSTATUS send_device_irp( DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info ) -{ - NTSTATUS status; - HANDLE event = CreateEventA( NULL, FALSE, FALSE, NULL ); - DEVICE_OBJECT *toplevel_device; - - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; - IoSetCompletionRoutine( irp, internal_complete, event, TRUE, TRUE, TRUE ); - - toplevel_device = IoGetAttachedDeviceReference( device ); - status = IoCallDriver( toplevel_device, irp ); - - if (status == STATUS_PENDING) - WaitForSingleObject( event, INFINITE ); - - status = irp->IoStatus.u.Status; - if (info) - *info = irp->IoStatus.Information; - IoCompleteRequest( irp, IO_NO_INCREMENT ); - ObDereferenceObject( toplevel_device ); - CloseHandle( event ); - return status; -} - - -static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ) -{ - IO_STACK_LOCATION *irpsp; - IO_STATUS_BLOCK irp_status; - IRP *irp; - - if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) - return STATUS_NO_MEMORY; - - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->MinorFunction = IRP_MN_QUERY_ID; - irpsp->Parameters.QueryId.IdType = type; - - return send_device_irp( device, irp, (ULONG_PTR *)id ); -} - - -static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) -{ - static const WCHAR serviceW[] = {'S','e','r','v','i','c','e',0}; - static const UNICODE_STRING service_str = { sizeof(serviceW) - sizeof(WCHAR), sizeof(serviceW), (WCHAR *)serviceW }; - static const WCHAR critical_fmtW[] = - {'\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','C','o','n','t','r','o','l', - '\\','C','r','i','t','i','c','a','l','D','e','v','i','c','e','D','a','t','a','b','a','s','e', - '\\','%','s',0}; - WCHAR buffer[FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_SERVICE_NAME * sizeof(WCHAR)] )]; - KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING key; - NTSTATUS status; - HANDLE hkey; - WCHAR *keyW; - DWORD len; - - if (!(keyW = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(critical_fmtW) + strlenW(id) * sizeof(WCHAR) ))) - return STATUS_NO_MEMORY; - - sprintfW( keyW, critical_fmtW, id ); - RtlInitUnicodeString( &key, keyW ); - InitializeObjectAttributes( &attr, &key, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL ); - - status = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); - RtlFreeUnicodeString( &key ); - if (status != STATUS_SUCCESS) - { - TRACE_(plugplay)( "no driver found for %s\n", debugstr_w(id) ); - return FALSE; - } - - status = NtQueryValueKey( hkey, &service_str, KeyValuePartialInformation, - info, sizeof(buffer) - sizeof(WCHAR), &len ); - NtClose( hkey ); - if (status != STATUS_SUCCESS || info->Type != REG_SZ) - { - TRACE_(plugplay)( "no driver found for %s\n", debugstr_w(id) ); - return FALSE; - } - - memcpy( driver, info->Data, info->DataLength ); - driver[ info->DataLength / sizeof(WCHAR) ] = 0; - TRACE_(plugplay)( "found driver %s for %s\n", debugstr_w(driver), debugstr_w(id) ); - return TRUE; -} - - -static NTSTATUS send_pnp_irp( DEVICE_OBJECT *device, UCHAR minor ) -{ - IO_STACK_LOCATION *irpsp; - IO_STATUS_BLOCK irp_status; - IRP *irp; - - if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) - return STATUS_NO_MEMORY; - - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->MinorFunction = minor; - - irpsp->Parameters.StartDevice.AllocatedResources = NULL; - irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; - - return send_device_irp( device, irp, NULL ); -} - - -static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) -{ - IO_STATUS_BLOCK irp_status; - IO_STACK_LOCATION *irpsp; - IRP *irp; - - if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status ))) - return STATUS_NO_MEMORY; - - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->MinorFunction = IRP_MN_SET_POWER; - - irpsp->Parameters.Power.Type = DevicePowerState; - irpsp->Parameters.Power.State.DeviceState = power; - - return send_device_irp( device, irp, NULL ); -} - - -static void handle_bus_relations( DEVICE_OBJECT *device ) -{ - static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; - WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(servicesW)]; - WCHAR driver[MAX_SERVICE_NAME] = {0}; - DRIVER_OBJECT *driver_obj; - UNICODE_STRING string; - WCHAR *ids, *ptr; - NTSTATUS status; - - TRACE_(plugplay)( "(%p)\n", device ); - - /* We could (should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, - * but we don't have to, we have the DEVICE_OBJECT of the new device - * so we can simply handle the process here */ - - status = get_device_id( device, BusQueryCompatibleIDs, &ids ); - if (status != STATUS_SUCCESS || !ids) - { - ERR_(plugplay)( "Failed to get device IDs\n" ); - return; - } - - for (ptr = ids; *ptr; ptr += strlenW(ptr) + 1) - { - if (get_driver_for_id( ptr, driver )) - break; - } - RtlFreeHeap( GetProcessHeap(), 0, ids ); - - if (!driver[0]) - { - ERR_(plugplay)( "No matching driver found for device\n" ); - return; - } - - strcpyW( buffer, servicesW ); - strcatW( buffer, driver ); - RtlInitUnicodeString( &string, buffer ); - status = ZwLoadDriver( &string ); - if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED) - { - ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); - return; - } - - strcpyW( buffer, driverW ); - strcatW( buffer, driver ); - RtlInitUnicodeString( &string, buffer ); - if (ObReferenceObjectByName( &string, OBJ_CASE_INSENSITIVE, NULL, - 0, NULL, KernelMode, NULL, (void **)&driver_obj ) != STATUS_SUCCESS) - { - ERR_(plugplay)( "Failed to locate loaded driver %s\n", debugstr_w(driver) ); - return; - } - - if (driver_obj->DriverExtension->AddDevice) - status = driver_obj->DriverExtension->AddDevice( driver_obj, device ); - else - status = STATUS_NOT_IMPLEMENTED; - - ObDereferenceObject( driver_obj ); - - if (status != STATUS_SUCCESS) - { - ERR_(plugplay)( "AddDevice failed for driver %s\n", debugstr_w(driver) ); - return; - } - - send_pnp_irp( device, IRP_MN_START_DEVICE ); - send_power_irp( device, PowerDeviceD0 ); -} - - -static void handle_removal_relations( DEVICE_OBJECT *device ) -{ - TRACE_(plugplay)( "(%p)\n", device ); - - send_power_irp( device, PowerDeviceD3 ); - send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); - send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); -} - - -/*********************************************************************** - * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) - */ -void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type ) -{ - TRACE( "(%p, %i)\n", device_object, type ); - - switch (type) - { - case BusRelations: - handle_bus_relations( device_object ); - break; - case RemovalRelations: - handle_removal_relations( device_object ); - break; - default: - FIXME( "unhandled relation %i\n", type ); - break; - } -} - /*********************************************************************** * IoCreateFile (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 03b44329e07..2823a1cd4f1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -23,6 +23,12 @@ #include "wine/asm.h" +static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "<null>"; + return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); +} + struct _OBJECT_TYPE { const WCHAR *name; /* object type name used for type validation */ @@ -68,4 +74,12 @@ extern POBJECT_TYPE SeTokenObjectType; 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; +void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; + +static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\',0}; #endif diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c new file mode 100644 index 00000000000..85bb9f43bcd --- /dev/null +++ b/dlls/ntoskrnl.exe/pnp.c @@ -0,0 +1,718 @@ +/* + * Plug and Play + * + * Copyright 2016 Sebastian Lackner + * Copyright 2016 Aric Stewart for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winioctl.h" +#include "winreg.h" +#include "winuser.h" +#include "winsvc.h" +#include "winternl.h" +#include "setupapi.h" +#include "cfgmgr32.h" +#include "dbt.h" +#include "ddk/wdm.h" +#include "ddk/ntifs.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/rbtree.h" +#include "wine/unicode.h" + +#include "ntoskrnl_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); + +#define MAX_SERVICE_NAME 260 + +struct device_interface +{ + struct wine_rb_entry entry; + + UNICODE_STRING symbolic_link; + DEVICE_OBJECT *device; + GUID interface_class; + BOOL enabled; +}; + +static int interface_rb_compare( const void *key, const struct wine_rb_entry *entry) +{ + const struct device_interface *iface = WINE_RB_ENTRY_VALUE( entry, const struct device_interface, entry ); + const UNICODE_STRING *k = key; + + return RtlCompareUnicodeString( k, &iface->symbolic_link, FALSE ); +} + +static struct wine_rb_tree device_interfaces = { interface_rb_compare }; + +static inline BOOL is_valid_hex(WCHAR c) +{ + if (!(((c >= '0') && (c <= '9')) || + ((c >= 'a') && (c <= 'f')) || + ((c >= 'A') && (c <= 'F')))) + return FALSE; + return TRUE; +} + +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + +static BOOL guid_from_string(const WCHAR *s, GUID *id) +{ + int i; + + if (!s || s[0] != '{') + { + memset( id, 0, sizeof (CLSID) ); + return FALSE; + } + + id->Data1 = 0; + for (i = 1; i < 9; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; + } + if (s[9] != '-') return FALSE; + + id->Data2 = 0; + for (i = 10; i < 14; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; + } + if (s[14] != '-') return FALSE; + + id->Data3 = 0; + for (i = 15; i < 19; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; + } + if (s[19] != '-') return FALSE; + + for (i = 20; i < 37; i += 2) + { + if (i == 24) + { + if (s[i] != '-') return FALSE; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; + id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; + } + + if (s[37] == '}') + return TRUE; + + return FALSE; +} + +static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + HANDLE event = context; + SetEvent( event ); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static NTSTATUS send_device_irp( DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info ) +{ + HANDLE event = CreateEventA( NULL, FALSE, FALSE, NULL ); + DEVICE_OBJECT *toplevel_device; + NTSTATUS status; + + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + IoSetCompletionRoutine( irp, internal_complete, event, TRUE, TRUE, TRUE ); + + toplevel_device = IoGetAttachedDeviceReference( device ); + status = IoCallDriver( toplevel_device, irp ); + + if (status == STATUS_PENDING) + WaitForSingleObject( event, INFINITE ); + + status = irp->IoStatus.u.Status; + if (info) + *info = irp->IoStatus.Information; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + ObDereferenceObject( toplevel_device ); + CloseHandle( event ); + return status; +} + +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK irp_status; + IRP *irp; + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = IRP_MN_QUERY_ID; + irpsp->Parameters.QueryId.IdType = type; + + return send_device_irp( device, irp, (ULONG_PTR *)id ); +} + +static NTSTATUS send_pnp_irp( DEVICE_OBJECT *device, UCHAR minor ) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK irp_status; + IRP *irp; + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = minor; + + irpsp->Parameters.StartDevice.AllocatedResources = NULL; + irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; + + return send_device_irp( device, irp, NULL ); +} + +static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) +{ + static const WCHAR serviceW[] = {'S','e','r','v','i','c','e',0}; + static const UNICODE_STRING service_str = { sizeof(serviceW) - sizeof(WCHAR), sizeof(serviceW), (WCHAR *)serviceW }; + static const WCHAR critical_fmtW[] = + {'\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','C','o','n','t','r','o','l', + '\\','C','r','i','t','i','c','a','l','D','e','v','i','c','e','D','a','t','a','b','a','s','e', + '\\','%','s',0}; + WCHAR buffer[FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_SERVICE_NAME * sizeof(WCHAR)] )]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING key; + NTSTATUS status; + HANDLE hkey; + WCHAR *keyW; + DWORD len; + + if (!(keyW = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(critical_fmtW) + strlenW(id) * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + sprintfW( keyW, critical_fmtW, id ); + RtlInitUnicodeString( &key, keyW ); + InitializeObjectAttributes( &attr, &key, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL ); + + status = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); + RtlFreeUnicodeString( &key ); + if (status != STATUS_SUCCESS) + { + TRACE("No driver found for ID %s.\n", debugstr_w(id)); + return FALSE; + } + + status = NtQueryValueKey( hkey, &service_str, KeyValuePartialInformation, + info, sizeof(buffer) - sizeof(WCHAR), &len ); + NtClose( hkey ); + if (status != STATUS_SUCCESS || info->Type != REG_SZ) + { + TRACE("No driver found for device ID %s.\n", debugstr_w(id)); + return FALSE; + } + + memcpy( driver, info->Data, info->DataLength ); + driver[ info->DataLength / sizeof(WCHAR) ] = 0; + TRACE("Found driver %s for ID %s.\n", debugstr_w(driver), debugstr_w(id)); + return TRUE; +} + +static NTSTATUS send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) +{ + IO_STATUS_BLOCK irp_status; + IO_STACK_LOCATION *irpsp; + IRP *irp; + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status ))) + return STATUS_NO_MEMORY; + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = IRP_MN_SET_POWER; + + irpsp->Parameters.Power.Type = DevicePowerState; + irpsp->Parameters.Power.State.DeviceState = power; + + return send_device_irp( device, irp, NULL ); +} + +static void handle_bus_relations( DEVICE_OBJECT *device ) +{ + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + WCHAR buffer[MAX_SERVICE_NAME + ARRAY_SIZE(servicesW)]; + WCHAR driver[MAX_SERVICE_NAME] = {0}; + DRIVER_OBJECT *driver_obj; + UNICODE_STRING string; + WCHAR *ids, *ptr; + NTSTATUS status; + + TRACE( "(%p)\n", device ); + + /* We could (should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, + * but we don't have to, we have the DEVICE_OBJECT of the new device + * so we can simply handle the process here */ + + status = get_device_id( device, BusQueryCompatibleIDs, &ids ); + if (status != STATUS_SUCCESS || !ids) + { + ERR("Failed to get compatible IDs, status %#x.\n", status); + return; + } + + for (ptr = ids; *ptr; ptr += strlenW(ptr) + 1) + { + if (get_driver_for_id( ptr, driver )) + break; + } + RtlFreeHeap( GetProcessHeap(), 0, ids ); + + if (!driver[0]) + { + ERR("No matching driver found for device.\n"); + return; + } + + strcpyW( buffer, servicesW ); + strcatW( buffer, driver ); + RtlInitUnicodeString( &string, buffer ); + status = ZwLoadDriver( &string ); + if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED) + { + ERR("Failed to load driver %s, status %#x.\n", debugstr_w(driver), status); + return; + } + + strcpyW( buffer, driverW ); + strcatW( buffer, driver ); + RtlInitUnicodeString( &string, buffer ); + if (ObReferenceObjectByName( &string, OBJ_CASE_INSENSITIVE, NULL, + 0, NULL, KernelMode, NULL, (void **)&driver_obj ) != STATUS_SUCCESS) + { + ERR("Failed to locate loaded driver %s.\n", debugstr_w(driver)); + return; + } + + if (driver_obj->DriverExtension->AddDevice) + status = driver_obj->DriverExtension->AddDevice( driver_obj, device ); + else + status = STATUS_NOT_IMPLEMENTED; + + ObDereferenceObject( driver_obj ); + + if (status != STATUS_SUCCESS) + { + ERR("AddDevice failed for driver %s, status %#x.\n", debugstr_w(driver), status); + return; + } + + send_pnp_irp( device, IRP_MN_START_DEVICE ); + send_power_irp( device, PowerDeviceD0 ); +} + +static void handle_removal_relations( DEVICE_OBJECT *device ) +{ + TRACE( "(%p)\n", device ); + + send_power_irp( device, PowerDeviceD3 ); + send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); + send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); +} + +/*********************************************************************** + * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) + */ +void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type ) +{ + TRACE("device %p, type %#x.\n", device_object, type); + + switch (type) + { + case BusRelations: + handle_bus_relations( device_object ); + break; + case RemovalRelations: + handle_removal_relations( device_object ); + break; + default: + FIXME("Unhandled relation %#x.\n", type); + break; + } +} + +/*********************************************************************** + * IoGetDeviceProperty (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROPERTY property, + ULONG length, void *buffer, ULONG *needed ) +{ + NTSTATUS status = STATUS_NOT_IMPLEMENTED; + TRACE("device %p, property %u, length %u, buffer %p, needed %p.\n", + device, property, length, buffer, needed); + + switch (property) + { + case DevicePropertyEnumeratorName: + { + WCHAR *id, *ptr; + + status = get_device_id( device, BusQueryInstanceID, &id ); + if (status != STATUS_SUCCESS) + { + ERR("Failed to get instance ID, status %#x.\n", status); + break; + } + + struprW( id ); + ptr = strchrW( id, '\\' ); + if (ptr) *ptr = 0; + + *needed = sizeof(WCHAR) * (strlenW(id) + 1); + if (length >= *needed) + memcpy( buffer, id, *needed ); + else + status = STATUS_BUFFER_TOO_SMALL; + + HeapFree( GetProcessHeap(), 0, id ); + break; + } + case DevicePropertyPhysicalDeviceObjectName: + { + ULONG used_len, len = length + sizeof(OBJECT_NAME_INFORMATION); + OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, len); + HANDLE handle; + + status = ObOpenObjectByPointer( device, OBJ_KERNEL_HANDLE, NULL, 0, NULL, KernelMode, &handle ); + if (!status) + { + status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); + NtClose( handle ); + } + if (status == STATUS_SUCCESS) + { + /* Ensure room for NULL termination */ + if (length >= name->Name.MaximumLength) + memcpy(buffer, name->Name.Buffer, name->Name.MaximumLength); + else + status = STATUS_BUFFER_TOO_SMALL; + *needed = name->Name.MaximumLength; + } + else + { + if (status == STATUS_INFO_LENGTH_MISMATCH || + status == STATUS_BUFFER_OVERFLOW) + { + status = STATUS_BUFFER_TOO_SMALL; + *needed = used_len - sizeof(OBJECT_NAME_INFORMATION); + } + else + *needed = 0; + } + HeapFree(GetProcessHeap(), 0, name); + break; + } + default: + FIXME("Unhandled property %u.\n", property); + } + return status; +} + +static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *symlink_name ) +{ + UNICODE_STRING device_nameU; + WCHAR *device_name; + ULONG len = 0; + NTSTATUS ret; + + ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, 0, NULL, &len ); + if (ret != STATUS_BUFFER_TOO_SMALL) + return ret; + + device_name = heap_alloc( len ); + ret = IoGetDeviceProperty( device, DevicePropertyPhysicalDeviceObjectName, len, device_name, &len ); + if (ret) + { + heap_free( device_name ); + return ret; + } + + RtlInitUnicodeString( &device_nameU, device_name ); + ret = IoCreateSymbolicLink( symlink_name, &device_nameU ); + heap_free( device_name ); + return ret; +} + +/*********************************************************************** + * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) +{ + static const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; + static const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR hashW[] = {'#',0}; + + size_t namelen = name->Length / sizeof(WCHAR); + DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; + struct device_interface *iface; + HANDLE iface_key, control_key; + OBJECT_ATTRIBUTES attr = {0}; + struct wine_rb_entry *entry; + WCHAR *path, *refstr, *p; + UNICODE_STRING string; + DWORD data = enable; + NTSTATUS ret; + GUID class; + ULONG len; + + TRACE("device %s, enable %u.\n", debugstr_us(name), enable); + + entry = wine_rb_get( &device_interfaces, name ); + if (!entry) + return STATUS_OBJECT_NAME_NOT_FOUND; + + iface = WINE_RB_ENTRY_VALUE( entry, struct device_interface, entry ); + + if (!enable && !iface->enabled) + return STATUS_OBJECT_NAME_NOT_FOUND; + + if (enable && iface->enabled) + return STATUS_OBJECT_NAME_EXISTS; + + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + + if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) + return STATUS_INVALID_PARAMETER; + + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; + + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + strcpyW( path, DeviceClassesW ); + lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); + strcatW( path, slashW ); + p = path + strlenW( path ); + lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); + p[0] = p[1] = p[3] = '#'; + strcatW( path, slashW ); + strcatW( path, hashW ); + if (refstr) + lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); + + attr.Length = sizeof(attr); + attr.ObjectName = &string; + RtlInitUnicodeString( &string, path ); + ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); + heap_free(path); + if (ret) + return ret; + + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + NtClose( iface_key ); + if (ret) + return ret; + + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + if (ret) + { + NtClose( control_key ); + return ret; + } + + if (enable) + ret = create_device_symlink( iface->device, name ); + else + ret = IoDeleteSymbolicLink( name ); + if (ret) + { + NtDeleteValueKey( control_key, &string ); + NtClose( control_key ); + return ret; + } + + iface->enabled = enable; + + len = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[namelen + 1]); + + if ((broadcast = heap_alloc( len ))) + { + broadcast->dbcc_size = len; + broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + broadcast->dbcc_classguid = class; + lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, + enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); + + heap_free( broadcast ); + } + return ret; +} + +static NTSTATUS get_instance_id(DEVICE_OBJECT *device, WCHAR **instance_id) +{ + WCHAR *id, *ptr; + NTSTATUS status; + + status = get_device_id( device, BusQueryInstanceID, &id ); + if (status != STATUS_SUCCESS) return status; + + struprW( id ); + for (ptr = id; *ptr; ptr++) + if (*ptr == '\\') *ptr = '#'; + + *instance_id = id; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *class_guid, + UNICODE_STRING *reference_string, UNICODE_STRING *symbolic_link) +{ + SP_DEVICE_INTERFACE_DATA sp_iface = {sizeof(sp_iface)}; + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + NTSTATUS status = STATUS_SUCCESS; + struct device_interface *iface; + WCHAR *referenceW = NULL; + WCHAR *instance_id; + DWORD required; + HDEVINFO set; + BOOL rc; + + TRACE("device %p, class_guid %s, reference_string %s, symbolic_link %p.\n", + device, debugstr_guid(class_guid), debugstr_us(reference_string), symbolic_link); + + if (reference_string != NULL) + referenceW = reference_string->Buffer; + + set = SetupDiGetClassDevsW( class_guid, referenceW, NULL, DIGCF_DEVICEINTERFACE ); + if (set == INVALID_HANDLE_VALUE) return STATUS_UNSUCCESSFUL; + + status = get_instance_id( device, &instance_id ); + if (status != STATUS_SUCCESS) return status; + + rc = SetupDiCreateDeviceInfoW( set, instance_id, class_guid, NULL, NULL, 0, &sp_device ); + if (rc == 0) + { + if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) + { + DWORD index = 0; + DWORD size = strlenW(instance_id) + 2; + WCHAR *id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); + do + { + rc = SetupDiEnumDeviceInfo( set, index, &sp_device ); + if (rc && IsEqualGUID( &sp_device.ClassGuid, class_guid )) + { + BOOL check; + check = SetupDiGetDeviceInstanceIdW( set, &sp_device, id, size, &required ); + if (check && strcmpW( id, instance_id ) == 0) + break; + } + index++; + } while (rc); + + HeapFree( GetProcessHeap(), 0, id ); + if (!rc) + { + HeapFree( GetProcessHeap(), 0, instance_id ); + return STATUS_UNSUCCESSFUL; + } + } + else + { + HeapFree( GetProcessHeap(), 0, instance_id ); + return STATUS_UNSUCCESSFUL; + } + } + HeapFree( GetProcessHeap(), 0, instance_id ); + + if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, NULL, 0, &sp_iface )) + return STATUS_UNSUCCESSFUL; + + required = 0; + SetupDiGetDeviceInterfaceDetailW( set, &sp_iface, NULL, 0, &required, NULL ); + if (required == 0) return STATUS_UNSUCCESSFUL; + + data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, required ); + data->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + + if (!SetupDiGetDeviceInterfaceDetailW( set, &sp_iface, data, required, NULL, NULL )) + { + HeapFree( GetProcessHeap(), 0, data ); + return STATUS_UNSUCCESSFUL; + } + + data->DevicePath[1] = '?'; + TRACE("Returning path %s.\n", debugstr_w(data->DevicePath)); + + iface = heap_alloc_zero( sizeof(struct device_interface) ); + iface->device = device; + iface->interface_class = *class_guid; + RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); + if (symbolic_link) + RtlCreateUnicodeString( symbolic_link, data->DevicePath); + + if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) + ERR("Failed to insert interface %s into tree.\n", debugstr_us(&iface->symbolic_link)); + + HeapFree( GetProcessHeap(), 0, data ); + + return status; +} + +/*********************************************************************** + * PoSetPowerState (NTOSKRNL.EXE.@) + */ +POWER_STATE WINAPI PoSetPowerState( DEVICE_OBJECT *device, POWER_STATE_TYPE type, POWER_STATE state) +{ + FIXME("device %p, type %u, state %u, stub!\n", device, type, state.DeviceState); + return state; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cd46f91985f..cad0a20ca2b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1579,6 +1579,7 @@ NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); void WINAPI IoFreeMdl(MDL*); void WINAPI IoFreeWorkItem(PIO_WORKITEM); +DEVICE_OBJECT * WINAPI IoGetAttachedDeviceReference(DEVICE_OBJECT*); PEPROCESS WINAPI IoGetCurrentProcess(void); NTSTATUS WINAPI IoGetDeviceInterfaces(const GUID*,PDEVICE_OBJECT,ULONG,PWSTR*); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*); -- 2.21.0

1 0

[PATCH] D3DXSaveSurfaceToFileInMemory allow to use D3DXIFF_TGA
by Lorenzo Ferrillo 30 May '19

30 May '19

2 2

[PATCH] mshtml: Implement IHTMLDocument2 get_bgColor
by Alistair Leslie-Hughes 30 May '19

30 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/htmldoc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5b14678a6f..a4788bdc7c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -687,8 +687,13 @@ static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); + return return_nsstr_variant(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) -- 2.17.1

2 1

[PATCH] quartz: Ensure error text is terminated with NUL character.
by Akihiro Sagawa 30 May '19

30 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH 5/5] ntoskrnl.exe: Set IRP caller thread.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/tests/driver.c | 8 ++++++++ 2 files changed, 10 insertions(+)

2 1

[PATCH 4/5] server: Associate create and close IRPs with current thread.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ server/device.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

2 1

[PATCH 3/5] ntoskrnl.exe: Dispatch server IRPs in critical region.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/tests/driver.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 1/5] ntoskrnl.exe: Implement KeAreApcsDisabled.
by Jacek Caban 30 May '19

30 May '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 23 +++++++++++++++++++++++ include/ddk/ntddk.h | 1 + 5 files changed, 40 insertions(+), 3 deletions(-)

2 1

[PATCH 1/3] mf: Maintain sample grabber sink state.
by Nikolay Sivov 30 May '19

30 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 68 ++++++++++++++++++++++++++++++++++++----- include/mfidl.idl | 3 ++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index d501e0865d..e2766c086c 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -28,6 +28,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +enum sink_state +{ + SINK_STATE_STOPPED = 0, + SINK_STATE_RUNNING, +}; + struct sample_grabber; struct sample_grabber_stream @@ -51,6 +57,7 @@ struct sample_grabber struct sample_grabber_stream *stream; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; + enum sink_state state; CRITICAL_SECTION cs; }; @@ -685,32 +692,77 @@ static ULONG WINAPI sample_grabber_clock_sink_Release(IMFClockStateSink *iface) return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); } +static void sample_grabber_set_state(struct sample_grabber *grabber, enum sink_state state) +{ + static const DWORD events[] = + { + MEStreamSinkStopped, /* SINK_STATE_STOPPED */ + MEStreamSinkStarted, /* SINK_STATE_RUNNING */ + }; + BOOL set_state = FALSE; + + EnterCriticalSection(&grabber->cs); + + switch (grabber->state) + { + case SINK_STATE_STOPPED: + set_state = state == SINK_STATE_RUNNING; + break; + case SINK_STATE_RUNNING: + set_state = state == SINK_STATE_STOPPED; + break; + default: + ; + } + + if (set_state) + { + grabber->state = state; + if (grabber->stream) + IMFStreamSink_QueueEvent(&grabber->stream->IMFStreamSink_iface, events[state], &GUID_NULL, S_OK, NULL); + } + + LeaveCriticalSection(&grabber->cs); +} + static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { - FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + + sample_grabber_set_state(grabber, SINK_STATE_RUNNING); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + sample_grabber_set_state(grabber, SINK_STATE_STOPPED); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { - FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - return E_NOTIMPL; + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + + sample_grabber_set_state(grabber, SINK_STATE_RUNNING); + + return S_OK; } static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink *iface, MFTIME systime, float rate) diff --git a/include/mfidl.idl b/include/mfidl.idl index 2421c06f50..93e20a6978 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -820,3 +820,6 @@ cpp_quote("EXTERN_GUID(MF_TOPOLOGY_START_TIME_ON_PRESENTATION_SWITCH, 0xc8cc113f cpp_quote("EXTERN_GUID(MF_TOPOLOGY_STATIC_PLAYBACK_OPTIMIZATIONS, 0xb86cac42, 0x41a6, 0x4b79, 0x89, 0x7a, 0x1a, 0xb0, 0xe5, 0x2b, 0x4a, 0x1b);") cpp_quote("EXTERN_GUID(MF_RATE_CONTROL_SERVICE, 0x866fa297, 0xb802, 0x4bf8, 0x9d, 0xc9, 0x5e, 0x3b, 0x6a, 0x9f, 0x53, 0xc9);") + +cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") +cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);") -- 2.20.1

1 2

[PATCH 2/5] server: Use current thread for IRP calls without associated thread.
by Jacek Caban 30 May '19

30 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel