December 2019 - Wine-commits

Alexandre Julliard : ntdll: Fix memory corruption in RtlNormalizeString().
by Alexandre Julliard 27 Dec '19

27 Dec '19

Module: wine Branch: master Commit: ddb6f150e1175287574f4561e9661dda97eab330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddb6f150e1175287574f4561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 17:58:34 2019 +0100 ntdll: Fix memory corruption in RtlNormalizeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index e3f562808b..7e85f344dd 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1585,20 +1585,14 @@ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, W else { buf_len = src_len * 4; - do + for (;;) { - WCHAR *old_buf = buf; - - if (!buf) buf = RtlAllocateHeap( GetProcessHeap(), 0, buf_len ); - else buf = RtlReAllocateHeap( GetProcessHeap(), 0, buf, buf_len ); - if (!buf) - { - RtlFreeHeap( GetProcessHeap(), 0, old_buf ); - return STATUS_NO_MEMORY; - } + buf = RtlAllocateHeap( GetProcessHeap(), 0, buf_len * sizeof(WCHAR) ); + if (!buf) return STATUS_NO_MEMORY; res = wine_decompose_string( flags, src, src_len, buf, buf_len ); + if (res) break; buf_len *= 2; - } while (!res); + } } if (compose)

1 0

Zebediah Figura : user32/tests: Remove unnecessary uses of CREATE_SUSPENDED.
by Alexandre Julliard 27 Dec '19

27 Dec '19

