March 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Don' t defer attaching OpenGL context to view if it is backed by a window device .
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 89a4e5a6d1c77646fd397e3419a91a08533bbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a4e5a6d1c77646fd397e341… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:25 2013 -0500 winemac: Don't defer attaching OpenGL context to view if it is backed by a window device. This fixes a problem with certain OpenGL programs which create a context very briefly before destroying it, like while handling WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 66eec63..5879b4d 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -21,6 +21,7 @@ #import "cocoa_opengl.h" #include "macdrv_cocoa.h" +#include "cocoa_app.h" @interface WineOpenGLContext () @@ -97,8 +98,21 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { + __block BOOL windowHasDevice; + macdrv_add_view_opengl_context(v, c); - [context setLatentView:view]; + + OnMainThread(^{ + windowHasDevice = [[view window] windowNumber] > 0; + }); + if (windowHasDevice) + { + [context setView:view]; + [context setLatentView:nil]; + } + else + [context setLatentView:view]; + [context makeCurrentContext]; } else

1 0

Andrew Talbot : msvcp60: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 956219b5d9801189fa18be8243dd6277410e5a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956219b5d9801189fa18be824… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:53 2013 +0000 msvcp60: Avoid signed-unsigned integer comparisons. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f68bcde..64b3271 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2456,7 +2456,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 98eb9cf..a54fd28 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -80,7 +80,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Akihiro Sagawa : msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 0010ee021a6c79eb766b805f5fa1485f13bb51f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0010ee021a6c79eb766b805f5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:40 2013 +0900 msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l. --- dlls/msvcrt/tests/string.c | 8 ++++---- dlls/msvcrt/wcs.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 98d79c4..31314fd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2491,8 +2491,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(digit, NULL, 10); ok(res == 9, "res != 9\n"); res = p_wcstoi64(stock, &endpos, 10); - todo_wine ok(res == 0, "res != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(res == 0, "res != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); res = p_wcstoi64(tamil, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); @@ -2506,8 +2506,8 @@ static void test__wcstoi64(void) ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(stock, &endpos, 10); - todo_wine ok(ures == 0, "ures != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(ures == 0, "ures != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); ures = p_wcstoui64(tamil, &endpos, 10); ok(ures == 0, "ures != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a0b1cb6..ba53084 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1395,7 +1395,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; if(isdigitW(cur)) { @@ -1493,10 +1493,10 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigit(cur)) { + if(isdigitW(cur)) { if(cur >= '0'+base) break; v = *nptr-'0';

1 0

Akihiro Sagawa : msvcrt/tests: Add _wcstoi64/_wcstoui64 tests.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 564b68244702031299d99d5354e7b573620f40e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564b68244702031299d99d535… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:38 2013 +0900 msvcrt/tests: Add _wcstoi64/_wcstoui64 tests. --- dlls/msvcrt/tests/string.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 43fe7c5..98d79c4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -71,6 +71,8 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); +static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); +static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); @@ -2468,6 +2470,57 @@ static void test__stricmp(void) setlocale(LC_ALL, "C"); } +static void test__wcstoi64(void) +{ + static const WCHAR digit[] = { '9', 0 }; + static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ + static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ + static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + + __int64 res; + unsigned __int64 ures; + WCHAR *endpos; + + if (!p_wcstoi64 || !p_wcstoui64) { + win_skip("_wcstoi64 or _wcstoui64 not found\n"); + return; + } + + res = p_wcstoi64(digit, NULL, 10); + ok(res == 9, "res != 9\n"); + res = p_wcstoi64(stock, &endpos, 10); + todo_wine ok(res == 0, "res != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(tamil, &endpos, 10); + ok(res == 0, "res != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + res = p_wcstoi64(thai, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(fullwidth, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(hex, NULL, 16); + todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + + ures = p_wcstoui64(digit, NULL, 10); + ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(stock, &endpos, 10); + todo_wine ok(ures == 0, "ures != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ures = p_wcstoui64(tamil, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + ures = p_wcstoui64(thai, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(fullwidth, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(hex, NULL, 16); + todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + + return; +} + START_TEST(string) { char mem[100]; @@ -2495,6 +2548,8 @@ START_TEST(string) p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *)GetProcAddress(hMsvcrt, "_strtoui64"); + p_wcstoi64 = (void *)GetProcAddress(hMsvcrt, "_wcstoi64"); + p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); @@ -2564,4 +2619,5 @@ START_TEST(string) test_tolower(); test__atodbl(); test__stricmp(); + test__wcstoi64(); }

1 0

Dmitry Timoshkov : gdiplus: Print a passed in rectangle in GdipCombineRegionRect.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 65bd8f2b262075938324ec2689e667aca96350cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bd8f2b262075938324ec268… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 11 17:31:52 2013 +0900 gdiplus: Print a passed in rectangle in GdipCombineRegionRect. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5583514..99c5d35 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -282,7 +282,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, region_element *left, *right = NULL; GpStatus stat; - TRACE("%p %p %d\n", region, rect, mode); + TRACE("%p %s %d\n", region, debugstr_rectf(rect), mode); if (!(region && rect)) return InvalidParameter;

1 0

Nikolay Sivov : xmllite: Fix a test failure on Windows 8.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: e5a48b2d75bd9669ae6c78f4090fc385e36937b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a48b2d75bd9669ae6c78f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:49:28 2013 +0400 xmllite: Fix a test failure on Windows 8. --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 16734d4..92ab215 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2246,6 +2246,8 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT TRACE("(%p)->(%p %p)\n", This, value, len); + *value = NULL; + if ((This->nodetype == XmlNodeType_Comment && !This->strvalues[StringValue_Value].str) || is_reader_pending(This)) { diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7373a69..b0a14d3 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1238,16 +1238,16 @@ static void test_read_pending(void) int c; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); /* first read call returns incomplete node, second attempt fails with E_PENDING */ stream_readcall = 0; type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK || broken(hr == E_PENDING), "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); @@ -1257,8 +1257,8 @@ static void test_read_pending(void) c = stream_readcall; value = (void*)0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == E_PENDING, "Expected E_PENDING, got %08x\n", hr); - ok(value == (void*)0xdeadbeef, "got %p\n", value); + ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); IXmlReader_Release(reader);

1 0

Nikolay Sivov : xmllite: Make another read attempt if we don' t have enough data initially.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 88d7b66be2716e8c8374d7a45bd823f7e6430026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d7b66be2716e8c8374d7a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:45:53 2013 +0400 xmllite: Make another read attempt if we don't have enough data initially. --- dlls/xmllite/reader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 688497c..16734d4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -610,7 +610,12 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod *enc = XmlEncoding_Unknown; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written <= 3) + { + HRESULT hr = readerinput_growraw(readerinput); + if (FAILED(hr)) return hr; + if (buffer->written <= 3) return MX_E_INPUTEND; + } /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */

1 0

Nikolay Sivov : xmllite: Actually resume comment and PI parsing while on Misc part.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: c38c471b644d571c038fbee6fcdd1ed1772edb81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c471b644d571c038fbee6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 15:45:38 2013 +0400 xmllite: Actually resume comment and PI parsing while on Misc part. --- dlls/xmllite/reader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 489d346..9216127 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -63,6 +63,7 @@ typedef enum XmlReadResumeState_Initial, XmlReadResumeState_PITarget, XmlReadResumeState_PIBody, + XmlReadResumeState_Comment, XmlReadResumeState_STag } XmlReaderResumeState; @@ -1064,6 +1065,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_Comment; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1088,6 +1090,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } else @@ -1354,14 +1357,22 @@ static HRESULT reader_parse_misc(xmlreader *reader) { HRESULT hr = S_FALSE; - if (is_reader_pending(reader)) + if (reader->resumestate != XmlReadResumeState_Initial) { hr = reader_more(reader); if (FAILED(hr)) return hr; /* finish current node */ - if (reader->nodetype == XmlNodeType_Comment) + switch (reader->resumestate) + { + case XmlReadResumeState_PITarget: + case XmlReadResumeState_PIBody: + return reader_parse_pi(reader); + case XmlReadResumeState_Comment: return reader_parse_comment(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } } while (1)

1 0

Detlef Riekenberg : kernel32/tests: Fix failures with virtual Drives ( AppVirt Client).
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 3826193f33fbbf726dd02d4a2187f3117f0bd0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3826193f33fbbf726dd02d4a2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 11 00:11:22 2013 +0100 kernel32/tests: Fix failures with virtual Drives (AppVirt Client). --- dlls/kernel32/tests/drive.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 14c0cf2..ca6cb44 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -114,16 +114,12 @@ static void test_GetDiskFreeSpaceA(void) drive, ret, GetLastError()); else { - ok(ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_INVALID_DRIVE || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", - drive, ret, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceA(%s) failed with %d\n", drive, GetLastError()); + if( GetVersion() & 0x80000000) /* win3.0 through winME */ ok( total_clusters <= 65535, @@ -135,14 +131,12 @@ static void test_GetDiskFreeSpaceA(void) tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceExA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceExA(%s) failed with %d\n", drive, GetLastError()); + ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, "GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive); @@ -196,15 +190,10 @@ static void test_GetDiskFreeSpaceW(void) ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError()); - else - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", - drive[0], ret, GetLastError()); + else if (!ret) + /* GetDiskFreeSpaceW() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceW(%c) failed with %d\n", drive[0], GetLastError()); } logical_drives >>= 1; }

