February 2013 - Wine-Commits

Jacek Caban : urlmon: Skip https tests on IE6.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 2544999ed2b27ccd3cf1ddd68fe2c2c61cd05e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2544999ed2b27ccd3cf1ddd68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 15:05:04 2013 +0100 urlmon: Skip https tests on IE6. --- dlls/urlmon/tests/protocol.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5133ec8..6255d6f 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3095,10 +3095,10 @@ static void test_ftp_protocol(void) trace("Testing ftp protocol...\n"); + init_test(FTP_TEST, 0); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; state = STATE_STARTDOWNLOADING; - tested_protocol = FTP_TEST; - first_data_notif = TRUE; expect_hrResult = E_PENDING; hres = CoGetClassObject(&CLSID_FtpProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); @@ -3629,7 +3629,10 @@ START_TEST(protocol) test_file_protocol(); test_http_protocol(); - test_https_protocol(); + if(pCreateUri) + test_https_protocol(); + else + win_skip("Skipping https tests on too old platform\n"); test_ftp_protocol(); test_gopher_protocol(); test_mk_protocol();

1 0

André Hentschel : winhlp32: Properly detect non-ASCII chars.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 147d4bc88a4059e129073effa30bd615eef54632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147d4bc88a4059e129073effa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 17 17:44:44 2013 +0100 winhlp32: Properly detect non-ASCII chars. --- programs/winhlp32/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 96c1e75..3c49c33 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -712,7 +712,7 @@ static BOOL HLPFILE_RtfAddText(struct RtfData* rd, const char* str) } for (last = p = str; *p; p++) { - if (*p < 0) /* escape non ASCII chars */ + if (*p & 0x80) /* escape non-ASCII chars */ { static char xx[8]; rlen = sprintf(xx, "\\'%x", *(const BYTE*)p);

1 0

Alexandre Julliard : winegcc: Don't use prelink when cross-compiling.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 381bbe1b28a3c9c9313e65118374ecc85266a4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bbe1b28a3c9c9313e65118… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 16:36:03 2013 +0100 winegcc: Don't use prelink when cross-compiling. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2432bf3..7d528e0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1065,7 +1065,7 @@ static void build(struct options* opts) strarray_free (link_args); /* set the base address */ - if (opts->image_base) + if (opts->image_base && !opts->target) { const char *prelink = PRELINK; if (prelink[0] && strcmp(prelink,"false"))

1 0

Nikolay Sivov : dwrite: Added more dwrite interfaces.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: c44942789cbca6150b0b6a5e5ebc16b311c1c7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44942789cbca6150b0b6a5e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 18 18:23:29 2013 +0400 dwrite: Added more dwrite interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/dwrite_1.idl | 827 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 829 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c44942789cbca6150b0b6…

1 0

Jacek Caban : wininet: Removed broken cache tests.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: aa4ccd807d163c2f0ff8bc70e18a8442bcbb9da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4ccd807d163c2f0ff8bc70e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 15:45:43 2013 +0100 wininet: Removed broken cache tests. --- dlls/wininet/tests/http.c | 78 --------------------------------------------- 1 files changed, 0 insertions(+), 78 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 52ad8a7..5f7a961 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1702,7 +1702,6 @@ static const char page1[] = struct server_info { HANDLE hEvent; int port; - int num_testH_retrievals; }; static DWORD CALLBACK server_thread(LPVOID param) @@ -1893,17 +1892,6 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, page1, sizeof page1-1, 0); } - if (strstr(buffer, "GET /testH")) - { - si->num_testH_retrievals++; - if (!strstr(buffer, "Content-Length: 0")) - { - send(c, okmsg, sizeof okmsg-1, 0); - send(c, page1, sizeof page1-1, 0); - } - else - send(c, notokmsg, sizeof notokmsg-1, 0); - } if (strstr(buffer, "GET /test_no_content")) { static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; @@ -2814,70 +2802,6 @@ static void test_options(int port) InternetCloseHandle(ses); } -static void test_url_caching(int port, int *num_retrievals) -{ - HINTERNET hi, hc, hr; - DWORD r, count; - char buffer[0x100]; - - ok(*num_retrievals == 0, "expected 0 retrievals prior to test\n"); - - hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(hi != NULL, "open failed\n"); - - hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(hc != NULL, "connect failed\n"); - - /* Pre-load the cache: */ - hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, 0, 0); - ok(hr != NULL, "HttpOpenRequest failed\n"); - - r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); - - ok(*num_retrievals == 1, "expected 1 retrievals, got %d\n", *num_retrievals); - - count = 0; - memset(buffer, 0, sizeof buffer); - SetLastError(0xdeadbeef); - r = InternetReadFile(hr, buffer, sizeof buffer, &count); - ok(r, "InternetReadFile failed %u\n", GetLastError()); - ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - - InternetCloseHandle(hr); - - /* Send the same request, requiring it to be retrieved from the cache */ - hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); - ok(hr != NULL, "HttpOpenRequest failed\n"); - - r = HttpSendRequest(hr, NULL, 0, NULL, 0); - /* Older Windows versions succeed with this request, newer ones fail with - * ERROR_FILE_NOT_FOUND. Accept either, as the older version allows us - * to verify that the server isn't contacted. - */ - if (!r) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - else - { - /* The server shouldn't be contacted for this request. */ - todo_wine - ok(*num_retrievals == 1, "expected 1 retrievals\n"); - - count = 0; - memset(buffer, 0, sizeof buffer); - SetLastError(0xdeadbeef); - r = InternetReadFile(hr, buffer, sizeof buffer, &count); - ok(r, "InternetReadFile failed %u\n", GetLastError()); - ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - } - - InternetCloseHandle(hc); - InternetCloseHandle(hi); -} - static void test_http_connection(void) { struct server_info si; @@ -2886,7 +2810,6 @@ static void test_http_connection(void) si.hEvent = CreateEvent(NULL, 0, 0, NULL); si.port = 7531; - si.num_testH_retrievals = 0; hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); @@ -2915,7 +2838,6 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_last_error(si.port); test_options(si.port); - test_url_caching(si.port, &si.num_testH_retrievals); test_no_content(si.port); test_conn_close(si.port);

