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

Alexander Dorofeyev : quartz: Fix interface leak in EnumMonikerImpl_Release .
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: 02943d96b4bdf4d03760274a46e2c60cbc553ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=02943d96b4bdf4d03760274a4… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Jul 2 00:58:48 2008 +0300 quartz: Fix interface leak in EnumMonikerImpl_Release. --- dlls/quartz/enummoniker.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index 86b4bb4..42ea361 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -123,6 +123,11 @@ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) if (!ref) { + ULONG i; + + for (i = 0; i < This->nMonikerCount; i++) + IMoniker_Release(This->ppMoniker[i]); + CoTaskMemFree(This->ppMoniker); This->ppMoniker = NULL; CoTaskMemFree(This);

1 0

Adam Petaccia : gdiplus: Correct spec entry for GdipFlush.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: 9f65b9a0fc9d3db681e70868377a8e8bf5dc6ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f65b9a0fc9d3db681e708683… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 1 20:46:31 2008 -0400 gdiplus: Correct spec entry for GdipFlush. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 61cc2de..587f2ab 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -234,7 +234,7 @@ @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem @ stub GdipFlattenPath -@ stdcall GdipFlush(long) +@ stdcall GdipFlush(ptr long) @ stdcall GdipFree(ptr) @ stub GdipGetAdjustableArrowCapFillState @ stub GdipGetAdjustableArrowCapHeight

1 0

Adam Petaccia : gdiplus: Test GdipCloneImage.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: de5b4d7c7fca07d0389a5fae4c09d03b540ea8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5b4d7c7fca07d0389a5fae4… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 1 21:04:10 2008 -0400 gdiplus: Test GdipCloneImage. --- dlls/gdiplus/tests/image.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 686fe54..38a58b9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -478,6 +478,35 @@ static void test_GdipGetImageFlags(void) expect(InvalidParameter, stat); } +static void test_GdipCloneImage(void) +{ + GpStatus stat; + GpRectF rectF; + GpUnit unit; + GpBitmap *bm; + GpImage *image_src, *image_dest = NULL; + const INT WIDTH = 10, HEIGHT = 20; + + /* Create an image, clone it, delete the original, make sure the copy works */ + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); +todo_wine +{ + image_src = ((GpImage*)bm); + stat = GdipCloneImage(image_src, &image_dest); + expect(Ok, stat); +} + stat = GdipDisposeImage((GpImage*)bm); + expect(Ok, stat); +todo_wine +{ + stat = GdipGetImageBounds(image_dest, &rectF, &unit); + expect(Ok, stat); + stat = GdipDisposeImage(image_dest); + expect(Ok, stat); +} +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -499,6 +528,7 @@ START_TEST(image) test_LockBits(); test_GdipCreateBitmapFromHBITMAP(); test_GdipGetImageFlags(); + test_GdipCloneImage(); GdiplusShutdown(gdiplusToken); }

1 0

Adam Petaccia : gdiplus: Stub GdipCloneImage.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: af29f96939cb204d355a5d03f928d3f1a673f785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af29f96939cb204d355a5d03f… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Tue Jul 1 21:03:34 2008 -0400 gdiplus: Stub GdipCloneImage. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 9 +++++++++ include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 587f2ab..4067873 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -52,7 +52,7 @@ @ stdcall GdipCloneCustomLineCap(ptr ptr) @ stdcall GdipCloneFont(ptr ptr) @ stub GdipCloneFontFamily -@ stub GdipCloneImage +@ stdcall GdipCloneImage(ptr ptr) @ stdcall GdipCloneImageAttributes(ptr ptr) @ stdcall GdipCloneMatrix(ptr ptr) @ stdcall GdipClonePath(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 330e54b..bf2ac35 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -240,6 +240,15 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } +GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) +{ + if (!(image && cloneImage)) return InvalidParameter; + + FIXME("stub: %p, %p", image, cloneImage); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, GpBitmap **bitmap) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5caeb72..4a5146c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -344,6 +344,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GDIPCONST CLSID*,GDIPCONST EncoderParameters*); GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*); +GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**); GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*);

1 0

