wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Henri Verbeet : d3d9: Remove D3D9_RENDER_STATES from the stateblock tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 3caba01ec9dc6ef4a37b37efda713752deb98645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3caba01ec9dc6ef4a37b37efd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:33 2009 +0200 d3d9: Remove D3D9_RENDER_STATES from the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 19bb948..9aa31c7 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -949,9 +949,8 @@ static void transform_queue_test( /* =================== State test: Render States ===================================== */ -#define D3D9_RENDER_STATES 102 -const D3DRENDERSTATETYPE render_state_indices[] = { - +const D3DRENDERSTATETYPE render_state_indices[] = +{ D3DRS_ZENABLE, D3DRS_FILLMODE, D3DRS_SHADEMODE, @@ -1060,7 +1059,7 @@ const D3DRENDERSTATETYPE render_state_indices[] = { }; typedef struct render_state_data { - DWORD states[D3D9_RENDER_STATES]; + DWORD states[sizeof(render_state_indices) / sizeof(*render_state_indices)]; } render_state_data; typedef struct render_state_arg { @@ -1082,7 +1081,8 @@ static void render_state_set_handler( const render_state_data* rsdata = data; unsigned int i; - for (i = 0; i < D3D9_RENDER_STATES; i++) { + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { hret = IDirect3DDevice9_SetRenderState(device, render_state_indices[i], rsdata->states[i]); ok(hret == D3D_OK, "SetRenderState returned %#x.\n", hret); } @@ -1095,7 +1095,8 @@ static void render_state_get_handler( render_state_data* rsdata = data; unsigned int i = 0; - for (i = 0; i < D3D9_RENDER_STATES; i++) { + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { hret = IDirect3DDevice9_GetRenderState(device, render_state_indices[i], &rsdata->states[i]); ok(hret == D3D_OK, "GetRenderState returned %#x.\n", hret); } @@ -1108,8 +1109,10 @@ static void render_state_print_handler( const render_state_data* rsdata = data; unsigned int i; - for (i = 0; i < D3D9_RENDER_STATES; i++) + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { trace("Index = %u, Value = %#x\n", i, rsdata->states[i]); + } } static inline DWORD to_dword(float fl) { @@ -1228,12 +1231,14 @@ static void render_state_default_data_init(const struct render_state_arg *rsarg, data->states[idx++] = TRUE; /* BLENDOPALPHA */ } -static void render_state_poison_data_init( - render_state_data* data) { +static void render_state_poison_data_init(struct render_state_data *data) +{ + unsigned int i; - unsigned int i; - for (i = 0; i < D3D9_RENDER_STATES; i++) + for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + { data->states[i] = 0x1337c0de; + } } static void render_state_test_data_init(

1 0

Mike Kaplinskiy : ws2_32/tests: fix failure on win98/me.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6d20b84ddd9f63d849a6b49928b005ee0fb2ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d20b84ddd9f63d849a6b4992… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Oct 5 01:51:58 2009 -0400 ws2_32/tests: fix failure on win98/me. --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 57147c9..37cd740 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2039,7 +2039,8 @@ static void test_accept(void) } WaitForSingleObject(thread_handle, 1000); - ok(thread_params.ReadKilled, "closesocket did not wakeup accept\n"); + ok(thread_params.ReadKilled || broken(!thread_params.ReadKilled) /* Win98/ME, after accept */, + "closesocket did not wakeup accept\n"); done: if (accepted != INVALID_SOCKET)

1 0

