wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Austin English : oleaut32/tests: Remove win9x hacks.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: 28e1b942bd0329c18a1f8d5c600b54e531dcf315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e1b942bd0329c18a1f8d5c6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:55:45 2011 -0800 oleaut32/tests: Remove win9x hacks. --- dlls/oleaut32/tests/olepicture.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 52dbb73..3422e79 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -798,9 +798,8 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(emptyW, NULL, 0, 0, NULL, (void **)&pic); todo_wine ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL || /* Win95 OSR2 */ - hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_OUTOFMEMORY), /* Win2k/Win2k3 */ "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); @@ -809,9 +808,8 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(emptyW, NULL, 0, 0, &IID_IPicture, (void **)&pic); todo_wine ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL || /* Win95 OSR2 */ - hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_OUTOFMEMORY), /* Win2k/Win2k3 */ "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); @@ -829,7 +827,7 @@ static void test_OleLoadPicturePath(void) /* Try a normal DOS path. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -837,7 +835,7 @@ static void test_OleLoadPicturePath(void) /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -846,15 +844,15 @@ static void test_OleLoadPicturePath(void) /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -873,7 +871,7 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -882,9 +880,9 @@ static void test_OleLoadPicturePath(void) /* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); }

1 0

Austin English : shell32/tests: Remove win9x hacks.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: d710056e4da3d8d3b211c3bee3bb63d57b11bb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d710056e4da3d8d3b211c3bee… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:40:28 2011 -0800 shell32/tests: Remove win9x hacks. --- dlls/shell32/tests/systray.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 1f505ec..23d3034 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -45,19 +45,15 @@ static void test_cbsize(void) nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); nidW.uCallbackMessage = WM_USER+17; ret = pShell_NotifyIconW(NIM_ADD, &nidW); - if (ret) - { - /* using an invalid cbSize does work */ - nidW.cbSize = 3; - nidW.hWnd = hMainWnd; - nidW.uID = 1; - ret = pShell_NotifyIconW(NIM_DELETE, &nidW); - ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); - /* as icon doesn't exist anymore - now there will be an error */ - nidW.cbSize = sizeof(nidW); - ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n"); - } - else win_skip( "Shell_NotifyIconW not working\n" ); /* win9x */ + /* using an invalid cbSize does work */ + nidW.cbSize = 3; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + ret = pShell_NotifyIconW(NIM_DELETE, &nidW); + ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); + /* as icon doesn't exist anymore - now there will be an error */ + nidW.cbSize = sizeof(nidW); + ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n"); } /* same for Shell_NotifyIconA */ @@ -75,7 +71,7 @@ static void test_cbsize(void) nidA.hWnd = hMainWnd; nidA.uID = 1; ret = Shell_NotifyIconA(NIM_DELETE, &nidA); - ok( ret || broken(!ret), /* win9x */ "NIM_DELETE failed!\n"); + ok(ret, "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidA.cbSize = sizeof(nidA); ok(!Shell_NotifyIconA(NIM_DELETE, &nidA) != !ret, "The icon was not deleted\n");

1 0

Austin English : urlmon/tests: Remove win9x hacks.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: bc32d4819a5e476ae843c63d8144090064bdd4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc32d4819a5e476ae843c63d8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:31:05 2011 -0800 urlmon/tests: Remove win9x hacks. --- dlls/urlmon/tests/protocol.c | 38 ++++++++++++-------------------------- 1 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 33afe49..2549e02 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -215,15 +215,6 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } -/* lstrcmpW is not implemented on Win9x */ -static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) -{ - CHAR stra1[512], stra2[512]; - WideCharToMultiByte(CP_ACP, 0, strw1, -1, stra1, MAX_PATH, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, strw2, -1, stra2, MAX_PATH, NULL, NULL); - return lstrcmpA(stra1, stra2); -} - static BOOL proxy_active(void) { HKEY internet_settings; @@ -333,9 +324,9 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, CHECK_EXPECT(BeginningTransaction); if(binding_test) - ok(!strcmp_ww(szURL, binding_urls[tested_protocol]), "szURL != http_url\n"); + ok(!lstrcmpW(szURL, binding_urls[tested_protocol]), "szURL != http_url\n"); else - ok(!strcmp_ww(szURL, http_url), "szURL != http_url\n"); + ok(!lstrcmpW(szURL, http_url), "szURL != http_url\n"); ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalHeaders) @@ -765,9 +756,9 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) { if(binding_test) - ok(!strcmp_ww(szStatusText, expect_wsz), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, expect_wsz), "unexpected szStatusText\n"); else if(tested_protocol == FILE_TEST) - ok(!strcmp_ww(szStatusText, file_name), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, file_name), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else ok(szStatusText != NULL, "szStatusText == NULL\n"); } @@ -792,12 +783,12 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!strcmp_ww(szStatusText, text_htmlW), "szStatusText != text/html\n"); + ok(!lstrcmpW(szStatusText, text_htmlW), "szStatusText != text/html\n"); break; case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); ok(szStatusText != NULL, "szStatusText == NULL\n"); - ok(!strcmp_ww(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, null_guid), "unexpected classid %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_COOKIE_SENT: CHECK_EXPECT(ReportProgress_COOKIE_SENT); @@ -829,7 +820,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, break; case BINDSTATUS_DECODING: CHECK_EXPECT(ReportProgress_DECODING); - ok(!strcmp_ww(szStatusText, gzipW), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, gzipW), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; default: ok(0, "Unexpected status %d\n", ulStatusCode); @@ -1013,7 +1004,7 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR ok(dwError == ERROR_SUCCESS, "dwError = %d, expected ERROR_SUCCESS\n", dwError); else ok(dwError != ERROR_SUCCESS || - broken(tested_protocol == MK_TEST), /* Win9x, WinME and NT4 */ + broken(tested_protocol == MK_TEST), /* WinME and NT4 */ "dwError == ERROR_SUCCESS\n"); ok(!szResult, "szResult != NULL\n"); @@ -1557,7 +1548,7 @@ static void protocol_start(IInternetProtocolSink *pOIProtSink, IInternetBindInfo ok(hres == S_OK, "GetBindString(BINDSTRING_USER_AGETNT) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d, expected 254\n", fetched); ok(ua != NULL, "ua = %p\n", ua); - ok(!strcmp_ww(ua, user_agentW), "unexpected user agent %s\n", wine_dbgstr_w(ua)); + ok(!lstrcmpW(ua, user_agentW), "unexpected user agent %s\n", wine_dbgstr_w(ua)); CoTaskMemFree(ua); fetched = 256; @@ -1569,7 +1560,7 @@ static void protocol_start(IInternetProtocolSink *pOIProtSink, IInternetBindInfo ok(hres == S_OK, "GetBindString(BINDSTRING_ACCEPT_MIMES) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d, expected 1\n", fetched); - ok(!strcmp_ww(acc_mimeW, accept_mimes[0]), "unexpected mimes %s\n", wine_dbgstr_w(accept_mimes[0])); + ok(!lstrcmpW(acc_mimeW, accept_mimes[0]), "unexpected mimes %s\n", wine_dbgstr_w(accept_mimes[0])); CoTaskMemFree(accept_mimes[0]); hres = IInternetBindInfo_QueryInterface(pOIBindInfo, &IID_IServiceProvider, @@ -1960,7 +1951,7 @@ static HRESULT WINAPI MimeProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU CHECK_EXPECT(MimeFilter_Start); - ok(!strcmp_ww(szUrl, gzipW), "wrong url %s\n", wine_dbgstr_w(szUrl)); + ok(!lstrcmpW(szUrl, gzipW), "wrong url %s\n", wine_dbgstr_w(szUrl)); ok(grfPI == (PI_FILTER_MODE|PI_FORCE_ASYNC), "grfPI=%x, expected PI_FILTER_MODE|PI_FORCE_ASYNC\n", grfPI); ok(dwReserved, "dwReserved == 0\n"); ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); @@ -2020,7 +2011,7 @@ static HRESULT WINAPI MimeProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_URL, &url_str, 1, &fetched); ok(hres == S_OK, "GetBindString(BINDSTRING_URL) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d\n", fetched); - ok(!strcmp_ww(url_str, binding_urls[tested_protocol]), "wrong url_str %s\n", wine_dbgstr_w(url_str)); + ok(!lstrcmpW(url_str, binding_urls[tested_protocol]), "wrong url_str %s\n", wine_dbgstr_w(url_str)); CoTaskMemFree(url_str); CHECK_CALLED(GetBindString_URL); @@ -2570,11 +2561,6 @@ static void test_file_protocol(void) { SetLastError(0xdeadbeef); file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(!file && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Detected Win9x or WinMe\n"); - return; - } ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) return;

