wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Jacek Caban : wininet: Write received data to cache before notifying progress.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: b012765e916b26e5b060d3e9f9c832873c127b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b012765e916b26e5b060d3e9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:05 2012 +0100 wininet: Write received data to cache before notifying progress. --- dlls/wininet/http.c | 117 +++++++++++++++++++++++++++------------------ dlls/wininet/tests/http.c | 4 +- 2 files changed, 72 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f465ad7..73dd991 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2233,6 +2233,47 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, return INET_SetOption(hdr, option, buffer, size); } +static void create_cache_entry(http_request_t *req) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR file_name[MAX_PATH+1]; + BOOL b; + + /* FIXME: We should free previous cache file earlier */ + heap_free(req->cacheFile); + CloseHandle(req->hCacheFile); + req->hCacheFile = NULL; + + b = HTTP_GetRequestURL(req, url); + if(!b) { + WARN("Could not get URL\n"); + return; + } + + b = CreateUrlCacheEntryW(url, req->contentLength, NULL, file_name, 0); + if(!b) { + WARN("Could not create cache entry: %08x\n", GetLastError()); + return; + } + + req->cacheFile = heap_strdupW(file_name); + req->hCacheFile = CreateFileW(req->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(req->hCacheFile == INVALID_HANDLE_VALUE) { + WARN("Could not create file: %u\n", GetLastError()); + req->hCacheFile = NULL; + return; + } + + if(req->read_size) { + DWORD written; + + b = WriteFile(req->hCacheFile, req->read_buf+req->read_pos, req->read_size, &written, NULL); + if(!b) + FIXME("WriteFile failed: %u\n", GetLastError()); + } +} + /* read some more data into the read buffer (the read section must be held) */ static DWORD read_more_data( http_request_t *req, int maxlen ) { @@ -2314,10 +2355,29 @@ static BOOL end_of_read_data( http_request_t *req ) return !req->read_size && req->data_stream->vtbl->end_of_data(req->data_stream, req); } +static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD *read, read_mode_t read_mode) +{ + DWORD res; + + res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, read_mode); + assert(*read <= size); + + if(*read && req->hCacheFile) { + BOOL bres; + DWORD written; + + bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); + if(!bres) + FIXME("WriteFile failed: %u\n", GetLastError()); + } + + return res; +} + /* fetch some more data into the read buffer (the read section must be held) */ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWORD *read_bytes) { - DWORD res, read=0, want; + DWORD res, read=0; if(req->read_size == sizeof(req->read_buf)) return ERROR_SUCCESS; @@ -2328,10 +2388,8 @@ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWOR req->read_pos = 0; } - want = sizeof(req->read_buf) - req->read_size; - res = req->data_stream->vtbl->read(req->data_stream, req, req->read_buf+req->read_size, - want, &read, read_mode); - assert(read <= want); + res = read_http_stream(req, req->read_buf+req->read_size, sizeof(req->read_buf) - req->read_size, + &read, read_mode); req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); @@ -2723,7 +2781,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * } if(ret_read < size) { - res = req->data_stream->vtbl->read(req->data_stream, req, (BYTE*)buffer+ret_read, size-ret_read, &current_read, read_mode); + res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, &current_read, read_mode); ret_read += current_read; } @@ -2732,15 +2790,6 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * *read = ret_read; TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength ); - if(req->hCacheFile && res == ERROR_SUCCESS && ret_read) { - BOOL res; - DWORD written; - - res = WriteFile(req->hCacheFile, buffer, ret_read, &written, NULL); - if(!res) - WARN("WriteFile failed: %u\n", GetLastError()); - } - if(size && !ret_read) http_release_netconn(req, res == ERROR_SUCCESS); @@ -4610,35 +4659,6 @@ static void http_process_keep_alive(http_request_t *req) req->netconn->keep_alive = !strcmpiW(req->version, g_szHttp1_1); } -static void HTTP_CacheRequest(http_request_t *request) -{ - WCHAR url[INTERNET_MAX_URL_LENGTH]; - WCHAR cacheFileName[MAX_PATH+1]; - BOOL b; - - b = HTTP_GetRequestURL(request, url); - if(!b) { - WARN("Could not get URL\n"); - return; - } - - b = CreateUrlCacheEntryW(url, request->contentLength, NULL, cacheFileName, 0); - if(b) { - heap_free(request->cacheFile); - CloseHandle(request->hCacheFile); - - request->cacheFile = heap_strdupW(cacheFileName); - request->hCacheFile = CreateFileW(request->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(request->hCacheFile == INVALID_HANDLE_VALUE) { - WARN("Could not create file: %u\n", GetLastError()); - request->hCacheFile = NULL; - } - }else { - WARN("Could not create cache entry: %08x\n", GetLastError()); - } -} - static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; @@ -4997,14 +5017,14 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } while (loop_next); - if(res == ERROR_SUCCESS) - HTTP_CacheRequest(request); - lend: heap_free(requestString); /* TODO: send notification for P3P header */ + if(res == ERROR_SUCCESS) + create_cache_entry(request); + if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { if (res == ERROR_SUCCESS) { @@ -5107,6 +5127,9 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } + if(res == ERROR_SUCCESS) + create_cache_entry(request); + if (res == ERROR_SUCCESS && request->contentLength) HTTP_ReceiveRequestData(request, TRUE); else diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c4db996..38d1845 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1259,7 +1259,7 @@ static void test_http_cache(void) FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); file_size = GetFileSize(file, NULL); - todo_wine ok(file_size == 106, "file size = %u\n", file_size); + ok(file_size == 106, "file size = %u\n", file_size); size = sizeof(buf); ret = InternetReadFile(request, buf, sizeof(buf), &size); @@ -1267,7 +1267,7 @@ static void test_http_cache(void) ok(size == 100, "size = %u\n", size); file_size = GetFileSize(file, NULL); - todo_wine ok(file_size == 106, "file size = %u\n", file_size); + ok(file_size == 106, "file size = %u\n", file_size); CloseHandle(file); ok(InternetCloseHandle(request), "Close request handle failed\n");

