February 2020 - Wine-Commits

Matteo Bruni : wined3d: Check the actual device limit in wined3d_stateblock_set_*s_consts_f().
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: efeaf866a35ff002d32c35d4656f25f6bfb85839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efeaf866a35ff002d32c35d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 20 22:40:14 2020 +0100 wined3d: Check the actual device limit in wined3d_stateblock_set_*s_consts_f(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0f5e2d70ea..6e8bebd719 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1367,10 +1367,13 @@ static void wined3d_bitmap_set_bits(uint32_t *bitmap, unsigned int start, unsign HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", stateblock, start_idx, count, constants); - if (!constants || start_idx >= WINED3D_MAX_VS_CONSTS_F || count > WINED3D_MAX_VS_CONSTS_F - start_idx) + if (!constants || start_idx >= d3d_info->limits.vs_uniform_count + || count > d3d_info->limits.vs_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); @@ -1433,10 +1436,13 @@ void CDECL wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateb HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", stateblock, start_idx, count, constants); - if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + if (!constants || start_idx >= d3d_info->limits.ps_uniform_count + || count > d3d_info->limits.ps_uniform_count - start_idx) return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.ps_consts_f[start_idx], constants, count * sizeof(*constants));

1 0

Nikolay Sivov : vcomp/tests: Link to activation context API directly.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: eb4c4b35049ab4e6f99f9063b5820040c61fd76c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb4c4b35049ab4e6f99f9063… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 21 13:24:23 2020 +0300 vcomp/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a8b80a0e22..0aea30815e 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -27,11 +27,6 @@ static HANDLE vcomp_actctx_hctx; static ULONG_PTR vcomp_actctx_cookie; static HMODULE vcomp_handle; -static HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); -static BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); -static VOID (WINAPI *pReleaseActCtx)(HANDLE); - typedef CRITICAL_SECTION *omp_lock_t; typedef CRITICAL_SECTION *omp_nest_lock_t; @@ -191,18 +186,10 @@ static const char vcomp_manifest[] = static void create_vcomp_manifest(void) { char temp_path[MAX_PATH]; - HMODULE kernel32; DWORD written; ACTCTXA ctx; HANDLE file; - kernel32 = GetModuleHandleA("kernel32.dll"); - pCreateActCtxA = (void *)GetProcAddress(kernel32, "CreateActCtxA"); - pActivateActCtx = (void *)GetProcAddress(kernel32, "ActivateActCtx"); - pDeactivateActCtx = (void *)GetProcAddress(kernel32, "DeactivateActCtx"); - pReleaseActCtx = (void *)GetProcAddress(kernel32, "ReleaseActCtx"); - if (!pCreateActCtxA) return; - if (!GetTempPathA(sizeof(temp_path), temp_path) || !GetTempFileNameA(temp_path, "vcomp", 0, vcomp_manifest_file)) { @@ -231,7 +218,7 @@ static void create_vcomp_manifest(void) memset(&ctx, 0, sizeof(ctx)); ctx.cbSize = sizeof(ctx); ctx.lpSource = vcomp_manifest_file; - vcomp_actctx_hctx = pCreateActCtxA(&ctx); + vcomp_actctx_hctx = CreateActCtxA(&ctx); if (!vcomp_actctx_hctx) { ok(0, "failed to create activation context\n"); @@ -239,10 +226,10 @@ static void create_vcomp_manifest(void) return; } - if (!pActivateActCtx(vcomp_actctx_hctx, &vcomp_actctx_cookie)) + if (!ActivateActCtx(vcomp_actctx_hctx, &vcomp_actctx_cookie)) { win_skip("failed to activate context\n"); - pReleaseActCtx(vcomp_actctx_hctx); + ReleaseActCtx(vcomp_actctx_hctx); DeleteFileA(vcomp_manifest_file); vcomp_actctx_hctx = NULL; } @@ -255,8 +242,8 @@ static void release_vcomp(void) if (vcomp_actctx_hctx) { - pDeactivateActCtx(0, vcomp_actctx_cookie); - pReleaseActCtx(vcomp_actctx_hctx); + DeactivateActCtx(0, vcomp_actctx_cookie); + ReleaseActCtx(vcomp_actctx_hctx); DeleteFileA(vcomp_manifest_file); } }

1 0

Nikolay Sivov : mf: Shut down quality manager on session shutdown.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 431afba5cf1c704e1159e2f5bccde4a59cb5f8ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=431afba5cf1c704e1159e2f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 21 13:16:51 2020 +0300 mf: Shut down quality manager on session shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6b5d590a25..5ee4074379 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -907,6 +907,8 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) { session->state = SESSION_STATE_SHUT_DOWN; IMFMediaEventQueue_Shutdown(session->event_queue); + if (session->quality_manager) + IMFQualityManager_Shutdown(session->quality_manager); } LeaveCriticalSection(&session->cs);

