February 2021 - Wine-commits

Nikolay Sivov : dwrite/shaping: Make sure initial glyph buffer can fit at least one glyph per WCHAR.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 23638b44ed4ee6fc7b406bbd4ac43ddf6e2be35d URL: https://source.winehq.org/git/wine.git/?a=commit;h=23638b44ed4ee6fc7b406bbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 14:31:13 2021 +0300 dwrite/shaping: Make sure initial glyph buffer can fit at least one glyph per WCHAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index f717bb47c80..53fb18df4c9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1154,6 +1154,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, struct scriptshaping_context context = { 0 }; struct dwrite_fontface *font_obj; WCHAR digits[NATIVE_DIGITS_LEN]; + unsigned int glyph_count; HRESULT hr; TRACE("%s:%u, %p, %d, %d, %s, %s, %p, %p, %p, %u, %u, %p, %p, %p, %p, %p.\n", debugstr_wn(text, length), @@ -1163,12 +1164,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, analyzer_dump_user_features(features, feature_range_lengths, feature_ranges); - if (max_glyph_count < length) - return E_NOT_SUFFICIENT_BUFFER; - get_number_substitutes(substitution, is_rtl, digits); - font_obj = unsafe_impl_from_IDWriteFontFace(fontface); + glyph_count = max(max_glyph_count, length); context.cache = fontface_get_shaping_cache(font_obj); context.script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; @@ -1176,18 +1174,18 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.length = length; context.is_rtl = is_rtl; context.is_sideways = is_sideways; - context.u.subst.glyphs = heap_calloc(max_glyph_count, sizeof(*glyphs)); - context.u.subst.glyph_props = heap_calloc(max_glyph_count, sizeof(*glyph_props)); + context.u.subst.glyphs = heap_calloc(glyph_count, sizeof(*glyphs)); + context.u.subst.glyph_props = heap_calloc(glyph_count, sizeof(*glyph_props)); context.u.subst.text_props = text_props; context.u.subst.clustermap = clustermap; context.u.subst.max_glyph_count = max_glyph_count; - context.u.subst.capacity = max_glyph_count; + context.u.subst.capacity = glyph_count; context.u.subst.digits = digits; context.language_tag = get_opentype_language(locale); context.user_features.features = features; context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; - context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * max_glyph_count); + context.glyph_infos = heap_calloc(glyph_count, sizeof(*context.glyph_infos)); context.table = &context.cache->gsub; scriptprops = &dwritescripts_properties[context.script];

1 0