Module: wine Branch: master Commit: 7473db002eb9ad8cd0e45df5028136a9deea12c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7473db002eb9ad8cd0e45df5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 27 10:37:37 2019 -0600 user32/tests: Remove unnecessary uses of CREATE_SUSPENDED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 102 ++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 56 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index d370df181a..786d4eca07 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -43,6 +43,22 @@ static WNDPROC old_dde_client_wndproc; static const DWORD default_timeout = 200; +static HANDLE create_process(const char *arg) +{ + STARTUPINFOA si = {.cb = sizeof(si)}; + PROCESS_INFORMATION pi; + char cmdline[200]; + char **argv; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], arg); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(pi.hThread); + return pi.hProcess; +} + static BOOL is_cjk(void) { int lang_id = PRIMARYLANGID(GetUserDefaultLangID()); @@ -253,23 +269,25 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA return DefWindowProcA(hwnd, msg, wparam, lparam); } -static void test_msg_server(HANDLE hproc, HANDLE hthread) +static void test_msg_server(void) { + HANDLE client; MSG msg; HWND hwnd; DWORD res; create_dde_window(&hwnd, "dde_server", dde_server_wndproc); - ResumeThread( hthread ); + client = create_process("ddeml"); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } destroy_dde_window(&hwnd, "dde_server"); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } static HDDEDATA CALLBACK client_ddeml_callback(UINT uType, UINT uFmt, HCONV hconv, @@ -823,14 +841,17 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon return 0; } -static void test_ddeml_server(HANDLE hproc) +static void test_ddeml_server(void) { + HANDLE client; MSG msg; UINT res; BOOL ret; HSZ server; HDDEDATA hdata; + client = create_process("msg"); + /* set up DDE server */ server_pid = 0; res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); @@ -842,14 +863,15 @@ static void test_ddeml_server(HANDLE hproc) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } static HWND client_hwnd, server_hwnd; @@ -2683,8 +2705,9 @@ static void test_end_to_end_client(BOOL type_a) } -static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) +static void test_end_to_end_server(BOOL client_unicode, BOOL server_unicode) { + HANDLE client; MSG msg; HSZ server; BOOL ret; @@ -2692,13 +2715,14 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("start end to end server %s\n", type_a ? "ASCII" : "UNICODE"); + trace("client %s, server %s\n", client_unicode ? "unicode" : "ascii", + server_unicode ? "unicode" : "ascii"); server_pid = 0; - if (type_a) - res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); - else + if (server_unicode) res = DdeInitializeW(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); + else + res = DdeInitializeA(&server_pid, server_end_to_end_callback, APPCLASS_STANDARD, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); server = DdeCreateStringHandleA(server_pid, test_service, CP_WINANSI); @@ -2706,27 +2730,25 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); ok(hdata == (HDDEDATA)TRUE, "Expected TRUE, got %p\n", hdata); - ResumeThread( hthread ); + client = create_process(client_unicode ? "endw" : "enda"); - while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) + while (MsgWaitForMultipleObjects(1, &client, FALSE, INFINITE, QS_ALLINPUT) != 0) { while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - GetExitCodeProcess( hproc, &res ); + GetExitCodeProcess(client, &res); ok( !res, "client failed with %u error(s)\n", res ); + CloseHandle(client); } START_TEST(dde) { int argc; char **argv; - char buffer[MAX_PATH]; - STARTUPINFOA startup; - PROCESS_INFORMATION proc; DWORD dde_inst = 0xdeadbeef; argc = winetest_get_mainargs(&argv); @@ -2754,30 +2776,12 @@ START_TEST(dde) return; } - ZeroMemory(&startup, sizeof(STARTUPINFOA)); - sprintf(buffer, "%s dde ddeml", argv[0]); - startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW; - startup.wShowWindow = SW_SHOWNORMAL; - - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_msg_server(proc.hProcess, proc.hThread); - - sprintf(buffer, "%s dde msg", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - 0, NULL, NULL, &startup, &proc); - - test_ddeml_server(proc.hProcess); + test_msg_server(); + test_ddeml_server(); /* Test the combinations of A and W interfaces with A and W data end to end to ensure that data conversions are accurate */ - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(FALSE, FALSE); /* Don't bother testing W interfaces on Win9x/WinMe */ SetLastError(0xdeadbeef); @@ -2788,23 +2792,9 @@ START_TEST(dde) } else { - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - - sprintf(buffer, "%s dde enda", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); - - sprintf(buffer, "%s dde endw", argv[0]); - CreateProcessA(NULL, buffer, NULL, NULL, FALSE, - CREATE_SUSPENDED, NULL, NULL, &startup, &proc); - - test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + test_end_to_end_server(TRUE, TRUE); + test_end_to_end_server(FALSE, TRUE); + test_end_to_end_server(TRUE, FALSE); test_dde_aw_transaction( FALSE, TRUE ); test_dde_aw_transaction( TRUE, FALSE );

1 0

Zebediah Figura : user32/tests: Get rid of some Windows 9x workarounds.
by Alexandre Julliard 27 Dec '19

27 Dec '19

Module: wine Branch: master Commit: 986bfcadd71786768abeb0e219da2572462b6e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=986bfcadd71786768abeb0e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 27 10:37:38 2019 -0600 user32/tests: Get rid of some Windows 9x workarounds. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 249 ++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=986bfcadd71786768abe…

1 0

Piotr Caban : msvcr90: Fix compilation warning in __AdjustPointer tests.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: eb2e9271a4cafd37080c95c90f1225637b1b1e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2e9271a4cafd37080c95c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 26 16:47:07 2019 +0100 msvcr90: Fix compilation warning in __AdjustPointer tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 050699e485..9bdaa1e3bd 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1475,9 +1475,12 @@ static void test_is_exception_typeof(void) static void test__AdjustPointer(void) { - int off = 0xf0; - void *obj1 = &off; - void *obj2 = (char*)&off - 2; + struct { + int vbase; + int off; + } obj = { 0, 0xf0 }; + void *obj1 = &obj.off; + void *obj2 = &obj; struct test_data { void *ptr; void *ret; @@ -1490,10 +1493,10 @@ static void test__AdjustPointer(void) {NULL, NULL, {0, -1, 0}}, {(void*)0xbeef, (void*)0xbef0, {1, -1, 1}}, {(void*)0xbeef, (void*)0xbeee, {-1, -1, 0}}, - {&obj1, (char*)&obj1 + off, {0, 0, 0}}, - {(char*)&obj1 - 5, (char*)&obj1 + off, {0, 5, 0}}, - {(char*)&obj1 - 3, (char*)&obj1 + off + 24, {24, 3, 0}}, - {(char*)&obj2 - 17, (char*)&obj2 + off + 4, {4, 17, 2}} + {&obj1, (char*)&obj1 + obj.off, {0, 0, 0}}, + {(char*)&obj1 - 5, (char*)&obj1 + obj.off, {0, 5, 0}}, + {(char*)&obj1 - 3, (char*)&obj1 + obj.off + 24, {24, 3, 0}}, + {(char*)&obj2 - 17, (char*)&obj2 + obj.off + 4, {4, 17, sizeof(int)}} }; void *ret; int i;

1 0

Michael Stefaniuc : dmcompos/tests: Add Chord track GetParam/SetParam tests.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: a3c0a1d57188242f8aca6f5deaf09d625c73e31e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c0a1d57188242f8aca6f5d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 26 17:21:27 2019 +0100 dmcompos/tests: Add Chord track GetParam/SetParam tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..f041d0ac34 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,6 +267,7 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; HRESULT hr; @@ -331,11 +332,29 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr == S_OK, "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL);

1 0

Zebediah Figura : ole32/tests: Rewrite and expand test_data_cache_updatecache().
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 91d4caa4cda882dc33c12ce9bb9523a36a418b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91d4caa4cda882dc33c12ce9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 26 10:32:26 2019 -0600 ole32/tests: Rewrite and expand test_data_cache_updatecache(). Instead of testing calls to IDataObject::GetData() and IDataObject::QueryGetData(), actually test whether the cache contains the updated data that we expose after calling IOleCache2::UpdateCache(). Fixes test failures with Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 511 +++++++++++++++++++++++------------------------- 1 file changed, 242 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91d4caa4cda882dc33c1…

1 0

Zebediah Figura : ole32/tests: Make the tests less verbose by default.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: c6a98a3187b1345cbe619a87d84d442884ff2f7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a98a3187b1345cbe619a87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 26 10:32:27 2019 -0600 ole32/tests: Make the tests less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4103a75abc..cd7eb83923 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -150,7 +150,7 @@ typedef struct PresentationDataHeader static void inline check_expected_method_fmt(const char *method_name, const FORMATETC *fmt) { - trace("%s\n", method_name); + if (winetest_debug > 1) trace("%s\n", method_name); ok(expected_method_list->method != NULL, "Extra method %s called\n", method_name); if (expected_method_list->method) { @@ -269,6 +269,8 @@ static LONG ole_object_refcount; static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { + if (winetest_debug > 1) trace("IOleObject::QueryInterface(%s)\n", debugstr_guid(riid)); + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleObject)) @@ -287,7 +289,6 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v return S_OK; } - trace("OleObject_QueryInterface: returning E_NOINTERFACE\n"); return E_NOINTERFACE; } @@ -1019,7 +1020,6 @@ static void test_OleCreate(IStorage *pStorage) runnable = &OleObjectRunnable; cache = &OleObjectCache; expected_method_list = methods_olerender_none; - trace("OleCreate with OLERENDER_NONE:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_NONE, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -1027,7 +1027,6 @@ static void test_OleCreate(IStorage *pStorage) ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw; - trace("OleCreate with OLERENDER_DRAW:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -1035,7 +1034,6 @@ static void test_OleCreate(IStorage *pStorage) ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw_with_site; - trace("OleCreate with OLERENDER_DRAW, with site:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -1045,7 +1043,6 @@ static void test_OleCreate(IStorage *pStorage) /* GetMiscStatus fails */ g_GetMiscStatusFailsWith = 0x8fafefaf; expected_method_list = methods_olerender_draw_with_site; - trace("OleCreate with OLERENDER_DRAW, with site:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -1059,7 +1056,6 @@ static void test_OleCreate(IStorage *pStorage) formatetc.lindex = -1; formatetc.tymed = TYMED_HGLOBAL; expected_method_list = methods_olerender_format; - trace("OleCreate with OLERENDER_FORMAT:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_FORMAT, &formatetc, (IOleClientSite *)0xdeadbeef, pStorage, (void **)&pObject); ok(hr == S_OK || broken(hr == E_INVALIDARG), /* win2k */ @@ -1072,7 +1068,6 @@ static void test_OleCreate(IStorage *pStorage) ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_asis; - trace("OleCreate with OLERENDER_ASIS:\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_ASIS, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -1083,7 +1078,6 @@ static void test_OleCreate(IStorage *pStorage) formatetc.tymed = TYMED_NULL; runnable = NULL; expected_method_list = methods_olerender_draw_no_runnable; - trace("OleCreate with OLERENDER_DRAW (no IRunnableObject):\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -1092,13 +1086,11 @@ static void test_OleCreate(IStorage *pStorage) runnable = &OleObjectRunnable; cache = NULL; expected_method_list = methods_olerender_draw_no_cache; - trace("OleCreate with OLERENDER_DRAW (no IOleCache):\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); - trace("end\n"); g_expected_fetc = NULL; } @@ -1120,7 +1112,6 @@ static void test_OleLoad(IStorage *pStorage) /* Test once with IOleObject_GetMiscStatus failing */ expected_method_list = methods_oleload; g_GetMiscStatusFailsWith = E_FAIL; - trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || broken(hr == E_INVALIDARG), /* win98 and win2k */ @@ -1140,7 +1131,6 @@ static void test_OleLoad(IStorage *pStorage) /* Test again, let IOleObject_GetMiscStatus succeed. */ expected_method_list = methods_oleload; - trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || broken(hr == E_INVALIDARG), /* win98 and win2k */ @@ -1826,7 +1816,6 @@ static void test_data_cache(void) CHECK_NO_EXTRA_METHODS(); /* Test with loaded data */ - trace("Testing loaded data with CreateDataCache:\n"); expected_method_list = methods_cacheload; hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); @@ -3685,7 +3674,6 @@ static void test_data_cache_save(void) SET_EXPECT(Storage_DestroyElement); Storage_DestroyElement_limit = 50; Storage_SetClass_CLSID = &CLSID_NULL; - trace("IPersistStorage_Save:\n"); hr = IPersistStorage_Save(stg, &Storage, FALSE); ok(hr == S_OK, "unexpected %#x\n", hr); CHECK_CALLED(Storage_CreateStream_OlePres); @@ -4357,7 +4345,6 @@ static void test_data_cache_save_data(void) ok(hr == S_OK, "unexpected %#x\n", hr); /* cache entries are dirty. test saving them to stg */ - trace("IPersistStorage_Save:\n"); hr = IPersistStorage_Save(persist, doc, FALSE); ok(hr == S_OK, "unexpected %#x\n", hr); @@ -4381,7 +4368,6 @@ static void test_data_cache_save_data(void) hr = IStorage_SetClass(doc, pdata->clsid); ok(hr == S_OK, "unexpected %#x\n", hr); - trace("IPersistStorage_Load\n"); hr = IPersistStorage_Load(persist, doc); ok(hr == S_OK, "unexpected %#x\n", hr);

1 0

Zebediah Figura : oleaut32/tests: Avoid testing that GDI objects are invalid.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: c7fa6e8e2d2cb85cabe1461cf59738fd2ada9e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7fa6e8e2d2cb85cabe1461c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 26 10:49:32 2019 -0600 oleaut32/tests: Avoid testing that GDI objects are invalid. This is not consistent across Windows versions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olefont.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 10e2a4cf2f..9c8d255af1 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1033,9 +1033,6 @@ static void test_hfont_lifetime(void) hr = IFont_get_hFont(font, &hfont); EXPECT_HR(hr, S_OK); - - obj_type = GetObjectType(last_hfont); - ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); } /* now show that if we take a reference on the hfont, it persists @@ -1063,9 +1060,6 @@ static void test_hfont_lifetime(void) IFont_Release(font); - obj_type = GetObjectType(first_hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); - /* An AddRefHfont followed by a ReleaseHfont means the font doesn't not persist through re-realization */ @@ -1099,9 +1093,6 @@ static void test_hfont_lifetime(void) hr = IFont_ReleaseHfont(font, hfont); EXPECT_HR(hr, S_OK); - - obj_type = GetObjectType(last_hfont); - ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); } /* Interestingly if we release a nonexistent reference on the hfont, @@ -1130,9 +1121,6 @@ static void test_hfont_lifetime(void) IFont_Release(font); - obj_type = GetObjectType(first_hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); - /* If we take two internal references on a hfont then we can release it twice. So it looks like there's a total reference count that includes internal and external references */ @@ -1165,9 +1153,6 @@ todo_wine ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); IFont_Release(font2); - - obj_type = GetObjectType(hfont); - ok(obj_type == 0, "got obj type %d\n", obj_type); } static void test_realization(void)

