February 2021 - Wine-Commits

Nikolay Sivov : mfreadwrite/reader: Keep a reference to configuration attributes.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: cf4fe13a41b7cc0a624da7741ae528ef21032736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4fe13a41b7cc0a624da774… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:32:29 2021 +0300 mfreadwrite/reader: Keep a reference to configuration attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 6 ++++++ dlls/mfreadwrite/tests/mfplat.c | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 0e0fe1ad9cd..86507bde5a1 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -169,6 +169,7 @@ struct source_reader IMFMediaSource *source; IMFPresentationDescriptor *descriptor; IMFSourceReaderCallback *async_callback; + IMFAttributes *attributes; unsigned int first_audio_stream_index; unsigned int first_video_stream_index; unsigned int last_read_index; @@ -1268,6 +1269,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); + if (reader->attributes) + IMFAttributes_Release(reader->attributes); IMFMediaSource_Release(reader->source); for (i = 0; i < reader->stream_count; ++i) @@ -2162,6 +2165,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (attributes) { + object->attributes = attributes; + IMFAttributes_AddRef(object->attributes); + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, &IID_IMFSourceReaderCallback, (void **)&object->async_callback); if (object->async_callback) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8455ac64688..9d84265244a 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -41,6 +41,13 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); #include "wine/heap.h" #include "wine/test.h" +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static void init_functions(void) @@ -620,6 +627,7 @@ static void test_source_reader(void) IMFByteStream *stream; LONGLONG timestamp; IMFSample *sample; + ULONG refcount; BOOL selected; HRESULT hr; @@ -836,9 +844,12 @@ skip_read_sample: ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); + refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); -todo_wine +todo_wine { ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); +} IMFAttributes_Release(attributes); if (hr == S_OK) IMFSourceReader_Release(reader); @@ -856,6 +867,7 @@ static void test_source_reader_from_media_source(void) IMFSample *sample; LONGLONG timestamp; IMFAttributes *attributes; + ULONG refcount; int i; source = create_test_source(); @@ -967,8 +979,10 @@ static void test_source_reader_from_media_source(void) ok(hr == S_OK, "Failed to set attribute value, hr %#x.\n", hr); IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); + refcount = get_refcount(attributes); hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + ok(get_refcount(attributes) > refcount, "Unexpected refcount.\n"); hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfreadwrite/reader: Create sample allocator for video streams.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: beb9c6578ad8e21eb4b34366dbc3dff8b8c2ae5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb9c6578ad8e21eb4b34366… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 13:32:30 2021 +0300 mfreadwrite/reader: Create sample allocator for video streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 78 +++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/Makefile.in | 2 +- dlls/mfreadwrite/tests/mfplat.c | 85 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 86507bde5a1..6a69196054a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -33,6 +33,9 @@ #include "mferror.h" #include "mfidl.h" #include "mfreadwrite.h" +#include "d3d9.h" +#include "initguid.h" +#include "dxva2api.h" #include "wine/debug.h" #include "wine/heap.h" @@ -108,6 +111,7 @@ struct media_stream IMFMediaStream *stream; IMFMediaType *current; IMFTransform *decoder; + IMFVideoSampleAllocatorEx *allocator; unsigned int id; unsigned int index; enum media_stream_state state; @@ -157,6 +161,9 @@ enum source_reader_flags SOURCE_READER_FLUSHING = 0x1, SOURCE_READER_SEEKING = 0x2, SOURCE_READER_SHUTDOWN_ON_RELEASE = 0x4, + SOURCE_READER_D3D9_DEVICE_MANAGER = 0x8, + SOURCE_READER_DXGI_DEVICE_MANAGER = 0x10, + SOURCE_READER_HAS_DEVICE_MANAGER = SOURCE_READER_D3D9_DEVICE_MANAGER | SOURCE_READER_DXGI_DEVICE_MANAGER, }; struct source_reader @@ -170,6 +177,7 @@ struct source_reader IMFPresentationDescriptor *descriptor; IMFSourceReaderCallback *async_callback; IMFAttributes *attributes; + IUnknown *device_manager; unsigned int first_audio_stream_index; unsigned int first_video_stream_index; unsigned int last_read_index; @@ -1283,6 +1291,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaType_Release(stream->current); if (stream->decoder) IMFTransform_Release(stream->decoder); + if (stream->allocator) + IMFVideoSampleAllocatorEx_Release(stream->allocator); } source_reader_release_responses(reader, NULL); heap_free(reader->streams); @@ -1519,6 +1529,48 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return type_set ? S_OK : S_FALSE; } +static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index, + IMFMediaType *media_type) +{ + struct media_stream *stream = &reader->streams[index]; + GUID major = { 0 }; + HRESULT hr; + + IMFMediaType_GetMajorType(media_type, &major); + if (!IsEqualGUID(&major, &MFMediaType_Video)) + return S_OK; + + if (!(reader->flags & SOURCE_READER_HAS_DEVICE_MANAGER)) + return S_OK; + + if (reader->flags & SOURCE_READER_DXGI_DEVICE_MANAGER) + { + FIXME("DXGI device manager is not supported.\n"); + return S_OK; + } + + if (!stream->allocator) + { + if (FAILED(hr = MFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&stream->allocator))) + { + WARN("Failed to create sample allocator, hr %#x.\n", hr); + return hr; + } + } + + IMFVideoSampleAllocatorEx_UninitializeSampleAllocator(stream->allocator); + if (FAILED(hr = IMFVideoSampleAllocatorEx_SetDirectXManager(stream->allocator, reader->device_manager))) + { + WARN("Failed to set device manager, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, media_type))) + WARN("Failed to initialize sample allocator, hr %#x.\n", hr); + + return hr; +} + static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWORD index, const CLSID *clsid, IMFMediaType *input_type, IMFMediaType *output_type) { @@ -1668,8 +1720,11 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO EnterCriticalSection(&reader->cs); - if ((hr = source_reader_set_compatible_media_type(reader, index, type)) == S_FALSE) + hr = source_reader_set_compatible_media_type(reader, index, type); + if (hr == S_FALSE) hr = source_reader_create_decoder_for_stream(reader, index, type); + if (SUCCEEDED(hr)) + hr = source_reader_setup_sample_allocator(reader, index, type); LeaveCriticalSection(&reader->cs); @@ -2172,6 +2227,27 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri (void **)&object->async_callback); if (object->async_callback) TRACE("Using async callback %p.\n", object->async_callback); + + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_D3D_MANAGER, &IID_IUnknown, (void **)&object->device_manager); + if (object->device_manager) + { + IUnknown *unk = NULL; + + if (SUCCEEDED(IUnknown_QueryInterface(object->device_manager, &IID_IMFDXGIDeviceManager, (void **)&unk))) + object->flags |= SOURCE_READER_DXGI_DEVICE_MANAGER; + else if (SUCCEEDED(IUnknown_QueryInterface(object->device_manager, &IID_IDirect3DDeviceManager9, (void **)&unk))) + object->flags |= SOURCE_READER_D3D9_DEVICE_MANAGER; + + if (!(object->flags & (SOURCE_READER_HAS_DEVICE_MANAGER))) + { + WARN("Unknown device manager.\n"); + IUnknown_Release(object->device_manager); + object->device_manager = NULL; + } + + if (unk) + IUnknown_Release(unk); + } } hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); diff --git a/dlls/mfreadwrite/tests/Makefile.in b/dlls/mfreadwrite/tests/Makefile.in index ae86fed95f6..c7476c14c6b 100644 --- a/dlls/mfreadwrite/tests/Makefile.in +++ b/dlls/mfreadwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfreadwrite.dll -IMPORTS = ole32 mfplat mfreadwrite mfuuid +IMPORTS = ole32 user32 d3d9 dxva2 mfplat mfreadwrite mfuuid C_SRCS = \ mfplat.c diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 9d84265244a..c6191767164 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "d3d9.h" +#include "dxva2api.h" #include "wine/heap.h" #include "wine/test.h" @@ -48,6 +50,37 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "mfreadwrite_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + +static IDirect3DDevice9 *create_d3d9_device(IDirect3D9 *d3d9, HWND focus_window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device = NULL; + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + present_parameters.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; + + IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); + + return device; +} + static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static void init_functions(void) @@ -1054,6 +1087,57 @@ static void test_source_reader_from_media_source(void) fail_request_sample = FALSE; } +static void test_reader_d3d9(void) +{ + IDirect3DDeviceManager9 *d3d9_manager; + IDirect3DDevice9 *d3d9_device; + IMFAttributes *attributes; + IMFSourceReader *reader; + IMFMediaSource *source; + IDirect3D9 *d3d9; + HWND window; + HRESULT hr; + UINT token; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D9 object.\n"); + if (!(d3d9_device = create_d3d9_device(d3d9, window))) + { + skip("Failed to create a D3D9 device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &d3d9_manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + hr = MFCreateAttributes(&attributes, 1); + ok(hr == S_OK, "Failed to create attributes object, hr %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &MF_SOURCE_READER_D3D_MANAGER, (IUnknown *)d3d9_manager); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSourceReaderFromMediaSource(source, attributes, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + IMFAttributes_Release(attributes); + + IMFSourceReader_Release(reader); + + IDirect3DDeviceManager9_Release(d3d9_manager); + IDirect3DDevice9_Release(d3d9_device); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(mfplat) { HRESULT hr; @@ -1066,6 +1150,7 @@ START_TEST(mfplat) test_factory(); test_source_reader(); test_source_reader_from_media_source(); + test_reader_d3d9(); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

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