1 0

Jacek Caban : cabinet: Improved debug traces.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 173dff4ccb91fd3a263a1c9b149a2897097ef359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173dff4ccb91fd3a263a1c9b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 11:45:48 2012 +0100 cabinet: Improved debug traces. --- dlls/cabinet/fdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 3d1aec9..2680e72 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2490,9 +2490,9 @@ BOOL __cdecl FDICopy( fdi_decomp_state *decomp_state; FDI_Int *fdi = get_fdi_ptr( hfdi ); - TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, " + TRACE("(hfdi == ^%p, pszCabinet == %s, pszCabPath == %s, flags == %x, " "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", - hfdi, pszCabinet, pszCabPath, flags, pfnfdin, pfnfdid, pvUser); + hfdi, debugstr_a(pszCabinet), debugstr_a(pszCabPath), flags, pfnfdin, pfnfdid, pvUser); if (!fdi) return FALSE;

1 0

Nikolay Sivov : dwrite: Support more script ranges, up to Mongolian.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 8222d4cd3cb9ac001e7988da659a3e822b3494df URL: http://source.winehq.org/git/wine.git/?a=commit;h=8222d4cd3cb9ac001e7988da6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 2 15:52:05 2012 -0400 dwrite: Support more script ranges, up to Mongolian. --- dlls/dwrite/analyzer.c | 56 ++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 110 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 6794c10..34b9faf 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -31,20 +31,37 @@ enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, Script_Bengali = 3, - Script_C1Controls = 12, + Script_Canadian = 8, + Script_Cherokee = 11, + Script_Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Devanagari = 18, + Script_Ethiopic = 19, + Script_Georgian = 20, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, + Script_Hangul = 27, Script_Hebrew = 29, + Script_Kannada = 32, + Script_Khmer = 36, + Script_Lao = 37, Script_Latin = 38, + Script_Malayalam = 44, + Script_Mongolian = 45, + Script_Myanmar = 46, Script_NKo = 48, + Script_Ogham = 49, Script_Oriya = 53, + Script_Runic = 58, + Script_Sinhala = 61, Script_Syriac = 64, Script_Tamil = 68, + Script_Telugu = 69, Script_Thaana = 70, + Script_Thai = 71, + Script_Tibetan = 72, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -70,7 +87,7 @@ static const struct script_range script_ranges[] = { /* ASCII punctuation and symbols, control char DEL: U+007B–U+007F */ { Script_Symbol, 0x7b, 0x7f }, /* C1 Controls: U+0080–U+009F */ - { Script_C1Controls, 0x80, 0x9f }, + { Script_Controls, 0x80, 0x9f }, /* Latin-1 Supplement: U+00A0–U+00FF */ /* Latin Extended-A: U+0100–U+017F */ /* Latin Extended-B: U+0180–U+024F */ @@ -116,6 +133,41 @@ static const struct script_range script_ranges[] = { { Script_Oriya, 0xb00, 0xb7f }, /* Tamil: U+0B80–U+0BFF */ { Script_Tamil, 0xb80, 0xbff }, + /* Telugu: U+0C00–U+0C7F */ + { Script_Telugu, 0xc00, 0xc7f }, + /* Kannada: U+0C80–U+0CFF */ + { Script_Kannada, 0xc80, 0xcff }, + /* Malayalam: U+0D00–U+0D7F */ + { Script_Malayalam, 0xd00, 0xd7f }, + /* Sinhala: U+0D80–U+0DFF */ + { Script_Sinhala, 0xd80, 0xdff }, + /* Thai: U+0E00–U+0E7F */ + { Script_Thai, 0xe00, 0xe7f }, + /* Lao: U+0E80–U+0EFF */ + { Script_Lao, 0xe80, 0xeff }, + /* Tibetan: U+0F00–U+0FFF */ + { Script_Tibetan, 0xf00, 0xfff }, + /* Myanmar: U+1000–U+109F */ + { Script_Myanmar, 0x1000, 0x109f }, + /* Georgian: U+10A0–U+10FF */ + { Script_Georgian, 0x10a0, 0x10ff }, + /* Hangul Jamo: U+1100–U+11FF */ + { Script_Hangul, 0x1100, 0x11ff }, + /* Ethiopic: U+1200–U+137F */ + /* Ethiopic Extensions: U+1380–U+139F */ + { Script_Ethiopic, 0x1200, 0x139f }, + /* Cherokee: U+13A0–U+13FF */ + { Script_Cherokee, 0x13a0, 0x13ff }, + /* Canadian Aboriginal Syllabics: U+1400–U+167F */ + { Script_Canadian, 0x1400, 0x167f }, + /* Ogham: U+1680–U+169F */ + { Script_Ogham, 0x1680, 0x169f }, + /* Runic: U+16A0–U+16F0 */ + { Script_Runic, 0x16a0, 0x16f0 }, + /* Khmer: U+1780–U+17FF */ + { Script_Khmer, 0x1780, 0x17ff }, + /* Mongolian: U+1800–U+18AF */ + { Script_Mongolian, 0x1800, 0x18af}, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index dbd0307..050837e 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -400,20 +400,37 @@ enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, Script_Bengali = 3, - Script_C1Controls = 12, + Script_Canadian = 8, + Script_Cherokee = 11, + Script_Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Devanagari = 18, + Script_Ethiopic = 19, + Script_Georgian = 20, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, + Script_Hangul = 27, Script_Hebrew = 29, + Script_Kannada = 32, + Script_Khmer = 36, + Script_Lao = 37, Script_Latin = 38, + Script_Malayalam = 44, + Script_Mongolian = 45, + Script_Myanmar = 46, Script_NKo = 48, + Script_Ogham = 49, Script_Oriya = 53, + Script_Runic = 58, + Script_Sinhala = 61, Script_Syriac = 64, Script_Tamil = 68, + Script_Telugu = 69, Script_Thaana = 70, + Script_Thai = 71, + Script_Tibetan = 72, Script_Symbol = 77 }; @@ -482,7 +499,7 @@ static struct sa_test sa_tests[] = { { /* C1 Controls, Latin-1 Supplement */ {0x80,0x90,0x9f,0xa0,0xc0,0xb8,0xbf,0xc0,0xff,0}, 2, - { { 0, 3, { Script_C1Controls, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { { 0, 3, { Script_Controls, DWRITE_SCRIPT_SHAPES_DEFAULT } }, { 3, 6, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }, } }, @@ -596,6 +613,95 @@ static struct sa_test sa_tests[] = { {0xba4,0xbae,0xbbf,0xbb4,0xbcd,'.',0}, 1, { { 0, 6, { Script_Tamil, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Telugu */ + {0xc24,0xc46,0xc32,0xc41,0xc17,0xc41,'.',0}, 1, + { { 0, 7, { Script_Telugu, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Kannada */ + {0xc95,0xca8,0xccd,0xca8,0xca1,'.',0}, 1, + { { 0, 6, { Script_Kannada, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Malayalam */ + {0xd2e,0xd32,0xd2f,0xd3e,0xd33,0xd02,'.',0}, 1, + { { 0, 7, { Script_Malayalam, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Sinhala */ + {0xd82,0xd85,0xd9a,0xdcf,'.',0}, 1, + { { 0, 5, { Script_Sinhala, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thai */ + {0x0e04,0x0e27,0x0e32,0x0e21,0x0e1e,0x0e22,0x0e32,0x0e22,0x0e32,0x0e21, + 0x0e2d,0x0e22,0x0e39,0x0e48,0x0e17,0x0e35,0x0e48,0x0e44,0x0e2b,0x0e19, + 0x0e04,0x0e27,0x0e32,0x0e21,0x0e2a, 0x0e33,0x0e40,0x0e23,0x0e47,0x0e08, + 0x0e2d,0x0e22,0x0e39,0x0e48,0x0e17,0x0e35,0x0e48,0x0e19,0x0e31,0x0e48,0x0e19,'.',0}, 1, + { { 0, 42, { Script_Thai, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Lao */ + {0xead,0xeb1,0xe81,0xeaa,0xead,0xe99,0xea5,0xeb2,0xea7,'.',0}, 1, + { { 0, 10, { Script_Lao, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tibetan */ + {0xf04,0xf05,0xf0e,0x020,0xf51,0xf7c,0xf53,0xf0b,0xf5a,0xf53,0xf0b, + 0xf51,0xf44,0xf0b,0xf54,0xf7c,0xf0d,'.',0}, 1, + { { 0, 18, { Script_Tibetan, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Myanmar */ + {0x1019,0x103c,0x1014,0x103a,0x1019,0x102c,0x1021,0x1000,0x1039,0x1001,0x101b,0x102c,'.',0}, 1, + { { 0, 13, { Script_Myanmar, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Georgian */ + {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,'.',0}, 1, + { { 0, 6, { Script_Georgian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Hangul */ + {0x1100,0x1110,0x1160,0x1170,0x11a8,'.',0}, 1, + { { 0, 6, { Script_Hangul, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Ethiopic */ + {0x130d,0x12d5,0x12dd,0}, 1, + { { 0, 3, { Script_Ethiopic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Cherokee */ + {0x13e3,0x13b3,0x13a9,0x0020,0x13a6,0x13ec,0x13c2,0x13af,0x13cd,0x13d7,0}, 1, + { { 0, 10, { Script_Cherokee, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Canadian */ + {0x1403,0x14c4,0x1483,0x144e,0x1450,0x1466,0}, 1, + { { 0, 6, { Script_Canadian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Ogham */ + {0x169b,0x1691,0x168c,0x1690,0x168b,0x169c,0}, 1, + { { 0, 6, { Script_Ogham, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Runic */ + {0x16a0,0x16a1,0x16a2,0x16a3,0x16a4,0x16a5,0}, 1, + { { 0, 6, { Script_Runic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Khmer */ + {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6,0}, 1, + { { 0, 8, { Script_Khmer, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Mongolian */ + {0x182e,0x1823,0x1829,0x182d,0x1823,0x182f,0x0020,0x182a,0x1822,0x1834,0x1822,0x182d,0x180c,0}, 1, + { { 0, 13, { Script_Mongolian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Christian Costa : kernel32: Implement CompareStringOrdinal.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ba5cade700a0f1ad18b9c8b9824fd8ac91c7493b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5cade700a0f1ad18b9c8b98… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:39 2012 +0100 kernel32: Implement CompareStringOrdinal. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 33 ++++++++++++++++++ dlls/kernel32/tests/locale.c | 76 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b7efa0f..0bd1adc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -201,6 +201,7 @@ @ stdcall CompareStringA(long long str long str long) @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) +@ stdcall CompareStringOrdinal(wstr long wstr long long) @ stdcall ConnectNamedPipe(long ptr) @ stub ConsoleMenuControl @ stub ConsoleSubst diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c41442c..57daab1 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3047,6 +3047,39 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, return ret; } +/****************************************************************************** + * CompareStringOrdinal (KERNEL32.@) + */ +INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, INT len2, BOOL ignore_case) +{ + int ret, len; + + if (!str1 || !str2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (len1 < 0) len1 = strlenW(str1); + if (len2 < 0) len2 = strlenW(str2); + + len = min(len1, len2); + if (ignore_case) + { + ret = memicmpW(str1, str2, len); + } + else + { + ret = 0; + for (; len > 0; len--) + if ((ret = (*str1++ - *str2++))) break; + } + if (!ret) ret = len1 - len2; + + if (ret < 0) return CSTR_LESS_THAN; + if (ret > 0) return CSTR_GREATER_THAN; + return CSTR_EQUAL; +} + /************************************************************************* * lstrcmp (KERNEL32.@) * lstrcmpA (KERNEL32.@) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0225c2b..197f562 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -87,6 +87,7 @@ static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pIdnToUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pGetLocaleInfoEx)(LPCWSTR, LCTYPE, LPWSTR, INT); static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); +static INT (WINAPI *pCompareStringOrdinal)(const WCHAR *, INT, const WCHAR *, INT, BOOL); static void InitFunctionPointers(void) { @@ -106,6 +107,7 @@ static void InitFunctionPointers(void) pIdnToUnicode = (void*)GetProcAddress(hKernel32, "IdnToUnicode"); pGetLocaleInfoEx = (void*)GetProcAddress(hKernel32, "GetLocaleInfoEx"); pIsValidLocaleName = (void*)GetProcAddress(hKernel32, "IsValidLocaleName"); + pCompareStringOrdinal = (void*)GetProcAddress(hKernel32, "CompareStringOrdinal"); } #define eq(received, expected, label, type) \ @@ -3478,11 +3480,82 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); } +void test_CompareStringOrdinal(void) +{ + INT ret; + WCHAR test1[] = { 't','e','s','t',0 }; + WCHAR test2[] = { 'T','e','S','t',0 }; + WCHAR test3[] = { 't','e','s','t','3',0 }; + WCHAR null1[] = { 'a',0,'a',0 }; + WCHAR null2[] = { 'a',0,'b',0 }; + WCHAR bills1[] = { 'b','i','l','l','\'','s',0 }; + WCHAR bills2[] = { 'b','i','l','l','s',0 }; + WCHAR coop1[] = { 'c','o','-','o','p',0 }; + WCHAR coop2[] = { 'c','o','o','p',0 }; + WCHAR nonascii1[] = { 0x0102,0 }; + WCHAR nonascii2[] = { 0x0201,0 }; + + if (!pCompareStringOrdinal) + { + win_skip("CompareStringOrdinal not supported\n"); + return; + } + + /* Check errors */ + SetLastError(0xdeadbeef); + ret = pCompareStringOrdinal(NULL, 0, NULL, 0, FALSE); + ok(!ret, "Got %u, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %x, expected %x\n", GetLastError(), ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + ret = pCompareStringOrdinal(test1, -1, NULL, 0, FALSE); + ok(!ret, "Got %u, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %x, expected %x\n", GetLastError(), ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + ret = pCompareStringOrdinal(NULL, 0, test1, -1, FALSE); + ok(!ret, "Got %u, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %x, expected %x\n", GetLastError(), ERROR_INVALID_PARAMETER); + + /* Check case */ + ret = pCompareStringOrdinal(test1, -1, test1, -1, FALSE); + ok(ret == CSTR_EQUAL, "Got %u, expected %u\n", ret, CSTR_EQUAL); + ret = pCompareStringOrdinal(test1, -1, test2, -1, FALSE); + ok(ret == CSTR_GREATER_THAN, "Got %u, expected %u\n", ret, CSTR_GREATER_THAN); + ret = pCompareStringOrdinal(test2, -1, test1, -1, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, -1, test2, -1, TRUE); + ok(ret == CSTR_EQUAL, "Got %u, expected %u\n", ret, CSTR_EQUAL); + + /* Check different sizes */ + ret = pCompareStringOrdinal(test1, 3, test2, -1, TRUE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, -1, test2, 3, TRUE); + ok(ret == CSTR_GREATER_THAN, "Got %u, expected %u\n", ret, CSTR_GREATER_THAN); + + /* Check null character */ + ret = pCompareStringOrdinal(null1, 3, null2, 3, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(null1, 3, null2, 3, TRUE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, 5, test3, 5, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, 4, test1, 5, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + + /* Check ordinal behaviour */ + ret = pCompareStringOrdinal(bills1, -1, bills2, -1, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(coop2, -1, coop1, -1, FALSE); + ok(ret == CSTR_GREATER_THAN, "Got %u, expected %u\n", ret, CSTR_GREATER_THAN); + ret = pCompareStringOrdinal(nonascii1, -1, nonascii2, -1, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(nonascii1, -1, nonascii2, -1, TRUE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); +} + START_TEST(locale) { InitFunctionPointers(); - test_EnumTimeFormatsA(); test_EnumDateFormatsA(); test_GetLocaleInfoA(); @@ -3512,6 +3585,7 @@ START_TEST(locale) test_IdnToAscii(); test_IdnToUnicode(); test_IsValidLocaleName(); + test_CompareStringOrdinal(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Alexandre Julliard : gdi32: Set the font anti-aliasing flags from the fontconfig information if available .
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 9d888b371fe93eeda0f2915e133a9fca329c35d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d888b371fe93eeda0f2915e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 19:46:18 2012 +0100 gdi32: Set the font anti-aliasing flags from the fontconfig information if available. --- dlls/gdi32/freetype.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a70b853..98c7b40 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -345,6 +345,7 @@ struct tagGdiFont { SHORT yMax; SHORT yMin; DWORD ntmFlags; + DWORD aa_flags; UINT ntmCellHeight, ntmAvgWidth; FONTSIGNATURE fs; GdiFont *base_font; @@ -4544,8 +4545,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) GetObjectW( hfont, sizeof(lf), &lf ); lf.lfWidth = abs(lf.lfWidth); - if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); - can_use_bitmap = GetDeviceCaps(dev->hdc, TEXTCAPS) & TC_RA_ABLE; TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", @@ -4946,6 +4945,7 @@ found_face: TRACE("Loaded GSUB table of %i bytes\n",length); } } + ret->aa_flags = face->aa_flags; TRACE("caching: gdiFont=%p hfont=%p\n", ret, hfont); @@ -4953,6 +4953,9 @@ found_face: done: if (ret) { + if (!*aa_flags) *aa_flags = ret->aa_flags; + if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + /* fixup the antialiasing flags for that font */ switch (*aa_flags) {

1 0

Alexandre Julliard : gdi32: Move checking of the subpixel support and gasp flags to freetype.c.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 123da6f888b954c242bd49a4abab8cad0e1436fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=123da6f888b954c242bd49a4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 17:21:28 2012 +0100 gdi32: Move checking of the subpixel support and gasp flags to freetype.c. --- dlls/gdi32/font.c | 101 ++--------------------------------- dlls/gdi32/freetype.c | 138 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 110 insertions(+), 129 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a2d4d3e..09ea1b7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -39,12 +39,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef WORDS_BIGENDIAN -#define get_be_word(x) (x) -#else -#define get_be_word(x) RtlUshortByteSwap(x) -#endif - WINE_DEFAULT_DEBUG_CHANNEL(font); /* Device -> World size conversion */ @@ -266,69 +260,6 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -static DWORD get_font_ppem( HDC hdc ) -{ - TEXTMETRICW tm; - DWORD ppem; - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return GDI_ERROR; - - GetTextMetricsW( hdc, &tm ); - ppem = abs( INTERNAL_YWSTODS( dc, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading ) ); - release_dc_ptr( dc ); - return ppem; -} - -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 - -static BOOL get_gasp_flags( HDC hdc, WORD *flags ) -{ - DWORD size, gasp_tag = 0x70736167; - WORD buf[16]; /* Enough for seven ranges before we need to alloc */ - WORD *alloced = NULL, *ptr = buf; - WORD num_recs, version; - DWORD ppem = get_font_ppem( hdc ); - BOOL ret = FALSE; - - *flags = 0; - if (ppem == GDI_ERROR) return FALSE; - - size = GetFontData( hdc, gasp_tag, 0, NULL, 0 ); - if (size == GDI_ERROR) return FALSE; - if (size < 4 * sizeof(WORD)) return FALSE; - if (size > sizeof(buf)) - { - ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); - if (!ptr) return FALSE; - } - - GetFontData( hdc, gasp_tag, 0, ptr, size ); - - version = get_be_word( *ptr++ ); - num_recs = get_be_word( *ptr++ ); - - if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) - { - FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); - goto done; - } - - while (num_recs--) - { - *flags = get_be_word( *(ptr + 1) ); - if (ppem <= get_be_word( *ptr )) break; - ptr += 2; - } - TRACE( "got flags %04x for ppem %d\n", *flags, ppem ); - ret = TRUE; - -done: - HeapFree( GetProcessHeap(), 0, alloced ); - return ret; -} - enum smoothing { no_smoothing, aa_smoothing, subpixel_smoothing }; static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) @@ -392,19 +323,8 @@ static UINT get_subpixel_orientation( void ) UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) { - WORD gasp_flags; - static int hinter = -1; - static int subpixel_enabled = -1; enum smoothing smoothing; - if (hinter == -1 || subpixel_enabled == -1) - { - RASTERIZER_STATUS status; - GetRasterizerCaps(&status, sizeof(status)); - hinter = status.wFlags & WINE_TT_HINTER_ENABLED; - subpixel_enabled = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; - } - switch (lf->lfQuality) { case NONANTIALIASED_QUALITY: @@ -423,24 +343,15 @@ UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) smoothing = get_default_smoothing(); } - if (smoothing == subpixel_smoothing) - { - if (subpixel_enabled) - { - UINT ret = get_subpixel_orientation(); - if (ret != GGO_GRAY4_BITMAP) return ret; - } - smoothing = aa_smoothing; - } - - if (smoothing == aa_smoothing) + switch (smoothing) { - if (hinter && get_gasp_flags( hdc, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) - return GGO_BITMAP; + case subpixel_smoothing: + return get_subpixel_orientation(); + case aa_smoothing: return GGO_GRAY4_BITMAP; + default: + return GGO_BITMAP; } - - return GGO_BITMAP; } /*********************************************************************** diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ad179f1..a70b853 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -894,6 +894,44 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) return (FT_Fixed)((int)f.value << 16 | (unsigned int)f.fract); } +static BOOL is_hinting_enabled(void) +{ + static int enabled = -1; + + if (enabled == -1) + { + /* Use the >= 2.2.0 function if available */ + if (pFT_Get_TrueType_Engine_Type) + { + FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); + enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); + } +#ifdef FT_DRIVER_HAS_HINTER + else + { + /* otherwise if we've been compiled with < 2.2.0 headers use the internal macro */ + FT_Module mod = pFT_Get_Module(library, "truetype"); + enabled = (mod && FT_DRIVER_HAS_HINTER(mod)); + } +#endif + else enabled = FALSE; + } + return enabled; +} + +static BOOL is_subpixel_rendering_enabled( void ) +{ +#ifdef HAVE_FREETYPE_FTLCDFIL_H + static int enabled = -1; + if (enabled == -1) + enabled = (pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + return enabled; +#else + return FALSE; +#endif +} + static const struct list *get_face_list_from_family(const Family *family) { @@ -4426,6 +4464,53 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 +#define GASP_TAG MS_MAKE_TAG('g','a','s','p') + +static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) +{ + DWORD size; + WORD buf[16]; /* Enough for seven ranges before we need to alloc */ + WORD *alloced = NULL, *ptr = buf; + WORD num_recs, version; + BOOL ret = FALSE; + + *flags = 0; + size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + if (size == GDI_ERROR) return FALSE; + if (size < 4 * sizeof(WORD)) return FALSE; + if (size > sizeof(buf)) + { + ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return FALSE; + } + + get_font_data( font, GASP_TAG, 0, ptr, size ); + + version = GET_BE_WORD( *ptr++ ); + num_recs = GET_BE_WORD( *ptr++ ); + + if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) + { + FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); + goto done; + } + + while (num_recs--) + { + *flags = GET_BE_WORD( *(ptr + 1) ); + if (font->ft_face->size->metrics.y_ppem <= GET_BE_WORD( *ptr )) break; + ptr += 2; + } + TRACE( "got flags %04x for ppem %d\n", *flags, font->ft_face->size->metrics.y_ppem ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, alloced ); + return ret; +} + /************************************************************* * freetype_SelectFont */ @@ -4868,6 +4953,25 @@ found_face: done: if (ret) { + /* fixup the antialiasing flags for that font */ + switch (*aa_flags) + { + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + if (is_subpixel_rendering_enabled()) break; + *aa_flags = GGO_GRAY4_BITMAP; + /* fall through */ + case GGO_GRAY4_BITMAP: + if (is_hinting_enabled()) + { + WORD gasp_flags; + if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + *aa_flags = GGO_BITMAP; + } + break; + } dc->gdiFont = ret; physdev->font = ret; } @@ -7430,40 +7534,6 @@ static BOOL freetype_FontIsLinked( PHYSDEV dev ) return ret; } -static BOOL is_hinting_enabled(void) -{ - /* Use the >= 2.2.0 function if available */ - if(pFT_Get_TrueType_Engine_Type) - { - FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); - return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; - } -#ifdef FT_DRIVER_HAS_HINTER - else - { - FT_Module mod; - - /* otherwise if we've been compiled with < 2.2.0 headers - use the internal macro */ - mod = pFT_Get_Module(library, "truetype"); - if(mod && FT_DRIVER_HAS_HINTER(mod)) - return TRUE; - } -#endif - - return FALSE; -} - -static BOOL is_subpixel_rendering_enabled( void ) -{ -#ifdef HAVE_FREETYPE_FTLCDFIL_H - return pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature; -#else - return FALSE; -#endif -} - /************************************************************************* * GetRasterizerCaps (GDI32.@) */

1 0

Alexandre Julliard : gdi32: Disable anti-aliasing when necessary in the various drivers.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 9cdb0e1ca6d9cdbe5d40d5a544629d6f21baff2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdb0e1ca6d9cdbe5d40d5a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 16:07:51 2012 +0100 gdi32: Disable anti-aliasing when necessary in the various drivers. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 13 +++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 1 + dlls/gdi32/font.c | 8 -------- dlls/gdi32/mfdrv/objects.c | 1 + dlls/wineps.drv/font.c | 2 ++ dlls/winex11.drv/init.c | 12 +++++++++++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0b6013d..4d84452 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -484,7 +484,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SelectBitmap, /* pSelectBitmap */ dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + dibdrv_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 564fe95..1cd87e3 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -141,6 +141,7 @@ extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT extern BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN; extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 6f936e0..0b54188 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -712,6 +712,19 @@ done: } /*********************************************************************** + * dibdrv_SelectFont + */ +HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (pdev->dib.bit_count <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ + + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, font, aa_flags ); +} + +/*********************************************************************** * dibdrv_Arc */ BOOL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 8dd88f6..4c85fe7 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -314,6 +314,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, UINT *aa_flags ) if(!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; done: + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); dev->funcs->pSelectFont( dev, hFont, aa_flags ); return hFont; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d5396ff..a2d4d3e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -397,14 +397,6 @@ UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) static int subpixel_enabled = -1; enum smoothing smoothing; - if (GetObjectType( hdc ) == OBJ_MEMDC) - { - BITMAP bm; - GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bm), &bm ); - if (bm.bmBitsPixel <= 8) return GGO_BITMAP; - } - else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; - if (hinter == -1 || subpixel_enabled == -1) { RASTERIZER_STATUS status; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 07e66b7..697644d 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -290,6 +290,7 @@ HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LOGFONTW font; INT16 index; + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ index = MFDRV_FindObject(dev, hfont); if( index < 0 ) { diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index f04d069..4888af3 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -47,6 +47,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (!GetObjectW( hfont, sizeof(lf), &lf )) return 0; + *aa_flags = GGO_BITMAP; /* no anti-aliasing on printer devices */ + TRACE("FaceName = %s Height = %d Italic = %d Weight = %d\n", debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic, lf.lfWeight); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d729fd0..7cf318f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -295,6 +295,16 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } +/*********************************************************************** + * SelectFont + */ +static HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) +{ + if (default_visual.depth <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, hfont, aa_flags ); +} + /********************************************************************** * ExtEscape (X11DRV.@) */ @@ -532,7 +542,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSelectBitmap */ X11DRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + X11DRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */

