May 2009 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Account for blend factors and positions in line gradients.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: a6161307cfd532b35b599078f78a97b4098220da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6161307cfd532b35b599078f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 1 14:26:50 2009 -0500 gdiplus: Account for blend factors and positions in line gradients. --- dlls/gdiplus/graphics.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 36cb324..b467dc7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -172,15 +172,43 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, } } -static ARGB blend_colors(ARGB start, ARGB end, int current, int total) +static ARGB blend_colors(ARGB start, ARGB end, REAL position) { ARGB result=0; ARGB i; for (i=0xff; i<=0xff0000; i = i << 8) - result |= (((start&i)*(total - current)+(end&i)*(current))/total)&i; + result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; return result; } +static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) +{ + REAL blendfac; + + if (brush->blendcount == 1) + blendfac = position; + else + { + int i=1; + REAL left_blendpos, left_blendfac, right_blendpos, right_blendfac; + REAL range; + + /* locate the blend positions surrounding this position */ + while (position > brush->blendpos[i]) + i++; + + /* interpolate between the blend positions */ + left_blendpos = brush->blendpos[i-1]; + left_blendfac = brush->blendfac[i-1]; + right_blendpos = brush->blendpos[i]; + right_blendfac = brush->blendfac[i]; + range = right_blendpos - left_blendpos; + blendfac = (left_blendfac * (right_blendpos - position) + + right_blendfac * (position - left_blendpos)) / range; + } + return blend_colors(brush->startcolor, brush->endcolor, blendfac); +} + static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { switch (brush->bt) @@ -240,7 +268,7 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) for (i=1; i<num_steps; i++) { - ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + ARGB argb = blend_line_gradient(line, i/(REAL)num_steps); int ofs = width * i / num_steps; col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); @@ -296,7 +324,7 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) for (i=1; i<num_steps; i++) { - ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + ARGB argb = blend_line_gradient(line, i/(REAL)num_steps); int ofs = height * i / num_steps; col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col);

1 0

