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

Alexandre Julliard : kernel32: Fix handling of LOAD_WITH_ALTERED_SEARCH_PATH when other search flags are specified.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 0d9d816fc352a556f1d00fde5a5e0e52e35e1ddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9d816fc352a556f1d00fde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 21:01:34 2019 +0200 kernel32: Fix handling of LOAD_WITH_ALTERED_SEARCH_PATH when other search flags are specified. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46809 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 13 +++++++++++-- dlls/kernel32/tests/module.c | 25 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 1ea7b0e..386a7c2 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -941,11 +941,20 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) const DWORD unsupported_flags = (LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET); - if (!(flags & load_library_search_flags)) flags |= default_search_flags; - if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); + if (flags & LOAD_WITH_ALTERED_SEARCH_PATH) + { + if (flags & load_library_search_flags) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (default_search_flags) flags |= default_search_flags | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; + } + else if (!(flags & load_library_search_flags)) flags |= default_search_flags; + if (flags & load_library_search_flags) load_path = get_dll_load_path_search_flags( libname->Buffer, flags ); else diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index c059b98..a8cdc3d 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -565,6 +565,31 @@ static void test_LoadLibraryEx_search_flags(void) mod = LoadLibraryExA( path, 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); ok( mod != NULL, "LoadLibrary failed err %u\n", GetLastError() ); FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_WITH_ALTERED_SEARCH_PATH ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); } SetCurrentDirectoryA( curdir );

1 0

Piotr Caban : msvcp: Fix _Lockit::_Lockit_ctor and _Lockit:: _Lockit_dtor implementation.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 2513b09c3cdf8d261f1561c4e99e501f674e5887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2513b09c3cdf8d261f1561c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 18:56:03 2019 +0200 msvcp: Fix _Lockit::_Lockit_ctor and _Lockit::_Lockit_dtor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/misc.c | 55 ++++++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 4 ++-- 7 files changed, 42 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2513b09c3cdf8d261f15…

1 0

Piotr Caban : msvcp: Add _Init_locks class implementation.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: c5530b276daf619f22fc3e1b0542efecbe30b47b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5530b276daf619f22fc3e1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 18:56:09 2019 +0200 msvcp: Add _Init_locks class implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46982 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 16 +++++----- dlls/msvcp110/msvcp110.spec | 20 ++++++------ dlls/msvcp120/msvcp120.spec | 20 ++++++------ dlls/msvcp120_app/msvcp120_app.spec | 20 ++++++------ dlls/msvcp140/msvcp140.spec | 20 ++++++------ dlls/msvcp60/main.c | 4 +-- dlls/msvcp60/msvcp.h | 8 +++++ dlls/msvcp80/msvcp80.spec | 16 +++++----- dlls/msvcp90/misc.c | 61 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 10 ++++-- dlls/msvcp90/msvcp90.spec | 16 +++++----- dlls/msvcp90/msvcp_main.c | 4 +-- 12 files changed, 137 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5530b276daf619f22fc…

1 0

Rémi Bernon : kernel32/tests: Fix NtAllocateVirtualMemory tests results on w1064v1809.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 4d5c874f42e27ac992f361c71490985d7553571a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d5c874f42e27ac992f361c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 12:01:58 2019 +0200 kernel32/tests: Fix NtAllocateVirtualMemory tests results on w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4749556..d797df2 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -456,12 +456,13 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); - /* 21 zero bits is valid */ + /* 21 zero bits never succeeds */ size = 0x1000; addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + todo_wine + ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); @@ -470,7 +471,8 @@ static void test_VirtualAlloc(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ @@ -484,8 +486,8 @@ static void test_VirtualAlloc(void) addr2 = (char *)addr1 + 0x1000; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); - todo_wine - ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status); + ok(status == STATUS_INVALID_PARAMETER_5 || status == STATUS_INVALID_PARAMETER, + "NtAllocateVirtualMemory returned %08x\n", status); ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); }

1 0