1 0

Jacek Caban : wininet: Address string should never be converted to UNICODE in status notifications .
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 3098e3c355775a6c0f6199fe73ad36befb455608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3098e3c355775a6c0f6199fe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 15:45:30 2013 +0100 wininet: Address string should never be converted to UNICODE in status notifications. --- dlls/urlmon/protocol.c | 15 +++++++++-- dlls/wininet/tests/http.c | 30 ++++++++++++++++++---- dlls/wininet/utility.c | 60 +++++++++++++++++--------------------------- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index e404e4d..c7c61da 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -115,10 +115,19 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex report_progress(protocol, BINDSTATUS_FINDINGRESOURCE, (LPWSTR)status_info); break; - case INTERNET_STATUS_CONNECTING_TO_SERVER: - TRACE("%p INTERNET_STATUS_CONNECTING_TO_SERVER\n", protocol); - report_progress(protocol, BINDSTATUS_CONNECTING, (LPWSTR)status_info); + case INTERNET_STATUS_CONNECTING_TO_SERVER: { + WCHAR *info; + + TRACE("%p INTERNET_STATUS_CONNECTING_TO_SERVER %s\n", protocol, (const char*)status_info); + + info = heap_strdupAtoW(status_info); + if(!info) + return; + + report_progress(protocol, BINDSTATUS_CONNECTING, info); + heap_free(info); break; + } case INTERNET_STATUS_SENDING_REQUEST: TRACE("%p INTERNET_STATUS_SENDING_REQUEST\n", protocol); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6083900..52ad8a7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -159,6 +159,7 @@ static const test_data_t test_data[] = { }; static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); +static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackW)(HINTERNET ,INTERNET_STATUS_CALLBACK); static BOOL (WINAPI *pInternetGetSecurityInfoByURLA)(LPSTR,PCCERT_CHAIN_CONTEXT*,DWORD*); static int strcmp_wa(LPCWSTR strw, const char *stra) @@ -321,12 +322,16 @@ static VOID WINAPI callback( trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + ok(dwStatusInformationLength == strlen(lpvStatusInformation)+1, "unexpected size %u\n", + dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_CONNECTED_TO_SERVER: trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", GetCurrentThreadId(), hInternet, dwContext, (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + ok(dwStatusInformationLength == strlen(lpvStatusInformation)+1, "unexpected size %u\n", + dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_SENDING_REQUEST: @@ -3595,19 +3600,27 @@ static void WINAPI cb(HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); - if (status == INTERNET_STATUS_REQUEST_COMPLETE) - { + switch(status) { + case INTERNET_STATUS_REQUEST_COMPLETE: trace("request handle: 0x%08lx\n", result->dwResult); ctx->req = (HINTERNET)result->dwResult; SetEvent(ctx->event); - } - if (status == INTERNET_STATUS_HANDLE_CLOSING) - { + break; + case INTERNET_STATUS_HANDLE_CLOSING: { DWORD type = INTERNET_HANDLE_TYPE_CONNECT_HTTP, size = sizeof(type); if (InternetQueryOption(handle, INTERNET_OPTION_HANDLE_TYPE, &type, &size)) ok(type != INTERNET_HANDLE_TYPE_CONNECT_HTTP, "unexpected callback\n"); SetEvent(ctx->event); + break; + } + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: { + char *str = info; + ok(str[0] && str[1], "Got string: %s\n", str); + ok(size == strlen(str)+1, "unexpected size %u\n", size); + } } } @@ -3619,6 +3632,10 @@ static void test_open_url_async(void) struct context ctx; ULONG type; + /* Collect all existing persistent connections */ + ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); + ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + ctx.req = NULL; ctx.event = CreateEvent(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1"); @@ -3636,7 +3653,7 @@ static void test_open_url_async(void) ok(!ret, "InternetSetOptionA failed\n"); ok(error == ERROR_INTERNET_OPTION_NOT_SETTABLE, "got %u expected ERROR_INTERNET_OPTION_NOT_SETTABLE\n", error); - pInternetSetStatusCallbackA(ses, cb); + pInternetSetStatusCallbackW(ses, cb); ResetEvent(ctx.event); req = InternetOpenUrl(ses, "http://test.winehq.org", NULL, 0, 0, (DWORD_PTR)&ctx); @@ -4123,6 +4140,7 @@ START_TEST(http) } pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); + pInternetSetStatusCallbackW = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackW"); pInternetGetSecurityInfoByURLA = (void*)GetProcAddress(hdll, "InternetGetSecurityInfoByURLA"); init_status_tests(); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 8879b8d..16ee059 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -298,62 +298,48 @@ static const char *debugstr_status_info(DWORD status, void *info) } } -VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, - DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength) +void INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR context, DWORD status, void *info, DWORD info_len) { - LPVOID lpvNewInfo = NULL; + void *new_info = info; if( !hdr->lpfnStatusCB ) return; /* the IE5 version of wininet does not send callbacks if dwContext is zero */ - if( !dwContext ) + if(!context) return; - lpvNewInfo = lpvStatusInfo; - if(hdr->dwInternalFlags & INET_CALLBACKW) { - switch(dwInternetStatus) { - case INTERNET_STATUS_NAME_RESOLVED: - case INTERNET_STATUS_CONNECTING_TO_SERVER: - case INTERNET_STATUS_CONNECTED_TO_SERVER: - lpvNewInfo = heap_strdupAtoW(lpvStatusInfo); - dwStatusInfoLength *= sizeof(WCHAR); - break; - case INTERNET_STATUS_RESOLVING_NAME: - case INTERNET_STATUS_REDIRECT: - lpvNewInfo = heap_strdupW(lpvStatusInfo); - break; - } - }else { - switch(dwInternetStatus) - { - case INTERNET_STATUS_NAME_RESOLVED: - case INTERNET_STATUS_CONNECTING_TO_SERVER: - case INTERNET_STATUS_CONNECTED_TO_SERVER: - lpvNewInfo = heap_alloc(strlen(lpvStatusInfo) + 1); - if (lpvNewInfo) strcpy(lpvNewInfo, lpvStatusInfo); + switch(status) { + case INTERNET_STATUS_NAME_RESOLVED: + case INTERNET_STATUS_CONNECTING_TO_SERVER: + case INTERNET_STATUS_CONNECTED_TO_SERVER: + new_info = heap_alloc(info_len); + if(new_info) + memcpy(new_info, info, info_len); + break; + case INTERNET_STATUS_RESOLVING_NAME: + case INTERNET_STATUS_REDIRECT: + if(hdr->dwInternalFlags & INET_CALLBACKW) { + new_info = heap_strdupW(info); break; - case INTERNET_STATUS_RESOLVING_NAME: - case INTERNET_STATUS_REDIRECT: - lpvNewInfo = heap_strdupWtoA(lpvStatusInfo); - dwStatusInfoLength /= sizeof(WCHAR); + }else { + new_info = heap_strdupWtoA(info); + info_len = strlen(new_info)+1; break; } } TRACE(" callback(%p) (%p (%p), %08lx, %d (%s), %s, %d)\n", - hdr->lpfnStatusCB, hdr->hInternet, hdr, dwContext, dwInternetStatus, get_callback_name(dwInternetStatus), - debugstr_status_info(dwInternetStatus, lpvNewInfo), dwStatusInfoLength); + hdr->lpfnStatusCB, hdr->hInternet, hdr, context, status, get_callback_name(status), + debugstr_status_info(status, new_info), info_len); - hdr->lpfnStatusCB(hdr->hInternet, dwContext, dwInternetStatus, - lpvNewInfo, dwStatusInfoLength); + hdr->lpfnStatusCB(hdr->hInternet, context, status, new_info, info_len); TRACE(" end callback().\n"); - if(lpvNewInfo != lpvStatusInfo) - heap_free(lpvNewInfo); + if(new_info != info) + heap_free(new_info); } typedef struct {

