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

Henri Verbeet : wined3d: checkGLcall() doesn't need a \n.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 32fd8f21300bce7b9cae574eab0fbdd9b94af582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fd8f21300bce7b9cae574ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:02 2009 +0200 wined3d: checkGLcall() doesn't need a \n. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/drawprim.c | 14 +++++++------- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 3 +-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- 8 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32fd8f21300bce7b9cae5…

1 0

Henri Verbeet : wined3d: Get rid of some pointers in WINED3DADAPTER_IDENTIFIER.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 699f68cdee8f9c2bc4ee51e54ec52487dd16531f URL: http://source.winehq.org/git/wine.git/?a=commit;h=699f68cdee8f9c2bc4ee51e54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:03 2009 +0200 wined3d: Get rid of some pointers in WINED3DADAPTER_IDENTIFIER. This also avoids some unchecked strcpy() calls. --- dlls/d3d8/directx.c | 36 +++++++++++++---------- dlls/d3d9/directx.c | 28 ++++++++++-------- dlls/wined3d/directx.c | 71 +++++++++++++++++++++++++++++++-------------- include/wine/wined3d.idl | 23 ++++++++------ 4 files changed, 97 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=699f68cdee8f9c2bc4ee5…

1 0

Henri Verbeet : wined3d: Replace some shader_is_pshader_version() calls with plain type checks.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 3484d46a36f2381132dfc617a3f743f4ea927839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3484d46a36f2381132dfc617a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 7 11:08:04 2009 +0200 wined3d: Replace some shader_is_pshader_version() calls with plain type checks. --- dlls/wined3d/baseshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ae28565..4e3fb92 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -762,7 +762,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti else { /* Pixel shaders 3.0 don't have usage semantics */ - if (shader_is_pshader_version(shader_version->type) && shader_version->major < 3) + if (shader_version->major < 3 && shader_version->type == WINED3D_SHADER_TYPE_PIXEL) return; else TRACE("_"); @@ -844,7 +844,7 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, break; case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */ - TRACE("%c", shader_is_pshader_version(shader_version->type) ? 't' : 'a'); + TRACE("%c", shader_version->type == WINED3D_SHADER_TYPE_PIXEL ? 't' : 'a'); break; case WINED3DSPR_RASTOUT:

1 0

Andrew Eikum : gdiplus: Implement GdipBeginContainer2 and GdipEndContainer.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 632aef3d8b3bc4baa0d673980552df288550c72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=632aef3d8b3bc4baa0d673980… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jul 5 17:04:20 2009 -0500 gdiplus: Implement GdipBeginContainer2 and GdipEndContainer. --- dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/graphics.c | 153 ++++++++++++++++++++++++++++++++++++++-- include/gdiplusflat.h | 1 + 3 files changed, 151 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 95133ca..be881c7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -29,6 +29,7 @@ #include "objbase.h" #include "ocidl.h" +#include "wine/list.h" #include "gdiplus.h" @@ -109,6 +110,8 @@ struct GpGraphics{ BOOL busy; /* hdc handle obtained by GdipGetDC */ GpRegion *clip; UINT textcontrast; /* not used yet. get/set only */ + struct list containers; + GraphicsContainer contid; /* last-issued container ID */ }; struct GpBrush{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3525743..b81a984 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -38,6 +38,7 @@ #include "gdiplus.h" #include "gdiplus_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); @@ -941,6 +942,104 @@ GpStatus trace_path(GpGraphics *graphics, GpPath *path) return result; } +typedef struct _GraphicsContainerItem { + struct list entry; + GraphicsContainer contid; + + SmoothingMode smoothing; + CompositingQuality compqual; + InterpolationMode interpolation; + CompositingMode compmode; + TextRenderingHint texthint; + REAL scale; + GpUnit unit; + PixelOffsetMode pixeloffset; + UINT textcontrast; + GpMatrix* worldtrans; + GpRegion* clip; +} GraphicsContainerItem; + +static GpStatus init_container(GraphicsContainerItem** container, + GDIPCONST GpGraphics* graphics){ + GpStatus sts; + + *container = GdipAlloc(sizeof(GraphicsContainerItem)); + if(!(*container)) + return OutOfMemory; + + (*container)->contid = graphics->contid + 1; + + (*container)->smoothing = graphics->smoothing; + (*container)->compqual = graphics->compqual; + (*container)->interpolation = graphics->interpolation; + (*container)->compmode = graphics->compmode; + (*container)->texthint = graphics->texthint; + (*container)->scale = graphics->scale; + (*container)->unit = graphics->unit; + (*container)->textcontrast = graphics->textcontrast; + (*container)->pixeloffset = graphics->pixeloffset; + + sts = GdipCloneMatrix(graphics->worldtrans, &(*container)->worldtrans); + if(sts != Ok){ + GdipFree(*container); + *container = NULL; + return sts; + } + + sts = GdipCloneRegion(graphics->clip, &(*container)->clip); + if(sts != Ok){ + GdipDeleteMatrix((*container)->worldtrans); + GdipFree(*container); + *container = NULL; + return sts; + } + + return Ok; +} + +static void delete_container(GraphicsContainerItem* container){ + GdipDeleteMatrix(container->worldtrans); + GdipDeleteRegion(container->clip); + GdipFree(container); +} + +static GpStatus restore_container(GpGraphics* graphics, + GDIPCONST GraphicsContainerItem* container){ + GpStatus sts; + GpMatrix *newTrans; + GpRegion *newClip; + + sts = GdipCloneMatrix(container->worldtrans, &newTrans); + if(sts != Ok) + return sts; + + sts = GdipCloneRegion(container->clip, &newClip); + if(sts != Ok){ + GdipDeleteMatrix(newTrans); + return sts; + } + + GdipDeleteMatrix(graphics->worldtrans); + graphics->worldtrans = newTrans; + + GdipDeleteRegion(graphics->clip); + graphics->clip = newClip; + + graphics->contid = container->contid - 1; + + graphics->smoothing = container->smoothing; + graphics->compqual = container->compqual; + graphics->interpolation = container->interpolation; + graphics->compmode = container->compmode; + graphics->texthint = container->texthint; + graphics->scale = container->scale; + graphics->unit = container->unit; + graphics->textcontrast = container->textcontrast; + graphics->pixeloffset = container->pixeloffset; + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { TRACE("(%p, %p)\n", hdc, graphics); @@ -991,6 +1090,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->scale = 1.0; (*graphics)->busy = FALSE; (*graphics)->textcontrast = 4; + list_init(&(*graphics)->containers); + (*graphics)->contid = 0; return Ok; } @@ -1155,6 +1256,7 @@ GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) { + GraphicsContainerItem *cont, *next; TRACE("(%p)\n", graphics); if(!graphics) return InvalidParameter; @@ -1163,6 +1265,11 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(graphics->owndc) ReleaseDC(graphics->hwnd, graphics->hdc); + LIST_FOR_EACH_ENTRY_SAFE(cont, next, &graphics->containers, GraphicsContainerItem, entry){ + list_remove(&cont->entry); + delete_container(cont); + } + GdipDeleteRegion(graphics->clip); GdipDeleteMatrix(graphics->worldtrans); GdipFree(graphics); @@ -3254,14 +3361,24 @@ GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) return Ok; } -GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, GraphicsContainer *state) +GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, + GraphicsContainer *state) { - FIXME("(%p, %p)\n", graphics, state); + GraphicsContainerItem *container; + GpStatus sts; + + TRACE("(%p, %p)\n", graphics, state); if(!graphics || !state) return InvalidParameter; - *state = 0xdeadbeef; + sts = init_container(&container, graphics); + if(sts != Ok) + return sts; + + list_add_head(&graphics->containers, &container->entry); + *state = graphics->contid = container->contid; + return Ok; } @@ -3285,12 +3402,36 @@ GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST B GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) { - FIXME("(%p, 0x%x)\n", graphics, state); + GpStatus sts; + GraphicsContainerItem *container, *container2; - if(!graphics || !state) + TRACE("(%p, %x)\n", graphics, state); + + if(!graphics) return InvalidParameter; - return Ok; + LIST_FOR_EACH_ENTRY(container, &graphics->containers, GraphicsContainerItem, entry){ + if(container->contid == state) + break; + } + + /* did not find a matching container */ + if(&container->entry == &graphics->containers) + return Ok; + + /* remove all of the containers on top of the found container */ + LIST_FOR_EACH_ENTRY_SAFE(container, container2, &graphics->containers, GraphicsContainerItem, entry){ + if(container->contid == state) + break; + list_remove(&container->entry); + delete_container(container); + } + + list_remove(&container->entry); + sts = restore_container(graphics, container); + delete_container(container); + + return sts; } GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 48c188b..0c1e54f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -127,6 +127,7 @@ GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics*,GDIPCONST GpRectF*,GDIPCONST GpRectF*,GpUnit,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics*,GraphicsContainer*); GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics*,GDIPCONST GpRect*,GDIPCONST GpRect*,GpUnit,GraphicsContainer*); +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics*,GraphicsContainer); GpStatus WINGDIPAPI GdipComment(GpGraphics*,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**);

1 0

Andrew Eikum : gdiplus/tests: Test cases for GdipBeginContainer2.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 0ed10bf696dc6cf09034eaa2ca124f6ace52cd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed10bf696dc6cf09034eaa2c… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jul 5 15:53:07 2009 -0500 gdiplus/tests: Test cases for GdipBeginContainer2. --- dlls/gdiplus/tests/graphics.c | 186 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ad7f2d3..23aa717 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -323,6 +323,191 @@ static void test_GdipDrawArcI(void) ReleaseDC(0, hdc); } +static void test_BeginContainer2(void) +{ + GpMatrix *transform; + GpRectF clip; + REAL defClip[] = {5, 10, 15, 20}; + REAL elems[6], defTrans[] = {1, 2, 3, 4, 5, 6}; + GraphicsContainer cont1, cont2, cont3, cont4; + CompositingQuality compqual, defCompqual = CompositingQualityHighSpeed; + CompositingMode compmode, defCompmode = CompositingModeSourceOver; + InterpolationMode interp, defInterp = InterpolationModeHighQualityBicubic; + REAL scale, defScale = 17; + GpUnit unit, defUnit = UnitPixel; + PixelOffsetMode offsetmode, defOffsetmode = PixelOffsetModeHighSpeed; + SmoothingMode smoothmode, defSmoothmode = SmoothingModeAntiAlias; + UINT contrast, defContrast = 5; + TextRenderingHint texthint, defTexthint = TextRenderingHintAntiAlias; + + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + /* null graphics, null container */ + status = GdipBeginContainer2(NULL, &cont1); + expect(InvalidParameter, status); + + status = GdipBeginContainer2(graphics, NULL); + expect(InvalidParameter, status); + + status = GdipEndContainer(NULL, cont1); + expect(InvalidParameter, status); + + /* test all quality-related values */ + GdipSetCompositingMode(graphics, defCompmode); + GdipSetCompositingQuality(graphics, defCompqual); + GdipSetInterpolationMode(graphics, defInterp); + GdipSetPageScale(graphics, defScale); + GdipSetPageUnit(graphics, defUnit); + GdipSetPixelOffsetMode(graphics, defOffsetmode); + GdipSetSmoothingMode(graphics, defSmoothmode); + GdipSetTextContrast(graphics, defContrast); + GdipSetTextRenderingHint(graphics, defTexthint); + + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + GdipSetCompositingQuality(graphics, CompositingQualityHighQuality); + GdipSetInterpolationMode(graphics, InterpolationModeBilinear); + GdipSetPageScale(graphics, 10); + GdipSetPageUnit(graphics, UnitDocument); + GdipSetPixelOffsetMode(graphics, PixelOffsetModeHalf); + GdipSetSmoothingMode(graphics, SmoothingModeNone); + GdipSetTextContrast(graphics, 7); + GdipSetTextRenderingHint(graphics, TextRenderingHintClearTypeGridFit); + + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + GdipGetCompositingMode(graphics, &compmode); + ok(defCompmode == compmode, "Expected Compositing Mode to be restored to %d, got %d\n", defCompmode, compmode); + + GdipGetCompositingQuality(graphics, &compqual); + ok(defCompqual == compqual, "Expected Compositing Quality to be restored to %d, got %d\n", defCompqual, compqual); + + GdipGetInterpolationMode(graphics, &interp); + ok(defInterp == interp, "Expected Interpolation Mode to be restored to %d, got %d\n", defInterp, interp); + + GdipGetPageScale(graphics, &scale); + ok(fabs(defScale - scale) < 0.0001, "Expected Page Scale to be restored to %f, got %f\n", defScale, scale); + + GdipGetPageUnit(graphics, &unit); + ok(defUnit == unit, "Expected Page Unit to be restored to %d, got %d\n", defUnit, unit); + + GdipGetPixelOffsetMode(graphics, &offsetmode); + ok(defOffsetmode == offsetmode, "Expected Pixel Offset Mode to be restored to %d, got %d\n", defOffsetmode, offsetmode); + + GdipGetSmoothingMode(graphics, &smoothmode); + ok(defSmoothmode == smoothmode, "Expected Smoothing Mode to be restored to %d, got %d\n", defSmoothmode, smoothmode); + + GdipGetTextContrast(graphics, &contrast); + ok(defContrast == contrast, "Expected Text Contrast to be restored to %d, got %d\n", defContrast, contrast); + + GdipGetTextRenderingHint(graphics, &texthint); + ok(defTexthint == texthint, "Expected Text Hint to be restored to %d, got %d\n", defTexthint, texthint); + + /* test world transform */ + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + GdipCreateMatrix2(defTrans[0], defTrans[1], defTrans[2], defTrans[3], + defTrans[4], defTrans[5], &transform); + GdipSetWorldTransform(graphics, transform); + GdipDeleteMatrix(transform); + transform = NULL; + + status = GdipBeginContainer2(graphics, &cont2); + expect(Ok, status); + + GdipCreateMatrix2(10, 20, 30, 40, 50, 60, &transform); + GdipSetWorldTransform(graphics, transform); + GdipDeleteMatrix(transform); + transform = NULL; + + status = GdipEndContainer(graphics, cont2); + expect(Ok, status); + + GdipCreateMatrix(&transform); + GdipGetWorldTransform(graphics, transform); + GdipGetMatrixElements(transform, elems); + ok(fabs(defTrans[0] - elems[0]) < 0.0001 && + fabs(defTrans[1] - elems[1]) < 0.0001 && + fabs(defTrans[2] - elems[2]) < 0.0001 && + fabs(defTrans[3] - elems[3]) < 0.0001 && + fabs(defTrans[4] - elems[4]) < 0.0001 && + fabs(defTrans[5] - elems[5]) < 0.0001, + "Expected World Transform Matrix to be restored to [%f, %f, %f, %f, %f, %f], got [%f, %f, %f, %f, %f, %f]\n", + defTrans[0], defTrans[1], defTrans[2], defTrans[3], defTrans[4], defTrans[5], + elems[0], elems[1], elems[2], elems[3], elems[4], elems[5]); + GdipDeleteMatrix(transform); + transform = NULL; + + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + /* test clipping */ + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + GdipSetClipRect(graphics, defClip[0], defClip[1], defClip[2], defClip[3], CombineModeReplace); + + status = GdipBeginContainer2(graphics, &cont2); + expect(Ok, status); + + GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); + + status = GdipEndContainer(graphics, cont2); + + GdipGetClipBounds(graphics, &clip); + todo_wine ok(fabs(defClip[0] - clip.X) < 0.0001 && + fabs(defClip[1] - clip.Y) < 0.0001 && + fabs(defClip[2] - clip.Width) < 0.0001 && + fabs(defClip[3] - clip.Height) < 0.0001, + "Expected Clipping Rectangle to be restored to [%f, %f, %f, %f], got [%f, %f, %f, %f]\n", + defClip[0], defClip[1], defClip[2], defClip[3], + clip.X, clip.Y, clip.Width, clip.Height); + + status = GdipEndContainer(graphics, cont1); + + /* nesting */ + status = GdipBeginContainer2(graphics, &cont1); + expect(Ok, status); + + status = GdipBeginContainer2(graphics, &cont2); + expect(Ok, status); + + status = GdipBeginContainer2(graphics, &cont3); + expect(Ok, status); + + status = GdipEndContainer(graphics, cont3); + expect(Ok, status); + + status = GdipBeginContainer2(graphics, &cont4); + expect(Ok, status); + + status = GdipEndContainer(graphics, cont4); + expect(Ok, status); + + /* skip cont2 */ + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + /* end an already-ended container */ + status = GdipEndContainer(graphics, cont1); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + static void test_GdipDrawBezierI(void) { GpStatus status; @@ -1511,6 +1696,7 @@ START_TEST(graphics) test_GdipDrawLinesI(); test_GdipDrawString(); test_Get_Release_DC(); + test_BeginContainer2(); test_transformpoints(); test_get_set_clip(); test_isempty();

1 0

Huw Davies : gdi32: Use a modified version of MulDiv to match native behaviour.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 787ead80880b5afbcba36f90a431c74634615f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787ead80880b5afbcba36f90a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 7 11:32:41 2009 +0100 gdi32: Use a modified version of MulDiv to match native behaviour. --- dlls/gdi32/metafile.c | 46 ++++++++++++++++++------- dlls/gdi32/tests/metafile.c | 79 ++++++++++++++++++++++++++++++++----------- 2 files changed, 92 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 2e34f37..a14928c 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1222,6 +1222,26 @@ end: return ret; } +/******************************************************************* + * muldiv + * + * Behaves somewhat differently to MulDiv when the answer is -ve + * and also rounds n.5 towards zero + */ +static INT muldiv(INT m1, INT m2, INT d) +{ + LONGLONG ret; + + ret = ((LONGLONG)m1 * m2 + d/2) / d; /* Always add d/2 even if ret will be -ve */ + + if((LONGLONG)m1 * m2 * 2 == (2 * ret - 1) * d) /* If the answer is exactly n.5 round towards zero */ + { + if(ret > 0) ret--; + else ret++; + } + return ret; +} + /****************************************************************** * set_window * @@ -1247,28 +1267,28 @@ static BOOL set_window(HDC hdc, HENHMETAFILE emf, HDC ref_dc, INT map_mode) case MM_TEXT: case MM_ISOTROPIC: case MM_ANISOTROPIC: - pt.y = MulDiv(header.rclFrame.top, vert_res, vert_size * 100); - pt.x = MulDiv(header.rclFrame.left, horz_res, horz_size * 100); + pt.y = muldiv(header.rclFrame.top, vert_res, vert_size * 100); + pt.x = muldiv(header.rclFrame.left, horz_res, horz_size * 100); break; case MM_LOMETRIC: - pt.y = MulDiv(-header.rclFrame.top, 1, 10) + 1; - pt.x = MulDiv( header.rclFrame.left, 1, 10); + pt.y = muldiv(-header.rclFrame.top, 1, 10) + 1; + pt.x = muldiv( header.rclFrame.left, 1, 10); break; case MM_HIMETRIC: pt.y = -header.rclFrame.top + 1; - pt.x = header.rclFrame.left; + pt.x = (header.rclFrame.left >= 0) ? header.rclFrame.left : header.rclFrame.left + 1; /* See the tests */ break; case MM_LOENGLISH: - pt.y = MulDiv(-header.rclFrame.top, 10, 254) + 1; - pt.x = MulDiv( header.rclFrame.left, 10, 254); + pt.y = muldiv(-header.rclFrame.top, 10, 254) + 1; + pt.x = muldiv( header.rclFrame.left, 10, 254); break; case MM_HIENGLISH: - pt.y = MulDiv(-header.rclFrame.top, 100, 254) + 1; - pt.x = MulDiv( header.rclFrame.left, 100, 254); + pt.y = muldiv(-header.rclFrame.top, 100, 254) + 1; + pt.x = muldiv( header.rclFrame.left, 100, 254); break; case MM_TWIPS: - pt.y = MulDiv(-header.rclFrame.top, 72 * 20, 2540) + 1; - pt.x = MulDiv( header.rclFrame.left, 72 * 20, 2540); + pt.y = muldiv(-header.rclFrame.top, 72 * 20, 2540) + 1; + pt.x = muldiv( header.rclFrame.left, 72 * 20, 2540); break; default: WARN("Unknown map mode %d\n", map_mode); @@ -1276,8 +1296,8 @@ static BOOL set_window(HDC hdc, HENHMETAFILE emf, HDC ref_dc, INT map_mode) } SetWindowOrgEx(hdc, pt.x, pt.y, NULL); - pt.x = MulDiv(header.rclFrame.right - header.rclFrame.left, horz_res, horz_size * 100); - pt.y = MulDiv(header.rclFrame.bottom - header.rclFrame.top, vert_res, vert_size * 100); + pt.x = muldiv(header.rclFrame.right - header.rclFrame.left, horz_res, horz_size * 100); + pt.y = muldiv(header.rclFrame.bottom - header.rclFrame.top, vert_res, vert_size * 100); SetWindowExtEx(hdc, pt.x, pt.y, NULL); return TRUE; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index d1966da..49a5489 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2308,11 +2308,25 @@ static void test_SetWinMetaFileBits(void) HeapFree(GetProcessHeap(), 0, buffer); } -static void getwinmetafilebits(UINT mode, int scale) +/* This is somewhat different to MulDiv, but appears to be how native behaves */ +static INT muldiv(INT m1, INT m2, INT d) +{ + LONGLONG ret; + + ret = ((LONGLONG)m1 * m2 + d/2) / d; /* Always add d/2 even if ret will be -ve */ + + if((LONGLONG)m1 * m2 * 2 == (2 * ret - 1) * d) /* If the answer is exactly n.5 round towards zero */ + { + if(ret > 0) ret--; + else ret++; + } + return ret; +} + +static void getwinmetafilebits(UINT mode, int scale, RECT *rc) { HENHMETAFILE emf; HDC display_dc, emf_dc; - RECT rc; ENHMETAHEADER *enh_header; UINT size, emf_size, i; WORD check = 0; @@ -2322,17 +2336,19 @@ static void getwinmetafilebits(UINT mode, int scale) INT horz_res, vert_res, horz_size, vert_size; display_dc = GetDC(NULL); + ok(display_dc != NULL, "display_dc is NULL\n"); horz_res = GetDeviceCaps(display_dc, HORZRES); vert_res = GetDeviceCaps(display_dc, VERTRES); horz_size = GetDeviceCaps(display_dc, HORZSIZE); vert_size = GetDeviceCaps(display_dc, VERTSIZE); - SetRect(&rc, 1000, 2000, 3000, 6000); - emf_dc = CreateEnhMetaFileA(display_dc, NULL, &rc, NULL); + emf_dc = CreateEnhMetaFileA(display_dc, NULL, rc, NULL); + ok(emf_dc != NULL, "emf_dc is NULL\n"); for(i = 0; i < 3000; i++) /* This is enough to take emf_size > 0xffff */ Rectangle(emf_dc, 0, 0, 1000, 20); emf = CloseEnhMetaFile(emf_dc); + ok(emf != NULL, "emf is NULL\n"); emf_size = GetEnhMetaFileBits(emf, 0, NULL); enh_header = HeapAlloc(GetProcessHeap(), 0, emf_size); @@ -2342,6 +2358,8 @@ static void getwinmetafilebits(UINT mode, int scale) have different resolutions */ enh_header->szlDevice.cx *= scale; emf = SetEnhMetaFileBits(emf_size, (BYTE*)enh_header); + ok(emf != NULL, "emf is NULL\n"); + ok(EqualRect((RECT*)&enh_header->rclFrame, rc), "Frame rectangles differ\n"); size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); ok(size, "GetWinMetaFileBits returns 0\n"); @@ -2403,28 +2421,28 @@ static void getwinmetafilebits(UINT mode, int scale) case MM_TEXT: case MM_ISOTROPIC: case MM_ANISOTROPIC: - pt.y = MulDiv(rc.top, vert_res, vert_size * 100); - pt.x = MulDiv(rc.left, horz_res, horz_size * 100); + pt.y = muldiv(rc->top, vert_res, vert_size * 100); + pt.x = muldiv(rc->left, horz_res, horz_size * 100); break; case MM_LOMETRIC: - pt.y = MulDiv(-rc.top, 1, 10) + 1; - pt.x = MulDiv(rc.left, 1, 10); + pt.y = muldiv(-rc->top, 1, 10) + 1; + pt.x = muldiv( rc->left, 1, 10); break; case MM_HIMETRIC: - pt.y = -rc.top + 1; - pt.x = rc.left; + pt.y = -rc->top + 1; + pt.x = (rc->left >= 0) ? rc->left : rc->left + 1; /* strange but true */ break; case MM_LOENGLISH: - pt.y = MulDiv(-rc.top, 10, 254) + 1; - pt.x = MulDiv( rc.left, 10, 254); + pt.y = muldiv(-rc->top, 10, 254) + 1; + pt.x = muldiv( rc->left, 10, 254); break; case MM_HIENGLISH: - pt.y = MulDiv(-rc.top, 100, 254) + 1; - pt.x = MulDiv( rc.left, 100, 254); + pt.y = muldiv(-rc->top, 100, 254) + 1; + pt.x = muldiv( rc->left, 100, 254); break; case MM_TWIPS: - pt.y = MulDiv(-rc.top, 72 * 20, 2540) + 1; - pt.x = MulDiv( rc.left, 72 * 20, 2540); + pt.y = muldiv(-rc->top, 72 * 20, 2540) + 1; + pt.x = muldiv( rc->left, 72 * 20, 2540); break; default: pt.x = pt.y = 0; @@ -2437,8 +2455,9 @@ static void getwinmetafilebits(UINT mode, int scale) if(rec_num == mfcomment_chunks + 2) { ok(rec->rdFunction == META_SETWINDOWEXT, "got %04x\n", rec->rdFunction); - ok((short)rec->rdParm[0] == MulDiv(rc.bottom - rc.top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); - ok((short)rec->rdParm[1] == MulDiv(rc.right - rc.left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); + ok((short)rec->rdParm[0] == muldiv(rc->bottom - rc->top, vert_res, vert_size * 100), "got %d\n", (short)rec->rdParm[0]); + ok((short)rec->rdParm[1] == muldiv(rc->right - rc->left, horz_res, horz_size * 100), "got %d\n", (short)rec->rdParm[1]); + } rec_num++; @@ -2455,11 +2474,31 @@ static void getwinmetafilebits(UINT mode, int scale) static void test_GetWinMetaFileBits(void) { UINT mode; + RECT frames[] = + { + { 1000, 2000, 3000, 6000}, + {-1000, 2000, 3000, 6000}, + { 1000, -2000, 3000, 6000}, + { 1005, 2005, 3000, 6000}, + {-1005, -2005, 3000, 6000}, + {-1005, -2010, 3000, 6000}, + {-1005, 2010, 3000, 6000}, + { 0, 0, 1, 1}, + { -1, -1, 1, 1}, + { 0, 0, 0, 0} + }; for(mode = MM_MIN; mode <= MM_MAX; mode++) { - getwinmetafilebits(mode, 1); - getwinmetafilebits(mode, 2); + RECT *rc; + trace("mode %d\n", mode); + + for(rc = frames; rc->right - rc->left > 0; rc++) + { + trace("frame %d,%d - %d,%d\n", rc->left, rc->top, rc->right, rc->bottom); + getwinmetafilebits(mode, 1, rc); + getwinmetafilebits(mode, 2, rc); + } } }

1 0

Paul Vriens : shell32: Add missing encoding for Dutch resources.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 5f5c34085539bfbbec4d5757508a7a2a83b4b445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c34085539bfbbec4d57575… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 13:01:18 2009 +0200 shell32: Add missing encoding for Dutch resources. --- dlls/shell32/shell32_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 9ea879d..33a65bc 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -19,6 +19,8 @@ #include "shresdef.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENU_001 MENU DISCARDABLE

1 0

Huw Davies : winhlp32: Add English neutral translations.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 7ceb4e7278d215dcd482a41c69b9af19ddb4506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ceb4e7278d215dcd482a41c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 17:10:39 2009 +0100 winhlp32: Add English neutral translations. --- programs/winhlp32/En.rc | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/En.rc b/programs/winhlp32/En.rc index cff0c6d..a4e9d8a 100644 --- a/programs/winhlp32/En.rc +++ b/programs/winhlp32/En.rc @@ -68,6 +68,51 @@ MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } } +MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +{ + POPUP "&File" { + MENUITEM "&Open", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Print", MNID_FILE_PRINT + MENUITEM "Printer &setup...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", MNID_FILE_EXIT + } + POPUP "&Edit" { + MENUITEM "&Copy...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE + } + POPUP "&Bookmark" { + MENUITEM "&Define...", MNID_BKMK_DEFINE + } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colours", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Help" { + MENUITEM "Help &on help", MNID_HELP_HELPON + MENUITEM "Always on &top", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Info...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&About Wine", MNID_HELP_WINE +#endif + } +} + IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -125,3 +170,26 @@ BEGIN MENUITEM "Use system colors", MNID_CTXT_SYSTEM_COLORS END END + +CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +BEGIN + POPUP "" + BEGIN + MENUITEM "Annotation...", MNID_CTXT_ANNOTATE + MENUITEM "Copy", MNID_CTXT_COPY + MENUITEM "Print...", MNID_CTXT_PRINT + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Large", MNID_CTXT_FONTS_LARGE + END + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_CTXT_HELP_DEFAULT + MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE + MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Use system colours", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Michael Stefaniuc : oleacc: Add missing encoding info to the German resource file.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: b880d71e28dd2ac82f689a442b26b7f0284ff45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b880d71e28dd2ac82f689a442… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 11:06:26 2009 +0200 oleacc: Add missing encoding info to the German resource file. The file is already UTF-8. --- dlls/oleacc/oleacc_De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/oleacc_De.rc b/dlls/oleacc/oleacc_De.rc index f39ff39..f15cc2d 100644 --- a/dlls/oleacc/oleacc_De.rc +++ b/dlls/oleacc/oleacc_De.rc @@ -20,6 +20,8 @@ #include "oleacc.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Michael Stefaniuc : cryptdlg: Add missing encoding info to the German resource file.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: b1edb166911bd0688a81d46ec7cd76b7468732fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1edb166911bd0688a81d46ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 11:06:36 2009 +0200 cryptdlg: Add missing encoding info to the German resource file. The file is already UTF-8. --- dlls/cryptdlg/cryptdlg_De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_De.rc b/dlls/cryptdlg/cryptdlg_De.rc index d3181ef..cd3fa96 100644 --- a/dlls/cryptdlg/cryptdlg_De.rc +++ b/dlls/cryptdlg/cryptdlg_De.rc @@ -20,6 +20,8 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0