1 0

Piotr Caban : msvcrt/tests: Improve doubles comparison in strtod and atodbl tests.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 9b6c9b08816357e613b1acd7003d7bc32f22a605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6c9b08816357e613b1acd7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 26 18:30:48 2019 +0100 msvcrt/tests: Improve doubles comparison in strtod and atodbl tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index fa2c8d6196..08bc0781e1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1880,17 +1880,21 @@ static void test__strtoi64(void) ok(errno == ERANGE, "errno = %x\n", errno); } -static inline BOOL almost_equal(double d1, double d2) { - if(d1-d2>-1e-30 && d1-d2<1e-30) - return TRUE; - return FALSE; -} +static inline BOOL compare_double(double f, double g, unsigned int ulps) +{ + ULONGLONG x = *(ULONGLONG *)&f; + ULONGLONG y = *(ULONGLONG *)&g; + + if (f < 0) + x = ~x + 1; + else + x |= ((ULONGLONG)1)<<63; + if (g < 0) + y = ~y + 1; + else + y |= ((ULONGLONG)1)<<63; -static inline BOOL large_almost_equal(double d1, double d2) { - double diff = fabs(d1-d2); - if(diff / (fabs(d1) + fabs(d2)) < DBL_EPSILON) - return TRUE; - return FALSE; + return (x>y ? x-y : y-x) <= ulps; } static void test__strtod(void) @@ -1908,34 +1912,34 @@ static void test__strtod(void) double d; d = strtod(double1, &end); - ok(almost_equal(d, 12.1), "d = %lf\n", d); + ok(d == 12.1, "d = %.16e\n", d); ok(end == double1+4, "incorrect end (%d)\n", (int)(end-double1)); d = strtod(double2, &end); - ok(almost_equal(d, -13.721), "d = %lf\n", d); + ok(d == -13.721, "d = %.16e\n", d); ok(end == double2+7, "incorrect end (%d)\n", (int)(end-double2)); d = strtod(double3, &end); - ok(almost_equal(d, 0), "d = %lf\n", d); + ok(d == 0, "d = %.16e\n", d); ok(end == double3, "incorrect end (%d)\n", (int)(end-double3)); d = strtod(double4, &end); - ok(almost_equal(d, 210000000000.0), "d = %lf\n", d); + ok(d == 210000000000.0, "d = %.16e\n", d); ok(end == double4+6, "incorrect end (%d)\n", (int)(end-double4)); d = strtod(double5, &end); - ok(almost_equal(d, 214.353), "d = %lf\n", d); + ok(d == 214.353, "d = %.16e\n", d); ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); d = strtod(double6, &end); - ok(almost_equal(d, 0), "d = %lf\n", d); + ok(d == 0, "d = %.16e\n", d); ok(end == double6, "incorrect end (%d)\n", (int)(end-double6)); d = strtod("12.1d2", NULL); - ok(almost_equal(d, 12.1e2), "d = %lf\n", d); + ok(d == 12.1e2, "d = %.16e\n", d); d = strtod(white_chars, &end); - ok(almost_equal(d, 0), "d = %lf\n", d); + ok(d == 0, "d = %.16e\n", d); ok(end == white_chars, "incorrect end (%d)\n", (int)(end-white_chars)); if (!p__strtod_l) @@ -1944,19 +1948,19 @@ static void test__strtod(void) { errno = EBADF; d = strtod(NULL, NULL); - ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(d == 0.0, "d = %.16e\n", d); ok(errno == EINVAL, "errno = %x\n", errno); errno = EBADF; end = (char *)0xdeadbeef; d = strtod(NULL, &end); - ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(d == 0.0, "d = %.16e\n", d); ok(errno == EINVAL, "errno = %x\n", errno); ok(!end, "incorrect end ptr %p\n", end); errno = EBADF; d = p__strtod_l(NULL, NULL, NULL); - ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(d == 0.0, "d = %.16e\n", d); ok(errno == EINVAL, "errno = %x\n", errno); } @@ -1967,28 +1971,28 @@ static void test__strtod(void) } d = strtod("12.1", NULL); - ok(almost_equal(d, 12.0), "d = %lf\n", d); + ok(d == 12.0, "d = %.16e\n", d); d = strtod("12,1", NULL); - ok(almost_equal(d, 12.1), "d = %lf\n", d); + ok(d == 12.1, "d = %.16e\n", d); setlocale(LC_ALL, "C"); /* Precision tests */ d = strtod("0.1", NULL); - ok(almost_equal(d, 0.1), "d = %lf\n", d); + ok(d == 0.1, "d = %.16e\n", d); d = strtod("-0.1", NULL); - ok(almost_equal(d, -0.1), "d = %lf\n", d); + ok(d == -0.1, "d = %.16e\n", d); d = strtod("0.1281832188491894198128921", NULL); - ok(almost_equal(d, 0.1281832188491894198128921), "d = %lf\n", d); + ok(d == 0.1281832188491894198128921, "d = %.16e\n", d); d = strtod("0.82181281288121", NULL); - ok(almost_equal(d, 0.82181281288121), "d = %lf\n", d); + ok(d == 0.82181281288121, "d = %.16e\n", d); d = strtod("21921922352523587651128218821", NULL); - ok(almost_equal(d, 21921922352523587651128218821.0), "d = %lf\n", d); + ok(d == 21921922352523587651128218821.0, "d = %.16e\n", d); d = strtod("0.1d238", NULL); - ok(almost_equal(d, 0.1e238L), "d = %lf\n", d); + ok(d == 0.1e238, "d = %.16e\n", d); d = strtod("0.1D-4736", NULL); - ok(almost_equal(d, 0.1e-4736L), "d = %lf\n", d); + ok(d == 0.0, "d = %.16e\n", d); errno = 0xdeadbeef; strtod(overflow, &end); @@ -3067,7 +3071,7 @@ static void test__atodbl(void) if (expected < DBL_MIN || expected > DBL_MAX) continue; snprintf(num, sizeof(num), "%de%d", i, j); ret = _atodbl(&d, num); - ok(large_almost_equal(d.x, expected), "d.x = %le, expected %le\n", d.x, expected); + ok(compare_double(d.x, expected, 2), "d.x = %.16e, expected %.16e\n", d.x, expected); } } @@ -3075,10 +3079,10 @@ static void test__atodbl(void) strcpy(num, "1e-309"); ret = p__atodbl_l(&d, num, NULL); ok(ret == _UNDERFLOW, "_atodbl_l(&d, \"1e-309\", NULL) returned %d, expected _UNDERFLOW\n", ret); - ok(d.x!=0 && almost_equal(d.x, 0.1e-308), "d.x = %le, expected 0.1e-308\n", d.x); + ok(compare_double(d.x, 1e-309, 1), "d.x = %.16e, expected 0\n", d.x); ret = _atodbl(&d, num); ok(ret == _UNDERFLOW, "_atodbl(&d, \"1e-309\") returned %d, expected _UNDERFLOW\n", ret); - ok(d.x!=0 && almost_equal(d.x, 0.1e-308), "d.x = %le, expected 0.1e-308\n", d.x); + ok(compare_double(d.x, 1e-309, 1), "d.x = %.16e, expected 0\n", d.x); strcpy(num, "1e309"); ret = p__atodbl_l(&d, num, NULL); @@ -3283,13 +3287,13 @@ static void test_atof(void) double d; d = atof("0.0"); - ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(d == 0.0, "d = %lf\n", d); d = atof("1.0"); - ok(almost_equal(d, 1.0), "d = %lf\n", d); + ok(d == 1.0, "d = %lf\n", d); d = atof("-1.0"); - ok(almost_equal(d, -1.0), "d = %lf\n", d); + ok(d == -1.0, "d = %lf\n", d); if (!p__atof_l) { @@ -3299,12 +3303,12 @@ static void test_atof(void) errno = EBADF; d = atof(NULL); - ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(d == 0.0, "d = %lf\n", d); ok(errno == EINVAL, "errno = %x\n", errno); errno = EBADF; d = p__atof_l(NULL, NULL); - ok(almost_equal(d, 0.0), "d = %lf\n", d); + ok(d == 0.0, "d = %lf\n", d); ok(errno == EINVAL, "errno = %x\n", errno); }

1 0

Piotr Caban : msvcr90/tests: Improve floats comparison in _atoflt tests.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 38666006cb1fa0abe44687ede02e692bd37ed226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38666006cb1fa0abe44687ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 26 18:30:58 2019 +0100 msvcr90/tests: Improve floats comparison in _atoflt tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 9bdaa1e3bd..9e7d280cf8 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -234,11 +234,6 @@ static int cb_called[4]; static int g_qsort_s_context_counter; static int g_bsearch_s_context_counter; -static inline int almost_equal_f(float f1, float f2) -{ - return f1-f2 > -1e-30 && f1-f2 < 1e-30; -} - /* ########## */ /* thiscall emulation */ @@ -1009,7 +1004,7 @@ if (0) _atoflt_testdata[i].ret, _atoflt_testdata[i].str); if (ret == 0) - ok(almost_equal_f(flt.f, _atoflt_testdata[i].flt), "got %f, expected %f, for %s\n", flt.f, + ok(flt.f == _atoflt_testdata[i].flt, "got %f, expected %f, for %s\n", flt.f, _atoflt_testdata[i].flt, _atoflt_testdata[i].str); i++;

1 0