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

Alexandre Julliard : wininet/tests: Add support for optional notifications. Fix the test to pass again on Windows and Wine.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 1f563440aae3ee595b622ef319d7b16580f81bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f563440aae3ee595b622ef31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 26 11:27:26 2008 +0200 wininet/tests: Add support for optional notifications. Fix the test to pass again on Windows and Wine. --- dlls/wininet/tests/http.c | 61 +++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0c4483b..7cd4abe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -43,6 +43,12 @@ static BOOL first_connection_to_test_url = TRUE; #define SET_EXPECT(status) \ SET_EXPECT2(status, 1) +#define SET_OPTIONAL2(status, num) \ + optional[status] = num + +#define SET_OPTIONAL(status) \ + SET_OPTIONAL2(status, 1) + /* SET_WINE_ALLOW's should be used with an appropriate * todo_wine CHECK_NOTIFIED at a later point in the code */ #define SET_WINE_ALLOW2(status, num) \ @@ -53,7 +59,7 @@ static BOOL first_connection_to_test_url = TRUE; #define CHECK_EXPECT(status) \ do { \ - if (!expect[status] && wine_allow[status]) \ + if (!expect[status] && !optional[status] && wine_allow[status]) \ { \ todo_wine ok(expect[status], "unexpected status %d (%s)\n", status, \ status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ @@ -62,10 +68,11 @@ static BOOL first_connection_to_test_url = TRUE; } \ else \ { \ - ok(expect[status], "unexpected status %d (%s)\n", status, \ + ok(expect[status] || optional[status], "unexpected status %d (%s)\n", status, \ status < MAX_INTERNET_STATUS && status_string[status][0] != 0 ? \ status_string[status] : "unknown"); \ - expect[status]--; \ + if (expect[status]) expect[status]--; \ + else optional[status]--; \ } \ notified[status]++; \ }while(0) @@ -73,7 +80,7 @@ static BOOL first_connection_to_test_url = TRUE; /* CLEAR_NOTIFIED used in cases when notification behavior * differs between Windows versions */ #define CLEAR_NOTIFIED(status) \ - expect[status] = wine_allow[status] = notified[status] = 0; + expect[status] = optional[status] = wine_allow[status] = notified[status] = 0; #define CHECK_NOTIFIED2(status, num) \ do { \ @@ -91,8 +98,8 @@ static BOOL first_connection_to_test_url = TRUE; #define MAX_INTERNET_STATUS (INTERNET_STATUS_COOKIE_HISTORY+1) #define MAX_STATUS_NAME 50 -static int expect[MAX_INTERNET_STATUS], wine_allow[MAX_INTERNET_STATUS], - notified[MAX_INTERNET_STATUS]; +static int expect[MAX_INTERNET_STATUS], optional[MAX_INTERNET_STATUS], + wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; static CHAR status_string[MAX_INTERNET_STATUS][MAX_STATUS_NAME]; static HANDLE hCompleteEvent; @@ -301,11 +308,13 @@ static void InternetReadFile_test(int flags) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); + SET_WINE_ALLOW(INTERNET_STATUS_RESOLVING_NAME); + SET_WINE_ALLOW(INTERNET_STATUS_NAME_RESOLVED); } else { - SET_WINE_ALLOW(INTERNET_STATUS_RESOLVING_NAME); - SET_WINE_ALLOW(INTERNET_STATUS_NAME_RESOLVED); + SET_WINE_ALLOW2(INTERNET_STATUS_RESOLVING_NAME,2); + SET_WINE_ALLOW2(INTERNET_STATUS_NAME_RESOLVED,2); } SET_WINE_ALLOW(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -315,7 +324,11 @@ static void InternetReadFile_test(int flags) SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REDIRECT); + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); else @@ -335,12 +348,12 @@ static void InternetReadFile_test(int flags) if (flags & INTERNET_FLAG_ASYNC) WaitForSingleObject(hCompleteEvent, INFINITE); - if (first_connection_to_test_url) + todo_wine if (first_connection_to_test_url) { CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); } - else todo_wine + else { CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); @@ -464,7 +477,7 @@ abort: Sleep(100); } CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); - if (hor != 0x0) todo_wine + if (hor != 0x0 && (flags & INTERNET_FLAG_ASYNC)) todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); @@ -537,11 +550,13 @@ static void InternetReadFileExA_test(int flags) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); + SET_WINE_ALLOW(INTERNET_STATUS_RESOLVING_NAME); + SET_WINE_ALLOW(INTERNET_STATUS_NAME_RESOLVED); } else { - SET_WINE_ALLOW(INTERNET_STATUS_RESOLVING_NAME); - SET_WINE_ALLOW(INTERNET_STATUS_NAME_RESOLVED); + SET_WINE_ALLOW2(INTERNET_STATUS_RESOLVING_NAME,2); + SET_WINE_ALLOW2(INTERNET_STATUS_NAME_RESOLVED,2); } SET_WINE_ALLOW(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -551,6 +566,8 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); SET_EXPECT(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); @@ -618,8 +635,11 @@ static void InternetReadFileExA_test(int flags) inetbuffers.dwOffsetLow = 5678; SET_WINE_ALLOW(INTERNET_STATUS_RECEIVING_RESPONSE); SET_WINE_ALLOW(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); rc = InternetReadFileEx(hor, &inetbuffers, 0, 0xdeadcafe); ok(rc, "InternetReadFileEx failed with error %u\n", GetLastError()); + trace("read %i bytes\n", inetbuffers.dwBufferLength); todo_wine { CHECK_NOT_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -697,7 +717,7 @@ static void InternetReadFileExA_test(int flags) length += inetbuffers.dwBufferLength; } - ok(length > 0, "failed to read any of the document\n"); + todo_wine ok(length > 0, "failed to read any of the document\n"); trace("Finished. Read %d bytes\n", length); /* WinXP does not send, but Win98 does */ @@ -725,16 +745,8 @@ abort: Sleep(100); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); } - if (hor != 0x0) todo_wine - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - } - else - { - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - } + CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CloseHandle(hCompleteEvent); first_connection_to_test_url = FALSE; } @@ -2095,6 +2107,7 @@ static void test_open_url_async(void) static void init_status_tests(void) { memset(expect, 0, sizeof(expect)); + memset(optional, 0, sizeof(optional)); memset(wine_allow, 0, sizeof(wine_allow)); memset(notified, 0, sizeof(notified)); memset(status_string, 0, sizeof(status_string));