1 0

Nikolay Sivov : kernel32/tests: Link to activation context API directly.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: f1ff96cf5a94d7d6212c4d9885f3f801218023a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ff96cf5a94d7d6212c4d98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 21 13:24:33 2020 +0300 kernel32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 35 +++++++---------------------------- dlls/kernel32/tests/thread.c | 41 ++++++++++++----------------------------- 2 files changed, 19 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 3d717f7b1f..7342a865af 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -80,12 +80,6 @@ static NTSTATUS (WINAPI *pRtlGetSearchPath)(LPWSTR*); static void (WINAPI *pRtlReleasePath)(LPWSTR); static NTSTATUS (WINAPI *pLdrGetDllPath)(LPCWSTR,ULONG,LPWSTR*,LPWSTR*); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); -static void (WINAPI *pReleaseActCtx)(HANDLE); - static BOOL (WINAPI *pCheckNameLegalDOS8Dot3W)(const WCHAR *, char *, DWORD, BOOL *, BOOL *); static BOOL (WINAPI *pCheckNameLegalDOS8Dot3A)(const char *, char *, DWORD, BOOL *, BOOL *); @@ -1758,7 +1752,7 @@ static HANDLE test_create(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = manifest_path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); @@ -1825,9 +1819,6 @@ static void test_SearchPathA(void) DeleteFileA(path2A); - if (!pActivateActCtx) - return; - GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); create_manifest_file("testdep1.manifest", manifest_dep); @@ -1844,7 +1835,7 @@ static void test_SearchPathA(void) ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ @@ -1873,9 +1864,9 @@ static void test_SearchPathA(void) ok(ret && ret == strlen(buffA), "got %d\n", ret); ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); /* test the search path priority of the working directory */ GetTempPathA(sizeof(tmpdirA), tmpdirA); @@ -1957,9 +1948,6 @@ if (0) DeleteFileW(path2W); - if (!pActivateActCtx) - return; - GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); create_manifest_file("testdep1.manifest", manifest_dep); @@ -1983,7 +1971,7 @@ if (0) GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); - ret = pActivateActCtx(handle, &cookie); + ret = ActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ @@ -2016,9 +2004,9 @@ if (0) ret = SearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pDeactivateActCtx(0, cookie); + ret = DeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); - pReleaseActCtx(handle); + ReleaseActCtx(handle); } static void test_GetFullPathNameA(void) @@ -2157,11 +2145,6 @@ static void init_pointers(void) MAKEFUNC(RemoveDllDirectory); MAKEFUNC(SetDllDirectoryW); MAKEFUNC(SetDefaultDllDirectories); - MAKEFUNC(ActivateActCtx); - MAKEFUNC(CreateActCtxW); - MAKEFUNC(DeactivateActCtx); - MAKEFUNC(GetCurrentActCtx); - MAKEFUNC(ReleaseActCtx); MAKEFUNC(CheckNameLegalDOS8Dot3W); MAKEFUNC(CheckNameLegalDOS8Dot3A); mod = GetModuleHandleA("ntdll.dll"); @@ -2695,10 +2678,6 @@ START_TEST(path) init_pointers(); - /* Report only once */ - if (!pActivateActCtx) - win_skip("Activation contexts not supported, some tests will be skipped\n"); - test_relative_path(); test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 8c27024cf2..3b9a407e73 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -90,11 +90,6 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static BOOL (WINAPI *pSetThreadErrorMode)(DWORD,PDWORD); static DWORD (WINAPI *pGetThreadErrorMode)(void); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); -static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); -static void (WINAPI *pReleaseActCtx)(HANDLE); static PTP_POOL (WINAPI *pCreateThreadpool)(PVOID); static void (WINAPI *pCloseThreadpool)(PTP_POOL); static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); @@ -312,7 +307,7 @@ static DWORD WINAPI thread_actctx_func(void *p) BOOL ret; cur = (void*)0xdeadbeef; - ret = pGetCurrentActCtx(&cur); + ret = GetCurrentActCtx(&cur); ok(ret, "thread GetCurrentActCtx failed, %u\n", GetLastError()); ok(cur == param->handle, "got %p, expected %p\n", cur, param->handle); param->thread_context = cur; @@ -1852,7 +1847,7 @@ static HANDLE test_create(const char *file) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); @@ -1876,12 +1871,6 @@ static void test_thread_actctx(void) DWORD tid, ret; BOOL b; - if (!pActivateActCtx) - { - win_skip("skipping activation context tests\n"); - return; - } - create_manifest_file("testdep1.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main); @@ -1890,7 +1879,7 @@ static void test_thread_actctx(void) DeleteFileA("main.manifest"); handle = (void*)0xdeadbeef; - b = pGetCurrentActCtx(&handle); + b = GetCurrentActCtx(&handle); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); @@ -1905,17 +1894,17 @@ static void test_thread_actctx(void) ok(param.thread_context == NULL, "got wrong thread context %p\n", param.thread_context); CloseHandle(thread); - b = pActivateActCtx(context, &cookie); + b = ActivateActCtx(context, &cookie); ok(b, "activation failed: %u\n", GetLastError()); handle = 0; - b = pGetCurrentActCtx(&handle); + b = GetCurrentActCtx(&handle); ok(b, "GetCurrentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "no active context\n"); - pReleaseActCtx(handle); + ReleaseActCtx(handle); param.handle = NULL; - b = pGetCurrentActCtx(&param.handle); + b = GetCurrentActCtx(&param.handle); ok(b && param.handle != NULL, "failed to get context, %u\n", GetLastError()); param.thread_context = (void*)0xdeadbeef; @@ -1925,7 +1914,7 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); - pReleaseActCtx(param.thread_context); + ReleaseActCtx(param.thread_context); CloseHandle(thread); /* similar test for CreateRemoteThread() */ @@ -1936,17 +1925,16 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); - pReleaseActCtx(param.thread_context); + ReleaseActCtx(param.thread_context); CloseHandle(thread); - pReleaseActCtx(param.handle); + ReleaseActCtx(param.handle); - b = pDeactivateActCtx(0, cookie); + b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); - pReleaseActCtx(context); + ReleaseActCtx(context); } - static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { int *foo = (int*)context; @@ -2267,11 +2255,6 @@ static void init_funcs(void) X(IsWow64Process); X(SetThreadErrorMode); X(GetThreadErrorMode); - X(ActivateActCtx); - X(CreateActCtxW); - X(DeactivateActCtx); - X(GetCurrentActCtx); - X(ReleaseActCtx); X(CreateThreadpool); X(CloseThreadpool);

1 0

Alexandre Julliard : unicode: Generate the NLS files for normalization forms.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: f9f3e57cf8cb720f04c5e7134a7f123df09123d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f3e57cf8cb720f04c5e713… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 11:26:21 2020 +0100 unicode: Generate the NLS files for normalization forms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 +- loader/wine.inf.in | 5 + nls/Makefile.in | 7 +- nls/normidna.nls | Bin 0 -> 82058 bytes nls/normnfc.nls | Bin 0 -> 57630 bytes nls/normnfd.nls | Bin 0 -> 50942 bytes nls/normnfkc.nls | Bin 0 -> 79052 bytes nls/normnfkd.nls | Bin 0 -> 72684 bytes tools/make_unicode | 378 ++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 383 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f3e57cf8cb720f04c5…

1 0

Francois Gouget : msvcrt/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: c2e6f4deeb26429bc65078fa80b4c0aa19d3b764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e6f4deeb26429bc65078fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 08:08:58 2020 +0100 msvcrt/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 63d5100de2..0c4e024a8e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1464,7 +1464,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = get_base_name(selfname); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; @@ -1477,7 +1477,7 @@ static void test_file_inherit( const char* selfname ) fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY | O_NOINHERIT, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; @@ -2168,7 +2168,7 @@ static void test_pipes(const char* selfname) } arg_v[0] = get_base_name(selfname); - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); @@ -2197,7 +2197,7 @@ static void test_pipes(const char* selfname) return; } - arg_v[1] = "tests/file.c"; + arg_v[1] = "file"; arg_v[2] = "pipes"; arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]);

