wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Alexandre Julliard : rpcrt4/tests: Define the required Windows version before including anything.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 38e8f6d83f78e18a3bf9529c7af8ee629730d16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e8f6d83f78e18a3bf9529c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:58 2013 +0100 rpcrt4/tests: Define the required Windows version before including anything. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ac3bacc..cc3e1d3 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ +#include <stdarg.h> + #include "wine/test.h" #include <windef.h> #include <winbase.h>

1 0

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

18 Feb '13

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

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

18 Feb '13

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

Piotr Caban : msvcp90: Prefer builtin version.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: cfec148b8baeb86ee9d775f9cf527b80e043f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfec148b8baeb86ee9d775f9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 18 10:26:17 2013 +0100 msvcp90: Prefer builtin version. --- dlls/msvcp90/msvcp90_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index cb6377f..7a7aafe 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -84,8 +84,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit();

1 0

Piotr Caban : msvcr90: Prefer builtin version.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 5d88f780dd4bbbde0ff27075b58321d7347f6d4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d88f780dd4bbbde0ff27075b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 18 10:26:01 2013 +0100 msvcr90: Prefer builtin version. --- dlls/msvcr90/msvcr90.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 79475e8..de6d86e 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -31,9 +31,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); _set_printf_count_output(0);

1 0

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

18 Feb '13

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 : include/gdiplusenums.h: Add FlatnessDefault definition.
by Alexandre Julliard 18 Feb '13

18 Feb '13

Module: wine Branch: master Commit: 9bcd1cdd3141dbfaa47432f92a309c4109080ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd1cdd3141dbfaa47432f92… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 17:31:48 2013 +0800 include/gdiplusenums.h: Add FlatnessDefault definition. --- include/gdiplusenums.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index d0fc11b..c730a0c 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -704,6 +704,8 @@ enum EmfPlusRecordType { EmfPlusRecordTypeMin = EmfPlusRecordTypeHeader }; +#define FlatnessDefault 0.25f + #ifndef __cplusplus typedef enum Unit Unit;

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawLinesI to GdipDrawLines.
by Alexandre Julliard 18 Feb '13

18 Feb '13

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 GdipDrawLineI to GdipDrawLine.
by Alexandre Julliard 18 Feb '13

18 Feb '13

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

Dmitry Timoshkov : gdiplus: Forward GdipDrawLine to GdipDrawLines.
by Alexandre Julliard 18 Feb '13

18 Feb '13

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

← Newer
1
...
18
19
20
21
22
23
24
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013