1 0

Nikolay Sivov : gdiplus: Test for default Graphics clipping region.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 32ac2d190972cdb188eb763c83fa2e9977fe8ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ac2d190972cdb188eb763c8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 26 01:58:45 2008 +0400 gdiplus: Test for default Graphics clipping region. --- dlls/gdiplus/tests/graphics.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 10f0e79..b0ed5c0 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -764,6 +764,40 @@ static void test_transformpoints(void) ReleaseDC(0, hdc); } +static void test_getclip(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + GpRegion *clip; + BOOL res; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegion(&clip); + + /* NULL arguments */ + status = GdipGetClip(NULL, NULL); + expect(InvalidParameter, status); + status = GdipGetClip(graphics, NULL); + expect(InvalidParameter, status); + status = GdipGetClip(NULL, clip); + expect(InvalidParameter, status); + + res = FALSE; + status = GdipGetClip(graphics, clip); + todo_wine expect(Ok, status); + status = GdipIsInfiniteRegion(clip, graphics, &res); + todo_wine expect(Ok, status); + todo_wine expect(TRUE, res); + + GdipDeleteRegion(clip); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -785,6 +819,7 @@ START_TEST(graphics) test_GdipDrawLinesI(); test_Get_Release_DC(); test_transformpoints(); + test_getclip(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus: Implemented GdipIsInfiniteRegion with tests.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 078c6a39255f56a4fe6d0a7ec477f1b15a402130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078c6a39255f56a4fe6d0a7ec… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 26 01:58:49 2008 +0400 gdiplus: Implemented GdipIsInfiniteRegion with tests. --- dlls/gdiplus/region.c | 10 +++++++- dlls/gdiplus/tests/graphics.c | 8 +++++- dlls/gdiplus/tests/region.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 11b5aa6..45d0e51 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -770,11 +770,17 @@ GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGra return NotImplemented; } +/* I think graphics is ignored here */ GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, BOOL *res) { - FIXME("(%p, %p, %p): stub\n", region, graphics, res); + TRACE("(%p, %p, %p)\n", region, graphics, res); - return NotImplemented; + if(!region || !graphics || !res) + return InvalidParameter; + + *res = (region->node.type == RegionDataInfiniteRect); + + return Ok; } GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b0ed5c0..082ffe8 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -770,12 +770,16 @@ static void test_getclip(void) GpGraphics *graphics = NULL; HDC hdc = GetDC(0); GpRegion *clip; + GpRectF rect; BOOL res; status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - status = GdipCreateRegion(&clip); + rect.X = rect.Y = 0.0; + rect.Height = rect.Width = 100.0; + + status = GdipCreateRegionRect(&rect, &clip); /* NULL arguments */ status = GdipGetClip(NULL, NULL); @@ -789,7 +793,7 @@ static void test_getclip(void) status = GdipGetClip(graphics, clip); todo_wine expect(Ok, status); status = GdipIsInfiniteRegion(clip, graphics, &res); - todo_wine expect(Ok, status); + expect(Ok, status); todo_wine expect(TRUE, res); GdipDeleteRegion(clip); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 0b8ed41..b207f3f 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -463,6 +463,52 @@ static void test_getregiondata(void) expect(Ok, status); } +static void test_isinfinite(void) +{ + GpStatus status; + GpRegion *region; + GpGraphics *graphics = NULL; + GpMatrix *m; + HDC hdc = GetDC(0); + BOOL res; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + GdipCreateRegion(&region); + + GdipCreateMatrix2(3.0, 0.0, 0.0, 1.0, 20.0, 30.0, &m); + + /* NULL arguments */ + status = GdipIsInfiniteRegion(NULL, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsInfiniteRegion(region, NULL, NULL); + expect(InvalidParameter, status); + status = GdipIsInfiniteRegion(NULL, graphics, NULL); + expect(InvalidParameter, status); + status = GdipIsInfiniteRegion(NULL, NULL, &res); + expect(InvalidParameter, status); + status = GdipIsInfiniteRegion(region, NULL, &res); + expect(InvalidParameter, status); + + res = FALSE; + status = GdipIsInfiniteRegion(region, graphics, &res); + expect(Ok, status); + expect(TRUE, res); + + /* after world transform */ + status = GdipSetWorldTransform(graphics, m); + expect(Ok, status); + + res = FALSE; + status = GdipIsInfiniteRegion(region, graphics, &res); + expect(Ok, status); + expect(TRUE, res); + + GdipDeleteMatrix(m); + GdipDeleteRegion(region); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -476,6 +522,7 @@ START_TEST(region) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_getregiondata(); + test_isinfinite(); GdiplusShutdown(gdiplusToken);

1 0

Roy Shea : mstask: Implemented (Set|Get)Trigger.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 65d987146390f0c69e86743cb5c8f214e967087b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d987146390f0c69e86743cb… Author: Roy Shea <royshea(a)gmail.com> Date: Fri Aug 22 12:53:59 2008 -0700 mstask: Implemented (Set|Get)Trigger. --- dlls/mstask/Makefile.in | 2 +- dlls/mstask/mstask_private.h | 1 + dlls/mstask/task_trigger.c | 183 +++++++++++++++++++++++++++++++++++++- dlls/mstask/tests/task_trigger.c | 110 +++++++++++++---------- 4 files changed, 245 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65d987146390f0c69e867…

1 0

Vladimir Pankratov : shell32: Update Russian translation.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 722e1f9fce1901107284569c4a6b5ac18be01188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722e1f9fce1901107284569c4… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sun Aug 24 19:03:55 2008 +0000 shell32: Update Russian translation. --- dlls/shell32/shell32_Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 47dcd37..3bcfefd 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -119,7 +119,7 @@ CAPTION " FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "��", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -154,7 +154,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&��", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "�� &��", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&��", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 }

1 0

Nikolay Sivov : gdiplus: GdipDeleteGraphics affected by busy state too. Test added.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 960de09ed1ff66fee8a0c14fc3f9cff3b64bbcbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=960de09ed1ff66fee8a0c14fc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 26 01:58:33 2008 +0400 gdiplus: GdipDeleteGraphics affected by busy state too. Test added. --- dlls/gdiplus/graphics.c | 2 ++ dlls/gdiplus/tests/graphics.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bff1c86..ef2aff7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -889,6 +889,8 @@ GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) { if(!graphics) return InvalidParameter; + if(graphics->busy) return ObjectBusy; + if(graphics->hwnd) ReleaseDC(graphics->hwnd, graphics->hdc); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 90a416c..9770211 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -714,6 +714,9 @@ static void test_Get_Release_DC(void) status = GdipMultiplyWorldTransform(graphics, m, MatrixOrderPrepend); status = GdipGetClip(graphics, region); expect(ObjectBusy, status); status = Ok; + /* try to delete before release */ + status = GdipDeleteGraphics(graphics); + expect(ObjectBusy, status); status = GdipReleaseDC(graphics, retdc); expect(Ok, status);

1 0

Nikolay Sivov : gdiplus: Basic parameter check in GdipTransformPoints with tests.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: c61ece6752ab212c32bc1791a32c3061c79bcfc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61ece6752ab212c32bc1791a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Aug 26 01:58:42 2008 +0400 gdiplus: Basic parameter check in GdipTransformPoints with tests. --- dlls/gdiplus/graphics.c | 6 ++++++ dlls/gdiplus/tests/graphics.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ef2aff7..bf3a638 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2887,6 +2887,12 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpPointF *points, INT count) { + if(!graphics || !points || count <= 0) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + FIXME("(%p, %d, %d, %p, %d): stub\n", graphics, dst_space, src_space, points, count); return NotImplemented; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9770211..10f0e79 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -714,6 +714,8 @@ static void test_Get_Release_DC(void) status = GdipMultiplyWorldTransform(graphics, m, MatrixOrderPrepend); status = GdipGetClip(graphics, region); expect(ObjectBusy, status); status = Ok; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 5); + expect(ObjectBusy, status); status = Ok; /* try to delete before release */ status = GdipDeleteGraphics(graphics); expect(ObjectBusy, status); @@ -732,6 +734,36 @@ static void test_Get_Release_DC(void) ReleaseDC(0, hdc); } +static void test_transformpoints(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + GpPointF ptf[5]; + INT i; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + for(i = 0; i < 5; i++){ + ptf[i].X = 200.0 + i * 50.0 * (i % 2); + ptf[i].Y = 200.0 + i * 50.0 * !(i % 2); + } + + /* NULL arguments */ + status = GdipTransformPoints(NULL, CoordinateSpacePage, CoordinateSpaceWorld, NULL, 0); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, NULL, 0); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 0); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); + expect(InvalidParameter, status); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -752,6 +784,7 @@ START_TEST(graphics) test_GdipDrawLineI(); test_GdipDrawLinesI(); test_Get_Release_DC(); + test_transformpoints(); GdiplusShutdown(gdiplusToken); }

