July 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi32: Clip solid pen regions to the DIB rectangle to avoid overflows.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 6714f16c74180c450edb8b9f9bdba43c14c0b8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6714f16c74180c450edb8b9f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 13:59:04 2012 +0200 gdi32: Clip solid pen regions to the DIB rectangle to avoid overflows. --- dlls/gdi32/dibdrv/dc.c | 12 +++ dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 177 +++++++++++++++++++++++++------------------ 3 files changed, 116 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index de64d18..73895c9 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -255,6 +255,18 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit return ERROR_SUCCESS; } +int clip_rect_to_dib( const dib_info *dib, RECT *rc ) +{ + RECT rect; + + rect.left = max( 0, -dib->rect.left ); + rect.top = max( 0, -dib->rect.top ); + rect.right = min( dib->rect.right, dib->width ) - dib->rect.left; + rect.bottom = min( dib->rect.bottom, dib->height ) - dib->rect.top; + if (is_rect_empty( &rect )) return 0; + return intersect_rect( rc, &rect, rc ); +} + int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) { const WINEREGION *region; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7802d17..0a99fba 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -244,6 +244,7 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; +extern int clip_rect_to_dib( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 0292537..f9736f6 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -654,6 +654,87 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } +static void solid_line_region( const dib_info *dib, const POINT *start, const struct line_params *params, + HRGN region ) +{ + int len, err = params->err_start; + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (params->x_major) + { + if (params->x_inc > 0) + { + for (len = params->length; len; len--, rect.right++) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.left = rect.right; + rect.top += params->y_inc; + rect.bottom += params->y_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + for (len = params->length; len; len--, rect.left--) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.right = rect.left; + rect.top += params->y_inc; + rect.bottom += params->y_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + } + else + { + if (params->y_inc > 0) + { + for (len = params->length; len; len--, rect.bottom++) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.top = rect.bottom; + rect.left += params->x_inc; + rect.right += params->x_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + else + { + for (len = params->length; len; len--, rect.top--) + { + if (err + params->bias > 0) + { + add_rect_to_region( region, &rect ); + rect.bottom = rect.top; + rect.left += params->x_inc; + rect.right += params->x_inc; + err += params->err_add_1; + } + else err += params->err_add_2; + } + } + } + /* add final rect */ + add_rect_to_region( region, &rect ); +} + static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region ) { RECT rect; @@ -667,99 +748,47 @@ static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *en { rect.right = end->x; order_end_points(&rect.left, &rect.right); - add_rect_to_region( region, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) add_rect_to_region( region, &rect ); } else if(start->x == end->x) { rect.bottom = end->y; order_end_points(&rect.top, &rect.bottom); - add_rect_to_region( region, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) add_rect_to_region( region, &rect ); } else { - INT dx = end->x - start->x, dy = end->y - start->y; - INT abs_dx = abs(dx), abs_dy = abs(dy); - DWORD octant = get_octant_mask(dx, dy); - INT bias = get_bias( octant ); + bres_params clip_params; + struct line_params line_params; + POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - if (is_xmajor( octant )) + init_bres_params( start, end, &clip_params, &line_params, &rect ); + if (clip_rect_to_dib( &pdev->dib, &rect )) { - int y_inc = is_y_increasing( octant ) ? 1 : -1; - int err_add_1 = 2 * abs_dy - 2 * abs_dx; - int err_add_2 = 2 * abs_dy; - int err = 2 * abs_dy - abs_dx; + POINT clipped_start, clipped_end; - if (is_x_increasing( octant )) - { - for (rect.right = start->x + 1; rect.right <= end->x; rect.right++) - { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.left = rect.right; - rect.top += y_inc; - rect.bottom += y_inc; - err += err_add_1; - } - else err += err_add_2; - } - } - else + if (clip_line( &p1, &p2, &rect, &clip_params, &clipped_start, &clipped_end )) { - for (rect.left = start->x; rect.left > end->x; rect.left--) - { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.right = rect.left; - rect.top += y_inc; - rect.bottom += y_inc; - err += err_add_1; - } - else err += err_add_2; - } - } - } - else - { - int x_inc = is_x_increasing( octant ) ? 1 : -1; - int err_add_1 = 2 * abs_dx - 2 * abs_dy; - int err_add_2 = 2 * abs_dx; - int err = 2 * abs_dx - abs_dy; + int m = abs(clipped_start.x - p1.x); + int n = abs(clipped_start.y - p1.y); - if (is_y_increasing( octant )) - { - for (rect.bottom = start->y + 1; rect.bottom <= end->y; rect.bottom++) + if (line_params.x_major) { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.top = rect.bottom; - rect.left += x_inc; - rect.right += x_inc; - err += err_add_1; - } - else err += err_add_2; + line_params.err_start = 2 * clip_params.dy - clip_params.dx + + m * 2 * clip_params.dy - n * 2 * clip_params.dx; + line_params.length = abs( clipped_end.x - clipped_start.x ) + 1; } - } - else - { - for (rect.top = start->y; rect.top > end->y; rect.top--) + else { - if (err + bias > 0) - { - add_rect_to_region( region, &rect ); - rect.bottom = rect.top; - rect.left += x_inc; - rect.right += x_inc; - err += err_add_1; - } - else err += err_add_2; + line_params.err_start = 2 * clip_params.dx - clip_params.dy + + n * 2 * clip_params.dx - m * 2 * clip_params.dy; + line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; } + + if (clipped_end.x == p2.x && clipped_end.y == p2.y) line_params.length--; + solid_line_region( &pdev->dib, &clipped_start, &line_params, region ); } } - /* add final rect */ - add_rect_to_region( region, &rect ); } return TRUE; }