Jacek Caban : jscript: Query created ActiveXObject for IObjectWithSite interface.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 4462fb356d7aa60d927e3a88faa8ac5d00872db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4462fb356d7aa60d927e3a88f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 22:01:27 2009 +0200 jscript: Query created ActiveXObject for IObjectWithSite interface. --- dlls/jscript/activex.c | 7 +++++++ dlls/jscript/tests/activex.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index e37abd2..027a2e2 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -59,6 +59,7 @@ static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr; + IObjectWithSite *obj_site; struct CONFIRMSAFETY cs; IClassFactoryEx *cfex; IClassFactory *cf; @@ -114,6 +115,12 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) return NULL; } + hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); + if(SUCCEEDED(hres)) { + FIXME("Set object site\n"); + IObjectWithSite_Release(obj_site); + } + return obj; } diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index aabf8f5..cd7b5a0 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(QueryCustomPolicy); DEFINE_EXPECT(reportSuccess); DEFINE_EXPECT(Host_QS_SecMgr); DEFINE_EXPECT(Caller_QS_SecMgr); +DEFINE_EXPECT(QI_IObjectWithSite); static const WCHAR testW[] = {'t','e','s','t',0}; @@ -132,6 +133,9 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, if(FAILED(QI_IDispatch_hres)) return QI_IDispatch_hres; *ppv = iface; + }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { + CHECK_EXPECT(QI_IObjectWithSite); + return E_NOINTERFACE; }else { return E_NOINTERFACE; } @@ -747,12 +751,14 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); CHECK_CALLED(Host_QS_SecMgr); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); proc = parse_procedure_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); @@ -760,21 +766,25 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); call_procedure(proc, NULL); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); call_procedure(proc, &caller_sp); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); IDispatchEx_Release(proc); @@ -787,12 +797,14 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); call_procedure(proc, &caller_sp); CHECK_CALLED(Host_QS_SecMgr); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); parse_script_a(parser, "testException(function() { new ActiveXObject('Wine.TestABC'); }, 'Error', -2146827859);"); @@ -866,12 +878,14 @@ static void test_ActiveXObject(void) SET_EXPECT(ProcessUrlAction); SET_EXPECT(CreateInstance); SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); SET_EXPECT(reportSuccess); parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); CHECK_CALLED(Host_QS_SecMgr); CHECK_CALLED(ProcessUrlAction); CHECK_CALLED(CreateInstance); CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); CHECK_CALLED(reportSuccess); IUnknown_Release(parser);

1 0

