June 2021 - Wine-Commits - list.winehq.org

Francois Gouget : msvcr120/tests: Wcstof() depends on the system locale.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 858f2bf268c380caea66cb83b834da15a328d10e URL: https://source.winehq.org/git/wine.git/?a=commit;h=858f2bf268c380caea66cb83… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 29 09:11:03 2021 +0200 msvcr120/tests: Wcstof() depends on the system locale. Arabic numerals are only recognized Arabic system locales. Also test a mix of Arabic and Roman numerals. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8002f6cb55..2a0e638be1b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -601,6 +601,7 @@ static void test__strtof(void) const char float3[] = "-3.402823466e+38"; const char float4[] = "1.7976931348623158e+308"; /* DBL_MAX */ + BOOL is_arabic; char *end; float f; @@ -638,8 +639,12 @@ static void test__strtof(void) f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(L"\x0662\x0663", NULL); - ok(f == 0, "f = %lf\n", f); + f = p_wcstof(L"\x0662\x0663", NULL); /* 23 in Arabic numerals */ + is_arabic = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ARABIC); + todo_wine_if(is_arabic) ok(f == (is_arabic ? 23.0 : 0.0), "f = %lf\n", f); + + f = p_wcstof(L"\x0662\x34\x0663", NULL); /* Arabic + Roman numerals mix */ + todo_wine_if(is_arabic) ok(f == (is_arabic ? 243.0 : 0.0), "f = %lf\n", f); if(!p_setlocale(LC_ALL, "Arabic")) { win_skip("Arabic locale not available\n"); @@ -649,8 +654,8 @@ static void test__strtof(void) f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(L"\x0662\x0663", NULL); - ok(f == 0, "f = %lf\n", f); + f = p_wcstof(L"\x0662\x0663", NULL); /* 23 in Arabic numerals */ + todo_wine_if(is_arabic) ok(f == (is_arabic ? 23.0 : 0.0), "f = %lf\n", f); p_setlocale(LC_ALL, "C"); }

1 0

