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

Jacek Caban : jscript: Pass msg as jsstr_t to create_error.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: c7c71b87b894bb67d8b9a136162a66a273bedf61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c71b87b894bb67d8b9a1361… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 11:37:30 2013 +0100 jscript: Pass msg as jsstr_t to create_error. --- dlls/jscript/error.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 3e15144..41cba5a 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -180,10 +180,9 @@ static HRESULT alloc_error(script_ctx_t *ctx, jsdisp_t *prototype, } static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, - UINT number, const WCHAR *msg, jsdisp_t **ret) + UINT number, jsstr_t *msg, jsdisp_t **ret) { jsdisp_t *err; - jsstr_t *str; HRESULT hres; hres = alloc_error(ctx, NULL, constr, &err); @@ -196,16 +195,9 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, return hres; } - if(msg) str = jsstr_alloc(msg); - else str = jsstr_empty(); - if(str) { - hres = jsdisp_propput_name(err, messageW, jsval_string(str)); - if(SUCCEEDED(hres)) - hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(str)); - jsstr_release(str); - }else { - hres = E_OUTOFMEMORY; - } + hres = jsdisp_propput_name(err, messageW, jsval_string(msg)); + if(SUCCEEDED(hres)) + hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(msg)); if(FAILED(hres)) { jsdisp_release(err); return hres; @@ -235,19 +227,21 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, unsigned argc, jsval_ num = n; } - if(argc>1 && !msg) { - hres = to_string(ctx, argv[1], &msg); - if(FAILED(hres)) - return hres; + if(!msg) { + if(argc > 1) { + hres = to_string(ctx, argv[1], &msg); + if(FAILED(hres)) + return hres; + }else { + msg = jsstr_empty(); + } } switch(flags) { case INVOKE_FUNC: case DISPATCH_CONSTRUCT: - hres = create_error(ctx, constr, num, msg ? msg->str : NULL, &err); - if(msg) - jsstr_release(msg); - + hres = create_error(ctx, constr, num, msg, &err); + jsstr_release(msg); if(FAILED(hres)) return hres; @@ -375,6 +369,7 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j { WCHAR buf[1024], *pos = NULL; jsdisp_t *err; + jsstr_t *msg; HRESULT hres; if(!is_jscript_error(error)) @@ -392,7 +387,12 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j WARN("%s\n", debugstr_w(buf)); - hres = create_error(ctx, constr, error, buf, &err); + msg = jsstr_alloc(buf); + if(!msg) + return E_OUTOFMEMORY; + + hres = create_error(ctx, constr, error, msg, &err); + jsstr_release(msg); if(FAILED(hres)) return hres;

1 0

Piotr Caban : cryptnet: Open file with FILE_SHARE_READ flag in File_RetrieveEncodedObjectW.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 437df58dce20b3d52d1a103b60b4f7d33e76ac3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=437df58dce20b3d52d1a103b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 11:17:30 2013 +0100 cryptnet: Open file with FILE_SHARE_READ flag in File_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 75dce9d..64af80c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1032,8 +1032,8 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, /* Try to create the file directly - Wine handles / in pathnames */ lstrcpynW(path, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { /* Try again on the current drive */ @@ -1042,8 +1042,8 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, { lstrcpynW(path + 2, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } if (hFile == INVALID_HANDLE_VALUE) { @@ -1053,8 +1053,8 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, { lstrcpynW(path + 2, components.lpszUrlPath, components.dwUrlPathLength + 1); - hFile = CreateFileW(path, GENERIC_READ, 0, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); } } }

1 0

Volkan Gezer : po: Updated Turkish translation.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 81e48cd0fa6050f1bbd86a7bbb8a0e445b80afa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e48cd0fa6050f1bbd86a7bb… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Tue Mar 5 20:57:20 2013 +0100 po: Updated Turkish translation. --- po/tr.po | 1094 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 554 insertions(+), 540 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81e48cd0fa6050f1bbd86…

1 0

Jacek Caban : urlmon: Fixed some test failures on IE10.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 8b0b99103c23f5b2d730dd1d50b85989d16996ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0b99103c23f5b2d730dd1d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:25:37 2013 +0100 urlmon: Fixed some test failures on IE10. --- dlls/urlmon/tests/protocol.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 8297738..b4b8f19 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -201,7 +201,7 @@ static const char *debugstr_guid(REFIID riid) { static char buf[50]; - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); @@ -1479,6 +1479,8 @@ static HRESULT WINAPI Protocol_Seek(IInternetProtocolEx *iface, static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) { + static const IID unknown_iid = {0x7daf9908,0x8415,0x4005,{0x95,0xae, 0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { *ppv = iface; return S_OK; @@ -1510,7 +1512,8 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE return E_NOINTERFACE; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + if(!IsEqualGUID(riid, &unknown_iid)) /* IE10 */ + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Jacek Caban : wininet: Added a test of request reading from cache.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 9d11eee03df5ee5d10bb97d0af0c8eb2be79f807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d11eee03df5ee5d10bb97d0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:59:36 2013 +0100 wininet: Added a test of request reading from cache. --- dlls/wininet/tests/http.c | 110 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c682930..7988de4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -397,7 +397,7 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", GetCurrentThreadId(), hInternet, dwContext, *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); - if(!--close_handle_cnt) + if(!InterlockedDecrement(&close_handle_cnt)) SetEvent(hCompleteEvent); break; case INTERNET_STATUS_REQUEST_COMPLETE: @@ -411,7 +411,8 @@ static VOID WINAPI callback( GetCurrentThreadId(), hInternet, dwContext, iar->dwResult,iar->dwError,dwStatusInformationLength); req_error = iar->dwError; - SetEvent(hCompleteEvent); + if(!close_handle_cnt) + SetEvent(hCompleteEvent); break; } case INTERNET_STATUS_REDIRECT: @@ -445,7 +446,6 @@ static void close_async_handle(HINTERNET handle, HANDLE complete_event, int hand ok(res, "InternetCloseHandle failed: %u\n", GetLastError()); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); - SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); } static void InternetReadFile_test(int flags, const test_data_t *test) @@ -1219,6 +1219,108 @@ done: ok(InternetCloseHandle(session), "Close session handle failed\n"); } +static void test_cache_read(void) +{ + HINTERNET session, connection, req; + FILETIME now, tomorrow, yesterday; + BYTE content[1000], buf[2000]; + char file_path[MAX_PATH]; + ULARGE_INTEGER li; + HANDLE file; + DWORD size; + unsigned i; + BOOL res; + + static const char cache_only_url[] = "http://test.winehq.org/tests/cache-only"; + BYTE cache_headers[] = "HTTP/1.1 200 OK\r\n\r\n"; + + trace("Testing cache read...\n"); + + hCompleteEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + for(i = 0; i < sizeof(content); i++) + content[i] = '0' + (i%10); + + GetSystemTimeAsFileTime(&now); + li.u.HighPart = now.dwHighDateTime; + li.u.LowPart = now.dwLowDateTime; + li.QuadPart += (LONGLONG)10000000 * 3600 * 24; + tomorrow.dwHighDateTime = li.u.HighPart; + tomorrow.dwLowDateTime = li.u.LowPart; + li.QuadPart -= (LONGLONG)10000000 * 3600 * 24 * 2; + yesterday.dwHighDateTime = li.u.HighPart; + yesterday.dwLowDateTime = li.u.LowPart; + + res = CreateUrlCacheEntryA(cache_only_url, sizeof(content), "", file_path, 0); + ok(res, "CreateUrlCacheEntryA failed: %u\n", GetLastError()); + + file = CreateFileA(file_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + WriteFile(file, content, sizeof(content), &size, NULL); + CloseHandle(file); + + res = CommitUrlCacheEntryA(cache_only_url, file_path, tomorrow, yesterday, NORMAL_CACHE_ENTRY, + cache_headers, sizeof(cache_headers)-1, "", 0); + ok(res, "CommitUrlCacheEntryA failed: %u\n", GetLastError()); + + session = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(session, callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + connection = InternetConnectA(session, "test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequestA(connection, "GET", "/tests/cache-only", NULL, NULL, NULL, 0, 0xdeadbead); + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_WINE_ALLOW(INTERNET_STATUS_SENDING_REQUEST); + SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_SENT); + SET_WINE_ALLOW(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_WINE_ALLOW(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, -1, NULL, 0); + todo_wine + ok(res, "HttpSendRequest failed: %u\n", GetLastError()); + + if(res) { + size = 0; + res = InternetQueryDataAvailable(req, &size, 0, 0); + ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(size == sizeof(content), "size = %u\n", size); + + size = sizeof(buf); + res = InternetReadFile(req, buf, sizeof(buf), &size); + ok(res, "InternetReadFile failed: %u\n", GetLastError()); + ok(size == sizeof(content), "size = %u\n", size); + ok(!memcmp(content, buf, sizeof(content)), "unexpected content\n"); + } + + close_async_handle(session, hCompleteEvent, 2); + + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CLEAR_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + res = DeleteUrlCacheEntryA(cache_only_url); + ok(res, "DeleteUrlCacheEntryA failed: %u\n", GetLastError()); + + CloseHandle(hCompleteEvent); +} + static void test_http_cache(void) { HINTERNET session, connect, request; @@ -1333,6 +1435,8 @@ static void test_http_cache(void) ok(InternetCloseHandle(request), "Close request handle failed\n"); ok(InternetCloseHandle(connect), "Close connect handle failed\n"); ok(InternetCloseHandle(session), "Close session handle failed\n"); + + test_cache_read(); } static void HttpHeaders_test(void)

1 0

Piotr Caban : cryptnet: Don' t ignore HttpEndRequestW error in HTTP_RetrieveEncodedObjectW.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: b8e2edf19c27c91641a6c26d07b94ecf33839467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e2edf19c27c91641a6c26d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 11:17:53 2013 +0100 cryptnet: Don't ignore HttpEndRequestW error in HTTP_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 64af80c..ddfdbce 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -941,19 +941,15 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, else ret = TRUE; } - /* We don't set ret to TRUE in this block to avoid masking - * an error from HttpSendRequestExW. - */ if (ret && - !HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context) && + !(ret = HttpEndRequestW(hHttp, NULL, 0, (DWORD_PTR)context)) && GetLastError() == ERROR_IO_PENDING) { if (WaitForSingleObject(context->event, context->timeout) == WAIT_TIMEOUT) - { SetLastError(ERROR_TIMEOUT); - ret = FALSE; - } + else + ret = TRUE; } if (ret) ret = CRYPT_DownloadObject(dwRetrievalFlags, hHttp,

1 0

Jacek Caban : wininet: Don' t pass expected cache file size to CreateUrlCacheEntry if it's unknown.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: d1ce8ba0534e1e42e3b7129c1dc8b75e1354bfed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ce8ba0534e1e42e3b7129c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 8 15:59:20 2013 +0100 wininet: Don't pass expected cache file size to CreateUrlCacheEntry if it's unknown. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 890adce..498e848 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2276,7 +2276,7 @@ static void create_cache_entry(http_request_t *req) return; } - b = CreateUrlCacheEntryW(url, req->contentLength, NULL, file_name, 0); + b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0); if(!b) { WARN("Could not create cache entry: %08x\n", GetLastError()); return;

1 0

Dmitry Timoshkov : windowscodecs: Fix handling of a tRNS PNG chunk in the frame CopyPalette method.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 18e76792a76291c7a8211b6daa433ba6532c840f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e76792a76291c7a8211b6da… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 8 13:18:06 2013 +0900 windowscodecs: Fix handling of a tRNS PNG chunk in the frame CopyPalette method. --- dlls/windowscodecs/pngformat.c | 17 ++++++----------- dlls/windowscodecs/tests/pngformat.c | 2 -- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 2f6a9e3..1708580 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -798,7 +798,7 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, png_colorp png_palette; int num_palette; WICColor palette[256]; - png_bytep trans; + png_bytep trans_alpha; int num_trans; png_color_16p trans_values; int i; @@ -822,23 +822,18 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, goto end; } + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans_alpha, &num_trans, &trans_values); + if (!ret) num_trans = 0; + for (i=0; i<num_palette; i++) { - palette[i] = (0xff000000| + BYTE alpha = (i < num_trans) ? trans_alpha[i] : 0xff; + palette[i] = (alpha << 24 | png_palette[i].red << 16| png_palette[i].green << 8| png_palette[i].blue); } - ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); - if (ret) - { - for (i=0; i<num_trans; i++) - { - palette[trans[i]] = 0x00000000; - } - } - end: LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 61c56b3..a222ebc 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -577,9 +577,7 @@ static void test_png_palette(void) hr = IWICPalette_GetColors(palette, 256, color, &ret); ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); -todo_wine ok(color[0] == 0xff010203, "expected 0xff010203, got %#x\n", color[0]); -todo_wine ok(color[1] == 0x00040506, "expected 0x00040506, got %#x\n", color[1]); IWICPalette_Release(palette);

1 0

Ken Thomases : winemac: Improve handling of "invert" pixels in monochrome cursors.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: 37b33a9de83d0942616f08c9eb66203296ae6ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b33a9de83d0942616f08c9e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Mar 7 20:37:02 2013 -0600 winemac: Improve handling of "invert" pixels in monochrome cursors. --- dlls/winemac.drv/mouse.c | 109 +++++++++++++++++++++++++++++++++------------- 1 files changed, 79 insertions(+), 30 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index cfbb274..66214fe 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -258,21 +258,6 @@ done: } /*********************************************************************** - * release_provider_cfdata - * - * Helper for create_monochrome_cursor. A CFData is used by two - * different CGDataProviders, using different offsets. One of them is - * constructed with a pointer to the bytes, not a reference to the - * CFData object (because of the offset). So, the CFData is CFRetain'ed - * on its behalf at creation and released here. - */ -void release_provider_cfdata(void *info, const void *data, size_t size) -{ - CFRelease(info); -} - - -/*********************************************************************** * create_monochrome_cursor */ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, int height) @@ -280,6 +265,9 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *info = (BITMAPINFO *)buffer; unsigned int width_bytes = (width + 31) / 32 * 4; + unsigned long *and_bits = NULL, *xor_bits; + unsigned long *data_bits; + int count, i; CGColorSpaceRef colorspace; CFMutableDataRef data; CGDataProviderRef provider; @@ -306,43 +294,86 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - /* This will be owned by the data provider for the mask image and released - when it is destroyed. */ - data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage); - if (!data) + and_bits = HeapAlloc(GetProcessHeap(), 0, info->bmiHeader.biSizeImage); + if (!and_bits) { - WARN("failed to create data\n"); + WARN("failed to allocate and_bits\n"); return NULL; } - CFDataSetLength(data, info->bmiHeader.biSizeImage); + xor_bits = (unsigned long*)((char*)and_bits + info->bmiHeader.biSizeImage / 2); - if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, CFDataGetMutableBytePtr(data), info, DIB_RGB_COLORS)) + if (!GetDIBits(hdc, icon->hbmMask, 0, height * 2, and_bits, info, DIB_RGB_COLORS)) { WARN("GetDIBits failed\n"); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } + /* On Windows, the pixels of a monochrome cursor can have four effects: + draw black, draw white, leave unchanged (transparent), or invert. The Mac + only supports the first three. It can't do pixels which invert the + background. Since the background is usually white, I am arbitrarily + mapping "invert" to "draw black". This entails bitwise math between the + cursor's AND mask and XOR mask: + + AND | XOR | Windows cursor pixel + -------------------------------- + 0 | 0 | black + 0 | 1 | white + 1 | 0 | transparent + 1 | 1 | invert + + AND | XOR | Mac image + --------------------- + 0 | 0 | black (0) + 0 | 1 | white (1) + 1 | 0 | don't care + 1 | 1 | black (0) + + AND | XOR | Mac mask + --------------------------- + 0 | 0 | paint (0) + 0 | 1 | paint (0) + 1 | 0 | don't paint (1) + 1 | 1 | paint (0) + + So, Mac image = AND ^ XOR and Mac mask = AND & ~XOR. + */ + /* Create data for Mac image. */ + data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage / 2); + if (!data) + { + WARN("failed to create data\n"); + HeapFree(GetProcessHeap(), 0, and_bits); + return NULL; + } + + /* image data = AND mask */ + CFDataAppendBytes(data, (UInt8*)and_bits, info->bmiHeader.biSizeImage / 2); + /* image data ^= XOR mask */ + data_bits = (unsigned long*)CFDataGetMutableBytePtr(data); + count = (info->bmiHeader.biSizeImage / 2) / sizeof(*data_bits); + for (i = 0; i < count; i++) + data_bits[i] ^= xor_bits[i]; + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray); if (!colorspace) { WARN("failed to create colorspace\n"); CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } - /* The data object needs to live as long as this provider, so retain it an - extra time and have the provider's data-release callback release it. */ - provider = CGDataProviderCreateWithData(data, CFDataGetBytePtr(data) + width_bytes * height, - width_bytes * height, release_provider_cfdata); + provider = CGDataProviderCreateWithCFData(data); + CFRelease(data); if (!provider) { WARN("failed to create data provider\n"); CGColorSpaceRelease(colorspace); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } - CFRetain(data); cgimage = CGImageCreate(width, height, 1, 1, width_bytes, colorspace, kCGImageAlphaNone | kCGBitmapByteOrderDefault, @@ -352,10 +383,28 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, if (!cgimage) { WARN("failed to create image\n"); - CFRelease(data); + HeapFree(GetProcessHeap(), 0, and_bits); + return NULL; + } + + /* Create data for mask. */ + data = CFDataCreateMutable(NULL, info->bmiHeader.biSizeImage / 2); + if (!data) + { + WARN("failed to create data\n"); + CGImageRelease(cgimage); + HeapFree(GetProcessHeap(), 0, and_bits); return NULL; } + /* mask data = AND mask */ + CFDataAppendBytes(data, (UInt8*)and_bits, info->bmiHeader.biSizeImage / 2); + /* mask data &= ~XOR mask */ + data_bits = (unsigned long*)CFDataGetMutableBytePtr(data); + for (i = 0; i < count; i++) + data_bits[i] &= ~xor_bits[i]; + HeapFree(GetProcessHeap(), 0, and_bits); + provider = CGDataProviderCreateWithCFData(data); CFRelease(data); if (!provider)

1 0

C.W. Betts : winemac: Fix compilation on Lion and later.
by Alexandre Julliard March 8, 2013

March 8, 2013

Module: wine Branch: master Commit: c333c6ea6c3338b2d4650342ab75219147b062cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c333c6ea6c3338b2d4650342a… Author: C.W. Betts <computers57(a)hotmail.com> Date: Thu Mar 7 15:12:45 2013 -0700 winemac: Fix compilation on Lion and later. --- dlls/winemac.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 0f62e28..e3e9aa4 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -33,6 +33,7 @@ #include "wine/wglext.h" #define __gl_h_ +#define __gltypes_h_ #include <OpenGL/OpenGL.h> #include <OpenGL/glu.h> #include <OpenGL/CGLRenderers.h>

1 0