Feb. 10, 2021

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

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

Feb. 10, 2021

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

Alexandre Julliard : ntdll/tests: Add some tests for NtQueryVirtualMemory(MemorySectionName).
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: 27b9a2c62140a45020e79254841c56e691a5874e URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b9a2c62140a45020e79254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 11:30:34 2021 +0100 ntdll/tests: Add some tests for NtQueryVirtualMemory(MemorySectionName). Partly based on a patch by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 405b628d712..c848248fae3 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2196,7 +2196,7 @@ static void test_threadstack(void) static void test_queryvirtualmemory(void) { NTSTATUS status; - SIZE_T readcount; + SIZE_T readcount, prev; static const char teststring[] = "test string"; static char datatestbuf[42] = "abc"; static char rwtestbuf[42]; @@ -2204,6 +2204,8 @@ static void test_queryvirtualmemory(void) char stackbuf[42]; HMODULE module; void *user_shared_data = (void *)0x7ffe0000; + char buffer[1024]; + MEMORY_SECTION_NAME *name = (MEMORY_SECTION_NAME *)buffer; module = GetModuleHandleA( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); @@ -2286,6 +2288,82 @@ static void test_queryvirtualmemory(void) /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + module = GetModuleHandleA( "ntdll.dll" ); + memset(buffer, 0xcc, sizeof(buffer)); + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemorySectionName, + name, sizeof(*name) + 16, &readcount); + ok(status == STATUS_BUFFER_OVERFLOW, "got %08x\n", status); + ok(name->SectionFileName.Length == 0xcccc || broken(!name->SectionFileName.Length), /* vista64 */ + "Wrong len %u\n", name->SectionFileName.Length); + ok(readcount > sizeof(*name), "Wrong count %lu\n", readcount); + + memset(buffer, 0xcc, sizeof(buffer)); + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemorySectionName, + name, sizeof(buffer), &readcount); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(name->SectionFileName.Buffer == (WCHAR *)(name + 1), "Wrong ptr %p/%p\n", + name->SectionFileName.Buffer, name + 1 ); + ok(name->SectionFileName.Length != 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); + ok(name->SectionFileName.MaximumLength == name->SectionFileName.Length + sizeof(WCHAR), + "Wrong maxlen %u/%u\n", name->SectionFileName.MaximumLength, name->SectionFileName.Length); + ok(readcount == sizeof(name->SectionFileName) + name->SectionFileName.MaximumLength, + "Wrong count %lu/%u\n", readcount, name->SectionFileName.MaximumLength); + ok( !name->SectionFileName.Buffer[name->SectionFileName.Length / sizeof(WCHAR)], + "buffer not null-terminated\n" ); + + memset(buffer, 0xcc, sizeof(buffer)); + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemorySectionName, + name, sizeof(buffer), NULL); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 1234, MemorySectionName, + NULL, sizeof(buffer), NULL); + ok(status == STATUS_ACCESS_VIOLATION, "got %08x\n", status); + + memset(buffer, 0xcc, sizeof(buffer)); + prev = readcount; + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)module + 321, MemorySectionName, + name, sizeof(*name) - 1, &readcount); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); + ok(readcount == prev, "Wrong count %lu\n", readcount); + + memset(buffer, 0xcc, sizeof(buffer)); + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory((HANDLE)0xdead, (char *)module + 1234, MemorySectionName, + name, sizeof(buffer), &readcount); + ok(status == STATUS_INVALID_HANDLE, "got %08x\n", status); + ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */ + "Wrong count %lu\n", readcount); + + memset(buffer, 0xcc, sizeof(buffer)); + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory(NtCurrentProcess(), buffer, MemorySectionName, + name, sizeof(buffer), &readcount); + ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status); + ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); + ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */ + "Wrong count %lu\n", readcount); + + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemorySectionName, + name, sizeof(buffer), &readcount); + ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status); + ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); + ok(readcount == 0xdeadbeef || broken(readcount == 1024 + sizeof(*name)), /* wow64 */ + "Wrong count %lu\n", readcount); + + readcount = 0xdeadbeef; + status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)0x1234, MemorySectionName, + name, sizeof(*name) - 1, &readcount); + ok(status == STATUS_INVALID_ADDRESS, "got %08x\n", status); + ok(name->SectionFileName.Length == 0xcccc, "Wrong len %u\n", name->SectionFileName.Length); + ok(readcount == 0xdeadbeef || broken(readcount == 15), /* wow64 */ + "Wrong count %lu\n", readcount); } static void test_affinity(void)