1 0

Alexandre Julliard : kernelbase: Use external NLS files for Unicode composition.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 55dc4fce990f9edd3c216e5dff15a7918308b03f URL: https://source.winehq.org/git/wine.git/?a=commit;h=55dc4fce990f9edd3c216e5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 16:02:36 2020 +0100 kernelbase: Use external NLS files for Unicode composition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 128 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 115 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 8e878981ba..aad2422db2 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -42,11 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); #define CALINFO_MAX_YEAR 2029 extern UINT CDECL __wine_get_unix_codepage(void); -extern unsigned int wine_compose( unsigned int ch1, unsigned int ch2 ) DECLSPEC_HIDDEN; extern const unsigned short wctype_table[] DECLSPEC_HIDDEN; extern const unsigned int collation_table[] DECLSPEC_HIDDEN; -extern const unsigned short nfd_table[] DECLSPEC_HIDDEN; static HANDLE kernel32_handle; @@ -538,6 +536,36 @@ static const struct geoinfo geoinfodata[] = { 161832257, L"XX", L"XX", 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; +/* NLS normalization file */ +struct norm_table +{ + WCHAR name[13]; /* 00 file name */ + USHORT checksum[3]; /* 1a checksum? */ + USHORT version[4]; /* 20 Unicode version */ + USHORT form; /* 28 normalization form */ + USHORT len_factor; /* 2a factor for length estimates */ + USHORT unknown1; /* 2c */ + USHORT decomp_size; /* 2e decomposition hash size */ + USHORT comp_size; /* 30 composition hash size */ + USHORT unknown2; /* 32 */ + USHORT classes; /* 34 combining classes table offset */ + USHORT props_level1; /* 36 char properties table level 1 offset */ + USHORT props_level2; /* 38 char properties table level 2 offset */ + USHORT decomp_hash; /* 3a decomposition hash table offset */ + USHORT decomp_map; /* 3c decomposition character map table offset */ + USHORT decomp_seq; /* 3e decomposition character sequences offset */ + USHORT comp_hash; /* 40 composition hash table offset */ + USHORT comp_seq; /* 42 composition character sequences offset */ + /* BYTE[] combining class values */ + /* BYTE[0x2200] char properties index level 1 */ + /* BYTE[] char properties index level 2 */ + /* WORD[] decomposition hash table */ + /* WORD[] decomposition character map */ + /* WORD[] decomposition character sequences */ + /* WORD[] composition hash table */ + /* WORD[] composition character sequences */ +}; + static NLSTABLEINFO nls_info; static UINT mac_cp = 10000; static HKEY intl_key; @@ -547,6 +575,8 @@ static HKEY tz_key; static CPTABLEINFO codepages[128]; static unsigned int nb_codepages; +static struct norm_table *norm_info; + static CRITICAL_SECTION locale_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -581,6 +611,8 @@ void init_locale(void) (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR) ); NtGetNlsSectionPtr( 10, 0, 0, (void **)&casemap_ptr, &size ); + NtGetNlsSectionPtr( 12, NormalizationC, NULL, (void **)&norm_info, &size ); + if (!ansi_cp || NtGetNlsSectionPtr( 11, ansi_cp, NULL, (void **)&ansi_ptr, &size )) NtGetNlsSectionPtr( 11, 1252, NULL, (void **)&ansi_ptr, &size ); if (!oem_cp || NtGetNlsSectionPtr( 11, oem_cp, 0, (void **)&oem_ptr, &size )) @@ -675,15 +707,85 @@ static inline WCHAR casemap( const USHORT *table, WCHAR ch ) } -static const WCHAR *get_decomposition( WCHAR ch, unsigned int *len ) +static BYTE rol( BYTE val, BYTE count ) { - unsigned short offset = nfd_table[nfd_table[ch >> 8] + ((ch >> 4) & 0xf)] + (ch & 0xf); - unsigned short start = nfd_table[offset]; - unsigned short end = nfd_table[offset + 1]; + return (val << count) | (val >> (8 - count)); +} - if ((*len = end - start)) return nfd_table + start; - *len = 1; - return NULL; + +static BYTE get_char_props( const struct norm_table *info, unsigned int ch ) +{ + const BYTE *level1 = (const BYTE *)((const USHORT *)info + info->props_level1); + const BYTE *level2 = (const BYTE *)((const USHORT *)info + info->props_level2); + BYTE off = level1[ch / 128]; + + if (!off || off >= 0xfb) return rol( off, 5 ); + return level2[(off - 1) * 128 + ch % 128]; +} + + +static const WCHAR *get_decomposition( WCHAR ch, unsigned int *ret_len ) +{ + const struct pair { WCHAR src; USHORT dst; } *pairs; + const USHORT *hash_table = (const USHORT *)norm_info + norm_info->decomp_hash; + const WCHAR *ret; + unsigned int i, pos, end, len, hash; + + *ret_len = 1; + hash = ch % norm_info->decomp_size; + pos = hash_table[hash]; + if (pos >> 13) + { + if (get_char_props( norm_info, ch ) != 0xbf) return NULL; + ret = (const USHORT *)norm_info + norm_info->decomp_seq + (pos & 0x1fff); + len = pos >> 13; + } + else + { + pairs = (const struct pair *)((const USHORT *)norm_info + norm_info->decomp_map); + + /* find the end of the hash bucket */ + for (i = hash + 1; i < norm_info->decomp_size; i++) if (!(hash_table[i] >> 13)) break; + if (i < norm_info->decomp_size) end = hash_table[i]; + else for (end = pos; pairs[end].src; end++) ; + + for ( ; pos < end; pos++) + { + if (pairs[pos].src != (WCHAR)ch) continue; + ret = (const USHORT *)norm_info + norm_info->decomp_seq + (pairs[pos].dst & 0x1fff); + len = pairs[pos].dst >> 13; + break; + } + if (pos >= end) return NULL; + } + + if (len == 7) while (ret[len]) len++; + if (!ret[0]) len = 0; /* ignored char */ + *ret_len = len; + return ret; +} + + +static WCHAR compose_chars( WCHAR ch1, WCHAR ch2 ) +{ + const USHORT *table = (const USHORT *)norm_info + norm_info->comp_hash; + const WCHAR *chars = (const USHORT *)norm_info + norm_info->comp_seq; + unsigned int hash, start, end, i; + WCHAR ch[3]; + + hash = (ch1 + 95 * ch2) % norm_info->comp_size; + start = table[hash]; + end = table[hash + 1]; + while (start < end) + { + for (i = 0; i < 3; i++, start++) + { + ch[i] = chars[start]; + if (IS_HIGH_SURROGATE( ch[i] )) start++; + } + if (ch[0] == ch1 && ch[1] == ch2) return ch[2]; + } + return 0; } @@ -1673,7 +1775,7 @@ static int wcstombs_sbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = 0; srclen; i++, src++, srclen--) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_sbcs_mapping( info, flags, composed )) @@ -1706,7 +1808,7 @@ static int wcstombs_sbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = dstlen; srclen && i; dst++, i--, src++, srclen--) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_sbcs_mapping( info, flags, composed )) @@ -1776,7 +1878,7 @@ static int wcstombs_dbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = 0; srclen; srclen--, src++, i++) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_dbcs_mapping( info, flags, composed )) @@ -1820,7 +1922,7 @@ static int wcstombs_dbcs_slow( const CPTABLEINFO *info, DWORD flags, const WCHAR for (i = dstlen; srclen && i; i--, srclen--, src++) { wch = *src; - if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = wine_compose( src[0], src[1] ))) + if ((flags & WC_COMPOSITECHECK) && (srclen > 1) && (composed = compose_chars( src[0], src[1] ))) { /* now check if we can use the composed char */ if (is_valid_dbcs_mapping( info, flags, composed ))

