August 2012 - Wine-commits - list.winehq.org

Jacek Caban : rpcrt4: Use proper helper for IRpcStubBuffer call.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 567e49f21a33c512ce2274afe116c7184ed191b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567e49f21a33c512ce2274afe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 13:34:56 2012 +0200 rpcrt4: Use proper helper for IRpcStubBuffer call. --- dlls/rpcrt4/cstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 74801f6..680b22e 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -372,7 +372,7 @@ HRESULT WINAPI CStdStubBuffer_QueryInterface(LPRPCSTUBBUFFER iface, if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IRpcStubBuffer, riid)) { - IUnknown_AddRef(iface); + IRpcStubBuffer_AddRef(iface); *obj = iface; return S_OK; }

1 0

Jacek Caban : rpcrt4: Added prepare_async_request helper.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: cba1cfc645bd605ed06422f630211cd8de4b0fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba1cfc645bd605ed06422f63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 13:35:06 2012 +0200 rpcrt4: Added prepare_async_request helper. --- dlls/rpcrt4/rpc_transport.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index f873f71..501e5cc 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1870,6 +1870,12 @@ static ULONG RpcHttpAsyncData_Release(RpcHttpAsyncData *data) return refs; } +static void prepare_async_request(RpcHttpAsyncData *async_data) +{ + ResetEvent(async_data->completion_event); + RpcHttpAsyncData_AddRef(async_data); +} + typedef struct _RpcConnection_http { RpcConnection common; @@ -2165,8 +2171,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync DWORD bytes_read, bytes_written; /* prepare in pipe */ - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); + prepare_async_request(async_data); ret = HttpSendRequestW(in_request, NULL, 0, NULL, 0); if (!ret) { @@ -2189,8 +2194,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync buffers_in.dwStructSize = sizeof(buffers_in); /* FIXME: get this from the registry */ buffers_in.dwBufferTotal = 1024 * 1024 * 1024; /* 1Gb */ - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); + prepare_async_request(async_data); ret = HttpSendRequestExW(in_request, &buffers_in, NULL, 0, 0); if (!ret) { @@ -2279,8 +2283,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcPktHdr pkt_from_server; ULONG field1, field3; - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); + prepare_async_request(async_data); ret = HttpSendRequestW(out_request, NULL, 0, NULL, 0); if (!ret) { @@ -2301,8 +2304,8 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, hdr = RPCRT4_BuildHttpConnectHeader(0, TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); + + prepare_async_request(async_data); ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); if (!ret) {

1 0

Jacek Caban : rpcrt4: Use helper for handling async call wait.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 5e6aca795595accf8380da8b87bfa77e75694906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6aca795595accf8380da8b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 13:35:17 2012 +0200 rpcrt4: Use helper for handling async call wait. --- dlls/rpcrt4/rpc_transport.c | 191 +++++++++++++----------------------------- 1 files changed, 59 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e6aca795595accf8380d…

1 0

Jacek Caban : rpcrt4: Optimize buffer allocation in rpcrt4_ncacn_http_read.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 9eeedc27237655ee025509a9c6c944560b7fac55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eeedc27237655ee025509a9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 13:35:36 2012 +0200 rpcrt4: Optimize buffer allocation in rpcrt4_ncacn_http_read. --- dlls/rpcrt4/rpc_transport.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ef18c64..445f186 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2440,31 +2440,32 @@ static int rpcrt4_ncacn_http_read(RpcConnection *Connection, unsigned int bytes_left = count; RPC_STATUS status = RPC_S_OK; + httpc->async_data->inet_buffers.lpvBuffer = HeapAlloc(GetProcessHeap(), 0, count); + while (bytes_left) { httpc->async_data->inet_buffers.dwBufferLength = bytes_left; - httpc->async_data->inet_buffers.lpvBuffer = HeapAlloc(GetProcessHeap(), 0, bytes_left); prepare_async_request(httpc->async_data); ret = InternetReadFileExA(httpc->out_request, &httpc->async_data->inet_buffers, IRF_ASYNC, 0); status = wait_async_request(httpc->async_data, ret, httpc->cancel_event); if(status != RPC_S_OK) { if(status == RPC_S_CALL_CANCELLED) TRACE("call cancelled\n"); - HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); - httpc->async_data->inet_buffers.lpvBuffer = NULL; break; } - memcpy(buf, httpc->async_data->inet_buffers.lpvBuffer, - httpc->async_data->inet_buffers.dwBufferLength); - HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); - httpc->async_data->inet_buffers.lpvBuffer = NULL; if(!httpc->async_data->inet_buffers.dwBufferLength) break; + memcpy(buf, httpc->async_data->inet_buffers.lpvBuffer, + httpc->async_data->inet_buffers.dwBufferLength); bytes_left -= httpc->async_data->inet_buffers.dwBufferLength; buf += httpc->async_data->inet_buffers.dwBufferLength; } + + HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); + httpc->async_data->inet_buffers.lpvBuffer = NULL; + TRACE("%p %p %u -> %u\n", httpc->out_request, buffer, count, status); return status == RPC_S_OK ? count : -1; }

