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

Maarten Lankhorst : quartz: Fix end of stream handling.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 43d0acd26a6f396a9f2e0d90a38f5156fb86b415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d0acd26a6f396a9f2e0d90a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 9 10:19:20 2008 -0700 quartz: Fix end of stream handling. Flushing blocks any end of stream that may occur. --- dlls/quartz/pin.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 9dedcb2..bb562ad 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -120,6 +120,11 @@ static HRESULT SendFurther( IPin *from, SendPinFunc fnMiddle, LPVOID arg, SendPi } IPin_Release( pin ); } + else + { + hr = S_OK; + break; + } } if (!foundend) @@ -622,12 +627,21 @@ static HRESULT deliver_endofstream(IPin* pin, LPVOID unused) HRESULT WINAPI InputPin_EndOfStream(IPin * iface) { + HRESULT hr = S_OK; InputPin *This = (InputPin *)iface; + TRACE("(%p)\n", This); - This->end_of_stream = 1; + EnterCriticalSection(This->pin.pCritSec); + if (This->flushing) + hr = S_FALSE; + else + This->end_of_stream = 1; + LeaveCriticalSection(This->pin.pCritSec); - return SendFurther( iface, deliver_endofstream, NULL, NULL ); + if (hr == S_OK) + hr = SendFurther( iface, deliver_endofstream, NULL, NULL ); + return hr; } static HRESULT deliver_beginflush(IPin* pin, LPVOID unused) @@ -665,7 +679,7 @@ HRESULT WINAPI InputPin_EndFlush(IPin * iface) TRACE("(%p)\n", This); EnterCriticalSection(This->pin.pCritSec); - This->flushing = 0; + This->flushing = This->end_of_stream = 0; hr = SendFurther( iface, deliver_endflush, NULL, NULL ); LeaveCriticalSection(This->pin.pCritSec); @@ -1774,7 +1788,7 @@ HRESULT WINAPI PullPin_EndFlush(IPin * iface) FILTER_STATE state; IBaseFilter_GetState(This->pin.pinInfo.pFilter, INFINITE, &state); - if (This->stop_playback && state != State_Stopped) + if (state != State_Stopped) PullPin_StartProcessing(This); PullPin_WaitForStateChange(This, INFINITE);

1 0

Jacek Caban : shlwapi: Fixed UrlCanonicalizeW for URLs without slashes after scheme.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: a4ea1c608a198069147a10dae8ad40d2b0e25a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ea1c608a198069147a10dae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 9 20:01:57 2008 +0200 shlwapi: Fixed UrlCanonicalizeW for URLs without slashes after scheme. --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3b0633a..4eb581f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -103,6 +103,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"res:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "res:///c:\\tests\\foo bar", TRUE}, {"A", 0, S_OK, "A", FALSE}, {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", TRUE} /*LimeWire online installer calls this*/, + {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"}, {"", 0, S_OK, "", FALSE} }; diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2efe386..00d319d 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -384,7 +384,6 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, if (*wk1++ == ':') state = 2; break; case 2: - if (*wk1 != '/') {state = 3; break;} *wk2++ = *wk1++; if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++;

1 0

