wine-devel February 2019

wine-devel@winehq.org

73 participants
737 discussions

[PATCH] mf/tests: Add some tests for node management.
by Nikolay Sivov 21 Feb '19

21 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 134 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6e77f6b77c..d6091cb629 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -28,29 +28,159 @@ #include "initguid.h" #include "mfapi.h" +#include "mferror.h" #include "mfidl.h" #include "wine/test.h" static void test_topology(void) { + IMFTopologyNode *node, *node2; IMFTopology *topology; - IMFTopologyNode *node; + WORD count; HRESULT hr; + TOPOID id; hr = MFCreateTopology(NULL); ok(hr == E_POINTER, "got %#x\n", hr); hr = MFCreateTopology(&topology); ok(hr == S_OK, "got %#x\n", hr); - IMFTopology_Release(topology); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetTopoNodeID(node, &id); +todo_wine + ok(hr == S_OK, "Failed to get node id, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetTopoNodeID(node2, id); +todo_wine + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + + count = 1; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 0, "Unexpected node count %u.\n", count); +} + /* Same id, different nodes. */ + hr = IMFTopology_AddNode(topology, node); +todo_wine + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + count = 0; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 1, "Unexpected node count %u.\n", count); +} + hr = IMFTopology_AddNode(topology, node2); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMFTopologyNode_Release(node2); + + hr = IMFTopology_GetNodeByID(topology, id, &node2); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node2 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node2); + + /* Change node id, add it again. */ + hr = IMFTopologyNode_SetTopoNodeID(node, ++id); +todo_wine + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(topology, id, &node2); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node2 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node2); + + hr = IMFTopology_GetNodeByID(topology, id + 1, &node2); +todo_wine + ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, node); +todo_wine + ok(hr == E_INVALIDARG, "Failed to add a node, hr %#x.\n", hr); + + hr = IMFTopology_GetNode(topology, 0, &node2); +todo_wine { + ok(hr == S_OK, "Failed to get a node, hr %#x.\n", hr); + ok(node2 == node, "Unexpected node.\n"); +} + if (SUCCEEDED(hr)) + IMFTopologyNode_Release(node2); + + hr = IMFTopology_GetNode(topology, 1, &node2); +todo_wine + ok(hr == MF_E_INVALIDINDEX, "Failed to get a node, hr %#x.\n", hr); + + hr = IMFTopology_GetNode(topology, -2, &node2); +todo_wine + ok(hr == MF_E_INVALIDINDEX, "Failed to get a node, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, node2); +todo_wine + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + IMFTopologyNode_Release(node2); + + count = 0; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 2, "Unexpected node count %u.\n", count); +} + /* Remove with detached node, existing id. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node2); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + hr = IMFTopologyNode_SetTopoNodeID(node2, id); +todo_wine + ok(hr == S_OK, "Failed to set node id, hr %#x.\n", hr); + hr = IMFTopology_RemoveNode(topology, node2); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMFTopologyNode_Release(node2); + + hr = IMFTopology_RemoveNode(topology, node); +todo_wine + ok(hr == S_OK, "Failed to remove a node, hr %#x.\n", hr); + + count = 0; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 1, "Unexpected node count %u.\n", count); +} + hr = IMFTopology_Clear(topology); +todo_wine + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + + count = 1; + hr = IMFTopology_GetNodeCount(topology, &count); +todo_wine { + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(count == 0, "Unexpected node count %u.\n", count); +} + hr = IMFTopology_Clear(topology); +todo_wine + ok(hr == S_OK, "Failed to clear topology, hr %#x.\n", hr); + IMFTopologyNode_Release(node); + IMFTopology_Release(topology); } static HRESULT WINAPI test_getservice_QI(IMFGetService *iface, REFIID riid, void **obj) -- 2.20.1

1 0

[PATCH] mfplat: Implement MFInvokeCallback().
by Nikolay Sivov 21 Feb '19

