November 2018 - Wine-commits

Roberto Pungartnik : po: Update Portuguese (Brazil) translation.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 0c38f7348691ac842b858268d8ea74145129ca29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c38f7348691ac842b858268… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Nov 18 00:19:08 2018 -0200 po: Update Portuguese (Brazil) translation. Signed-off-by: Roberto Augusto Pungartnik <rpungartik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 213 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 110 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c38f7348691ac842b85…

1 0

Nikolay Sivov : dwrite/tests: Add CreateFontFaceFromHdc() test for in-memory font.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 5ac5154c3df7b14c28497b3fc355d7249641414f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ac5154c3df7b14c28497b3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 12:27:36 2018 +0300 dwrite/tests: Add CreateFontFaceFromHdc() test for in-memory font. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 158 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 29fa2f3..2ac8157 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3711,16 +3711,52 @@ static void test_GetGdiInterop(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void *map_font_file(const WCHAR *filename, DWORD *file_size) +{ + HANDLE file, mapping; + void *ptr; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) return NULL; + + *file_size = GetFileSize(file, NULL); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + { + CloseHandle(file); + return NULL; + } + + ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + + CloseHandle(file); + CloseHandle(mapping); + return ptr; +} + static void test_CreateFontFaceFromHdc(void) { + IDWriteFontFileStream *stream, *stream2; + void *font_data, *fragment_context; + const void *refkey, *fragment; + IDWriteFontFileLoader *loader; + DWORD data_size, num_fonts; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFactory *factory; + UINT64 size, writetime; + IDWriteFontFile *file; HFONT hfont, oldhfont; LOGFONTW logfont; + HANDLE resource; + IUnknown *unk; + UINT32 count; LOGFONTA lf; + WCHAR *path; HRESULT hr; ULONG ref; + BOOL ret; HDC hdc; factory = create_factory(); @@ -3771,8 +3807,91 @@ static void test_CreateFontFaceFromHdc(void) ok(fontface == NULL, "got %p\n", fontface); DeleteObject(SelectObject(hdc, oldhfont)); - DeleteDC(hdc); + /* Memory resource font */ + path = create_testfontfile(test_fontfile); + + data_size = 0; + font_data = map_font_file(path, &data_size); + + num_fonts = 0; + resource = AddFontMemResourceEx(font_data, data_size, NULL, &num_fonts); + ok(resource != NULL, "Failed to add memory resource font, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts.\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -12; + strcpy(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "Failed to create a font.\n"); + oldhfont = SelectObject(hdc, hfont); + + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); +todo_wine + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + +if (fontface) +{ + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "Failed to get font files, hr %#x.\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "Failed to get file loader, hr %#x.\n", hr); + + hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IDWriteFontFile_GetReferenceKey(file, &refkey, &count); + ok(hr == S_OK, "Failed to get ref key, hr %#x.\n", hr); + ok(count > 0, "Unexpected key length %u.\n", count); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream2); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + ok(stream2 != stream, "Unexpected stream instance.\n"); + IDWriteFontFileStream_Release(stream2); + + hr = IDWriteFontFileStream_GetFileSize(stream, &size); + ok(hr == S_OK, "Failed to get stream size, hr %#x.\n", hr); + ok(size == data_size, "Unexpected stream size.\n"); + + hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + fragment_context = NULL; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, size, &fragment_context); + ok(hr == S_OK, "Failed to read fragment, hr %#x.\n", hr); + ok(fragment_context != NULL, "Unexpected context %p.\n", fragment_context); + ok(fragment == fragment_context, "Unexpected data pointer %p, context %p.\n", fragment, fragment_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, fragment_context); + + IDWriteFontFileStream_Release(stream); + + IDWriteFontFileLoader_Release(loader); + IDWriteFontFile_Release(file); + + IDWriteFontFace_Release(fontface); +} + ret = RemoveFontMemResourceEx(resource); + ok(ret, "Failed to remove memory resource font, %d.\n", GetLastError()); + + UnmapViewOfFile(font_data); + + DELETE_FONTFILE(path); + + DeleteObject(SelectObject(hdc, oldhfont)); + DeleteDC(hdc); IDWriteGdiInterop_Release(interop); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); @@ -7935,6 +8054,7 @@ static void test_inmemory_file_loader(void) hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, &ref_key, sizeof(ref_key), &stream2); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* With owner object. */ hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory, data, file_size, &ownerobject.IUnknown_iface, &file); ok(hr == S_OK, "Failed to create in-memory file reference, hr %#x.\n", hr); @@ -7946,7 +8066,7 @@ static void test_inmemory_file_loader(void) context2 = (void *)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream2, &frag_start, 0, file_size, &context2); ok(hr == S_OK, "Failed to read a fragment, hr %#x.\n", hr); - ok(context == NULL, "Unexpected context %p.\n", context2); + ok(context2 == NULL, "Unexpected context %p.\n", context2); ok(frag_start == data, "Unexpected fragment pointer %p.\n", frag_start); hr = IDWriteFontFileStream_GetFileSize(stream2, &size); @@ -7962,6 +8082,36 @@ static void test_inmemory_file_loader(void) IDWriteFontFileStream_Release(stream2); + /* Without owner object. */ + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory, data, + file_size, NULL, &file2); + ok(hr == S_OK, "Failed to create in-memory file reference, hr %#x.\n", hr); + + ref_key = 1; + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, &ref_key, sizeof(ref_key), &stream2); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + context2 = (void *)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream2, &frag_start, 0, file_size, &context2); + ok(hr == S_OK, "Failed to read a fragment, hr %#x.\n", hr); + ok(context2 == NULL, "Unexpected context %p.\n", context2); + ok(frag_start != data, "Unexpected fragment pointer %p.\n", frag_start); + + hr = IDWriteFontFileStream_GetFileSize(stream2, &size); + ok(hr == S_OK, "Failed to get file size, hr %#x.\n", hr); + ok(size == file_size, "Unexpected file size.\n"); + + IDWriteFontFileStream_ReleaseFileFragment(stream2, context2); + + writetime = 1; + hr = IDWriteFontFileStream_GetLastWriteTime(stream2, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(writetime == 0, "Unexpected writetime.\n"); + + IDWriteFontFileStream_Release(stream2); + IDWriteFontFile_Release(file2); + + /* Key size validation. */ ref_key = 0; hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, NULL, sizeof(ref_key) - 1, &stream2); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -7975,7 +8125,7 @@ static void test_inmemory_file_loader(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); count = IDWriteInMemoryFontFileLoader_GetFileCount(inmemory); - ok(count == 1, "Unexpected file count %u.\n", count); + ok(count == 2, "Unexpected file count %u.\n", count); hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); ok(hr == S_OK, "Failed to get reference key, hr %#x.\n", hr); @@ -7986,7 +8136,7 @@ static void test_inmemory_file_loader(void) IDWriteFontFile_Release(file); count = IDWriteInMemoryFontFileLoader_GetFileCount(inmemory); - ok(count == 1, "Unexpected file count %u.\n", count); + ok(count == 2, "Unexpected file count %u.\n", count); hr = IDWriteFactory5_UnregisterFontFileLoader(factory, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "Failed to unregister loader, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : crypt32: Make sure that the provider supports the specified public key algorithm.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: a9baa25c8c43f6cf9b0373f273ba01d533ae53fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9baa25c8c43f6cf9b0373f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 11:06:18 2018 +0300 crypt32: Make sure that the provider supports the specified public key algorithm. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index faf70de..2d7ef42 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1329,7 +1329,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, TRACE("public key algid %#x (%s)\n", info->u.Algid, debugstr_a(pPublicKey->Algorithm.pszObjId)); - ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(0), dwCertEncodingType, pPublicKey, &key); + ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(info->u.Algid), dwCertEncodingType, pPublicKey, &key); if (ret) { size = sizeof(len);

1 0

Zebediah Figura : dbghelp: Only check process architecture if we are actually given a process.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 63ef9854fb6fc91a8c956a9d91abc07e906a4a33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ef9854fb6fc91a8c956a9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 12:17:03 2018 -0600 dbghelp: Only check process architecture if we are actually given a process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45407 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a085cd1..ed4d5f4 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -310,7 +310,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP IsWow64Process(GetCurrentProcess(), &wow64); - if (!IsWow64Process(hProcess, &child_wow64)) + if (GetProcessId(hProcess) && !IsWow64Process(hProcess, &child_wow64)) return FALSE; pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs));

