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

Francois Gouget : gdiplus: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: fe1ce0e34102749eb968d473e612b5bdd63e893b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1ce0e34102749eb968d473e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:10:42 2008 +0200 gdiplus: Add a trailing '\n' to a Wine trace. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 6c52623..4a11623 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -330,7 +330,7 @@ GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) if (!region) return InvalidParameter; - TRACE("%p", region); + TRACE("%p\n", region); delete_element(&region->node); stat = init_region(region, RegionDataInfiniteRect);

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetCustomLineCapStrokeJoin + tests .
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 5038845cf21d2d8474b74cbaf21cb316a29c5b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5038845cf21d2d8474b74cbaf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 26 12:48:05 2008 +0400 gdiplus: Implemented GdipSetCustomLineCapStrokeJoin + tests. --- dlls/gdiplus/customlinecap.c | 9 +++++---- dlls/gdiplus/tests/customlinecap.c | 19 +++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 429b144..721a4f5 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -175,15 +175,16 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, return NotImplemented; } +/*FIXME: LineJoin completely ignored now */ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, GpLineJoin join) { - static int calls; + if(!custom) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + custom->join = join; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index c33ec6f..9f3e6f0 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -87,12 +87,31 @@ static void test_linejoin(void) expect(InvalidParameter, stat); stat = GdipGetCustomLineCapStrokeJoin(NULL, &join); expect(InvalidParameter, stat); + stat = GdipSetCustomLineCapStrokeJoin(NULL, LineJoinBevel); + expect(InvalidParameter, stat); /* LineJoinMiter is default */ stat = GdipGetCustomLineCapStrokeJoin(custom, &join); expect(Ok, stat); expect(LineJoinMiter, join); + /* set/get */ + stat = GdipSetCustomLineCapStrokeJoin(custom, LineJoinBevel); + expect(Ok, stat); + stat = GdipGetCustomLineCapStrokeJoin(custom, &join); + expect(Ok, stat); + expect(LineJoinBevel, join); + stat = GdipSetCustomLineCapStrokeJoin(custom, LineJoinRound); + expect(Ok, stat); + stat = GdipGetCustomLineCapStrokeJoin(custom, &join); + expect(Ok, stat); + expect(LineJoinRound, join); + stat = GdipSetCustomLineCapStrokeJoin(custom, LineJoinMiterClipped); + expect(Ok, stat); + stat = GdipGetCustomLineCapStrokeJoin(custom, &join); + expect(Ok, stat); + expect(LineJoinMiterClipped, join); + GdipDeleteCustomLineCap(custom); GdipDeletePath(path); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d9cebe8..37ef6e0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -327,6 +327,7 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpLineCap); GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*); +GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetCustomLineCapBaseInset + test.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 6c6e8f489e72054e7e3879dc26609702c02f9137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6e8f489e72054e7e3879dc2… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 26 12:48:11 2008 +0400 gdiplus: Implemented GdipGetCustomLineCapBaseInset + test. --- dlls/gdiplus/customlinecap.c | 8 ++++---- dlls/gdiplus/tests/customlinecap.c | 34 ++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 721a4f5..d6af063 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -156,12 +156,12 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, REAL* inset) { - static int calls; + if(!custom || !inset) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *inset = custom->inset; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 9f3e6f0..26b9645 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -23,6 +23,7 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(got == expected, "Expected %.2f, got %.2f\n", expected, got) static void test_constructor_destructor(void) { @@ -116,6 +117,38 @@ static void test_linejoin(void) GdipDeletePath(path); } +static void test_inset(void) +{ + GpCustomLineCap *custom; + GpPath *path; + REAL inset; + GpStatus stat; + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + expect(Ok, stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + expect(Ok, stat); + + /* NULL args */ + stat = GdipGetCustomLineCapBaseInset(NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetCustomLineCapBaseInset(NULL, &inset); + expect(InvalidParameter, stat); + stat = GdipGetCustomLineCapBaseInset(custom, NULL); + expect(InvalidParameter, stat); + /* valid args */ + inset = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapBaseInset(custom, &inset); + expect(Ok, stat); + expectf(0.0, inset); + + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -130,6 +163,7 @@ START_TEST(customlinecap) test_constructor_destructor(); test_linejoin(); + test_inset(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 37ef6e0..0138c8b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -326,6 +326,7 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpLineCap); GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap*,REAL*); GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin);

1 0

Stefan Leichter : rasapi32: Fix building the tests with MSVC ( based on a patch by Reece Dunn).
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: cc494c48af86c72d6265269aa81cbd98318a0cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc494c48af86c72d6265269aa… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Jul 26 10:29:34 2008 +0200 rasapi32: Fix building the tests with MSVC (based on a patch by Reece Dunn). --- dlls/rasapi32/rasapi.c | 1 + dlls/rasapi32/tests/rasapi.c | 1 + include/Makefile.in | 1 + include/ras.h | 4 ---- include/raserror.h | 26 ++++++++++++++++++++++++++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index f14694a..704a8bc 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ras.h" +#include "raserror.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ras); diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 4130392..94026ab 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include "ras.h" +#include "raserror.h" static HMODULE hmodule; static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD); diff --git a/include/Makefile.in b/include/Makefile.in index 99b06d9..882d89d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -350,6 +350,7 @@ SRCDIR_INCLUDES = \ pshpack4.h \ pshpack8.h \ ras.h \ + raserror.h \ reason.h \ regstr.h \ richedit.h \ diff --git a/include/ras.h b/include/ras.h index 82efcda..f90d25a 100644 --- a/include/ras.h +++ b/include/ras.h @@ -55,10 +55,6 @@ extern "C" { #define RASDT_Parallel "PARALLEL" #define RASDT_PPPoE "PPPoE" -#define RASBASE 600 -#define ERROR_BUFFER_TOO_SMALL (RASBASE+3) -#define ERROR_INVALID_SIZE (RASBASE+32) - typedef struct tagRASDEVINFOA { DWORD dwSize; CHAR szDeviceType[ RAS_MaxDeviceType + 1 ]; diff --git a/include/raserror.h b/include/raserror.h new file mode 100644 index 0000000..e0f7d44 --- /dev/null +++ b/include/raserror.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2008 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_RASERROR_H +#define __WINE_RASERROR_H + +#define RASBASE 600 +#define ERROR_BUFFER_TOO_SMALL (RASBASE+3) +#define ERROR_INVALID_SIZE (RASBASE+32) + +#endif

1 0

Stefan Leichter : rasapi32: Skip RasEnumDevicesA tests on configuration problems.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 548abf369dbc5aafd4ba3df31b6dc844299b58d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548abf369dbc5aafd4ba3df31… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Jul 26 10:30:22 2008 +0200 rasapi32: Skip RasEnumDevicesA tests on configuration problems. --- dlls/rasapi32/tests/rasapi.c | 6 +++++- include/raserror.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 94026ab..da733a1 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -55,7 +55,11 @@ static void test_rasenum(void) /* create the return buffer */ result = pRasEnumDevicesA(NULL, &bufsize, &cDevices); - trace("RasEnumDevicesA: buffersize %d\n", cb); + if(ERROR_RASMAN_CANNOT_INITIALIZE == result) { + win_skip("RAS configuration problem\n"); + return; + } + trace("RasEnumDevicesA: returned %d buffersize %d\n", result, cb); ok(result == ERROR_BUFFER_TOO_SMALL, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); diff --git a/include/raserror.h b/include/raserror.h index e0f7d44..ad38cd3 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -22,5 +22,6 @@ #define RASBASE 600 #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) #define ERROR_INVALID_SIZE (RASBASE+32) +#define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111) #endif

1 0

Nikolay Sivov : gdiplus: Added testfile for customlinecap + constr./destr. tests.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 92c440c633462cf8daf342c1edd0ce536762cd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c440c633462cf8daf342c1e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 26 12:47:50 2008 +0400 gdiplus: Added testfile for customlinecap + constr./destr. tests. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/customlinecap.c | 83 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index c5f8504..7dba3da 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = gdiplus user32 gdi32 kernel32 CTESTS = \ brush.c \ + customlinecap.c \ font.c \ graphics.c \ graphicspath.c \ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c new file mode 100644 index 0000000..f05b61e --- /dev/null +++ b/dlls/gdiplus/tests/customlinecap.c @@ -0,0 +1,83 @@ +/* + * Unit test suite for customlinecap + * + * Copyright (C) 2008 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_constructor_destructor(void) +{ + GpCustomLineCap *custom; + GpPath *path, *path2; + GpStatus stat; + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &path2); + expect(Ok, stat); + stat = GdipAddPathRectangle(path2, 5.0, 5.0, 10.0, 10.0); + expect(Ok, stat); + + /* NULL args */ + stat = GdipCreateCustomLineCap(NULL, NULL, LineCapFlat, 0.0, NULL); + expect(InvalidParameter, stat); + stat = GdipCreateCustomLineCap(path, NULL, LineCapFlat, 0.0, NULL); + expect(InvalidParameter, stat); + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, NULL); + expect(InvalidParameter, stat); + stat = GdipCreateCustomLineCap(NULL, NULL, LineCapFlat, 0.0, &custom); + expect(InvalidParameter, stat); + stat = GdipDeleteCustomLineCap(NULL); + expect(InvalidParameter, stat); + + /* valid args */ + stat = GdipCreateCustomLineCap(NULL, path2, LineCapFlat, 0.0, &custom); + expect(Ok, stat); + stat = GdipDeleteCustomLineCap(custom); + expect(Ok, stat); + /* it's strange but native returns NotImplemented on stroke == NULL */ + stat = GdipCreateCustomLineCap(path, NULL, LineCapFlat, 10.0, &custom); + todo_wine expect(NotImplemented, stat); + + GdipDeletePath(path2); + GdipDeletePath(path); +} + +START_TEST(customlinecap) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetCustomLineCapStrokeJoin with basic test.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 2848100e827ebf6004dd9148ed7cfe69df83fb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2848100e827ebf6004dd9148e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 26 12:48:01 2008 +0400 gdiplus: Implemented GdipGetCustomLineCapStrokeJoin with basic test. --- dlls/gdiplus/customlinecap.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/customlinecap.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index e8e18bc..429b144 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -100,6 +100,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath (*customCap)->inset = baseInset; (*customCap)->cap = baseCap; + (*customCap)->join = LineJoinMiter; return Ok; } @@ -116,6 +117,17 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap *customCap) return Ok; } +GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap* customCap, + GpLineJoin* lineJoin) +{ + if(!customCap || !lineJoin) + return InvalidParameter; + + *lineJoin = customCap->join; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, GpLineCap start, GpLineCap end) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b55b4b1..5a1a7a7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -252,7 +252,7 @@ @ stdcall GdipGetCustomLineCapBaseCap(ptr ptr) @ stdcall GdipGetCustomLineCapBaseInset(ptr ptr) @ stub GdipGetCustomLineCapStrokeCaps -@ stub GdipGetCustomLineCapStrokeJoin +@ stdcall GdipGetCustomLineCapStrokeJoin(ptr ptr) @ stub GdipGetCustomLineCapType @ stub GdipGetCustomLineCapWidthScale @ stdcall GdipGetDC(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 620f822..aa03727 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -149,6 +149,7 @@ struct GpCustomLineCap{ BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap cap; /* as far as I can tell, this value is ignored */ REAL inset; /* how much to adjust the end of the line */ + GpLineJoin join; }; struct GpImage{ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index f05b61e..c33ec6f 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -65,6 +65,38 @@ static void test_constructor_destructor(void) GdipDeletePath(path); } +static void test_linejoin(void) +{ + GpCustomLineCap *custom; + GpPath *path; + GpLineJoin join; + GpStatus stat; + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + expect(Ok, stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + expect(Ok, stat); + + /* NULL args */ + stat = GdipGetCustomLineCapStrokeJoin(NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetCustomLineCapStrokeJoin(custom, NULL); + expect(InvalidParameter, stat); + stat = GdipGetCustomLineCapStrokeJoin(NULL, &join); + expect(InvalidParameter, stat); + + /* LineJoinMiter is default */ + stat = GdipGetCustomLineCapStrokeJoin(custom, &join); + expect(Ok, stat); + expect(LineJoinMiter, join); + + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -78,6 +110,7 @@ START_TEST(customlinecap) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor_destructor(); + test_linejoin(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c82b69d..d9cebe8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -326,6 +326,7 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpLineCap); GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); +GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);

1 0

Juan Lang : shlwapi: Use CharNextA to iterate through characters in PathAddBackslashA. Fixes problems with MBCS paths.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 87c3df1578803f63ce68096c07c42c3af279077c URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c3df1578803f63ce68096c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 25 11:16:54 2008 -0700 shlwapi: Use CharNextA to iterate through characters in PathAddBackslashA. Fixes problems with MBCS paths. --- dlls/shlwapi/path.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index d0d4e93..e06e027 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -235,6 +235,7 @@ LPWSTR WINAPI PathCombineW(LPWSTR lpszDest, LPCWSTR lpszDir, LPCWSTR lpszFile) LPSTR WINAPI PathAddBackslashA(LPSTR lpszPath) { size_t iLen; + LPSTR prev = lpszPath; TRACE("(%s)\n",debugstr_a(lpszPath)); @@ -243,11 +244,15 @@ LPSTR WINAPI PathAddBackslashA(LPSTR lpszPath) if (iLen) { - lpszPath += iLen; - if (lpszPath[-1] != '\\') + do { + lpszPath = CharNextA(prev); + if (*lpszPath) + prev = lpszPath; + } while (*lpszPath); + if (*prev != '\\') { - *lpszPath++ = '\\'; - *lpszPath = '\0'; + *lpszPath++ = '\\'; + *lpszPath = '\0'; } } return lpszPath;

1 0

Vitaliy Margolen : dinput: Implement saturation property for evdev joystick driver.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a0abf988ac027566e1d1c8713a841110440490b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0abf988ac027566e1d1c8713… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Jul 25 14:20:37 2008 -0600 dinput: Implement saturation property for evdev joystick driver. --- dlls/dinput/joystick_linuxinput.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index aad25a4..d3f7dc0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -885,6 +885,26 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, FIXME("DIPROP_AUTOCENTER(%d)\n", pd->dwData); break; } + case (DWORD)DIPROP_SATURATION: { + LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; + + if (ph->dwHow == DIPH_DEVICE) { + int i; + + TRACE("saturation(%d) all\n", pd->dwData); + for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) + This->props[i].lSaturation = pd->dwData; + } else { + int obj = find_property(&This->base.data_format, ph); + + if (obj < 0) return DIERR_OBJECTNOTFOUND; + + TRACE("saturation(%d) obj=%d\n", pd->dwData, obj); + This->props[obj].lSaturation = pd->dwData; + } + fake_current_js_state(This); + break; + } default: return IDirectInputDevice2AImpl_SetProperty(iface, rguid, ph); } @@ -977,6 +997,17 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("deadzone(%d) obj=%d\n", pd->dwData, obj); break; } + case (DWORD) DIPROP_SATURATION: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + int obj = find_property(&This->base.data_format, pdiph); + + if (obj < 0) return DIERR_OBJECTNOTFOUND; + + pd->dwData = This->props[obj].lSaturation; + TRACE("saturation(%d) obj=%d\n", pd->dwData, obj); + break; + } default: return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph);