21 Feb '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 ++--- dlls/mfplat/queue.c | 54 +++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 2 ++ 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 8f5ee77406..e55cfb9a5a 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -116,12 +116,12 @@ @ stub MFInitMediaTypeFromWaveFormatEx @ stub MFInitVideoFormat @ stub MFInitVideoFormat_RGB -@ stub MFInvokeCallback +@ stdcall MFInvokeCallback(ptr) @ stub MFJoinIoPort @ stdcall MFLockPlatform() @ stdcall MFLockWorkQueue(long) -@ stub MFPutWorkItem -@ stub MFPutWorkItemEx +@ stdcall MFPutWorkItem(long ptr ptr) +@ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback @ stub MFScheduleWorkItem diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 65f111ba41..ebc2ad487b 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -331,3 +331,57 @@ HRESULT WINAPI MFUnlockWorkQueue(DWORD queue) return unlock_user_queue(queue); } + +/*********************************************************************** + * MFPutWorkItem (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%#x, %p, %p.\n", queue, callback, state); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = MFPutWorkItemEx(queue, result); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFPutWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) +{ + FIXME("%#x, %p\n", queue, result); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFInvokeCallback (mfplat.@) + */ +HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) +{ + MFASYNCRESULT *result_data = (MFASYNCRESULT *)result; + DWORD queue = MFASYNC_CALLBACK_QUEUE_STANDARD, flags; + HRESULT hr; + + TRACE("%p.\n", result); + + if (FAILED(IMFAsyncCallback_GetParameters(result_data->pCallback, &flags, &queue))) + queue = MFASYNC_CALLBACK_QUEUE_STANDARD; + + if (FAILED(MFLockWorkQueue(queue))) + queue = MFASYNC_CALLBACK_QUEUE_STANDARD; + + hr = MFPutWorkItemEx(queue, result); + + MFUnlockWorkQueue(queue); + + return hr; +} diff --git a/include/mfapi.h b/include/mfapi.h index d70a300a3c..d85f7408b0 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -102,6 +102,8 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN UINT32 *pcount); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); +HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); +HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); -- 2.20.1

1 0

[PATCH] wineandroid.drv: Remove unnecessary 'extends Object' statement.
by Isira Seneviratne 21 Feb '19

21 Feb '19

1 0

