winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
839 discussions
Start a n
N
ew thread
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
0
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(®ion); + + 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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
Alexander Nicolaysen Sørnes : regedit: Use only SendMessageW in treeview.c.
by Alexandre Julliard
26 Aug '08
26 Aug '08
Module: wine Branch: master Commit: 5915b4970075e8ccbe87ddafae7f958bb1f732ce URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5915b4970075e8ccbe87ddafa…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 25 23:03:17 2008 +0200 regedit: Use only SendMessageW in treeview.c. --- programs/regedit/treeview.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 92c2af2..12dd87a 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -508,7 +508,7 @@ BOOL RefreshTreeView(HWND hwndTV) WINE_TRACE("\n"); hSelectedItem = TreeView_GetSelection(hwndTV); hcursorOld = SetCursor(LoadCursor(NULL, IDC_WAIT)); - SendMessage(hwndTV, WM_SETREDRAW, FALSE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, FALSE, 0); hItem = TreeView_GetChild(hwndTV, TreeView_GetRoot(hwndTV)); while (hItem) { @@ -516,12 +516,12 @@ BOOL RefreshTreeView(HWND hwndTV) hItem = TreeView_GetNextSibling(hwndTV, hItem); } - SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */ - SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem); + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem); return TRUE; } @@ -697,7 +697,7 @@ BOOL UpdateExpandingTree(HWND hwndTV, HTREEITEM hItem, int state) done: TreeView_SetItemState(hwndTV, hItem, TVIS_EXPANDEDONCE, TVIS_EXPANDEDONCE); - SendMessage(hwndTV, WM_SETREDRAW, TRUE, 0); + SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); SetCursor(hcursorOld); expanding = FALSE; HeapFree(GetProcessHeap(), 0, keyPath);
1
0
0
0
Alexander Nicolaysen Sørnes : regedit: Convert treeview init to Unicode.
by Alexandre Julliard
26 Aug '08
26 Aug '08
Module: wine Branch: master Commit: be43131b49eede447acdf95065e33ff9674d74d2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=be43131b49eede447acdf9506…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 25 23:00:35 2008 +0200 regedit: Convert treeview init to Unicode. --- programs/regedit/childwnd.c | 2 +- programs/regedit/main.h | 4 ++-- programs/regedit/treeview.c | 25 +++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 42fefca..76f354d 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -304,7 +304,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case WM_CREATE: g_pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); if (!g_pChildWnd) return 0; - LoadString(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); + LoadStringW(hInst, IDS_REGISTRY_ROOT_NAME, g_pChildWnd->szPath, MAX_PATH); g_pChildWnd->nSplitPos = 250; g_pChildWnd->hWnd = hWnd; g_pChildWnd->hTreeWnd = CreateTreeView(hWnd, g_pChildWnd->szPath, TREE_WINDOW); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 0398f57..55f2201 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -72,7 +72,7 @@ typedef struct { int nFocusPanel; /* 0: left 1: right */ int nSplitPos; WINDOWPLACEMENT pos; - TCHAR szPath[MAX_PATH]; + WCHAR szPath[MAX_PATH]; } ChildWnd; extern ChildWnd* g_pChildWnd; @@ -128,7 +128,7 @@ extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Res extern BOOL IsDefaultValue(HWND hwndLV, int i); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, UINT id); +extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index e3ea8b8..92c2af2 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -567,9 +567,9 @@ HWND StartKeyRename(HWND hwndTV) return TreeView_EditLabel(hwndTV, hItem); } -static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) +static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) { - TVINSERTSTRUCT tvins; + TVINSERTSTRUCTW tvins; HTREEITEM hRoot; static WCHAR hkcr[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}, hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}, @@ -581,7 +581,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ tvins.u.item.pszText = pHostName; - tvins.u.item.cchTextMax = lstrlen(pHostName); + tvins.u.item.cchTextMax = lstrlenW(pHostName); /* Assume the item is not a parent item, so give it an image. */ tvins.u.item.iImage = Image_Root; tvins.u.item.iSelectedImage = Image_Root; @@ -591,7 +591,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) tvins.hInsertAfter = (HTREEITEM)TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */ - if (!(hRoot = TreeView_InsertItem(hwndTV, &tvins))) return FALSE; + if (!(hRoot = TreeView_InsertItemW(hwndTV, &tvins))) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkcr, HKEY_CLASSES_ROOT, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkcu, HKEY_CURRENT_USER, 1)) return FALSE; @@ -601,8 +601,8 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; /* expand and select host name */ - SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); + SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); + SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } @@ -624,13 +624,13 @@ static BOOL InitTreeViewImageLists(HWND hwndTV) return FALSE; /* Add the open file, closed file, and document bitmaps. */ - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_OPEN_FILE)); + hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_OPEN_FILE)); Image_Open = ImageList_AddIcon(himl, hico); - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CLOSED_FILE)); + hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_CLOSED_FILE)); Image_Closed = ImageList_AddIcon(himl, hico); - hico = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ROOT)); + hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_ROOT)); Image_Root = ImageList_AddIcon(himl, hico); /* Fail if not all of the images were added. */ @@ -640,7 +640,7 @@ static BOOL InitTreeViewImageLists(HWND hwndTV) } /* Associate the image list with the tree view control. */ - SendMessage(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl); + SendMessageW(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl); return TRUE; } @@ -716,14 +716,15 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv) * Returns the handle to the new control if successful, or NULL otherwise. * hwndParent - handle to the control's parent window. */ -HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, UINT id) +HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id) { RECT rcClient; HWND hwndTV; + WCHAR TreeView[] = {'T','r','e','e',' ','V','i','e','w',0}; /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); - hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, _T("Tree View"), + hwndTV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, TreeView, WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)ULongToHandle(id), hInst, NULL);
1
0
0
0
← Newer
1
...
19
20
21
22
23
24
25
...
84
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
Results per page:
10
25
50
100
200