October 2009 - Wine-Commits

Henri Verbeet : d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: d818e4edf6f0b57f71fae79769344afba3cbef69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d818e4edf6f0b57f71fae7976… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:36 2009 +0200 d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 65 ++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index a6ad662..a197b20 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -154,17 +154,24 @@ struct state_test #define EVENT_ERROR 0x08 #define EVENT_APPLY_DATA 0x10 +struct event_data +{ + DWORD stateblock; + IDirect3DSurface8 *original_render_target; + IDirect3DSwapChain8 *new_swap_chain; +}; + struct event { - int (*event_fn)(IDirect3DDevice8 *device, void *arg); - int status; + int (*event_fn)(IDirect3DDevice8 *device, struct event_data *event_data); + int status; }; /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test, - unsigned int ntests, struct event *event, unsigned int nevents, void *event_arg) + unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { unsigned int i = 0, j; int outcome; @@ -174,7 +181,7 @@ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test { /* Execute the next event handler (if available) or just set the supplied status */ outcome = event[j].status; - if (event[j].event_fn) outcome |= event[j].event_fn(device, event_arg); + if (event[j].event_fn) outcome |= event[j].event_fn(device, event_data); /* Now verify correct outcome depending on what was signaled by the handler. * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). @@ -256,19 +263,11 @@ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test } } -struct event_data -{ - DWORD stateblock; - IDirect3DSurface8 *original_render_target; - IDirect3DSwapChain8 *new_swap_chain; -}; - -static int switch_render_target(IDirect3DDevice8* device, void *data) +static int switch_render_target(IDirect3DDevice8* device, struct event_data *event_data) { D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain8 *swapchain = NULL; IDirect3DSurface8 *backbuffer = NULL; - struct event_data *edata = data; D3DDISPLAYMODE d3ddm; HRESULT hr; @@ -290,7 +289,7 @@ static int switch_render_target(IDirect3DDevice8* device, void *data) if (FAILED(hr)) goto error; /* Save the current render target */ - hr = IDirect3DDevice8_GetRenderTarget(device, &edata->original_render_target); + hr = IDirect3DDevice8_GetRenderTarget(device, &event_data->original_render_target); ok(SUCCEEDED(hr), "GetRenderTarget returned %#x.\n", hr); if (FAILED(hr)) goto error; @@ -300,7 +299,7 @@ static int switch_render_target(IDirect3DDevice8* device, void *data) if (FAILED(hr)) goto error; IDirect3DSurface8_Release(backbuffer); - edata->new_swap_chain = swapchain; + event_data->new_swap_chain = swapchain; return EVENT_OK; error: @@ -309,26 +308,25 @@ error: return EVENT_ERROR; } -static int revert_render_target(IDirect3DDevice8 *device, void *data) +static int revert_render_target(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; /* Reset the old render target */ - hr = IDirect3DDevice8_SetRenderTarget(device, edata->original_render_target, NULL); + hr = IDirect3DDevice8_SetRenderTarget(device, event_data->original_render_target, NULL); ok(SUCCEEDED(hr), "SetRenderTarget returned %#x.\n", hr); if (FAILED(hr)) { - IDirect3DSurface8_Release(edata->original_render_target); + IDirect3DSurface8_Release(event_data->original_render_target); return EVENT_ERROR; } - IDirect3DSurface8_Release(edata->original_render_target); - IDirect3DSwapChain8_Release(edata->new_swap_chain); + IDirect3DSurface8_Release(event_data->original_render_target); + IDirect3DSwapChain8_Release(event_data->new_swap_chain); return EVENT_OK; } -static int begin_stateblock(IDirect3DDevice8 *device, void *data) +static int begin_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { HRESULT hr; @@ -338,44 +336,39 @@ static int begin_stateblock(IDirect3DDevice8 *device, void *data) return EVENT_OK; } -static int end_stateblock(IDirect3DDevice8 *device, void *data) +static int end_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_EndStateBlock(device, &edata->stateblock); + hr = IDirect3DDevice8_EndStateBlock(device, &event_data->stateblock); ok(SUCCEEDED(hr), "EndStateBlock returned %#x.\n", hr); if (FAILED(hr)) return EVENT_ERROR; return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice8 *device, void *data) +static int abort_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; - - IDirect3DDevice8_DeleteStateBlock(device, edata->stateblock); + IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); return EVENT_OK; } -static int apply_stateblock(IDirect3DDevice8 *device, void *data) +static int apply_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_ApplyStateBlock(device, edata->stateblock); + hr = IDirect3DDevice8_ApplyStateBlock(device, event_data->stateblock); ok(SUCCEEDED(hr), "Apply returned %#x.\n", hr); - IDirect3DDevice8_DeleteStateBlock(device, edata->stateblock); + IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); if (FAILED(hr)) return EVENT_ERROR; return EVENT_OK; } -static int capture_stateblock(IDirect3DDevice8 *device, void *data) +static int capture_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hr; - hr = IDirect3DDevice8_CaptureStateBlock(device, edata->stateblock); + hr = IDirect3DDevice8_CaptureStateBlock(device, event_data->stateblock); ok(SUCCEEDED(hr), "Capture returned %#x.\n", hr); if (FAILED(hr)) return EVENT_ERROR;

