November 2008 - Wine-Commits

Henri Verbeet : wined3d: Use IDL to generate wined3d.h.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: a6917b143d4d5be0809c162f2adc3e4eb17adfc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6917b143d4d5be0809c162f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 11:57:39 2008 +0100 wined3d: Use IDL to generate wined3d.h. --- .gitignore | 1 + dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/ddraw/clipper.c | 2 + dlls/ddraw/ddraw_private.h | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/Makefile.in | 13 +- include/wine/wined3d.idl | 3429 ++++++++++++++++++++++++++++++++++++++ include/wine/wined3d_caps.h | 590 ------- include/wine/wined3d_interface.h | 1634 ------------------ include/wine/wined3d_types.h | 1480 ---------------- tools/make_makefiles | 25 +- 13 files changed, 3463 insertions(+), 3723 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6917b143d4d5be0809c1…

1 0

Vincent Povirk : gdiplus: Implement GdipGetRegionHRgn for rects.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 5e77c74f37f38f69c86b19a7259c3d8aef5c7d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e77c74f37f38f69c86b19a72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 24 16:06:32 2008 -0600 gdiplus: Implement GdipGetRegionHRgn for rects. --- dlls/gdiplus/region.c | 18 ++++++++++++++++++ dlls/gdiplus/tests/region.c | 13 +++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5580319..509c7ce 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -823,6 +823,24 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap return *hrgn ? Ok : OutOfMemory; case RegionDataPath: return get_path_hrgn(element->elementdata.pathdata.path, graphics, hrgn); + case RegionDataRect: + { + GpPath* path; + GpStatus stat; + GpRectF* rc = &element->elementdata.rect; + + stat = GdipCreatePath(FillModeAlternate, &path); + if (stat != Ok) + return stat; + stat = GdipAddPathRectangle(path, rc->X, rc->Y, rc->Width, rc->Height); + + if (stat == Ok) + stat = get_path_hrgn(path, graphics, hrgn); + + GdipDeletePath(path); + + return stat; + } default: FIXME("GdipGetRegionHRgn unimplemented for region type=%x\n", element->type); *hrgn = NULL; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 45ef0b1..34024be 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -804,6 +804,7 @@ static void test_gethrgn(void) HDC hdc=GetDC(0); static const RECT empty_rect = {0,0,0,0}; static const RECT test_rect = {10, 11, 20, 21}; + static const GpRectF test_rectF = {10.0, 11.0, 10.0, 10.0}; static const RECT scaled_rect = {20, 22, 40, 42}; status = GdipCreateFromHDC(hdc, &graphics); @@ -854,6 +855,18 @@ static void test_gethrgn(void) verify_region(hrgn, &scaled_rect); DeleteObject(hrgn); + status = GdipCombineRegionRect(region2, &test_rectF, CombineModeReplace); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region2, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect); + DeleteObject(hrgn); + + status = GdipGetRegionHRgn(region2, graphics, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &scaled_rect); + DeleteObject(hrgn); + status = GdipDeletePath(path); ok(status == Ok, "status %08x\n", status); status = GdipDeleteRegion(region);

1 0

