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

Michael Stefaniuc : cmd: Print the debug string instead of the pointer value.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 6899279bab92f8bcc4d14010b0dae20b3e2b5dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6899279bab92f8bcc4d14010b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 17:56:27 2013 +0200 cmd: Print the debug string instead of the pointer value. --- programs/cmd/builtins.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 076b852..1d9fc15 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1503,8 +1503,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, CMD_LIST *curPosition = *cmdList; int myDepth = (*cmdList)->bracketDepth; - WINE_TRACE("cmdList(%p), firstCmd(%p), doIt(%d)\n", - cmdList, wine_dbgstr_w(firstcmd), + WINE_TRACE("cmdList(%p), firstCmd(%s), doIt(%d)\n", cmdList, wine_dbgstr_w(firstcmd), executecmds); /* Skip leading whitespace between condition and the command */

1 0

Hans Leidekker : wininet/tests: Add tests for a prematurely closed connection.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 26b59bf8e5d0db1b0bdffb5b51c1256ce5aff6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b59bf8e5d0db1b0bdffb5b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 17 15:32:54 2013 +0200 wininet/tests: Add tests for a prematurely closed connection. --- dlls/wininet/tests/http.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 031efb1..9474d70 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2029,6 +2029,8 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; send(c, no_cache_response, sizeof(no_cache_response)-1, 0); } + if (strstr(buffer, "GET /test_premature_disconnect")) + trace("closing connection\n"); shutdown(c, 2); closesocket(c); @@ -2660,6 +2662,32 @@ static void test_basic_authentication(int port) InternetCloseHandle(session); } +static void test_premature_disconnect(int port) +{ + HINTERNET session, connect, request; + DWORD err; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/premature_disconnect", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + err = GetLastError(); + todo_wine ok(!ret, "HttpSendRequest succeeded\n"); + todo_wine ok(err == ERROR_HTTP_INVALID_SERVER_RESPONSE, "got %u\n", err); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void test_invalid_response_headers(int port) { HINTERNET session, connect, request; @@ -3032,6 +3060,7 @@ static void test_http_connection(void) test_no_content(si.port); test_conn_close(si.port); test_no_cache(si.port); + test_premature_disconnect(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Jacek Caban : secur32: Added support for TLS 1.1 and TLS 1.2 on Mac.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 930bf0016defe35ec0c582607df696f43cd7bc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930bf0016defe35ec0c582607… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 17 14:23:44 2013 +0200 secur32: Added support for TLS 1.1 and TLS 1.2 on Mac. --- dlls/secur32/schannel_macosx.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 5ec06cf..9463c94 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1007,7 +1007,25 @@ BOOL schan_imp_init(void) supported_protocols = SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 - /* FIXME: Test max allowed version for TLS 1.1 and TLS 1.2 */ + if(SSLGetProtocolVersionMax != NULL) { + SSLProtocol max_protocol; + SSLContextRef ctx; + OSStatus status; + + status = SSLNewContext(FALSE, &ctx); + if(status == noErr) { + status = SSLGetProtocolVersionMax(ctx, &max_protocol); + if(status == noErr) { + if(max_protocol >= kTLSProtocol11) + supported_protocols |= SP_PROT_TLS1_1_CLIENT; + if(max_protocol >= kTLSProtocol12) + supported_protocols |= SP_PROT_TLS1_2_CLIENT; + } + SSLDisposeContext(ctx); + }else { + WARN("SSLNewContext failed\n"); + } + } #endif return TRUE;

1 0

Huw Davies : riched20: Use PointFromCharContext now that we can specify logical ordering.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: eb773e0dea25138c9fc197962b9c64d8ff025525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb773e0dea25138c9fc197962… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 17 12:56:38 2013 +0100 riched20: Use PointFromCharContext now that we can specify logical ordering. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 13 ------------- dlls/riched20/wrap.c | 9 ++------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d34fbd0..8c78447 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -150,7 +150,6 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECL void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) DECLSPEC_HIDDEN; -SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx) DECLSPEC_HIDDEN; void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor) DECLSPEC_HIDDEN; void ME_RunOfsFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem **ppPara, ME_DisplayItem **ppRun, int *pOfs) DECLSPEC_HIDDEN; int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, const ME_DisplayItem *pRun, int nOfs) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 4bb1c0b..8929fc5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -622,19 +622,6 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i } /****************************************************************************** - * ME_GetRunSize - * - * Finds width and height (but not ascent and descent) of a part of the run - * up to given character. - */ -SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, - ME_Run *run, int nLen, int startx) -{ - int asc, desc; - return ME_GetRunSizeCommon(c, para, run, nLen, startx, &asc, &desc); -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index ebb7b29..52722db 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -188,7 +188,6 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) { /* Exclude space characters from run width. * Other whitespace or delimiters are not treated this way. */ - SIZE sz; int len = p->member.run.len; WCHAR *text = get_text( &p->member.run, len - 1 ); @@ -199,13 +198,9 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) if (len) { if (len == p->member.run.len) - { width += p->member.run.nWidth; - } else { - sz = ME_GetRunSize(wc->context, &para->member.para, - &p->member.run, len, p->member.run.pt.x); - width += sz.cx; - } + else + width += ME_PointFromCharContext( wc->context, &p->member.run, len, FALSE ); } bSkippingSpaces = !len; } else if (!(p->member.run.nFlags & MERF_ENDPARA))

