February 2021 - Wine-devel - list.winehq.org

[PATCH] reg/tests: Add initial syntax tests for 'reg copy'
by hugh.mcmaster＠outlook.com 09 Feb '21

09 Feb '21

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/reg.c | 80 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ea4e128da5a..afba8424c1a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -21,7 +21,8 @@ #include "wine/test.h" #define lok ok_(__FILE__,line) -#define KEY_BASE "Software\\Wine\\reg_test" +#define KEY_WINE "Software\\Wine" +#define KEY_BASE KEY_WINE "\\reg_test" #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 #define TODO_REG_TYPE (0x0001u) @@ -4684,6 +4685,82 @@ static void test_export(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } +#define COPY_DEST KEY_WINE "\\reg_copy" + +static void test_copy(void) +{ + DWORD r; + + run_reg_exe("reg copy", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /h", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy /? /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /? /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /h /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /s /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE" /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" COPY_DEST " HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST "/f /a", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4702,4 +4779,5 @@ START_TEST(reg) test_unicode_import_with_whitespace(); test_import_31(); test_export(); + test_copy(); } -- 2.30.0

1 0

[PATCH v2 1/3] user32/tests: Add more tests for GetKeyState from background thread.
by Rémi Bernon 09 Feb '21

09 Feb '21

It looks like that GetKeyState is supposed to catch key presses when called from a background thread even after its thread message queue and thread input structures have been created. This happens in Bioshock 2 Remaster, and causes the game to stay forever on a "Press space to continue" screen, as the thread checking for space key press calls GetKeyState repeatedly (and PeekMessage), although it's in background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix PATCH 2 todo_wine, skip the test on non-us keyboards. dlls/user32/tests/input.c | 145 +++++++++++++++++++++++++++++--------- 1 file changed, 111 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1249f8cf5a1..1ca836b9cdd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3715,74 +3715,151 @@ static void test_attach_input(void) DestroyWindow(Wnd2); } +struct get_key_state_test_desc +{ + BOOL peek_message; + BOOL peek_message_main; +}; + +struct get_key_state_test_desc get_key_state_tests[] = +{ + /* 0: not peeking in thread, no msg queue: GetKeyState misses key press */ + {FALSE, TRUE}, + /* 1: peeking on thread init, not in main: GetKeyState catches key press */ + { TRUE, FALSE}, + /* 2: peeking on thread init, and in main: GetKeyState catches key press */ + { TRUE, TRUE}, +}; + +struct get_key_state_thread_params +{ + HANDLE semaphores[2]; + int index; +}; + static DWORD WINAPI get_key_state_thread(void *arg) { - HANDLE *semaphores = arg; + struct get_key_state_thread_params *params = arg; + struct get_key_state_test_desc* test; + HANDLE *semaphores = params->semaphores; DWORD result; + BOOL has_queue; + MSG msg; + int i = params->index; + test = get_key_state_tests + i; + has_queue = test->peek_message; + + if (test->peek_message) + { + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + ok(!is_keyboard_message(msg.message), "%d: PeekMessageA got keyboard message.\n", i); + } + + /* initialization */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - result = GetKeyState('X'); - ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ - "expected that highest bit is set, got %x\n", result); + /* key pressed */ + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + result = GetKeyState('X'); + if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); result = GetKeyState('X'); - ok(!(result & 0x8000), "expected that highest bit is unset, got %x\n", result); - - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); return 0; } static void test_GetKeyState(void) { - HANDLE semaphores[2]; + struct get_key_state_thread_params params; HANDLE thread; DWORD result; HWND hwnd; + MSG msg; + int i; - semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); - semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + skip("skipping test with inconsistent results on non-us keyboard\n"); + return; + } + + params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + empty_message_queue(); - thread = CreateThread(NULL, 0, get_key_state_thread, semaphores, 0, NULL); - ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + for (i = 0; i < ARRAY_SIZE(get_key_state_tests); ++i) + { + struct get_key_state_test_desc* test = get_key_state_tests + i; - SetForegroundWindow(hwnd); - SetFocus(hwnd); - keybd_event('X', 0, 0, 0); + params.index = i; + thread = CreateThread(NULL, 0, get_key_state_thread, &params, 0, NULL); + ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* initialization */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + SetForegroundWindow(hwnd); + SetFocus(hwnd); + empty_message_queue(); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(thread, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - CloseHandle(thread); + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + /* key pressed */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + + keybd_event('X', 0, 0, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + result = GetKeyState('X'); + if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + /* key released */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + + keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + result = GetKeyState('X'); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + CloseHandle(thread); + } DestroyWindow(hwnd); - CloseHandle(semaphores[0]); - CloseHandle(semaphores[1]); + CloseHandle(params.semaphores[0]); + CloseHandle(params.semaphores[1]); } static void test_OemKeyScan(void) -- 2.30.0