Vincent Povirk : gdiplus: Implement GdipRegionGetHRgn for paths.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 08aa0cac74f563e129ff092c6f0bdefb5cdb0677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08aa0cac74f563e129ff092c6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 24 15:01:47 2008 -0600 gdiplus: Implement GdipRegionGetHRgn for paths. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 11 +++++++++ dlls/gdiplus/region.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/region.c | 29 ++++++++++++++++++++++++- 4 files changed, 86 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e9cbfa5..a279268 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -54,6 +54,8 @@ extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, extern BOOL lengthen_path(GpPath *path, INT len); +extern GpStatus trace_path(GpGraphics *graphics, GpPath *path); + typedef struct region_element region_element; extern inline void delete_element(region_element *element); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index da2ea6f..b9cb1c2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -715,6 +715,17 @@ end: return status; } +GpStatus trace_path(GpGraphics *graphics, GpPath *path) +{ + GpStatus result; + + BeginPath(graphics->hdc); + result = draw_poly(graphics, NULL, path->pathdata.Points, + path->pathdata.Types, path->pathdata.Count, FALSE); + EndPath(graphics->hdc); + return result; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { TRACE("(%p, %p)\n", hdc, graphics); diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 8cae004..5580319 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -768,6 +768,49 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) return Ok; } +static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) +{ + HDC new_hdc=NULL; + GpStatus stat; + INT save_state; + + if (!graphics) + { + new_hdc = GetDC(0); + if (!new_hdc) + return OutOfMemory; + + stat = GdipCreateFromHDC(new_hdc, &graphics); + if (stat != Ok) + { + ReleaseDC(0, new_hdc); + return stat; + } + } + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + + SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE + : WINDING)); + + stat = trace_path(graphics, path); + if (stat == Ok) + { + *hrgn = PathToRegion(graphics->hdc); + stat = *hrgn ? Ok : OutOfMemory; + } + + RestoreDC(graphics->hdc, save_state); + if (new_hdc) + { + ReleaseDC(0, new_hdc); + GdipDeleteGraphics(graphics); + } + + return stat; +} + static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *graphics, HRGN *hrgn) { switch (element->type) @@ -778,6 +821,8 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case RegionDataEmptyRect: *hrgn = CreateRectRgn(0, 0, 0, 0); return *hrgn ? Ok : OutOfMemory; + case RegionDataPath: + return get_path_hrgn(element->elementdata.pathdata.path, graphics, hrgn); default: FIXME("GdipGetRegionHRgn unimplemented for region type=%x\n", element->type); *hrgn = NULL; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 9cdd929..45ef0b1 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -797,11 +797,14 @@ todo_wine{ static void test_gethrgn(void) { GpStatus status; - GpRegion *region; + GpRegion *region, *region2; + GpPath *path; GpGraphics *graphics; HRGN hrgn; HDC hdc=GetDC(0); static const RECT empty_rect = {0,0,0,0}; + static const RECT test_rect = {10, 11, 20, 21}; + static const RECT scaled_rect = {20, 22, 40, 42}; status = GdipCreateFromHDC(hdc, &graphics); ok(status == Ok, "status %08x\n", status); @@ -831,8 +834,32 @@ static void test_gethrgn(void) verify_region(hrgn, &empty_rect); DeleteObject(hrgn); + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + status = GdipAddPathRectangle(path, 10.0, 11.0, 10.0, 10.0); + ok(status == Ok, "status %08x\n", status); + + status = GdipCreateRegionPath(path, &region2); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region2, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &test_rect); + DeleteObject(hrgn); + + /* resulting HRGN is in device coordinates */ + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region2, graphics, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &scaled_rect); + DeleteObject(hrgn); + + status = GdipDeletePath(path); + ok(status == Ok, "status %08x\n", status); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); + status = GdipDeleteRegion(region2); + ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics); ok(status == Ok, "status %08x\n", status); ReleaseDC(0, hdc);

1 0