1 0

Jacek Caban : rpcrt4: Properly handle async HTTP failures.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 1de4129b0a0cd4ce4453920ed79663f412ea468d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de4129b0a0cd4ce4453920ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 13:35:46 2012 +0200 rpcrt4: Properly handle async HTTP failures. --- dlls/rpcrt4/rpc_transport.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 445f186..76a9714 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1844,6 +1844,7 @@ typedef struct _RpcHttpAsyncData { LONG refs; HANDLE completion_event; + WORD async_result; INTERNET_BUFFERSA inet_buffers; CRITICAL_SECTION cs; } RpcHttpAsyncData; @@ -1897,6 +1898,11 @@ static RPC_STATUS wait_async_request(RpcHttpAsyncData *async_data, BOOL call_ret }else { WaitForSingleObject(async_data->completion_event, INFINITE); } + if(async_data->async_result) { + ERR("Async request failed with error %d\n", async_data->async_result); + return RPC_S_SERVER_UNAVAILABLE; + } + return RPC_S_OK; } @@ -2007,6 +2013,9 @@ static VOID WINAPI rpcrt4_http_internet_callback( TRACE("INTERNET_STATUS_REQUEST_COMPLETED\n"); if (async_data) { + INTERNET_ASYNC_RESULT *async_result = lpvStatusInformation; + + async_data->async_result = async_result->dwResult ? ERROR_SUCCESS : async_result->dwError; SetEvent(async_data->completion_event); RpcHttpAsyncData_Release(async_data); }

1 0

Alexandre Julliard : winex11: Remove X11 locking around simple X calls.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 6bfcb347bfff24d7268e23b3686028373631c642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfcb347bfff24d7268e23b36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 13:38:03 2012 +0200 winex11: Remove X11 locking around simple X calls. --- dlls/winex11.drv/bitblt.c | 46 ++----------------- dlls/winex11.drv/brush.c | 13 +----- dlls/winex11.drv/clipboard.c | 45 +----------------- dlls/winex11.drv/desktop.c | 2 - dlls/winex11.drv/event.c | 39 +--------------- dlls/winex11.drv/graphics.c | 62 +------------------------ dlls/winex11.drv/init.c | 14 ------ dlls/winex11.drv/keyboard.c | 10 ---- dlls/winex11.drv/mouse.c | 25 +--------- dlls/winex11.drv/opengl.c | 39 +--------------- dlls/winex11.drv/palette.c | 16 ------- dlls/winex11.drv/systray.c | 9 +--- dlls/winex11.drv/window.c | 97 +-------------------------------------- dlls/winex11.drv/x11drv_main.c | 4 -- dlls/winex11.drv/xdnd.c | 14 ------ dlls/winex11.drv/xrender.c | 78 +------------------------------- dlls/winex11.drv/xvidmode.c | 50 ++++++--------------- 17 files changed, 40 insertions(+), 523 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bfcb347bfff24d7268e2…

1 0

Alexandre Julliard : winex11: Remove remaining X11 locking around graphics calls.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 6f6217e9a4c31e0edb2eb14f48bedfe9dcfb07fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6217e9a4c31e0edb2eb14f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 14:43:28 2012 +0200 winex11: Remove remaining X11 locking around graphics calls. --- dlls/winex11.drv/bitblt.c | 14 -------------- dlls/winex11.drv/brush.c | 2 -- dlls/winex11.drv/graphics.c | 10 ---------- dlls/winex11.drv/mouse.c | 4 ---- dlls/winex11.drv/opengl.c | 24 ------------------------ dlls/winex11.drv/palette.c | 13 ------------- dlls/winex11.drv/xrender.c | 22 ++-------------------- 7 files changed, 2 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f6217e9a4c31e0edb2eb…

1 0

Dmitry Timoshkov : gdiplus: Add more tests for GdipMeasureString using device with custom resolution.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: b953011f9ede9b88ac5570b51437cbe5c0d1769b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b953011f9ede9b88ac5570b51… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:53:33 2012 +0900 gdiplus: Add more tests for GdipMeasureString using device with custom resolution. --- dlls/gdiplus/tests/graphics.c | 416 ++++++++++++++++++++++++++++++----------- 1 files changed, 311 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b953011f9ede9b88ac557…

1 0

Dmitry Timoshkov : Revert commit b20a1f56b0c915b24f70b8be83fbf76ea7378123.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: e9af648aeb3f6066ccf9fa2df6cb704a92b3310d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9af648aeb3f6066ccf9fa2df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:54:20 2012 +0900 Revert commit b20a1f56b0c915b24f70b8be83fbf76ea7378123. --- dlls/gdiplus/graphics.c | 35 +++-------------------------------- 1 files changed, 3 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ad2f56..101b73a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4910,30 +4910,6 @@ static GpStatus measure_ranges_callback(HDC hdc, return stat; } -static void rect_to_pixels(const RectF *in, const GpGraphics *graphics, RectF *out) -{ - REAL dpi; - - GdipGetDpiX((GpGraphics *)graphics, &dpi); - out->X = units_to_pixels(in->X, graphics->unit, dpi); - out->Width = units_to_pixels(in->Width, graphics->unit, dpi); - GdipGetDpiY((GpGraphics *)graphics, &dpi); - out->Y = units_to_pixels(in->Y, graphics->unit, dpi); - out->Height = units_to_pixels(in->Height, graphics->unit, dpi); -} - -static void rect_to_units(const RectF *in, const GpGraphics *graphics, RectF *out) -{ - REAL dpi; - - GdipGetDpiX((GpGraphics *)graphics, &dpi); - out->X = pixels_to_units(in->X, graphics->unit, dpi); - out->Width = pixels_to_units(in->Width, graphics->unit, dpi); - GdipGetDpiY((GpGraphics *)graphics, &dpi); - out->Y = pixels_to_units(in->Y, graphics->unit, dpi); - out->Height = pixels_to_units(in->Height, graphics->unit, dpi); -} - GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, @@ -5037,7 +5013,6 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, struct measure_string_args args; HDC temp_hdc=NULL, hdc; GpPointF pt[3]; - RectF rect_pixels; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5075,10 +5050,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, get_font_hfont(graphics, font, &gdifont); oldfont = SelectObject(hdc, gdifont); - rect_to_pixels(rect, graphics, &rect_pixels); - - bounds->X = rect_pixels.X; - bounds->Y = rect_pixels.Y; + bounds->X = rect->X; + bounds->Y = rect->Y; bounds->Width = 0.0; bounds->Height = 0.0; @@ -5086,11 +5059,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(hdc, string, length, font, &rect_pixels, format, + gdip_format_string(hdc, string, length, font, rect, format, measure_string_callback, &args); - rect_to_units(bounds, graphics, bounds); - SelectObject(hdc, oldfont); DeleteObject(gdifont);

1 0

Dmitry Timoshkov : gdiplus: GdipGetLogFontW should transform returned font height using font and device unit /resolution/scale.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: f8b11542266e78f9ac7b7161da2474cf772860fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b11542266e78f9ac7b7161d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:54:48 2012 +0900 gdiplus: GdipGetLogFontW should transform returned font height using font and device unit/resolution/scale. --- dlls/gdiplus/font.c | 19 +++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 12 ------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 9d545e0..51fda73 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -449,8 +449,23 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { - /* FIXME: use graphics */ - lf->lfHeight = -units_to_pixels(font->emSize, font->unit, font->family->dpi); + REAL height; + + if (font->unit == UnitPixel) + { + height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); + if (graphics->unit != UnitDisplay) + height *= graphics->scale; + } + else + { + if (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) + height = units_to_pixels(font->emSize, font->unit, graphics->xres); + else + height = units_to_pixels(font->emSize, font->unit, graphics->yres); + } + + lf->lfHeight = -(height + 0.5); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 2c32390..5f1213c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3479,19 +3479,8 @@ static void test_GdipMeasureString(void) height = units_to_pixels(font_size, td[i].unit, td[i].res_y); if (td[i].unit != UnitDisplay) height *= td[i].page_scale; - /* FIXME: remove once Wine is fixed */ - if (td[i].unit == UnitDisplay || (td[i].unit == UnitPixel && td[i].page_scale == 1.0)) - ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", - i, (LONG)(height + 0.5), height, lf.lfHeight); - else - { - todo_wine ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", i, (LONG)(height + 0.5), height, lf.lfHeight); - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } height = font_size * font_to_pixel_scale; @@ -3572,7 +3561,6 @@ static void test_GdipMeasureString(void) else height = units_to_pixels(font_size, font_unit, td[i].res_y); /*trace("%.1f font units = %f pixels with %.1f dpi, page_scale %.1f\n", font_size, height, td[i].res_y, td[i].page_scale);*/ -todo_wine ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", i, (LONG)(height + 0.5), height, lf.lfHeight);

1 0