June 2019 - Wine-Devel - list.winehq.org

[PATCH v3 1/5] user32: Move EnumDisplayDevicesA/W.
by Zhiyi Zhang June 24, 2019

June 24, 2019

Because most of the monitor functions are in sysparams.c. And format the string constants to be more consistent with the style in sysparams.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Fix test failure. Avoid a race issue. Delete unused code. Supersede 166972~166974 dlls/user32/misc.c | 313 ------------------------------------------------ dlls/user32/sysparams.c | 298 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 313 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 5f26cf9af3..bed5812a47 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -28,14 +28,7 @@ #include "wine/windef16.h" #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" @@ -43,66 +36,6 @@ 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[] = - {'\\','\\','.','\\', - '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}; - -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; @@ -307,252 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * EnumDisplayDevicesA (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpDispDev, - DWORD dwFlags ) -{ - UNICODE_STRING deviceW; - DISPLAY_DEVICEW ddW; - BOOL ret; - - if(lpDevice) - RtlCreateUnicodeStringFromAsciiz(&deviceW, lpDevice); - else - deviceW.Buffer = NULL; - - ddW.cb = sizeof(ddW); - ret = EnumDisplayDevicesW(deviceW.Buffer, i, &ddW, dwFlags); - RtlFreeUnicodeString(&deviceW); - - if(!ret) return ret; - - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceName, -1, lpDispDev->DeviceName, sizeof(lpDispDev->DeviceName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceString, -1, lpDispDev->DeviceString, sizeof(lpDispDev->DeviceString), NULL, NULL); - lpDispDev->StateFlags = ddW.StateFlags; - - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(lpDispDev->DeviceID)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceID, -1, lpDispDev->DeviceID, sizeof(lpDispDev->DeviceID), NULL, NULL); - if(lpDispDev->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(lpDispDev->DeviceKey)) - WideCharToMultiByte(CP_ACP, 0, ddW.DeviceKey, -1, lpDispDev->DeviceKey, sizeof(lpDispDev->DeviceKey), NULL, NULL); - - return TRUE; -} - -/*********************************************************************** - * EnumDisplayDevicesW (USER32.@) - */ -BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, - DWORD 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) - { - 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, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) - lpDisplayDevice->DeviceKey[0] = 0; - - return TRUE; -} - /*********************************************************************** * QueryDisplayConfig (USER32.@) */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9a5c3cf8d5..3e457f09c4 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -34,10 +34,14 @@ #include "winbase.h" #include "winnls.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "wine/wingdi16.h" #include "winerror.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "controls.h" #include "win.h" #include "user_private.h" @@ -245,6 +249,56 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + +/* Strings for monitor functions */ +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}; +static const WCHAR BACKSLASH[] = {'\\',0}; +static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; +static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; +static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR VIDEO_KEY[] = {'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 NT_CLASS[] = {'\\','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 ADAPTER_FMT[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; +static const WCHAR MONITOR_FMT[] = {'\\','\\','.','\\', + 'D','I','S','P','L','A','Y','%','d','\\', + 'M','o','n','i','t','o','r','%','d',0}; +static const WCHAR VIDEO_VALUE_FMT[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; +static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','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 HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -3772,6 +3826,250 @@ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPA return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); } +/*********************************************************************** + * EnumDisplayDevicesA (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesA( LPCSTR device, DWORD index, DISPLAY_DEVICEA *info, DWORD flags ) +{ + UNICODE_STRING deviceW; + DISPLAY_DEVICEW ddW; + BOOL ret; + + if (device) + RtlCreateUnicodeStringFromAsciiz( &deviceW, device ); + else + deviceW.Buffer = NULL; + + ddW.cb = sizeof(ddW); + ret = EnumDisplayDevicesW( deviceW.Buffer, index, &ddW, flags ); + RtlFreeUnicodeString( &deviceW ); + + if (!ret) + return ret; + + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceName, -1, info->DeviceName, sizeof(info->DeviceName), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceString, -1, info->DeviceString, sizeof(info->DeviceString), NULL, NULL ); + info->StateFlags = ddW.StateFlags; + + if (info->cb >= offsetof(DISPLAY_DEVICEA, DeviceID) + sizeof(info->DeviceID)) + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceID, -1, info->DeviceID, sizeof(info->DeviceID), NULL, NULL ); + if (info->cb >= offsetof(DISPLAY_DEVICEA, DeviceKey) + sizeof(info->DeviceKey)) + WideCharToMultiByte( CP_ACP, 0, ddW.DeviceKey, -1, info->DeviceKey, sizeof(info->DeviceKey), NULL, NULL ); + + return TRUE; +} + +/*********************************************************************** + * EnumDisplayDevicesW (USER32.@) + */ +BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ) +{ + 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( device ), index, info, flags); + + /* Find adapter */ + if (!device) + { + sprintfW( key_nameW, VIDEO_VALUE_FMT, index ); + size = sizeof(bufferW); + if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + return FALSE; + + /* DeviceKey */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + lstrcpyW( info->DeviceKey, bufferW ); + + /* DeviceName */ + sprintfW( info->DeviceName, ADAPTER_FMT, index + 1 ); + + /* Strip \Registry\Machine\ */ + lstrcpyW( key_nameW, bufferW + 18 ); + + /* DeviceString */ + size = sizeof(info->DeviceString); + if (RegGetValueW( HKEY_LOCAL_MACHINE, key_nameW, DRIVER_DESC, RRF_RT_REG_SZ, NULL, + info->DeviceString, &size )) + return FALSE; + + /* StateFlags */ + size = sizeof(info->StateFlags); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, STATE_FLAGS, RRF_RT_REG_DWORD, NULL, + &info->StateFlags, &size )) + return FALSE; + + /* DeviceID */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + info->DeviceID[0] = 0; + else + { + size = sizeof(bufferW); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, GPU_ID, 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( info->DeviceID, bufferW ); + } + } + } + /* Find monitor */ + else + { + /* Check adapter name */ + if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) + return FALSE; + + adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); + sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); + + size = sizeof(bufferW); + if (RegGetValueW( HKEY_LOCAL_MACHINE, VIDEO_KEY, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + return FALSE; + + /* DeviceName */ + sprintfW( info->DeviceName, MONITOR_FMT, adapter_index, index ); + + /* Get monitor instance */ + /* Strip \Registry\Machine\ first */ + lstrcpyW( key_nameW, bufferW + 18 ); + sprintfW( bufferW, MONITOR_ID_VALUE_FMT, index ); + + 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 *)&info->StateFlags, sizeof(info->StateFlags), NULL, 0 )) + goto done; + + /* DeviceString */ + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DEVICEDESC, NULL, + (BYTE *)info->DeviceString, + sizeof(info->DeviceString), NULL )) + goto done; + + /* DeviceKey */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + { + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + + lstrcpyW( info->DeviceKey, NT_CLASS ); + lstrcatW( info->DeviceKey, bufferW ); + } + + /* DeviceID */ + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + { + lstrcpyW( info->DeviceID, MONITOR_INTERFACE_PREFIX ); + lstrcatW( info->DeviceID, instanceW ); + lstrcatW( info->DeviceID, GUID_DEVINTERFACE_MONITOR ); + /* Replace '\\' with '#' after prefix */ + for (next_charW = info->DeviceID + strlenW( MONITOR_INTERFACE_PREFIX ); *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( info->DeviceID, bufferW ); + lstrcatW( info->DeviceID, BACKSLASH ); + + if (!SetupDiGetDeviceRegistryPropertyW( set, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, + sizeof(bufferW), NULL )) + goto done; + + lstrcatW( info->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 (index) + return FALSE; + + /* If user driver did initialize the registry, then exit */ + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, VIDEO_KEY, &hkey )) + { + RegCloseKey( hkey ); + return FALSE; + } + WARN("Reporting fallback display devices\n"); + + /* Adapter */ + if (!device) + { + memcpy( info->DeviceName, DEFAULT_ADAPTER_NAME, sizeof(DEFAULT_ADAPTER_NAME) ); + memcpy( info->DeviceString, DEFAULT_ADAPTER_STRING, sizeof(DEFAULT_ADAPTER_STRING) ); + info->StateFlags = + DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + info->DeviceID[0] = 0; + else + memcpy( info->DeviceID, DEFAULT_ADAPTER_ID, sizeof(DEFAULT_ADAPTER_ID) ); + } + } + /* Monitor */ + else + { + if (lstrcmpiW( DEFAULT_ADAPTER_NAME, device )) + return FALSE; + + memcpy( info->DeviceName, DEFAULT_MONITOR_NAME, sizeof(DEFAULT_MONITOR_NAME) ); + memcpy( info->DeviceString, DEFAULT_MONITOR_STRING, sizeof(DEFAULT_MONITOR_STRING) ); + info->StateFlags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED; + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(info->DeviceID)) + { + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + memcpy( info->DeviceID, DEFAULT_MONITOR_INTERFACE_ID, sizeof(DEFAULT_MONITOR_INTERFACE_ID) ); + else + memcpy( info->DeviceID, DEFAULT_MONITOR_ID, sizeof(DEFAULT_MONITOR_ID) ); + } + } + + if (info->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(info->DeviceKey)) + info->DeviceKey[0] = 0; + + return TRUE; +} /********************************************************************** * GetAutoRotationState [USER32.@] -- 2.15.2 (Apple Git-101.1)