Tim Clem : quartz/tests: Test IGraphBuilder::RenderFile() cleanup on failure.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: d9b95ac0df2df7e99c76f4191f33c1a2f77c3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b95ac0df2df7e99c76f419… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Jun 29 14:59:57 2021 -0500 quartz/tests: Test IGraphBuilder::RenderFile() cleanup on failure. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fdcfcead0be..557b3965016 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4186,6 +4186,49 @@ static void test_ec_complete(void) ok(filter3.ref == 1, "Got outstanding refcount %d.\n", filter3.ref); } +static void test_renderfile_failure(void) +{ + static const char bogus_data[20] = {0xde, 0xad, 0xbe, 0xef}; + + struct testfilter testfilter; + IEnumFilters *filterenum; + const WCHAR *filename; + IFilterGraph2 *graph; + IBaseFilter *filter; + HRESULT hr; + ULONG ref; + BOOL ret; + + /* Windows removes the source filter from the graph if a RenderFile + * call fails. It leaves the rest of the graph intact. */ + + graph = create_graph(); + testfilter_init(&testfilter, NULL, 0); + hr = IFilterGraph2_AddFilter(graph, &testfilter.IBaseFilter_iface, L"dummy"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = create_file(L"test.nonsense", bogus_data, sizeof(bogus_data)); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + todo_wine ok(hr == VFW_E_UNSUPPORTED_STREAM, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_EnumFilters(graph, &filterenum); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(filter == &testfilter.IBaseFilter_iface, "Got unexpected filter %p.\n", filter); + + hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumFilters_Release(filterenum); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + todo_wine ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); +} + /* Remove and re-add the filter, to flush the graph's internal * IMediaSeeking cache. Don't expose IMediaSeeking when adding, to show * that it's only queried when needed. */ @@ -5645,6 +5688,7 @@ START_TEST(filtergraph) test_sync_source(); test_filter_state(); test_ec_complete(); + test_renderfile_failure(); test_graph_seeking(); test_default_sync_source(); test_add_source_filter();

1 0

Tim Clem : quartz: Remove the source filter on failure in IGraphBuilder::RenderFile().
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 83ae1ff59a4695ed1a7ee8e139aab267176e0747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83ae1ff59a4695ed1a7ee8e1… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Jun 29 14:59:58 2021 -0500 quartz: Remove the source filter on failure in IGraphBuilder::RenderFile(). Signed-off-by: Tim Clem <tclem(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 8 ++++++++ dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f509bdad332..4861d6cf1b0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1431,11 +1431,19 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw IEnumPins_Release(penumpins); if (!any) + { + if (FAILED(hr = IFilterGraph2_RemoveFilter(iface, preader))) + ERR("Failed to remove source filter, hr %#x.\n", hr); hr = VFW_E_CANNOT_RENDER; + } else if (partial) + { hr = VFW_S_PARTIAL_RENDER; + } else + { hr = S_OK; + } } IBaseFilter_Release(preader); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 557b3965016..fef7b972fac 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4216,17 +4216,17 @@ static void test_renderfile_failure(void) hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(filter == &testfilter.IBaseFilter_iface, "Got unexpected filter %p.\n", filter); + ok(filter == &testfilter.IBaseFilter_iface, "Got unexpected filter %p.\n", filter); hr = IEnumFilters_Next(filterenum, 1, &filter, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); IEnumFilters_Release(filterenum); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); ret = DeleteFileW(filename); - todo_wine ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); } /* Remove and re-add the filter, to flush the graph's internal

1 0

Zebediah Figura : ws2_32: Move the getsockopt(SO_REUSEADDR) implementation to ntdll.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: f7cb96e53c9e0cc4d18d6da0c07ee3d241e65bf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7cb96e53c9e0cc4d18d6da0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 11:43:21 2021 -0500 ws2_32: Move the getsockopt(SO_REUSEADDR) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0ab30ec6515..549981388c7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1652,6 +1652,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_SO_OOBINLINE: return do_setsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_SO_REUSEADDR: + return do_getsockopt( handle, io, SOL_SOCKET, SO_REUSEADDR, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 15c9d0cc940..11e6719fcb0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2090,7 +2090,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_REUSEADDR: case WS_SO_SNDBUF: if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; @@ -2291,6 +2290,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_RCVTIMEO: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVTIMEO, optval, optlen ); + case WS_SO_REUSEADDR: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_REUSEADDR, optval, optlen ); + case WS_SO_SNDTIMEO: { INT64 timeout; diff --git a/include/wine/afd.h b/include/wine/afd.h index c4f7c7a6413..f337ec361b2 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -173,6 +173,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Francois Gouget : shell32/tests: Fix the known folder relative path check for multiple CD drives.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 8aaf9e64607f72806391843cfeb38adeb5b8aaa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aaf9e64607f72806391843c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jun 29 17:59:51 2021 +0200 shell32/tests: Fix the known folder relative path check for multiple CD drives. When there is more than one CD drive the extra drives typically get a folder called "Burn1", etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 62fa68eb20a..ea6f92ce827 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2067,7 +2067,11 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId debugstr_w(ikf_path), debugstr_w(ikf_parent_path)); ok_(__FILE__, known_folder->line)(*(ikf_path + lstrlenW(ikf_parent_path)) == '\\', "Missing slash\n"); - ok_(__FILE__, known_folder->line)(wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0, + ok_(__FILE__, known_folder->line)( + wcsicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1) == 0 || + /* With multiple drives, there are multiple CD-burning folders */ + (IsEqualGUID(folderId, &FOLDERID_CDBurning) && + wcsnicmp(kfd.pszRelativePath, ikf_path + lstrlenW(ikf_parent_path) + 1, wcslen(kfd.pszRelativePath)) == 0), "Full path %s does not end with relative path %s\n", debugstr_w(ikf_path), debugstr_w(kfd.pszRelativePath));

1 0

Rémi Bernon : ntoskrnl.exe/tests: Retry timer wait to address spurious failures.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: c2e9ee36d3de25523180823fb6c1c2c6159273a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e9ee36d3de25523180823f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 29 09:21:39 2021 +0200 ntoskrnl.exe/tests: Retry timer wait to address spurious failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f1c72d8fdaf..918b4632c40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -756,6 +756,8 @@ static void test_sync(void) ok(ret == 0, "got %#x\n", ret); ret = wait_single(&timer, 0); + /* aliasing makes it sometimes succeeds, try again in that case */ + if (ret == 0) ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); ret = wait_single(&timer, -40 * 10000);

1 0