1 0

Hans Leidekker : msi: Fix one more occurrence of overwriting verstr in set_installer_properties.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 27a1a9a862eb06fc94e6e7f34f5f28fec05fdc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a1a9a862eb06fc94e6e7f34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 17 15:32:23 2013 +0200 msi: Fix one more occurrence of overwriting verstr in set_installer_properties. --- dlls/msi/package.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6b3d16c..f7cc908 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -869,8 +869,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) break; case VER_PLATFORM_WIN32_NT: msi_set_property( package->db, szVersionNT, verstr, len ); - len = sprintfW( verstr, szFormat,OSVersion.wProductType ); - msi_set_property( package->db, szMsiNTProductType, verstr, len ); + len = sprintfW( bufstr, szFormat,OSVersion.wProductType ); + msi_set_property( package->db, szMsiNTProductType, bufstr, len ); break; } len = sprintfW( bufstr, szFormat, OSVersion.dwBuildNumber );

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode::data property implementation.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: b4f8cf8ec1fd148560813a4356cf9dc73e946cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f8cf8ec1fd148560813a435… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 17 13:00:04 2013 +0200 mshtml: Added IHTMLDOMTextNode::data property implementation. --- dlls/mshtml/htmltextnode.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 29ffa56..27e00c0 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -101,15 +101,28 @@ static HRESULT WINAPI HTMLDOMTextNode_Invoke(IHTMLDOMTextNode *iface, DISPID dis static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMText_SetData(This->nstext, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLDOMTextNode_get_data(IHTMLDOMTextNode *iface, BSTR *p) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMText_GetData(This->nstext, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDOMTextNode_toString(IHTMLDOMTextNode *iface, BSTR *String) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 44306ee..ffb3614 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2432,6 +2432,33 @@ static void _test_text_length(unsigned line, IUnknown *unk, LONG l) IHTMLDOMTextNode_Release(text); } +#define test_text_data(a,b) _test_text_data(__LINE__,a,b) +static void _test_text_data(unsigned line, IUnknown *unk, const char *exdata) +{ + IHTMLDOMTextNode *text = _get_text_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLDOMTextNode_get_data(text, &str); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exdata), "data = %s, expected %s\n", wine_dbgstr_w(str), exdata); + IHTMLDOMTextNode_Release(text); + SysFreeString(str); +} + +#define set_text_data(a,b) _set_text_data(__LINE__,a,b) +static void _set_text_data(unsigned line, IUnknown *unk, const char *data) +{ + IHTMLDOMTextNode *text = _get_text_iface(line, unk); + BSTR str = a2bstr(data); + HRESULT hres; + + hres = IHTMLDOMTextNode_put_data(text, str); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08x\n", hres); + IHTMLDOMTextNode_Release(text); + SysFreeString(str); +} + #define test_select_set_disabled(i,b) _test_select_set_disabled(__LINE__,i,b) static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL b) { @@ -6640,10 +6667,13 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); IHTMLDOMNode_Release(node); - node = test_create_text(doc, "test"); + node = test_create_text(doc, "abc"); test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode, "[object]"); - test_text_length((IUnknown*)node, 4); + test_text_length((IUnknown*)node, 3); + test_text_data((IUnknown*)node, "abc"); + set_text_data((IUnknown*)node, "test"); + test_text_data((IUnknown*)node, "test"); V_VT(&var) = VT_NULL; node2 = test_node_insertbefore((IUnknown*)body, node, &var);

1 0

André Hentschel : gdi32: Copy gamma ramp validation from winex11 to make it driver independent.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 741f7b6f0c1ed8c35e1c30ca226641c0611299f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741f7b6f0c1ed8c35e1c30ca2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 17 00:38:37 2013 +0200 gdi32: Copy gamma ramp validation from winex11 to make it driver independent. --- dlls/gdi32/dc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c6ba488..231f197 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1311,6 +1311,84 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) return ret; } +static BOOL check_gamma_ramps(void *ptr) +{ + WORD *ramp = ptr; + + while (ramp < (WORD*)ptr + 3 * 256) + { + float r_x, r_y, r_lx, r_ly, r_d, r_v, r_e, g_avg, g_min, g_max; + unsigned i, f, l, g_n, c; + + f = ramp[0]; + l = ramp[255]; + if (f >= l) + { + TRACE("inverted or flat gamma ramp (%d->%d), rejected\n", f, l); + return FALSE; + } + r_d = l - f; + g_min = g_max = g_avg = 0.0; + + /* check gamma ramp entries to estimate the gamma */ + TRACE("analyzing gamma ramp (%d->%d)\n", f, l); + for (i=1, g_n=0; i<255; i++) + { + if (ramp[i] < f || ramp[i] > l) + { + TRACE("strange gamma ramp ([%d]=%d for %d->%d), rejected\n", i, ramp[i], f, l); + return FALSE; + } + c = ramp[i] - f; + if (!c) continue; /* avoid log(0) */ + + /* normalize entry values into 0..1 range */ + r_x = i/255.0; r_y = c / r_d; + /* compute logarithms of values */ + r_lx = log(r_x); r_ly = log(r_y); + /* compute gamma for this entry */ + r_v = r_ly / r_lx; + /* compute differential (error estimate) for this entry */ + /* some games use table-based logarithms that magnifies the error by 128 */ + r_e = -r_lx * 128 / (c * r_lx * r_lx); + + /* compute min & max while compensating for estimated error */ + if (!g_n || g_min > (r_v + r_e)) g_min = r_v + r_e; + if (!g_n || g_max < (r_v - r_e)) g_max = r_v - r_e; + + /* add to average */ + g_avg += r_v; + g_n++; + } + + if (!g_n) + { + TRACE("no gamma data, shouldn't happen\n"); + return FALSE; + } + g_avg /= g_n; + TRACE("low bias is %d, high is %d, gamma is %5.3f\n", f, 65535-l, g_avg); + + /* check that the gamma is reasonably uniform across the ramp */ + if (g_max - g_min > 12.8) + { + TRACE("ramp not uniform (max=%f, min=%f, avg=%f), rejected\n", g_max, g_min, g_avg); + return FALSE; + } + + /* check that the gamma is not too bright */ + if (g_avg < 0.2) + { + TRACE("too bright gamma ( %5.3f), rejected\n", g_avg); + return FALSE; + } + + ramp += 256; + } + + return TRUE; +} + /*********************************************************************** * SetDeviceGammaRamp (GDI32.@) */ @@ -1325,7 +1403,9 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) if (GetObjectType( hDC ) != OBJ_MEMDC) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); - ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); + + if (check_gamma_ramps(ptr)) + ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); } else SetLastError( ERROR_INVALID_PARAMETER ); release_dc_ptr( dc );