1 0

Huw Davies : riched20: Add the ability to CharFromPoint to either pick the closest leading edge or the leading edge of the selected character .
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: acaad0a842f2cee5e9f24260a4647a9ce5256202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaad0a842f2cee5e9f24260a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 18 13:43:48 2013 +0000 riched20: Add the ability to CharFromPoint to either pick the closest leading edge or the leading edge of the selected character. --- dlls/riched20/caret.c | 4 +- dlls/riched20/editor.h | 3 +- dlls/riched20/run.c | 55 +++++++++++++++++++++++++++--------------------- dlls/riched20/wrap.c | 35 +----------------------------- 4 files changed, 36 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 76c169b..ddaa37a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -873,7 +873,7 @@ static BOOL ME_ReturnFoundPos(ME_TextEditor *editor, ME_DisplayItem *found, if ((found->member.run.nFlags & MERF_ENDPARA) || rx < 0) rx = 0; result->pRun = found; - result->nOffset = ME_CharFromPointCursor(editor, rx, &found->member.run); + result->nOffset = ME_CharFromPoint(editor, rx, &found->member.run, TRUE); if (result->nOffset == found->member.run.len && rx) { result->pRun = ME_FindItemFwd(result->pRun, diRun); @@ -1194,7 +1194,7 @@ static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pR } if (x >= run_x && x < run_x+width) { - int ch = ME_CharFromPointCursor(editor, x-run_x, &pNext->member.run); + int ch = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); if (ch < pNext->member.run.len) { if (pOffset) *pOffset = ch; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index de95448..95818cd 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -141,7 +141,8 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ -int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_HIDDEN; +int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest) DECLSPEC_HIDDEN; +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest) DECLSPEC_HIDDEN; int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 2808045..010fb80 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -404,22 +404,22 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) } /****************************************************************************** - * ME_CharFromPointCursor + * ME_CharFromPointContext * * Returns a character position inside the run given a run-relative - * pixel horizontal position. This version rounds to the nearest character edge - * (ie. if the second character is at pixel position 8, then for cx=0..3 - * it returns 0, and for cx=4..7 it returns 1). + * pixel horizontal position. * - * It is used for mouse click handling, for better usability (and compatibility - * with the native control). + * If closest is FALSE return the actual character + * If closest is TRUE will round to the closest leading edge. + * ie. if the second character is at pixel position 8 and third at 16 then for: + * closest = FALSE cx = 0..7 return 0, cx = 8..15 return 1 + * closest = TRUE cx = 0..3 return 0, cx = 4..11 return 1. */ -int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) +int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest) { ME_String *mask_text = NULL; WCHAR *str; int fit = 0; - ME_Context c; HGDIOBJ hOldFont; SIZE sz, sz2, sz3; if (!run->len || cx <= 0) @@ -427,47 +427,54 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) if (run->nFlags & (MERF_TAB | MERF_ENDCELL)) { - if (cx < run->nWidth/2) - return 0; + if (!closest || cx < run->nWidth / 2) return 0; return 1; } - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetOLEObjectSize(&c, run, &sz); - ME_DestroyContext(&c); - if (cx < sz.cx/2) - return 0; + ME_GetOLEObjectSize(c, run, &sz); + if (!closest || cx < sz.cx / 2) return 0; return 1; } - if (editor->cPasswordMask) + if (c->editor->cPasswordMask) { - mask_text = ME_MakeStringR( editor->cPasswordMask, run->len ); + mask_text = ME_MakeStringR( c->editor->cPasswordMask, run->len ); str = mask_text->szData; } else str = get_text( run, 0 ); - hOldFont = ME_SelectStyleFont(&c, run->style); - GetTextExtentExPointW(c.hDC, str, run->len, + hOldFont = ME_SelectStyleFont(c, run->style); + GetTextExtentExPointW(c->hDC, str, run->len, cx, &fit, NULL, &sz); - if (fit != run->len) + if (closest && fit != run->len) { - GetTextExtentPoint32W(c.hDC, str, fit, &sz2); - GetTextExtentPoint32W(c.hDC, str, fit + 1, &sz3); + GetTextExtentPoint32W(c->hDC, str, fit, &sz2); + GetTextExtentPoint32W(c->hDC, str, fit + 1, &sz3); if (cx >= (sz2.cx+sz3.cx)/2) fit = fit + 1; } ME_DestroyString( mask_text ); - ME_UnselectStyleFont(&c, run->style, hOldFont); - ME_DestroyContext(&c); + ME_UnselectStyleFont(c, run->style, hOldFont); return fit; } +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest) +{ + ME_Context c; + int ret; + + ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + ret = ME_CharFromPointContext( &c, cx, run, closest ); + ME_DestroyContext(&c); + return ret; +} + /****************************************************************************** * ME_GetTextExtent * diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index aed04806..7c34876 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -106,41 +106,8 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite */ static int find_split_point( ME_Context *c, int cx, ME_Run *run ) { - int fit = 0; - HGDIOBJ hOldFont; - SIZE sz; - if (!run->len || cx <= 0) return 0; - - if (run->nFlags & MERF_TAB || - (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) - { - if (cx < run->nWidth / 2) return 0; - return 1; - } - if (run->nFlags & MERF_GRAPHICS) - { - SIZE sz; - ME_GetOLEObjectSize( c, run, &sz ); - if (cx < sz.cx) return 0; - return 1; - } - hOldFont = ME_SelectStyleFont( c, run->style ); - - if (c->editor->cPasswordMask) - { - ME_String *strMasked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); - GetTextExtentExPointW( c->hDC, strMasked->szData, run->len, cx, &fit, NULL, &sz ); - ME_DestroyString( strMasked ); - } - else - { - GetTextExtentExPointW( c->hDC, get_text( run, 0 ), run->len, cx, &fit, NULL, &sz ); - } - - ME_UnselectStyleFont( c, run->style, hOldFont ); - - return fit; + return ME_CharFromPointContext( c, cx, run, FALSE ); } static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width)