1 0

André Hentschel : kernel32: Add stub case for ARM64 in GetSystemInfo.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 014f9c09294dd3945dc4e943e697ae52c3f2c844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=014f9c09294dd3945dc4e943… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 16 22:51:18 2018 +0100 kernel32: Add stub case for ARM64 in GetSystemInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46092 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 89482a6..84385c7 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -157,6 +157,9 @@ VOID WINAPI GetSystemInfo( default: si->dwProcessorType = PROCESSOR_ARM920; } break; + case PROCESSOR_ARCHITECTURE_ARM64: + si->dwProcessorType = 0; + break; default: FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0;

1 0

Zebediah Figura : stdole2: Avoid defining Automation typedefs as part of the public library.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 247ae9838ff4ef575d329c8f8f47db01f341d03e URL: https://source.winehq.org/git/wine.git/?a=commit;h=247ae9838ff4ef575d329c8f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 18 14:35:51 2018 -0600 stdole2: Avoid defining Automation typedefs as part of the public library. This fixes a regression introduced by 70e5d5fd2e8501f36e4f3b2bccbdc55e25d31ee4. If the VARIANT struct is defined inside the library block, widl generates typeinfo for it at index 0. This confuses typelibs that import stdole2.tlb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45949 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/stdole2.idl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index d372384..b659070 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -25,6 +25,17 @@ #include <olectl.h> +/* These typedefs need to have the same size as their real counterparts. */ +typedef short VARIANT_BOOL; +typedef void *BSTR; +typedef double CURRENCY; +typedef unsigned long HRESULT; +typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; +} VARIANT; +typedef unsigned long SCODE; + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), @@ -32,17 +43,6 @@ ] library stdole { - /* These typedefs need to have the same size as their real counterparts. */ - typedef short VARIANT_BOOL; - typedef void *BSTR; - typedef double CURRENCY; - typedef unsigned long HRESULT; - typedef struct { - short word1, word2, word3, word4; - void *ptr1, *ptr2; - } VARIANT; - typedef unsigned long SCODE; - typedef struct GUID { unsigned long Data1; unsigned short Data2;