3 2

[PATCH 2/2] wininet: Always set last error in InternetReadFile.
by Alistair Leslie-Hughes June 24, 2019

June 24, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47352 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 3 +-- dlls/wininet/tests/http.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6671950f8c..7294241b67 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2193,8 +2193,7 @@ BOOL WINAPI InternetReadFile(HINTERNET hFile, LPVOID lpBuffer, TRACE("-- %s (%u) (bytes read: %d)\n", res == ERROR_SUCCESS ? "TRUE": "FALSE", res, pdwNumOfBytesRead ? *pdwNumOfBytesRead : -1); - if(res != ERROR_SUCCESS) - SetLastError(res); + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 70d57385e5..c8a2796322 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -987,7 +987,10 @@ static void InternetReadFile_chunked_test(void) { char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); + SetLastError(0xdeadbeef); res = InternetReadFile(hor,buffer,length,&got); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); buffer[got]=0; trace("ReadFile -> %i %i\n",res,got); @@ -1000,8 +1003,11 @@ static void InternetReadFile_chunked_test(void) if (length == 0) { got = 0xdeadbeef; + SetLastError(0xdeadbeef); res = InternetReadFile( hor, buffer, 1, &got ); ok( res, "InternetReadFile failed: %u\n", GetLastError() ); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); ok( !got, "got %u\n", got ); break; } -- 2.17.1

