February 2013 - Wine-Commits

Alexandre Julliard : user32/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 3369c532028e2b8f156f16480d5be7639bc70cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3369c532028e2b8f156f16480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:50 2013 +0100 user32/tests: Define the required Windows version before including anything. --- dlls/user32/tests/dialog.c | 4 ++-- dlls/user32/tests/sysparams.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 0ebab4c..145b20f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -29,12 +29,12 @@ * normally be met. */ +#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ + #include <assert.h> #include <stdio.h> #include <stdarg.h> -#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ - #include "wine/test.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ad43cb7..d4704fa 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -17,16 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ +#define _WIN32_IE 0x0700 +#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ + #include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ -#define _WIN32_IE 0x0700 -#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ - #include "wine/test.h" #include "windef.h" #include "winbase.h"

1 0

Dmitry Timoshkov : gdiplus: Avoid a devision by zero when a being added segment length is 0.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 22a7458a3f5fdd060bc6ae9c26e5b98adcd6bc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a7458a3f5fdd060bc6ae9c2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 17:32:12 2013 +0800 gdiplus: Avoid a devision by zero when a being added segment length is 0. This sometimes happens after GdipAddPathLine + GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 1fbebba..f4d1a4b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1702,6 +1702,13 @@ static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint, REAL distance = pen->width/2.0; REAL bevel_dx, bevel_dy; + if (segment_length == 0.0) + { + *last_point = add_path_list_node(*last_point, endpoint->X, + endpoint->Y, PathPointTypeLine); + return; + } + if (right_side) { bevel_dx = -distance * segment_dy / segment_length;

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLineI to GdipDrawLine.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 7cccd36c9ab047cfbbfc17daa224f6344b49abb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cccd36c9ab047cfbbfc17daa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 11:37:40 2013 +0800 gdiplus: Forward GdipDrawLineI to GdipDrawLine. --- dlls/gdiplus/graphics.c | 29 +---------------------------- 1 files changed, 1 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 667ead3..bc8b7da 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3539,36 +3539,9 @@ GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { - INT save_state; - GpPointF pt[2]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2); - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = (REAL)x1; - pt[0].Y = (REAL)y1; - pt[1].X = (REAL)x2; - pt[1].Y = (REAL)y2; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, pt, 2, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawLine(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2); } GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST

1 0

Ken Thomases : include/wingdi.h: Add definitions for DEVMODE display fixed output flags and values.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: ef2b8a1e8e6afb3525991befc98cd2e9db251193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2b8a1e8e6afb3525991befc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:38 2013 -0600 include/wingdi.h: Add definitions for DEVMODE display fixed output flags and values. --- include/wingdi.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index ca98b3e..408a1b1 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3027,6 +3027,7 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DM_DITHERTYPE __MSABI_LONG(0x04000000) #define DM_PANNINGWIDTH __MSABI_LONG(0x08000000) #define DM_PANNINGHEIGHT __MSABI_LONG(0x10000000) +#define DM_DISPLAYFIXEDOUTPUT __MSABI_LONG(0x20000000) #define DM_GRAYSCALE 1 #define DM_INTERLACED 2 @@ -3224,6 +3225,10 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE) #define DMDO_180 2 #define DMDO_270 3 +#define DMDFO_DEFAULT 0 +#define DMDFO_STRETCH 1 +#define DMDFO_CENTER 2 + typedef struct { INT cbSize;

1 0

Ken Thomases : winemac: Use only on-screen windows for Cocoa parent ( Win32 owner) and ordering sibling.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 3799acb3ac8968353c3d8b2ce23f0834c970a098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799acb3ac8968353c3d8b2ce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:23 2013 -0600 winemac: Use only on-screen windows for Cocoa parent (Win32 owner) and ordering sibling. --- dlls/winemac.drv/window.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 7a7eda7..65f7955 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -303,10 +303,12 @@ static void release_win_data(struct macdrv_win_data *data) * * Return the Mac window associated with the full area of a window */ -static macdrv_window macdrv_get_cocoa_window(HWND hwnd) +static macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen) { struct macdrv_win_data *data = get_win_data(hwnd); - macdrv_window ret = data ? data->cocoa_window : NULL; + macdrv_window ret = NULL; + if (data && (data->on_screen || !require_on_screen)) + ret = data->cocoa_window; release_win_data(data); return ret; } @@ -330,7 +332,7 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); owner = GetWindow(data->hwnd, GW_OWNER); - owner_win = macdrv_get_cocoa_window(owner); + owner_win = macdrv_get_cocoa_window(owner, TRUE); macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win); get_cocoa_window_features(data, style, ex_style, &wf); @@ -698,14 +700,14 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) /* find window that this one must be after */ HWND prev = GetWindow(data->hwnd, GW_HWNDPREV); while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && - (prev_window = macdrv_get_cocoa_window(prev)))) + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) prev = GetWindow(prev, GW_HWNDPREV); if (!prev_window) { /* find window that this one must be before */ next = GetWindow(data->hwnd, GW_HWNDNEXT); while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && - (next_window = macdrv_get_cocoa_window(next)))) + (next_window = macdrv_get_cocoa_window(next, TRUE)))) next = GetWindow(next, GW_HWNDNEXT); } @@ -988,7 +990,7 @@ void CDECL macdrv_SetWindowText(HWND hwnd, LPCWSTR text) TRACE("%p, %s\n", hwnd, debugstr_w(text)); - if ((win = macdrv_get_cocoa_window(hwnd))) + if ((win = macdrv_get_cocoa_window(hwnd, FALSE))) macdrv_set_cocoa_window_title(win, text, strlenW(text)); }