Vincent Povirk : gdiplus: Properly draw points outside of line gradients.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 966fd5ec092a3745fe8d2d371e24d4b3161dd0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966fd5ec092a3745fe8d2d371… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 1 15:23:02 2009 -0500 gdiplus: Properly draw points outside of line gradients. Theoretically, a line gradient covers the area enclosed by the starting and ending gradient lines, which intersect the start and end points respectively and are perpendicular to a line joining the start and end points. --- dlls/gdiplus/graphics.c | 115 ++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 60 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b467dc7..219ed75 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -185,6 +185,19 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) { REAL blendfac; + /* clamp to between 0.0 and 1.0, using the wrap mode */ + if (brush->wrap == WrapModeTile) + { + position = fmodf(position, 1.0f); + if (position < 0.0f) position += 1.0f; + } + else /* WrapModeFlip* */ + { + position = fmodf(position, 2.0f); + if (position < 0.0f) position += 2.0f; + if (position > 1.0f) position = 2.0f - position; + } + if (brush->blendcount == 1) blendfac = position; else @@ -217,7 +230,6 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { GpLineGradient *line = (GpLineGradient*)brush; RECT rc; - int num_steps = 255; SelectClipPath(graphics->hdc, RGN_AND); if (GetClipBox(graphics->hdc, &rc) != NULLREGION) @@ -228,9 +240,6 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); - /* fill with starting color */ - FillRect(graphics->hdc, &rc, brush->gdibrush); - endpointsf[0] = line->startpoint; endpointsf[1] = line->endpoint; transform_and_round_points(graphics, endpointsi, endpointsf, 2); @@ -238,114 +247,100 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) if (abs(endpointsi[0].x-endpointsi[1].x) > abs(endpointsi[0].y-endpointsi[1].y)) { /* vertical-ish gradient */ - int endborderx; /* vertical rectangle boundary near endpoint */ int startx, endx; /* x co-ordinates of endpoints shifted to intersect the top of the visible rectangle */ - int startbottomx, endbottomx; /* x co-ordinate of endpoints shifted to intersect the bottom of the visible rectangle */ + int startbottomx; /* x co-ordinate of start point shifted to intersect the bottom of the visible rectangle */ int width; COLORREF col; HBRUSH hbrush, hprevbrush; - int i; - - if (endpointsi[1].x > endpointsi[0].x) - endborderx = rc.right; - else - endborderx = rc.left; + int leftx, rightx; /* x co-ordinates where the leftmost and rightmost gradient lines hit the top of the visible rectangle */ + int x; + int tilt; /* horizontal distance covered by a gradient line */ startx = roundr((rc.top - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); endx = roundr((rc.top - endpointsf[1].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[1].X); width = endx - startx; startbottomx = roundr((rc.bottom - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); - endbottomx = startbottomx+width; + tilt = startx - startbottomx; - if (num_steps > abs(width)) num_steps = abs(width); + if (startx >= startbottomx) + { + leftx = rc.left; + rightx = rc.right + tilt; + } + else + { + leftx = rc.left + tilt; + rightx = rc.right; + } - poly[0].x = endborderx; + poly[0].x = rc.right; poly[0].y = rc.bottom; - poly[1].x = endborderx; + poly[1].x = rc.right; poly[1].y = rc.top; poly[2].y = rc.top; poly[3].y = rc.bottom; - for (i=1; i<num_steps; i++) + for (x=leftx; x<=rightx; x++) { - ARGB argb = blend_line_gradient(line, i/(REAL)num_steps); - int ofs = width * i / num_steps; + ARGB argb = blend_line_gradient(line, (x-startx)/(REAL)width); col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); hprevbrush = SelectObject(graphics->hdc, hbrush); - poly[2].x = startx + ofs; - poly[3].x = startbottomx + ofs; + poly[2].x = x; + poly[3].x = x - tilt; Polygon(graphics->hdc, poly, 4); SelectObject(graphics->hdc, hprevbrush); DeleteObject(hbrush); } - - poly[2].x = endx; - poly[3].x = endbottomx; - - /* draw the ending color */ - col = ARGB2COLORREF(line->endcolor); - hbrush = CreateSolidBrush(col); - hprevbrush = SelectObject(graphics->hdc, hbrush); - Polygon(graphics->hdc, poly, 4); - SelectObject(graphics->hdc, hprevbrush); - DeleteObject(hbrush); } else if (endpointsi[0].y != endpointsi[1].y) { /* horizontal-ish gradient */ - int endbordery; /* horizontal rectangle boundary near endpoint */ int starty, endy; /* y co-ordinates of endpoints shifted to intersect the left of the visible rectangle */ - int startrighty, endrighty; /* y co-ordinate of endpoints shifted to intersect the right of the visible rectangle */ + int startrighty; /* y co-ordinate of start point shifted to intersect the right of the visible rectangle */ int height; COLORREF col; HBRUSH hbrush, hprevbrush; - int i; - - if (endpointsi[1].y > endpointsi[0].y) - endbordery = rc.bottom; - else - endbordery = rc.top; + int topy, bottomy; /* y co-ordinates where the topmost and bottommost gradient lines hit the left of the visible rectangle */ + int y; + int tilt; /* vertical distance covered by a gradient line */ starty = roundr((rc.left - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); endy = roundr((rc.left - endpointsf[1].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[1].Y); height = endy - starty; startrighty = roundr((rc.right - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); - endrighty = startrighty+height; + tilt = starty - startrighty; - if (num_steps > abs(height)) num_steps = abs(height); + if (starty >= startrighty) + { + topy = rc.top; + bottomy = rc.bottom + tilt; + } + else + { + topy = rc.top + tilt; + bottomy = rc.bottom; + } poly[0].x = rc.right; - poly[0].y = endbordery; + poly[0].y = rc.bottom; poly[1].x = rc.left; - poly[1].y = endbordery; + poly[1].y = rc.bottom; poly[2].x = rc.left; poly[3].x = rc.right; - for (i=1; i<num_steps; i++) + for (y=topy; y<=bottomy; y++) { - ARGB argb = blend_line_gradient(line, i/(REAL)num_steps); - int ofs = height * i / num_steps; + ARGB argb = blend_line_gradient(line, (y-starty)/(REAL)height); col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); hprevbrush = SelectObject(graphics->hdc, hbrush); - poly[2].y = starty + ofs; - poly[3].y = startrighty + ofs; + poly[2].y = y; + poly[3].y = y - tilt; Polygon(graphics->hdc, poly, 4); SelectObject(graphics->hdc, hprevbrush); DeleteObject(hbrush); } - - poly[2].y = endy; - poly[3].y = endrighty; - - /* draw the ending color */ - col = ARGB2COLORREF(line->endcolor); - hbrush = CreateSolidBrush(col); - hprevbrush = SelectObject(graphics->hdc, hbrush); - Polygon(graphics->hdc, poly, 4); - SelectObject(graphics->hdc, hprevbrush); - DeleteObject(hbrush); } /* else startpoint == endpoint */ }

1 0

Vincent Povirk : gdiplus: Don't draw outside of gradient lines.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: cb478a32584a8779640762cb6c8bd02f2edcae7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb478a32584a8779640762cb6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 1 15:37:35 2009 -0500 gdiplus: Don't draw outside of gradient lines. Currently, gradients are drawn by filling a series of quadrilaterals, with one side equal to a gradient line and the other side equal to the edge of the bounding rectangle of the area being filled. A single pixel can be filled many times, and that causes flicker. --- dlls/gdiplus/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 219ed75..9ba7d47 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -273,9 +273,7 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) rightx = rc.right; } - poly[0].x = rc.right; poly[0].y = rc.bottom; - poly[1].x = rc.right; poly[1].y = rc.top; poly[2].y = rc.top; poly[3].y = rc.bottom; @@ -286,6 +284,8 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[0].x = x - tilt - 1; + poly[1].x = x - 1; poly[2].x = x; poly[3].x = x - tilt; Polygon(graphics->hdc, poly, 4); @@ -323,9 +323,7 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) } poly[0].x = rc.right; - poly[0].y = rc.bottom; poly[1].x = rc.left; - poly[1].y = rc.bottom; poly[2].x = rc.left; poly[3].x = rc.right; @@ -335,6 +333,8 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) col = ARGB2COLORREF(argb); hbrush = CreateSolidBrush(col); hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[0].y = y - tilt - 1; + poly[1].y = y - 1; poly[2].y = y; poly[3].y = y - tilt; Polygon(graphics->hdc, poly, 4);

