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

Jacek Caban : rpcrt4: Optimize buffer allocation in rpcrt4_ncacn_http_read.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

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: Use proper helper for IRpcStubBuffer call.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

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: Properly handle async HTTP failures.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

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

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

Aug. 14, 2012

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 : vbscript: Added shell registry for VBSFile.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 7931c23fef1b41bcf31a9c07bd85816c679d3af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7931c23fef1b41bcf31a9c07b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 12:02:01 2012 +0200 vbscript: Added shell registry for VBSFile. --- dlls/vbscript/vbscript.rgs | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbscript.rgs b/dlls/vbscript/vbscript.rgs index c390d17..4513b4d 100644 --- a/dlls/vbscript/vbscript.rgs +++ b/dlls/vbscript/vbscript.rgs @@ -59,5 +59,24 @@ HKCR ForceRemove VBSFile = s 'VBScript Script File' { ScriptEngine = s 'VBScript' + Shell = s 'Open' + { + Edit + { + Command = s '"%%SystemRoot%%\system32\notepad.exe" %%1' + } + Open + { + Command = s '"%%SystemRoot%%\system32\wscript.exe" "%%1" %%*' + } + Open2 + { + Command = s '"%%SystemRoot%%\system32\cscript.exe" "%%1" %%*' + } + Print + { + Command = s '"%%SystemRoot%%\system32\notepad.exe" /p %%1' + } + } } }

1 0

Dmitry Timoshkov : gdiplus: get_font_hfont helper should transform returned font height using font and device unit /resolution/scale.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 889be9d447329994f009726d4e79a2fb3772e456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889be9d447329994f009726d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:55:19 2012 +0900 gdiplus: get_font_hfont helper should transform returned font height using font and device unit/resolution/scale. --- dlls/gdiplus/gdiplus.c | 6 ++++++ dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 20 ++++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 29 +++++++++++++++++++++-------- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index ed2dcae..0146a0f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -389,6 +389,12 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) } } +REAL units_scale(GpUnit from, GpUnit to, REAL dpi) +{ + REAL pixels = units_to_pixels(1.0, from, dpi); + return pixels_to_units(pixels, to, dpi); +} + /* Calculates Bezier points from cardinal spline points. */ void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0c7e055..ac070fe 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -51,6 +51,7 @@ extern GpStatus hresult_to_status(HRESULT res) DECLSPEC_HIDDEN; extern REAL convert_unit(REAL logpixels, GpUnit unit) DECLSPEC_HIDDEN; extern REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; +extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN; extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 101b73a..41034e5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2115,11 +2115,27 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT * { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; - REAL angle, rel_width, rel_height; + REAL angle, rel_width, rel_height, font_height, font_to_pixel_scale; LOGFONTW lfw; HFONT unscaled_font; TEXTMETRICW textmet; + font_to_pixel_scale = units_scale(UnitPoint, UnitPixel, font->family->dpi); + + if (font->unit == UnitPixel) + font_height = font->emSize * font_to_pixel_scale; + else + { + REAL unit_scale, res; + + res = (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) ? graphics->xres : graphics->yres; + unit_scale = units_scale(font->unit, graphics->unit, res); + + font_height = font->emSize * font_to_pixel_scale * unit_scale; + if (graphics->unit != UnitDisplay) + font_height /= graphics->scale; + } + pt[0].X = 0.0; pt[0].Y = 0.0; pt[1].X = 1.0; @@ -2135,7 +2151,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT * (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); get_log_fontW(font, graphics, &lfw); - lfw.lfHeight = roundr(lfw.lfHeight * rel_height); + lfw.lfHeight = roundr(font_height * rel_height); unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5f1213c..fb0c1cd 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3495,14 +3495,6 @@ static void test_GdipMeasureString(void) base_cy = bounds.Height; } - /* FIXME: remove once Wine is fixed */ - if (fabs(height - bounds.Height) > height / 100.0) - { - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } - expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(height, bounds.Height, height / 100.0); @@ -3521,6 +3513,13 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); + /* FIXME: remove once Wine is fixed */ + if (fabs(height - bounds.Height) > height / 100.0) + { + /* further testing is useless */ + GdipDeleteGraphics(graphics); + continue; + } expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3595,6 +3594,13 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); + /* FIXME: remove once Wine is fixed */ + if (fabs(height - bounds.Height) > height / 85.0) + { + /* further testing is useless */ + GdipDeleteGraphics(graphics); + continue; + } expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3611,6 +3617,13 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); + /* FIXME: remove once Wine is fixed */ + if (fabs(height - bounds.Height) > height / 85.0) + { + /* further testing is useless */ + GdipDeleteGraphics(graphics); + continue; + } expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars);

1 0

Alexandre Julliard : winex11: Remove remaining X11 locking around graphics calls.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

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

Alexandre Julliard : winex11: Remove X11 locking around simple X calls.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

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

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

Aug. 14, 2012

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

Nikolay Bogoychev : wined3d: Recognize GeForce GT 630M.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 9716c1b50c7e5bd4fe1182c96d965a190f662b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9716c1b50c7e5bd4fe1182c96… Author: Nikolay Bogoychev <nheart(a)gmail.com> Date: Wed Aug 1 23:59:19 2012 +0100 wined3d: Recognize GeForce GT 630M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e00c9b4..e47b4e1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1106,6 +1106,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1504,6 +1505,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ + {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f96c0..36edf20 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1402,6 +1402,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, + CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0