Vincent Povirk : gdiplus: Implement GdipGetRegionHRgn for empty regions.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 4f8751a5db271afac251e85787e9d557fa0a3997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8751a5db271afac251e8578… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 24 14:30:08 2008 -0600 gdiplus: Implement GdipGetRegionHRgn for empty regions. --- dlls/gdiplus/region.c | 3 ++ dlls/gdiplus/tests/region.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index ac7a20b..8cae004 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -775,6 +775,9 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case RegionDataInfiniteRect: *hrgn = NULL; return Ok; + case RegionDataEmptyRect: + *hrgn = CreateRectRgn(0, 0, 0, 0); + return *hrgn ? Ok : OutOfMemory; default: FIXME("GdipGetRegionHRgn unimplemented for region type=%x\n", element->type); *hrgn = NULL; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 90dfc24..9cdd929 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -49,6 +49,57 @@ typedef struct RegionDataPoint short X, Y; } RegionDataPoint; +static void verify_region(HRGN hrgn, const RECT *rc) +{ + union + { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rgn; + const RECT *rect; + DWORD ret; + + ret = GetRegionData(hrgn, 0, NULL); + if (IsRectEmpty(rc)) + ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret); + else + ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + if (!ret) return; + + ret = GetRegionData(hrgn, sizeof(rgn), &rgn.data); + if (IsRectEmpty(rc)) + ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret); + else + ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", + rgn.data.rdh.dwSize, rgn.data.rdh.iType, + rgn.data.rdh.nCount, rgn.data.rdh.nRgnSize, + rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, + rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); + if (rgn.data.rdh.nCount != 0) + { + rect = (const RECT *)rgn.data.Buffer; + trace("rect (%d,%d-%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); + ok(EqualRect(rect, rc), "rects don't match\n"); + } + + ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", rgn.data.rdh.dwSize); + ok(rgn.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn.data.rdh.iType); + if (IsRectEmpty(rc)) + { + ok(rgn.data.rdh.nCount == 0, "expected 0, got %u\n", rgn.data.rdh.nCount); + ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %u\n", rgn.data.rdh.nRgnSize); + } + else + { + ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); + ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); + } + ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); +} + static void test_getregiondata(void) { GpStatus status; @@ -750,6 +801,7 @@ static void test_gethrgn(void) GpGraphics *graphics; HRGN hrgn; HDC hdc=GetDC(0); + static const RECT empty_rect = {0,0,0,0}; status = GdipCreateFromHDC(hdc, &graphics); ok(status == Ok, "status %08x\n", status); @@ -772,6 +824,13 @@ static void test_gethrgn(void) ok(hrgn == NULL, "hrgn=%p\n", hrgn); DeleteObject(hrgn); + status = GdipSetEmpty(region); + ok(status == Ok, "status %08x\n", status); + status = GdipGetRegionHRgn(region, NULL, &hrgn); + ok(status == Ok, "status %08x\n", status); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics);

1 0