1 0

Roy Shea : mstask: Implemented CreateTrigger.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 7c5f411e7ae82dd1ff6569adbb2c4f9a76a58103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f411e7ae82dd1ff6569adb… Author: Roy Shea <royshea(a)gmail.com> Date: Fri Aug 22 12:52:46 2008 -0700 mstask: Implemented CreateTrigger. --- dlls/mstask/task.c | 4 ++-- dlls/mstask/tests/task.c | 2 +- dlls/mstask/tests/task_trigger.c | 17 +++++++---------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 47a9b9a..3815b19 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -94,8 +94,8 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger( WORD *piNewTrigger, ITaskTrigger **ppTrigger) { - FIXME("(%p, %p, %p): stub\n", iface, piNewTrigger, ppTrigger); - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", iface, piNewTrigger, ppTrigger); + return TaskTriggerConstructor((LPVOID *)ppTrigger); } static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 9e4dfe2..a5f2d0a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -218,7 +218,7 @@ static void test_CreateTrigger(void) } hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); - todo_wine ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); if (hres != S_OK) { cleanup_task(); diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 398494f..cbd652c 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -66,7 +66,7 @@ static void cleanup_trigger(void) static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) { - todo_wine ok(found_state.cbTriggerSize == expected_state.cbTriggerSize, + ok(found_state.cbTriggerSize == expected_state.cbTriggerSize, "cbTriggerSize: Found %d but expected %d\n", found_state.cbTriggerSize, expected_state.cbTriggerSize); @@ -162,7 +162,7 @@ static void test_SetTrigger_GetTrigger(void) SYSTEMTIME time; setup = setup_trigger(); - todo_wine ok(setup, "Failed to setup test_task\n"); + ok(setup, "Failed to setup test_task\n"); if (!setup) { skip("Failed to create task. Skipping tests.\n"); @@ -182,8 +182,7 @@ static void test_SetTrigger_GetTrigger(void) trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); todo_wine ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); - todo_wine ok(compare_trigger_state(trigger_state, empty_trigger_state), - "Invalid state\n"); + compare_trigger_state(trigger_state, empty_trigger_state); /* Test setting basic empty trigger */ hres = ITaskTrigger_SetTrigger(test_trigger, &empty_trigger_state); @@ -192,8 +191,7 @@ static void test_SetTrigger_GetTrigger(void) trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); todo_wine ok(hres == S_OK, "Failed to GetTrigger\n"); - todo_wine ok(compare_trigger_state(trigger_state, empty_trigger_state), - "Invalid state\n"); + compare_trigger_state(trigger_state, empty_trigger_state); /* Test setting basic non-empty trigger */ hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); @@ -202,8 +200,7 @@ static void test_SetTrigger_GetTrigger(void) trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); todo_wine ok(hres == S_OK, "Failed to GetTrigger\n"); - todo_wine ok(compare_trigger_state(trigger_state, normal_trigger_state), - "Invalid state\n"); + compare_trigger_state(trigger_state, normal_trigger_state); /* The following tests modify the normal_trigger_state structure * before each test, and return the normal_trigger_state structure @@ -331,10 +328,10 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - todo_wine ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf, + ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf, "Expected WeeksInterval set remain untouched: %d\n", trigger_state.Type.Weekly.WeeksInterval); - todo_wine ok(trigger_state.Type.Weekly.rgfDaysOfTheWeek == 0xcfcf, + ok(trigger_state.Type.Weekly.rgfDaysOfTheWeek == 0xcfcf, "Expected WeeksInterval set remain untouched: %d\n", trigger_state.Type.Weekly.rgfDaysOfTheWeek); normal_trigger_state.TriggerType = TASK_TIME_TRIGGER_DAILY;

1 0

Stefan Dösinger : winex11: Add a run-total fps counter to the fps debug channel.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 058ebe378926b910c72d18a76d66eeddbdd64624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058ebe378926b910c72d18a76… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 24 22:45:21 2008 -0500 winex11: Add a run-total fps counter to the fps debug channel. --- dlls/winex11.drv/opengl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a68591d..3f6d131 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3486,15 +3486,19 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) /* FPS support */ if (TRACE_ON(fps)) { - static long prev_time, frames; + static long prev_time, start_time; + static unsigned long frames, frames_total; DWORD time = GetTickCount(); frames++; + frames_total++; /* every 1.5 seconds */ if (time - prev_time > 1500) { - TRACE_(fps)("@ approx %.2ffps\n", 1000.0*frames/(time - prev_time)); + TRACE_(fps)("@ approx %.2ffps, total %.2ffps\n", + 1000.0*frames/(time - prev_time), 1000.0*frames_total/(time - start_time)); prev_time = time; frames = 0; + if(start_time == 0) start_time = time; } }