1 0

Nicolas Le Cam : msi/tests: Fix MsiApplyMultiplePatches tests on Windows.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 2f3767222591573da1a8b8058d0514828071a5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3767222591573da1a8b8058… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri May 1 23:46:27 2009 +0200 msi/tests: Fix MsiApplyMultiplePatches tests on Windows. --- dlls/msi/tests/package.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 35a22de..82b7110 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11535,7 +11535,7 @@ static void test_MsiSetProperty(void) static void test_MsiApplyMultiplePatches(void) { - UINT r; + UINT r, type = GetDriveType(NULL); r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); @@ -11544,19 +11544,51 @@ static void test_MsiApplyMultiplePatches(void) ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); r = MsiApplyMultiplePatchesA(";", NULL, NULL); - ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + todo_wine + { + if (type == DRIVE_FIXED) + ok(r == ERROR_PATH_NOT_FOUND, + "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, + "Expected ERROR_INVALID_NAME, got %u\n", r); + } r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); - ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + todo_wine + { + if (type == DRIVE_FIXED) + ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, + "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, + "Expected ERROR_INVALID_NAME, got %u\n", r); + } r = MsiApplyMultiplePatchesA(";;", NULL, NULL); - ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + todo_wine + { + if (type == DRIVE_FIXED) + ok(r == ERROR_PATH_NOT_FOUND, + "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, + "Expected ERROR_INVALID_NAME, got %u\n", r); + } r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); - ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + todo_wine + { + if (type == DRIVE_FIXED) + ok(r == ERROR_PATH_NOT_FOUND, + "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); + else + ok(r == ERROR_INVALID_NAME, + "Expected ERROR_INVALID_NAME, got %u\n", r); + } r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r);