1 0

Nikolay Sivov : dwrite: Remove testing for exact script code value.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 1cb663f5ce7acec0f73f611756b4a45559f9632f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb663f5ce7acec0f73f61175… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 16 20:23:04 2013 +0400 dwrite: Remove testing for exact script code value. --- dlls/dwrite/analyzer.c | 7 +- dlls/dwrite/tests/analyzer.c | 200 ++++++++++++++++-------------------------- 2 files changed, 81 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cb663f5ce7acec0f73f6…

1 0

Dmitry Timoshkov : gdiplus: Avoid a crash in GdipDrawImagePointRect.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: f817fb56e87cae9049d5d917382445345baeea3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f817fb56e87cae9049d5d9173… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 21:29:12 2013 +0800 gdiplus: Avoid a crash in GdipDrawImagePointRect. --- dlls/gdiplus/graphics.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b9aa912..7d54871 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3053,6 +3053,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + if (!graphics || !image) return InvalidParameter; + scale_x = units_scale(srcUnit, graphics->unit, graphics->xres); scale_x *= graphics->xres / image->xres; scale_y = units_scale(srcUnit, graphics->unit, graphics->yres);

1 0

Alexandre Julliard : kernel32: Attempt to buffer the full directory in FindFirstFile to avoid races.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 7ce90cc7198a6dee75a999e9502ff997e5d3a763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce90cc7198a6dee75a999e95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 14:50:57 2013 +0100 kernel32: Attempt to buffer the full directory in FindFirstFile to avoid races. --- dlls/kernel32/file.c | 63 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 91e8c8c..89e0fad 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -61,11 +61,14 @@ typedef struct BOOL is_root; /* is directory the root of the drive? */ UINT data_pos; /* current position in dir data */ UINT data_len; /* length of dir data */ - BYTE data[8192]; /* directory data */ + UINT data_size; /* size of data buffer, or 0 when everything has been read */ + BYTE *data; /* directory data */ } FIND_FIRST_INFO; #define FIND_FIRST_MAGIC 0xc0ffee11 +static const UINT max_entry_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ); + static BOOL oem_file_apis; static const WCHAR wildcardsW[] = { '*','?',0 }; @@ -1930,6 +1933,8 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->magic = FIND_FIRST_MAGIC; info->data_pos = 0; info->data_len = 0; + info->data_size = 0; + info->data = NULL; info->search_op = search_op; if (device) @@ -1945,16 +1950,44 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, else { IO_STATUS_BLOCK io; + BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; + + info->data_size = has_wildcard ? 8192 : max_entry_size; - NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, sizeof(info->data), - FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); - if (io.u.Status) + while (info->data_size) { - FindClose( info ); - SetLastError( RtlNtStatusToDosError( io.u.Status ) ); - return INVALID_HANDLE_VALUE; + if (!(info->data = HeapAlloc( GetProcessHeap(), 0, info->data_size ))) + { + FindClose( info ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return INVALID_HANDLE_VALUE; + } + + NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); + if (io.u.Status) + { + FindClose( info ); + SetLastError( RtlNtStatusToDosError( io.u.Status ) ); + return INVALID_HANDLE_VALUE; + } + + if (io.Information < info->data_size - max_entry_size) + { + info->data_size = 0; /* we read everything */ + } + else if (info->data_size < 1024 * 1024) + { + HeapFree( GetProcessHeap(), 0, info->data ); + info->data_size *= 2; + } + else break; } + info->data_len = io.Information; + if (!info->data_size && has_wildcard) /* release unused buffer space */ + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info->data, info->data_len ); + if (!FindNextFileW( info, data )) { TRACE( "%s not found\n", debugstr_w(filename) ); @@ -1962,11 +1995,12 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, SetLastError( ERROR_FILE_NOT_FOUND ); return INVALID_HANDLE_VALUE; } - if (!strpbrkW( info->mask.Buffer, wildcardsW )) + if (!has_wildcard) /* we can't find two files with the same name */ { - /* we can't find two files with the same name */ CloseHandle( info->handle ); + HeapFree( GetProcessHeap(), 0, info->data ); info->handle = 0; + info->data = NULL; } } return info; @@ -2010,15 +2044,21 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) { IO_STATUS_BLOCK io; - NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, sizeof(info->data), - FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); + if (info->data_size) + NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); + else + io.u.Status = STATUS_NO_MORE_FILES; + if (io.u.Status) { SetLastError( RtlNtStatusToDosError( io.u.Status ) ); if (io.u.Status == STATUS_NO_MORE_FILES) { CloseHandle( info->handle ); + HeapFree( GetProcessHeap(), 0, info->data ); info->handle = 0; + info->data = NULL; } break; } @@ -2101,6 +2141,7 @@ BOOL WINAPI FindClose( HANDLE handle ) RtlFreeUnicodeString( &info->path ); info->data_pos = 0; info->data_len = 0; + HeapFree( GetProcessHeap(), 0, info->data ); RtlLeaveCriticalSection( &info->cs ); info->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &info->cs );

1 0