1 0

Luis C. Busquets Pérez : d3dx8: D3DXQuaternionRotationMatrix correct compare value for the trace.
by Alexandre Julliard 26 Aug '08

26 Aug '08

Module: wine Branch: master Commit: 21060b0762f95e1b986121026d1f5f9c368347f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21060b0762f95e1b986121026… Author: Luis C. Busquets Pérez <luiscar2001(a)yahoo.es> Date: Sun Aug 24 11:47:43 2008 +0200 d3dx8: D3DXQuaternionRotationMatrix correct compare value for the trace. --- dlls/d3dx8/math.c | 2 +- dlls/d3dx8/tests/math.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 958cb96..3bc171f 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -972,7 +972,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST FLOAT maxdiag, S, trace; trace = pm->u.m[0][0] + pm->u.m[1][1] + pm->u.m[2][2] + 1.0f; - if ( trace > 0.0f) + if ( trace > 1.0f) { pout->x = ( pm->u.m[1][2] - pm->u.m[2][1] ) / ( 2.0f * sqrt(trace) ); pout->y = ( pm->u.m[2][0] - pm->u.m[0][2] ) / ( 2.0f * sqrt(trace) ); diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index e69c6d2..6a4b44d 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -744,6 +744,106 @@ static void D3X8QuaternionTest(void) expectedquat.x = 0.651031f; expectedquat.y = 6.144103f; expectedquat.z = -0.203447f; expectedquat.w = 0.488273f; D3DXQuaternionRotationMatrix(&gotquat,&mat); expect_vec4(expectedquat,gotquat); + /* test the case when the trace is near 0 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = -0.9f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 1.709495f; expectedquat.y = 2.339872f; expectedquat.z = -0.534217f; expectedquat.w = 1.282122f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 0.49 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = -0.51f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 1.724923f; expectedquat.y = 2.318944f; expectedquat.z = -0.539039f; expectedquat.w = 1.293692f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 0.51 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = -0.49f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 1.725726f; expectedquat.y = 2.317865f; expectedquat.z = -0.539289f; expectedquat.w = 1.294294f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 0.99 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = -0.01f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 1.745328f; expectedquat.y = 2.291833f; expectedquat.z = -0.545415f; expectedquat.w = 1.308996f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 1.0 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = 0.0f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 1.745743f; expectedquat.y = 2.291288f; expectedquat.z = -0.545545f; expectedquat.w = 1.309307f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 1.01 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = 0.01f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 18.408188f; expectedquat.y = 5.970223f; expectedquat.z = -2.985111f; expectedquat.w = 0.502494f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 1.5 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = 0.5f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 15.105186f; expectedquat.y = 4.898980f; expectedquat.z = -2.449490f; expectedquat.w = 0.612372f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 1.7 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = 0.70f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 14.188852f; expectedquat.y = 4.601790f; expectedquat.z = -2.300895f; expectedquat.w = 0.651920f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 1.99 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = 0.99f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 13.114303f; expectedquat.y = 4.253287f; expectedquat.z = -2.126644f; expectedquat.w = 0.705337f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); + /* test the case when the trace is 2.0 in a matrix which is not a rotation */ + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = -10.0f; U(mat).m[1][1] = 10.0f; U(mat).m[2][2] = 2.0f; + U(mat).m[3][3] = 48.0f; + expectedquat.x = 10.680980f; expectedquat.y = 3.464102f; expectedquat.z = -1.732051f; expectedquat.w = 0.866025f; + D3DXQuaternionRotationMatrix(&gotquat,&mat); + expect_vec4(expectedquat,gotquat); /*_______________D3DXQuaternionRotationYawPitchRoll__________*/ expectedquat.x = 0.303261f; expectedquat.y = 0.262299f; expectedquat.z = 0.410073f; expectedquat.w = 0.819190f;

1 0