February 2019 - Wine-Commits

Paul Gofman : ntdll/tests: Add more tests for overlapped file read.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 9dc63ca9813b9aec1384160afb19a8be9061d9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc63ca9813b9aec1384160a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:38 2019 +0300 ntdll/tests: Add more tests for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8391570..7b35569 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -598,8 +598,11 @@ static void delete_file_test(void) pRtlFreeUnicodeString( &nameW ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + static void read_file_test(void) { + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char aligned_buffer[TEST_OVERLAPPED_READ_SIZE]; const char text[] = "foobar"; HANDLE handle; IO_STATUS_BLOCK iosb; @@ -711,7 +714,45 @@ static void read_file_test(void) CloseHandle( handle ); - CloseHandle( event ); + if (!(handle = create_temp_file(FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING))) + return; + + apc_count = 0; + offset.QuadPart = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + offset.QuadPart = 0; + ResetEvent(event); + status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, + aligned_buffer, sizeof(aligned_buffer), &offset, NULL); + ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || status == STATUS_SUCCESS, + "Wrong status %x.\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(is_signaled(event), "event is not signaled.\n"); + ok(!apc_count, "apc was called.\n"); + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called.\n"); + + apc_count = 0; + offset.QuadPart = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + offset.QuadPart = 0; + ResetEvent(event); + status = pNtReadFile(handle, event, apc, &apc_count, &iosb, + aligned_buffer, sizeof(aligned_buffer), &offset, NULL); + todo_wine ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + WaitForSingleObject(event, 1000); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(is_signaled(event), "event is not signaled.\n"); + ok(!apc_count, "apc was called.\n"); + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called.\n"); + + CloseHandle(handle); + CloseHandle(event); } static void append_file_test(void)

1 0