Zebediah Figura : ntoskrnl.exe: Free device IDs from pool.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 533a426d145144f79e2e81d70e5b28f530b00926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533a426d145144f79e2e81d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:12 2019 -0500 ntoskrnl.exe: Free device IDs from pool. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 23ae4ca..d8f74e0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -301,7 +301,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) if (get_driver_for_id( ptr, driver )) break; } - RtlFreeHeap( GetProcessHeap(), 0, ids ); + ExFreePool( ids ); if (!driver[0]) { @@ -409,7 +409,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP else status = STATUS_BUFFER_TOO_SMALL; - HeapFree( GetProcessHeap(), 0, id ); + ExFreePool( id ); break; } case DevicePropertyPhysicalDeviceObjectName: @@ -658,17 +658,17 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla HeapFree( GetProcessHeap(), 0, id ); if (!rc) { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } else { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL;

1 0

Zebediah Figura : winebus.sys: Allocate IRP return buffers from paged pool.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: eebb1d99318b8e165ff73647097251b5c4586861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eebb1d99318b8e165ff73647… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:13 2019 -0500 winebus.sys: Allocate IRP return buffers from paged pool. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 7207e14..b649bfb 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -149,7 +149,7 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) DWORD len = strlenW(ext->busid) + strlenW(serial) + 64; WCHAR *dst; - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { if (ext->input == (WORD)-1) { @@ -176,7 +176,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) DWORD len = strlenW(ext->busid) + 34; WCHAR *dst; - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { if (ext->input == (WORD)-1) { @@ -197,7 +197,7 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; - if ((dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) { strcpyW(dst, ext->busid); dst[strlenW(dst) + 1] = 0; @@ -387,8 +387,7 @@ static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) struct pnp_device *ptr; EnterCriticalSection(&device_list_cs); - *devices = HeapAlloc(GetProcessHeap(), 0, sizeof(DEVICE_RELATIONS) + - list_count(&pnp_devset) * sizeof (void *)); + *devices = ExAllocatePool(PagedPool, offsetof(DEVICE_RELATIONS, Objects[list_count(&pnp_devset)])); if (!*devices) {

1 0

Zebediah Figura : hidclass.sys: Allocate IRP return buffers from paged pool.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 1e05e96c47f62b04e4409deccd5ffffef410bbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e05e96c47f62b04e4409dec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:14 2019 -0500 hidclass.sys: Allocate IRP return buffers from paged pool. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 363d82d..ce755e8 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -252,7 +252,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - WCHAR *id = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)*REGSTR_VAL_MAX_HCID_LEN); + WCHAR *id = ExAllocatePool(PagedPool, sizeof(WCHAR) * REGSTR_VAL_MAX_HCID_LEN); TRACE("IRP_MN_QUERY_ID[%i]\n", irpsp->Parameters.QueryId.IdType); switch (irpsp->Parameters.QueryId.IdType) {

1 0

Zebediah Figura : ntoskrnl.exe: Use SetupDiOpenDeviceInfo().
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 510261a4b4344be6833a0c3b0412461fec98ef43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=510261a4b4344be6833a0c3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:15 2019 -0500 ntoskrnl.exe: Use SetupDiOpenDeviceInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index d8f74e0..b88b9f1 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -623,7 +623,6 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla WCHAR *instance_id; DWORD required; HDEVINFO set; - BOOL rc; TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n", device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link); @@ -634,39 +633,11 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla status = get_instance_id( device, &instance_id ); if (status != STATUS_SUCCESS) return status; - rc = SetupDiCreateDeviceInfoW( set, instance_id, class_guid, NULL, NULL, 0, &sp_device ); - if (rc == 0) + if (!SetupDiCreateDeviceInfoW( set, instance_id, class_guid, NULL, NULL, 0, &sp_device ) + && !SetupDiOpenDeviceInfoW( set, instance_id, NULL, 0, &sp_device )) { - if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) - { - DWORD index = 0; - DWORD size = strlenW(instance_id) + 2; - WCHAR *id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); - do - { - rc = SetupDiEnumDeviceInfo( set, index, &sp_device ); - if (rc && IsEqualGUID( &sp_device.ClassGuid, class_guid )) - { - BOOL check; - check = SetupDiGetDeviceInstanceIdW( set, &sp_device, id, size, &required ); - if (check && strcmpW( id, instance_id ) == 0) - break; - } - index++; - } while (rc); - - HeapFree( GetProcessHeap(), 0, id ); - if (!rc) - { - ExFreePool( instance_id ); - return STATUS_UNSUCCESSFUL; - } - } - else - { - ExFreePool( instance_id ); - return STATUS_UNSUCCESSFUL; - } + ERR("Failed to create device %s, error %#x.\n", debugstr_w(instance_id), GetLastError()); + return GetLastError(); } ExFreePool( instance_id );

1 0

Zebediah Figura : ntoskrnl.exe: Correctly handle instance IDs.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 6c6aeea8a87e910f50ab412856c50b579927341d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6aeea8a87e910f50ab4128… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:16 2019 -0500 ntoskrnl.exe: Correctly handle instance IDs. The instance ID is only the third part of the "A\B\C" form, and must be combined with the device ID to form the whole name for setupapi (the "device instance ID"). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 8 +++++- dlls/hidclass.sys/pnp.c | 49 +++++++++++++++++-------------------- dlls/ntoskrnl.exe/pnp.c | 61 ++++++++++++++++++++++++++++------------------ dlls/winebus.sys/main.c | 40 +++++++++++++++--------------- 4 files changed, 85 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c6aeea8a87e910f50ab…

1 0

Nikolay Sivov : mf/tests: Add some more Video Processor tests.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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

1 0