Vincent Povirk : gdiplus: Implement GdipGetRegionHRgn for infinite regions.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 74d62bccabfbe3639264d9be34420fe7ba8ddc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d62bccabfbe3639264d9be3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 24 14:12:39 2008 -0600 gdiplus: Implement GdipGetRegionHRgn for infinite regions. --- dlls/gdiplus/region.c | 19 ++++++++++++++++--- dlls/gdiplus/tests/region.c | 8 ++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5d8098b..ac7a20b 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -768,18 +768,31 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) return Ok; } +static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *graphics, HRGN *hrgn) +{ + switch (element->type) + { + case RegionDataInfiniteRect: + *hrgn = NULL; + return Ok; + default: + FIXME("GdipGetRegionHRgn unimplemented for region type=%x\n", element->type); + *hrgn = NULL; + return NotImplemented; + } +} + /***************************************************************************** * GdipGetRegionHRgn [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) { - FIXME("(%p, %p, %p): stub\n", region, graphics, hrgn); + TRACE("(%p, %p, %p)\n", region, graphics, hrgn); if (!region || !hrgn) return InvalidParameter; - *hrgn = NULL; - return NotImplemented; + return get_region_hrgn(&region->node, graphics, hrgn); } GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 2bf4416..90dfc24 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -762,14 +762,14 @@ static void test_gethrgn(void) status = GdipGetRegionHRgn(region, graphics, NULL); ok(status == InvalidParameter, "status %08x\n", status); - hrgn = NULL; status = GdipGetRegionHRgn(region, NULL, &hrgn); - todo_wine ok(status == Ok, "status %08x\n", status); + ok(status == Ok, "status %08x\n", status); + ok(hrgn == NULL, "hrgn=%p\n", hrgn); DeleteObject(hrgn); - hrgn = NULL; status = GdipGetRegionHRgn(region, graphics, &hrgn); - todo_wine ok(status == Ok, "status %08x\n", status); + ok(status == Ok, "status %08x\n", status); + ok(hrgn == NULL, "hrgn=%p\n", hrgn); DeleteObject(hrgn); status = GdipDeleteRegion(region);

1 0

Vincent Povirk : gdiplus: Add parameter checking to GdipGetRegionHRgn.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 5c752777849be992db287b4d2c109df89b11204c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c752777849be992db287b4d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 24 13:55:20 2008 -0600 gdiplus: Add parameter checking to GdipGetRegionHRgn. --- dlls/gdiplus/region.c | 3 +++ dlls/gdiplus/tests/region.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 1cda0b7..5d8098b 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -775,6 +775,9 @@ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HR { FIXME("(%p, %p, %p): stub\n", region, graphics, hrgn); + if (!region || !hrgn) + return InvalidParameter; + *hrgn = NULL; return NotImplemented; } diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d2477ce..2bf4416 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -743,6 +743,42 @@ todo_wine{ DeleteObject((HGDIOBJ)hrgn); } +static void test_gethrgn(void) +{ + GpStatus status; + GpRegion *region; + GpGraphics *graphics; + HRGN hrgn; + HDC hdc=GetDC(0); + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %08x\n", status); + + status = GdipCreateRegion(&region); + ok(status == Ok, "status %08x\n", status); + + status = GdipGetRegionHRgn(NULL, graphics, &hrgn); + ok(status == InvalidParameter, "status %08x\n", status); + status = GdipGetRegionHRgn(region, graphics, NULL); + ok(status == InvalidParameter, "status %08x\n", status); + + hrgn = NULL; + status = GdipGetRegionHRgn(region, NULL, &hrgn); + todo_wine ok(status == Ok, "status %08x\n", status); + DeleteObject(hrgn); + + hrgn = NULL; + status = GdipGetRegionHRgn(region, graphics, &hrgn); + todo_wine ok(status == Ok, "status %08x\n", status); + DeleteObject(hrgn); + + status = GdipDeleteRegion(region); + ok(status == Ok, "status %08x\n", status); + status = GdipDeleteGraphics(graphics); + ok(status == Ok, "status %08x\n", status); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -760,7 +796,7 @@ START_TEST(region) test_isempty(); test_combinereplace(); test_fromhrgn(); + test_gethrgn(); GdiplusShutdown(gdiplusToken); - }

1 0

Ricardo Filipe : comdlg32: Removed dead assignments (llvm/clang).
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 25f7ad44e5cbd1a7d8aaaba7e10c905b2b3cfd2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f7ad44e5cbd1a7d8aaaba7e… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Mon Nov 24 23:19:52 2008 +0000 comdlg32: Removed dead assignments (llvm/clang). --- dlls/comdlg32/colordlg.c | 2 +- dlls/comdlg32/fontdlg16.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 4baa261..d4a43af 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -166,7 +166,7 @@ int CC_RGBtoHSL(char c, int r, int g, int b) else { result = mmdif * 240; /* 0...61200=255*240 */ - result /= (mmsum > 255 ? mmsum = 510 - mmsum : mmsum); /* 0..255 */ + result /= (mmsum > 255 ? 510 - mmsum : mmsum); /* 0..255 */ } break; /* hue */ diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index 9a85729..c7be1d3 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -187,7 +187,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) if (lpChFont->Flags & CF_ENABLETEMPLATEHANDLE) { - if (!(template = LockResource16( lpChFont->hInstance ))) + if (!LockResource16( lpChFont->hInstance )) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; @@ -204,7 +204,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) return FALSE; } if (!(hDlgTmpl16 = LoadResource16( lpChFont->hInstance, hResInfo )) || - !(template = LockResource16( hDlgTmpl16 ))) + !LockResource16( hDlgTmpl16 )) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE;