Nikolay Sivov : mfplat: Add basic support for user queue object lifetime management.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 1fb58ab2fb08498b68d753de5456d2a1a0d6cb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb58ab2fb08498b68d753de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:05 2019 +0300 mfplat: Add basic support for user queue object lifetime management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/queue.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 40 +++++++++++++ include/mfapi.h | 3 + include/mferror.h | 2 + 5 files changed, 187 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 9813789..8f5ee77 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -16,7 +16,7 @@ @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool @ stub MFAddPeriodicCallback -@ stub MFAllocateWorkQueue +@ stdcall MFAllocateWorkQueue(ptr) @ stub MFAllocateWorkQueueEx @ stub MFAppendCollection @ stub MFAverageTimePerFrameToFrameRate @@ -119,7 +119,7 @@ @ stub MFInvokeCallback @ stub MFJoinIoPort @ stdcall MFLockPlatform() -@ stub MFLockWorkQueue +@ stdcall MFLockWorkQueue(long) @ stub MFPutWorkItem @ stub MFPutWorkItemEx @ stub MFRecordError @@ -147,7 +147,7 @@ @ stub MFTraceFuncEnter @ stub MFUnblockThread @ stdcall MFUnlockPlatform() -@ stub MFUnlockWorkQueue +@ stdcall MFUnlockWorkQueue(long) @ stub MFUnwrapMediaType @ stub MFValidateMediaTypeSize @ stub MFWrapMediaType diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 32c7a6c..65f111b 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -21,12 +21,121 @@ #define COBJMACROS #include "mfapi.h" +#include "mferror.h" #include "wine/debug.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +#define FIRST_USER_QUEUE_HANDLE 5 +#define MAX_USER_QUEUE_HANDLES 124 + +struct queue +{ + void *obj; + LONG refcount; + WORD generation; +}; + +static struct queue user_queues[MAX_USER_QUEUE_HANDLES]; +static struct queue *next_free_user_queue; +static struct queue *next_unused_user_queue = user_queues; +static WORD queue_generation; + +static CRITICAL_SECTION user_queues_section; +static CRITICAL_SECTION_DEBUG user_queues_critsect_debug = +{ + 0, 0, &user_queues_section, + { &user_queues_critsect_debug.ProcessLocksList, &user_queues_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": user_queues_section") } +}; +static CRITICAL_SECTION user_queues_section = { &user_queues_critsect_debug, -1, 0, 0, 0, 0 }; + +static struct queue *get_queue_obj(DWORD handle) +{ + unsigned int idx = HIWORD(handle) - FIRST_USER_QUEUE_HANDLE; + + if (idx < MAX_USER_QUEUE_HANDLES && user_queues[idx].refcount) + { + if (LOWORD(handle) == user_queues[idx].generation) + return &user_queues[idx]; + } + + return NULL; +} + +static HRESULT alloc_user_queue(DWORD *queue) +{ + struct queue *entry; + unsigned int idx; + + EnterCriticalSection(&user_queues_section); + + entry = next_free_user_queue; + if (entry) + next_free_user_queue = entry->obj; + else if (next_unused_user_queue < user_queues + MAX_USER_QUEUE_HANDLES) + entry = next_unused_user_queue++; + else + { + LeaveCriticalSection(&user_queues_section); + return E_OUTOFMEMORY; + } + + entry->refcount = 1; + entry->obj = NULL; + if (++queue_generation == 0xffff) queue_generation = 1; + entry->generation = queue_generation; + idx = entry - user_queues + FIRST_USER_QUEUE_HANDLE; + *queue = (idx << 16) | entry->generation; + LeaveCriticalSection(&user_queues_section); + + return S_OK; +} + +static HRESULT lock_user_queue(DWORD queue) +{ + HRESULT hr = MF_E_INVALID_WORKQUEUE; + struct queue *entry; + + if (!(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK)) + return S_OK; + + EnterCriticalSection(&user_queues_section); + entry = get_queue_obj(queue); + if (entry && entry->refcount) + { + entry->refcount++; + hr = S_OK; + } + LeaveCriticalSection(&user_queues_section); + return hr; +} + +static HRESULT unlock_user_queue(DWORD queue) +{ + HRESULT hr = MF_E_INVALID_WORKQUEUE; + struct queue *entry; + + if (!(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK)) + return S_OK; + + EnterCriticalSection(&user_queues_section); + entry = get_queue_obj(queue); + if (entry && entry->refcount) + { + if (--entry->refcount == 0) + { + entry->obj = next_free_user_queue; + next_free_user_queue = entry; + } + hr = S_OK; + } + LeaveCriticalSection(&user_queues_section); + return hr; +} + struct async_result { MFASYNCRESULT result; @@ -192,3 +301,33 @@ HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, return S_OK; } + +/*********************************************************************** + * MFAllocateWorkQueue (mfplat.@) + */ +HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue) +{ + TRACE("%p.\n", queue); + + return alloc_user_queue(queue); +} + +/*********************************************************************** + * MFLockWorkQueue (mfplat.@) + */ +HRESULT WINAPI MFLockWorkQueue(DWORD queue) +{ + TRACE("%#x.\n", queue); + + return lock_user_queue(queue); +} + +/*********************************************************************** + * MFUnlockWorkQueue (mfplat.@) + */ +HRESULT WINAPI MFUnlockWorkQueue(DWORD queue) +{ + TRACE("%#x.\n", queue); + + return unlock_user_queue(queue); +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7d202bc..8b06e23 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -838,6 +838,45 @@ static void test_startup(void) ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); } +static void test_allocate_queue(void) +{ + DWORD queue, queue2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + ok(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK, "Unexpected queue id.\n"); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(queue); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue2); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + ok(queue2 & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK, "Unexpected queue id.\n"); + + hr = MFUnlockWorkQueue(queue2); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + /* Unlock in system queue range. */ + hr = MFUnlockWorkQueue(MFASYNC_CALLBACK_QUEUE_STANDARD); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(MFASYNC_CALLBACK_QUEUE_UNDEFINED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(0x20); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -855,6 +894,7 @@ START_TEST(mfplat) test_MFCreateMemoryBuffer(); test_source_resolver(); test_MFCreateAsyncResult(); + test_allocate_queue(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 1575cc3..d70a300 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -80,6 +80,7 @@ DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0 typedef unsigned __int64 MFWORKITEM_KEY; +HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); @@ -99,6 +100,7 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, @@ -109,6 +111,7 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); +HRESULT WINAPI MFUnlockWorkQueue(DWORD queue); HRESULT WINAPI MFTUnregister(CLSID clsid); HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); diff --git a/include/mferror.h b/include/mferror.h index 1f5ae98..53024ca 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -65,6 +65,8 @@ #define MF_E_INVALID_POSITION _HRESULT_TYPEDEF_(0xc00d36e5) #define MF_E_ATTRIBUTENOTFOUND _HRESULT_TYPEDEF_(0xc00d36e6) #define MF_E_PROPERTY_TYPE_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d36e7) +#define MF_E_INVALID_WORKQUEUE _HRESULT_TYPEDEF_(0xc00d36ff) +#define MF_E_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d3e85) #define MF_E_TOPO_INVALID_OPTIONAL_NODE _HRESULT_TYPEDEF_(0xc00d520e) #define MF_E_TOPO_CANNOT_FIND_DECRYPTOR _HRESULT_TYPEDEF_(0xc00d5211)