Jacek Caban : shlwapi: Fixed handling mk protocol URLs in UrlCombineW.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: c086429465cbe9387349ef6835dfa4ac1b33e654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c086429465cbe9387349ef683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 9 20:02:23 2008 +0200 shlwapi: Fixed handling mk protocol URLs in UrlCombineW. --- dlls/shlwapi/tests/url.c | 2 ++ dlls/shlwapi/url.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 4eb581f..ede4d7c 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -234,6 +234,8 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"foo:today", "bar:calendar", 0, S_OK, "bar:calendar"}, {"foo:/today", "foo:calendar", 0, S_OK, "foo:/calendar"}, {"foo:/today/", "foo:calendar", 0, S_OK, "foo:/today/calendar"}, + {"mk:@MSITStore:dir/test.chm::dir/index.html", "image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"}, + {"mk:@MSITStore:dir/test.chm::dir/dir2/index.html", "../image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"} }; /* ################ */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 00d319d..03941a9 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -659,29 +659,29 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, base.pszSuffix += delta; base.cchSuffix -= delta; } - } - - /* get size of location field (if it exists) */ - work = (LPWSTR)base.pszSuffix; - sizeloc = 0; - if (*work++ == '/') { + }else { + /* get size of location field (if it exists) */ + work = (LPWSTR)base.pszSuffix; + sizeloc = 0; if (*work++ == '/') { - /* At this point have start of location and - * it ends at next '/' or end of string. - */ - while(*work && (*work != '/')) work++; - sizeloc = (DWORD)(work - base.pszSuffix); - } - } + if (*work++ == '/') { + /* At this point have start of location and + * it ends at next '/' or end of string. + */ + while(*work && (*work != '/')) work++; + sizeloc = (DWORD)(work - base.pszSuffix); + } + } + } - /* Change .sizep2 to not have the last leaf in it, - * Note: we need to start after the location (if it exists) - */ + /* Change .sizep2 to not have the last leaf in it, + * Note: we need to start after the location (if it exists) + */ work = strrchrW((base.pszSuffix+sizeloc), '/'); - if (work) { - len = (DWORD)(work - base.pszSuffix + 1); - base.cchSuffix = len; - } + if (work) { + len = (DWORD)(work - base.pszSuffix + 1); + base.cchSuffix = len; + } /* * At this point: @@ -723,7 +723,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, process_case = 4; break; } - process_case = (*base.pszSuffix == '/') ? 5 : 3; + process_case = (*base.pszSuffix == '/' || base.nScheme == URL_SCHEME_MK) ? 5 : 3; break; }

1 0

Huw Davies : gdiplus: Add some tests for regions with paths and update a comment.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 1c8271d27aca7956affc6ee4bdb8d943c0a4ecf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8271d27aca7956affc6ee4b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 12:31:09 2008 +0100 gdiplus: Add some tests for regions with paths and update a comment. --- dlls/gdiplus/region.c | 34 ++++++++++------- dlls/gdiplus/tests/region.c | 81 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 3d95723..fc53c86 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -32,8 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); /********************************************************** * - * Data returned by GdipGetRegionData (for rectangle based regions) - * looks something like this: + * Data returned by GdipGetRegionData looks something like this: * * struct region_data_header * { @@ -43,7 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * DWORD num_ops; number of combining ops * 2 * }; * - * Then follows a sequence of combining ops and RECTFs. + * Then follows a sequence of combining ops and region elements. + * + * A region element is either a RECTF or some path data. * * Combining ops are just stored as their CombineMode value. * @@ -51,19 +52,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); * stored as 0x10000002 (with no following RECTF) and an infinite rect * is stored as 0x10000003 (again with no following RECTF). * - * The combining ops are stored in the reverse order to the RECTFs and in the - * reverse order to which the region was constructed. + * Path data is preceded by the DWORD 0x10000001. Then follows a + * DWORD size and then size bytes of data. + * + * The combining ops are stored in the reverse order to the region + * elements and in the reverse order to which the region was + * constructed. * - * When two or more complex regions (ie those with more than one rect) - * are combined, the combining op for the two regions comes first, - * then the combining ops for the rects in region 1, followed by the - * rects for region 1, then follows the combining ops for region 2 and - * finally region 2's rects. Presumably you're supposed to use the - * 0x10000000 rect header to find the end of the op list (the count of - * the rects in each region is not stored). + * When two or more complex regions (ie those with more than one + * element) are combined, the combining op for the two regions comes + * first, then the combining ops for the region elements in region 1, + * followed by the region elements for region 1, then follows the + * combining ops for region 2 and finally region 2's region elements. + * Presumably you're supposed to use the 0x1000000x header to find the + * end of the op list (the count of the elements in each region is not + * stored). * - * When a simple region (1 rect) is combined, it's treated as if a single rect - * is being combined. + * When a simple region (1 element) is combined, it's treated as if a + * single rect/path is being combined. * */ diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 166df2d..dfdba26 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -34,13 +34,14 @@ static inline void expect_float(DWORD *value, FLOAT expected) ok(valuef == expected, "expected %f got %f\n", expected, valuef); } -static void test_create_rgn(void) +static void test_getregiondata(void) { GpStatus status; GpRegion *region, *region2; UINT needed; DWORD buf[100]; GpRect rect; + GpPath *path; status = GdipCreateRegion(&region); todo_wine @@ -201,6 +202,82 @@ todo_wine status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); + /* Try some paths */ + + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + GdipAddPathRectangle(path, 12.5, 13.0, 14.0, 15.0); + + status = GdipCreateRegionPath(path, &region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 72, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 72, "got %d\n", needed); + expect_dword(buf, 64); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, 0x10000001); + expect_dword(buf + 5, 0x00000030); + expect_dword(buf + 6, 0xdbc01001); + expect_dword(buf + 7, 0x00000004); + expect_dword(buf + 8, 0x00000000); + expect_float(buf + 9, 12.5); + expect_float(buf + 10, 13.0); + expect_float(buf + 11, 26.5); + expect_float(buf + 12, 13.0); + expect_float(buf + 13, 26.5); + expect_float(buf + 14, 28.0); + expect_float(buf + 15, 12.5); + expect_float(buf + 16, 28.0); + expect_dword(buf + 17, 0x81010100); + + + rect.X = 50; + rect.Y = 30; + rect.Width = 10; + rect.Height = 20; + status = GdipCombineRegionRectI(region, &rect, CombineModeIntersect); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 96, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + ok(needed == 96, "got %d\n", needed); + expect_dword(buf, 88); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 3, 2); + expect_dword(buf + 4, CombineModeIntersect); + expect_dword(buf + 5, 0x10000001); + expect_dword(buf + 6, 0x00000030); + expect_dword(buf + 7, 0xdbc01001); + expect_dword(buf + 8, 0x00000004); + expect_dword(buf + 9, 0x00000000); + expect_float(buf + 10, 12.5); + expect_float(buf + 11, 13.0); + expect_float(buf + 12, 26.5); + expect_float(buf + 13, 13.0); + expect_float(buf + 14, 26.5); + expect_float(buf + 15, 28.0); + expect_float(buf + 16, 12.5); + expect_float(buf + 17, 28.0); + expect_dword(buf + 18, 0x81010100); + expect_dword(buf + 19, 0x10000000); + expect_float(buf + 20, 50.0); + expect_float(buf + 21, 30.0); + expect_float(buf + 22, 10.0); + expect_float(buf + 23, 20.0); + + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + status = GdipDeletePath(path); + ok(status == Ok, "status %08x\n", status); + } START_TEST(region) @@ -215,7 +292,7 @@ START_TEST(region) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - test_create_rgn(); + test_getregiondata(); GdiplusShutdown(gdiplusToken);