1 0

Alexandre Julliard : gdi32: Store the anti-aliasing flags in the DC when selecting a font.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ccc034c27e7595662c9c02b86de1b660ac680536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc034c27e7595662c9c02b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 15:55:29 2012 +0100 gdi32: Store the anti-aliasing flags in the DC when selecting a font. --- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 20 ++++++++------------ dlls/gdi32/freetype.c | 2 ++ dlls/gdi32/gdi_private.h | 3 ++- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 450ecad..6f936e0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -665,7 +665,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); struct clipped_rects clipped_rects; - UINT aa_flags; + DC *dc; RECT bounds; DWORD text_color; struct intensity_range ranges[17]; @@ -700,10 +700,10 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); - aa_flags = get_font_aa_flags( dev->hdc ); - - render_string( dev->hdc, &pdev->dib, x, y, flags, aa_flags, str, count, dx, + dc = get_dc_ptr( dev->hdc ); + render_string( dev->hdc, &pdev->dib, x, y, flags, dc->aa_flags, str, count, dx, text_color, ranges, &clipped_rects, &bounds ); + release_dc_ptr( dc ); done: add_clipped_bounds( pdev, &bounds, pdev->clip ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6179230..d5396ff 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -390,9 +390,8 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -UINT get_font_aa_flags( HDC hdc ) +UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) { - LOGFONTW lf; WORD gasp_flags; static int hinter = -1; static int subpixel_enabled = -1; @@ -406,9 +405,6 @@ UINT get_font_aa_flags( HDC hdc ) } else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; - GetObjectW( GetCurrentObject( hdc, OBJ_FONT ), sizeof(lf), &lf ); - if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; - if (hinter == -1 || subpixel_enabled == -1) { RASTERIZER_STATUS status; @@ -417,8 +413,10 @@ UINT get_font_aa_flags( HDC hdc ) subpixel_enabled = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; } - switch (lf.lfQuality) + switch (lf->lfQuality) { + case NONANTIALIASED_QUALITY: + return GGO_BITMAP; case ANTIALIASED_QUALITY: smoothing = aa_smoothing; break; @@ -731,6 +729,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { ret = dc->hFont; dc->hFont = handle; + dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc ); GDI_dec_ref_count( ret ); } @@ -1948,7 +1947,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect LPCWSTR str, UINT count, const INT *dx ) { DC *dc = get_nulldrv_dc( dev ); - UINT aa_flags, i; + UINT i; DWORD err; HGDIOBJ orig; HPEN pen; @@ -1970,18 +1969,15 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect if (!count) return TRUE; - aa_flags = get_font_aa_flags( dev->hdc ); - - if (aa_flags != GGO_BITMAP) + if (dc->aa_flags != GGO_BITMAP) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; struct gdi_image_bits bits; struct bitblt_coords src, dst; PHYSDEV dst_dev; - /* FIXME Subpixel modes */ - aa_flags = GGO_GRAY4_BITMAP; + UINT aa_flags = GGO_GRAY4_BITMAP; dst_dev = GET_DC_PHYSDEV( dc, pPutImage ); src.visrect = get_total_extents( dev->hdc, x, y, flags, aa_flags, str, count, dx ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b747f6f..ad179f1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4459,6 +4459,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) GetObjectW( hfont, sizeof(lf), &lf ); lf.lfWidth = abs(lf.lfWidth); + if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + can_use_bitmap = GetDeviceCaps(dev->hdc, TEXTCAPS) & TC_RA_ABLE; TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 792a9e4..084245e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -88,6 +88,7 @@ typedef struct tagDC RECT vis_rect; /* visible rectangle in screen coords */ RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ + UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; int flags; @@ -278,7 +279,7 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; /* font.c */ -extern UINT get_font_aa_flags( HDC hdc ) DECLSPEC_HIDDEN; +extern UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Add a parameter to return anti-aliasing flags in the SelectFont driver entry point .
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 6164d533a9bbfc40ed0fbc0c6c2b95c493da1c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6164d533a9bbfc40ed0fbc0c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 19:37:31 2012 +0100 gdi32: Add a parameter to return anti-aliasing flags in the SelectFont driver entry point. --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 4 ++-- dlls/gdi32/font.c | 3 ++- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/wineps.drv/font.c | 6 +++--- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/xrender.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ca21d4d..2ab0778 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -552,7 +552,7 @@ static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush return brush; } -static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font ) +static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { return 0; } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 03bb829..3dd2923 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -105,7 +105,7 @@ extern BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, extern HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; extern HBRUSH EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; -extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle ) DECLSPEC_HIDDEN; +extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN EMFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 905560d..8dd88f6 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -277,7 +277,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont ) /*********************************************************************** * EMFDRV_SelectFont */ -HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont ) +HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, UINT *aa_flags ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -315,7 +315,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont ) return 0; done: dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); - dev->funcs->pSelectFont( dev, hFont ); + dev->funcs->pSelectFont( dev, hFont, aa_flags ); return hFont; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6684660..6179230 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -716,6 +716,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); PHYSDEV physdev; + UINT aa_flags = 0; if (!dc) return 0; @@ -726,7 +727,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) } physdev = GET_DC_PHYSDEV( dc, pSelectFont ); - if (physdev->funcs->pSelectFont( physdev, handle )) + if (physdev->funcs->pSelectFont( physdev, handle, &aa_flags )) { ret = dc->hFont; dc->hFont = handle; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ca11968..b747f6f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4429,7 +4429,7 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) /************************************************************* * freetype_SelectFont */ -static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) +static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { struct freetype_physdev *physdev = get_freetype_dev( dev ); GdiFont *ret; diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index d04cc8f..e1a03bb 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -105,7 +105,7 @@ extern BOOL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, extern HBITMAP MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; extern HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; -extern HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT handle ) DECLSPEC_HIDDEN; +extern HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground) DECLSPEC_HIDDEN; extern UINT MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL primary) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index ca70117..07e66b7 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -285,7 +285,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo /*********************************************************************** * MFDRV_SelectFont */ -HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont ) +HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LOGFONTW font; INT16 index; diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index abc9b92..f04d069 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * SelectFont (WINEPS.@) */ -HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont ) +HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); @@ -114,14 +114,14 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont ) physDev->font.escapement = lf.lfEscapement; physDev->font.set = FALSE; - if (!subst && ((ret = next->funcs->pSelectFont( next, hfont )))) + if (!subst && ((ret = next->funcs->pSelectFont( next, hfont, aa_flags )))) { PSDRV_SelectDownloadFont(dev); return ret; } PSDRV_SelectBuiltinFont(dev, hfont, &lf, FaceName); - next->funcs->pSelectFont( next, 0 ); /* tell next driver that we selected a device font */ + next->funcs->pSelectFont( next, 0, aa_flags ); /* tell next driver that we selected a device font */ return hfont; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 52f84e7..1e76bef 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -444,7 +444,7 @@ extern BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott extern BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont ) DECLSPEC_HIDDEN; +extern HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern COLORREF PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 389f684..d1993f7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1036,12 +1036,12 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz) /********************************************************************** * xrenderdrv_SelectFont */ -static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont ) +static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LFANDSIZE lfsz; struct xrender_physdev *physdev = get_xrender_dev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); - HFONT ret = next->funcs->pSelectFont( next, hfont ); + HFONT ret = next->funcs->pSelectFont( next, hfont, aa_flags ); if (!ret) return 0; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 1f6376c..f6be211d 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -153,7 +153,7 @@ struct gdi_dc_funcs HBITMAP (*pSelectBitmap)(PHYSDEV,HBITMAP); HBRUSH (*pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); BOOL (*pSelectClipPath)(PHYSDEV,INT); - HFONT (*pSelectFont)(PHYSDEV,HFONT); + HFONT (*pSelectFont)(PHYSDEV,HFONT,UINT*); HPALETTE (*pSelectPalette)(PHYSDEV,HPALETTE,BOOL); HPEN (*pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*); INT (*pSetArcDirection)(PHYSDEV,INT); @@ -197,7 +197,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 44 +#define WINE_GDI_DRIVER_VERSION 45 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */

