wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Rémi Bernon : ntdll: Rename find_free_area to find_reserved_free_area.
by Alexandre Julliard 27 Dec '19

27 Dec '19

Module: wine Branch: master Commit: d840d7852b10121003e2af82f3463eb1705d4469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d840d7852b10121003e2af82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 26 22:27:25 2019 +0100 ntdll: Rename find_free_area to find_reserved_free_area. We used this function to find free areas outside of the reserved range, and it's obviously incorrect as there can be some system or external memory mapping we don't know about. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cb869feff0..ded00e3eb7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,14 +496,14 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } - /*********************************************************************** - * find_free_area + * find_reserved_free_area * * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. + * The range must be inside the preloader reserved range. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_reserved_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; void *start; @@ -1053,14 +1053,14 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) else { /* range is split in two by the preloader reservation, try first part */ - if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + if ((alloc->result = find_reserved_free_area( start, preload_reserve_start, alloc->size, + alloc->mask, alloc->top_down ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_reserved_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) return 1; return 0; @@ -1167,7 +1167,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (!zero_bits_64) ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + else if (!(ptr = find_reserved_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) return STATUS_NO_MEMORY; if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1)

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 27 Dec '19

27 Dec '19

Module: wine Branch: master Commit: ceeb07c2e7d156dfc40d28a279955ce236187250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceeb07c2e7d156dfc40d28a2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 26 22:33:41 2019 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 508 ++++++++++++++++++--------------------------------------------- 1 file changed, 146 insertions(+), 362 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceeb07c2e7d156dfc40d…

1 0

Dmitry Timoshkov : msscript.ocx/tests: Fix a typo.
by Alexandre Julliard 27 Dec '19

27 Dec '19

Module: wine Branch: master Commit: 27146e994776c0d13078ea0b15e04c279a867552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27146e994776c0d13078ea0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 27 17:02:44 2019 +0800 msscript.ocx/tests: Fix a typo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7693f0b51b..d95c43d9b4 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -448,7 +448,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc IActiveScriptSiteWindow *window; IActiveScriptSiteDebug *debug; IServiceProvider *service; - ICanHandleException *canexpection; + ICanHandleException *canexception; LCID lcid; HRESULT hres; @@ -468,7 +468,7 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); - hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexpection); + hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service);

1 0

Zebediah Figura : ntdll/tests: Remove a no longer reliable test.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 347b3b42fe548ed6190570d86b7ca2c900cdb7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=347b3b42fe548ed6190570d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 26 14:40:02 2019 -0600 ntdll/tests: Remove a no longer reliable test. On Windows 10 version 1607, a process called "Memory Compression" violates this invariant. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index caa123e982..76de56810c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -363,8 +363,6 @@ static void test_query_process(void) last_pid = (DWORD_PTR)spi->UniqueProcessId; - ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\n"); - /* Loop through the threads, skip NT4 for now */ if (!is_nt)

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

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

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

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 : 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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019