1 0

Huw Davies : gdiplus: Add some defines for the magic values.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 140d4edb5b5c11a3c4e190e82968bde91427ad74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140d4edb5b5c11a3c4e190e82… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 12:40:42 2008 +0100 gdiplus: Add some defines for the magic values. --- dlls/gdiplus/tests/region.c | 51 ++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index dfdba26..699d565 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -23,6 +23,13 @@ #include "wingdi.h" #include "wine/test.h" +#define RGNDATA_RECT 0x10000000 +#define RGNDATA_PATH 0x10000001 +#define RGNDATA_EMPTY_RECT 0x10000002 +#define RGNDATA_INFINITE_RECT 0x10000003 + +#define RGNDATA_MAGIC 0xdbc01001 + static inline void expect_dword(DWORD *value, DWORD expected) { ok(*value == expected, "expected %08x got %08x\n", expected, *value); @@ -57,9 +64,9 @@ todo_wine ok(needed == 20, "got %d\n", needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 0); - expect_dword(buf + 4, 0x10000003); + expect_dword(buf + 4, RGNDATA_INFINITE_RECT); status = GdipSetEmpty(region); ok(status == Ok, "status %08x\n", status); @@ -71,9 +78,9 @@ todo_wine ok(needed == 20, "got %d\n", needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 0); - expect_dword(buf + 4, 0x10000002); + expect_dword(buf + 4, RGNDATA_EMPTY_RECT); status = GdipSetInfinite(region); ok(status == Ok, "status %08x\n", status); @@ -85,9 +92,9 @@ todo_wine ok(needed == 20, "got %d\n", needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 0); - expect_dword(buf + 4, 0x10000003); + expect_dword(buf + 4, RGNDATA_INFINITE_RECT); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); @@ -106,9 +113,9 @@ todo_wine ok(needed == 36, "got %d\n", needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 0); - expect_dword(buf + 4, 0x10000000); + expect_dword(buf + 4, RGNDATA_RECT); expect_float(buf + 5, 10.0); expect_float(buf + 6, 20.0); expect_float(buf + 7, 100.0); @@ -158,39 +165,39 @@ todo_wine ok(needed == 156, "got %d\n", needed); expect_dword(buf, 148); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 10); expect_dword(buf + 4, CombineModeExclude); expect_dword(buf + 5, CombineModeComplement); expect_dword(buf + 6, CombineModeXor); expect_dword(buf + 7, CombineModeIntersect); - expect_dword(buf + 8, 0x10000000); + expect_dword(buf + 8, RGNDATA_RECT); expect_float(buf + 9, 10.0); expect_float(buf + 10, 20.0); expect_float(buf + 11, 100.0); expect_float(buf + 12, 200.0); - expect_dword(buf + 13, 0x10000000); + expect_dword(buf + 13, RGNDATA_RECT); expect_float(buf + 14, 50.0); expect_float(buf + 15, 30.0); expect_float(buf + 16, 10.0); expect_float(buf + 17, 20.0); - expect_dword(buf + 18, 0x10000000); + expect_dword(buf + 18, RGNDATA_RECT); expect_float(buf + 19, 100.0); expect_float(buf + 20, 300.0); expect_float(buf + 21, 30.0); expect_float(buf + 22, 50.0); expect_dword(buf + 23, CombineModeUnion); - expect_dword(buf + 24, 0x10000000); + expect_dword(buf + 24, RGNDATA_RECT); expect_float(buf + 25, 200.0); expect_float(buf + 26, 100.0); expect_float(buf + 27, 133.0); expect_float(buf + 28, 266.0); - expect_dword(buf + 29, 0x10000000); + expect_dword(buf + 29, RGNDATA_RECT); expect_float(buf + 30, 20.0); expect_float(buf + 31, 10.0); expect_float(buf + 32, 40.0); expect_float(buf + 33, 66.0); - expect_dword(buf + 34, 0x10000000); + expect_dword(buf + 34, RGNDATA_RECT); expect_float(buf + 35, 400.0); expect_float(buf + 36, 500.0); expect_float(buf + 37, 22.0); @@ -218,11 +225,11 @@ todo_wine ok(needed == 72, "got %d\n", needed); expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 0); - expect_dword(buf + 4, 0x10000001); + expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 0x00000030); - expect_dword(buf + 6, 0xdbc01001); + expect_dword(buf + 6, RGNDATA_MAGIC); expect_dword(buf + 7, 0x00000004); expect_dword(buf + 8, 0x00000000); expect_float(buf + 9, 12.5); @@ -250,12 +257,12 @@ todo_wine ok(needed == 96, "got %d\n", needed); expect_dword(buf, 88); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, 0xdbc01001); + expect_dword(buf + 2, RGNDATA_MAGIC); expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeIntersect); - expect_dword(buf + 5, 0x10000001); + expect_dword(buf + 5, RGNDATA_PATH); expect_dword(buf + 6, 0x00000030); - expect_dword(buf + 7, 0xdbc01001); + expect_dword(buf + 7, RGNDATA_MAGIC); expect_dword(buf + 8, 0x00000004); expect_dword(buf + 9, 0x00000000); expect_float(buf + 10, 12.5); @@ -267,7 +274,7 @@ todo_wine expect_float(buf + 16, 12.5); expect_float(buf + 17, 28.0); expect_dword(buf + 18, 0x81010100); - expect_dword(buf + 19, 0x10000000); + expect_dword(buf + 19, RGNDATA_RECT); expect_float(buf + 20, 50.0); expect_float(buf + 21, 30.0); expect_float(buf + 22, 10.0);