Rémi Bernon : ntdll/tests: Remove traces from threadpool callbacks.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: bf846d05ed7f53ae5b39ce81cb88b3cf1e8efb74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf846d05ed7f53ae5b39ce81… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 10 12:56:03 2021 +0100 ntdll/tests: Remove traces from threadpool callbacks. They seem to cause spurious failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 24f32346fbe..4045cfa4081 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -119,7 +119,6 @@ static BOOL init_threadpool(void) static DWORD CALLBACK rtl_work_cb(void *userdata) { HANDLE semaphore = userdata; - trace("Running rtl_work callback\n"); ReleaseSemaphore(semaphore, 1, NULL); return 0; } @@ -175,8 +174,6 @@ static void CALLBACK rtl_wait_cb(void *userdata, BOOLEAN timeout) struct rtl_wait_info *info = userdata; DWORD result; - trace("Running rtl_wait callback\n"); - if (!timeout) InterlockedIncrement(&info->userdata); else @@ -196,7 +193,6 @@ static HANDLE rtl_wait_apc_semaphore; static void CALLBACK rtl_wait_apc_cb(ULONG_PTR userdata) { - trace("Running rtl_wait_apc callback\n"); if (rtl_wait_apc_semaphore) ReleaseSemaphore(rtl_wait_apc_semaphore, 1, NULL); } @@ -481,13 +477,11 @@ static void test_RtlRegisterWait(void) static void CALLBACK simple_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE semaphore = userdata; - trace("Running simple callback\n"); ReleaseSemaphore(semaphore, 1, NULL); } static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { - trace("Running simple2 callback\n"); Sleep(50); InterlockedIncrement((LONG *)userdata); } @@ -605,14 +599,12 @@ static void test_tp_simple(void) static void CALLBACK work_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) { - trace("Running work callback\n"); Sleep(100); InterlockedIncrement((LONG *)userdata); } static void CALLBACK work2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) { - trace("Running work2 callback\n"); Sleep(100); InterlockedExchangeAdd((LONG *)userdata, 0x10000); } @@ -735,7 +727,6 @@ static void test_tp_work_scheduler(void) static void CALLBACK simple_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; - trace("Running simple release callback\n"); ReleaseSemaphore(semaphores, 1, NULL); Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ } @@ -743,7 +734,6 @@ static void CALLBACK simple_release_cb(TP_CALLBACK_INSTANCE *instance, void *use static void CALLBACK work_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) { HANDLE semaphore = userdata; - trace("Running work release callback\n"); ReleaseSemaphore(semaphore, 1, NULL); Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ pTpReleaseWork(work); @@ -752,7 +742,6 @@ static void CALLBACK work_release_cb(TP_CALLBACK_INSTANCE *instance, void *userd static void CALLBACK timer_release_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_TIMER *timer) { HANDLE semaphore = userdata; - trace("Running timer release callback\n"); ReleaseSemaphore(semaphore, 1, NULL); Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ pTpReleaseTimer(timer); @@ -762,7 +751,6 @@ static void CALLBACK wait_release_cb(TP_CALLBACK_INSTANCE *instance, void *userd TP_WAIT *wait, TP_WAIT_RESULT result) { HANDLE semaphore = userdata; - trace("Running wait release callback\n"); ReleaseSemaphore(semaphore, 1, NULL); Sleep(200); /* wait until main thread is in TpReleaseCleanupGroupMembers */ pTpReleaseWait(wait); @@ -855,8 +843,6 @@ static void CALLBACK simple_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void DWORD result; int i; - trace("Running simple group cancel callback\n"); - status = pTpCallbackMayRunLong(instance); ok(status == STATUS_TOO_MANY_THREADS || broken(status == 1) /* Win Vista / 2008 */, "expected STATUS_TOO_MANY_THREADS, got %08x\n", status); @@ -875,8 +861,6 @@ static void CALLBACK work_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void * HANDLE *semaphores = userdata; DWORD result; - trace("Running work group cancel callback\n"); - ReleaseSemaphore(semaphores[1], 1, NULL); result = WaitForSingleObject(semaphores[0], 200); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); @@ -885,7 +869,6 @@ static void CALLBACK work_group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void * static void CALLBACK group_cancel_cleanup_release_cb(void *object, void *userdata) { HANDLE *semaphores = userdata; - trace("Running group cancel cleanup release callback\n"); group_cancel_tid = GetCurrentThreadId(); ok(object == (void *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", object); ReleaseSemaphore(semaphores[0], 1, NULL); @@ -894,7 +877,6 @@ static void CALLBACK group_cancel_cleanup_release_cb(void *object, void *userdat static void CALLBACK group_cancel_cleanup_release2_cb(void *object, void *userdata) { HANDLE *semaphores = userdata; - trace("Running group cancel cleanup release2 callback\n"); group_cancel_tid = GetCurrentThreadId(); ok(object == userdata, "expected %p, got %p\n", userdata, object); ReleaseSemaphore(semaphores[0], 1, NULL); @@ -902,7 +884,6 @@ static void CALLBACK group_cancel_cleanup_release2_cb(void *object, void *userda static void CALLBACK group_cancel_cleanup_increment_cb(void *object, void *userdata) { - trace("Running group cancel cleanup increment callback\n"); group_cancel_tid = GetCurrentThreadId(); InterlockedIncrement((LONG *)userdata); } @@ -1089,7 +1070,6 @@ static void test_tp_group_cancel(void) static void CALLBACK instance_semaphore_completion_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; - trace("Running instance completion callback\n"); pTpCallbackReleaseSemaphoreOnCompletion(instance, semaphores[0], 1); } @@ -1098,8 +1078,7 @@ static void CALLBACK instance_finalization_cb(TP_CALLBACK_INSTANCE *instance, vo HANDLE *semaphores = userdata; DWORD result; - trace("Running instance finalization callback\n"); - + Sleep(50); result = WaitForSingleObject(semaphores[0], 100); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); @@ -1156,8 +1135,6 @@ static void CALLBACK disassociate_cb(TP_CALLBACK_INSTANCE *instance, void *userd HANDLE *semaphores = userdata; DWORD result; - trace("Running disassociate callback\n"); - pTpDisassociateCallback(instance); result = WaitForSingleObject(semaphores[0], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); @@ -1169,8 +1146,6 @@ static void CALLBACK disassociate2_cb(TP_CALLBACK_INSTANCE *instance, void *user HANDLE *semaphores = userdata; DWORD result; - trace("Running disassociate2 callback\n"); - pTpDisassociateCallback(instance); result = WaitForSingleObject(semaphores[0], 100); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); @@ -1182,8 +1157,6 @@ static void CALLBACK disassociate3_cb(TP_CALLBACK_INSTANCE *instance, void *user HANDLE *semaphores = userdata; DWORD result; - trace("Running disassociate3 callback\n"); - pTpDisassociateCallback(instance); result = WaitForSingleObject(semaphores[0], 100); ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); @@ -1300,7 +1273,6 @@ static void test_tp_disassociate(void) static void CALLBACK timer_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_TIMER *timer) { HANDLE semaphore = userdata; - trace("Running timer callback\n"); ReleaseSemaphore(semaphore, 1, NULL); } @@ -1440,7 +1412,6 @@ struct window_length_info static void CALLBACK window_length_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_TIMER *timer) { struct window_length_info *info = userdata; - trace("Running window length callback\n"); info->ticks = GetTickCount(); ReleaseSemaphore(info->semaphore, 1, NULL); } @@ -1558,8 +1529,6 @@ static void CALLBACK wait_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WAIT *wait, TP_WAIT_RESULT result) { struct wait_info *info = userdata; - trace("Running wait callback\n"); - if (result == WAIT_OBJECT_0) InterlockedIncrement(&info->userdata); else if (result == WAIT_TIMEOUT)

1 0

Rémi Bernon : ntdll/tests: Test RtlRegisterWait with WT_EXECUTEINWAITTHREAD flag.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 6a45c160f4b73acd5d8dc65191553542be40e68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a45c160f4b73acd5d8dc651… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 10 12:56:04 2021 +0100 ntdll/tests: Test RtlRegisterWait with WT_EXECUTEINWAITTHREAD flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47843 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 91 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 4045cfa4081..e18ad4dd76d 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -203,7 +203,7 @@ static void test_RtlRegisterWait(void) struct rtl_wait_info info; HANDLE semaphores[2]; NTSTATUS status; - DWORD result; + DWORD result, threadid; semaphores[0] = CreateSemaphoreW(NULL, 0, 2, NULL); ok(semaphores[0] != NULL, "failed to create semaphore\n"); @@ -294,6 +294,69 @@ static void test_RtlRegisterWait(void) status = RtlDeregisterWait(wait1); ok(!status, "RtlDeregisterWait failed with status %x\n", status); + /* test RtlRegisterWait WT_EXECUTEINWAITTHREAD flag */ + info.userdata = 0; + info.threadid = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 200); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + ok(info.threadid && info.threadid != GetCurrentThreadId(), "unexpected wait thread id %x\n", info.threadid); + threadid = info.threadid; + result = WaitForSingleObject(semaphores[1], 0); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); + status = RtlDeregisterWait(wait1); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); + + info.userdata = 0; + info.threadid = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 200); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + todo_wine ok(info.threadid == threadid, "unexpected different wait thread id %x\n", info.threadid); + result = WaitForSingleObject(semaphores[1], 0); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); + status = RtlDeregisterWait(wait1); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); + + /* test RtlRegisterWait WT_EXECUTEINWAITTHREAD flag with 0 timeout */ + info.userdata = 0; + info.threadid = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 0, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + result = WaitForSingleObject(semaphores[0], 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 0x10000, "expected info.userdata = 0x10000, got %u\n", info.userdata); + ok(info.threadid == threadid, "unexpected different wait thread id %x\n", info.threadid); + result = WaitForSingleObject(semaphores[1], 0); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); + status = RtlDeregisterWait(wait1); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); + + /* test RtlRegisterWait WT_EXECUTEINWAITTHREAD flag with already signaled event */ + info.userdata = 0; + info.threadid = 0; + ReleaseSemaphore(semaphores[1], 1, NULL); + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, 200, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + result = WaitForSingleObject(semaphores[0], 200); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + todo_wine ok(info.threadid == threadid, "unexpected different wait thread id %x\n", info.threadid); + result = WaitForSingleObject(semaphores[1], 0); + ok(result == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", result); + Sleep(50); + status = RtlDeregisterWait(wait1); + ok(!status, "RtlDeregisterWait failed with status %x\n", status); + /* test for IO threads */ info.userdata = 0; info.threadid = 0; @@ -427,6 +490,19 @@ static void test_RtlRegisterWait(void) result = WaitForSingleObject(semaphores[0], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + info.userdata = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + status = RtlDeregisterWait(wait1); + ok(status == STATUS_PENDING, "expected STATUS_PENDING, got %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE); ok(!status, "RtlRegisterWait failed with status %x\n", status); @@ -453,6 +529,19 @@ static void test_RtlRegisterWait(void) result = WaitForSingleObject(semaphores[0], 0); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + info.wait_result = WAIT_TIMEOUT; + info.userdata = 0; + status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEINWAITTHREAD|WT_EXECUTEONLYONCE); + ok(!status, "RtlRegisterWait failed with status %x\n", status); + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(info.userdata == 1, "expected info.userdata = 1, got %u\n", info.userdata); + status = RtlDeregisterWaitEx(wait1, INVALID_HANDLE_VALUE); + ok(!status, "RtlDeregisterWaitEx failed with status %x\n", status); + result = WaitForSingleObject(semaphores[0], 0); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + info.wait_result = WAIT_OBJECT_0; info.userdata = 0; status = RtlRegisterWait(&wait1, semaphores[1], rtl_wait_cb, &info, INFINITE, WT_EXECUTEONLYONCE);