1 0

Austin English : spoolss/tests: Change skip() to win_skip().
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: b651dcdb6bbb5c91537613f35f9d563275e262ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b651dcdb6bbb5c91537613f35… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:31:42 2011 -0800 spoolss/tests: Change skip() to win_skip(). --- dlls/spoolss/tests/spoolss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index b7d71d6..acf2801 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -208,10 +208,10 @@ START_TEST(spoolss) { LPCSTR ptr; - /* spoolss.dll does not exist on win9x */ + /* The tests fail on Win7 (see comments in load_function() */ ptr = load_functions(); if (ptr) { - skip("%s not found\n", ptr); + win_skip("%s not found\n", ptr); return; }

1 0

Austin English : userenv/tests: Remove win9x hacks.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: 04b5763923ab47ac21a0f5173d9a1751863a41a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b5763923ab47ac21a0f5173… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 24 15:28:13 2011 -0800 userenv/tests: Remove win9x hacks. --- dlls/userenv/tests/userenv.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 4fa257b..446870f 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -218,15 +218,12 @@ static void test_get_profiles_dir(void) char *profiles_dir, *buf, small_buf[1]; l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); - if (l) - { - win_skip("No ProfileList key (Win9x), skipping tests\n"); - return; - } + ok(!l, "RegOpenKeyExA failed: %d\n", GetLastError()); + l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &cch); if (l) { - win_skip("No ProfilesDirectory value, skipping tests\n"); + win_skip("No ProfilesDirectory value (NT4), skipping tests\n"); return; } buf = HeapAlloc(GetProcessHeap(), 0, cch);

