October 2017 - Wine-Commits

Dmitry Timoshkov : ole32: Remove an optimization from DataCache_Save() that copies whole original storage.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: f7eabdf3a8ebdcc388772949749f36808ba7fea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eabdf3a8ebdcc3887729497… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:43:28 2017 +0800 ole32: Remove an optimization from DataCache_Save() that copies whole original storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 6 ------ dlls/ole32/tests/ole2.c | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 808c2dc..360ecd8 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1665,12 +1665,6 @@ static HRESULT WINAPI DataCache_Save( } } - /* this is a shortcut if nothing changed */ - if (!dirty && !fSameAsLoad && This->presentationStorage) - { - return IStorage_CopyTo(This->presentationStorage, 0, NULL, NULL, pStg); - } - /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 16c6d88..08b6a27 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2980,9 +2980,7 @@ static HRESULT WINAPI Storage_SetElementTimes(IStorage *iface, LPCOLESTR pwcsNam static HRESULT WINAPI Storage_SetClass(IStorage *iface, REFCLSID clsid) { -todo_wine_if(!expect_Storage_SetClass) CHECK_EXPECT(Storage_SetClass); -todo_wine_if(IsEqualIID(Storage_SetClass_CLSID, &CLSID_NULL)) ok(IsEqualIID(clsid, Storage_SetClass_CLSID), "expected %s, got %s\n", wine_dbgstr_guid(Storage_SetClass_CLSID), wine_dbgstr_guid(clsid)); return S_OK; @@ -3491,7 +3489,6 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ hr = IStorage_Stat(stg, &stat, STATFLAG_NONAME); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine_if(!IsEqualCLSID(stg_def->clsid, &stat.clsid)) ok(IsEqualCLSID(stg_def->clsid, &stat.clsid), "expected %s, got %s\n", wine_dbgstr_guid(stg_def->clsid), wine_dbgstr_guid(&stat.clsid)); @@ -3702,10 +3699,10 @@ todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || t enumerated_streams = matched_streams = -1; check_storage_contents(doc2, test_data[i].out, &enumerated_streams, &matched_streams); -todo_wine +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i, enumerated_streams, matched_streams); -todo_wine +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_5)) ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i, enumerated_streams, test_data[i].out->stream_count);

1 0