1 0

Henri Verbeet : d3d9: Remove useless typedefs from the stateblock tests.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 9f4f29fd0352a023c5c5dc542edbb42cff82cb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4f29fd0352a023c5c5dc542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:34 2009 +0200 d3d9: Remove useless typedefs from the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 384 ++++++++++++++++++++---------------------- 1 files changed, 180 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f4f29fd0352a023c5c5d…

1 0

Jacek Caban : mshtml: Fixed typo in IHTMLElement2::get_scrollHeight.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Henri Verbeet : d3d9: Always pass "struct event_data" to "event_fn" in the stateblock tests.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 54e28991fc9584324d75c5f56d9a3d3103144d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e28991fc9584324d75c5f56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 5 09:47:35 2009 +0200 d3d9: Always pass "struct event_data" to "event_fn" in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 73 ++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index bd85535..22fa1de 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -156,10 +156,17 @@ struct state_test #define EVENT_ERROR 0x08 #define EVENT_APPLY_DATA 0x10 +struct event_data +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DSurface9 *original_render_target; + IDirect3DSwapChain9 *new_swap_chain; +}; + struct event { - int (*event_fn) (IDirect3DDevice9* device, void* arg); - int status; + int (*event_fn)(IDirect3DDevice9 *device, struct event_data *event_data); + int status; }; /* This is an event-machine, which tests things. @@ -167,7 +174,7 @@ struct event * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test, - unsigned int ntests, struct event *event, unsigned int nevents, void *event_arg) + unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { int outcome; unsigned int i = 0, j; @@ -178,7 +185,7 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test /* Execute the next event handler (if available) or just set the supplied status */ outcome = event[j].status; if (event[j].event_fn) - outcome |= event[j].event_fn(device, event_arg); + outcome |= event[j].event_fn(device, event_data); /* Now verify correct outcome depending on what was signaled by the handler. * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). @@ -253,20 +260,12 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test test[i].set_handler(device, &test[i], test[i].default_data); } -struct event_data -{ - IDirect3DStateBlock9* stateblock; - IDirect3DSurface9* original_render_target; - IDirect3DSwapChain9* new_swap_chain; -}; - -static int switch_render_target(IDirect3DDevice9 *device, void *data) +static int switch_render_target(IDirect3DDevice9 *device, struct event_data *event_data) { HRESULT hret; D3DPRESENT_PARAMETERS present_parameters; IDirect3DSwapChain9* swapchain = NULL; IDirect3DSurface9* backbuffer = NULL; - struct event_data* edata = data; /* Parameters for new swapchain */ ZeroMemory(&present_parameters, sizeof(present_parameters)); @@ -284,7 +283,7 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) if (hret != D3D_OK) goto error; /* Save the current render target */ - hret = IDirect3DDevice9_GetRenderTarget(device, 0, &edata->original_render_target); + hret = IDirect3DDevice9_GetRenderTarget(device, 0, &event_data->original_render_target); ok (hret == D3D_OK, "GetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) goto error; @@ -294,7 +293,7 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) if (hret != D3D_OK) goto error; IUnknown_Release(backbuffer); - edata->new_swap_chain = swapchain; + event_data->new_swap_chain = swapchain; return EVENT_OK; error: @@ -303,79 +302,71 @@ static int switch_render_target(IDirect3DDevice9 *device, void *data) return EVENT_ERROR; } -static int revert_render_target(IDirect3DDevice9 *device, void *data) +static int revert_render_target(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; /* Reset the old render target */ - hret = IDirect3DDevice9_SetRenderTarget(device, 0, edata->original_render_target); + hret = IDirect3DDevice9_SetRenderTarget(device, 0, event_data->original_render_target); ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(edata->original_render_target); + IUnknown_Release(event_data->original_render_target); return EVENT_ERROR; } - IUnknown_Release(edata->original_render_target); + IUnknown_Release(event_data->original_render_target); + IUnknown_Release(event_data->new_swap_chain); - IUnknown_Release(edata->new_swap_chain); return EVENT_OK; } -static int begin_stateblock( - IDirect3DDevice9* device, - void* data) { - +static int begin_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) +{ HRESULT hret; - data = NULL; hret = IDirect3DDevice9_BeginStateBlock(device); ok(hret == D3D_OK, "BeginStateBlock returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR; return EVENT_OK; } -static int end_stateblock(IDirect3DDevice9 *device, void *data) +static int end_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DDevice9_EndStateBlock(device, &edata->stateblock); + hret = IDirect3DDevice9_EndStateBlock(device, &event_data->stateblock); ok(hret == D3D_OK, "EndStateBlock returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR; return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice9 *device, void *data) +static int abort_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; - - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); return EVENT_OK; } -static int apply_stateblock(IDirect3DDevice9 *device, void *data) +static int apply_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DStateBlock9_Apply(edata->stateblock); + hret = IDirect3DStateBlock9_Apply(event_data->stateblock); ok(hret == D3D_OK, "Apply returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); return EVENT_ERROR; } - IUnknown_Release(edata->stateblock); + IUnknown_Release(event_data->stateblock); + return EVENT_OK; } -static int capture_stateblock(IDirect3DDevice9 *device, void *data) +static int capture_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - struct event_data *edata = data; HRESULT hret; - hret = IDirect3DStateBlock9_Capture(edata->stateblock); + hret = IDirect3DStateBlock9_Capture(event_data->stateblock); ok(hret == D3D_OK, "Capture returned %#x.\n", hret); if (hret != D3D_OK) return EVENT_ERROR;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::client[Top|Left] tests.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Vincent Povirk : ole32: Remove useless comments.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: b41822b1dcdb640206be54ef01e75faaa5a7cae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41822b1dcdb640206be54ef0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 17:21:33 2009 -0500 ole32: Remove useless comments. --- dlls/ole32/storage32.c | 172 +----------------------------------------------- 1 files changed, 2 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b41822b1dcdb640206be5…