2 1

[PATCH 1/2] wininet: Always set last error in HttpQueryInfoW.
by Alistair Leslie-Hughes June 24, 2019

June 24, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cbc95fb8ae..c90213bf46 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3911,8 +3911,8 @@ lend: WININET_Release( &request->hdr ); TRACE("%u <--\n", res); - if(res != ERROR_SUCCESS) - SetLastError(res); + + SetLastError(res); return res == ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5a0cc11754..70d57385e5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -722,8 +722,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); + SetLastError(0xdeadbeef); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(GetLastError() == 0 || + broken(GetLastError() == 0xdeadbeef /* XP/W2K3 */), "Last Error not reset %u\n", GetLastError()); /* show that the function writes data past the length returned */ ok(buffer[length-2], "Expected any header character, got 0x00\n"); ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]); -- 2.17.1

1 0

[PATCH 1/7] wined3d: Return a wined3d_stateblock from wined3d_device_begin_stateblock().
by Zebediah Figura June 23, 2019

June 23, 2019

And hold it locally in d3d[789]. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 14 +++++++++----- dlls/d3d9/d3d9_private.h | 5 +++-- dlls/d3d9/device.c | 21 +++++++++++++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 10 ++++++---- dlls/wined3d/device.c | 30 ++++++++++++++++-------------- dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 4 ++-- 9 files changed, 55 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1669ff74315..0d4d4faf898 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -126,12 +126,13 @@ struct d3d8_device DWORD sysmem_vb : 16; /* D3D8_MAX_STREAMS */ DWORD sysmem_ib : 1; DWORD in_destruction : 1; - DWORD recording : 1; - DWORD padding : 13; + DWORD padding : 14; /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ struct wined3d_swapchain *implicit_swapchain; + + struct wined3d_stateblock *recording; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e57e01e42ba..efea4708fda 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -911,7 +911,9 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { - device->recording = FALSE; + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; implicit_swapchain = wined3d_swapchain_get_parent(device->implicit_swapchain); implicit_swapchain->swap_interval @@ -1862,13 +1864,14 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -1886,14 +1889,15 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * * of memory later and cause locking problems) */ wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device, &stateblock); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - device->recording = FALSE; + stateblock = device->recording; + device->recording = NULL; *token = d3d8_allocate_handle(&device->handle_table, stateblock, D3D8_HANDLE_SB); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8ee521b14b0..c01e3997808 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -108,8 +108,7 @@ struct d3d9_device DWORD in_destruction : 1; DWORD in_scene : 1; DWORD has_vertex_declaration : 1; - DWORD recording : 1; - DWORD padding : 11; + DWORD padding : 12; DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ @@ -117,6 +116,8 @@ struct d3d9_device UINT implicit_swapchain_count; struct wined3d_swapchain **implicit_swapchains; + + struct wined3d_stateblock *recording; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fbdcebf075..9d05771c5d1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -995,7 +995,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { - device->recording = FALSE; + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); @@ -2350,13 +2352,14 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr; @@ -2372,14 +2375,16 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire TRACE("iface %p, stateblock %p.\n", iface, stateblock); wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_stateblock); - wined3d_mutex_unlock(); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { - WARN("Failed to end the state block, hr %#x.\n", hr); - return hr; + wined3d_mutex_unlock(); + WARN("Failed to end the stateblock, hr %#x.\n", hr); + return hr; } - device->recording = FALSE; + wined3d_stateblock = device->recording; + device->recording = NULL; + wined3d_mutex_unlock(); if (!(object = heap_alloc_zero(sizeof(*object)))) { diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b228f3ec355..6bdc7c789fa 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -350,7 +350,7 @@ struct d3d_device struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; - BOOL recording; + struct wined3d_stateblock *recording; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cdf4de8f95d..2c0b85d9a47 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5625,6 +5625,7 @@ static HRESULT WINAPI d3d_device7_GetLight_FPUPreserve(IDirect3DDevice7 *iface, static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("iface %p.\n", iface); @@ -5636,8 +5637,8 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); return D3DERR_INBEGINSTATEBLOCK; } - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) - device->recording = TRUE; + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + device->recording = stateblock; wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); @@ -5695,7 +5696,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); return D3DERR_NOTINBEGINSTATEBLOCK; } - hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_sb); + hr = wined3d_device_end_stateblock(device->wined3d_device); if (FAILED(hr)) { WARN("Failed to end stateblock, hr %#x.\n", hr); @@ -5703,7 +5704,8 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl *stateblock = 0; return hr_ddraw_from_wined3d(hr); } - device->recording = FALSE; + wined3d_sb = device->recording; + device->recording = NULL; h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK); if (h == DDRAW_INVALID_HANDLE) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d35a0648c9c..612278d5d56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4178,49 +4178,51 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic return wined3d_swapchain_get_display_mode(swapchain, mode, rotation); } -HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) +HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device, + struct wined3d_stateblock **stateblock) { - struct wined3d_stateblock *stateblock; + struct wined3d_stateblock *object; HRESULT hr; TRACE("device %p.\n", device); if (device->recording) + { + *stateblock = NULL; return WINED3DERR_INVALIDCALL; + } - hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &stateblock); + hr = wined3d_stateblock_create(device, WINED3D_SBT_RECORDED, &object); if (FAILED(hr)) return hr; - device->recording = stateblock; - device->update_stateblock_state = &stateblock->stateblock_state; + device->recording = object; + device->update_stateblock_state = &object->stateblock_state; + *stateblock = object; - TRACE("Recording stateblock %p.\n", stateblock); + TRACE("Recording stateblock %p.\n", *stateblock); return WINED3D_OK; } -HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, - struct wined3d_stateblock **stateblock) +HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) { - struct wined3d_stateblock *object = device->recording; + struct wined3d_stateblock *stateblock = device->recording; - TRACE("device %p, stateblock %p.\n", device, stateblock); + TRACE("device %p.\n", device); if (!device->recording) { WARN("Not recording.\n"); - *stateblock = NULL; return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(object); + stateblock_init_contained_states(stateblock); - *stateblock = object; device->recording = NULL; device->update_stateblock_state = &device->stateblock_state; - TRACE("Returning stateblock %p.\n", *stateblock); + TRACE("Ending stateblock %p.\n", stateblock); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c91e07..9b4f4792f5d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,7 +37,7 @@ @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) -@ cdecl wined3d_device_begin_stateblock(ptr) +@ cdecl wined3d_device_begin_stateblock(ptr ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @@ -55,7 +55,7 @@ @ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive_instanced_indirect(ptr ptr long) @ cdecl wined3d_device_end_scene(ptr) -@ cdecl wined3d_device_end_stateblock(ptr ptr) +@ cdecl wined3d_device_end_stateblock(ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) @ cdecl wined3d_device_get_available_texture_mem(ptr) @ cdecl wined3d_device_get_base_vertex_index(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0ad02..27776385313 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2231,7 +2231,7 @@ ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device); +HRESULT __cdecl wined3d_device_begin_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); HRESULT __cdecl wined3d_device_clear_rendertarget_view(struct wined3d_device *device, @@ -2267,7 +2267,7 @@ void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *devi void __cdecl wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); +HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); -- 2.21.0