Jacek Caban : mshtml: Implement IDOMEvent:: stopPropagation and use it where appropriate.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: aa6882cba86d63ac89d06081e0af69cafd0f2e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa6882cba86d63ac89d06081e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:05 2017 +0200 mshtml: Implement IDOMEvent::stopPropagation and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 19 ++++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0e1946b..02e4363 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -232,7 +232,6 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; - BOOL cancel_bubble; }; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) @@ -455,7 +454,8 @@ static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%x)\n", This, v); - This->cancel_bubble = !!v; + if(This->event) + IDOMEvent_stopPropagation(&This->event->IDOMEvent_iface); return S_OK; } @@ -465,7 +465,7 @@ static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - *p = This->cancel_bubble ? VARIANT_TRUE : VARIANT_FALSE; + *p = This->event && This->event->stop_propagation ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } @@ -984,8 +984,13 @@ static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->stop_propagation = TRUE; + nsIDOMEvent_StopPropagation(This->nsevent); + IDOMEvent_preventDefault(&This->IDOMEvent_iface); + return S_OK; } static HRESULT WINAPI DOMEvent_stopImmediatePropagation(IDOMEvent *iface) @@ -1422,7 +1427,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent for(i = 0; i < chain_cnt; i++) { call_event_handlers(event_obj, target_chain[i], event); - if(!(event_flags & EVENT_BUBBLES) || (event_obj && event_obj->cancel_bubble)) + if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) break; } @@ -1440,7 +1445,7 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent continue; hres = vtbl->handle_event_default(&event_target->dispex, event->event_id, event->nsevent, &prevent_default); - if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) + if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) IDOMEvent_preventDefault(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1528f91..76b971f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -65,6 +65,7 @@ typedef struct { eventid_t event_id; EventTarget *target; BOOL prevent_default; + BOOL stop_propagation; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cc1da62..84a35f3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2550,6 +2550,9 @@ static void test_create_event(IHTMLDocument2 *doc) hres = IDOMEvent_preventDefault(event); ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + hres = IDOMEvent_stopPropagation(event); + ok(hres == S_OK, "stopPropagation failed: %08x\n", hres); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Implement IDOMEvent:: preventDefault and use it where appropriate.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: d5b0c1d77c7d3e329e2da7ba013bd0f505a752ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b0c1d77c7d3e329e2da7ba0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:08:59 2017 +0200 mshtml: Implement IDOMEvent::preventDefault and use it where appropriate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++------------------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 3 +++ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 00b9524..0e1946b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -232,7 +232,6 @@ struct HTMLEventObj { const event_info_t *type; DOMEvent *event; VARIANT return_value; - BOOL prevent_default; BOOL cancel_bubble; }; @@ -435,8 +434,8 @@ static HRESULT WINAPI HTMLEventObj_put_returnValue(IHTMLEventObj *iface, VARIANT } This->return_value = v; - if(!V_BOOL(&v)) - This->prevent_default = TRUE; + if(!V_BOOL(&v) && This->event) + IDOMEvent_preventDefault(&This->event->IDOMEvent_iface); return S_OK; } @@ -974,8 +973,12 @@ static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BO static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->prevent_default = TRUE; + nsIDOMEvent_PreventDefault(This->nsevent); + return S_OK; } static HRESULT WINAPI DOMEvent_stopPropagation(IDOMEvent *iface) @@ -1274,7 +1277,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1306,7 +1309,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1346,7 +1349,7 @@ void call_event_handlers(HTMLEventObj *event_obj, EventTarget *event_target, DOM if(cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) - event_obj->prevent_default = TRUE; + IDOMEvent_preventDefault(&event->IDOMEvent_iface); }else if(V_VT(&v) != VT_EMPTY) { FIXME("unhandled result %s\n", debugstr_variant(&v)); } @@ -1368,7 +1371,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent unsigned chain_cnt, chain_buf_size, i; const event_target_vtbl_t *vtbl, *target_vtbl; IHTMLEventObj *prev_event = NULL; - BOOL prevent_default = FALSE; EventTarget *iter; DWORD event_flags; HRESULT hres; @@ -1430,11 +1432,9 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IHTMLEventObj_Release(prev_event); } - if(event_obj && event_obj->prevent_default) - prevent_default = TRUE; - if(event_flags & EVENT_HASDEFAULTHANDLERS) { - for(i = 0; !prevent_default && i < chain_cnt; i++) { + for(i = 0; !event->prevent_default && i < chain_cnt; i++) { + BOOL prevent_default = FALSE; vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; @@ -1442,6 +1442,8 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent event->nsevent, &prevent_default); if(FAILED(hres) || (event_obj && event_obj->cancel_bubble)) break; + if(prevent_default) + IDOMEvent_preventDefault(&event->IDOMEvent_iface); } } @@ -1449,11 +1451,6 @@ static void fire_event_obj(EventTarget *event_target, DOMEvent *event, HTMLEvent IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); if(target_chain != target_chain_buf) heap_free(target_chain); - - if(prevent_default) { - TRACE("calling PreventDefault\n"); - nsIDOMEvent_PreventDefault(event->nsevent); - } } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, EventTarget *target, nsIDOMEvent *nsevent) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 2230608..1528f91 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,6 +64,7 @@ typedef struct { nsIDOMEvent *nsevent; eventid_t event_id; EventTarget *target; + BOOL prevent_default; } DOMEvent; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 228aa04..cc1da62 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2547,6 +2547,9 @@ static void test_create_event(IHTMLDocument2 *doc) SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); + hres = IDOMEvent_preventDefault(event); + ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Daniel Lehman : msvcp60: Only use name for internal string in exception.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 3a4fed1d7346e04b197abc2cb5f31c1c185e474d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4fed1d7346e04b197abc2cb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 20 13:02:51 2017 +0200 msvcp60: Only use name for internal string in exception. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/string.c | 127 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index f61ad4a..bf396f7 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -43,6 +43,29 @@ typedef struct MSVCP_size_t res; } basic_string_wchar; +typedef void (*vtable_ptr)(void); +typedef struct __exception +{ + const vtable_ptr *vtable; + char *name; + int do_free; +} exception; + +typedef struct { + exception e; + basic_string_char str; +} runtime_error; + +typedef struct { + exception e; + basic_string_char str; +} range_error; + +typedef struct { + exception e; + basic_string_char str; +} logic_error; + static basic_string_char* (__cdecl *p_basic_string_char_concatenate)(basic_string_char*, const basic_string_char*, const basic_string_char*); static basic_string_char* (__cdecl *p_basic_string_char_concatenate_cstr)(basic_string_char*, const basic_string_char*, const char*); @@ -86,6 +109,17 @@ static size_t (__thiscall *p_basic_string_wchar_size)(basic_string_wchar*); static size_t (__thiscall *p_basic_string_wchar_capacity)(basic_string_wchar*); static void (__thiscall *p_basic_string_wchar_swap)(basic_string_wchar*, basic_string_wchar*); +static runtime_error* (__thiscall *p_runtime_error_ctor_bstr)(runtime_error*, const basic_string_char*); +static void (__thiscall *p_runtime_error_dtor)(runtime_error*); +static const char *(__thiscall *p_runtime_error_what)(runtime_error*); + +static range_error* (__thiscall *p_range_error_ctor_bstr)(range_error*, const basic_string_char*); +static void (__thiscall *p_range_error_dtor)(range_error*); + +static logic_error* (__thiscall *p_logic_error_ctor_bstr)(logic_error*, const basic_string_char*); +static void (__thiscall *p_logic_error_dtor)(logic_error*); +static const char *(__thiscall *p_logic_error_what)(logic_error*); + /* Emulate a __thiscall */ #ifdef __i386__ @@ -226,6 +260,25 @@ static BOOL init(void) "?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ"); SET(p_basic_string_wchar_swap, "?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXAEAV12@@Z"); + + SET(p_runtime_error_ctor_bstr, + "??0runtime_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_runtime_error_dtor, + "??1runtime_error(a)std@@UEAA(a)XZ"); + SET(p_runtime_error_what, + "?what(a)runtime_error@std@@UEBAPEBDXZ"); + + SET(p_range_error_ctor_bstr, + "??0range_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_range_error_dtor, + "??1range_error(a)std@@UEAA(a)XZ"); + + SET(p_logic_error_ctor_bstr, + "??0logic_error(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_logic_error_dtor, + "??1logic_error(a)std@@UEAA(a)XZ"); + SET(p_logic_error_what, + "?what(a)logic_error@std@@UEBAPEBDXZ"); } else { SET(p_basic_string_char_ctor, "??_F?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ"); @@ -292,6 +345,25 @@ static BOOL init(void) "?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ"); SET(p_basic_string_wchar_swap, "?swap@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXAAV12@@Z"); + + SET(p_runtime_error_ctor_bstr, + "??0runtime_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_runtime_error_dtor, + "??1runtime_error(a)std@@UAE(a)XZ"); + SET(p_runtime_error_what, + "?what(a)runtime_error@std@@UBEPBDXZ"); + + SET(p_range_error_ctor_bstr, + "??0range_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_range_error_dtor, + "??1range_error(a)std@@UAE(a)XZ"); + + SET(p_logic_error_ctor_bstr, + "??0logic_error(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z"); + SET(p_logic_error_dtor, + "??1logic_error(a)std@@UAE(a)XZ"); + SET(p_logic_error_what, + "?what(a)logic_error@std@@UBEPBDXZ"); } init_thiscall_thunk(); @@ -687,6 +759,59 @@ static void test_basic_string_wchar_swap(void) { call_func1(p_basic_string_wchar_dtor, &str2); } +static void test_exception(void) +{ + const char *name = "test"; + const char *what; + basic_string_char str; + runtime_error re; + range_error ra; + logic_error le; + + call_func3(p_basic_string_char_ctor_cstr_alloc, &str, name, &fake_allocator); + + /* runtime_error */ + memset(&re, 0, sizeof(re)); + what = call_func1(p_runtime_error_what, &re); + ok(!strcmp("", what), "what = %s\n", what); + + memset(&re, 0xff, sizeof(re)); + call_func2(p_runtime_error_ctor_bstr, &re, &str); + ok(!strcmp(re.e.name, ""), "re.e.name = %s\n", re.e.name); + ok(re.e.do_free, "re.e.do_free == FALSE\n"); + what = call_func1(p_runtime_error_what, &re); + ok(!strcmp(name, what), "what = %s\n", what); + call_func1(p_runtime_error_dtor, &re); + + /* range_error */ + memset(&ra, 0, sizeof(ra)); + what = call_func1(p_runtime_error_what, (runtime_error*)&ra); + ok(!strcmp("", what), "what = %s\n", what); + + memset(&ra, 0xff, sizeof(ra)); + call_func2(p_range_error_ctor_bstr, &ra, &str); + ok(!strcmp(ra.e.name, ""), "ra.e.name = %s\n", ra.e.name); + ok(ra.e.do_free, "ra.e.do_free == FALSE\n"); + what = call_func1(p_runtime_error_what, (runtime_error*)&ra); + ok(!strcmp(name, what), "what = %s\n", what); + call_func1(p_range_error_dtor, &ra); + + /* logic_error */ + memset(&le, 0, sizeof(le)); + what = call_func1(p_logic_error_what, &le); + ok(!strcmp("", what), "what = %s\n", what); + + memset(&le, 0xff, sizeof(le)); + call_func2(p_logic_error_ctor_bstr, &le, &str); + ok(!strcmp(le.e.name, ""), "le.e.name = %s\n", le.e.name); + ok(le.e.do_free, "le.e.do_free == FALSE\n"); + what = call_func1(p_logic_error_what, &le); + ok(!strcmp(name, what), "what = %s\n", what); + call_func1(p_logic_error_dtor, &le); + + call_func1(p_basic_string_char_dtor, &str); +} + START_TEST(string) { if(!init()) @@ -703,5 +828,7 @@ START_TEST(string) test_basic_string_wchar(); test_basic_string_wchar_swap(); + test_exception(); + FreeLibrary(msvcp); }