1 0

Nicolas Le Cam : ddraw/tests: Fix a test failure on VirtualBox.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: ad66aa77a42aeaa623eb3986f3e72443028b34e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad66aa77a42aeaa623eb3986f… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Wed Apr 29 01:22:14 2009 +0200 ddraw/tests: Fix a test failure on VirtualBox. --- dlls/ddraw/tests/dsurface.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 47a231e..a0f69b1 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1374,20 +1374,28 @@ static void AttachmentTest(void) ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); - ok(hr == DD_OK, "Attaching an offscreen plain surface to a front buffer returned %08x\n", hr); - /* Try the reverse without detaching first */ - hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); - ok(hr == DDERR_SURFACEALREADYATTACHED, "Attaching an attached surface to its attachee returned %08x\n", hr); - hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); - ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching an offscreen plain surface to a front buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try the reverse without detaching first */ + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Attaching an attached surface to its attachee returned %08x\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); - ok(hr == DD_OK, "Attaching a front buffer to an offscreen plain surface returned %08x\n", hr); - /* Try to detach reversed */ - hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); - ok(hr == DDERR_CANNOTDETACHSURFACE, "DeleteAttachedSurface returned %08x\n", hr); - /* Now the proper detach */ - hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); - ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a front buffer to an offscreen plain surface returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try to detach reversed */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DDERR_CANNOTDETACHSURFACE, "DeleteAttachedSurface returned %08x\n", hr); + /* Now the proper detach */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); /* Fails on refrast */ ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), "Attaching an offscreen plain surface to another offscreen plain surface returned %08x\n", hr);

1 0

Ken Thomases : winegcc: Recognize '-arch <arch>' as a compiler and linker option.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 81d1d8e355650d4d7d69efe38423075265a9d07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d1d8e355650d4d7d69efe38… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 1 22:59:25 2009 -0500 winegcc: Recognize '-arch <arch>' as a compiler and linker option. The dev tools on Mac OS X takes this option to dictate the output architecture. (Gcc still accepts -m32 and -m64, as well, but "ld" and "as" do not.) --- tools/winegcc/winegcc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9588bbf..8a3159b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -841,6 +841,9 @@ static int is_linker_arg(const char* arg) case 'X': if (strcmp("-Xlinker", arg) == 0) return 1; break; + case 'a': + if (strcmp("-arch", arg) == 0) return 1; + break; } for (j = 0; j < sizeof(link_switches)/sizeof(link_switches[0]); j++) @@ -988,6 +991,8 @@ int main(int argc, char **argv) case 'a': if (strcmp("-aux-info", argv[i]) == 0) next_is_arg = 1; + if (strcmp("-arch", argv[i]) == 0) + next_is_arg = 1; break; case 'X': if (strcmp("-Xlinker", argv[i]) == 0)

1 0