1 0

Dan Hipschman : ntdll: Fix a small timer-queue bug whereby a deleted timer may still expire.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 2b287a4489c6eded2f156ab3dc1c41ce319be433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b287a4489c6eded2f156ab3d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 25 14:50:10 2008 -0700 ntdll: Fix a small timer-queue bug whereby a deleted timer may still expire. --- dlls/kernel32/tests/sync.c | 58 +++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/threadpool.c | 6 ++-- 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index c7a949c..dcf2b62 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -609,11 +609,45 @@ static void CALLBACK timer_queue_cb5(PVOID p, BOOLEAN timedOut) Sleep(delay); } +static void CALLBACK timer_queue_cb6(PVOID p, BOOLEAN timedOut) +{ + struct timer_queue_data1 *d = p; + ok(timedOut, "Timer callbacks should always time out\n"); + /* This tests an original implementation bug where a deleted timer may get + to run, but it is tricky to set up. */ + if (d->q && d->num_calls++ == 0) + { + /* First run: delete ourselves, then insert and remove a timer + that goes in front of us in the sorted timeout list. Once + removed, we will still timeout at the faster timer's due time, + but this should be a no-op if we are bug-free. There should + not be a second run. We can test the value of num_calls later. */ + BOOL ret; + HANDLE t; + + /* The delete will pend while we are in this callback. */ + SetLastError(0xdeadbeef); + ret = pDeleteTimerQueueTimer(d->q, d->t, NULL); + ok(!ret, "DeleteTimerQueueTimer\n"); + ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueTimer\n"); + + ret = pCreateTimerQueueTimer(&t, d->q, timer_queue_cb1, NULL, 100, 0, 0); + ok(ret, "CreateTimerQueueTimer\n"); + ok(t != NULL, "CreateTimerQueueTimer\n"); + + ret = pDeleteTimerQueueTimer(d->q, t, INVALID_HANDLE_VALUE); + ok(ret, "DeleteTimerQueueTimer\n"); + + /* Now we stay alive by hanging around in the callback. */ + Sleep(500); + } +} + static void test_timer_queue(void) { HANDLE q, t1, t2, t3, t4, t5; int n1, n2, n3, n4, n5; - struct timer_queue_data1 d2, d3, d4; + struct timer_queue_data1 d1, d2, d3, d4; HANDLE e, et1, et2; BOOL ret; @@ -824,6 +858,28 @@ static void test_timer_queue(void) ok(d2.num_calls == d2.max_calls, "DeleteTimerQueueTimer\n"); ok(d3.num_calls == d3.max_calls, "ChangeTimerQueueTimer\n"); ok(d4.num_calls == 1, "Timer flagged for deletion incorrectly\n"); + + /* Test an obscure bug that was in the original implementation. */ + q = pCreateTimerQueue(); + ok(q != NULL, "CreateTimerQueue\n"); + + /* All the work is done in the callback. */ + d1.t = t1 = NULL; + d1.num_calls = 0; + d1.q = q; + ret = pCreateTimerQueueTimer(&t1, q, timer_queue_cb6, &d1, 100, + 100, WT_EXECUTELONGFUNCTION); + d1.t = t1; + ok(ret, "CreateTimerQueueTimer\n"); + ok(t1 != NULL, "CreateTimerQueueTimer\n"); + + Sleep(750); + + SetLastError(0xdeadbeef); + ret = pDeleteTimerQueueEx(q, NULL); + ok(!ret, "DeleteTimerQueueEx\n"); + ok(GetLastError() == ERROR_IO_PENDING, "DeleteTimerQueueEx\n"); + ok(d1.num_calls == 1, "DeleteTimerQueueTimer\n"); } START_TEST(sync) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index a60adfa..e468cbe 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -643,7 +643,7 @@ static inline void queue_move_timer(struct queue_timer *t, ULONGLONG time, static void queue_timer_expire(struct timer_queue *q) { - struct queue_timer *t; + struct queue_timer *t = NULL; RtlEnterCriticalSection(&q->cs); if (list_head(&q->timers)) @@ -656,9 +656,9 @@ static void queue_timer_expire(struct timer_queue *q) t, t->period ? queue_current_time() + t->period : EXPIRE_NEVER, FALSE); } + else + t = NULL; } - else - t = NULL; RtlLeaveCriticalSection(&q->cs); if (t)

1 0