James Hawkins : gdi32: Fix two tests that fail for all platforms.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: 36e703b409cda204c8ad50a931fecfe55cfe7afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e703b409cda204c8ad50a93… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:20:12 2008 -0500 gdi32: Fix two tests that fail for all platforms. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eef7f36..8769b2f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1655,7 +1655,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", ansi_charset, symbol_charset, russian_charset); - ok(efd.total > 0, "no fonts enumerated: NULL\n"); + ok(efd.total == 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); @@ -1670,7 +1670,7 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", ansi_charset, symbol_charset, russian_charset); - ok(efd.total > 0, "no fonts enumerated: NULL\n"); + ok(efd.total == 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n");

1 0

James Hawkins : ntdll: Skip the byte swap test in win2k.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: 3c969224ad5706c81e50069a1c5d5a548cc9b4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c969224ad5706c81e50069a1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:21:17 2008 -0500 ntdll: Skip the byte swap test in win2k. --- dlls/ntdll/tests/rtl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 443b987..415f0db 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -264,6 +264,12 @@ static void test_RtlUlonglongByteSwap(void) { ULONGLONG result; + if ( pRtlUlonglongByteSwap( 0 ) != 0 ) + { + win_skip("Broken RtlUlonglongByteSwap in win2k\n"); + return; + } + result = pRtlUlonglongByteSwap( ((ULONGLONG)0x76543210 << 32) | 0x87654321 ); ok( (((ULONGLONG)0x21436587 << 32) | 0x10325476) == result, "RtlUlonglongByteSwap(0x7654321087654321) returns 0x%x%08x, expected 0x2143658710325476\n",

1 0

James Hawkins : advapi32: Send in an empty string to RegSetValueEx to avoid a test failure in win95.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: 60b7f641b980d605678812d911c308460ff2238c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b7f641b980d605678812d91… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:23:51 2008 -0500 advapi32: Send in an empty string to RegSetValueEx to avoid a test failure in win95. --- dlls/advapi32/tests/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 58c7202..c4f039a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -437,7 +437,7 @@ static void create_test_entries(void) "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"TP1_SZ",0,REG_SZ, (const BYTE *)sTestpath1, strlen(sTestpath1)+1), "RegSetValueExA failed\n"); - ok(!RegSetValueExA(hkey_main,"TP1_ZB_SZ",0,REG_SZ, NULL, 0), + ok(!RegSetValueExA(hkey_main,"TP1_ZB_SZ",0,REG_SZ, (const BYTE *)"", 0), "RegSetValueExA failed\n"); ok(!RegSetValueExA(hkey_main,"TP2_EXP_SZ",0,REG_EXPAND_SZ, (const BYTE *)sTestpath2, strlen(sTestpath2)+1), "RegSetValueExA failed\n");

1 0

James Hawkins : d3d9: Fix a test that fails with broken drivers.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: 74bb01f4a9c1fb9c249d02ea4359fece4cc5ab65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bb01f4a9c1fb9c249d02ea4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:23:18 2008 -0500 d3d9: Fix a test that fails with broken drivers. --- dlls/d3d9/tests/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fe72e9f..02eaf05 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2014,7 +2014,9 @@ static void test_display_formats() hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, FALSE); if(x8r8g8b8_format_list[i].shouldPass) - ok(hr == D3D_OK, "format %d %d didn't pass with hr=%#08x\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr); + ok(hr == D3D_OK || + broken(hr == D3DERR_NOTAVAILABLE), + "format %d %d didn't pass with hr=%#08x\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat, hr); else ok(hr != D3D_OK, "format %d %d didn't pass while it was expected to\n", x8r8g8b8_format_list[i].DisplayFormat, x8r8g8b8_format_list[i].BackBufferFormat); }

1 0

James Hawkins : rpcrt4: Fix a failing test in win2k.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: d0a8fd48a9b45cd14f6dc830117c6508e272f563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a8fd48a9b45cd14f6dc8301… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:22:39 2008 -0500 rpcrt4: Fix a failing test in win2k. --- dlls/rpcrt4/tests/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 490a151..671159d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -391,7 +391,9 @@ static void test_towers(void) ret = TowerConstruct(&mapi_if_id, &ndr_syntax, "ncacn_np", "\\pipe\\test", NULL, &tower); ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); ret = TowerExplode(tower, NULL, NULL, NULL, NULL, &address); - ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); + ok(ret == RPC_S_OK || + broken(ret != RPC_S_OK), /* win2k, indeterminate */ + "TowerExplode failed with error %ld\n", ret); /* Windows XP SP3 sets address to NULL */ ok(!address || !strcmp(address, ""), "address was \"%s\" instead of \"\"\n or NULL (XP SP3)", address);

1 0

James Hawkins : kernel32: Fix test failures because of a broken ReplaceFile in win2k.
by Alexandre Julliard July 2, 2008

July 2, 2008

Module: wine Branch: master Commit: c7375427826fb42ca078b4833ca9a9234f9a2235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7375427826fb42ca078b4833… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 1 23:20:46 2008 -0500 kernel32: Fix test failures because of a broken ReplaceFile in win2k. --- dlls/kernel32/tests/file.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 57e0496..4730ec4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2074,7 +2074,8 @@ static void test_ReplaceFileA(void) ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - ok(hReplacementFile != INVALID_HANDLE_VALUE, + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ "unexpected error, replacement file should still exist %d\n", GetLastError()); CloseHandle(hReplacementFile); ret = SetFileAttributesA(replaced, FILE_ATTRIBUTE_NORMAL); @@ -2107,7 +2108,9 @@ static void test_ReplaceFileA(void) /* delete temporary files, replacement and replaced are already deleted */ ret = DeleteFileA(backup); - ok(ret, "DeleteFileA: error (backup) %d\n", GetLastError()); + ok(ret || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ + "DeleteFileA: error (backup) %d\n", GetLastError()); } /* @@ -2178,7 +2181,9 @@ static void test_ReplaceFileW(void) "ReplaceFileW: unexpected error %d\n", GetLastError()); ret = DeleteFileW(backup); - ok(ret, "DeleteFileW: error %d\n", GetLastError()); + ok(ret || + broken(GetLastError() == ERROR_ACCESS_DENIED), /* win2k */ + "DeleteFileW: error (backup) %d\n", GetLastError()); } START_TEST(file)

1 0