1 0

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32 versions.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 1dbab053649823c36b52f81ae92e29dc2e18944b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbab053649823c36b52f81ae… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 14:44:34 2009 +0200 comctl32/tests: Fix some test failures on older comctl32 versions. --- 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 28b3646..fc61fee 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -331,9 +331,15 @@ static void test_monthcal(void) memset(&st, 0xcc, sizeof(st)); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); - expect(0, st[0].wYear); - expect(0, st[0].wMonth); - expect(0, st[0].wDay); + ok(0 == st[0].wYear || + broken(1752 == st[0].wYear), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wYear); + ok(0 == st[0].wMonth || + broken(9 == st[0].wMonth), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wMonth); + ok(0 == st[0].wDay || + broken(14 == st[0].wDay), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wDay); expect(0, st[0].wDayOfWeek); expect(0, st[0].wHour); expect(0, st[0].wMinute);

1 0

Jacek Caban : mshtml: Added IHTMLElement2::clientLeft implementation.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETRANGE and MCM_GETRANGE).
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 0d726970c6b4a6c4b564db2b3a661d71c5866a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d726970c6b4a6c4b564db2b3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 14:51:09 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETRANGE and MCM_GETRANGE). --- dlls/comctl32/tests/monthcal.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index fc61fee..eaabc47 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -322,6 +322,7 @@ static void test_monthcal(void) HWND hwnd; SYSTEMTIME st[2], st1[2], today; int res, month_range; + DWORD limits; hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, 0, 300, 300, 0, 0, NULL, NULL); @@ -329,7 +330,16 @@ static void test_monthcal(void) /* test range just after creation */ memset(&st, 0xcc, sizeof(st)); - ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); + limits = SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st); + ok(limits == 0 || + broken(limits == GDTR_MIN), /* comctl32 <= 4.70 */ + "No limits should be set (%d)\n", limits); + if (limits == GDTR_MIN) + { + win_skip("comctl32 <= 4.70 is broken\n"); + DestroyWindow(hwnd); + return; + } ok(0 == st[0].wYear || broken(1752 == st[0].wYear), /* comctl32 <= 4.72 */

1 0

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETUNICODEFORMAT and MCM_GETUNICODEFORMAT).
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

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