[PATCH 2/5] user32/tests: Add more EnumDisplayDevices tests.
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 194 ++++++++++++++++++++++++++++++++---- 1 file changed, 174 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8f1b2c6fdd..8bf284a5e1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -23,6 +23,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winreg.h" +#include <stdio.h> static HMODULE hdll; static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); @@ -74,12 +76,154 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, return TRUE; } +static int adapter_count = 0; +static int monitor_count = 0; + +static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) +{ + char video_name[16]; + char video_value[128]; + char buffer[128]; + int number; + int vendor_id; + int device_id; + int subsys_id; + int revision_id; + size_t length; + HKEY hkey; + HDC hdc; + DWORD size; + LSTATUS ls; + + adapter_count++; + + /* DeviceName */ + ok(sscanf(device->DeviceName, "\\\\.\\DISPLAY%d", &number) == 1, "#%d: wrong DeviceName %s\n", index, + device->DeviceName); + + /* DeviceKey */ + /* win7 is the only OS version where \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not in order with adapter index. */ + if (GetVersion() != 0x1db10106 || !strcmp(winetest_platform, "wine")) + { + sprintf(video_name, "\\Device\\Video%d", index); + ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); + todo_wine ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); + if (!ls) + { + memset(video_value, 0, sizeof(video_value)); + size = sizeof(video_value); + ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); + ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); + RegCloseKey(hkey); + ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); + } + } + else + ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, + "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); + + /* DeviceString */ + length = strlen(device->DeviceString); + ok(broken(length == 0) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ + length > 0, "#%d: expect DeviceString not empty\n", index); + + /* StateFlags */ + if (index == 0) + ok(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "#%d: adapter should be primary\n", index); + else + ok(!(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "#%d: adapter should not be primary\n", index); + + if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + /* Test creating DC */ + hdc = CreateDCA(device->DeviceName, NULL, NULL, NULL); + ok(hdc != NULL, "#%d: failed to CreateDC(\"%s\") err=%d\n", index, device->DeviceName, GetLastError()); + DeleteDC(hdc); + } + + /* DeviceID */ + /* DeviceID should equal to the first string of HardwareID value data in PCI GPU instance. You can verify this + * by changing the data and rerun EnumDisplayDevices. But it's difficult to find corresponding PCI device on + * userland. So here we check the expected format instead. */ + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + todo_wine ok(strlen(device->DeviceID) == 0 || /* vista+ */ + sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", + &vendor_id, &device_id, &subsys_id, &revision_id) == 4, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ + "#%d: got %s\n", index, device->DeviceID); + else + { + todo_wine ok(broken(strlen(device->DeviceID) == 0) || /* XP on Testbot returns an empty string, whereas real machine doesn't */ + sscanf(device->DeviceID, "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X", &vendor_id, &device_id, &subsys_id, + &revision_id) == 4, "#%d: wrong DeviceID %s\n", index, device->DeviceID); + } +} + +static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, + const DISPLAY_DEVICEA *device, DWORD flags) +{ + static const char device_id_prefix[] = "MONITOR\\Default_Monitor\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; + static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" + "\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; + char monitor_name[32]; + char buffer[128]; + int number; + + monitor_count++; + + /* DeviceName */ + lstrcpyA(monitor_name, adapter_name); + sprintf(monitor_name + strlen(monitor_name), "\\Monitor%d", monitor_index); + todo_wine ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); + + /* DeviceString */ + ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); + + /* StateFlags */ + if (adapter_index == 0 && monitor_index == 0) + todo_wine ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); + else + ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, + device->StateFlags); + + /* DeviceID */ + lstrcpynA(buffer, device->DeviceID, sizeof(device_id_prefix)); + if (flags & EDD_GET_DEVICE_INTERFACE_NAME) + { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR + * ^ ^ ^ + * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ + todo_wine ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ + sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ + (!lstrcmpiA(buffer, device_id_prefix) && + sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ + "#%d: wrong DeviceID : %s \n", monitor_index, device->DeviceID); + } + else + { + /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ + /* But we don't know which monitor instance this belongs to, so check format instead */ + todo_wine ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + todo_wine ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + } + + /* DeviceKey */ + lstrcpynA(buffer, device->DeviceKey, sizeof(device_key_prefix)); + todo_wine ok(!lstrcmpiA(buffer, device_key_prefix), "#%d: wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); + todo_wine ok(sscanf(device->DeviceKey + sizeof(device_key_prefix) - 1, "%04d", &number) == 1, + "#%d wrong DeviceKey : %s\n", monitor_index, device->DeviceKey); +} + static void test_enumdisplaydevices(void) { + static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; DISPLAY_DEVICEA dd; char primary_device_name[32]; char primary_monitor_device_name[32]; - DWORD primary_num = -1, num = 0; + char adapter_name[32]; + int number; + int flag_index; + int adapter_index; + int monitor_index; BOOL ret; if (!pEnumDisplayDevicesA) @@ -88,34 +232,44 @@ static void test_enumdisplaydevices(void) return; } + /* Doesn't accept \\.\DISPLAY */ dd.cb = sizeof(dd); - while(1) - { - BOOL ret; - HDC dc; - ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); - if(!ret) break; - if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - strcpy(primary_device_name, dd.DeviceName); - primary_num = num; - } - if(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ret = pEnumDisplayDevicesA("\\\\.\\DISPLAY", 0, &dd, 0); + todo_wine ok(!ret, "Expect failure\n"); + + /* Enumeration */ + for (flag_index = 0; flag_index < ARRAY_SIZE(flags); flag_index++) + for (adapter_index = 0; pEnumDisplayDevicesA(NULL, adapter_index, &dd, flags[flag_index]); adapter_index++) { - /* test creating DC */ - dc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); - ok(dc != NULL, "Failed to CreateDC(\"%s\") err=%d\n", dd.DeviceName, GetLastError()); - DeleteDC(dc); + lstrcpyA(adapter_name, dd.DeviceName); + + if (sscanf(adapter_name, "\\\\.\\DISPLAYV%d", &number) == 1) + { + skip("Skipping software devices %s:%s\n", adapter_name, dd.DeviceString); + continue; + } + + test_enumdisplaydevices_adapter(adapter_index, &dd, flags[flag_index]); + + for (monitor_index = 0; pEnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); + monitor_index++) + test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); } - num++; - } - if (primary_num == -1 || !pEnumDisplayMonitors || !pGetMonitorInfoA) + ok(adapter_count > 0, "Expect at least one adapter found\n"); + /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ + ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); + + if (!pEnumDisplayMonitors || !pGetMonitorInfoA) { win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); return; } + ret = pEnumDisplayDevicesA(NULL, 0, &dd, 0); + ok(ret, "Expect success\n"); + lstrcpyA(primary_device_name, dd.DeviceName); + primary_monitor_device_name[0] = 0; ret = pEnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); ok(ret, "EnumDisplayMonitors failed\n"); -- 2.20.1