1 0

Huw Davies : riched20: Fix an (incorrect) compiler warning.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 674e2cfd242cd8284a9b45618ee6bc8f20acc233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=674e2cfd242cd8284a9b45618… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 17 12:56:39 2013 +0100 riched20: Fix an (incorrect) compiler warning. --- dlls/riched20/paint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 80d9586..e728b47 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -318,7 +318,7 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, { COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; - COLORREF old_text, old_back; + COLORREF old_text, old_back = 0; const WCHAR *text = get_text( run, 0 ); ME_String *masked = NULL;

1 0

Huw Davies : riched20: Add a visual vs logical order flag to the character to position mapping routines .
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 5ddfc36cc0c2c5055f666eac641a4d7538e96322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddfc36cc0c2c5055f666eac6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 17 12:56:37 2013 +0100 riched20: Add a visual vs logical order flag to the character to position mapping routines. --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 8 ++++---- dlls/riched20/paint.c | 6 +++--- dlls/riched20/run.c | 12 ++++++------ dlls/riched20/wrap.c | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b41ee9e..b39a8c7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -237,7 +237,7 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, assert(run->type == diRun); } } - run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset ); + run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset, TRUE ); *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; *x = c.rcView.left + run->member.run.pt.x + run_x - editor->horz_si.nPos; @@ -887,7 +887,7 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, if (x >= run_x && x < run_x+width) { - cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE); + cursor->nOffset = ME_CharFromPoint(editor, x-run_x, &pNext->member.run, TRUE, TRUE); cursor->pRun = pNext; cursor->pPara = ME_GetParagraph( cursor->pRun ); return exact; @@ -1182,7 +1182,7 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) } else { x = pRun->member.run.pt.x; - x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset); + x += ME_PointFromChar(editor, &pRun->member.run, pCursor->nOffset, TRUE); } editor->nUDArrowX = x; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f490799..1b4788c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3936,7 +3936,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_RunOfsFromCharOfs(editor, nCharOfs, &pPara, &pRun, &nOffset); assert(pRun->type == diRun); pt.y = pRun->member.run.pt.y; - pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); + pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset, TRUE); pt.y += pPara->member.para.pt.y + editor->rcFormat.top; pt.x += editor->rcFormat.left; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f7cac1f..d34fbd0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -140,10 +140,10 @@ 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_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_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; +int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; +int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0ab4e2b..80d9586 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -306,9 +306,9 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in { from = max( 0, from ); to = min( run->len, to ); - r->left = ME_PointFromCharContext( c, run, from ); + r->left = ME_PointFromCharContext( c, run, from, TRUE ); r->top = 0; - r->right = ME_PointFromCharContext( c, run, to ); + r->right = ME_PointFromCharContext( c, run, to, TRUE ); r->bottom = cy; return; } @@ -1235,7 +1235,7 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->styleFlags & ES_AUTOHSCROLL) { - x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset); + x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset, TRUE); if (x > editor->horz_si.nPos + editor->sizeWindow.cx) x = x + 1 - editor->sizeWindow.cx; else if (x > editor->horz_si.nPos) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 010fb80..4bb1c0b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -415,7 +415,7 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) * 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_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest) +int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BOOL visual_order) { ME_String *mask_text = NULL; WCHAR *str; @@ -464,13 +464,13 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest) return fit; } -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest) +int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) { ME_Context c; int ret; ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); - ret = ME_CharFromPointContext( &c, cx, run, closest ); + ret = ME_CharFromPointContext( &c, cx, run, closest, visual_order ); ME_DestroyContext(&c); return ret; } @@ -499,7 +499,7 @@ static void ME_GetTextExtent(ME_Context *c, LPCWSTR szText, int nChars, ME_Style * Returns a run-relative pixel position given a run-relative character * position (character offset) */ -int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset) +int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) { SIZE size; ME_String *mask_text = NULL; @@ -532,13 +532,13 @@ int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset) * * Calls ME_PointFromCharContext after first creating a context. */ -int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) +int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) { ME_Context c; int ret; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - ret = ME_PointFromCharContext( &c, pRun, nOffset ); + ret = ME_PointFromCharContext( &c, pRun, nOffset, visual_order ); ME_DestroyContext(&c); return ret; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 9bebd8a..ebb7b29 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -107,7 +107,7 @@ 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 ) { if (!run->len || cx <= 0) return 0; - return ME_CharFromPointContext( c, cx, run, FALSE ); + return ME_CharFromPointContext( c, cx, run, FALSE, FALSE ); } static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width)

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE.
by Alexandre Julliard April 17, 2013

April 17, 2013

Module: wine Branch: master Commit: 4e1bac56b5e32288e838684d7a93f3bc0d11e590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1bac56b5e32288e838684d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 08:48:01 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE. --- dlls/d3drm/d3drm.c | 36 ++++++++++++++---------------------- dlls/d3drm/tests/d3drm.c | 24 ++++++++++++------------ dlls/d3drm/viewport.c | 19 ++++++------------- include/d3drm.h | 10 +++++----- include/d3drmobj.h | 12 ++++++------ 5 files changed, 43 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e1bac56b5e32288e8386…

1 0