May 2019 - Wine-devel - list.winehq.org

[PATCH v7 3/7] winex11.drv: Initialize adapter registry data.
by Zhiyi Zhang 28 May '19

28 May '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 f5436e93d3..f7374d540b 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,6 +42,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 graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',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}; @@ -67,6 +70,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; @@ -79,8 +102,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)}; @@ -126,6 +150,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto fail; RegCloseKey(hkey); + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto fail; + strcpyW(driver, nt_classW); + strcatW(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); @@ -138,6 +169,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 fail; } + strcpyW(guid_string, bufferW); ret = TRUE; fail: @@ -147,13 +179,73 @@ fail: 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); + strcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + strcatW(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 fail; + + /* 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 fail; + 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 fail; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto fail; + + ret = TRUE; +fail: + 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 @@ -195,11 +287,15 @@ void X11DRV_DisplayDevices_Init(void) {'_','_','x','1','1','_','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]; BOOL success = FALSE; mutex = CreateMutexW(NULL, FALSE, init_mutexW); @@ -218,7 +314,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); @@ -228,8 +324,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 fail; + + /* Initialize adapters */ + if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto fail; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + &gpus[gpu], guidW, driverW, &adapters[adapter])) + goto fail; + + video_index++; + } + + handler.pFreeAdapters(adapters); + adapters = NULL; } success = TRUE; @@ -241,6 +353,8 @@ fail: CloseHandle(mutex); if (gpus) handler.pFreeGpus(gpus); + if (adapters) + handler.pFreeAdapters(adapters); if (!success) ERR("Failed to initialize display devices\n"); } 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 520f59f93d..3f6fdebb1e 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 v7 2/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang 28 May '19

28 May '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 164 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 22 +++++ dlls/winex11.drv/xinerama.c | 25 ++++++ 4 files changed, 212 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 a82975bfb9..f5436e93d3 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -26,11 +26,43 @@ #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 graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',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 winex11_drvW[] = { + 'C',':','\\', + 'W','i','n','d','o','w','s','\\', + 'S','y','s','t','e','m','3','2','\\', + 'w','i','n','e','x','1','1','.','d','r','v',0}; static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -47,11 +79,125 @@ 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 fail; + } + + /* 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 fail; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto fail; + + /* 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 GraphicsDriver value */ + if (RegSetValueExW(hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)winex11_drvW, sizeof(winex11_drvW))) + goto fail; + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto fail; + 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 fail; + } + + ret = TRUE; +fail: + 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[] = {'_','_','x','1','1','_','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; BOOL success = FALSE; @@ -72,11 +218,29 @@ 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 fail; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu)) + goto fail; + } + success = TRUE; fail: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); ReleaseMutex(mutex); CloseHandle(mutex); + if (gpus) + handler.pFreeGpus(gpus); if (!success) ERR("Failed to initialize display devices\n"); } 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..520f59f93d 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_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + strcpyW( gpus[0].name, wine_gpuW ); + + *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 1/5] strmbase/renderer: Add a destructor callback.
by Zebediah Figura 27 May '19

27 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 16 ++++++++++++---- include/wine/strmbase.h | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ea1be8b7127..7a69d98367c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -194,6 +194,18 @@ static IPin *renderer_get_pin(BaseFilter *iface, unsigned int index) return &This->pInputPin->pin.IPin_iface; } +static void renderer_destroy(BaseFilter *iface) +{ + BaseRenderer *filter = impl_from_BaseFilter(iface); + filter->pFuncsTable->renderer_destroy(filter); +} + +static const BaseFilterFuncTable RendererBaseFilterFuncTable = +{ + .filter_get_pin = renderer_get_pin, + .filter_destroy = renderer_destroy, +}; + static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) { BaseRenderer *This = impl_from_IBaseFilter(pin->pinInfo.pFilter); @@ -206,10 +218,6 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa return BaseRendererImpl_Receive(This, pSample); } -static const BaseFilterFuncTable RendererBaseFilterFuncTable = { - .filter_get_pin = renderer_get_pin, -}; - static const BaseInputPinFuncTable input_BaseInputFuncTable = { { BaseRenderer_Input_CheckMediaType, diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 307204e0e07..ee3e2c2c04a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -604,6 +604,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_EndOfStream pfnEndOfStream; BaseRenderer_BeginFlush pfnBeginFlush; BaseRenderer_EndFlush pfnEndFlush; + void (*renderer_destroy)(BaseRenderer *iface); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); -- 2.21.0

2 5

[PATCH 1/7] setupapi/tests: Test calling SetupDiEnumDeviceInterfaces() with a NULL device.
by Zebediah Figura 27 May '19

27 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index abf6fe9ed8d..728c4a3627d 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1055,8 +1055,8 @@ static void test_device_iface(void) { char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buffer; + SP_DEVINFO_DATA device = {0}, device2 = {sizeof(device2)}; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; @@ -1154,6 +1154,16 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device2); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device2, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + check_device_iface(set, NULL, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, NULL, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, NULL, &guid, 2, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0001#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}"); + check_device_iface(set, NULL, &guid, 3, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } -- 2.21.0

2 11

[PATCH] wininet: Fix name and data allocation failure handling in alloc_cookie.
by Jacek Caban 27 May '19

27 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/cookie.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH v2 1/4] kernel32/tests: Add NtAllocateVirtualMemory tests for ZeroBits behavior
by Rémi Bernon 27 May '19

27 May '19

The ZeroBits parameter doesn't behave as expected, and some 64bit code use it to allocate memory in the lower 32bit address space. The expected full behaviour is: * ZeroBits == 0: no constraint on address range * 0 < ZeroBits <= 15: returned address should have as many upper bits set to 0, starting at bit 31. In 64bit mode, upper 64bits should all be 0 as well. * 15 < ZeroBits <= 31: unsure, but probably same as ZeroBits == 15. * ZeroBits > 31: (64bit/WoW64 only) ZeroBits behaves as a bitmask, as if it was set to the number of leading 0 in the bitmask, works in the whole 64bit range. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 77 +++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..91dc654580e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -228,10 +228,12 @@ static void test_VirtualAllocEx(void) static void test_VirtualAlloc(void) { void *addr1, *addr2; + ULONG zero_bits; DWORD old_prot; MEMORY_BASIC_INFORMATION info; NTSTATUS status; SIZE_T size; + BOOL is_wow64; SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -461,6 +463,7 @@ static void test_VirtualAlloc(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine 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"); @@ -473,6 +476,80 @@ static void test_VirtualAlloc(void) ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* 1 zero bits should zero 63-31 upper bits */ + size = 0x1000; + addr2 = NULL; + zero_bits = 1; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 1, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + todo_wine + ok((status == STATUS_SUCCESS || broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */) && + ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 2 zero bits should zero 63-31 upper bits */ + size = 0x1000; + addr2 = NULL; + zero_bits = 2; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + todo_wine + ok(status == STATUS_SUCCESS && ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* 15 zero bits should zero 63-17 upper bits */ + size = 0x1000; + addr2 = NULL; + zero_bits = 15; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + todo_wine + ok((status == STATUS_SUCCESS || status == STATUS_NO_MEMORY) && ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + + /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */ + size = 0x1000; + addr2 = NULL; + zero_bits = 0x1fffffff; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + + if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || + !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) + { + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + } + else + { + todo_wine + ok(status == STATUS_SUCCESS && ((UINT_PTR)addr2 & ~zero_bits) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + } + /* 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); -- 2.20.1

2 7

[PATCH] services: Don't double release process in service_start.
by Piotr Caban 27 May '19

27 May '19

Fixes a crash while running ntoskrnl tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- programs/services/services.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] d3dx9: Release the full parameter name when a parameter is released (Valgrind).
by Sven Baars 27 May '19