1 0

Vincent Povirk : gdiplus: Implement ImageLockModeUserInputBuf.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: 21d6fc9643a33fb0ea2437fdd0383d7294e93dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d6fc9643a33fb0ea2437fdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 24 16:48:03 2011 -0600 gdiplus: Implement ImageLockModeUserInputBuf. --- dlls/gdiplus/image.c | 49 +++++++++++++++++-------------------------- dlls/gdiplus/tests/image.c | 14 ++++++------ 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 070ea3d..2582ae2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -913,9 +913,7 @@ GpStatus convert_pixels(UINT width, UINT height, GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, UINT flags, PixelFormat format, BitmapData* lockeddata) { - INT stride, bitspp = PIXELFORMATBPP(format); - BYTE *buff = NULL; - UINT abs_height; + INT bitspp = PIXELFORMATBPP(format); GpRect act_rect; /* actual rect to be used */ GpStatus stat; @@ -937,20 +935,13 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, act_rect.Height = bitmap->height; } - if(flags & ImageLockModeUserInputBuf) - { - static int fixme=0; - if (!fixme++) FIXME("ImageLockModeUserInputBuf not implemented\n"); - return NotImplemented; - } - if(bitmap->lockmode) { WARN("bitmap is already locked and cannot be locked again\n"); return WrongState; } - if (bitmap->bits && bitmap->format == format) + if (bitmap->bits && bitmap->format == format && !(flags & ImageLockModeUserInputBuf)) { /* no conversion is necessary; just use the bits directly */ lockeddata->Width = act_rect.Width; @@ -990,13 +981,21 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } } - abs_height = act_rect.Height; - stride = (act_rect.Width * bitspp + 7) / 8; - stride = (stride + 3) & ~3; + lockeddata->Width = act_rect.Width; + lockeddata->Height = act_rect.Height; + lockeddata->PixelFormat = format; + lockeddata->Reserved = flags; + + if(!(flags & ImageLockModeUserInputBuf)) + { + lockeddata->Stride = (((act_rect.Width * bitspp + 7) / 8) + 3) & ~3; + + bitmap->bitmapbits = GdipAlloc(lockeddata->Stride * act_rect.Height); - buff = GdipAlloc(stride * abs_height); + if (!bitmap->bitmapbits) return OutOfMemory; - if (!buff) return OutOfMemory; + lockeddata->Scan0 = bitmap->bitmapbits; + } if (flags & ImageLockModeRead) { @@ -1009,28 +1008,21 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } stat = convert_pixels(act_rect.Width, act_rect.Height, - stride, buff, format, + lockeddata->Stride, lockeddata->Scan0, format, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, bitmap->format, bitmap->image.palette_entries); if (stat != Ok) { - GdipFree(buff); + GdipFree(bitmap->bitmapbits); + bitmap->bitmapbits = NULL; return stat; } } - lockeddata->Width = act_rect.Width; - lockeddata->Height = act_rect.Height; - lockeddata->PixelFormat = format; - lockeddata->Reserved = flags; - lockeddata->Stride = stride; - lockeddata->Scan0 = buff; - bitmap->lockmode = flags; bitmap->numlocks++; - bitmap->bitmapbits = buff; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y; @@ -1064,9 +1056,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(!bitmap->lockmode) return WrongState; - if(lockeddata->Reserved & ImageLockModeUserInputBuf) - return NotImplemented; - if(!(lockeddata->Reserved & ImageLockModeWrite)){ if(!(--bitmap->numlocks)) bitmap->lockmode = 0; @@ -1076,7 +1065,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } - if (!bitmap->bitmapbits) + if (!bitmap->bitmapbits && !(lockeddata->Reserved & ImageLockModeUserInputBuf)) { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 005969b..71a99ea 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -777,10 +777,10 @@ static void test_LockBits_UserBuf(void) /* read-only */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); - todo_wine expect(Ok, stat); + expect(Ok, stat); expect(0xaaaaaaaa, bits[0]); - todo_wine expect(0, bits[2+3*WIDTH]); + expect(0, bits[2+3*WIDTH]); bits[2+3*WIDTH] = 0xdeadbeef; @@ -795,7 +795,7 @@ static void test_LockBits_UserBuf(void) /* write-only */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); - todo_wine expect(Ok, stat); + expect(Ok, stat); expect(0xdeadbeef, bits[2+3*WIDTH]); bits[2+3*WIDTH] = 0x12345678; @@ -807,15 +807,15 @@ static void test_LockBits_UserBuf(void) stat = GdipBitmapGetPixel(bm, 2, 3, &color); expect(Ok, stat); - todo_wine expect(0x12345678, color); + expect(0x12345678, color); bits[2+3*WIDTH] = 0; /* read/write */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeRead|ImageLockModeWrite|ImageLockModeUserInputBuf, PixelFormat32bppARGB, &bd); - todo_wine expect(Ok, stat); + expect(Ok, stat); - todo_wine expect(0x12345678, bits[2+3*WIDTH]); + expect(0x12345678, bits[2+3*WIDTH]); bits[2+3*WIDTH] = 0xdeadbeef; if (stat == Ok) { @@ -825,7 +825,7 @@ static void test_LockBits_UserBuf(void) stat = GdipBitmapGetPixel(bm, 2, 3, &color); expect(Ok, stat); - todo_wine expect(0xdeadbeef, color); + expect(0xdeadbeef, color); stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Copy only the area requested when (un) locking bitmaps.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: 546b1a5cb41a1e7f11c2f90d813864bac86e0b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546b1a5cb41a1e7f11c2f90d8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 24 16:32:54 2011 -0600 gdiplus: Copy only the area requested when (un)locking bitmaps. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 37 +++++++++++++++++++++++++++++-------- dlls/gdiplus/tests/image.c | 4 ++++ 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index bdfb204..42e28fa 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -280,6 +280,7 @@ struct GpBitmap{ BYTE *bits; /* actual image bits if this is a DIB */ INT stride; /* stride of bits if this is a DIB */ BYTE *own_bits; /* image bits that need to be freed with this object */ + INT lockx, locky; /* X and Y coordinates of the rect when a bitmap is locked for writing. */ }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2139e97..070ea3d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -990,8 +990,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } } - abs_height = bitmap->height; - stride = (bitmap->width * bitspp + 7) / 8; + abs_height = act_rect.Height; + stride = (act_rect.Width * bitspp + 7) / 8; stride = (stride + 3) & ~3; buff = GdipAlloc(stride * abs_height); @@ -1000,9 +1000,19 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if (flags & ImageLockModeRead) { - stat = convert_pixels(bitmap->width, bitmap->height, + static int fixme=0; + + if (!fixme && (PIXELFORMATBPP(bitmap->format) * act_rect.X) % 8 != 0) + { + FIXME("Cannot copy rows that don't start at a whole byte.\n"); + fixme = 1; + } + + stat = convert_pixels(act_rect.Width, act_rect.Height, stride, buff, format, - bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette_entries); + bitmap->stride, + bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, + bitmap->format, bitmap->image.palette_entries); if (stat != Ok) { @@ -1016,11 +1026,13 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, lockeddata->PixelFormat = format; lockeddata->Reserved = flags; lockeddata->Stride = stride; - lockeddata->Scan0 = buff + (bitspp / 8) * act_rect.X + stride * act_rect.Y; + lockeddata->Scan0 = buff; bitmap->lockmode = flags; bitmap->numlocks++; bitmap->bitmapbits = buff; + bitmap->lockx = act_rect.X; + bitmap->locky = act_rect.Y; return Ok; } @@ -1042,6 +1054,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, BitmapData* lockeddata) { GpStatus stat; + static int fixme=0; TRACE("(%p,%p)\n", bitmap, lockeddata); @@ -1071,9 +1084,17 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } - stat = convert_pixels(bitmap->width, bitmap->height, - bitmap->stride, bitmap->bits, bitmap->format, - lockeddata->Stride, bitmap->bitmapbits, lockeddata->PixelFormat, NULL); + if (!fixme && (PIXELFORMATBPP(bitmap->format) * bitmap->lockx) % 8 != 0) + { + FIXME("Cannot copy rows that don't start at a whole byte.\n"); + fixme = 1; + } + + stat = convert_pixels(lockeddata->Width, lockeddata->Height, + bitmap->stride, + bitmap->bits + bitmap->stride * bitmap->locky + PIXELFORMATBPP(bitmap->format) * bitmap->lockx / 8, + bitmap->format, + lockeddata->Stride, lockeddata->Scan0, lockeddata->PixelFormat, NULL); if (stat != Ok) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 82d7588..005969b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -687,6 +687,10 @@ static void test_LockBits(void) expect(Ok, stat); expect(0xff563412, color); + stat = GdipBitmapGetPixel(bm, 2, 8, &color); + expect(Ok, stat); + expect(0xffc30000, color); + stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat); stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm);