2 14

Wine staging 4.11 release
by Alistair Leslie-Hughes June 23, 2019

June 23, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.11 (818 patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. Upstreamed (Either directly from staging or fixed with a similar patch). * ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps. * winex11: Make GetMonitorInfo() give a different device name (\.\DISPLAY<n>) to each monitor. * user32: Implement EnumDisplayDevicesW() based on EnumDisplayMonitors() and GetMonitorInfoW(). * user32: Return a more reasonable display DeviceID. * ntdll/directory: Add support for EXT4 case folding per directory. * dxgi: Improve stubs for MakeWindowAssociation and GetWindowAssociation. * wininet: Silence wininet no support on this platform message. Added: * [37058] mshtml: Improve IOleInPlaceActiveObject TranslateAccelerator. Updated: * kernel32-PE_Loader_Fixes Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

6 7

[PATCH v4 1/5] wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Zebediah Figura June 22, 2019

June 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 11298301f55..9f97b346f93 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -465,6 +465,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" -- 2.21.0

2 5

[PATCH v2 1/5] strmbase: Add default implementations of filter state change methods.
by Zebediah Figura June 22, 2019

June 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 42 insertions(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 5f57731b7a1..9ed588cf803 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -123,6 +123,45 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) return S_OK; } +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Stopped; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Paused; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Running; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) { BaseFilter *This = impl_from_IBaseFilter(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 8de92b2826b..6abd8c76011 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -184,6 +184,9 @@ typedef struct BaseFilterFuncTable HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface); ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface); +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start); HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid); HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ); HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); -- 2.21.0