1 0

Nikolay Sivov : mfplat/tests: Remove initialization from tests that don' t need it.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: e87faa1ad2d11dd1db8c2194bf6d350ca9840bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87faa1ad2d11dd1db8c2194… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 19 16:20:03 2019 +0300 mfplat/tests: Remove initialization from tests that don't need it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 395fde4..7d202bc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -319,12 +319,6 @@ static void test_MFCreateMediaType(void) HRESULT hr; IMFMediaType *mediatype; - hr = MFStartup(MAKELONG( MF_API_VERSION, 0xdead ), MFSTARTUP_FULL); - ok(hr == MF_E_BAD_STARTUP_VERSION, "got 0x%08x\n", hr); - - hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - if(0) { /* Crash on Windows Vista/7 */ @@ -339,8 +333,6 @@ if(0) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFMediaType_Release(mediatype); - - MFShutdown(); } static void test_MFCreateMediaEvent(void) @@ -832,12 +824,27 @@ static void test_MFCreateAsyncResult(void) ok(!refcount, "Unexpected refcount %u\n.", refcount); } +static void test_startup(void) +{ + HRESULT hr; + + hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); + ok(hr == MF_E_BAD_STARTUP_VERSION, "Unexpected hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); init_functions(); + test_startup(); test_register(); test_MFCreateMediaType(); test_MFCreateMediaEvent();

1 0

Vijay Kiran Kamuju : crypt32: Add CMSG_SIGNER_UNAUTH_ATTR_PARAM implementation.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 0d0906b56d5ffec3a6ae57570860f00dc5e053cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d0906b56d5ffec3a6ae5757… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 13 05:56:20 2019 +0100 crypt32: Add CMSG_SIGNER_UNAUTH_ATTR_PARAM implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37837 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4132390..ea96248 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2999,6 +2999,37 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, + const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size; + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + size = CRYPT_SizeOfAttributes(&in->UnauthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CRYPT_ATTRIBUTES *out = pvData; + + CRYPT_ConstructAttributes(out,&in->UnauthAttrs); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -3172,6 +3203,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_UNAUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyUnauthAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; default: FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE);

1 0

Daniel Lehman : kernel32/tests: Add tests for SpecialCasing.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 8acdd597d03100aefddee42abbe55461c0a0f4b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8acdd597d03100aefddee42a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Feb 13 18:39:48 2019 -0800 kernel32/tests: Add tests for SpecialCasing. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 186 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8acdd597d03100aefdde…

1 0

Paul Gofman : kernel32/tests: Add test for overlapped file read.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 3117370acceeb2606d0f6dde420a735fa6854a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3117370acceeb2606d0f6dde… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:37 2019 +0300 kernel32/tests: Add test for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b47b2b9..c9c2dd2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5140,6 +5140,70 @@ static void test_post_completion(void) CloseHandle( port ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + +static void test_overlapped_read(void) +{ + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char buffer[TEST_OVERLAPPED_READ_SIZE]; + static const char prefix[] = "pfx"; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + DWORD bytes_count; + OVERLAPPED ov; + HANDLE hfile; + DWORD err; + DWORD ret; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret, "Unexpect error %u.\n", GetLastError()); + ret = GetTempFileNameA(temp_path, prefix, 0, file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); + + hfile = CreateFileA(file_name, GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + memset(buffer, 0x55, sizeof(buffer)); + ret = WriteFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, NULL); + ok(ret && bytes_count == TEST_OVERLAPPED_READ_SIZE, + "Unexpected WriteFile result, ret %#x, bytes_count %u, GetLastError() %u.\n", + ret, bytes_count, GetLastError()); + CloseHandle(hfile); + + hfile = CreateFileA(file_name, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + + bytes_count = 0xffffffff; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(ret, "Unexpected error %u.\n", GetLastError()); + ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); + + S(U(ov)).Offset = bytes_count; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + err = GetLastError(); + /* Win8+ return ERROR_IO_PENDING like stated in MSDN, while older ones + * return ERROR_HANDLE_EOF right away. */ + ok(!ret && (err == ERROR_HANDLE_EOF || err == ERROR_IO_PENDING), + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + if (err == ERROR_IO_PENDING) + { + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(!ret && GetLastError() == ERROR_HANDLE_EOF, "Unexpected result %#x, GetLasttError() %u.\n", + ret, GetLastError()); + } + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + + CloseHandle(hfile); + ret = DeleteFileA(file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5209,4 +5273,5 @@ START_TEST(file) test_SetFileInformationByHandle(); test_GetFileAttributesExW(); test_post_completion(); + test_overlapped_read(); }

1 0

Byeongsik Jeon : gdi32: Add a workaround for Freetype < 2.8.1 using v40 FT_LOAD_TARGET_MONO.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: c666a45560c3998e9cf5271d2628eb2b913d0b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c666a45560c3998e9cf5271d… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Feb 19 10:25:41 2019 +0000 gdi32: Add a workaround for Freetype < 2.8.1 using v40 FT_LOAD_TARGET_MONO. Freetype < 2.8.1 v40 has incorrect advance widths and rendering issues. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0fc41f3..098faff 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -170,6 +170,7 @@ static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef FT_LCD_FILTER_H static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif +static FT_Error (*pFT_Property_Set)(FT_Library, const FT_String *, const FT_String *, const void *); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> @@ -4162,6 +4163,7 @@ static BOOL init_freetype(void) #ifdef FT_LCD_FILTER_H pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); #endif + pFT_Property_Set = wine_dlsym(ft_handle, "FT_Property_Set", NULL, 0); if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -4176,6 +4178,13 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + /* In Freetype < 2.8.1 v40's FT_LOAD_TARGET_MONO has broken advance widths. */ + if (pFT_Property_Set && FT_SimpleVersion < FT_VERSION_VALUE(2, 8, 1)) + { + FT_UInt interpreter_version = 35; + pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); + } + font_driver = &freetype_funcs; return TRUE;

1 0

Jacek Caban : atlthunk: Implement AtlThunk functions.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 89ef868e5e25d236b3673dd6d3e7bd54013e3617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ef868e5e25d236b3673dd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:15 2019 +0100 atlthunk: Implement AtlThunk functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/atlthunk.c | 148 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 144 insertions(+), 4 deletions(-) diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c index 79d0432..cd37b75 100644 --- a/dlls/atlthunk/atlthunk.c +++ b/dlls/atlthunk/atlthunk.c @@ -22,24 +22,164 @@ WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); +#if defined(__i386__) || defined(__x86_64__) + +struct AtlThunkData_t { + struct thunk_pool *pool; + WNDPROC proc; + SIZE_T arg; +}; + +/* Thunk replaces the first argument and jumps to provided proc. */ +#include "pshpack1.h" +struct thunk_code +{ +#if defined(__x86_64__) + BYTE mov_rip_rcx[3]; /* mov mov_offset(%rip), %rcx */ + DWORD mov_offset; + WORD jmp_rip; /* jmp *jmp_offset(%rip) */ + DWORD jmp_offset; +#elif defined(__i386__) + BYTE mov_data_addr_eax; /* movl data_addr, %eax */ + DWORD data_addr; + DWORD mov_eax_esp; /* movl %eax, 4(%esp) */ + WORD jmp; + DWORD jmp_addr; /* jmp *jmp_addr */ +#endif +}; +#include "poppack.h" + +#define THUNK_POOL_SIZE (4096 / sizeof(struct thunk_code)) + +struct thunk_pool +{ + struct thunk_code thunks[THUNK_POOL_SIZE]; + LONG first_free; + LONG free_count; + AtlThunkData_t data[THUNK_POOL_SIZE]; +}; + +C_ASSERT(FIELD_OFFSET(struct thunk_pool, first_free) == 4096); + +static struct thunk_pool *alloc_thunk_pool(void) +{ + struct thunk_pool *thunks; + DWORD old_protect; + unsigned i; + + if (!(thunks = VirtualAlloc(NULL, sizeof(*thunks), MEM_COMMIT, PAGE_READWRITE))) + return NULL; + + for (i = 0; i < ARRAY_SIZE(thunks->thunks); i++) + { + struct thunk_code *thunk = &thunks->thunks[i]; +#if defined(__x86_64__) + thunk->mov_rip_rcx[0] = 0x48; /* mov mov_offset(%rip), %rcx */ + thunk->mov_rip_rcx[1] = 0x8b; + thunk->mov_rip_rcx[2] = 0x0d; + thunk->mov_offset = (const BYTE *)&thunks->data[i].arg - (const BYTE *)(&thunk->mov_offset + 1); + thunk->jmp_rip = 0x25ff; /* jmp *jmp_offset(%rip) */ + thunk->jmp_offset = (const BYTE *)&thunks->data[i].proc - (const BYTE *)(&thunk->jmp_offset + 1); +#elif defined(__i386__) + thunk->mov_data_addr_eax = 0xa1; /* movl data_addr, %eax */ + thunk->data_addr = (DWORD)&thunks->data[i].arg; + thunk->mov_eax_esp = 0x04244489; /* movl %eax, 4(%esp) */ + thunk->jmp = 0x25ff; /* jmp *jmp_addr */ + thunk->jmp_addr = (DWORD)&thunks->data[i].proc; +#endif + } + VirtualProtect(thunks->thunks, FIELD_OFFSET(struct thunk_pool, first_free), PAGE_EXECUTE_READ, &old_protect); + thunks->first_free = 0; + thunks->free_count = 0; + return thunks; +} + +static struct thunk_pool *current_pool; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + if (current_pool && current_pool->free_count == current_pool->first_free) + VirtualFree(current_pool, sizeof(*current_pool), MEM_RELEASE); + break; + } + return TRUE; +} + +static CRITICAL_SECTION thunk_alloc_cs; +static CRITICAL_SECTION_DEBUG thunk_alloc_cs_debug = { + 0, 0, &thunk_alloc_cs, + { &thunk_alloc_cs_debug.ProcessLocksList, + &thunk_alloc_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": thunk_alloc_cs") } +}; +static CRITICAL_SECTION thunk_alloc_cs = { &thunk_alloc_cs_debug, -1, 0, 0, 0, 0 }; + AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) { - FIXME("\n"); + AtlThunkData_t *thunk = NULL; + + EnterCriticalSection(&thunk_alloc_cs); + + if (!current_pool) current_pool = alloc_thunk_pool(); + if (current_pool) + { + thunk = &current_pool->data[current_pool->first_free]; + thunk->pool = current_pool; + thunk->proc = NULL; + thunk->arg = 0; + if (++current_pool->first_free == ARRAY_SIZE(current_pool->data)) + current_pool = NULL; + } + + LeaveCriticalSection(&thunk_alloc_cs); + return thunk; +} + +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) +{ + WNDPROC code = (WNDPROC)&thunk->pool->thunks[thunk - thunk->pool->data]; + TRACE("(%p) -> %p\n", thunk, code); + return code; +} + +void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) +{ + if (InterlockedIncrement(&thunk->pool->free_count) == ARRAY_SIZE(thunk->pool->thunks)) + VirtualFree(thunk->pool, sizeof(*thunk->pool), MEM_RELEASE); +} + +void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) +{ + thunk->proc = proc; + thunk->arg = arg; +} + +#else /* __i386__ || __x86_64__ */ + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) +{ + FIXME("Unsupported architecture.\n"); return NULL; } WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) { - FIXME("(%p)\n", thunk); return NULL; } void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) { - FIXME("(%p)\n", thunk); } void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) { - FIXME("(%p %p %lx)\n", thunk, proc, arg); } + +#endif /* __i386__ || __x86_64__ */

1 0

Jacek Caban : atlthunk: Add stub DLL.
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: 3fe02210a9764120facba7f3be1146233359f803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fe02210a9764120facba7f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 22:06:04 2019 +0100 atlthunk: Add stub DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/atlthunk/Makefile.in | 5 +++++ dlls/atlthunk/atlthunk.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/atlthunk/atlthunk.spec | 4 ++++ 5 files changed, 57 insertions(+) diff --git a/configure b/configure index ac22582..b86e260 100755 --- a/configure +++ b/configure @@ -1119,6 +1119,7 @@ enable_atl100 enable_atl110 enable_atl80 enable_atl90 +enable_atlthunk enable_atmlib enable_authz enable_avicap32 @@ -19357,6 +19358,7 @@ wine_fn_config_makefile dlls/atl110 enable_atl110 wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 +wine_fn_config_makefile dlls/atlthunk enable_atlthunk wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 diff --git a/configure.ac b/configure.ac index e468966..da14848 100644 --- a/configure.ac +++ b/configure.ac @@ -3093,6 +3093,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl110) WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) +WINE_CONFIG_MAKEFILE(dlls/atlthunk) WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) diff --git a/dlls/atlthunk/Makefile.in b/dlls/atlthunk/Makefile.in new file mode 100644 index 0000000..1adeedf --- /dev/null +++ b/dlls/atlthunk/Makefile.in @@ -0,0 +1,5 @@ +MODULE = atlthunk.dll +IMPORTLIB = atlthunk + +C_SRCS = \ + atlthunk.c diff --git a/dlls/atlthunk/atlthunk.c b/dlls/atlthunk/atlthunk.c new file mode 100644 index 0000000..79d0432 --- /dev/null +++ b/dlls/atlthunk/atlthunk.c @@ -0,0 +1,45 @@ +/* + * Copyright 2019 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "atlthunk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atlthunk); + +AtlThunkData_t* WINAPI AtlThunk_AllocateData(void) +{ + FIXME("\n"); + return NULL; +} + +WNDPROC WINAPI AtlThunk_DataToCode(AtlThunkData_t *thunk) +{ + FIXME("(%p)\n", thunk); + return NULL; +} + +void WINAPI AtlThunk_FreeData(AtlThunkData_t *thunk) +{ + FIXME("(%p)\n", thunk); +} + +void WINAPI AtlThunk_InitData(AtlThunkData_t *thunk, void *proc, SIZE_T arg) +{ + FIXME("(%p %p %lx)\n", thunk, proc, arg); +} diff --git a/dlls/atlthunk/atlthunk.spec b/dlls/atlthunk/atlthunk.spec new file mode 100644 index 0000000..25516a8 --- /dev/null +++ b/dlls/atlthunk/atlthunk.spec @@ -0,0 +1,4 @@ +@ stdcall AtlThunk_AllocateData() +@ stdcall AtlThunk_DataToCode(ptr) +@ stdcall AtlThunk_FreeData(ptr) +@ stdcall AtlThunk_InitData(ptr ptr long)

1 0

Michael Stefaniuc : hnetcfg: Remove redundant "not NULL" check ( coccinellery).
by Alexandre Julliard Feb. 19, 2019

Feb. 19, 2019

Module: wine Branch: master Commit: c6ecb1b6a477e1b7367cb01bafb20837c68252bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6ecb1b6a477e1b7367cb01b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 19 00:06:21 2019 +0100 hnetcfg: Remove redundant "not NULL" check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/policy.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index c2f3252..53f39ae 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -641,11 +641,8 @@ static HRESULT WINAPI fwpolicy2_get_Rules(INetFwPolicy2 *iface, INetFwRules **ru if(!rules) return E_POINTER; - if(rules) - { - *rules = This->fw_policy2_rules; - INetFwRules_AddRef(This->fw_policy2_rules); - } + *rules = This->fw_policy2_rules; + INetFwRules_AddRef(This->fw_policy2_rules); return S_OK; }

1 0