December 2008 - Wine-commits

ByeongSik Jeon : gdi32: Unify Chinese and Japanese default font name.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: d1ca64b3f51548d1ab6b849ef2f592b6eddb656d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ca64b3f51548d1ab6b849ef… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Thu Dec 11 03:29:07 2008 +0900 gdi32: Unify Chinese and Japanese default font name. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/gdiobj.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2894dca..aac5fde 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2276,7 +2276,7 @@ static const struct nls_update_font_list /* Chinese Simplified */ { 936, 936, "vga936.fon", "svgafix.fon", "svgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", - "Tahoma", "Times New Roman", /* FIXME unverified */ + "SimSun", "NSimSun", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, { 0 }, { 0 }, { 0 } }, diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index a4f2fb5..910f49b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -341,7 +341,7 @@ static const struct DefaultFontInfo default_fonts[] = { /* DefaultGuiFont */ 9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SHIFTJIS_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'M','S',' ','U','I',' ','G','o','t','h','i','c','\0'} + {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, { GB2312_CHARSET, @@ -363,7 +363,7 @@ static const struct DefaultFontInfo default_fonts[] = { /* DefaultGuiFont */ 9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, GB2312_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'S','i','m','S','u','n','\0'} + {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, { HANGEUL_CHARSET, @@ -407,7 +407,7 @@ static const struct DefaultFontInfo default_fonts[] = { /* DefaultGuiFont */ 9, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, CHINESEBIG5_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - {'P','M','i','n','g','L','i','U','\0'} + {'M','S',' ','S','h','e','l','l',' ','D','l','g','\0'} }, }, { JOHAB_CHARSET,

1 0

Henri Verbeet : wined3d: Remove some more unused code.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 9541c346b3232f6d1aea79172f769d3d21f1a69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9541c346b3232f6d1aea79172… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 11 11:52:37 2008 +0100 wined3d: Remove some more unused code. --- dlls/wined3d/pixelshader.c | 3 --- dlls/wined3d/vertexshader.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f8dd4a3..969d25a 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -119,9 +119,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_GetFunction(IWineD3DPixelShader* TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData); (*(DWORD **) pData) = NULL; } else { - if (This->baseShader.functionLength == 0) { - - } TRACE("(%p) : GetFunction copying to %p\n", This, pData); memcpy(pData, This->baseShader.function, This->baseShader.functionLength); } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e153a1f..4f87241 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -415,9 +415,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_GetFunction(IWineD3DVertexShader* TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData); (*(DWORD **) pData) = NULL; } else { - if(This->baseShader.functionLength == 0){ - - } TRACE("(%p) : GetFunction copying to %p\n", This, pData); memcpy(pData, This->baseShader.function, This->baseShader.functionLength); }

1 0

Henri Verbeet : wined3d: shader_trace_init() shouldn't have side effects.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 8124f5e14aa1d9dd2e76761a838a44edb97bc4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8124f5e14aa1d9dd2e76761a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 11 11:52:37 2008 +0100 wined3d: shader_trace_init() shouldn't have side effects. This moves setting baseShader.hex_version and baseShader.functionLength to shader_get_registers_used(), where it's more appropriate. --- dlls/wined3d/baseshader.c | 97 ++++++++++++++++++++------------------- dlls/wined3d/pixelshader.c | 94 +++++++++++++++++++------------------- dlls/wined3d/vertexshader.c | 5 +- dlls/wined3d/wined3d_private.h | 5 +-- 4 files changed, 101 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8124f5e14aa1d9dd2e767…

1 0

Henri Verbeet : wined3d: Get rid of the "len" variable in shader_trace_init ().
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: a2f259afff1c90e4bd4455e35b2d15844587e57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f259afff1c90e4bd4455e35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 11 11:52:36 2008 +0100 wined3d: Get rid of the "len" variable in shader_trace_init(). --- dlls/wined3d/baseshader.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 8cd2490..9ab1d96 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -990,7 +990,6 @@ void shader_trace_init( const DWORD* pToken = pFunction; const SHADER_OPCODE* curOpcode = NULL; DWORD opcode_token; - unsigned int len = 0; DWORD i; TRACE("(%p) : Parsing program\n", This); @@ -1011,7 +1010,6 @@ void shader_trace_init( WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version), WINED3DSHADER_VERSION_MINOR(This->baseShader.hex_version)); ++pToken; - ++len; continue; } if (shader_is_comment(*pToken)) /* comment */ @@ -1020,12 +1018,10 @@ void shader_trace_init( ++pToken; TRACE("//%s\n", (const char*)pToken); pToken += comment_len; - len += comment_len + 1; continue; } opcode_token = *pToken++; curOpcode = shader_get_opcode(This->baseShader.shader_ins, This->baseShader.hex_version, opcode_token); - len++; if (!curOpcode) { @@ -1033,7 +1029,6 @@ void shader_trace_init( FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); tokens_read = shader_skip_unrecognized(pToken, This->baseShader.hex_version); pToken += tokens_read; - len += tokens_read; } else { @@ -1047,7 +1042,6 @@ void shader_trace_init( TRACE(" "); shader_dump_param(param, 0, 0, This->baseShader.hex_version); pToken += 2; - len += 2; } else if (curOpcode->opcode == WINED3DSIO_DEF) { @@ -1059,7 +1053,6 @@ void shader_trace_init( *(const float *)(pToken + 3), *(const float *)(pToken + 4)); pToken += 5; - len += 5; } else if (curOpcode->opcode == WINED3DSIO_DEFI) { @@ -1069,14 +1062,12 @@ void shader_trace_init( *(pToken + 3), *(pToken + 4)); pToken += 5; - len += 5; } else if (curOpcode->opcode == WINED3DSIO_DEFB) { TRACE("defb b%u = %s", *pToken & WINED3DSP_REGNUM_MASK, *(pToken + 1)? "true": "false"); pToken += 2; - len += 2; } else { @@ -1127,7 +1118,6 @@ void shader_trace_init( { tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token); pToken += tokens_read; - len += tokens_read; shader_dump_ins_modifiers(param); TRACE(" "); @@ -1138,7 +1128,6 @@ void shader_trace_init( if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) { pToken++; - len++; } /* Other source tokens */ @@ -1146,7 +1135,6 @@ void shader_trace_init( { tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token); pToken += tokens_read; - len += tokens_read; TRACE((i == 0)? " " : ", "); shader_dump_param(param, addr_token, 1, This->baseShader.hex_version); @@ -1155,7 +1143,9 @@ void shader_trace_init( TRACE("\n"); } } - This->baseShader.functionLength = (len + 1) * sizeof(DWORD); + ++pToken; + + This->baseShader.functionLength = ((char *)pToken - (char *)pFunction); } void shader_cleanup(IWineD3DBaseShader *iface)

1 0

Henri Verbeet : wined3d: baseShader. functionLength should be 0 when a NULL pFunction is passed.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 15d497cb26f26c18786c77cdbed1b9145f7e8daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d497cb26f26c18786c77cdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 11 11:52:37 2008 +0100 wined3d: baseShader.functionLength should be 0 when a NULL pFunction is passed. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9ab1d96..23dd8f1 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -997,7 +997,7 @@ void shader_trace_init( if (!pFunction) { WARN("Got a NULL pFunction, returning.\n"); - This->baseShader.functionLength = 1; /* no Function defined use fixed function vertex processing */ + This->baseShader.functionLength = 0; /* no Function defined use fixed function vertex processing */ return; }

1 0

Nikolay Sivov : gdiplus: Stub for GdipGetNearestColor.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 63ae714fc660f65287d8cf8177ed95d96490bb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ae714fc660f65287d8cf817… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 11 10:32:43 2008 +0300 gdiplus: Stub for GdipGetNearestColor. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 13 +++++++++++++ dlls/gdiplus/tests/graphics.c | 3 +++ include/gdiplusflat.h | 1 + 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b3d2103..9473f1b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -320,7 +320,7 @@ @ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) @ stub GdipGetMetafileHeaderFromStream @ stub GdipGetMetafileHeaderFromWmf -@ stub GdipGetNearestColor +@ stdcall GdipGetNearestColor(ptr ptr) @ stdcall GdipGetPageScale(ptr ptr) @ stdcall GdipGetPageUnit(ptr ptr) @ stdcall GdipGetPathData(ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b9cb1c2..b19c7bb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2456,6 +2456,19 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) +{ + if(!graphics || !argb) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + FIXME("(%p, %p): stub\n", graphics, argb); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics *graphics, REAL *scale) { TRACE("(%p, %p)\n", graphics, scale); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fd28d5e..fb98a38 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -485,6 +485,7 @@ static void test_Get_Release_DC(void) GpRegion *clip; INT i; BOOL res; + ARGB color = 0x00000000; pt[0].X = 10; pt[0].Y = 10; @@ -658,6 +659,8 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipGetInterpolationMode(graphics, &intmode); expect(ObjectBusy, status); status = Ok; + status = GdipGetNearestColor(graphics, &color); + expect(ObjectBusy, status); status = Ok; status = GdipGetPageScale(graphics, &r); expect(ObjectBusy, status); status = Ok; status = GdipGetPageUnit(graphics, &unit); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1f93258..216b2f3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -196,6 +196,7 @@ GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); +GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*);

1 0

Paul Vriens : setupapi/tests: Fix a test failure on Vista/W2K8.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: e755a96fc8a59aee831c00bc75af69334e37dedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e755a96fc8a59aee831c00bc7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 11 11:12:24 2008 +0100 setupapi/tests: Fix a test failure on Vista/W2K8. --- dlls/setupapi/tests/parser.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 2fd4bd1..8869ca1 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -52,6 +52,7 @@ static const char tmpfilename[] = ".\\tmp.inf"; #define A400 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \ "aaaaaaaaaaaaaaaa" A256 +#define A1200 A400 A400 A400 #define A511 A255 A256 #define A4097 "a" A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 A256 @@ -61,7 +62,7 @@ static const char tmpfilename[] = ".\\tmp.inf"; "per%%cent=abcd\nper=1\ncent=2\n22=foo\n" \ "big=" A400 "\n" \ "mydrive=\"C:\\\"\n" \ - "verybig=" A400 A400 A400 "\n" + "verybig=" A1200 "\n" /* create a new file with specified contents and open it */ static HINF test_file_contents( const char *data, UINT *err_line ) @@ -315,7 +316,7 @@ static const struct { "loop=%loop%\n" STR_SECTION, "loop", { "%loop2%" } }, { "%per%%cent%=100\n" STR_SECTION, "12", { "100" } }, { "a=%big%\n" STR_SECTION, "a", { A400 } }, - { "a=%verybig%\n" STR_SECTION, "a", { A511 } }, /* truncated to 511 */ + { "a=%verybig%\n" STR_SECTION, "a", { A511 } }, /* truncated to 511, not on Vista/W2K8 */ { "a=%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 } }, { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, @@ -384,8 +385,16 @@ static void test_key_names(void) { ok( err == 0, "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) - ok( !strcmp( field, key_names[i].fields[index] ), "line %u: bad field %s/%s\n", - i, field, key_names[i].fields[index] ); + { + if (i == 49) + ok( !strcmp( field, key_names[i].fields[index] ) || + !strcmp( field, A1200), /* Vista, W2K8 */ + "line %u: bad field %s/%s\n", + i, field, key_names[i].fields[index] ); + else + ok( !strcmp( field, key_names[i].fields[index] ), "line %u: bad field %s/%s\n", + i, field, key_names[i].fields[index] ); + } else ok( 0, "line %u: got extra field %s\n", i, field ); strcat( buffer, "," );

1 0

Lei Zhang : qcap: Don' t clip intermediate values in YUV to RGB conversion code.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 0537a122c752886f6e87f2e372570ff2d041b0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0537a122c752886f6e87f2e37… Author: Lei Zhang <thestig(a)google.com> Date: Tue Dec 9 16:35:32 2008 -0800 qcap: Don't clip intermediate values in YUV to RGB conversion code. --- dlls/qcap/yuv.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/yuv.c b/dlls/qcap/yuv.c index 358a711..5896ee5 100644 --- a/dlls/qcap/yuv.c +++ b/dlls/qcap/yuv.c @@ -68,21 +68,21 @@ void YUV_Init(void) { for (y_ = 0; y_ <= 255; y_++) { y = ((float) 255 / 219) * (y_ - 16); - yuv_xy[y_] = ValidRange((int) (y)); + yuv_xy[y_] = y; } for (cb = 0; cb <= 255; cb++) { u = ((float) 255 / 224) * (cb - 128); - yuv_gu[cb] = - ValidRange((int) (0.344 * u)); - yuv_bu[cb] = ValidRange((int) (1.772 * u)); + yuv_gu[cb] = -0.344 * u; + yuv_bu[cb] = 1.772 * u; } for (cr = 0; cr <= 255; cr++) { v = ((float) 255 / 224) * (cr - 128); - yuv_rv[cr] = ValidRange((int) (1.402 * v)); - yuv_gv[cr] = - ValidRange((int) (0.714 * v)); + yuv_rv[cr] = 1.402 * v; + yuv_gv[cr] = -0.714 * v; } TRACE("Filled hash table\n"); }

1 0

Paul Vriens : msi/tests: Skip tests on win9x due to different registry keys .
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 194c0530211cd581a798a45633904d49a3eb0221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194c0530211cd581a798a4563… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 10 17:02:12 2008 +0100 msi/tests: Skip tests on win9x due to different registry keys. --- dlls/msi/tests/package.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6645c06..e3565ef 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9523,6 +9523,15 @@ static void test_MsiGetProductProperty(void) DWORD size; LONG res; UINT r; + SC_HANDLE scm; + + scm = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); + if (!scm && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("Different registry keys on Win9x and WinMe\n"); + return; + } + CloseServiceHandle(scm); GetCurrentDirectoryA(MAX_PATH, path); lstrcatA(path, "\\");

1 0

Paul Vriens : gdi32/tests: Remove the todo_wine logic where appropriate.
by Alexandre Julliard 11 Dec '08

11 Dec '08

Module: wine Branch: master Commit: 52a914db83385fa2197c7ea12fac21ad3e19ef53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a914db83385fa2197c7ea12… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 10 17:27:30 2008 +0100 gdi32/tests: Remove the todo_wine logic where appropriate. --- dlls/gdi32/tests/metafile.c | 75 ++++++++++--------------------------------- 1 files changed, 17 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 21e6767..b0c6f24 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -995,33 +995,15 @@ static void dump_EMREXTTEXTOUT(const EMREXTTEXTOUTW *eto) } static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr2, - const char *desc, BOOL ignore_scaling, BOOL todo) + const char *desc, BOOL ignore_scaling) { int diff; - if (emr1->iType != emr2->iType && todo) - { - todo_wine - { - ok(emr1->iType == emr2->iType, "%s: emr->iType %u != %u\n", - desc, emr1->iType, emr2->iType); - } - } - else - ok(emr1->iType == emr2->iType, "%s: emr->iType %u != %u\n", - desc, emr1->iType, emr2->iType); + ok(emr1->iType == emr2->iType, "%s: emr->iType %u != %u\n", + desc, emr1->iType, emr2->iType); - if (emr1->nSize != emr2->nSize && todo) - { - todo_wine - { - ok(emr1->nSize == emr2->nSize, "%s: emr->nSize %u != %u\n", - desc, emr1->nSize, emr2->nSize); - } - } - else - ok(emr1->nSize == emr2->nSize, "%s: emr->nSize %u != %u\n", - desc, emr1->nSize, emr2->nSize); + ok(emr1->nSize == emr2->nSize, "%s: emr->nSize %u != %u\n", + desc, emr1->nSize, emr2->nSize); /* iType and nSize mismatches are fatal */ if (emr1->iType != emr2->iType || emr1->nSize != emr2->nSize) return FALSE; @@ -1060,13 +1042,8 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr } else diff = memcmp(emr1, emr2, emr1->nSize); - if (diff && todo) - { - todo_wine - ok(diff == 0, "%s: contents of record %u don't match\n", desc, emr1->iType); - } - else - ok(diff == 0, "%s: contents of record %u don't match\n", desc, emr1->iType); + + ok(diff == 0, "%s: contents of record %u don't match\n", desc, emr1->iType); if (diff) { @@ -1074,7 +1051,7 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr dump_emf_record(emr2, "actual bits"); } - return diff == 0 || todo; /* report all non-fatal record mismatches */ + return diff == 0; /* report all non-fatal record mismatches */ } /* Compare the EMF produced by a test function with the @@ -1085,7 +1062,7 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr */ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, UINT bsize, const char *desc, - BOOL ignore_scaling, BOOL todo) + BOOL ignore_scaling) { unsigned char buf[MF_BUFSIZE]; UINT mfsize, offset; @@ -1096,12 +1073,6 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, if (mfsize < MF_BUFSIZE) { - if (mfsize != bsize && todo) - { - todo_wine - ok(mfsize == bsize, "%s: mfsize=%d, bsize=%d\n", desc, mfsize, bsize); - } - else ok(mfsize == bsize, "%s: mfsize=%d, bsize=%d\n", desc, mfsize, bsize); } else @@ -1119,20 +1090,8 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, ok(emh1->iType == emh2->iType, "expected EMR_HEADER, got %u\n", emh2->iType); ok(emh1->nSize == emh2->nSize, "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); ok(emh1->dSignature == emh2->dSignature, "expected dSignature %u, got %u\n", emh1->dSignature, emh2->dSignature); - if (todo && emh1->nBytes != emh2->nBytes) - { - todo_wine - ok(emh1->nBytes == emh2->nBytes, "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); - } - else - ok(emh1->nBytes == emh2->nBytes, "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); - if (todo && emh1->nRecords != emh2->nRecords) - { - todo_wine - ok(emh1->nRecords == emh2->nRecords, "expected nBytes %u, got %u\n", emh1->nRecords, emh2->nRecords); - } - else - ok(emh1->nRecords == emh2->nRecords, "expected nBytes %u, got %u\n", emh1->nRecords, emh2->nRecords); + ok(emh1->nBytes == emh2->nBytes, "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); + ok(emh1->nRecords == emh2->nRecords, "expected nBytes %u, got %u\n", emh1->nRecords, emh2->nRecords); offset = emh1->nSize; while (offset < emh1->nBytes) @@ -1143,7 +1102,7 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, trace("EMF record %u, size %u/record %u, size %u\n", emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); - if (!match_emf_record(emr1, emr2, desc, ignore_scaling, todo)) return -1; + if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; offset += emr1->nSize; } @@ -1483,7 +1442,7 @@ static void test_emf_ExtTextOut_on_path(void) * are there, but their contents don't match for different reasons. */ if (compare_emf_bits(hMetafile, EMF_TEXTOUT_ON_PATH_BITS, sizeof(EMF_TEXTOUT_ON_PATH_BITS), - "emf_TextOut_on_path", FALSE, FALSE) != 0) + "emf_TextOut_on_path", FALSE) != 0) { dump_emf_bits(hMetafile, "emf_TextOut_on_path"); dump_emf_records(hMetafile, "emf_TextOut_on_path"); @@ -1679,7 +1638,7 @@ static void test_emf_clipping(void) ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); if (compare_emf_bits(hemf, EMF_CLIPPING, sizeof(EMF_CLIPPING), - "emf_clipping", FALSE, FALSE) != 0) + "emf_clipping", FALSE) != 0) { dump_emf_bits(hemf, "emf_clipping"); dump_emf_records(hemf, "emf_clipping"); @@ -1788,7 +1747,7 @@ static void test_mf_conversions(void) hemf = create_converted_emf(&mfp); if (compare_emf_bits(hemf, EMF_LINETO_MM_ANISOTROPIC_BITS, sizeof(EMF_LINETO_MM_ANISOTROPIC_BITS), - "emf_LineTo MM_ANISOTROPIC", TRUE, FALSE) != 0) + "emf_LineTo MM_ANISOTROPIC", TRUE) != 0) { dump_emf_bits(hemf, "emf_LineTo MM_ANISOTROPIC"); dump_emf_records(hemf, "emf_LineTo MM_ANISOTROPIC"); @@ -1813,7 +1772,7 @@ static void test_mf_conversions(void) hemf = create_converted_emf(&mfp); if (compare_emf_bits(hemf, EMF_LINETO_MM_TEXT_BITS, sizeof(EMF_LINETO_MM_TEXT_BITS), - "emf_LineTo MM_TEXT", TRUE, FALSE) != 0) + "emf_LineTo MM_TEXT", TRUE) != 0) { dump_emf_bits(hemf, "emf_LineTo MM_TEXT"); dump_emf_records(hemf, "emf_LineTo MM_TEXT"); @@ -1833,7 +1792,7 @@ static void test_mf_conversions(void) hemf = create_converted_emf(NULL); if (compare_emf_bits(hemf, EMF_LINETO_BITS, sizeof(EMF_LINETO_BITS), - "emf_LineTo NULL", TRUE, FALSE) != 0) + "emf_LineTo NULL", TRUE) != 0) { dump_emf_bits(hemf, "emf_LineTo NULL"); dump_emf_records(hemf, "emf_LineTo NULL");

1 0