1 0

[PATCH 1/5] include: Add EnumDisplayDevices flags.
by Zhiyi Zhang 21 Feb '19

21 Feb '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/wingdi.h | 6 +++++- include/winuser.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 1851654194..11d55c602e 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,13 +3318,17 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +/* DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 + typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { POINTL PathSourceSize; diff --git a/include/winuser.h b/include/winuser.h index 693965a03e..6300cc9a39 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1082,6 +1082,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used by EnumDisplayDevices */ +#define EDD_GET_DEVICE_INTERFACE_NAME 0x00000001 + #define EDS_RAWMODE 0x00000002 #define EDS_ROTATEDMODE 0x00000004 -- 2.20.1

1 0

[PATCH] [PATCH v2] wmvcore: Add stub for WMCheckURlExtension
by Vijay Kiran Kamuju 21 Feb '19

21 Feb '19

V2: Added tests Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++++++++++++++- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ include/wmsdkidl.idl | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index b11a5bf7dea9..af6d32a78efb 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -18,7 +18,7 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/test.h" @@ -232,6 +232,26 @@ static void test_WMCreateWriterPriv(void) IWMWriter_Release(writer2); } +static void test_urlextension(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; + const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; + const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; + + hr = WMCheckURLExtension(NULL); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mkvfile); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mp3file); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(urlfile); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(testurl); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); +} + START_TEST(wmvcore) { HRESULT hr; @@ -245,6 +265,7 @@ START_TEST(wmvcore) test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); + test_urlextension(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index f3e3b6412274..61c3c0885249 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,4 +1,4 @@ -@ stub WMCheckURLExtension +@ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) @ stub WMCreateBackupRestorerPrivate @ stub WMCreateSyncReaderPriv diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 690885e8612d..14014ee59ace 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } +HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) +{ + FIXME("(%s): stub\n", wine_dbgstr_w(url)); + + if (!url) + return E_INVALIDARG; + + return NS_E_INVALID_NAME; +} + HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) { FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5bc85465e1b2..bb7bfee4f8bc 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown [in] DWORD flags); }; +cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") +cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);") -- 2.17.0

1 0

[PATCH] [PATCH v2] wmvcore: Add stub for WMCheckURlExtension
by Vijay Kiran Kamuju 21 Feb '19

21 Feb '19

1 0

[PATCH v2 1/5] quartz/tests/filesource: Add some tests for IBaseFilter_EnumPins().
by Zebediah Figura 21 Feb '19

21 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filesource.c | 160 +++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index b9040e26d6..9781a83792 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -23,6 +23,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + static IBaseFilter *create_file_source(void) { IBaseFilter *filter = NULL; @@ -32,6 +34,50 @@ static IBaseFilter *create_file_source(void) return filter; } +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + +static void load_file(IBaseFilter *filter, const WCHAR *filename) +{ + IFileSourceFilter *filesource; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFileSourceFilter_Load(filesource, filename, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFileSourceFilter_Release(filesource); +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -192,11 +238,125 @@ static void test_file_source_filter(void) } } +static void test_enum_pins(void) +{ + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_file_source(); + IEnumPins *enum1, *enum2; + IPin *pins[2]; + ULONG count; + HRESULT hr; + ULONG ref; + BOOL ret; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + load_file(filter, filename); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filesource) { CoInitialize(NULL); test_interfaces(); + test_enum_pins(); test_file_source_filter(); CoUninitialize(); -- 2.20.1

1 4

[PATCH 1/5] quartz/tests/filesource: Add some tests for IBaseFilter_EnumPins().
by Zebediah Figura 21 Feb '19

21 Feb '19

2 5

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 21 Feb '19

21 Feb '19

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2019