1 0

Vincent Povirk : gdiplus: Don' t copy bits into the buffer when a bitmap is locked write-only.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: 9497e9380b8f87fe456c844ac49db4210c0dd7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9497e9380b8f87fe456c844ac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 24 16:12:43 2011 -0600 gdiplus: Don't copy bits into the buffer when a bitmap is locked write-only. --- dlls/gdiplus/image.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3c4e9bf..2139e97 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -968,11 +968,14 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } /* Make sure we can convert to the requested format. */ - stat = convert_pixels(0, 0, 0, NULL, format, 0, NULL, bitmap->format, NULL); - if (stat == NotImplemented) + if (flags & ImageLockModeRead) { - FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); - return NotImplemented; + stat = convert_pixels(0, 0, 0, NULL, format, 0, NULL, bitmap->format, NULL); + if (stat == NotImplemented) + { + FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); + return NotImplemented; + } } /* If we're opening for writing, make sure we'll be able to write back in @@ -995,14 +998,17 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if (!buff) return OutOfMemory; - stat = convert_pixels(bitmap->width, bitmap->height, - stride, buff, format, - bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette_entries); - - if (stat != Ok) + if (flags & ImageLockModeRead) { - GdipFree(buff); - return stat; + stat = convert_pixels(bitmap->width, bitmap->height, + stride, buff, format, + bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette_entries); + + if (stat != Ok) + { + GdipFree(buff); + return stat; + } } lockeddata->Width = act_rect.Width;

1 0

Vincent Povirk : gdiplus: Copy the bits on bitmap unlock if the write flag is set.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: 58eb96c9e79088383d0f17cbcd82fb88013f500c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58eb96c9e79088383d0f17cbc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 24 16:09:17 2011 -0600 gdiplus: Copy the bits on bitmap unlock if the write flag is set. The read and write flags are independent, so a read flag being set doesn't imply we can quit early. --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a69046d..3c4e9bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1048,7 +1048,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(lockeddata->Reserved & ImageLockModeUserInputBuf) return NotImplemented; - if(lockeddata->Reserved & ImageLockModeRead){ + if(!(lockeddata->Reserved & ImageLockModeWrite)){ if(!(--bitmap->numlocks)) bitmap->lockmode = 0; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index dde040a..82d7588 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -657,7 +657,7 @@ static void test_LockBits(void) stat = GdipBitmapGetPixel(bm, 2, 3, &color); expect(Ok, stat); - todo_wine expect(0xffff8800, color); + expect(0xffff8800, color); /* write, conversion */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat32bppARGB, &bd);