Jacek Caban : mshtml: Fixed typo in IHTMLElement2::get_scrollHeight.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 0713fde4feb283c6f04e9585c18ec204e23ed4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0713fde4feb283c6f04e9585c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 22:00:17 2009 +0200 mshtml: Fixed typo in IHTMLElement2::get_scrollHeight. --- dlls/mshtml/htmlelem2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index b870a2a..fd7cb69 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -773,7 +773,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, LONG * TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { nsres = nsIDOMNSElement_GetScrollHeight(nselem, &height); nsIDOMNSElement_Release(nselem); @@ -783,7 +783,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, LONG * ERR("Could not get nsIDOMNSElement interface: %08x\n", nsres); } - *p = height == -1 ? 0 : height; + *p = height; TRACE("*p = %d\n", *p); return S_OK;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::client[Top|Left] tests.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 908e715c8327cd4a160699683f8772c64f2e5edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=908e715c8327cd4a160699683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 22:00:00 2009 +0200 mshtml: Added IHTMLElement2::client[Top|Left] tests. --- dlls/mshtml/tests/dom.c | 72 ++++++++++++++++++++++++++++++----------------- 1 files changed, 46 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dba424b..c13c0a8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -809,32 +809,6 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) return ret; } -static void test_doc_elem(IHTMLDocument2 *doc) -{ - IHTMLDocument2 *doc_node, *owner_doc; - IHTMLElement *elem; - IHTMLDocument3 *doc3; - HRESULT hres; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); - - hres = IHTMLDocument3_get_documentElement(doc3, &elem); - IHTMLDocument3_Release(doc3); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); - - test_node_name((IUnknown*)elem, "HTML"); - test_elem_tag((IUnknown*)elem, "HTML"); - - doc_node = get_doc_node(doc); - owner_doc = get_owner_doc((IUnknown*)elem); - ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); - IHTMLDocument2_Release(doc_node); - IHTMLDocument2_Release(owner_doc); - - IHTMLElement_Release(elem); -} - static void test_get_set_attr(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -2008,6 +1982,24 @@ static void _test_elem_client_size(unsigned line, IUnknown *unk) IHTMLElement2_Release(elem); } +#define test_elem_client_rect(u) _test_elem_client_rect(__LINE__,u) +static void _test_elem_client_rect(unsigned line, IUnknown *unk) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + LONG l; + HRESULT hres; + + hres = IHTMLElement2_get_clientLeft(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_clientLeft failed: %08x\n", hres); + ok_(__FILE__,line) (!l, "clientLeft = %d\n", l); + + hres = IHTMLElement2_get_clientTop(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_clientTop failed: %08x\n", hres); + ok_(__FILE__,line) (!l, "clientTop = %d\n", l); + + IHTMLElement2_Release(elem); +} + #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) { @@ -4203,6 +4195,34 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } +static void test_doc_elem(IHTMLDocument2 *doc) +{ + IHTMLDocument2 *doc_node, *owner_doc; + IHTMLElement *elem; + IHTMLDocument3 *doc3; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + + hres = IHTMLDocument3_get_documentElement(doc3, &elem); + IHTMLDocument3_Release(doc3); + ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + + test_node_name((IUnknown*)elem, "HTML"); + test_elem_tag((IUnknown*)elem, "HTML"); + + doc_node = get_doc_node(doc); + owner_doc = get_owner_doc((IUnknown*)elem); + ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); + IHTMLDocument2_Release(doc_node); + IHTMLDocument2_Release(owner_doc); + + test_elem_client_rect((IUnknown*)elem); + + IHTMLElement_Release(elem); +} + static void test_default_body(IHTMLBodyElement *body) { LONG l;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::clientLeft implementation.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 74071b0505234c7dab9b1fd69bd4692dbaf20506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74071b0505234c7dab9b1fd69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 21:59:05 2009 +0200 mshtml: Added IHTMLElement2::clientLeft implementation. --- dlls/mshtml/htmlelem2.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 5b58fd4..b870a2a 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -614,8 +614,25 @@ static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSElement *nselem; + PRInt32 client_left = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSElement_GetClientLeft(nselem, &client_left); + nsIDOMNSElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollHeight failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSElement interface: %08x\n", nsres); + } + + *p = client_left; + TRACE("*p = %d\n", *p); + return S_OK; } static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event,

1 0

Jacek Caban : mshtml: Added IHTMLElement2::clientTop implementation.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 6d6f341c64b037e59cccebe028a057374e2e2b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6f341c64b037e59cccebe02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 21:58:38 2009 +0200 mshtml: Added IHTMLElement2::clientTop implementation. --- dlls/mshtml/htmlelem2.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 342030c..5b58fd4 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -590,8 +590,25 @@ static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, LONG *p static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSElement *nselem; + PRInt32 client_top = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSElement_GetClientTop(nselem, &client_top); + nsIDOMNSElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollHeight failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSElement interface: %08x\n", nsres); + } + + *p = client_top; + TRACE("*p = %d\n", *p); + return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p)

1 0