1 0

Dylan Smith : richedit: Prevented cursor flicker while moving over selection bar.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: d293b3fc98b105122366cdf956fd1278dc2bca17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d293b3fc98b105122366cdf95… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 9 09:36:00 2008 -0400 richedit: Prevented cursor flicker while moving over selection bar. When the cursor is moved over the selection bar, without holding any mouse buttons down, the cursor would be repeatably set between the normal cursor, set by DefWindowProc for the WM_SETCURSOR message, and the reversed cursor, set by ME_MouseMove. --- dlls/riched20/editor.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 35e4be1..b988372 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1666,10 +1666,15 @@ static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, return clickNum; } -static BOOL ME_SetCursor(ME_TextEditor *editor, int x) +static BOOL ME_SetCursor(ME_TextEditor *editor) { + POINT pt; + DWORD messagePos = GetMessagePos(); + pt.x = (short)LOWORD(messagePos); + pt.y = (short)HIWORD(messagePos); + ScreenToClient(editor->hWnd, &pt); if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && - (x < editor->selofs || + (pt.x < editor->selofs || (editor->nSelectionType == stLine && GetCapture() == editor->hWnd))) { SetCursor(hLeft); @@ -3033,6 +3038,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_DestroyEditor(editor); SetWindowLongPtrW(hWnd, 0, 0); return 0; + case WM_SETCURSOR: + { + if (!ME_SetCursor(editor)) goto do_default; + return TRUE; + } case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: { @@ -3045,7 +3055,6 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_CalculateClickCount(hWnd, msg, wParam, lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); - if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; } case WM_MOUSEMOVE: @@ -3055,7 +3064,6 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); - if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; case WM_LBUTTONUP: if (GetCapture() == hWnd) @@ -3068,7 +3076,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, else { BOOL ret; - ret = ME_SetCursor(editor, LOWORD(lParam)); + ret = ME_SetCursor(editor); ME_LinkNotify(editor,msg,wParam,lParam); if (!ret) goto do_default; }

1 0

Dylan Smith : richedit: Added more conditional cursor changes.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 7de6c2674a8a82d1169afbb1ceef5b5c0fc85780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de6c2674a8a82d1169afbb1c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 9 09:36:12 2008 -0400 richedit: Added more conditional cursor changes. Previously the cursor was either an IBEAM, or a reversed arrow when over the selectionbar. --- dlls/riched20/caret.c | 38 ++++++++++++++++++++++++++++++----- dlls/riched20/editor.c | 51 +++++++++++++++++++++++++++++++++++++++-------- dlls/riched20/editor.h | 2 +- 3 files changed, 75 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 08e9036..da83c9d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -814,11 +814,21 @@ int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor) + pCursor->pRun->member.run.nCharOfs + pCursor->nOffset; } -static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) +/* Finds the run and offset from the pixel position. + * + * x & y are pixel positions in virtual coordinates into the rich edit control, + * so client coordinates must first be adjusted by the scroll position. + * + * returns TRUE if the result was exactly under the cursor, otherwise returns + * FALSE, and result is set to the closest position to the coordinates. + */ +static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, + ME_Cursor *result, BOOL *is_eol) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; ME_DisplayItem *last = NULL; int rx = 0; + BOOL isExact = TRUE; if (is_eol) *is_eol = 0; @@ -857,6 +867,7 @@ static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *resu /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to * determine the offset closest to the pixel position. */ + isExact = FALSE; p = ME_FindItemBack(p, diStartRow); if (p != NULL){ p = ME_FindItemFwd(p, diRun); @@ -885,16 +896,18 @@ static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *resu result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); result->nOffset = 0; } - return; + return isExact; } break; case diStartRow: + isExact = FALSE; p = ME_FindItemFwd(p, diRun); if (is_eol) *is_eol = 1; rx = 0; /* FIXME not sure */ goto found_here; case diParagraph: case diTextEnd: + isExact = FALSE; rx = 0; /* FIXME not sure */ p = last; goto found_here; @@ -905,24 +918,37 @@ static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *resu result->pRun = ME_FindItemBack(p, diRun); result->nOffset = 0; assert(result->pRun->member.run.nFlags & MERF_ENDPARA); + return FALSE; } -int -ME_CharFromPos(ME_TextEditor *editor, int x, int y) +/* Returns the character offset closest to the pixel position + * + * x & y are pixel positions in client coordinates. + * + * isExact will be set to TRUE if the run is directly under the pixel + * position, FALSE if it not, unless isExact is set to NULL. + */ +int ME_CharFromPos(ME_TextEditor *editor, int x, int y, BOOL *isExact) { ME_Cursor cursor; RECT rc; + BOOL bResult; GetClientRect(editor->hWnd, &rc); - if (x < 0 || y < 0 || x >= rc.right || y >= rc.bottom) + if (x < 0 || y < 0 || x >= rc.right || y >= rc.bottom) { + if (isExact) *isExact = FALSE; return -1; + } y += ME_GetYScrollPos(editor); - ME_FindPixelPos(editor, x, y, &cursor, NULL); + bResult = ME_FindPixelPos(editor, x, y, &cursor, NULL); + if (isExact) *isExact = bResult; return (ME_GetParagraph(cursor.pRun)->member.para.nCharOfs + cursor.pRun->member.run.nCharOfs + cursor.nOffset); } + + /* Extends the selection with a word, line, or paragraph selection type. * * The selection is anchored by editor->pCursors[2-3] such that the text diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b988372..2dd758a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1669,6 +1669,8 @@ static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, static BOOL ME_SetCursor(ME_TextEditor *editor) { POINT pt; + BOOL isExact; + int offset; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos); @@ -1680,7 +1682,35 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) SetCursor(hLeft); return TRUE; } - return FALSE; + offset = ME_CharFromPos(editor, pt.x, pt.y, &isExact); + if (isExact) + { + if (editor->AutoURLDetect_bEnable) + { + ME_Cursor cursor; + ME_Run *run; + ME_CursorFromCharOfs(editor, offset, &cursor); + run = &cursor.pRun->member.run; + if (editor->AutoURLDetect_bEnable && + run->style->fmt.dwMask & CFM_LINK && + run->style->fmt.dwEffects & CFE_LINK) + { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_HAND)); + return TRUE; + } + } + if (ME_IsSelection(editor)) + { + int selStart, selEnd; + ME_GetSelection(editor, &selStart, &selEnd); + if (selStart <= offset && selEnd >= offset) { + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + return TRUE; + } + } + } + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_IBEAM)); + return TRUE; } static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) @@ -2986,7 +3016,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case EM_SETZOOM: return ME_SetZoom(editor, wParam, lParam); case EM_CHARFROMPOS: - return ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y); + return ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y, NULL); case EM_POSFROMCHAR: { ME_DisplayItem *pRun; @@ -3040,8 +3070,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return 0; case WM_SETCURSOR: { - if (!ME_SetCursor(editor)) goto do_default; - return TRUE; + return ME_SetCursor(editor); } case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: @@ -3055,6 +3084,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_CalculateClickCount(hWnd, msg, wParam, lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); + if (!ME_SetCursor(editor)) goto do_default; break; } case WM_MOUSEMOVE: @@ -3064,6 +3094,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); + /* Set cursor if mouse is captured, since WM_SETCURSOR won't be received. */ + if (GetCapture() == hWnd) + ME_SetCursor(editor); break; case WM_LBUTTONUP: if (GetCapture() == hWnd) @@ -3075,10 +3108,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return 0; else { - BOOL ret; - ret = ME_SetCursor(editor); + ME_SetCursor(editor); ME_LinkNotify(editor,msg,wParam,lParam); - if (!ret) goto do_default; } break; case WM_RBUTTONUP: @@ -3202,6 +3233,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); ME_CommitCoalescingUndo(editor); + SetCursor(NULL); } if (editor->AutoURLDetect_bEnable) ME_UpdateSelectionLinkAttribute(editor); @@ -3504,6 +3536,7 @@ void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam { int x,y; ME_Cursor tmpCursor; + BOOL isExact; int nCharOfs; /* The start of the clicked text. Absolute character offset */ ME_Run *tmpRun; @@ -3511,8 +3544,8 @@ void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam ENLINK info; x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); - nCharOfs = ME_CharFromPos(editor, x, y); - if (nCharOfs < 0) return; + nCharOfs = ME_CharFromPos(editor, x, y, &isExact); + if (!isExact) return; ME_CursorFromCharOfs(editor, nCharOfs, &tmpCursor); tmpRun = &tmpCursor.pRun->member.run; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 786191a..6e07331 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -180,7 +180,7 @@ void ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed); void ME_MoveCaret(ME_TextEditor *ed); -int ME_CharFromPos(ME_TextEditor *editor, int x, int y); +int ME_CharFromPos(ME_TextEditor *editor, int x, int y, BOOL *isExact); void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum); void ME_MouseMove(ME_TextEditor *editor, int x, int y); void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars);