1 4

[PATCH 1/5] strmbase: Add default implementations of filter state change methods.
by Zebediah Figura June 22, 2019

June 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 39 +++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 42 insertions(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 5f57731b7a1..9ed588cf803 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -123,6 +123,45 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) return S_OK; } +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Stopped; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p.\n", iface); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Paused; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) +{ + BaseFilter *filter = impl_from_IBaseFilter(iface); + + TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start)); + + EnterCriticalSection(&filter->csFilter); + filter->state = State_Running; + LeaveCriticalSection(&filter->csFilter); + + return S_OK; +} + HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) { BaseFilter *This = impl_from_IBaseFilter(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 8de92b2826b..6abd8c76011 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -184,6 +184,9 @@ typedef struct BaseFilterFuncTable HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface); ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface); +HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface); +HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start); HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid); HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ); HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); -- 2.21.0

2 7

[PATCH 5/5] wined3d: Move texture2d_load_drawable() to texture.c.
by Henri Verbeet June 21, 2019

June 21, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 48 ----------------------------------------- dlls/wined3d/texture.c | 49 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 48 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6d3590b3d13..fc8be3827ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1423,54 +1423,6 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, } /* Context activation is done by the caller. */ -BOOL texture2d_load_drawable(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context) -{ - struct wined3d_texture *restore_texture; - struct wined3d_device *device; - unsigned int restore_idx; - unsigned int level; - RECT r; - - if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) - { - DWORD current = texture->sub_resources[sub_resource_idx].locations; - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(current)); - return FALSE; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && wined3d_resource_is_offscreen(&texture->resource)) - { - ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); - return FALSE; - } - - device = texture->resource.device; - restore_texture = context->current_rt.texture; - restore_idx = context->current_rt.sub_resource_idx; - if (restore_texture != texture || restore_idx != sub_resource_idx) - context = context_acquire(device, texture, sub_resource_idx); - else - restore_texture = NULL; - - level = sub_resource_idx % texture->level_count; - SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), - wined3d_texture_get_level_height(texture, level)); - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, - texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &r, - texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, - NULL, WINED3D_TEXF_POINT); - - if (restore_texture) - context_restore(context, restore_texture, restore_idx); - - return TRUE; -} - -/* Context activation is done by the caller. */ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ae3e17914f5..4ae869b4b2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2481,6 +2481,53 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl return FALSE; } +static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context) +{ + struct wined3d_texture *restore_texture; + struct wined3d_device *device; + unsigned int restore_idx; + unsigned int level; + RECT r; + + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) + { + DWORD current = texture->sub_resources[sub_resource_idx].locations; + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(current)); + return FALSE; + } + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && wined3d_resource_is_offscreen(&texture->resource)) + { + ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); + return FALSE; + } + + device = texture->resource.device; + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) + context = context_acquire(device, texture, sub_resource_idx); + else + restore_texture = NULL; + + level = sub_resource_idx % texture->level_count; + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); + device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, + texture, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, &r, + texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r, + NULL, WINED3D_TEXF_POINT); + + if (restore_texture) + context_restore(context, restore_texture, restore_idx); + + return TRUE; +} + static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, BOOL srgb) { @@ -2651,7 +2698,7 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); case WINED3D_LOCATION_DRAWABLE: - return texture2d_load_drawable(texture, sub_resource_idx, context); + return wined3d_texture_load_drawable(texture, sub_resource_idx, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e23653024b..f796d12446f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3549,8 +3549,6 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co const RECT *dst_rect) DECLSPEC_HIDDEN; void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; -BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_create_buffer_object().
by Henri Verbeet June 21, 2019

June 21, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b664214fb31..5aca952b2cf 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -196,10 +196,10 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } /* Context activation is done by the caller. */ -static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -269,7 +269,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -615,6 +615,9 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + switch (location) { case WINED3D_LOCATION_SYSMEM: @@ -626,7 +629,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - if (wined3d_buffer_gl(buffer)->buffer_object) + if (buffer_gl->buffer_object) return TRUE; if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) @@ -634,7 +637,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); return FALSE; } - return wined3d_buffer_gl_create_buffer_object(wined3d_buffer_gl(buffer), context); + return wined3d_buffer_gl_create_buffer_object(buffer_gl, context_gl); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); -- 2.11.0

1 0