Paul Vriens : comctl32/tests: Fix some test failures (MCM_GETSELRANGE).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: a7633d783dfeb375941d9b4e072ced1d48c9524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7633d783dfeb375941d9b4e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:21:59 2009 +0200 comctl32/tests: Fix some test failures (MCM_GETSELRANGE). --- dlls/comctl32/tests/monthcal.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 64a11b0..1ac2bb8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1484,7 +1484,7 @@ static void test_monthcal_getselrange(void) { HWND hwnd; SYSTEMTIME st, range[2]; - BOOL ret; + BOOL ret, old_comctl32 = FALSE; hwnd = create_monthcal_control(MCS_MULTISELECT); @@ -1492,25 +1492,37 @@ static void test_monthcal_getselrange(void) ret = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st); expect(TRUE, ret); + memset(range, 0xcc, sizeof(range)); ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range); expect(TRUE, ret); expect(st.wYear, range[0].wYear); expect(st.wMonth, range[0].wMonth); expect(st.wDay, range[0].wDay); - expect(st.wDayOfWeek, range[0].wDayOfWeek); - expect(st.wHour, range[0].wHour); - expect(st.wMinute, range[0].wMinute); - expect(st.wSecond, range[0].wSecond); - expect(st.wMilliseconds, range[0].wMilliseconds); + if (range[0].wDayOfWeek == 0) + { + win_skip("comctl32 <= 4.70 doesn't set some values\n"); + old_comctl32 = TRUE; + } + else + { + expect(st.wDayOfWeek, range[0].wDayOfWeek); + expect(st.wHour, range[0].wHour); + expect(st.wMinute, range[0].wMinute); + expect(st.wSecond, range[0].wSecond); + expect(st.wMilliseconds, range[0].wMilliseconds); + } expect(st.wYear, range[1].wYear); expect(st.wMonth, range[1].wMonth); expect(st.wDay, range[1].wDay); - expect(st.wDayOfWeek, range[1].wDayOfWeek); - expect(st.wHour, range[1].wHour); - expect(st.wMinute, range[1].wMinute); - expect(st.wSecond, range[1].wSecond); - expect(st.wMilliseconds, range[1].wMilliseconds); + if (!old_comctl32) + { + expect(st.wDayOfWeek, range[1].wDayOfWeek); + expect(st.wHour, range[1].wHour); + expect(st.wMinute, range[1].wMinute); + expect(st.wSecond, range[1].wSecond); + expect(st.wMilliseconds, range[1].wMilliseconds); + } DestroyWindow(hwnd); }

1 0

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETCURSEL and MCM_GETCURSEL).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: efaa25fe66bddc48a72d54cd1a6f46dbd1a84e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaa25fe66bddc48a72d54cd1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:00:56 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETCURSEL and MCM_GETCURSEL). --- dlls/comctl32/tests/monthcal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index eaabc47..cb229e4 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -773,9 +773,15 @@ static void test_monthcal_currdate(void) expect(st_original.wYear, st_new.wYear); expect(st_original.wMonth, st_new.wMonth); expect(st_original.wDay, st_new.wDay); - expect(st_original.wHour, st_new.wHour); - expect(st_original.wMinute, st_new.wMinute); - expect(st_original.wSecond, st_new.wSecond); + ok(st_original.wHour == st_new.wHour || + broken(0 == st_new.wHour), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wHour, st_new.wHour); + ok(st_original.wMinute == st_new.wMinute || + broken(0 == st_new.wMinute), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wMinute, st_new.wMinute); + ok(st_original.wSecond == st_new.wSecond || + broken(0 == st_new.wSecond), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wSecond, st_new.wSecond); /* lparam cannot be NULL */ res = SendMessage(hwnd, MCM_GETCURSEL, 0, 0);

1 0

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 0a6c2c86be8ac0fa5e5293508cc6ae706455f3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6c2c86be8ac0fa5e5293508… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:10:40 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT). --- dlls/comctl32/tests/monthcal.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index cb229e4..64a11b0 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -859,11 +859,17 @@ static void test_monthcal_unicode(void) /* current setting is 1, so, should return 1 */ res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0); - todo_wine {expect(1, res);} + todo_wine + ok(1 == res || + broken(0 == res), /* comctl32 <= 4.70 */ + "Expected 1, got %d\n", res); /* setting to 0, should return previous settings */ res = SendMessage(hwnd, MCM_SETUNICODEFORMAT, 0, 0); - todo_wine {expect(1, res);} + todo_wine + ok(1 == res || + broken(0 == res), /* comctl32 <= 4.70 */ + "Expected 1, got %d\n", res); /* current setting is 0, so, it should return 0 */ res = SendMessage(hwnd, MCM_GETUNICODEFORMAT, 0, 0);

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 October 2009