1 0

Alexandre Julliard : winedump: Add dumping of normalization NLS files.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 3d55de8c73dc8b9de84c9e69a51cedb592407da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d55de8c73dc8b9de84c9e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 16:37:46 2020 +0100 winedump: Add dumping of normalization NLS files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/nls.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/tools/winedump/nls.c b/tools/winedump/nls.c index ec42f86422..8966ceada9 100644 --- a/tools/winedump/nls.c +++ b/tools/winedump/nls.c @@ -165,6 +165,187 @@ static void dump_codepage(void) printf( "\n" ); } +struct norm_table +{ + WCHAR name[13]; /* 00 file name */ + USHORT checksum[3]; /* 1a checksum? */ + USHORT version[4]; /* 20 Unicode version */ + USHORT form; /* 28 normalization form */ + USHORT len_factor; /* 2a factor for length estimates */ + USHORT unknown1; /* 2c */ + USHORT decomp_size; /* 2e decomposition hash size */ + USHORT comp_size; /* 30 composition hash size */ + USHORT unknown2; /* 32 */ + USHORT classes; /* 34 combining classes table offset */ + USHORT props_level1; /* 36 char properties table level 1 offset */ + USHORT props_level2; /* 38 char properties table level 2 offset */ + USHORT decomp_hash; /* 3a decomposition hash table offset */ + USHORT decomp_map; /* 3c decomposition character map table offset */ + USHORT decomp_seq; /* 3e decomposition character sequences offset */ + USHORT comp_hash; /* 40 composition hash table offset */ + USHORT comp_seq; /* 42 composition character sequences offset */ +}; + +static int offset_scale = 1; /* older versions use byte offsets */ + +#define GET_TABLE(info,table) ((const void *)((const BYTE *)info + (info->table * offset_scale))) + +static unsigned int get_utf16( const WCHAR *str ) +{ + if (str[0] >= 0xd800 && str[0] <= 0xdbff && + str[1] >= 0xdc00 && str[1] <= 0xdfff) + return 0x10000 + ((str[0] & 0x3ff) << 10) + (str[1] & 0x3ff); + return str[0]; +} + +static BYTE rol( BYTE val, BYTE count ) +{ + return (val << count) | (val >> (8 - count)); +} + +static unsigned char get_char_props( const struct norm_table *info, unsigned int ch ) +{ + const BYTE *level1 = GET_TABLE( info, props_level1 ); + const BYTE *level2 = GET_TABLE( info, props_level2 ); + BYTE off = level1[ch / 128]; + + if (!off || off >= 0xfb) return rol( off, 5 ); + return level2[(off - 1) * 128 + ch % 128]; +} + +static const WCHAR *get_decomposition( const struct norm_table *info, + unsigned int ch, unsigned int *ret_len ) +{ + const USHORT *hash_table = GET_TABLE( info, decomp_hash ); + const WCHAR *seq = GET_TABLE(info, decomp_seq ); + const WCHAR *ret; + unsigned int i, pos, end, len, hash; + + *ret_len = 1 + (ch >= 0x10000); + if (!info->decomp_size) return NULL; + hash = ch % info->decomp_size; + pos = hash_table[hash]; + if (pos >> 13) + { + if (get_char_props( info, ch ) != 0xbf) return NULL; + ret = seq + (pos & 0x1fff); + len = pos >> 13; + } + else + { + const struct { WCHAR src; USHORT dst; } *pairs = GET_TABLE( info, decomp_map ); + + /* find the end of the hash bucket */ + for (i = hash + 1; i < info->decomp_size; i++) if (!(hash_table[i] >> 13)) break; + if (i < info->decomp_size) end = hash_table[i]; + else for (end = pos; pairs[end].src; end++) ; + + for ( ; pos < end; pos++) + { + if (pairs[pos].src != (WCHAR)ch) continue; + ret = seq + (pairs[pos].dst & 0x1fff); + len = pairs[pos].dst >> 13; + break; + } + if (pos >= end) return NULL; + } + + if (len == 7) while (ret[len]) len++; + *ret_len = len; + return ret; +} + +static int cmp_compos( const void *a, const void *b ) +{ + int ret = ((unsigned int *)a)[0] - ((unsigned int *)b)[0]; + if (!ret) ret = ((unsigned int *)a)[1] - ((unsigned int *)b)[1]; + return ret; +} + +static void dump_norm(void) +{ + const struct norm_table *info; + const BYTE *classes; + unsigned int i; + char name[13]; + + if (!(info = PRD( 0, sizeof(*info) ))) return; + for (i = 0; i < sizeof(name); i++) name[i] = info->name[i]; + printf( "Name: %s\n", name ); + switch (info->form) + { + case 1: printf( "Form: NFC\n" ); break; + case 2: printf( "Form: NFD\n" ); break; + case 5: printf( "Form: NFKC\n" ); break; + case 6: printf( "Form: NFKD\n" ); break; + case 13: printf( "Form: IDNA\n" ); break; + default: printf( "Form: %u\n", info->form ); break; + } + printf( "Version: %u.%u.%u\n", info->version[0], info->version[1], info->version[2] ); + printf( "Factor: %u\n", info->len_factor ); + + if (info->classes == sizeof(*info) / 2) offset_scale = 2; + classes = GET_TABLE( info, classes ); + + printf( "\nCharacter classes:\n" ); + for (i = 0; i < 0x110000; i++) + { + BYTE flags = get_char_props( info, i ); + + if (!(i % 16)) printf( "\n%06x:", i ); + if (!flags || (flags & 0x3f) == 0x3f) + { + static const char *flagstr[4] = { ".....", "Undef", "QC=No", "Inval" }; + printf( " %s", flagstr[flags >> 6] ); + } + else + { + static const char flagschar[4] = ".+*M"; + BYTE class = classes[flags & 0x3f]; + printf( " %c.%03u", flagschar[flags >> 6], class ); + } + } + + printf( "\n\nDecompositions:\n\n" ); + for (i = 0; i < 0x110000; i++) + { + unsigned int j, len; + const WCHAR *decomp = get_decomposition( info, i, &len ); + if (!decomp) continue; + printf( "%04x ->", i ); + for (j = 0; j < len; j++) + { + unsigned int ch = get_utf16( decomp + j ); + printf( " %04x", ch ); + if (ch >= 0x10000) j++; + } + printf( "\n" ); + } + if (info->comp_size) + { + unsigned int pos, len = (dump_total_len - info->comp_seq * offset_scale) / sizeof(WCHAR); + const WCHAR *seq = GET_TABLE( info, comp_seq ); + unsigned int *map = malloc( len * sizeof(*map) ); + + printf( "\nCompositions:\n\n" ); + + /* ignore hash table, simply dump all the sequences */ + for (i = pos = 0; i < len; pos += 3) + { + map[pos] = get_utf16( seq + i ); + i += 1 + (map[pos] >= 0x10000); + map[pos+1] = get_utf16( seq + i ); + i += 1 + (map[pos+1] >= 0x10000); + map[pos+2] = get_utf16( seq + i ); + i += 1 + (map[pos+2] >= 0x10000); + } + qsort( map, pos / 3, 3 * sizeof(*map), cmp_compos ); + for (i = 0; i < pos; i += 3) printf( "%04x %04x -> %04x\n", map[i], map[i + 1], map[i + 2] ); + free( map ); + } + printf( "\n" ); +} + void nls_dump(void) { const char *name = strrchr( globals.input_name, '/' ); @@ -172,6 +353,7 @@ void nls_dump(void) else name = globals.input_name; if (!strcasecmp( name, "l_intl.nls" )) return dump_casemap(); if (!strncasecmp( name, "c_", 2 )) return dump_codepage(); + if (!strncasecmp( name, "norm", 4 )) return dump_norm(); fprintf( stderr, "Unrecognized file name '%s'\n", globals.input_name ); }