1 0

Paul Gofman : cryptsp: Add dll.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 4bb44913ad837fe34b8144e4fc8f26f95e329ef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bb44913ad837fe34b8144e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 10 15:50:12 2021 +0300 cryptsp: Add dll. Required for newer native d3dcompiler_47.dll. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/cryptsp/Makefile.in | 3 +++ dlls/cryptsp/cryptsp.spec | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+) diff --git a/configure b/configure index 8d782ad0353..8567a9ca4ef 100755 --- a/configure +++ b/configure @@ -1182,6 +1182,7 @@ enable_cryptdlg enable_cryptdll enable_cryptext enable_cryptnet +enable_cryptsp enable_cryptui enable_ctapi32 enable_ctl3d32 @@ -20277,6 +20278,7 @@ wine_fn_config_makefile dlls/cryptdll enable_cryptdll wine_fn_config_makefile dlls/cryptext enable_cryptext wine_fn_config_makefile dlls/cryptnet enable_cryptnet wine_fn_config_makefile dlls/cryptnet/tests enable_tests +wine_fn_config_makefile dlls/cryptsp enable_cryptsp wine_fn_config_makefile dlls/cryptui enable_cryptui wine_fn_config_makefile dlls/cryptui/tests enable_tests wine_fn_config_makefile dlls/ctapi32 enable_ctapi32 diff --git a/configure.ac b/configure.ac index 9d8f831e0fc..0549a9ee78a 100644 --- a/configure.ac +++ b/configure.ac @@ -3072,6 +3072,7 @@ WINE_CONFIG_MAKEFILE(dlls/cryptdll) WINE_CONFIG_MAKEFILE(dlls/cryptext) WINE_CONFIG_MAKEFILE(dlls/cryptnet) WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests) +WINE_CONFIG_MAKEFILE(dlls/cryptsp) WINE_CONFIG_MAKEFILE(dlls/cryptui) WINE_CONFIG_MAKEFILE(dlls/cryptui/tests) WINE_CONFIG_MAKEFILE(dlls/ctapi32) diff --git a/dlls/cryptsp/Makefile.in b/dlls/cryptsp/Makefile.in new file mode 100644 index 00000000000..2422119d806 --- /dev/null +++ b/dlls/cryptsp/Makefile.in @@ -0,0 +1,3 @@ +MODULE = cryptsp.dll + +IMPORTS = advapi32 diff --git a/dlls/cryptsp/cryptsp.spec b/dlls/cryptsp/cryptsp.spec new file mode 100644 index 00000000000..98626b759f3 --- /dev/null +++ b/dlls/cryptsp/cryptsp.spec @@ -0,0 +1,65 @@ +@ stub CheckSignatureInFile +@ stdcall -import CryptAcquireContextA(ptr str str long long) +@ stdcall -import CryptAcquireContextW(ptr wstr wstr long long) +@ stdcall -import CryptContextAddRef(long ptr long) +@ stdcall -import CryptCreateHash(long long long long ptr) +@ stdcall -import CryptDecrypt(long long long long ptr ptr) +@ stdcall -import CryptDeriveKey(long long long long ptr) +@ stdcall -import CryptDestroyHash(long) +@ stdcall -import CryptDestroyKey(long) +@ stdcall -import CryptDuplicateHash(long ptr long ptr) +@ stdcall -import CryptDuplicateKey(long ptr long ptr) +@ stdcall -import CryptEncrypt(long long long long ptr ptr long) +@ stdcall -import CryptEnumProviderTypesA(long ptr long ptr ptr ptr) +@ stdcall -import CryptEnumProviderTypesW(long ptr long ptr ptr ptr) +@ stdcall -import CryptEnumProvidersA(long ptr long ptr ptr ptr) +@ stdcall -import CryptEnumProvidersW(long ptr long ptr ptr ptr) +@ stdcall -import CryptExportKey(long long long long ptr ptr) +@ stdcall -import CryptGenKey(long long long ptr) +@ stdcall -import CryptGenRandom(long long ptr) +@ stdcall -import CryptGetDefaultProviderA(long ptr long ptr ptr) +@ stdcall -import CryptGetDefaultProviderW(long ptr long ptr ptr) +@ stdcall -import CryptGetHashParam(long long ptr ptr long) +@ stdcall -import CryptGetKeyParam(long long ptr ptr long) +@ stdcall -import CryptGetProvParam(long long ptr ptr long) +@ stdcall -import CryptGetUserKey(long long ptr) +@ stdcall -import CryptHashData(long ptr long long) +@ stdcall -import CryptHashSessionKey(long long long) +@ stdcall -import CryptImportKey(long ptr long long long ptr) +@ stdcall -import CryptReleaseContext(long long) +@ stdcall -import CryptSetHashParam(long long ptr long) +@ stdcall -import CryptSetKeyParam(long long ptr long) +@ stdcall -import CryptSetProvParam(long long ptr long) +@ stdcall -import CryptSetProviderA(str long) +@ stdcall -import CryptSetProviderExA(str long ptr long) +@ stdcall -import CryptSetProviderExW(wstr long ptr long) +@ stdcall -import CryptSetProviderW(wstr long) +@ stdcall -import CryptSignHashA(long long str long ptr ptr) +@ stdcall -import CryptSignHashW(long long wstr long ptr ptr) +@ stdcall -import CryptVerifySignatureA(long ptr long long str long) +@ stdcall -import CryptVerifySignatureW(long ptr long long wstr long) +@ stdcall -import SystemFunction006(ptr ptr) +@ stdcall -import SystemFunction007(ptr ptr) +@ stdcall -import SystemFunction008(ptr ptr ptr) +@ stdcall -import SystemFunction009(ptr ptr ptr) +@ stdcall -import SystemFunction010(ptr ptr ptr) +@ stdcall -import SystemFunction011(ptr ptr ptr) +@ stdcall -import SystemFunction012(ptr ptr ptr) +@ stdcall -import SystemFunction013(ptr ptr ptr) +@ stdcall -import SystemFunction014(ptr ptr ptr) +@ stdcall -import SystemFunction015(ptr ptr ptr) +@ stdcall -import SystemFunction016(ptr ptr ptr) +@ stdcall -import SystemFunction018(ptr ptr ptr) +@ stdcall -import SystemFunction020(ptr ptr ptr) +@ stdcall -import SystemFunction021(ptr ptr ptr) +@ stdcall -import SystemFunction022(ptr ptr ptr) +@ stdcall -import SystemFunction023(ptr ptr ptr) +@ stdcall -import SystemFunction024(ptr ptr ptr) +@ stdcall -import SystemFunction025(ptr ptr ptr) +@ stdcall -import SystemFunction026(ptr ptr ptr) +@ stdcall -import SystemFunction027(ptr ptr ptr) +@ stdcall -import SystemFunction030(ptr ptr) +@ stdcall -import SystemFunction031(ptr ptr) +@ stdcall -import SystemFunction032(ptr ptr) +@ stub SystemFunction033 +@ stdcall -import SystemFunction035(str)