27 May '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a4bce690fb..4b6321b659 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -581,6 +581,9 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil HeapFree(GetProcessHeap(), 0, param->members); } + if (param->full_name) + heap_free(param->full_name); + free_parameter_data(param, child); /* only the parent has to release name and semantic */ -- 2.17.1

2 3

[PATCH] kernel32: Added stub for Set/GetProcessPreferredUILanguages
by Manuel Edelmann 27 May '19

27 May '19

Empty Message

1 1

[PATCH] mf: Implement type handler methods for sample grabber stream.
by Nikolay Sivov 27 May '19

27 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 81 +++++++++++++++++++++------- dlls/mf/tests/mf.c | 117 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 172 insertions(+), 26 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index b62502f4f1..86dcb13a6c 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -28,12 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +struct sample_grabber; + struct sample_grabber_stream { IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; LONG refcount; - IMFMediaSink *sink; + struct sample_grabber *sink; IMFMediaEventQueue *event_queue; }; @@ -136,7 +138,7 @@ static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) if (!refcount) { - IMFMediaSink_Release(stream->sink); + IMFMediaSink_Release(&stream->sink->IMFMediaSink_iface); if (stream->event_queue) { IMFMediaEventQueue_Shutdown(stream->event_queue); @@ -193,7 +195,7 @@ static HRESULT WINAPI sample_grabber_stream_GetMediaSink(IMFStreamSink *iface, I TRACE("%p, %p.\n", iface, sink); - *sink = stream->sink; + *sink = &stream->sink->IMFMediaSink_iface; IMFMediaSink_AddRef(*sink); return S_OK; @@ -281,47 +283,81 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { - FIXME("%p, %p, %p.\n", iface, in_type, out_type); + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + DWORD flags; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + if (!in_type) + return E_POINTER; + + if (IMFMediaType_IsEqual(stream->sink->media_type, in_type, &flags) == S_OK) + return S_OK; + + return (flags & supported_flags) == supported_flags ? S_OK : MF_E_INVALIDMEDIATYPE; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + TRACE("%p, %p.\n", iface, count); - return E_NOTIMPL; + if (!count) + return E_POINTER; + + *count = 0; + + return S_OK; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, - IMFMediaType **type) + IMFMediaType **media_type) { - FIXME("%p, %u, %p.\n", iface, index, type); + TRACE("%p, %u, %p.\n", iface, index, media_type); - return E_NOTIMPL; + if (!media_type) + return E_POINTER; + + return MF_E_NO_MORE_TYPES; } static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, - IMFMediaType *type) + IMFMediaType *media_type) { - FIXME("%p, %p.\n", iface, type); + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, media_type); + + if (!media_type) + return E_POINTER; + + IMFMediaType_Release(stream->sink->media_type); + stream->sink->media_type = media_type; + IMFMediaType_AddRef(stream->sink->media_type); + + return S_OK; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) { - FIXME("%p, %p.\n", iface, type); + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + *type = stream->sink->media_type; + IMFMediaType_AddRef(*type); + + return S_OK; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { - FIXME("%p, %p.\n", iface, type); + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + return IMFMediaType_GetMajorType(stream->sink->media_type, type); } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -682,7 +718,7 @@ static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = sample_grabber_clock_sink_OnClockSetRate, }; -static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink **stream) +static HRESULT sample_grabber_create_stream(struct sample_grabber *sink, IMFStreamSink **stream) { struct sample_grabber_stream *object; HRESULT hr; @@ -695,7 +731,7 @@ static HRESULT sample_grabber_create_stream(IMFMediaSink *sink, IMFStreamSink ** object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->refcount = 1; object->sink = sink; - IMFMediaSink_AddRef(object->sink); + IMFMediaSink_AddRef(&object->sink->IMFMediaSink_iface); if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto failed; @@ -715,9 +751,14 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use struct sample_grabber_activate_context *context = user_context; struct sample_grabber *object; HRESULT hr; + GUID guid; TRACE("%p, %p, %p.\n", attributes, user_context, obj); + /* At least major type is required. */ + if (FAILED(IMFMediaType_GetMajorType(context->media_type, &guid))) + return MF_E_INVALIDMEDIATYPE; + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -732,7 +773,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use IMFMediaType_AddRef(object->media_type); InitializeCriticalSection(&object->cs); - if (FAILED(hr = sample_grabber_create_stream(&object->IMFMediaSink_iface, &object->stream))) + if (FAILED(hr = sample_grabber_create_stream(object, &object->stream))) goto failed; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 317d611c2f..b381daf882 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1638,17 +1638,23 @@ static IMFSampleGrabberSinkCallback grabber_callback = { &grabber_callback_vtbl static void test_sample_grabber(void) { + IMFMediaType *media_type, *media_type2, *media_type3; IMFMediaTypeHandler *handler, *handler2; + IMFPresentationTimeSource *time_source; IMFStreamSink *stream, *stream2; IMFClockStateSink *clocksink; + IMFPresentationClock *clock; IMFMediaEventGenerator *eg; IMFMediaSink *sink, *sink2; - IMFMediaType *media_type; DWORD flags, count, id; IMFActivate *activate; ULONG refcount; IUnknown *unk; HRESULT hr; + GUID guid; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); @@ -1725,15 +1731,32 @@ static void test_sample_grabber(void) hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); -todo_wine { ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); -} ok(handler == handler2, "Unexpected handler.\n"); IMFMediaTypeHandler_Release(handler); IMFMediaTypeHandler_Release(handler2); + /* Set clock. */ + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Failed to create clock object, hr %#x.\n", hr); + + hr = IMFMediaSink_SetPresentationClock(sink, clock); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = MFCreateSystemTimeSource(&time_source); + ok(hr == S_OK, "Failed to create time source, hr %#x.\n", hr); + + hr = IMFPresentationClock_SetTimeSource(clock, time_source); + ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + IMFPresentationTimeSource_Release(time_source); + + hr = IMFMediaSink_SetPresentationClock(sink, clock); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + IMFPresentationClock_Release(clock); + hr = IMFActivate_ShutdownObject(activate); todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); @@ -1768,20 +1791,102 @@ todo_wine hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + /* On Win8+ this initialization happens automatically. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); -todo_wine { ok(hr == S_OK, "Failed to get media type count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); -} + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type %s.\n", wine_dbgstr_guid(&guid)); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type2); + ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); + ok(media_type2 == media_type, "Unexpected media type.\n"); + IMFMediaType_Release(media_type2); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); + IMFMediaType_Release(media_type); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); + ok(media_type2 == media_type, "Unexpected media type.\n"); + IMFMediaType_Release(media_type); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &media_type); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, &media_type3); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type3 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, &media_type3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type3 == (void *)0xdeadbeef, "Unexpected media type %p.\n", media_type3); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, 1024); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type3 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, &media_type3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type3 == (void *)0xdeadbeef, "Unexpected media type %p.\n", media_type3); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFMediaTypeHandler_Release(handler); + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + IMFMediaSink_Release(sink); IMFStreamSink_Release(stream); refcount = IMFActivate_Release(activate); ok(!refcount, "Unexpected refcount %u.\n", refcount); - IMFMediaType_Release(media_type); + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } START_TEST(mf) -- 2.20.1

1 0