1 0

Ricardo Filipe : comctl32: Removed dead assignments (llvm/clang).
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 1c55ba0b838140f18c6dd7316225ac18ca15e197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c55ba0b838140f18c6dd7316… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Mon Nov 24 23:07:25 2008 +0000 comctl32: Removed dead assignments (llvm/clang). --- dlls/comctl32/trackbar.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c72f29b..3424333 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -152,7 +152,6 @@ static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) if (infoPtr->uTicFreq && infoPtr->lRangeMax >= infoPtr->lRangeMin) nrTics=(infoPtr->lRangeMax - infoPtr->lRangeMin)/infoPtr->uTicFreq; else { - nrTics = 0; Free (infoPtr->tics); infoPtr->tics = NULL; infoPtr->uNumTics = 0; @@ -1590,7 +1589,7 @@ static LRESULT theme_changed (const TRACKBAR_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); - theme = OpenThemeData (infoPtr->hwndSelf, themeClass); + OpenThemeData (infoPtr->hwndSelf, themeClass); return 0; }

1 0

Stefan Dösinger : wined3d: Add the ability to duplicate GL pixel shaders.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 0bf32b12f5a97045c4c2785260961e53184c29ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf32b12f5a97045c4c278526… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 24 11:55:50 2008 +0100 wined3d: Add the ability to duplicate GL pixel shaders. Some stateblock parameters have to be compiled into the GL pixel shader code, like lines for pixelformat fixups. This leads to problems when applications switch those settings, requiring a recompilation of the shader. This patch enables wined3d to have multiple GL shaders for a D3D shader(pixel shaders only so far) to handle this more efficiently. --- dlls/wined3d/arb_program_shader.c | 116 +++++++++---------------------- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/glsl_shader.c | 111 ++++++++++++------------------- dlls/wined3d/pixelshader.c | 134 ++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 21 +++--- 5 files changed, 134 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf32b12f5a97045c4c27…

1 0

Stefan Dösinger : wined3d: Put the ps compile parameters into the glsl program hashmap.
by Alexandre Julliard Nov. 25, 2008

Nov. 25, 2008