1 0

Zebediah Figura : ntdll: Only wait on the completion port if no entries were returned.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: fbde01335fef80d36975adbc9e2de9f382d57874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbde01335fef80d36975adbc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 17 20:06:16 2018 -0600 ntdll: Only wait on the completion port if no entries were returned. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a00a159..3037e58 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1371,9 +1371,10 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT if (i++ >= count) break; } - if (i && ret == STATUS_PENDING) + if (i || ret != STATUS_PENDING) { - ret = STATUS_SUCCESS; + if (ret == STATUS_PENDING) + ret = STATUS_SUCCESS; break; }

1 0

Zebediah Figura : ntdll: Don't write more IOCP entries than requested.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: e09248d3633522474c11e733238f5fd01a3e4f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09248d3633522474c11e733… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 17 20:06:17 2018 -0600 ntdll: Don't write more IOCP entries than requested. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45948 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3037e58..0c373a4 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1351,7 +1351,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT for (;;) { - for (;;) + while (i < count) { SERVER_START_REQ( remove_completion ) { @@ -1368,7 +1368,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE port, FILE_IO_COMPLETION_INFORMAT if (ret != STATUS_SUCCESS) break; - if (i++ >= count) break; + ++i; } if (i || ret != STATUS_PENDING)

1 0

Zebediah Figura : ntdll/tests: Add more tests for NtRemoveIoCompletionEx() .
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 9badb7807f6f9d534c53a0952d10f5c855f45bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9badb7807f6f9d534c53a095… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 17 20:06:18 2018 -0600 ntdll/tests: Add more tests for NtRemoveIoCompletionEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 56a438b..dcea45e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -955,6 +955,32 @@ static void test_set_io_completion(void) info[1].IoStatusBlock.Information ); ok( U(info[1].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[1].IoStatusBlock).Status); + res = pNtSetIoCompletion( h, 123, 456, 789, size ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + + res = pNtSetIoCompletion( h, 12, 34, 56, size ); + ok( res == STATUS_SUCCESS, "NtSetIoCompletion failed: %#x\n", res ); + + count = 0xdeadbeef; + res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); + ok( count == 1, "wrong count %u\n", count ); + ok( info[0].CompletionKey == 123, "wrong key %#lx\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 456, "wrong value %#lx\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + info[0].IoStatusBlock.Information ); + ok( U(info[0].IoStatusBlock).Status == 789, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + + count = 0xdeadbeef; + res = pNtRemoveIoCompletionEx( h, info, 1, &count, NULL, FALSE ); + ok( res == STATUS_SUCCESS, "NtRemoveIoCompletionEx failed: %#x\n", res ); + ok( count == 1, "wrong count %u\n", count ); + ok( info[0].CompletionKey == 12, "wrong key %#lx\n", info[0].CompletionKey ); + ok( info[0].CompletionValue == 34, "wrong value %#lx\n", info[0].CompletionValue ); + ok( info[0].IoStatusBlock.Information == size, "wrong information %#lx\n", + info[0].IoStatusBlock.Information ); + ok( U(info[0].IoStatusBlock).Status == 56, "wrong status %#x\n", U(info[0].IoStatusBlock).Status); + apc_count = 0; QueueUserAPC( user_apc_proc, GetCurrentThread(), (ULONG_PTR)&apc_count );

1 0

Zebediah Figura : rpcrt4: Handle large arrays in EmbeddedComplexSize().
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: c94314085c4e7654f87172d9ad0a2b991d2b51ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94314085c4e7654f87172d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 16 21:58:43 2018 -0600 rpcrt4: Handle large arrays in EmbeddedComplexSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 82cc064..38ead96 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2765,6 +2765,9 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, case FC_SMVARRAY: case FC_CSTRING: return *(const WORD*)&pFormat[2]; + case FC_LGFARRAY: + case FC_LGVARRAY: + return *(const ULONG*)&pFormat[2]; case FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; case FC_RANGE: {

1 0