wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

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

14 Aug '12

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

Detlef Riekenberg : advpack/tests: Avoid test failures without high access rights.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: a97f81ff320920d0196cbfb572d53a718ee8e256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97f81ff320920d0196cbfb57… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 5 15:55:20 2012 +0200 advpack/tests: Avoid test failures without high access rights. --- dlls/advpack/tests/Makefile.in | 2 +- dlls/advpack/tests/install.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in index 115f180..af9d2ee 100644 --- a/dlls/advpack/tests/Makefile.in +++ b/dlls/advpack/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advpack.dll -IMPORTS = cabinet advapi32 +IMPORTS = cabinet advapi32 advpack C_SRCS = \ advpack.c \ diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6a4d8d6..4876d71 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -259,6 +259,12 @@ START_TEST(install) if (!init_function_pointers()) return; + if (!IsNTAdmin(0, NULL)) + { + skip("Most tests need admin rights\n"); + return; + } + GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPath(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);

1 0

Nikolay Bogoychev : wined3d: Recognize GeForce GT 630M.
by Alexandre Julliard 14 Aug '12

14 Aug '12

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

Dmitry Timoshkov : gdiplus: get_font_hfont helper 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: 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

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

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

← Newer
1
...
40
41
42
43
44
45
46
...
55
Older →

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