2 5

[PATCH] wbemprox: Implement Win32_LogicalDisk.Caption.
by Hans Leidekker 09 Feb '21

09 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50643 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b86326327fb..498e3f6fc79 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -177,6 +177,7 @@ static const struct column col_ip4routetable[] = }; static const struct column col_logicaldisk[] = { + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"DriveType", CIM_UINT32 }, { L"FileSystem", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -585,6 +586,7 @@ struct record_ip4routetable }; struct record_logicaldisk { + const WCHAR *caption; const WCHAR *device_id; UINT32 drivetype; const WCHAR *filesystem; @@ -2501,6 +2503,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr rec = (struct record_logicaldisk *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), L"%c:", 'A' + i ); + rec->caption = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id ); rec->drivetype = type; rec->filesystem = get_filesystem( root ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a0488f40e52..b5de00b5dec 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1905,6 +1905,33 @@ static void test_SystemRestore( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_LogicalDisk( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1955,6 +1982,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_LogicalDisk( services ); test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); -- 2.30.0

1 0

[tools 1/2] testbot/reporttest: Fix the test stubs.
by Francois Gouget 09 Feb '21

09 Feb '21

Fix the generated source file path and automatically select the dlls or programs root directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This just fixes the source file path which normally does not matter much in these tests. Still this patch makes stubs perfect so there is no reason to avoid or suspect them anymore. testbot/src/reporttest/report.template | 1 + testbot/src/reporttest/reporttest.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 8da3d82a6..0a8f08720 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -210,6 +210,7 @@ Dll info: Test output: stub advapi32:cred ----- WTBS Simple test patch +----- Stubs automatically generate a successful dlls or programs test. ----- Expected assessement: Success advapi32:crypt start dlls/advapi32/tests/crypt.c - diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index d2364c94e..67dca248b 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -240,6 +240,9 @@ int main(int argc, char** argv) } else if (strncmp(line, "stub ", 5) == 0) { + char* root; + char* module = line + 5; + int dirlen; char* unit = strchr(line, ':'); if (!unit) { @@ -249,12 +252,22 @@ int main(int argc, char** argv) } *unit = '\0'; unit++; - unit[strlen(unit)-1] = '\0'; - fprintf(logfile, "%s:%s start fake/%s/%s.c -\n", line+5, unit, line+5, unit); + unit[strlen(unit)-1] = '\0'; /* strip the \r */ + + dirlen = strlen(module); + if (strstr(module, ".exe")) + { + dirlen -= 4; + root = "programs"; + } + else + root = strstr(module, ".com") ? "programs" : "dlls"; + + fprintf(logfile, "%s:%s start %s/%.*s/tests/%s.c -\n", module, unit, root, dirlen, module, unit); fprintf(logfile, "----- A standard successful test unit\n"); fprintf(logfile, "----- Expected assessment: Success\n"); fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit); - fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", line+5, unit); + fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", module, unit); } else { -- 2.20.1

1 1

[tools] testbot/reporttest: Add TestWTBS information.
by Francois Gouget 09 Feb '21

09 Feb '21

Embed TestWTBS directives and add a --testwtbs option to output the directives instead of the regular report. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Sending as an attachment to protect the diacritic characters. testbot/src/reporttest/Makefile | 2 +- testbot/src/reporttest/report.testwtbs | 70 ++++++++++++++++++++++++++ testbot/src/reporttest/reporttest.c | 18 +++++-- testbot/src/reporttest/reporttest.rc | 1 + 4 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 testbot/src/reporttest/report.testwtbs

1 0

[tools] testbot/reporttest: Fix the diacritic test.
by Francois Gouget 09 Feb '21

09 Feb '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I forgot to put the original patch as an attachment and so the diacritic characters got mangled in the mail. But it was a new line so the patch still applied. testbot/src/reporttest/report.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/7] vcomp100: Share the source with vcomp.
by Paul Gofman 09 Feb '21

09 Feb '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/vcomp100/Makefile.in | 7 ++ dlls/vcomp100/vcomp100.spec | 202 ++++++++++++++++++------------------ 2 files changed, 108 insertions(+), 101 deletions(-) diff --git a/dlls/vcomp100/Makefile.in b/dlls/vcomp100/Makefile.in index 57ceface8f0..4524a2d47cd 100644 --- a/dlls/vcomp100/Makefile.in +++ b/dlls/vcomp100/Makefile.in @@ -1 +1,8 @@ MODULE = vcomp100.dll + +EXTRADLLFLAGS = -mno-cygwin + +PARENTSRC = ../vcomp + +C_SRCS = \ + main.c diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index afea2f2af65..f2231c0de24 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -1,112 +1,112 @@ -@ cdecl _vcomp_atomic_add_i1(ptr long) vcomp._vcomp_atomic_add_i1 -@ cdecl _vcomp_atomic_add_i2(ptr long) vcomp._vcomp_atomic_add_i2 -@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 -@ cdecl _vcomp_atomic_add_i8(ptr int64) vcomp._vcomp_atomic_add_i8 -@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 -@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 -@ cdecl _vcomp_atomic_and_i1(ptr long) vcomp._vcomp_atomic_and_i1 -@ cdecl _vcomp_atomic_and_i2(ptr long) vcomp._vcomp_atomic_and_i2 -@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 -@ cdecl _vcomp_atomic_and_i8(ptr int64) vcomp._vcomp_atomic_and_i8 -@ cdecl _vcomp_atomic_div_i1(ptr long) vcomp._vcomp_atomic_div_i1 -@ cdecl _vcomp_atomic_div_i2(ptr long) vcomp._vcomp_atomic_div_i2 -@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 -@ cdecl _vcomp_atomic_div_i8(ptr int64) vcomp._vcomp_atomic_div_i8 -@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 -@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 -@ cdecl _vcomp_atomic_div_ui1(ptr long) vcomp._vcomp_atomic_div_ui1 -@ cdecl _vcomp_atomic_div_ui2(ptr long) vcomp._vcomp_atomic_div_ui2 -@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 -@ cdecl _vcomp_atomic_div_ui8(ptr int64) vcomp._vcomp_atomic_div_ui8 -@ cdecl _vcomp_atomic_mul_i1(ptr long) vcomp._vcomp_atomic_mul_i1 -@ cdecl _vcomp_atomic_mul_i2(ptr long) vcomp._vcomp_atomic_mul_i2 -@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 -@ cdecl _vcomp_atomic_mul_i8(ptr int64) vcomp._vcomp_atomic_mul_i8 -@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 -@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 -@ cdecl _vcomp_atomic_or_i1(ptr long) vcomp._vcomp_atomic_or_i1 -@ cdecl _vcomp_atomic_or_i2(ptr long) vcomp._vcomp_atomic_or_i2 -@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 -@ cdecl _vcomp_atomic_or_i8(ptr int64) vcomp._vcomp_atomic_or_i8 -@ cdecl _vcomp_atomic_shl_i1(ptr long) vcomp._vcomp_atomic_shl_i1 -@ cdecl _vcomp_atomic_shl_i2(ptr long) vcomp._vcomp_atomic_shl_i2 -@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 -@ cdecl _vcomp_atomic_shl_i8(ptr long) vcomp._vcomp_atomic_shl_i8 -@ cdecl _vcomp_atomic_shr_i1(ptr long) vcomp._vcomp_atomic_shr_i1 -@ cdecl _vcomp_atomic_shr_i2(ptr long) vcomp._vcomp_atomic_shr_i2 -@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 -@ cdecl _vcomp_atomic_shr_i8(ptr long) vcomp._vcomp_atomic_shr_i8 -@ cdecl _vcomp_atomic_shr_ui1(ptr long) vcomp._vcomp_atomic_shr_ui1 -@ cdecl _vcomp_atomic_shr_ui2(ptr long) vcomp._vcomp_atomic_shr_ui2 -@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 -@ cdecl _vcomp_atomic_shr_ui8(ptr long) vcomp._vcomp_atomic_shr_ui8 -@ cdecl _vcomp_atomic_sub_i1(ptr long) vcomp._vcomp_atomic_sub_i1 -@ cdecl _vcomp_atomic_sub_i2(ptr long) vcomp._vcomp_atomic_sub_i2 -@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 -@ cdecl _vcomp_atomic_sub_i8(ptr int64) vcomp._vcomp_atomic_sub_i8 -@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 -@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 -@ cdecl _vcomp_atomic_xor_i1(ptr long) vcomp._vcomp_atomic_xor_i1 -@ cdecl _vcomp_atomic_xor_i2(ptr long) vcomp._vcomp_atomic_xor_i2 -@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 -@ cdecl _vcomp_atomic_xor_i8(ptr int64) vcomp._vcomp_atomic_xor_i8 -@ cdecl _vcomp_barrier() vcomp._vcomp_barrier +@ cdecl _vcomp_atomic_add_i1(ptr long) +@ cdecl _vcomp_atomic_add_i2(ptr long) +@ cdecl _vcomp_atomic_add_i4(ptr long) +@ cdecl _vcomp_atomic_add_i8(ptr int64) +@ cdecl _vcomp_atomic_add_r4(ptr float) +@ cdecl _vcomp_atomic_add_r8(ptr double) +@ cdecl _vcomp_atomic_and_i1(ptr long) +@ cdecl _vcomp_atomic_and_i2(ptr long) +@ cdecl _vcomp_atomic_and_i4(ptr long) +@ cdecl _vcomp_atomic_and_i8(ptr int64) +@ cdecl _vcomp_atomic_div_i1(ptr long) +@ cdecl _vcomp_atomic_div_i2(ptr long) +@ cdecl _vcomp_atomic_div_i4(ptr long) +@ cdecl _vcomp_atomic_div_i8(ptr int64) +@ cdecl _vcomp_atomic_div_r4(ptr float) +@ cdecl _vcomp_atomic_div_r8(ptr double) +@ cdecl _vcomp_atomic_div_ui1(ptr long) +@ cdecl _vcomp_atomic_div_ui2(ptr long) +@ cdecl _vcomp_atomic_div_ui4(ptr long) +@ cdecl _vcomp_atomic_div_ui8(ptr int64) +@ cdecl _vcomp_atomic_mul_i1(ptr long) +@ cdecl _vcomp_atomic_mul_i2(ptr long) +@ cdecl _vcomp_atomic_mul_i4(ptr long) +@ cdecl _vcomp_atomic_mul_i8(ptr int64) +@ cdecl _vcomp_atomic_mul_r4(ptr float) +@ cdecl _vcomp_atomic_mul_r8(ptr double) +@ cdecl _vcomp_atomic_or_i1(ptr long) +@ cdecl _vcomp_atomic_or_i2(ptr long) +@ cdecl _vcomp_atomic_or_i4(ptr long) +@ cdecl _vcomp_atomic_or_i8(ptr int64) +@ cdecl _vcomp_atomic_shl_i1(ptr long) +@ cdecl _vcomp_atomic_shl_i2(ptr long) +@ cdecl _vcomp_atomic_shl_i4(ptr long) +@ cdecl _vcomp_atomic_shl_i8(ptr long) +@ cdecl _vcomp_atomic_shr_i1(ptr long) +@ cdecl _vcomp_atomic_shr_i2(ptr long) +@ cdecl _vcomp_atomic_shr_i4(ptr long) +@ cdecl _vcomp_atomic_shr_i8(ptr long) +@ cdecl _vcomp_atomic_shr_ui1(ptr long) +@ cdecl _vcomp_atomic_shr_ui2(ptr long) +@ cdecl _vcomp_atomic_shr_ui4(ptr long) +@ cdecl _vcomp_atomic_shr_ui8(ptr long) +@ cdecl _vcomp_atomic_sub_i1(ptr long) +@ cdecl _vcomp_atomic_sub_i2(ptr long) +@ cdecl _vcomp_atomic_sub_i4(ptr long) +@ cdecl _vcomp_atomic_sub_i8(ptr int64) +@ cdecl _vcomp_atomic_sub_r4(ptr float) +@ cdecl _vcomp_atomic_sub_r8(ptr double) +@ cdecl _vcomp_atomic_xor_i1(ptr long) +@ cdecl _vcomp_atomic_xor_i2(ptr long) +@ cdecl _vcomp_atomic_xor_i4(ptr long) +@ cdecl _vcomp_atomic_xor_i8(ptr int64) +@ cdecl _vcomp_barrier() @ stub _vcomp_copyprivate_broadcast @ stub _vcomp_copyprivate_receive -@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect -@ cdecl _vcomp_flush() vcomp._vcomp_flush -@ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init +@ cdecl _vcomp_enter_critsect(ptr) +@ cdecl _vcomp_flush() +@ cdecl _vcomp_for_dynamic_init(long long long long long) @ stub _vcomp_for_dynamic_init_i8 -@ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next +@ cdecl _vcomp_for_dynamic_next(ptr ptr) @ stub _vcomp_for_dynamic_next_i8 -@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end -@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init +@ cdecl _vcomp_for_static_end() +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) @ stub _vcomp_for_static_init_i8 -@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 -@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num -@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect +@ varargs _vcomp_fork(long long ptr) +@ cdecl _vcomp_get_thread_num() +@ cdecl _vcomp_leave_critsect(ptr) @ stub _vcomp_master_barrier -@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin -@ cdecl _vcomp_master_end() vcomp._vcomp_master_end +@ cdecl _vcomp_master_begin() +@ cdecl _vcomp_master_end() @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end -@ cdecl _vcomp_reduction_i1(long ptr long) vcomp._vcomp_reduction_i1 -@ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 -@ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 -@ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 -@ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 -@ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 -@ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 -@ cdecl _vcomp_reduction_u8(long ptr int64) vcomp._vcomp_reduction_u8 -@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init -@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next -@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads -@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin -@ cdecl _vcomp_single_end() vcomp._vcomp_single_end -@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock -@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock -@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic -@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads -@ cdecl omp_get_nested() vcomp.omp_get_nested -@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads -@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num +@ cdecl _vcomp_reduction_i1(long ptr long) +@ cdecl _vcomp_reduction_i2(long ptr long) +@ cdecl _vcomp_reduction_i4(long ptr long) +@ cdecl _vcomp_reduction_i8(long ptr int64) +@ cdecl _vcomp_reduction_r4(long ptr float) +@ cdecl _vcomp_reduction_r8(long ptr double) +@ cdecl _vcomp_reduction_u1(long ptr long) _vcomp_reduction_i1 +@ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 +@ cdecl _vcomp_reduction_u4(long ptr long) _vcomp_reduction_i4 +@ cdecl _vcomp_reduction_u8(long ptr int64) _vcomp_reduction_i8 +@ cdecl _vcomp_sections_init(long) +@ cdecl _vcomp_sections_next() +@ cdecl _vcomp_set_num_threads(long) +@ cdecl _vcomp_single_begin(long) +@ cdecl _vcomp_single_end() +@ cdecl omp_destroy_lock(ptr) +@ cdecl omp_destroy_nest_lock(ptr) omp_destroy_lock +@ cdecl omp_get_dynamic() +@ cdecl omp_get_max_threads() +@ cdecl omp_get_nested() +@ cdecl omp_get_num_procs() +@ cdecl omp_get_num_threads() +@ cdecl omp_get_thread_num() @ stub omp_get_wtick -@ cdecl omp_get_wtime() vcomp.omp_get_wtime -@ cdecl omp_in_parallel() vcomp.omp_in_parallel -@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock -@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock -@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock -@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock -@ cdecl omp_set_nested(long) vcomp.omp_set_nested -@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock -@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock -@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock +@ cdecl omp_get_wtime() +@ cdecl omp_in_parallel() +@ cdecl omp_init_lock(ptr) +@ cdecl omp_init_nest_lock(ptr) omp_init_lock +@ cdecl omp_set_dynamic(long) +@ cdecl omp_set_lock(ptr) +@ cdecl omp_set_nest_lock(ptr) +@ cdecl omp_set_nested(long) +@ cdecl omp_set_num_threads(long) +@ cdecl omp_test_lock(ptr) +@ cdecl omp_test_nest_lock(ptr) +@ cdecl omp_unset_lock(ptr) +@ cdecl omp_unset_nest_lock(ptr) -- 2.29.2

2 9

[PATCH 0/4] Server async restructuring
by Zebediah Figura 08 Feb '21

08 Feb '21

Currently the only reliable way for server-side devices to become aware of canceled asyncs is by checking for STATUS_PENDING in their reselect_async callback. Named pipes and sockets both use this to free extra data (struct pipe_message and struct accept_req respectively). This is a bit architecturally unpleasant, and hard to follow, and caused me some grief while trying to implement socket ioctls. After some discussion with Jacek I decided to try to restructure things a bit, so that the socket provides a callback which will be called as soon as we know the async is complete. This requires some other changes, though: * Not only is it possible for an async to outlive its object, but this even happens normally (consider e.g. STATUS_HANDLES_CLOSED)—even after the object is destroyed, a thread apc still holds a reference to the async. In case the completion callback needs to access object information (as with accept_req, to remove that structure from a per-socket list), we need to ensure that the object is not freed before then. The obvious way to do this is to take a reference to the object, i.e. patch 0003. * However, this causes a circular reference, since we're effectively also taking a reference to the async on behalf of the object in alloc_accept_req() [and even if that were removed, we'd still be holding a reference to the async on behalf of the object via the async queue. We can't remove all such references as they are the only things keeping a pending async alive.] In order to break this reference loop, we make use of the close_handle callback to terminate all asyncs as soon as the last user-space handle is closed, rather than when the object is destroyed, i.e. patch 0002. Note that this doesn't mean they'll immediately be removed from the list, but they will be as soon as the apc object is done with them. [As an aside, this also seems to match the way Windows drivers work: according to [1] drivers should cancel pending asyncs in IRP_MJ_CLEANUP, and according to [2] when IRP_MJ_CLOSE is subsequently sent "all outstanding I/O requests have been completed or canceled."] * Note that we can't easily avoid taking a reference to the socket object from the async. The earliest possible place we can call the async callback is in async_set_result(), once we're sure that the async is done and its results can't be altered. We could call it in async_terminate(), and make sure that async_terminate() is always called on object destruction, but there is a slight snag in that the client is technically allowed to restart any async. That won't actually happen in practice, for any of the asyncs I've seen or have planned, but it's an awful lot of implicit assumptions to remember. As an added complication, there is an awful socket ioctl, viz. the WSAPoll() ioctl, which can outlive the object it's called on. Neither of the applications I've seen that use the ioctl depend on that behaviour, but this restructuring does actually help make it possible to implement without reference leaks. [1] https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/irp-mj-cle… [2] https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/irp-mj-clo… Zebediah Figura (4): server: Hold a reference to the iosb in the accept_req structure. server: Terminate accept asyncs when the last socket handle is closed. server: Hold a reference to both sockets in the accept_req structure. server: Use a callback to free the accept_req structure. server/async.c | 15 ++++++++ server/file.h | 4 +++ server/sock.c | 98 ++++++++++++++++++++++++++------------------------ 3 files changed, 71 insertions(+), 46 deletions(-) -- 2.20.1

1 4

[PATCH] mscoree: Update Wine Mono to 6.0.0.
by Esme Povirk 08 Feb '21

08 Feb '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- dlls/mscoree/tests/comtest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index cfc51155f57..b2e726422da 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.1.1" +#define MONO_VERSION "6.0.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" +#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index c9edc2d68d0..da587285cfe 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.1.1" +#define WINE_MONO_VERSION "6.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4b2183bac3a..6c0d081cbd3 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -195,7 +195,7 @@ static void run_registry_test(run_type run) ok(hr == S_OK, "Got %x\n", hr); ok(i == 42, "Expected 42, got %d\n", i); hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); - todo_wine ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); } -- 2.25.1

2 1

[PATCH 1/4] winegstreamer: Do not use gst_segment_to_running_time().
by Zebediah Figura 08 Feb '21

08 Feb '21

It fails if samples lie outside of the current segment, but DirectShow filters (in particular, the native AVI splitter) will happily set timestamps outside of the current segment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7b3a4fd48bd..c05b1e24018 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -103,7 +103,6 @@ struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - GstSegment *segment; GstCaps *caps; pthread_cond_t event_cond, event_empty_cond; @@ -769,8 +768,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; } - gst_segment_copy_into(segment, stream->segment); - stream_event.type = WG_PARSER_EVENT_SEGMENT; stream_event.u.segment.position = segment->position / 100; stream_event.u.segment.stop = segment->stop / 100; @@ -822,7 +819,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_FLUSH_STOP: - gst_segment_init(stream->segment, GST_FORMAT_TIME); if (stream->enabled) { pthread_mutex_lock(&parser->mutex); @@ -928,7 +924,6 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { - struct wg_parser_stream *stream = pin->wg_stream; HRESULT hr; BYTE *ptr = NULL; @@ -943,26 +938,19 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, memcpy(ptr, &info->data[offset], size); if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart; - GstClockTime ptsStart = buf->pts; + REFERENCE_TIME rtStart, ptsStart = buf->pts; + if (offset > 0) ptsStart = buf->pts + gst_util_uint64_scale(offset, GST_SECOND, bytes_per_second); - rtStart = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStart); - if (rtStart >= 0) - rtStart /= 100; + rtStart = ((ptsStart / 100) - pin->seek.llCurrent) * pin->seek.dRate; if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME rtStop; - REFERENCE_TIME tStart; - REFERENCE_TIME tStop; - GstClockTime ptsStop = buf->pts + buf->duration; + REFERENCE_TIME rtStop, tStart, tStop, ptsStop = buf->pts + buf->duration; if (offset + size < info->size) ptsStop = buf->pts + gst_util_uint64_scale(offset + size, GST_SECOND, bytes_per_second); tStart = ptsStart / 100; tStop = ptsStop / 100; - rtStop = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStop); - if (rtStop >= 0) - rtStop /= 100; + rtStop = ((ptsStop / 100) - pin->seek.llCurrent) * pin->seek.dRate; TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); IMediaSample_SetMediaTime(sample, &tStart, &tStop); @@ -2473,7 +2461,6 @@ static void free_stream(struct wg_parser_stream *stream) gst_object_unref(stream->their_src); } gst_object_unref(stream->my_sink); - gst_segment_free(stream->segment); pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond); @@ -2538,8 +2525,6 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->wg_stream = stream; strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); - stream->segment = gst_segment_new(); - gst_segment_init(stream->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate); -- 2.30.0

2 4