1 0

Piotr Caban : msvcr120: Relax gettnames structure layout tests.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 20b1dd9b1565ba2f23f4f266b47259ed83df4a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b1dd9b1565ba2f23f4f266… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 10 14:36:43 2021 +0100 msvcr120: Relax gettnames structure layout tests. Fixes test failure on newtb-wvistaadm testbot machine. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index b3e3828156b..e8ef2be3520 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -575,7 +575,8 @@ static void test_gettnames(void* (CDECL *p_gettnames)(void)) i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } - ok(ret->str[42] + strlen(ret->str[42])+1 == (char*)ret->wstr[0], + ok(ret->str[42] + strlen(ret->str[42]) + 1 == (char*)ret->wstr[0] || + ret->str[42] + strlen(ret->str[42]) + 2 == (char*)ret->wstr[0], "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", ret->str[42], strlen(ret->str[42]), ret->wstr[0]); p_free(ret);

1 0

Nikolay Sivov : explorerframe: Do not block clicks on the item button.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 7ac196aa0cc97e7730b81a4f67e65f6ca1f6cd8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac196aa0cc97e7730b81a4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 17:00:19 2021 +0300 explorerframe: Do not block clicks on the item button. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28786 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 0abaded85a6..b1ecace5fae 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -678,7 +678,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) { TVHITTESTINFO tvhit; IShellItem *psi; - HRESULT hr; + TRACE("%p (%p)\n", This, nmhdr); GetCursorPos(&tvhit.pt); @@ -690,17 +690,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) /* TVHT_ maps onto the corresponding NSTCEHT_ */ psi = shellitem_from_treeitem(This, tvhit.hItem); - hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - - /* The expando should not be expanded unless - * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMBUTTON) - return TRUE; - - if(SUCCEEDED(hr)) - return FALSE; - else - return TRUE; + return FAILED(events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON)); } static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam)

1 0

Roman Pišl : cmd: Fix handling of nested if-for expressions on a single line.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 6809e0599ef57d30f1a3f87f87cd006ea8d589be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6809e0599ef57d30f1a3f87f… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:43 2021 +0100 cmd: Fix handling of nested if-for expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50641 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 4 ++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e99dd24ac72..0fb40d94e49 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1599,8 +1599,14 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) { - WINE_TRACE("Found end of this nested IF statement, ending this if\n"); - break; + static const WCHAR doW[] = {'d','o'}; + if (WCMD_keyword_ws_found(doW, ARRAY_SIZE(doW), (*cmdList)->command)) { + WINE_TRACE("Still inside FOR-loop, not an end of IF statement\n"); + *cmdList = (*cmdList)->nextcommand; + } else { + WINE_TRACE("Found end of this nested IF statement, ending this if\n"); + break; + } } else if (!processThese) { if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; WINE_TRACE("Skipping this command, as in not process mode (next = %p)\n", *cmdList); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c7418b759e4..4019c51ba73 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1242,6 +1242,10 @@ goto :eof set WINE_STR_PARMS= set WINE_INT_PARMS= +echo ------------ Testing if/for ------------ +if ""=="" for %%i in (A) DO (echo %%i) +if not ""=="" for %%i in (B) DO (echo %%i) + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index f75839fdbe8..129e5313d90 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -914,6 +914,8 @@ x(a)space@ --- x(a)space@ --- +------------ Testing if/for ------------ +A ------------ Testing for ------------ --- plain FOR A

1 0

Roman Pišl : cmd: Fix handling of brackets in if-set expressions on a single line.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 2d6b0b67d91b6433744ec859b10b8ee8eb4a37b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6b0b67d91b6433744ec859… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 8 19:06:44 2021 +0100 cmd: Fix handling of brackets in if-set expressions on a single line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50642 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4019c51ba73..7cd806c3d54 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1246,6 +1246,11 @@ echo ------------ Testing if/for ------------ if ""=="" for %%i in (A) DO (echo %%i) if not ""=="" for %%i in (B) DO (echo %%i) +echo ------------ Testing if/set ------------ +set x=C:\Program Files (x86) +if ""=="" set y=%x%\dummy +echo %y% + echo ------------ Testing for ------------ echo --- plain FOR for %%i in (A B C) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 129e5313d90..bf5fcddeb9d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -916,6 +916,8 @@ x(a)space@ --- ------------ Testing if/for ------------ A +------------ Testing if/set ------------ +C:\Program Files (x86)\dummy ------------ Testing for ------------ --- plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fbe8475d8a9..dd7d14e50e5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1817,6 +1817,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; + static const WCHAR setCmd[] = {'s','e','t'}; BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1829,6 +1830,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE BOOL lastWasElse = FALSE; BOOL lastWasRedirect = TRUE; BOOL lastWasCaret = FALSE; + BOOL ignoreBracket = FALSE; /* Some expressions after if (set) require */ + /* handling brackets as a normal character */ int lineCurDepth; /* Bracket depth when line was read in */ BOOL resetAtEndOfLine = FALSE; /* Do we need to reset curdepth at EOL */ @@ -1957,6 +1960,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curPos+=if_condition_len; } + if (WCMD_keyword_ws_found(setCmd, ARRAY_SIZE(setCmd), curPos)) + ignoreBracket = TRUE; + } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { const int keyw_len = ARRAY_SIZE(ifElse) + 1; inElse = TRUE; @@ -2146,7 +2152,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE In an ELSE statement, only allow it straight away after the ELSE and whitespace */ - } else if (inIf || + } else if ((inIf && !ignoreBracket) || (inElse && lastWasElse && onlyWhiteSpace) || (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace)) {

1 0

Zebediah Figura : winegstreamer: Compare wg_format structures in GST_QUERY_ACCEPT_CAPS.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: 897800fd449ae0ea5da00206bd348aa9f76f4b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=897800fd449ae0ea5da00206… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:55 2021 -0600 winegstreamer: Compare wg_format structures in GST_QUERY_ACCEPT_CAPS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 71 ++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7c70041000c..51e7a5abef1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -628,14 +628,6 @@ static bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format return false; } -static bool amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) -{ - struct wg_format wg_format; - - wg_format_from_caps(&wg_format, caps); - return amt_from_wg_format(mt, &wg_format); -} - static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *format) { static const struct @@ -906,6 +898,32 @@ static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) return wg_format_to_caps(&wg_format); } +static bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) +{ + if (a->major_type != b->major_type) + return false; + + switch (a->major_type) + { + case WG_MAJOR_TYPE_UNKNOWN: + return false; + + case WG_MAJOR_TYPE_AUDIO: + return a->u.audio.format == b->u.audio.format + && a->u.audio.channels == b->u.audio.channels + && a->u.audio.rate == b->u.audio.rate; + + case WG_MAJOR_TYPE_VIDEO: + return a->u.video.format == b->u.video.format + && a->u.video.width == b->u.video.width + && a->u.video.height == b->u.video.height + && a->u.video.fps_d * b->u.video.fps_n == a->u.video.fps_n * b->u.video.fps_d; + } + + assert(0); + return false; +} + static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { struct parser_source *pin = gst_pad_get_element_private(pad); @@ -941,8 +959,8 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } case GST_QUERY_ACCEPT_CAPS: { + struct wg_format format; gboolean ret = TRUE; - AM_MEDIA_TYPE mt; GstCaps *caps; if (!stream->enabled) @@ -952,45 +970,14 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } gst_query_parse_accept_caps(query, &caps); - if (!amt_from_gst_caps(caps, &mt)) - return FALSE; - - if (!IsEqualGUID(&mt.majortype, &pin->pin.pin.mt.majortype) - || !IsEqualGUID(&mt.subtype, &pin->pin.pin.mt.subtype) - || !IsEqualGUID(&mt.formattype, &pin->pin.pin.mt.formattype)) - ret = FALSE; - - if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Video)) - { - const VIDEOINFOHEADER *req_vih = (VIDEOINFOHEADER *)mt.pbFormat; - const VIDEOINFOHEADER *our_vih = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; - - if (req_vih->bmiHeader.biWidth != our_vih->bmiHeader.biWidth - || req_vih->bmiHeader.biHeight != our_vih->bmiHeader.biHeight - || req_vih->bmiHeader.biBitCount != our_vih->bmiHeader.biBitCount - || req_vih->bmiHeader.biCompression != our_vih->bmiHeader.biCompression) - ret = FALSE; - } - else if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) - { - const WAVEFORMATEX *req_wfx = (WAVEFORMATEX *)mt.pbFormat; - const WAVEFORMATEX *our_wfx = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; - - if (req_wfx->nChannels != our_wfx->nChannels - || req_wfx->nSamplesPerSec != our_wfx->nSamplesPerSec - || req_wfx->wBitsPerSample != our_wfx->wBitsPerSample) - ret = FALSE; - } - - FreeMediaType(&mt); - + wg_format_from_caps(&format, caps); + ret = wg_format_compare(&format, &stream->current_format); if (!ret && WARN_ON(gstreamer)) { gchar *str = gst_caps_to_string(caps); WARN("Rejecting caps \"%s\".\n", debugstr_a(str)); g_free(str); } - gst_query_set_accept_caps_result(query, ret); return TRUE; }

1 0

Zebediah Figura : winegstreamer: Use wg_format_to_caps() in GST_QUERY_CAPS.
by Alexandre Julliard 10 Feb '21

10 Feb '21

Module: wine Branch: master Commit: f0a0b9404ec2fc1186c9c8171ae6233690d36771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a0b9404ec2fc1186c9c817… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 9 17:13:56 2021 -0600 winegstreamer: Use wg_format_to_caps() in GST_QUERY_CAPS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 51e7a5abef1..070e2eca7f7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -940,7 +940,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_caps(query, &filter); if (stream->enabled) - caps = amt_to_gst_caps(&pin->pin.pin.mt); + caps = wg_format_to_caps(&stream->current_format); else caps = gst_caps_new_any(); if (!caps)

1 0