1 0

Jacek Caban : urlmon: SecManagerImpl_QueryInterface clean up.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 4ffcf3359da132a4699e1f1e829e271c3ae18f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffcf3359da132a4699e1f1e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 10:36:44 2012 +0200 urlmon: SecManagerImpl_QueryInterface clean up. --- dlls/urlmon/sec_mgr.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index df90ce1..477f89e 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -854,31 +854,23 @@ static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManagerEx2* { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("(%p)->(%s %p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if(!ppvObject) return E_INVALIDARG; - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IInternetSecurityManager, riid) || - IsEqualIID(&IID_IInternetSecurityManagerEx, riid) || - IsEqualIID(&IID_IInternetSecurityManagerEx2, riid)) + if(IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IInternetSecurityManager, riid) || + IsEqualIID(&IID_IInternetSecurityManagerEx, riid) || + IsEqualIID(&IID_IInternetSecurityManagerEx2, riid)) { *ppvObject = iface; - - /* Check that we obtained an interface.*/ - if (!*ppvObject) { + } else { WARN("not supported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } - /* Query Interface always increases the reference count by one when it is successful */ IInternetSecurityManagerEx2_AddRef(iface); - return S_OK; }

1 0

Jacek Caban : urlmon/tests: Use proper helpers for iface calls.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: fcca6af646303b61041ca35adc0013b8d0469891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcca6af646303b61041ca35ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 10:56:13 2012 +0200 urlmon/tests: Use proper helpers for iface calls. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 69a2716..5be3f02 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2638,8 +2638,8 @@ static BOOL test_bscholder(IBindStatusCallback *holder) CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate2); /* IE8 */ CHECK_CALLED(GetRootSecurityId); - IHttpNegotiate_Release(http_negotiate2_serv); - IHttpNegotiate_Release(http_negotiate2); + IHttpNegotiate2_Release(http_negotiate2_serv); + IHttpNegotiate2_Release(http_negotiate2); }else { skip("Could not get IHttpNegotiate2\n"); ret = FALSE;

1 0

Nikolay Sivov : kernel32: Added WerRegisterMemoryBlock stub.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 48ff6fa9277740823a4e46cbac47c7e0471332ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ff6fa9277740823a4e46cba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:51:47 2012 +0400 kernel32: Added WerRegisterMemoryBlock stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/wer.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a916309..b8c6a3c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1253,6 +1253,7 @@ @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) @ stdcall WerRegisterFile(wstr long long) +@ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) @ stdcall WerSetFlags(long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index 22ca7f2..aa1d530 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -63,3 +63,9 @@ HRESULT WINAPI WerSetFlags(DWORD flags) FIXME("(%d) stub!\n", flags); return E_NOTIMPL; } + +HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size) +{ + FIXME("(%p %d) stub\n", block, size); + return E_NOTIMPL; +}

1 0