1 0

Zebediah Figura : server: Use a callback to free the accept_req structure.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: 61abc500f557cbd5f732688963843dc2d238c9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61abc500f557cbd5f7326889… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 17:40:42 2021 -0600 server: Use a callback to free the accept_req structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 15 +++++++++++++++ server/file.h | 4 ++++ server/sock.c | 23 +++++++++++------------ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/server/async.c b/server/async.c index 6da61fd502c..1ac5117edb9 100644 --- a/server/async.c +++ b/server/async.c @@ -55,6 +55,8 @@ struct async struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ + async_completion_callback completion_callback; /* callback to be called on completion */ + void *completion_callback_private; /* argument to completion_callback */ }; static void async_dump( struct object *obj, int verbose ); @@ -247,6 +249,8 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->direct_result = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; + async->completion_callback = NULL; + async->completion_callback_private = NULL; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -362,6 +366,13 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta async->timeout_status = status; } +/* set a callback to be notified when the async is completed */ +void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ) +{ + async->completion_callback = func; + async->completion_callback_private = private; +} + static void add_async_completion( struct async *async, apc_param_t cvalue, unsigned int status, apc_param_t information ) { @@ -420,6 +431,10 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->signaled = 1; wake_up( &async->obj, 0 ); } + + if (async->completion_callback) + async->completion_callback( async->completion_callback_private ); + async->completion_callback = NULL; } } diff --git a/server/file.h b/server/file.h index b41a6c3f0c4..3b70799a3ec 100644 --- a/server/file.h +++ b/server/file.h @@ -212,6 +212,9 @@ extern int is_serial_fd( struct fd *fd ); extern struct object *create_serial( struct fd *fd ); /* async I/O functions */ + +typedef void (*async_completion_callback)( void *private ); + extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ); @@ -219,6 +222,7 @@ extern obj_handle_t async_handoff( struct async *async, int success, data_size_t extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); +extern void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ); extern void set_async_pending( struct async *async, int signal ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); diff --git a/server/sock.c b/server/sock.c index 78b1578113b..3aed5494612 100644 --- a/server/sock.c +++ b/server/sock.c @@ -449,8 +449,9 @@ static inline int sock_error( struct fd *fd ) return optval; } -static void free_accept_req( struct accept_req *req ) +static void free_accept_req( void *private ) { + struct accept_req *req = private; list_remove( &req->entry ); if (req->acceptsock) { @@ -582,7 +583,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) LIST_FOR_EACH_ENTRY( req, &sock->accept_list, struct accept_req, entry ) { - if (!req->accepted) + if (req->iosb->status == STATUS_PENDING && !req->accepted) { complete_async_accept( sock, req ); if (get_error() != STATUS_PENDING) @@ -591,7 +592,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) } } - if (sock->accept_recv_req) + if (sock->accept_recv_req && sock->accept_recv_req->iosb->status == STATUS_PENDING) { complete_async_accept_recv( sock->accept_recv_req ); if (get_error() != STATUS_PENDING) @@ -626,9 +627,12 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) async_wake_up( &sock->write_q, status ); LIST_FOR_EACH_ENTRY_SAFE( req, next, &sock->accept_list, struct accept_req, entry ) - async_terminate( req->async, status ); + { + if (req->iosb->status == STATUS_PENDING) + async_terminate( req->async, status ); + } - if (sock->accept_recv_req) + if (sock->accept_recv_req && sock->accept_recv_req->iosb->status == STATUS_PENDING) async_terminate( sock->accept_recv_req->async, status ); } @@ -872,13 +876,6 @@ static void sock_queue_async( struct fd *fd, struct async *async, int type, int static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); - struct accept_req *req, *next; - - LIST_FOR_EACH_ENTRY_SAFE( req, next, &sock->accept_list, struct accept_req, entry ) - { - if (req->iosb->status != STATUS_PENDING) - free_accept_req( req ); - } /* ignore reselect on ifchange queue */ if (&sock->ifchange_q != queue) @@ -1434,6 +1431,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!(req = alloc_accept_req( sock, NULL, async, NULL ))) return 0; list_add_tail( &sock->accept_list, &req->entry ); + async_set_completion_callback( async, free_accept_req, req ); queue_async( &sock->accept_q, async ); sock_reselect( sock ); set_error( STATUS_PENDING ); @@ -1490,6 +1488,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) release_object( acceptsock ); acceptsock->wparam = params->accept_handle; + async_set_completion_callback( async, free_accept_req, req ); queue_async( &sock->accept_q, async ); sock_reselect( sock ); set_error( STATUS_PENDING );