1 0

H. Verbeet : wined3d: Destroy depth_blt resources in the backend' s destructor.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 54ae3ebfd4bc6fab1e322b92fe84909535f9f26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ae3ebfd4bc6fab1e322b92f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jul 9 17:59:39 2008 +0200 wined3d: Destroy depth_blt resources in the backend's destructor. No need to expose this in the interface. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++---------------- dlls/wined3d/ati_fragment_shader.c | 5 ----- dlls/wined3d/baseshader.c | 2 -- dlls/wined3d/device.c | 2 -- dlls/wined3d/glsl_shader.c | 21 +++++++++------------ dlls/wined3d/wined3d_private.h | 1 - 6 files changed, 19 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 12d6a5b..a62aed7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1819,21 +1819,6 @@ static void shader_arb_select_depth_blt(IWineD3DDevice *iface) { glEnable(GL_FRAGMENT_PROGRAM_ARB); } -static void shader_arb_destroy_depth_blt(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; - WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - - if(priv->depth_blt_vprogram_id) { - GL_EXTCALL(glDeleteProgramsARB(1, &priv->depth_blt_vprogram_id)); - priv->depth_blt_vprogram_id = 0; - } - if(priv->depth_blt_fprogram_id) { - GL_EXTCALL(glDeleteProgramsARB(1, &priv->depth_blt_fprogram_id)); - priv->depth_blt_fprogram_id = 0; - } -} - static void shader_arb_cleanup(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; @@ -1861,6 +1846,16 @@ static HRESULT shader_arb_alloc(IWineD3DDevice *iface) { static void shader_arb_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + struct shader_arb_priv *priv = (struct shader_arb_priv *) This->shader_priv; + + if(priv->depth_blt_vprogram_id) { + GL_EXTCALL(glDeleteProgramsARB(1, &priv->depth_blt_vprogram_id)); + } + if(priv->depth_blt_fprogram_id) { + GL_EXTCALL(glDeleteProgramsARB(1, &priv->depth_blt_fprogram_id)); + } + HeapFree(GetProcessHeap(), 0, This->shader_priv); } @@ -2097,7 +2092,6 @@ static void shader_arb_fragment_enable(IWineD3DDevice *iface, BOOL enable) { const shader_backend_t arb_program_shader_backend = { shader_arb_select, shader_arb_select_depth_blt, - shader_arb_destroy_depth_blt, shader_arb_load_constants, shader_arb_cleanup, shader_arb_color_correction, diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index ebbb0c6..0c34474 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -976,10 +976,6 @@ static void shader_atifs_select_depth_blt(IWineD3DDevice *iface) { arb_program_shader_backend.shader_select_depth_blt(iface); } -static void shader_atifs_destroy_depth_blt(IWineD3DDevice *iface) { - arb_program_shader_backend.shader_destroy_depth_blt(iface); -} - static void shader_atifs_load_constants(IWineD3DDevice *iface, char usePS, char useVS) { arb_program_shader_backend.shader_load_constants(iface, usePS, useVS); } @@ -1111,7 +1107,6 @@ static void shader_atifs_fragment_enable(IWineD3DDevice *iface, BOOL enable) { const shader_backend_t atifs_shader_backend = { shader_atifs_select, shader_atifs_select_depth_blt, - shader_atifs_destroy_depth_blt, shader_atifs_load_constants, shader_atifs_cleanup, shader_atifs_color_correction, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 11d807f..a8806d3 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1091,7 +1091,6 @@ void shader_trace_init( static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} -static void shader_none_destroy_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_cleanup(IWineD3DDevice *iface) {} static void shader_none_color_correction(SHADER_OPCODE_ARG* arg) {} @@ -1202,7 +1201,6 @@ static void shader_none_fragment_enable(IWineD3DDevice *iface, BOOL enable) { const shader_backend_t none_shader_backend = { shader_none_select, shader_none_select_depth_blt, - shader_none_destroy_depth_blt, shader_none_load_constants, shader_none_cleanup, shader_none_color_correction, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3f94a3f..d25e1bc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2283,7 +2283,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0; } - This->shader_backend->shader_destroy_depth_blt(iface); This->shader_backend->shader_free_private(iface); /* Release the update stateblock */ @@ -7218,7 +7217,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0; } - This->shader_backend->shader_destroy_depth_blt(iface); This->shader_backend->shader_free_private(iface); for (i = 0; i < GL_LIMITS(textures); i++) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 070aecb..1ff7e11 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3398,17 +3398,6 @@ static void shader_glsl_select_depth_blt(IWineD3DDevice *iface) { GL_EXTCALL(glUniform1iARB(loc, 0)); } -static void shader_glsl_destroy_depth_blt(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - struct shader_glsl_priv *priv = (struct shader_glsl_priv *) This->shader_priv; - WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - - if(priv->depth_blt_glsl_program_id) { - GL_EXTCALL(glDeleteObjectARB(priv->depth_blt_glsl_program_id)); - priv->depth_blt_glsl_program_id = 0; - } -} - static void shader_glsl_cleanup(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; @@ -3483,6 +3472,15 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { static void shader_glsl_free(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; + + if(priv->depth_blt_glsl_program_id) { + GL_EXTCALL(glDeleteObjectARB(priv->depth_blt_glsl_program_id)); + } + + hash_table_destroy(priv->glsl_program_lookup); + HeapFree(GetProcessHeap(), 0, This->shader_priv); This->shader_priv = NULL; } @@ -3697,7 +3695,6 @@ static void shader_glsl_fragment_enable(IWineD3DDevice *iface, BOOL enable) { const shader_backend_t glsl_shader_backend = { shader_glsl_select, shader_glsl_select_depth_blt, - shader_glsl_destroy_depth_blt, shader_glsl_load_constants, shader_glsl_cleanup, shader_glsl_color_correction, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb019c7..808d9bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -289,7 +289,6 @@ struct shader_caps { typedef struct { void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(IWineD3DDevice *iface); - void (*shader_destroy_depth_blt)(IWineD3DDevice *iface); void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_cleanup)(IWineD3DDevice *iface); void (*shader_color_correction)(struct SHADER_OPCODE_ARG *arg);

1 0

Vincent Povirk : comctl32: Disable owner of modal property sheets before creating the dialog.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 2893294f4b80ea363b75bfb9d784e7201fc0eb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2893294f4b80ea363b75bfb9d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 8 16:43:03 2008 -0500 comctl32: Disable owner of modal property sheets before creating the dialog. --- dlls/comctl32/propsheet.c | 8 ++++++-- dlls/comctl32/tests/propsheet.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 84b1b7f..f33bd54 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2784,17 +2784,21 @@ static INT do_loop(const PropSheetInfo *psInfo) static INT_PTR PROPSHEET_PropertySheet(PropSheetInfo* psInfo, BOOL unicode) { INT_PTR bRet = 0; + HWND parent = NULL; if (psInfo->active_page >= psInfo->nPages) psInfo->active_page = 0; TRACE("startpage: %d of %d pages\n", psInfo->active_page, psInfo->nPages); psInfo->unicode = unicode; psInfo->ended = FALSE; - bRet = PROPSHEET_CreateDialog(psInfo); if(!psInfo->isModeless) { - HWND parent = GetParent(psInfo->hwnd); + parent = psInfo->ppshheader.hwndParent; if (parent) EnableWindow(parent, FALSE); + } + bRet = PROPSHEET_CreateDialog(psInfo); + if(!psInfo->isModeless) + { bRet = do_loop(psInfo); if (parent) EnableWindow(parent, TRUE); } diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index f73bca3..45c8d97 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -140,7 +140,7 @@ static int CALLBACK disableowner_callback(HWND hwnd, UINT msg, LPARAM lparam) { case PSCB_INITIALIZED: { - todo_wine ok(IsWindowEnabled(parent) == 0, "parent window should be disabled\n"); + ok(IsWindowEnabled(parent) == 0, "parent window should be disabled\n"); PostQuitMessage(0); return FALSE; }

1 0

Vincent Povirk : comctl32: Add test for disabling owner of modal property sheets.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 57b25bcf48d33cbd98b00ce79507280330c86ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b25bcf48d33cbd98b00ce79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 8 13:52:57 2008 -0500 comctl32: Add test for disabling owner of modal property sheets. --- dlls/comctl32/tests/propsheet.c | 68 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 8627351..f73bca3 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -22,6 +22,8 @@ #include "wine/test.h" +static HWND parent; + static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) @@ -132,8 +134,74 @@ static void test_nopage(void) DestroyWindow(hdlg); } +static int CALLBACK disableowner_callback(HWND hwnd, UINT msg, LPARAM lparam) +{ + switch(msg) + { + case PSCB_INITIALIZED: + { + todo_wine ok(IsWindowEnabled(parent) == 0, "parent window should be disabled\n"); + PostQuitMessage(0); + return FALSE; + } + } + return FALSE; +} + +static void register_parent_wnd_class(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "parent class"; + RegisterClassA(&cls); +} + +static void test_disableowner(void) +{ + HPROPSHEETPAGE hpsp[1]; + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + + register_parent_wnd_class(); + parent = CreateWindowA("parent class", "", WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 100, 100, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), 0); + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = 0; + psp.hInstance = GetModuleHandleW(NULL); + U(psp).pszTemplate = "prop_page1"; + U2(psp).pszIcon = NULL; + psp.pfnDlgProc = NULL; + psp.lParam = 0; + + hpsp[0] = CreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = parent; + U3(psh).phpage = hpsp; + psh.pfnCallback = disableowner_callback; + + PropertySheetA(&psh); + ok(IsWindowEnabled(parent) != 0, "parent window should be enabled\n"); + DestroyWindow(parent); +} + START_TEST(propsheet) { test_title(); test_nopage(); + test_disableowner(); }

1 0