Module: wine Branch: master Commit: 2f98fce9cf277f2ce7202acf9b81de98f2e9bd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f98fce9cf277f2ce7202acf9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 21 19:48:36 2008 +0100 wined3d: Put the ps compile parameters into the glsl program hashmap. This avoids the double search for a pixel shader. The pixel shader compilation parameter structure is recorded in the GLSL program hashmap, together with the WineD3D pixel shader. --- dlls/wined3d/glsl_shader.c | 63 ++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d0d7491..a32c3c0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -62,26 +62,28 @@ struct shader_glsl_priv { /* Struct to maintain data about a linked GLSL program */ struct glsl_shader_prog_link { - struct list vshader_entry; - struct list pshader_entry; - GLhandleARB programId; - GLhandleARB *vuniformF_locations; - GLhandleARB *puniformF_locations; - GLhandleARB vuniformI_locations[MAX_CONST_I]; - GLhandleARB puniformI_locations[MAX_CONST_I]; - GLhandleARB posFixup_location; - GLhandleARB bumpenvmat_location[MAX_TEXTURES]; - GLhandleARB luminancescale_location[MAX_TEXTURES]; - GLhandleARB luminanceoffset_location[MAX_TEXTURES]; - GLhandleARB ycorrection_location; - GLenum vertex_color_clamp; - GLhandleARB vshader; - GLhandleARB pshader; + struct list vshader_entry; + struct list pshader_entry; + GLhandleARB programId; + GLhandleARB *vuniformF_locations; + GLhandleARB *puniformF_locations; + GLhandleARB vuniformI_locations[MAX_CONST_I]; + GLhandleARB puniformI_locations[MAX_CONST_I]; + GLhandleARB posFixup_location; + GLhandleARB bumpenvmat_location[MAX_TEXTURES]; + GLhandleARB luminancescale_location[MAX_TEXTURES]; + GLhandleARB luminanceoffset_location[MAX_TEXTURES]; + GLhandleARB ycorrection_location; + GLenum vertex_color_clamp; + GLhandleARB vshader; + IWineD3DPixelShader *pshader; + struct ps_compile_args ps_args; }; typedef struct { - GLhandleARB vshader; - GLhandleARB pshader; + GLhandleARB vshader; + IWineD3DPixelShader *pshader; + struct ps_compile_args ps_args; } glsl_program_key_t; @@ -2817,16 +2819,18 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); key->vshader = entry->vshader; key->pshader = entry->pshader; + key->ps_args = entry->ps_args; hash_table_put(priv->glsl_program_lookup, key, entry); } static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, - GLhandleARB vshader, GLhandleARB pshader) { + GLhandleARB vshader, IWineD3DPixelShader *pshader, struct ps_compile_args *ps_args) { glsl_program_key_t key; key.vshader = vshader; key.pshader = pshader; + key.ps_args = *ps_args; return (struct glsl_shader_prog_link *)hash_table_get(priv->glsl_program_lookup, &key); } @@ -2837,6 +2841,7 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, WineD3D_GL_ key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); key->vshader = entry->vshader; key->pshader = entry->pshader; + key->ps_args = entry->ps_args; hash_table_remove(priv->glsl_program_lookup, key); GL_EXTCALL(glDeleteObjectARB(entry->programId)); @@ -3186,6 +3191,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use int i; char glsl_name[8]; GLhandleARB vshader_id, pshader_id; + struct ps_compile_args compile_args; if(use_vs) { IWineD3DVertexShaderImpl_CompileShader(vshader); @@ -3194,13 +3200,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use vshader_id = 0; } if(use_ps) { - struct ps_compile_args compile_args; find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &compile_args); - pshader_id = find_gl_pshader((IWineD3DPixelShaderImpl *) pshader, &compile_args); } else { - pshader_id = 0; + /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ + memset(&compile_args, 0, sizeof(compile_args)); } - entry = get_glsl_program_entry(priv, vshader_id, pshader_id); + entry = get_glsl_program_entry(priv, vshader_id, pshader, &compile_args); if (entry) { priv->glsl_program = entry; return; @@ -3214,7 +3219,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); entry->programId = programId; entry->vshader = vshader_id; - entry->pshader = pshader_id; + entry->pshader = pshader; + entry->ps_args = compile_args; /* Add the hash table entry */ add_glsl_program_entry(priv, entry); @@ -3259,6 +3265,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry); } + if(use_ps) { + pshader_id = find_gl_pshader((IWineD3DPixelShaderImpl *) pshader, &compile_args); + } else { + pshader_id = 0; + } + /* Attach GLSL pshader */ if (pshader_id) { TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); @@ -3552,7 +3564,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { static unsigned int glsl_program_key_hash(void *key) { glsl_program_key_t *k = (glsl_program_key_t *)key; - unsigned int hash = k->vshader | k->pshader << 16; + unsigned int hash = k->vshader | ((DWORD_PTR) k->pshader) << 16; hash += ~(hash << 15); hash ^= (hash >> 10); hash += (hash << 3); @@ -3567,7 +3579,8 @@ static BOOL glsl_program_key_compare(void *keya, void *keyb) { glsl_program_key_t *ka = (glsl_program_key_t *)keya; glsl_program_key_t *kb = (glsl_program_key_t *)keyb; - return ka->vshader == kb->vshader && ka->pshader == kb->pshader; + return ka->vshader == kb->vshader && ka->pshader == kb->pshader && + (memcmp(&ka->ps_args, &kb->ps_args, sizeof(kb->ps_args)) == 0); } static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) {

1 0