1 0

Vincent Povirk : gdiplus: Test writes with conversion and without a user buffer.
by Alexandre Julliard 25 Feb '11

25 Feb '11

Module: wine Branch: master Commit: d086af1d365f92e23d0d9d93f2e0af2f41c62877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d086af1d365f92e23d0d9d93f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 24 16:04:04 2011 -0600 gdiplus: Test writes with conversion and without a user buffer. --- dlls/gdiplus/tests/image.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index fb2ec28..dde040a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -517,6 +517,7 @@ static void test_LockBits(void) BitmapData bd; const INT WIDTH = 10, HEIGHT = 20; ARGB color; + int y; bm = NULL; stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); @@ -645,6 +646,7 @@ static void test_LockBits(void) if (stat == Ok) { expect(0xff, ((BYTE*)bd.Scan0)[2]); + ((BYTE*)bd.Scan0)[1] = 0x88; if (0) /* Areas outside the rectangle appear to be uninitialized */ ok(0xc3 != ((BYTE*)bd.Scan0)[2 + bd.Stride * 5], "original image bits are readable\n"); @@ -653,6 +655,10 @@ static void test_LockBits(void) expect(Ok, stat); } + stat = GdipBitmapGetPixel(bm, 2, 3, &color); + expect(Ok, stat); + todo_wine expect(0xffff8800, color); + /* write, conversion */ stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat32bppARGB, &bd); expect(Ok, stat); @@ -665,10 +671,22 @@ static void test_LockBits(void) ok(0xc3 != ((BYTE*)bd.Scan0)[2 + bd.Stride * 5], "original image bits are readable\n"); } + /* Initialize the buffer so the unlock doesn't access undefined memory */ + for (y=0; y<5; y++) + memset(((BYTE*)bd.Scan0) + bd.Stride * y, 0, 12); + + ((BYTE*)bd.Scan0)[0] = 0x12; + ((BYTE*)bd.Scan0)[1] = 0x34; + ((BYTE*)bd.Scan0)[2] = 0x56; + stat = GdipBitmapUnlockBits(bm, &bd); expect(Ok, stat); } + stat = GdipBitmapGetPixel(bm, 2, 3, &color); + expect(Ok, stat); + expect(0xff563412, color); + stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat); stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011