Ken Thomases : winebuild: On Mac OS X, use -arch option to control output of "ld" and "as".
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 0e0e918f0f60ebe3e0f6f11b44473853c625ba33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0e918f0f60ebe3e0f6f11b4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 1 22:59:36 2009 -0500 winebuild: On Mac OS X, use -arch option to control output of "ld" and "as". --- tools/winebuild/utils.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 400f01a..d6eab0e 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -262,7 +262,9 @@ const char *get_as_command(void) if (force_pointer_size) { - const char *args = (force_pointer_size == 8) ? " --64" : " --32"; + const char *args = (target_platform == PLATFORM_APPLE) ? + ((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") : + ((force_pointer_size == 8) ? " --64" : " --32"); as_command = xrealloc( as_command, strlen(as_command) + strlen(args) + 1 ); strcat( as_command, args ); } @@ -288,7 +290,9 @@ const char *get_ld_command(void) if (force_pointer_size) { - const char *args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"; + const char *args = (target_platform == PLATFORM_APPLE) ? + ((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") : + ((force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"); ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 ); strcat( ld_command, args ); }

1 0

Ken Thomases : configure: On Mac OS X, always specify target architecture to the dev tools.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 42664338686f4d5237cefede8e9a0a5cb6011d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=42664338686f4d5237cefede8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 1 22:59:52 2009 -0500 configure: On Mac OS X, always specify target architecture to the dev tools. Fixes building on Snow Leopard. Mac OS X doesn't have a concept of one bit-ness being "native". So, which architecture gets built is somewhat arbitrary. On Snow Leopard, the tools have changed to default to building 64-bit, which causes us problems. So, just always be explicit. --- configure | 23 +++++++++++++++++++++++ configure.ac | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fa8add2..a44b1ca 100755 --- a/configure +++ b/configure @@ -3811,6 +3811,29 @@ fi case $host in + *-darwin*) + if test "x$enable_win64" == "xyes" + then + CC="$CC -m64" + CXX="$CXX -m64" + LD="${LD:-ld} -arch x86_64" + AS="${AS:-as} -arch x86_64" + host_cpu="x86_64" + notice_platform="64-bit " + TARGETFLAGS="-m64" + + else + CC="$CC -m32" + CXX="$CXX -m32" + LD="${LD:-ld} -arch i386" + AS="${AS:-as} -arch i386" + host_cpu="i386" + notice_platform="32-bit " + TARGETFLAGS="-m32" + + enable_win16=${enable_win16:-yes} + fi + ;; x86_64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then diff --git a/configure.ac b/configure.ac index 0d92131..322b6e9 100644 --- a/configure.ac +++ b/configure.ac @@ -102,6 +102,27 @@ dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E AC_CHECK_TOOL(CPPBIN,cpp,cpp) case $host in + *-darwin*) + if test "x$enable_win64" == "xyes" + then + CC="$CC -m64" + CXX="$CXX -m64" + LD="${LD:-ld} -arch x86_64" + AS="${AS:-as} -arch x86_64" + host_cpu="x86_64" + notice_platform="64-bit " + AC_SUBST(TARGETFLAGS,"-m64") + else + CC="$CC -m32" + CXX="$CXX -m32" + LD="${LD:-ld} -arch i386" + AS="${AS:-as} -arch i386" + host_cpu="i386" + notice_platform="32-bit " + AC_SUBST(TARGETFLAGS,"-m32") + enable_win16=${enable_win16:-yes} + fi + ;; x86_64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then

1 0

Ken Thomases : winecoreaudio: Fix building on Snow Leopard.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 131a046302cd8467c07caf5889b8690b8439bbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131a046302cd8467c07caf588… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 1 23:01:18 2009 -0500 winecoreaudio: Fix building on Snow Leopard. --- dlls/winecoreaudio.drv/audiounit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 08e2607..27f8f60 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,10 +22,16 @@ #ifdef HAVE_AUDIOUNIT_AUDIOUNIT_H +#define ULONG CoreFoundation_ULONG +#define HRESULT CoreFoundation_HRESULT +#include <CoreServices/CoreServices.h> #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> +#undef ULONG +#undef HRESULT #undef DPRINTF +#undef STDMETHODCALLTYPE #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wave);

1 0

Ken Thomases : dbghelp: Don' t check version of Mach-O dyld_all_image_infos structure.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 6903238948d2e49f1a75bd45d1036e1c71dddb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6903238948d2e49f1a75bd45d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 1 23:01:24 2009 -0500 dbghelp: Don't check version of Mach-O dyld_all_image_infos structure. The structure has changed repeatedly, but always in a backward compatible way. The version check was only hampering us. --- dlls/dbghelp/macho_module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 13f24d9..c0458c6 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1170,7 +1170,6 @@ static BOOL macho_enum_modules_internal(const struct process* pcs, if (!pcs->dbg_hdr_addr || !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, &image_infos, sizeof(image_infos), NULL) || - (image_infos.version != 1 && image_infos.version != 2) || !image_infos.infoArray) goto done; TRACE("Process has %u image infos at %p\n", image_infos.infoArrayCount, image_infos.infoArray);

1 0