1 0

Jacek Caban : explorerframe: Moved TaskbarList implementation to explorerframe.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: deeb14e0ee39087a4f629cf332d586b44559427c URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeb14e0ee39087a4f629cf33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 10:26:26 2012 +0100 explorerframe: Moved TaskbarList implementation to explorerframe. --- dlls/explorerframe/Makefile.in | 3 ++- dlls/explorerframe/explorerframe.idl | 7 +++++++ dlls/explorerframe/explorerframe_main.c | 4 ++++ dlls/explorerframe/explorerframe_main.h | 13 +++++++++++++ dlls/{ieframe => explorerframe}/taskbarlist.c | 10 +++++----- dlls/ieframe/Makefile.in | 1 - dlls/ieframe/ieframe.h | 1 - dlls/ieframe/ieframe_main.c | 17 ----------------- dlls/ieframe/ieframe_v1.idl | 6 ------ 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 975f197..dcb2826 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 shell32 user32 C_SRCS = \ explorerframe_main.c \ - nstc.c + nstc.c \ + taskbarlist.c IDL_R_SRCS = explorerframe.idl diff --git a/dlls/explorerframe/explorerframe.idl b/dlls/explorerframe/explorerframe.idl index 8171396..f7d6ece 100644 --- a/dlls/explorerframe/explorerframe.idl +++ b/dlls/explorerframe/explorerframe.idl @@ -24,3 +24,10 @@ uuid(ae054212-3535-4430-83ed-d501aa6680e6) ] coclass NamespaceTreeControl { interface INameSpaceTreeControl2; } + +[ + helpstring("Task Bar Communication"), + threading(apartment), + uuid(56fdf344-fd6d-11d0-958a-006097c9a090) +] +coclass TaskbarList { interface ITaskbarList; } diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index e26082f..bdb77a1 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -199,12 +199,16 @@ static const IClassFactoryVtbl EFCF_Vtbl = HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { static IClassFactoryImpl NSTCClassFactory = {{&EFCF_Vtbl}, NamespaceTreeControl_Constructor}; + static IClassFactoryImpl TaskbarListFactory = {{&EFCF_Vtbl}, TaskbarList_Constructor}; TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(&CLSID_NamespaceTreeControl, rclsid)) return IClassFactory_QueryInterface(&NSTCClassFactory.IClassFactory_iface, riid, ppv); + if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) + return IClassFactory_QueryInterface(&TaskbarListFactory.IClassFactory_iface, riid, ppv); + return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index 7fc2b45..44e7253 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -21,6 +21,8 @@ #ifndef __WINE_EXPLORERFRAME_H #define __WINE_EXPLORERFRAME_H +#define COBJMACROS + #include "shlobj.h" /* Not declared in commctrl.h ("for internal use (msdn)") */ @@ -33,5 +35,16 @@ static inline void EFRAME_LockModule(void) { InterlockedIncrement( &EFRAME_refCo static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_refCount ); } HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/ieframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c similarity index 97% rename from dlls/ieframe/taskbarlist.c rename to dlls/explorerframe/taskbarlist.c index f432317..d40f652 100644 --- a/dlls/ieframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -18,7 +18,7 @@ * */ -#include "ieframe.h" +#include "explorerframe_main.h" #include "wine/debug.h" @@ -78,7 +78,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) if (!refcount) { heap_free(This); - unlock_module(); + EFRAME_UnlockModule(); } return refcount; @@ -289,7 +289,7 @@ static const struct ITaskbarList4Vtbl taskbar_list_vtbl = taskbar_list_SetTabProperties, }; -HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **taskbar_list) +HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_list) { struct taskbar_list *object; HRESULT hres; @@ -303,7 +303,7 @@ HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID return CLASS_E_NOAGGREGATION; } - object = heap_alloc_zero(sizeof(*object)); + object = heap_alloc(sizeof(*object)); if (!object) { ERR("Failed to allocate taskbar list object memory\n"); @@ -313,7 +313,7 @@ HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID object->ITaskbarList4_iface.lpVtbl = &taskbar_list_vtbl; object->refcount = 1; - lock_module(); + EFRAME_LockModule(); TRACE("Created ITaskbarList4 %p\n", object); diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index dca216b..38800f1 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -18,7 +18,6 @@ C_SRCS = \ persist.c \ shellbrowser.c \ shelluihelper.c \ - taskbarlist.c \ urlhist.c \ view.c \ webbrowser.c diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4698008..8dd3f17 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -305,7 +305,6 @@ HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI TaskbarList_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 56cd663..7c0b37b 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -201,16 +201,6 @@ static const IClassFactoryVtbl CUrlHistoryFactoryVtbl = { static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl }; -static const IClassFactoryVtbl TaskbarListFactoryVtbl = { - ClassFactory_QueryInterface, - ClassFactory_AddRef, - ClassFactory_Release, - TaskbarList_Create, - ClassFactory_LockServer -}; - -static IClassFactory TaskbarListFactory = { &TaskbarListFactoryVtbl }; - /****************************************************************** * DllMain (ieframe.@) */ @@ -250,7 +240,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&WebBrowserV1Factory, riid, ppv); } - if(IsEqualGUID(rclsid, &CLSID_InternetShortcut)) { TRACE("(CLSID_InternetShortcut %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&InternetShortcutFactory, riid, ppv); @@ -261,12 +250,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&CUrlHistoryFactory, riid, ppv); } - if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) { - TRACE("(CLSID_TaskbarList %s %p)\n", debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&TaskbarListFactory, riid, ppv); - } - - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl index f4f7954..a7d3543 100644 --- a/dlls/ieframe/ieframe_v1.idl +++ b/dlls/ieframe/ieframe_v1.idl @@ -30,12 +30,6 @@ ] coclass CUrlHistory { interface IUrlHistoryStg2; } [ - helpstring("Task Bar Communication"), - threading(apartment), - uuid(56fdf344-fd6d-11d0-958a-006097c9a090) -] coclass TaskbarList { interface ITaskbarList; } - -[ helpstring("Internet Shortcut"), threading(apartment), progid("InternetShortcut"),

1 0

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 November 2012