1 0

Ken Thomases : winemac: Don't set Cocoa window frame to be zero-sized.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: d74e90080ab1b8820d15b84ab3dce6fe9b4c0568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74e90080ab1b8820d15b84ab… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:19 2013 -0600 winemac: Don't set Cocoa window frame to be zero-sized. --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2247d32..d8ea9ed 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -429,14 +429,17 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self doOrderOut]; } - oldFrame = [self frame]; - frame = [self frameRectForContentRect:contentRect]; - if (!NSEqualRects(frame, oldFrame)) + if (!NSIsEmptyRect(contentRect)) { - if (NSEqualSizes(frame.size, oldFrame.size)) - [self setFrameOrigin:frame.origin]; - else - [self setFrame:frame display:YES]; + oldFrame = [self frame]; + frame = [self frameRectForContentRect:contentRect]; + if (!NSEqualRects(frame, oldFrame)) + { + if (NSEqualSizes(frame.size, oldFrame.size)) + [self setFrameOrigin:frame.origin]; + else + [self setFrame:frame display:YES]; + } } if (on_screen)

1 0

Andrew Talbot : msi: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 40f3a9fa590b1e4ab785509bb389efbe4f59e964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f3a9fa590b1e4ab785509bb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:17 2013 +0000 msi: Avoid signed-unsigned integer comparisons. --- dlls/msi/package.c | 8 +++++--- dlls/msi/suminfo.c | 2 +- dlls/msi/where.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 385000c..bcda102 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -154,7 +154,6 @@ void msi_free_action_script( MSIPACKAGE *package, UINT script ) static void free_package_structures( MSIPACKAGE *package ) { - INT i; struct list *item, *cursor; LIST_FOR_EACH_SAFE( item, cursor, &package->features ) @@ -283,11 +282,14 @@ static void free_package_structures( MSIPACKAGE *package ) if (package->script) { + INT i; + UINT j; + for (i = 0; i < SCRIPT_MAX; i++) msi_free_action_script( package, i ); - for (i = 0; i < package->script->UniqueActionsCount; i++) - msi_free( package->script->UniqueActions[i] ); + for (j = 0; j < package->script->UniqueActionsCount; j++) + msi_free( package->script->UniqueActions[j] ); msi_free( package->script->UniqueActions ); msi_free( package->script ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index e0c99b8..363f683 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -922,7 +922,7 @@ static UINT parse_prop( LPCWSTR prop, LPCWSTR value, UINT *pid, INT *int_value, UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) { UINT r = ERROR_FUNCTION_FAILED; - DWORD i, j; + int i, j; MSISUMMARYINFO *si; si = MSI_GetSummaryInformationW( db->storage, num_records * (num_columns / 2) ); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 10c4b37..e3bc9b7 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -770,7 +770,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) JOINTABLE *table = wv->tables; UINT *rows; JOINTABLE **ordered_tables; - int i = 0; + UINT i = 0; TRACE("%p %p\n", wv, record); @@ -1052,7 +1052,7 @@ static UINT WHERE_sort(struct tagMSIVIEW *view, column_info *columns) column_info *column = columns; MSIORDERINFO *orderinfo; UINT r, count = 0; - int i; + UINT i; TRACE("%p %p\n", view, columns);

1 0

Alexandre Julliard : gdi32/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: eaf78eadf08b5057b0aeff0e76e71e1c3566b354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf78eadf08b5057b0aeff0e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:40 2013 +0100 gdi32/tests: Define the required Windows version before including anything. --- dlls/gdi32/tests/dc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e47a091..5f19370 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -20,13 +20,13 @@ */ -#include <assert.h> -#include <stdio.h> - #define WINVER 0x0501 /* request latest DEVMODE */ #define NONAMELESSSTRUCT #define NONAMELESSUNION +#include <assert.h> +#include <stdio.h> + #include "wine/test.h" #include "winbase.h" #include "wingdi.h"

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLinesI to GdipDrawLines.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 8ec2354b32ac2d807c453ad9620869afadd96184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec2354b32ac2d807c453ad96… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 11:38:06 2013 +0800 gdiplus: Forward GdipDrawLinesI to GdipDrawLines. --- dlls/gdiplus/graphics.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bc8b7da..b9aa912 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3576,25 +3576,12 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count) { - INT save_state; GpStatus retval; - GpPointF *ptf = NULL; + GpPointF *ptf; int i; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); - if(!pen || !graphics || (count < 2)) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - ptf = GdipAlloc(count * sizeof(GpPointF)); if(!ptf) return OutOfMemory; @@ -3603,11 +3590,7 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST ptf[i].Y = (REAL) points[i].Y; } - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, ptf, count, TRUE); - - restore_dc(graphics, save_state); + retval = GdipDrawLines(graphics, pen, ptf, count); GdipFree(ptf); return retval;

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLine to GdipDrawLines.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 0ed65a2d3aee55851eb7ebe3d57c66f330a22ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed65a2d3aee55851eb7ebe3d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 11:37:19 2013 +0800 gdiplus: Forward GdipDrawLine to GdipDrawLines. --- dlls/gdiplus/graphics.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 659c46b..667ead3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3525,36 +3525,15 @@ GpStatus WINGDIPAPI GdipDrawImageRectI(GpGraphics *graphics, GpImage *image, GpStatus WINGDIPAPI GdipDrawLine(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2) { - INT save_state; GpPointF pt[2]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2); - if(!pen || !graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; pt[1].Y = y2; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, pt, 2, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawLines(graphics, pen, pt, 2); } GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0