Module: wine Branch: master Commit: b7219295ccfa2dec30a12e0f52aa2c8513a98f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7219295ccfa2dec30a12e0f52...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Fri Mar 6 13:06:39 2009 +0100
gdiplus/tests: Fix two test failures on Win98.
---
dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 12fab7c..5d46c8b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -229,6 +229,7 @@ static void test_SavingImages(void) const REAL WIDTH = 10.0, HEIGHT = 20.0; REAL w, h; ImageCodecInfo *codecs; + static const CHAR filenameA[] = "a.bmp"; static const WCHAR filename[] = { 'a','.','b','m','p',0 };
codecs = NULL; @@ -280,7 +281,7 @@ static void test_SavingImages(void) GdipFree(codecs); if (bm) GdipDisposeImage((GpImage*)bm); - ok(DeleteFileW(filename), "Delete failed.\n"); + ok(DeleteFileA(filenameA), "Delete failed.\n"); }
static void test_encoders(void) @@ -292,7 +293,7 @@ static void test_encoders(void) int i; int bmp_found;
- static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; + static const CHAR bmp_format[] = "BMP";
stat = GdipGetImageEncodersSize(&n, &s); expect(stat, Ok); @@ -319,8 +320,13 @@ static void test_encoders(void) bmp_found = FALSE; for (i = 0; i < n; i++) { - if (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, - codecs[i].FormatDescription, -1, + CHAR desc[32]; + + WideCharToMultiByte(CP_ACP, 0, codecs[i].FormatDescription, -1, + desc, 32, 0, 0); + + if (CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, + desc, -1, bmp_format, -1) == CSTR_EQUAL) { bmp_found = TRUE; break;