1 0

Zebediah Figura : server: Hold a reference to both sockets in the accept_req structure.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

Module: wine Branch: master Commit: 12783dabbcff59d31e4973b09d2e0b8442ed3931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12783dabbcff59d31e4973b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 17:40:41 2021 -0600 server: Hold a reference to both sockets in the accept_req structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6523418f779..78b1578113b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -127,7 +127,7 @@ struct accept_req struct list entry; struct async *async; struct iosb *iosb; - struct sock *acceptsock; + struct sock *sock, *acceptsock; int accepted; unsigned int recv_len, local_len; }; @@ -452,9 +452,14 @@ static inline int sock_error( struct fd *fd ) static void free_accept_req( struct accept_req *req ) { list_remove( &req->entry ); - if (req->acceptsock) req->acceptsock->accept_recv_req = NULL; + if (req->acceptsock) + { + req->acceptsock->accept_recv_req = NULL; + release_object( req->acceptsock ); + } release_object( req->async ); release_object( req->iosb ); + release_object( req->sock ); free( req ); } @@ -1361,7 +1366,7 @@ static int sock_get_ntstatus( int err ) } } -static struct accept_req *alloc_accept_req( struct sock *acceptsock, struct async *async, +static struct accept_req *alloc_accept_req( struct sock *sock, struct sock *acceptsock, struct async *async, const struct afd_accept_into_params *params ) { struct accept_req *req = mem_alloc( sizeof(*req) ); @@ -1370,7 +1375,9 @@ static struct accept_req *alloc_accept_req( struct sock *acceptsock, struct asyn { req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); + req->sock = (struct sock *)grab_object( sock ); req->acceptsock = acceptsock; + if (acceptsock) grab_object( acceptsock ); req->accepted = 0; req->recv_len = 0; req->local_len = 0; @@ -1424,7 +1431,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (sock->state & FD_WINE_NONBLOCKING) return 0; if (get_error() != (0xc0010000 | WSAEWOULDBLOCK)) return 0; - if (!(req = alloc_accept_req( NULL, async, NULL ))) return 0; + if (!(req = alloc_accept_req( sock, NULL, async, NULL ))) return 0; list_add_tail( &sock->accept_list, &req->entry ); queue_async( &sock->accept_q, async ); @@ -1473,7 +1480,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - if (!(req = alloc_accept_req( acceptsock, async, params ))) + if (!(req = alloc_accept_req( sock, acceptsock, async, params ))) { release_object( acceptsock ); return 0;

1 0

Piotr Caban : msvcr120: Relax gettnames structure layout tests.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

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

Paul Gofman : cryptsp: Add dll.
by Alexandre Julliard Feb. 10, 2021

Feb. 10, 2021

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

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

Feb. 10, 2021

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