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

Jacek Caban : jscript/tests: Use proper helpers for iface calls.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 142d0f302623e650a6854ebb2f1e368f4547c536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142d0f302623e650a6854ebb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 12:02:01 2012 +0200 jscript/tests: Use proper helpers for iface calls. --- dlls/jscript/tests/activex.c | 68 ++++++++++++++++++++++++++++------------- dlls/jscript/tests/caller.c | 30 ++++++++++++++---- dlls/jscript/tests/jscript.c | 34 +++++++++++++++----- dlls/jscript/tests/run.c | 46 +++++++++++++++++++--------- 4 files changed, 125 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=142d0f302623e650a6854…

1 0

Nikolay Sivov : shell32: Use proper macros when calling COM methods.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: bf0c67c3220bbbf527316ff1384e25f00f79d843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0c67c3220bbbf527316ff13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:51:05 2012 +0400 shell32: Use proper macros when calling COM methods. --- dlls/shell32/assoc.c | 2 +- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/ebrowser.c | 12 ++++++------ dlls/shell32/recyclebin.c | 2 +- dlls/shell32/shellitem.c | 6 +++--- dlls/shell32/shfldr_desktop.c | 6 +++--- dlls/shell32/shfldr_fs.c | 8 ++++---- dlls/shell32/shfldr_mycomp.c | 14 +++++++------- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ dlls/shell32/shlfolder.c | 8 ++++---- 11 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf0c67c3220bbbf527316…

1 0

Nikolay Sivov : kernel32: Added WerRegisterMemoryBlock stub.
by Alexandre Julliard 30 Jul '12

30 Jul '12

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

Nikolay Sivov : msxml3: Enable inline wrappers for tests.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 6ca60b59c937ca3e31696ef685c068d136c1cbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca60b59c937ca3e31696ef68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 30 10:32:56 2012 +0400 msxml3: Enable inline wrappers for tests. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++-------------------- dlls/msxml3/tests/xmldoc.c | 4 +- 3 files changed, 38 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ca60b59c937ca3e31696…

1 0