1 0

Vincent Povirk : gdiplus: Fix GdipCreateBitmapFromGraphics implementation.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 636e60b6e020a8e37e6dac03481bedcb20f3edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=636e60b6e020a8e37e6dac034… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 9 12:08:27 2013 -0600 gdiplus: Fix GdipCreateBitmapFromGraphics implementation. --- dlls/gdiplus/image.c | 14 +++++----- dlls/gdiplus/tests/graphics.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ff27334..98c0bd0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1595,12 +1595,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, return NotImplemented; } -/* FIXME: this should create a bitmap in the given size with the attributes - * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, GpGraphics* target, GpBitmap** bitmap) { - static int calls; GpStatus ret; TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap); @@ -1608,12 +1605,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, if(!target || !bitmap) return InvalidParameter; - if(!(calls++)) - FIXME("hacked stub\n"); - - ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, bitmap); + if (ret == Ok) + { + GdipGetDpiX(target, &(*bitmap)->image.xres); + GdipGetDpiY(target, &(*bitmap)->image.yres); + } + return ret; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 08b2465..e41751a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4282,6 +4282,58 @@ static void test_alpha_hdc(void) DeleteDC(hdc); } +static void test_bitmapfromgraphics(void) +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpBitmap *bitmap = NULL; + PixelFormat format; + REAL imageres, graphicsres; + UINT width, height; + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, NULL, &bitmap); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); + expect(PixelFormat32bppPARGB, format); + + stat = GdipGetDpiX(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetDpiY(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetImageWidth((GpImage*)bitmap, &width); + expect(Ok, stat); + expect(12, width); + + stat = GdipGetImageHeight((GpImage*)bitmap, &height); + expect(Ok, stat); + expect(13, height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4349,6 +4401,7 @@ START_TEST(graphics) test_get_set_textrenderinghint(); test_getdc_scaled(); test_alpha_hdc(); + test_bitmapfromgraphics(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0