February 2023 - Wine-commits

Brendan Shanks : ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 82c96f94840ae279fdcfe8e08c243dde89b72bbe URL: https://gitlab.winehq.org/wine/wine/-/commit/82c96f94840ae279fdcfe8e08c243d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 25 16:32:33 2022 -0700 ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31. --- dlls/ntdll/tests/virtual.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 6831fe3c522..a239a75ad47 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -1265,6 +1265,32 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL file image mapping */ + if (is_win64) + { + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + CloseHandle(file); + } + TerminateProcess(process, 0); CloseHandle(process); }

1 0

Brendan Shanks : ntdll: Respect zero_bits/limit when mapping a PE file.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: c4fba638942f975194704855f2bdf3d80714f020 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4fba638942f975194704855f2bdf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 19 14:01:49 2022 -0700 ntdll: Respect zero_bits/limit when mapping a PE file. --- dlls/ntdll/unix/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f6e8793396c..d4afb8cc2ad 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1923,6 +1923,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (limit && is_beyond_limit( base, size, (void *)limit )) + return STATUS_CONFLICTING_ADDRESSES; status = map_fixed_area( base, size, vprot ); if (status != STATUS_SUCCESS) return status; ptr = base;

1 0

Eric Pouech : include: Add manifest constants for EnumProcessModulesEx.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 20e7eb5eba8f20f7e050a12aa754e7a3473426fc URL: https://gitlab.winehq.org/wine/wine/-/commit/20e7eb5eba8f20f7e050a12aa754e7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:43 2023 +0100 include: Add manifest constants for EnumProcessModulesEx. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/psapi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/psapi.h b/include/psapi.h index 66e660b2435..6dcb783934e 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -137,6 +137,12 @@ extern "C" { #define GetProcessImageFileNameW K32GetProcessImageFileNameW #endif +/* filter flags for EnumProcessModulesEx */ +#define LIST_MODULES_32BIT 0x01 +#define LIST_MODULES_64BIT 0x02 +#define LIST_MODULES_ALL 0x03 +#define LIST_MODULES_DEFAULT 0x00 + BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*); BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD); BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD);

1 0