Alexandre Julliard : gdi32: Add a helper function to initialize Bresenham parameters for line drawing.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 78d12e7fccafb16cf8df8e498e599665565a8624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d12e7fccafb16cf8df8e498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 12:02:34 2012 +0200 gdi32: Add a helper function to initialize Bresenham parameters for line drawing. --- dlls/gdi32/dibdrv/objects.c | 105 ++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 60 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 04548ce..026ea50 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -300,6 +300,39 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) return out; } +static void init_bres_params( const POINT *start, const POINT *end, bres_params *clip_params, + struct line_params *line_params, RECT *rect ) +{ + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + + clip_params->dx = abs_dx; + clip_params->dy = abs_dy; + clip_params->octant = get_octant_mask(dx, dy); + clip_params->bias = get_bias( clip_params->octant ); + + line_params->bias = clip_params->bias; + line_params->x_major = is_xmajor( clip_params->octant ); + line_params->x_inc = is_x_increasing( clip_params->octant ) ? 1 : -1; + line_params->y_inc = is_y_increasing( clip_params->octant ) ? 1 : -1; + + if (line_params->x_major) + { + line_params->err_add_1 = 2 * abs_dy - 2 * abs_dx; + line_params->err_add_2 = 2 * abs_dy; + } + else + { + line_params->err_add_1 = 2 * abs_dx - 2 * abs_dy; + line_params->err_add_2 = 2 * abs_dx; + } + + rect->left = min( start->x, end->x ); + rect->top = min( start->y, end->y ); + rect->right = max( start->x, end->x ) + 1; + rect->bottom = max( start->y, end->y ) + 1; +} + /****************************************************************************** * clip_line * @@ -570,34 +603,8 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD { bres_params clip_params; struct line_params line_params; - INT dx = end->x - start->x, dy = end->y - start->y; - INT abs_dx = abs(dx), abs_dy = abs(dy); - - clip_params.dx = abs_dx; - clip_params.dy = abs_dy; - clip_params.octant = get_octant_mask(dx, dy); - clip_params.bias = get_bias( clip_params.octant ); - - line_params.bias = clip_params.bias; - line_params.x_major = is_xmajor( clip_params.octant ); - line_params.x_inc = is_x_increasing( clip_params.octant ) ? 1 : -1; - line_params.y_inc = is_y_increasing( clip_params.octant ) ? 1 : -1; - - if (line_params.x_major) - { - line_params.err_add_1 = 2 * abs_dy - 2 * abs_dx; - line_params.err_add_2 = 2 * abs_dy; - } - else - { - line_params.err_add_1 = 2 * abs_dx - 2 * abs_dy; - line_params.err_add_2 = 2 * abs_dx; - } - rect.left = min( start->x, end->x ); - rect.top = min( start->y, end->y ); - rect.right = max( start->x, end->x ) + 1; - rect.bottom = max( start->y, end->y ) + 1; + init_bres_params( start, end, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { @@ -612,12 +619,14 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD if (line_params.x_major) { - line_params.err_start = 2 * abs_dy - abs_dx + m * 2 * abs_dy - n * 2 * abs_dx; + 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 { - line_params.err_start = 2 * abs_dx - abs_dy + n * 2 * abs_dx - m * 2 * abs_dy; + 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; } @@ -978,34 +987,8 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { bres_params clip_params; struct line_params line_params; - INT dx = end->x - start->x, dy = end->y - start->y; - INT abs_dx = abs(dx), abs_dy = abs(dy); - - clip_params.dx = abs_dx; - clip_params.dy = abs_dy; - clip_params.octant = get_octant_mask(dx, dy); - clip_params.bias = get_bias( clip_params.octant ); - line_params.bias = clip_params.bias; - line_params.x_major = is_xmajor( clip_params.octant ); - line_params.x_inc = is_x_increasing( clip_params.octant ) ? 1 : -1; - line_params.y_inc = is_y_increasing( clip_params.octant ) ? 1 : -1; - - if (line_params.x_major) - { - line_params.err_add_1 = 2 * abs_dy - 2 * abs_dx; - line_params.err_add_2 = 2 * abs_dy; - } - else - { - line_params.err_add_1 = 2 * abs_dx - 2 * abs_dy; - line_params.err_add_2 = 2 * abs_dx; - } - - rect.left = min( start->x, end->x ); - rect.top = min( start->y, end->y ); - rect.right = max( start->x, end->x ) + 1; - rect.bottom = max( start->y, end->y ) + 1; + init_bres_params( start, end, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); for (i = 0; i < clipped_rects.count; i++) { @@ -1022,13 +1005,15 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) if (line_params.x_major) { - line_params.err_start = 2 * abs_dy - abs_dx + m * 2 * abs_dy - n * 2 * abs_dx; + 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; skip_dash(pdev, m); } else { - line_params.err_start = 2 * abs_dx - abs_dy + n * 2 * abs_dx - m * 2 * abs_dy; + 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; skip_dash(pdev, n); } @@ -1041,9 +1026,9 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) } pdev->dash_pos = start_pos; if(line_params.x_major) - skip_dash(pdev, abs_dx); + skip_dash(pdev, clip_params.dx); else - skip_dash(pdev, abs_dy); + skip_dash(pdev, clip_params.dy); } free_clipped_rects( &clipped_rects );

1 0

Alexandre Julliard : gdi32: Limit line drawing coordinates to reasonable values to avoid overflows.
by Alexandre Julliard 30 Jul '12

30 Jul '12

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

Alexandre Julliard : gdi32: Clip solid pen regions to the DIB rectangle to avoid overflows.
by Alexandre Julliard 30 Jul '12

30 Jul '12

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

Hans Leidekker : wbemprox: Add support for boolean properties.
by Alexandre Julliard 30 Jul '12

30 Jul '12

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

Dmitry Timoshkov : windowscodecs: Fix warnings detected by compiling with inline wrappers.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: aaa164272d2dccc506914ea6b840c9286bffc396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa164272d2dccc506914ea6b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 27 18:08:19 2012 +0900 windowscodecs: Fix warnings detected by compiling with inline wrappers. --- dlls/windowscodecs/Makefile.in | 2 +- dlls/windowscodecs/fliprotate.c | 2 +- dlls/windowscodecs/icoformat.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index da851d5..acbb0e9 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -2,7 +2,7 @@ MODULE = windowscodecs.dll IMPORTLIB = windowscodecs IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4 EXTRAINCL = @PNGINCL@ -EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL +EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DWIDL_C_INLINE_WRAPPERS EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 3449679..81e01cc 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -179,7 +179,7 @@ static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, if (!prc) { UINT width, height; - hr = IWICBitmapSource_GetSize(iface, &width, &height); + hr = IWICBitmapFlipRotator_GetSize(iface, &width, &height); if (FAILED(hr)) return hr; rect.X = 0; rect.Y = 0; diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 047c25a..6cccc3e 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -697,14 +697,14 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, LeaveCriticalSection(&This->lock); - IStream_Release(substream); + IWICStream_Release(substream); return S_OK; fail: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, result); - if (substream) IStream_Release(substream); + if (substream) IWICStream_Release(substream); if (SUCCEEDED(hr)) hr = E_FAIL; TRACE("<-- %x\n", hr); return hr;

1 0

Alexandre Julliard : msxml3: Fix an uninitialized variable.
by Alexandre Julliard 27 Jul '12

27 Jul '12

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