Hans Leidekker : secur32: Use blocking mode for DTLS sessions.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8aaf86b2dbb8ecb3f7094cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 29 13:56:41 2021 +0200 secur32: Use blocking mode for DTLS sessions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 7 +------ dlls/secur32/schannel_gnutls.c | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9c7e98b32a4..515f01d08a3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -879,11 +879,6 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } -static inline BOOL is_dtls_context(const struct schan_context *ctx) -{ - return (ctx->header_size == HEADER_SIZE_DTLS); -} - /*********************************************************************** * InitializeSecurityContextW */ @@ -1011,7 +1006,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INCOMPLETE_MESSAGE; } } - else if (!is_dtls_context(ctx)) return SEC_E_INCOMPLETE_MESSAGE; + else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); } diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 03124924644..bcf38e3f23f 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,10 +292,6 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - struct schan_transport *t = (struct schan_transport *)transport; - SIZE_T count = 0; - - if (callbacks->get_buffer(t, &t->in, &count)) return 1; return 0; } @@ -309,7 +305,7 @@ static BOOL CDECL schan_create_session(schan_session *session, schan_credentials if (cred->enabled_protocols & (SP_PROT_DTLS1_0_CLIENT | SP_PROT_DTLS1_2_CLIENT)) { - flags |= GNUTLS_DATAGRAM | GNUTLS_NONBLOCK; + flags |= GNUTLS_DATAGRAM; } err = pgnutls_init(s, flags);

1 0

Jacek Caban : gdi32/tests: Add metafile file creation tests.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: d19ac108f91d19f7dd06bb48a1c00dfaa07fd387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19ac108f91d19f7dd06bb48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:30 2021 +0200 gdi32/tests: Add metafile file creation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 171 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 062eb4c8a44..dcd6cea0c2b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3015,6 +3015,175 @@ static void test_mf_Blank(void) ok( ret, "DeleteMetaFile(%p) error %d\n", hMetafile, GetLastError()); } +static void test_metafile_file(void) +{ + char temp_path[MAX_PATH]; + char mf_name[MAX_PATH]; + char buf[4096]; + HMETAFILE metafile; + POINT oldpoint; + DWORD size; + HANDLE file; + HDC dc; + BOOL ret; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "wmf", 0, mf_name); + + dc = CreateMetaFileA(mf_name); + ok(dc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + + file = CreateFileA(mf_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + ret = MoveToEx(dc, 1, 1, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(dc, 2, 2); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = MoveToEx(dc, 1, 1, &oldpoint); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = Ellipse(dc, 0, 0, 2, 2); + ok( ret, "Ellipse error %d.\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + metafile = CloseMetaFile(dc); + size = GetFileSize(file, NULL); + ok(size == sizeof(MF_GRAPHICS_BITS), "size = %u\n", size); + + CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + todo_wine + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ret = ReadFile(file, buf, sizeof(buf), &size, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(MF_GRAPHICS_BITS), "size = %u\n", size); + ok(!memcmp(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS)), "unexpected file content\n"); + CloseHandle(file); + + if (compare_mf_bits(metafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) + { + dump_mf_bits(metafile, "mf_Graphics"); + EnumMetaFile(0, metafile, mf_enum_proc, 0); + } + + DeleteMetaFile(metafile); + + SetLastError(0xdeadbeef); + metafile = CloseMetaFile(dc); + todo_wine + ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", + metafile, GetLastError()); + + ret = DeleteFileA(mf_name); + ok(ret, "Could not delete file: %u\n", GetLastError()); +} + +static void test_enhmetafile_file(void) +{ + char temp_path[MAX_PATH]; + char mf_name[MAX_PATH]; + char buf[4096]; + HENHMETAFILE metafile; + POINT pts[4]; + DWORD size; + HANDLE file; + HDC dc; + BOOL ret; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "wmf", 0, mf_name); + + dc = CreateEnhMetaFileA(NULL, mf_name, NULL, NULL); + ok(dc != 0, "CreateMetaFileA(NULL) error %d\n", GetLastError()); + + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + + file = CreateFileA(mf_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + pts[0].x = pts[0].y = 10; + pts[1].x = pts[1].y = 20; + pts[2].x = pts[2].y = 15; + pts[3].x = pts[3].y = 25; + ret = PolyBezierTo(dc, pts, 3); /* EMR_POLYBEZIERTO16 */ + ok( ret, "PolyBezierTo failed\n" ); + ret = PolyBezier(dc, pts, 4); /* EMR_POLYBEZIER16 */ + ok( ret, "PolyBezier failed\n" ); + + pts[0].x = pts[0].y = 32769; + ret = PolyBezier(dc, pts, 4); /* EMR_POLYBEZIER */ + ok( ret, "PolyBezier failed\n" ); + ret = PolyBezierTo(dc, pts, 3); /* EMR_POLYBEZIERTO */ + ok( ret, "PolyBezierTo failed\n" ); + + size = GetFileSize(file, NULL); + todo_wine + ok(!size, "size = %u\n", size); + + metafile = CloseEnhMetaFile(dc); + size = GetFileSize(file, NULL); + ok(size == sizeof(EMF_BEZIER_BITS), "size = %u\n", size); + + CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + todo_wine + ok(file == INVALID_HANDLE_VALUE && GetLastError() == ERROR_SHARING_VIOLATION, + "CreateFile returned: %p %u\n", file, GetLastError()); + if (file != INVALID_HANDLE_VALUE) CloseHandle(file); + file = CreateFileA(mf_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + ret = ReadFile(file, buf, sizeof(buf), &size, NULL); + ok(ret, "ReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(EMF_BEZIER_BITS), "size = %u\n", size); + CloseHandle(file); + + if (compare_emf_bits(metafile, EMF_BEZIER_BITS, sizeof(EMF_BEZIER_BITS), "emf_Bezier", FALSE) != 0) + { + dump_emf_bits(metafile, "emf_Bezier"); + dump_emf_records(metafile, "emf_Bezier"); + } + + DeleteEnhMetaFile(metafile); + + SetLastError(0xdeadbeef); + metafile = CloseEnhMetaFile(dc); + todo_wine + ok(!metafile && GetLastError() == ERROR_INVALID_HANDLE, "CloseMetaFile returned %p (%u)\n", + metafile, GetLastError()); + + ret = DeleteFileA(mf_name); + ok(ret, "Could not delete file: %u\n", GetLastError()); +} + static void test_CopyMetaFile(void) { HDC hdcMetafile; @@ -6107,6 +6276,7 @@ START_TEST(metafile) test_emf_GradientFill(); test_emf_WorldTransform(); test_emf_text_extents(); + test_enhmetafile_file(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC(); @@ -6120,6 +6290,7 @@ START_TEST(metafile) test_mf_clipping(); test_mf_GetPath(); test_mf_SetLayout(); + test_metafile_file(); /* For metafile conversions */ test_mf_conversions();

1 0

Jacek Caban : gdi32: Delay writing metafile file until CloseMetaFile is called.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: 0c9bc0ed6bc616c50e020552a93233e64e8a9262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9bc0ed6bc616c50e020552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:41:41 2021 +0200 gdi32: Delay writing metafile file until CloseMetaFile is called. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/init.c | 50 +++++++++++---------------------------------- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index fe7aae631d7..d64e754da84 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -325,7 +325,6 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) DC *dc; METAFILEDRV_PDEVICE *physDev; HANDLE hFile; - DWORD bytes_written; TRACE("%s\n", debugstr_w(filename) ); @@ -340,12 +339,6 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), - &bytes_written, NULL )) { - free_dc_ptr( dc ); - CloseHandle (hFile ); - return 0; - } physDev->hFile = hFile; /* Grow METAHEADER to include filename */ @@ -422,19 +415,13 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ { - if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) { - free_dc_ptr( dc ); - return 0; - } - physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ - if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), + if (!WriteFile(physDev->hFile, physDev->mh, physDev->mh->mtSize * 2, &bytes_written, NULL)) { free_dc_ptr( dc ); return 0; } CloseHandle(physDev->hFile); - physDev->mh->mtType = METAFILE_DISK; } return dc; @@ -481,32 +468,19 @@ BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen) METAHEADER *mh; METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; - switch(physDev->mh->mtType) + len = physDev->mh->mtSize * 2 + rlen; + /* reallocate memory if needed */ + size = HeapSize( GetProcessHeap(), 0, physDev->mh ); + if (len > size) { - case METAFILE_MEMORY: - len = physDev->mh->mtSize * 2 + rlen; - /* reallocate memory if needed */ - size = HeapSize( GetProcessHeap(), 0, physDev->mh ); - if (len > size) - { - /*expand size*/ - size += size / 2 + rlen; - mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); - if (!mh) return FALSE; - physDev->mh = mh; - TRACE("Reallocated metafile: new size is %d\n",size); - } - memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); - break; - case METAFILE_DISK: - TRACE("Writing record to disk\n"); - if (!WriteFile(physDev->hFile, mr, rlen, NULL, NULL)) - return FALSE; - break; - default: - ERR("Unknown metafile type %d\n", physDev->mh->mtType ); - return FALSE; + /*expand size*/ + size += size / 2 + rlen; + mh = HeapReAlloc( GetProcessHeap(), 0, physDev->mh, size); + if (!mh) return FALSE; + physDev->mh = mh; + TRACE("Reallocated metafile: new size is %d\n",size); } + memcpy((WORD *)physDev->mh + physDev->mh->mtSize, mr, rlen); physDev->mh->mtSize += rlen / 2; physDev->mh->mtMaxRecord = max(physDev->mh->mtMaxRecord, rlen / 2); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index dcd6cea0c2b..a3b51418ab7 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3043,7 +3043,6 @@ static void test_metafile_file(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); ret = MoveToEx(dc, 1, 1, NULL); @@ -3056,7 +3055,6 @@ static void test_metafile_file(void) ok( ret, "Ellipse error %d.\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); metafile = CloseMetaFile(dc);

1 0

Jacek Caban : gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called.
by Alexandre Julliard June 29, 2021

June 29, 2021

Module: wine Branch: master Commit: c359b4a0e96d06defef6c880cfbd4336739a4be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c359b4a0e96d06defef6c880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 29 13:42:09 2021 +0200 gdi32: Delay writing to enhanced metafile file until CreateEnhMetaFile is called. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/init.c | 41 +++++++++++------------------------------ dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6c41aa88feb..ca50792fb57 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -196,8 +196,7 @@ static BOOL CDECL EMFDRV_DeleteDC( PHYSDEV dev ) */ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) { - DWORD len; - DWORD bytes_written; + DWORD len, size; ENHMETAHEADER *emh; EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); @@ -209,21 +208,16 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nBytes += emr->nSize; physDev->emh->nRecords++; - if(physDev->hFile) { - if (!WriteFile(physDev->hFile, emr, emr->nSize, &bytes_written, NULL)) - return FALSE; - } else { - DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); - len = physDev->emh->nBytes; - if (len > nEmfSize) { - nEmfSize += (nEmfSize / 2) + emr->nSize; - emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, nEmfSize); - if (!emh) return FALSE; - physDev->emh = emh; - } - memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr, - emr->nSize); + size = HeapSize(GetProcessHeap(), 0, physDev->emh); + len = physDev->emh->nBytes; + if (len > size) { + size += (size / 2) + emr->nSize; + emh = HeapReAlloc(GetProcessHeap(), 0, physDev->emh, size); + if (!emh) return FALSE; + physDev->emh = emh; } + memcpy((CHAR *)physDev->emh + physDev->emh->nBytes - emr->nSize, emr, + emr->nSize); return TRUE; } @@ -337,7 +331,6 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; - DWORD bytes_written; int cap; TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); @@ -439,11 +432,6 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - if (!WriteFile( hFile, physDev->emh, size, &bytes_written, NULL )) { - free_dc_ptr( dc ); - CloseHandle( hFile ); - return 0; - } physDev->hFile = hFile; } @@ -508,14 +496,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (physDev->hFile) /* disk based metafile */ { - if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) - { - CloseHandle( physDev->hFile ); - free_dc_ptr( dc ); - return 0; - } - - if (!WriteFile(physDev->hFile, physDev->emh, sizeof(*physDev->emh), + if (!WriteFile(physDev->hFile, physDev->emh, physDev->emh->nBytes, NULL, NULL)) { CloseHandle( physDev->hFile ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a3b51418ab7..fa00438ddfe 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3123,7 +3123,6 @@ static void test_enhmetafile_file(void) ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); pts[0].x = pts[0].y = 10; @@ -3142,7 +3141,6 @@ static void test_enhmetafile_file(void) ok( ret, "PolyBezierTo failed\n" ); size = GetFileSize(file, NULL); - todo_wine ok(!size, "size = %u\n", size); metafile = CloseEnhMetaFile(dc);

1 0