Eric Pouech : psapi: Let modules test pass on non wow64 compatible platforms.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: f0b22385053416d4372e299817f20c71237aabf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0b22385053416d4372e299817f20c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:44 2023 +0100 psapi: Let modules test pass on non wow64 compatible platforms. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 62 ++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 185a4062092..cd260a844b5 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -143,33 +143,41 @@ static void test_EnumProcessModules(void) strcpy(buffer, "C:\\windows\\syswow64\\notepad.exe"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed: %lu\n", GetLastError()); - - ret = WaitForInputIdle(pi.hProcess, 5000); - ok(!ret, "wait timed out\n"); - - SetLastError(0xdeadbeef); - hMod = NULL; - ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); - ok(ret == 1, "got %ld, error %lu\n", ret, GetLastError()); - ok(!!hMod, "expected non-NULL module\n"); - ok(cbNeeded % sizeof(hMod) == 0, "got %lu\n", cbNeeded); - - ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); - ok(ret, "got error %lu\n", GetLastError()); - ok(!strcmp(name, "notepad.exe"), "got %s\n", name); - - ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); - ok(ret, "got error %lu\n", GetLastError()); - ok(!strcmp(name, buffer), "got %s\n", name); - - ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); - ok(ret, "got error %lu\n", GetLastError()); - ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); - ok(info.SizeOfImage, "image size was 0\n"); - ok(info.EntryPoint >= info.lpBaseOfDll, "got entry point %p\n", info.EntryPoint); - - TerminateProcess(pi.hProcess, 0); + if (ret) + { + ret = WaitForInputIdle(pi.hProcess, 5000); + ok(!ret, "wait timed out\n"); + + SetLastError(0xdeadbeef); + hMod = NULL; + ret = EnumProcessModules(pi.hProcess, &hMod, sizeof(HMODULE), &cbNeeded); + ok(ret == 1, "got %ld, error %lu\n", ret, GetLastError()); + ok(!!hMod, "expected non-NULL module\n"); + ok(cbNeeded % sizeof(hMod) == 0, "got %lu\n", cbNeeded); + + ret = GetModuleBaseNameA(pi.hProcess, hMod, name, sizeof(name)); + ok(ret, "got error %lu\n", GetLastError()); + ok(!strcmp(name, "notepad.exe"), "got %s\n", name); + + ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); + ok(ret, "got error %lu\n", GetLastError()); + ok(!strcmp(name, buffer), "got %s\n", name); + + ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info)); + ok(ret, "got error %lu\n", GetLastError()); + ok(info.lpBaseOfDll == hMod, "expected %p, got %p\n", hMod, info.lpBaseOfDll); + ok(info.SizeOfImage, "image size was 0\n"); + ok(info.EntryPoint >= info.lpBaseOfDll, "got entry point %p\n", info.EntryPoint); + + TerminateProcess(pi.hProcess, 0); + } + else + { + if (GetLastError() == ERROR_FILE_NOT_FOUND) + skip("Skip wow64 test on non compatible platform\n"); + else + ok(ret, "CreateProcess failed: %lu\n", GetLastError()); + } } else if (wow64) {

1 0

Eric Pouech : psapi: Add tests for EnumProcessModulesEx().
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 84a9a1c8fbc1e8ccc9c34cf0db375813b3ac2955 URL: https://gitlab.winehq.org/wine/wine/-/commit/84a9a1c8fbc1e8ccc9c34cf0db3758… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:46 2023 +0100 psapi: Add tests for EnumProcessModulesEx(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 315 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+)

1 0

Eric Pouech : kernelbase: Implement EnumProcessModulesEx.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: c56971ffbd0c0bbe1658fa3badf5f787bc1ad182 URL: https://gitlab.winehq.org/wine/wine/-/commit/c56971ffbd0c0bbe1658fa3badf5f7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:47 2023 +0100 kernelbase: Implement EnumProcessModulesEx. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 149 +++++++++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 31 +++++---- 2 files changed, 159 insertions(+), 21 deletions(-)

1 0

Eric Pouech : kernelbase: Let GetModuleBaseName succeed on 64bit modules in wow64.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 07efff4e9ff3f3cb59da07c61ce80b25932ec957 URL: https://gitlab.winehq.org/wine/wine/-/commit/07efff4e9ff3f3cb59da07c61ce80b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:49 2023 +0100 kernelbase: Let GetModuleBaseName succeed on 64bit modules in wow64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 23 ++++++++++++++++------- dlls/psapi/tests/psapi_main.c | 1 - 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index c4c1bfa59e2..d34268c0828 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -876,6 +876,13 @@ static BOOL get_ldr_module32( HANDLE process, HMODULE module, LDR_DATA_TABLE_ENT struct module_iterator iter; INT ret; +#ifdef _WIN64 + if ((ULONG_PTR)module >> 32) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } +#endif if (!init_module_iterator( &iter, process, TRUE )) return FALSE; while ((ret = module_iterator_next( &iter )) > 0) @@ -1320,7 +1327,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameA( HANDLE process, HMODULE modul DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameW( HANDLE process, HMODULE module, WCHAR *name, DWORD size ) { - BOOL wow64; + BOOL wow64, found = FALSE; if (!IsWow64Process( process, &wow64 )) return 0; @@ -1328,13 +1335,15 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameW( HANDLE process, HMODULE modul { LDR_DATA_TABLE_ENTRY32 ldr_module32; - if (!get_ldr_module32(process, module, &ldr_module32)) return 0; - size = min( ldr_module32.BaseDllName.Length / sizeof(WCHAR), size ); - if (!ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.BaseDllName.Buffer, - name, size * sizeof(WCHAR), NULL )) - return 0; + if (get_ldr_module32(process, module, &ldr_module32)) + { + size = min( ldr_module32.BaseDllName.Length / sizeof(WCHAR), size ); + if (ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.BaseDllName.Buffer, + name, size * sizeof(WCHAR), NULL )) + found = TRUE; + } } - else + if (!found) { LDR_DATA_TABLE_ENTRY ldr_module; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 71eadc7114e..15b168cf83f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -241,7 +241,6 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap case LIST_MODULES_64BIT: break; } ret = GetModuleBaseNameA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); - todo_wine_if(fail) ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); todo_wine_if(fail)

1 0

Eric Pouech : kernelbase: Let GetModuleFileNameEx succeed on 64bit modules in wow64.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: c66e876037b06b6fcc6faf12400fe55321bbe72c URL: https://gitlab.winehq.org/wine/wine/-/commit/c66e876037b06b6fcc6faf12400fe5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:50 2023 +0100 kernelbase: Let GetModuleFileNameEx succeed on 64bit modules in wow64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 16 +++++++++------- dlls/psapi/tests/psapi_main.c | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index d34268c0828..fa2262daa2c 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1409,7 +1409,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExA( HANDLE process, HMODULE mod DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE module, WCHAR *name, DWORD size ) { - BOOL wow64; + BOOL wow64, found = FALSE; DWORD len; if (!size) return 0; @@ -1420,13 +1420,15 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE mod { LDR_DATA_TABLE_ENTRY32 ldr_module32; - if (!get_ldr_module32( process, module, &ldr_module32 )) return 0; - len = ldr_module32.FullDllName.Length / sizeof(WCHAR); - if (!ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.FullDllName.Buffer, - name, min( len, size ) * sizeof(WCHAR), NULL )) - return 0; + if (get_ldr_module32( process, module, &ldr_module32 )) + { + len = ldr_module32.FullDllName.Length / sizeof(WCHAR); + if (ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.FullDllName.Buffer, + name, min( len, size ) * sizeof(WCHAR), NULL )) + found = TRUE; + } } - else + if (!found) { LDR_DATA_TABLE_ENTRY ldr_module; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 15b168cf83f..2237bad3665 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -243,7 +243,6 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap ret = GetModuleBaseNameA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); - todo_wine_if(fail) ok(ret, "GetModuleFileNameEx failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); memset(&info, 0, sizeof(info)); ret = GetModuleInformation(proc, mxsnap[i].modules[j], &info, sizeof(info));

1 0

Eric Pouech : kernelbase: Let GetModuleInformation succeed on 64bit modules in wow64.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 115fbf632a98807062600c83d84b4bd2e41e82ab URL: https://gitlab.winehq.org/wine/wine/-/commit/115fbf632a98807062600c83d84b4b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:52 2023 +0100 kernelbase: Let GetModuleInformation succeed on 64bit modules in wow64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 15 +++++++++------ dlls/psapi/tests/psapi_main.c | 15 --------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index fa2262daa2c..6d8b9ad4b2c 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1458,7 +1458,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE mod */ BOOL WINAPI GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD count ) { - BOOL wow64; + BOOL wow64, found = FALSE; if (count < sizeof(MODULEINFO)) { @@ -1472,12 +1472,15 @@ BOOL WINAPI GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO *mo { LDR_DATA_TABLE_ENTRY32 ldr_module32; - if (!get_ldr_module32( process, module, &ldr_module32 )) return FALSE; - modinfo->lpBaseOfDll = (void *)(DWORD_PTR)ldr_module32.BaseAddress; - modinfo->SizeOfImage = ldr_module32.SizeOfImage; - modinfo->EntryPoint = (void *)(DWORD_PTR)ldr_module32.EntryPoint; + if (get_ldr_module32( process, module, &ldr_module32 )) + { + modinfo->lpBaseOfDll = (void *)(DWORD_PTR)ldr_module32.BaseAddress; + modinfo->SizeOfImage = ldr_module32.SizeOfImage; + modinfo->EntryPoint = (void *)(DWORD_PTR)ldr_module32.EntryPoint; + found = TRUE; + } } - else + if (!found) { LDR_DATA_TABLE_ENTRY ldr_module; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 2237bad3665..a106628a9ed 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -215,10 +215,6 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap MODULEINFO info; int i, j; BOOL ret; - BOOL fail, wow64; - - ret = IsWow64Process(proc, &wow64); - ok(ret, "IsWow64Process failed: %lu\n", GetLastError()); for (i = 0; i < numsnap; i++) { @@ -231,27 +227,16 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap mxsnap[i].num_modules = min(needed, sizeof(mxsnap[i].modules)) / sizeof(HMODULE); for (j = 0; j < mxsnap[i].num_modules; j++) { - /* temporary todo until GetModuleBaseName and friends are fixed */ - if ((fail = sizeof(void*) == 8 && wow64)) - switch (mxsnap[i].list) - { - case LIST_MODULES_32BIT: fail = FALSE; break; - case LIST_MODULES_DEFAULT: fail = j >= 1; break; - case LIST_MODULES_ALL: fail = j >= mxsnap[0].num_modules; break; - case LIST_MODULES_64BIT: break; - } ret = GetModuleBaseNameA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); ok(ret, "GetModuleFileNameEx failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); memset(&info, 0, sizeof(info)); ret = GetModuleInformation(proc, mxsnap[i].modules[j], &info, sizeof(info)); - todo_wine_if(fail) { ok(ret, "GetModuleInformation failed: %lu\n", GetLastError()); ok(info.lpBaseOfDll == mxsnap[i].modules[j], "expected %p, got %p\n", mxsnap[i].modules[j], info.lpBaseOfDll); ok(info.SizeOfImage, "image size was 0\n"); /* info.EntryPoint to be checked */ - } } winetest_pop_context(); }

1 0

Shaun Ren : winegstreamer: Add WG_MAJOR_TYPE_VIDEO_INDEO video type.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 32bb602393ef991fe0e9372612d212e0489ac87c URL: https://gitlab.winehq.org/wine/wine/-/commit/32bb602393ef991fe0e9372612d212… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jan 13 16:33:29 2023 -0500 winegstreamer: Add WG_MAJOR_TYPE_VIDEO_INDEO video type. --- dlls/winegstreamer/mfplat.c | 31 +++++++++++++++++++++++++++++++ dlls/winegstreamer/quartz_parser.c | 2 ++ dlls/winegstreamer/unixlib.h | 7 +++++++ dlls/winegstreamer/wg_format.c | 22 ++++++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 2 ++ dlls/winegstreamer/wm_reader.c | 4 ++++ 6 files changed, 68 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 79787cfafd4..34731a23e1e 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -38,6 +38,7 @@ DEFINE_GUID(DMOVideoFormat_RGB555,D3DFMT_X1R5G5B5,0x524f,0x11ce,0x9f,0x53,0x00,0 DEFINE_GUID(DMOVideoFormat_RGB8,D3DFMT_P8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); DEFINE_MEDIATYPE_GUID(MFAudioFormat_RAW_AAC,WAVE_FORMAT_RAW_AAC1); DEFINE_MEDIATYPE_GUID(MFVideoFormat_VC1S,MAKEFOURCC('V','C','1','S')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_IV50,MAKEFOURCC('I','V','5','0')); struct class_factory { @@ -557,6 +558,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: FIXME("Format %u not implemented!\n", format->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: @@ -810,6 +812,33 @@ static void mf_media_type_to_wg_format_video_h264(IMFMediaType *type, struct wg_ format->u.video_h264.level = level; } +static void mf_media_type_to_wg_format_video_indeo(IMFMediaType *type, uint32_t version, struct wg_format *format) +{ + UINT64 frame_rate, frame_size; + + memset(format, 0, sizeof(*format)); + format->major_type = WG_MAJOR_TYPE_VIDEO_INDEO; + + if (SUCCEEDED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size))) + { + format->u.video_indeo.width = frame_size >> 32; + format->u.video_indeo.height = (UINT32)frame_size; + } + + if (SUCCEEDED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &frame_rate)) && (UINT32)frame_rate) + { + format->u.video_indeo.fps_n = frame_rate >> 32; + format->u.video_indeo.fps_d = (UINT32)frame_rate; + } + else + { + format->u.video_indeo.fps_n = 1; + format->u.video_indeo.fps_d = 1; + } + + format->u.video_indeo.version = version; +} + void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) { GUID major_type, subtype; @@ -843,6 +872,8 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) { if (IsEqualGUID(&subtype, &MFVideoFormat_H264)) mf_media_type_to_wg_format_video_h264(type, format); + else if (IsEqualGUID(&subtype, &MFVideoFormat_IV50)) + mf_media_type_to_wg_format_video_indeo(type, 5, format); else mf_media_type_to_wg_format_video(type, &subtype, format); } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 5561b106327..c12e9ee3397 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -377,6 +377,7 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: FIXME("Format %u not implemented!\n", format->major_type); return 0; @@ -548,6 +549,7 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: FIXME("Format %u not implemented!\n", format->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 5c55fbfe229..19629d12fd0 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -43,6 +43,7 @@ struct wg_format WG_MAJOR_TYPE_VIDEO_CINEPAK, WG_MAJOR_TYPE_VIDEO_H264, WG_MAJOR_TYPE_VIDEO_WMV, + WG_MAJOR_TYPE_VIDEO_INDEO, } major_type; union @@ -133,6 +134,12 @@ struct wg_format uint32_t fps_n, fps_d; uint32_t version; } video_wmv; + struct + { + int32_t width, height; + uint32_t fps_n, fps_d; + uint32_t version; + } video_indeo; } u; }; diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index a7876977d6c..63f1e3931b5 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -573,6 +573,25 @@ static GstCaps *wg_format_to_caps_video_wmv(const struct wg_format *format) return caps; } +static GstCaps *wg_format_to_caps_video_indeo(const struct wg_format *format) +{ + GstCaps *caps; + + if (!(caps = gst_caps_new_empty_simple("video/x-indeo"))) + return NULL; + + if (format->u.video_indeo.width) + gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video_indeo.width, NULL); + if (format->u.video_indeo.height) + gst_caps_set_simple(caps, "height", G_TYPE_INT, format->u.video_indeo.height, NULL); + if (format->u.video_indeo.fps_d || format->u.video_indeo.fps_n) + gst_caps_set_simple(caps, "framerate", GST_TYPE_FRACTION, format->u.video_indeo.fps_n, format->u.video_indeo.fps_d, NULL); + if (format->u.video_indeo.version) + gst_caps_set_simple(caps, "indeoversion", G_TYPE_INT, format->u.video_indeo.version, NULL); + + return caps; +} + GstCaps *wg_format_to_caps(const struct wg_format *format) { switch (format->major_type) @@ -595,6 +614,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) return wg_format_to_caps_video_h264(format); case WG_MAJOR_TYPE_VIDEO_WMV: return wg_format_to_caps_video_wmv(format); + case WG_MAJOR_TYPE_VIDEO_INDEO: + return wg_format_to_caps_video_indeo(format); } assert(0); return NULL; @@ -612,6 +633,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: GST_FIXME("Format %u not implemented!", a->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index f4244708a8f..65a34511284 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -427,6 +427,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_AUDIO_MPEG4: case WG_MAJOR_TYPE_AUDIO_WMA: case WG_MAJOR_TYPE_VIDEO_CINEPAK: + case WG_MAJOR_TYPE_VIDEO_INDEO: if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) || !transform_append_element(transform, element, &first, &last)) { @@ -482,6 +483,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_UNKNOWN: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 50e2c5fc175..736dbba452c 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1579,6 +1579,8 @@ static const char *get_major_type_string(enum wg_major_type type) return "h264"; case WG_MAJOR_TYPE_VIDEO_WMV: return "wmv"; + case WG_MAJOR_TYPE_VIDEO_INDEO: + return "indeo"; case WG_MAJOR_TYPE_UNKNOWN: return "unknown"; } @@ -1934,6 +1936,7 @@ static HRESULT WINAPI reader_GetOutputFormat(IWMSyncReader2 *iface, case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: FIXME("Format %u not implemented!\n", format.major_type); break; case WG_MAJOR_TYPE_UNKNOWN: @@ -1975,6 +1978,7 @@ static HRESULT WINAPI reader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD o case WG_MAJOR_TYPE_VIDEO_CINEPAK: case WG_MAJOR_TYPE_VIDEO_H264: case WG_MAJOR_TYPE_VIDEO_WMV: + case WG_MAJOR_TYPE_VIDEO_INDEO: FIXME("Format %u not implemented!\n", format.major_type); /* fallthrough */ case WG_MAJOR_TYPE_AUDIO:

1 0