Hans Leidekker : wbemprox: Add support for boolean properties.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 773f5f8dc234ca2a7c83a502c4b83a424f22d749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773f5f8dc234ca2a7c83a502c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:03 2012 +0200 wbemprox: Add support for boolean properties. --- dlls/wbemprox/query.c | 11 +++++++++++ dlls/wbemprox/table.c | 5 +++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 15423d9..d2b0e76 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -550,6 +550,10 @@ static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT * { switch (vartype) { + case VT_BOOL: + V_VT( ret ) = VT_BOOL; + V_BOOL( ret ) = val; + return; case VT_BSTR: V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = val_bstr; @@ -601,6 +605,9 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR switch (view->table->columns[column].type & COL_TYPE_MASK) { + case CIM_BOOLEAN: + if (!vartype) vartype = VT_BOOL; + break; case CIM_STRING: case CIM_DATETIME: if (val) @@ -650,6 +657,10 @@ static HRESULT variant_to_longlong( VARIANT *var, LONGLONG *val, CIMTYPE *type ) } switch (V_VT( var )) { + case VT_BOOL: + *val = V_BOOL( var ); + *type = CIM_BOOLEAN; + break; case VT_BSTR: *val = (INT_PTR)SysAllocString( V_BSTR( var ) ); if (!*val) return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index d94a8e8..5b6f4b4 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -50,6 +50,8 @@ UINT get_type_size( CIMTYPE type ) switch (type) { + case CIM_BOOLEAN: + return sizeof(int); case CIM_SINT16: case CIM_UINT16: return sizeof(INT16); @@ -102,6 +104,9 @@ HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *v } switch (table->columns[column].type & COL_TYPE_MASK) { + case CIM_BOOLEAN: + *val = *(const int *)ptr; + break; case CIM_DATETIME: case CIM_STRING: *val = (LONGLONG)(INT_PTR)*(const WCHAR **)ptr;

1 0

Jacek Caban : ieframe/tests: Use proper helpers for iface calls.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 0947bc78a79eaac198b52791b1466a7c4d24fb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0947bc78a79eaac198b52791b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 10:52:52 2012 +0200 ieframe/tests: Use proper helpers for iface calls. --- dlls/ieframe/tests/intshcut.c | 2 +- dlls/ieframe/tests/webbrowser.c | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 63c595f..c9c105c 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -143,7 +143,7 @@ static void _test_shortcut_url(unsigned line, IUnknown *unk, const char *exurl) ok_(__FILE__,line)(!strcmp(url_a, exurl), "unexpected URL, got %s, expected %s\n", url_a, exurl); CoTaskMemFree(url_a); - IUnknown_Release(locator_a); + IUnknown_Release((IUnknown*)locator_a); } #define check_string_transform(a,b,c,d,e) _check_string_transform(__LINE__,a,b,c,d,e) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e073c91..57c2be9 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -288,7 +288,7 @@ static IDispatch *_get_document(unsigned line, IWebBrowser2 *wb) hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc); ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument iface: %08x\n", hres); ok(disp == (IDispatch*)html_doc, "disp != html_doc\n"); - IHTMLDocument_Release(html_doc); + IHTMLDocument2_Release(html_doc); return disp; } @@ -1750,7 +1750,7 @@ static void test_DoVerb(IWebBrowser2 *unk) RECT rect = {0,0,1000,1000}; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1798,7 +1798,7 @@ static void call_DoVerb(IWebBrowser2 *unk, LONG verb) RECT rect = {60,60,600,600}; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1816,7 +1816,7 @@ static HWND get_hwnd(IWebBrowser2 *unk) HWND hwnd; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); hres = IOleInPlaceObject_GetWindow(inplace, &hwnd); @@ -1859,7 +1859,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop HWND hwnd; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1867,7 +1867,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop test_GetMiscStatus(oleobj); test_SetHostNames(oleobj); - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); if(FAILED(hres)) { IOleObject_Release(oleobj); @@ -1929,7 +1929,7 @@ static void test_ClassInfo(IWebBrowser2 *unk) GUID guid; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&class_info); + hres = IWebBrowser2_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&class_info); ok(hres == S_OK, "QueryInterface(IID_IProvideClassInfo) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2394,7 +2394,7 @@ static void test_wb_funcs(IWebBrowser2 *wb, BOOL is_clientsite) IOleControl *control; HRESULT hres; - hres = IUnknown_QueryInterface(wb, &IID_IOleControl, (void**)&control); + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleControl, (void**)&control); ok(hres == S_OK, "Could not get IOleControl interface: %08x\n", hres); test_Silent(wb, control, is_clientsite); @@ -2410,7 +2410,7 @@ static void test_GetControlInfo(IWebBrowser2 *unk) CONTROLINFO info; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleControl, (void**)&control); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleControl, (void**)&control); ok(hres == S_OK, "Could not get IOleControl: %08x\n", hres); if(FAILED(hres)) return; @@ -2440,7 +2440,7 @@ static void test_Extent(IWebBrowser2 *unk) if (dpi_x != 96 || dpi_y != 96) trace("dpi: %d / %d\n", dpi_y, dpi_y); - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObkect: %08x\n", hres); if(FAILED(hres)) return; @@ -2510,7 +2510,7 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static DWORD dw = 100; - hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); + hres = IWebBrowser2_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2801,7 +2801,7 @@ static void test_olecmd(IWebBrowser2 *unk, BOOL loaded) OLECMD cmds[3]; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); if(FAILED(hres)) return; @@ -2831,7 +2831,7 @@ static void test_IServiceProvider(IWebBrowser2 *unk) IUnknown *iface; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); + hres = IWebBrowser2_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(FAILED(hres)) return; @@ -2909,7 +2909,7 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); } -static void test_QueryInterface(IWebBrowser2 *unk) +static void test_QueryInterface(IWebBrowser2 *wb) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; @@ -2921,6 +2921,7 @@ static void test_QueryInterface(IWebBrowser2 *unk) IOleLink *link = (void*)0xdeadbeef; IMarshal *marshal = (void*)0xdeadbeef; IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef; + IUnknown *unk = (IUnknown*)wb; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -3054,7 +3055,7 @@ static void test_TranslateAccelerator(IWebBrowser2 *unk) test_Navigate2(unk, "about:blank"); - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { /* One accelerator that should be handled by mshtml */ @@ -3075,7 +3076,7 @@ static void test_TranslateAccelerator(IWebBrowser2 *unk) test_UIActivate(unk, TRUE); /* Test again after UIActivate */ - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { /* One accelerator that should be handled by mshtml */ @@ -3125,14 +3126,14 @@ static void test_TranslateAccelerator(IWebBrowser2 *unk) for(keycode = 0; keycode <= 0x100; keycode++) { msg_a.wParam = keycode; SET_EXPECT(DocHost_TranslateAccelerator); - hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + hres = IDocHostUIHandler2_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); ok(hres == 0xdeadbeef, "Got 0x%08x\n", hres); CHECK_CALLED(DocHost_TranslateAccelerator); } hr_dochost_TranslateAccelerator = E_NOTIMPL; SET_EXPECT(DocHost_TranslateAccelerator); - hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + hres = IDocHostUIHandler2_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); ok(hres == E_NOTIMPL, "Got 0x%08x\n", hres); CHECK_CALLED(DocHost_TranslateAccelerator);

1 0

Jacek Caban : mshtml/tests: Use proper helpers for iface calls.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: d0b8c6bca21fef9f92c47191d7875eef529c8cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b8c6bca21fef9f92c47191d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 11:04:56 2012 +0200 mshtml/tests: Use proper helpers for iface calls. --- dlls/mshtml/tests/activex.c | 2 +- dlls/mshtml/tests/dom.c | 14 ++++---- dlls/mshtml/tests/htmldoc.c | 66 +++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0b8c6bca21fef9f92c47…

1 0

Alexandre Julliard : gdi32: Limit line drawing coordinates to reasonable values to avoid overflows.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: a9151e5da3a2633505d21a3af86d2f11fb5c58a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9151e5da3a2633505d21a3af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 12:47:24 2012 +0200 gdi32: Limit line drawing coordinates to reasonable values to avoid overflows. --- dlls/gdi32/dibdrv/objects.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 026ea50..0292537 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -300,6 +300,17 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) return out; } +/* crop coordinates to a reasonable range to avoid overflows in calculations */ +static inline POINT crop_coords( POINT pt ) +{ + if (pt.x >= 0x10000000 || pt.x <= -0x10000000 || pt.y >= 0x10000000 || pt.y <= -0x10000000) + { + pt.x /= 8; + pt.y /= 8; + } + return pt; +} + static void init_bres_params( const POINT *start, const POINT *end, bres_params *clip_params, struct line_params *line_params, RECT *rect ) { @@ -603,6 +614,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD { bres_params clip_params; struct line_params line_params; + POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); init_bres_params( start, end, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; @@ -611,11 +623,11 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD POINT clipped_start, clipped_end; int clip_status; - clip_status = clip_line(start, end, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); + clip_status = clip_line( &p1, &p2, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); if(clip_status) { - int m = abs(clipped_start.x - start->x); - int n = abs(clipped_start.y - start->y); + int m = abs(clipped_start.x - p1.x); + int n = abs(clipped_start.y - p1.y); if (line_params.x_major) { @@ -630,7 +642,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD line_params.length = abs( clipped_end.y - clipped_start.y ) + 1; } - if (clipped_end.x == end->x && clipped_end.y == end->y) line_params.length--; + if (clipped_end.x == p2.x && clipped_end.y == p2.y) line_params.length--; pdev->dib.funcs->solid_line( &pdev->dib, &clipped_start, &line_params, and, xor ); @@ -987,6 +999,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { bres_params clip_params; struct line_params line_params; + POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); init_bres_params( start, end, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); @@ -994,12 +1007,12 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { POINT clipped_start, clipped_end; int clip_status; - clip_status = clip_line(start, end, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); + clip_status = clip_line(&p1, &p2, clipped_rects.rects + i, &clip_params, &clipped_start, &clipped_end); if(clip_status) { - int m = abs(clipped_start.x - start->x); - int n = abs(clipped_start.y - start->y); + int m = abs(clipped_start.x - p1.x); + int n = abs(clipped_start.y - p1.y); pdev->dash_pos = start_pos;

1 0

Michael Stefaniuc : winaspi.dll16: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard July 27, 2012

July 27, 2012

Module: wine Branch: master Commit: c48b372bf82eb805dc19ac7182f2349182398a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48b372bf82eb805dc19ac718… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 27 13:59:52 2012 +0200 winaspi.dll16: Simplify the "pointer to start of array" idiom. --- dlls/winaspi.dll16/winaspi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winaspi.dll16/winaspi.c b/dlls/winaspi.dll16/winaspi.c index aceef36..0755b4d 100644 --- a/dlls/winaspi.dll16/winaspi.c +++ b/dlls/winaspi.dll16/winaspi.c @@ -205,7 +205,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode) TRACE("LinkPointer %x\n", prb->SRB_Rsvd1); TRACE("CDB Length: %d\n", prb->SRB_CDBLen); TRACE("POST Proc: %x\n", (DWORD) prb->SRB_PostProc); - cdb = &prb->CDBByte[0]; + cdb = prb->CDBByte; if (TRACE_ON(aspi)) { TRACE("CDB buffer["); @@ -225,7 +225,7 @@ ASPI_PrintSenseArea16(SRB_ExecSCSICmd16 *prb) if (TRACE_ON(aspi)) { - cdb = &prb->CDBByte[0]; + cdb = prb->CDBByte; TRACE("SenseArea["); for (i = 0; i < prb->SRB_SenseLen; i++) { if (i) TRACE(","); @@ -288,7 +288,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) in_len = SCSI_OFF + lpPRB->SRB_CDBLen + lpPRB->SRB_BufLen; sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len); memset(sg_hd, 0, SCSI_OFF); - memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); + memcpy(sg_hd + 1, lpPRB->CDBByte, lpPRB->SRB_CDBLen); if (lpPRB->SRB_BufLen) { memcpy(((BYTE *) sg_hd) + SCSI_OFF + lpPRB->SRB_CDBLen, lpBuf, lpPRB->SRB_BufLen); } @@ -298,7 +298,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) in_len = SCSI_OFF + lpPRB->SRB_CDBLen; sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len); memset(sg_hd, 0, SCSI_OFF); - memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); + memcpy(sg_hd + 1, lpPRB->CDBByte, lpPRB->SRB_CDBLen); } if (TARGET_TO_HOST(lpPRB)) { @@ -349,7 +349,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) int sense_len = lpPRB->SRB_SenseLen; if (lpPRB->SRB_SenseLen > 16) sense_len = 16; - memcpy(SENSE_BUFFER(lpPRB), &sg_reply_hdr->sense_buffer[0], sense_len); + memcpy(SENSE_BUFFER(lpPRB), sg_reply_hdr->sense_buffer, sense_len); }

1 0

Alexandre Julliard : msxml3: Fix an uninitialized variable.
by Alexandre Julliard July 27, 2012

July 27, 2012

Module: wine Branch: master Commit: 32a188e8623b2e94685a20fff203d5e0f342be37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a188e8623b2e94685a20fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 13:46:10 2012 +0200 msxml3: Fix an uninitialized variable. --- dlls/msxml3/xmlview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index cd7389a..c2e6f1e 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -347,11 +347,11 @@ static inline HRESULT report_data(BindStatusCallback *This) ULARGE_INTEGER size; HRESULT hres; + off.QuadPart = 0; hres = IStream_Seek(This->stream, off, STREAM_SEEK_CUR, &size); if(FAILED(hres)) return hres; - off.QuadPart = 0; hres = IStream_Seek(This->stream, off, STREAM_SEEK_SET, NULL); if(FAILED(hres)) return hres;

1 0