1 0

Daniel Lehman : msvcirt/tests: Add more exception tests.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: daf0172bd935ae0ffc1d89610c2829c7d7af8607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0172bd935ae0ffc1d89610… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 20 13:02:36 2017 +0200 msvcirt/tests: Add more exception tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 63582e8..61f166b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -168,6 +168,18 @@ typedef struct { ios base_ios; /* virtually inherited */ } iostream; +/* class exception */ +typedef struct { + const void *vtable; + char *name; + int do_free; +} exception; + +/* class logic_error */ +typedef struct { + exception e; +} logic_error; + static inline float __port_infinity(void) { static const unsigned __inf_bytes = 0x7f800000; @@ -422,6 +434,14 @@ static iostream* (*__thiscall p_stdiostream_assign)(iostream*, const iostream*); /* Iostream_init */ static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); +/* exception */ +static exception* (*__thiscall p_exception_ctor)(exception*, const char**); +static void (*__thiscall p_exception_dtor)(exception*); +static const char* (*__thiscall p_exception_what)(exception*); + +static logic_error* (*__thiscall p_logic_error_ctor)(logic_error*, const char**); +static void (*__thiscall p_logic_error_dtor)(logic_error*); + /* Predefined streams */ static istream *p_cin; static ostream *p_cout, *p_cerr, *p_clog; @@ -710,6 +730,13 @@ static BOOL init(void) SET(p_stdiostream_assign, "??4stdiostream@@QEAAAEAV0(a)AEAV0@@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z"); + + SET(p_exception_ctor, "??0exception@@QEAA(a)AEBQEBD@Z"); + SET(p_exception_dtor, "??1exception@@UEAA(a)XZ"); + SET(p_exception_what, "?what(a)exception@@UEBAPEBDXZ"); + + SET(p_logic_error_ctor, "??0logic_error@@QEAA(a)AEBQEBD@Z"); + SET(p_logic_error_dtor, "??1logic_error@@UEAA(a)XZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -917,6 +944,13 @@ static BOOL init(void) SET(p_stdiostream_assign, "??4stdiostream@@QAEAAV0(a)AAV0@@Z"); SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE(a)AAVios@@H(a)Z"); + + SET(p_exception_ctor, "??0exception@@QAE(a)ABQBD@Z"); + SET(p_exception_dtor, "??1exception@@UAE(a)XZ"); + SET(p_exception_what, "?what(a)exception@@UBEPBDXZ"); + + SET(p_logic_error_ctor, "??0logic_error@@QAE(a)ABQBD@Z"); + SET(p_logic_error_dtor, "??1logic_error@@UAE(a)XZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -7464,6 +7498,34 @@ static void test_std_streams(void) ok(p_cin->count == 0xabababab, "expected %d got %d\n", 0xabababab, p_cin->count); } +static void test_exception(void) +{ + const char *unknown = "Unknown exception"; + const char *test = "test"; + const char *what; + logic_error le; + exception e; + + /* exception */ + memset(&e, 0, sizeof(e)); + what = call_func1(p_exception_what, (void*) &e); + ok(!strcmp(what, unknown), "expected %s got %s\n", unknown, what); + + call_func2(p_exception_ctor, (void*) &e, &test); + what = call_func1(p_exception_what, (void*) &e); + ok(!strcmp(what, test), "expected %s got %s\n", test, what); + call_func1(p_exception_dtor, (void*) &e); + + /* logic_error */ + memset(&le, 0xff, sizeof(le)); + call_func2(p_logic_error_ctor, (void*) &le, &test); + ok(!strcmp(le.e.name, test), "expected %s got %s\n", test, le.e.name); + ok(le.e.do_free, "expected TRUE, got FALSE\n"); + what = call_func1(p_exception_what, (void*) &le.e); + ok(!strcmp(what, test), "expected %s got %s\n", test, what); + call_func1(p_logic_error_dtor, (void*) &le); +} + START_TEST(msvcirt) { if(!init()) @@ -7489,6 +7551,7 @@ START_TEST(msvcirt) test_stdiostream(); test_Iostream_init(); test_std_streams(); + test_exception(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Daniel Lehman : msvcp120: Implement concurrent_vector:: _Internal_throw_exception.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 237788a56e54c1b9e58d7aa269d2b201e061380b URL: http://source.winehq.org/git/wine.git/?a=commit;h=237788a56e54c1b9e58d7aa26… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 20 13:02:23 2017 +0200 msvcp120: Implement concurrent_vector::_Internal_throw_exception. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp120_app/msvcp120_app.spec | 6 +++--- dlls/msvcp90/misc.c | 20 ++++++++++++++++++++ 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index eb0c9fb..0f96d7e 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -385,8 +385,8 @@ @ stub -arch=win64 ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z @ stub -arch=i386 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ @ stub -arch=win64 ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ @ stub -arch=i386 ?_IsCanceling(a)_TaskCollection@details(a)Concurrency@@QAE_NXZ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 8bffda2..d557a4a 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1061,8 +1061,8 @@ @ stub -arch=win64 ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z @ stub -arch=win32 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=win32 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ thiscall -arch=win32 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ thiscall -arch=win32 ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_char__Ipfx diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c912202..aa8adaf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1539,9 +1539,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ cdecl -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=arm ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z(ptr long) basic_istream_char__Ipfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 61d7c7d..e26e3cb 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1500,9 +1500,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ cdecl -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) _vector_base_v4__Internal_throw_exception +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) _vector_base_v4__Internal_throw_exception @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) ios_base_Ios_base_dtor @ cdecl -arch=arm ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z(ptr long) basic_istream_char__Ipfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index e63b3f7..03df113 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1500,9 +1500,9 @@ @ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBAXXZ @ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IBEXXZ @ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEBAXXZ -@ stub -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z -@ stub -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z -@ stub -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z +@ cdecl -arch=arm ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBAXI(a)Z +@ thiscall -arch=i386 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z +@ cdecl -arch=win64 ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z(ptr long) msvcp120.?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z @ cdecl -arch=win32 ?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z(ptr) msvcp120.?_Ios_base_dtor(a)ios_base@std@@CAXPAV12@@Z @ cdecl -arch=win64 ?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z(ptr) msvcp120.?_Ios_base_dtor(a)ios_base@std@@CAXPEAV12@@Z @ cdecl -arch=arm ?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z(ptr long) msvcp120.?_Ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAA_N_N(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 9f26a48..901930b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1702,4 +1702,24 @@ MSVCP_size_t __cdecl _vector_base_v4__Segment_index_of(MSVCP_size_t x) return log2i(x); } + +/* ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IBEXI(a)Z */ +/* ?_Internal_throw_exception(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEBAX_K(a)Z */ +DEFINE_THISCALL_WRAPPER(_vector_base_v4__Internal_throw_exception, 8) +void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4*/ *this, MSVCP_size_t idx) +{ + static const struct { + exception_type type; + const char *msg; + } exceptions[] = { + { EXCEPTION_OUT_OF_RANGE, "Index out of range" }, + { EXCEPTION_OUT_OF_RANGE, "Index out of segments table range" }, + { EXCEPTION_RANGE_ERROR, "Index is inside segment which failed to be allocated" }, + }; + + TRACE("(%p %lu)\n", this, idx); + + if(idx < sizeof(exceptions)/sizeof(exceptions[0])) + throw_exception(exceptions[idx].type, exceptions[idx].msg); +} #endif

1 0

Piotr Caban : msvcrt: Don' t define type_info structures as const so we can set demangled class name.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 7274ed63e2165f3d0c500660aa4d89a57d89f3d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7274ed63e2165f3d0c500660a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 13:02:19 2017 +0200 msvcrt: Don't define type_info structures as const so we can set demangled class name. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 4 ++-- dlls/msvcrt/cxx.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index ddf9421..3da510e 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -68,7 +68,7 @@ #ifndef __x86_64__ #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ mangled_name \ @@ -140,7 +140,7 @@ static const cxx_exception_type type ## _cxx_type = { \ #else #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ mangled_name \ diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 50bf7ca..027026e 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -67,7 +67,7 @@ #ifndef __x86_64__ #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCRT_type_info_vtable, \ NULL, \ mangled_name \ @@ -113,7 +113,7 @@ const rtti_object_locator name ## _rtti = { \ #else #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ - static const type_info name ## _type_info = { \ + static type_info name ## _type_info = { \ &MSVCRT_type_info_vtable, \ NULL, \ mangled_name \

1 0

Dmitry Timoshkov : ole32/tests: Add a test for IOleCache storage contents created by IPersistStorage_Save ().
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 19385780ca630a553051e8e4f009a11eb82bcac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19385780ca630a553051e8e4f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:42:39 2017 +0800 ole32/tests: Add a test for IOleCache storage contents created by IPersistStorage_Save(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 402 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19385780ca630a553051e…

1 0

Alexandre Julliard : makedep: Output empty rule for source makefiles.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 83fbb78d5f186fd2a38134689296142ae91a0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fbb78d5f186fd2a38134689… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 10:03:17 2017 +0200 makedep: Output empty rule for source makefiles. This should avoid breaking the build when a makefile is removed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 296356b..ec339e0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3151,6 +3151,8 @@ static struct strarray output_sources( const struct makefile *make ) output( "Makefile:" ); output_filenames( makefile_deps ); output( "\n" ); + output_filenames( makefile_deps ); + output( ":\n" ); output( "distclean::\n"); output( "\trm -f" ); output_filenames( distclean_files );

1 0

Nikolay Sivov : dwrite/tests: Some tests for font set properties.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: f577fc8fa22da5645bd33f26a68a053d9bfc0132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f577fc8fa22da5645bd33f26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:25:16 2017 +0300 dwrite/tests: Some tests for font set properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c28f27a..7a14180 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8305,6 +8305,149 @@ static void test_AnalyzeContainerType(void) IDWriteFactory5_Release(factory); } +static void test_fontsetbuilder(void) +{ + IDWriteFontCollection1 *collection; + IDWriteFontSetBuilder *builder; + IDWriteFactory3 *factory; + UINT32 count, i, ref; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory3); + if (!factory) { + skip("IDWriteFontSetBuilder is not supported.\n"); + return; + } + + EXPECT_REF(factory, 1); + hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); +todo_wine + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + if (FAILED(hr)) { + IDWriteFactory3_Release(factory); + return; + } + + EXPECT_REF(factory, 2); + IDWriteFontSetBuilder_Release(builder); + + hr = IDWriteFactory3_GetSystemFontCollection(factory, FALSE, &collection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + + for (i = 0; i < count; i++) { + IDWriteFontFamily1 *family; + UINT32 j, fontcount; + IDWriteFont3 *font; + + hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + + fontcount = IDWriteFontFamily1_GetFontCount(family); + for (j = 0; j < fontcount; j++) { + IDWriteFontFaceReference *ref, *ref2; + IDWriteFontSet *fontset; + UINT32 setcount, id; + + hr = IDWriteFontFamily1_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + /* Create a set with a single font reference, test set properties. */ + hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + hr = IDWriteFont3_GetFontFaceReference(font, &ref); + ok(hr == S_OK, "Failed to get fontface reference, hr %#x.\n", hr); + + EXPECT_REF(ref, 1); + hr = IDWriteFontSetBuilder_AddFontFaceReference(builder, ref); + ok(hr == S_OK, "Failed to add fontface reference, hr %#x.\n", hr); + EXPECT_REF(ref, 1); + + hr = IDWriteFontSetBuilder_CreateFontSet(builder, &fontset); + ok(hr == S_OK, "Failed to create a font set, hr %#x.\n", hr); + + setcount = IDWriteFontSet_GetFontCount(fontset); + ok(setcount == 1, "Unexpected font count %u.\n", setcount); + + hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref2); + ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); + ok(ref2 != ref, "Unexpected reference.\n"); + IDWriteFontFaceReference_Release(ref2); + + for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; id++) { + static const WCHAR fmtW[] = {'%','u',0}; + IDWriteLocalizedStrings *values; + WCHAR buffW[255], buff2W[255]; + UINT32 c, ivalue; + BOOL exists; + + hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + + if (!exists) + continue; + + switch (id) + { + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + ivalue = IDWriteFont3_GetWeight(font); + break; + case DWRITE_FONT_PROPERTY_ID_STRETCH: + ivalue = IDWriteFont3_GetStretch(font); + break; + case DWRITE_FONT_PROPERTY_ID_STYLE: + ivalue = IDWriteFont3_GetStyle(font); + break; + default: + ; + } + + switch (id) + { + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + case DWRITE_FONT_PROPERTY_ID_STRETCH: + case DWRITE_FONT_PROPERTY_ID_STYLE: + c = IDWriteLocalizedStrings_GetCount(values); + ok(c == 1, "Unexpected string count %u.\n", c); + + buffW[0] = 'a'; + hr = IDWriteLocalizedStrings_GetLocaleName(values, 0, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "Failed to get locale name, hr %#x.\n", hr); + ok(!*buffW, "Unexpected locale %s.\n", wine_dbgstr_w(buffW)); + + buff2W[0] = 0; + hr = IDWriteLocalizedStrings_GetString(values, 0, buff2W, sizeof(buff2W)/sizeof(buff2W[0])); + ok(hr == S_OK, "Failed to get property string, hr %#x.\n", hr); + + wsprintfW(buffW, fmtW, ivalue); + ok(!lstrcmpW(buffW, buff2W), "Unexpected property value %s, expected %s.\n", wine_dbgstr_w(buff2W), + wine_dbgstr_w(buffW)); + break; + default: + ; + } + + IDWriteLocalizedStrings_Release(values); + } + + IDWriteFontSet_Release(fontset); + IDWriteFontFaceReference_Release(ref); + IDWriteFontSetBuilder_Release(builder); + + IDWriteFont3_Release(font); + } + + IDWriteFontFamily1_Release(family); + } + + IDWriteFontCollection1_Release(collection); + + ref = IDWriteFactory3_Release(factory); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -8371,6 +8514,7 @@ START_TEST(font) test_CreateCustomRenderingParams(); test_localfontfileloader(); test_AnalyzeContainerType(); + test_fontsetbuilder(); IDWriteFactory_Release(factory); }

1 0