1 0

Francois Gouget : kernel32/tests: Simplify the name of the test unit for child processes.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: cd523f3049f8fdee9cca1cb0fa3ac749fad3cca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd523f3049f8fdee9cca1cb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 21 08:09:03 2020 +0100 kernel32/tests: Simplify the name of the test unit for child processes. The official name (shown by --list) has no path nor extension. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 68 +++++++++++++++++++++--------------------- dlls/kernel32/tests/toolhelp.c | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd523f3049f8fdee9cca…

1 0

Zebediah Figura : qasf/dmowrapper: Flush the DMO on IPin::EndFlush().
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: f4ae2e3b4db34afdc4fabb81046f9e29dd7e5aa2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ae2e3b4db34afdc4fabb81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:42:57 2020 -0600 qasf/dmowrapper: Flush the DMO on IPin::EndFlush(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 23 ++++++++++++++++++++++ dlls/qasf/tests/dmowrapper.c | 47 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 9e0a178542..32a9d41b7a 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -361,6 +361,28 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) return hr; } +static HRESULT dmo_wrapper_end_flush(struct strmbase_sink *iface) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface->pin.filter); + IMediaObject *dmo; + HRESULT hr; + DWORD i; + + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); + + if (FAILED(hr = IMediaObject_Flush(dmo))) + ERR("Flush() failed, hr %#x.\n", hr); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i].pin.pin.peer) + IPin_EndFlush(filter->sources[i].pin.pin.peer); + } + + IMediaObject_Release(dmo); + return hr; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = dmo_wrapper_sink_query_interface, @@ -369,6 +391,7 @@ static const struct strmbase_sink_ops sink_ops = .sink_connect = dmo_wrapper_sink_connect, .sink_disconnect = dmo_wrapper_sink_disconnect, .sink_eos = dmo_wrapper_sink_eos, + .sink_end_flush = dmo_wrapper_end_flush, .pfnReceive = dmo_wrapper_sink_Receive, }; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index b509839de4..9ec9f85d55 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1121,7 +1121,7 @@ struct testfilter struct strmbase_source source; struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; - unsigned int got_new_segment, got_eos; + unsigned int got_new_segment, got_eos, got_begin_flush, got_end_flush; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -1285,6 +1285,20 @@ static HRESULT testsink_eos(struct strmbase_sink *iface) return 0xdeadbeef; } +static HRESULT testsink_begin_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_begin_flush; + return 0xdeadbeef; +} + +static HRESULT testsink_end_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_end_flush; + return 0xdeadbeef; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, @@ -1293,6 +1307,8 @@ static const struct strmbase_sink_ops testsink_ops = .pfnReceive = testsink_Receive, .sink_new_segment = testsink_new_segment, .sink_eos = testsink_eos, + .sink_begin_flush = testsink_begin_flush, + .sink_end_flush = testsink_end_flush, }; static void testfilter_init(struct testfilter *filter) @@ -1693,6 +1709,35 @@ static void test_streaming_events(IMediaControl *control, IPin *sink, IMemInputP hr = IMemInputPin_Receive(input, sample); todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + got_Flush = 0; + ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + ok(!testsink2->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink2->got_begin_flush); + hr = IPin_BeginFlush(sink); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + ok(testsink2->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink2->got_begin_flush); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(sink); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ok(!testsink->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + ok(!testsink2->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink2->got_end_flush); + hr = IPin_EndFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + ok(testsink2->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink2->got_end_flush); + ok(got_Flush, "Expected IMediaObject::Flush().\n"); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(got_ProcessInput == 1, "Got %u calls to ProcessInput().\n", got_ProcessInput); + todo_wine ok(got_ProcessOutput == 1, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); + todo_wine ok(got_Receive == 2, "Got %u calls to Receive().\n", got_Receive); + got_ProcessInput = got_ProcessOutput = got_Receive = 0; + hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); IMediaSample_Release(sample);

1 0