November 2012 - Wine-Commits

Jason Edmeades : attrib: Remove redundant code.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 458e573584801dee7d7f961d212ffda698a11960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458e573584801dee7d7f961d2… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 22:17:21 2012 +0000 attrib: Remove redundant code. --- programs/attrib/attrib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index e2cec36..443a0c0 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -289,8 +289,6 @@ int wmain(int argc, WCHAR *argv[]) } else if (param[0] == '/') { if (((param[1] == 'D') || (param[1] == 'd')) && !param[2]) { attrib_includedirs = TRUE; - } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { - WINE_FIXME("Option /R not yet supported\n"); } else if (((param[1] == 'S') || (param[1] == 's')) && !param[2]) { attrib_recurse = TRUE; } else {

1 0

Piotr Caban : msvcrt: Improved strtod_l precision.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: cbb94b1fcc73f50d1ec00121cb86060ab44b5bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb94b1fcc73f50d1ec00121c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 6 10:33:51 2012 +0100 msvcrt: Improved strtod_l precision. --- dlls/msvcrt/string.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2a6a8ca..ad33f6a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -291,7 +291,8 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca int exp=0, sign=1; const char *p; double ret; - BOOL found_digit = FALSE; + long double lret=1, expcnt = 10; + BOOL found_digit = FALSE, negexp; if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; @@ -378,10 +379,16 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - if(exp>0) - ret = (double)sign*d*pow(10, exp); - else - ret = (double)sign*d/pow(10, -exp); + negexp = (exp < 0); + if(negexp) + exp = -exp; + while(exp) { + if(exp & 1) + lret *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + ret = (long double)sign * (negexp ? d/lret : d*lret); _control87(fpcontrol, 0xffffffff);

1 0

Jason Edmeades : cmd: Fix for loops within for loops.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: ae4571fb796dc03d91a63d6c5c2a80a08f587578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4571fb796dc03d91a63d6c5… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Nov 5 21:43:08 2012 +0000 cmd: Fix for loops within for loops. --- programs/cmd/batch.c | 35 ++++++++----- programs/cmd/builtins.c | 77 ++++++++++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 20 ++++---- programs/cmd/wcmd.h | 17 +++++-- programs/cmd/wcmdmain.c | 84 +++++++++++++---------------- 5 files changed, 141 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae4571fb796dc03d91a63…

1 0

Alexandre Julliard : user32: Force refreshing the non-client area when the window surface is changed.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: d2607ff6c9390d47e591657074188700fadfece6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2607ff6c9390d47e59165707… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 14:52:28 2012 +0100 user32: Force refreshing the non-client area when the window surface is changed. --- dlls/user32/winpos.c | 6 +++--- server/window.c | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5a2f1f2..eda5b78 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2025,6 +2025,8 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } old_width = win->rectClient.right - win->rectClient.left; old_visible_rect = win->visible_rect; + old_surface = win->surface; + if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ SERVER_START_REQ( set_window_pos ) { @@ -2055,7 +2057,6 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->rectWindow = *window_rect; win->rectClient = *client_rect; win->visible_rect = visible_rect; - old_surface = win->surface; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) @@ -2076,8 +2077,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { if (surface_win) update_surface_region( surface_win ); - if (old_surface != new_surface || - ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + if (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) invalidate_dce( win, &old_window_rect ); } diff --git a/server/window.c b/server/window.c index 368171f..fc40d55 100644 --- a/server/window.c +++ b/server/window.c @@ -1724,14 +1724,6 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->bottom - old_client_rect.bottom != y_offset || !valid_rects || memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); - /* if part of the non-client area was exposed, consider it changed */ - if (exposed_rgn && !frame_changed) - { - get_region_extents( exposed_rgn, &rect ); - offset_rect( &rect, client_rect->left, client_rect->top ); - frame_changed = (rect.left < client_rect->left || rect.top < client_rect->top || - rect.right > client_rect->right || rect.bottom > client_rect->bottom); - } } if (frame_changed || client_changed)

1 0

Dmitry Timoshkov : gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString .
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 12340af3f9234186116663a70fa8d1fb85adc013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12340af3f9234186116663a70… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:38:23 2012 +0800 gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b3eaa86d..e7b72b7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2166,7 +2166,8 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) } static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, - GDIPCONST GpStringFormat *format, HFONT *hfont) + GDIPCONST GpStringFormat *format, HFONT *hfont, + GDIPCONST GpMatrix *matrix) { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; @@ -2193,6 +2194,11 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + if (matrix) + { + GpMatrix xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } if (graphics) GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); @@ -5052,7 +5058,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - get_font_hfont(graphics, font, stringFormat, &gdifont); + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) @@ -5182,7 +5188,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, format, &gdifont); + get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; @@ -5369,7 +5375,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SelectClipRgn(hdc, rgn); } - get_font_hfont(graphics, font, format, &gdifont); + get_font_hfont(graphics, font, format, &gdifont, NULL); SelectObject(hdc, gdifont); args.graphics = graphics; @@ -6325,10 +6331,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - - get_font_hfont(graphics, font, NULL, &hfont); + get_font_hfont(graphics, font, NULL, &hfont, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -6341,6 +6344,11 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + if (matrix) + { + GpMatrix xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); @@ -6417,9 +6425,6 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - if (!(flags & DriverStringOptionsCmapLookup)) eto_flags |= ETO_GLYPH_INDEX; @@ -6430,7 +6435,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 pt = positions[0]; GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1); - get_font_hfont(graphics, font, format, &hfont); + get_font_hfont(graphics, font, format, &hfont, matrix); SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); @@ -6476,9 +6481,6 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - pti = GdipAlloc(sizeof(POINT) * length); if (!pti) return OutOfMemory; @@ -6505,7 +6507,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI GdipFree(real_positions); } - get_font_hfont(graphics, font, format, &hfont); + get_font_hfont(graphics, font, format, &hfont, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont);

1 0

Detlef Riekenberg : mstask/tests: Add tests for GetTargetComputer.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 48ddbde74683a7a58aa4e73cb7fd60197d1df0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ddbde74683a7a58aa4e73cb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 6 00:20:13 2012 +0100 mstask/tests: Add tests for GetTargetComputer. --- dlls/mstask/tests/task_scheduler.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 2de0e16..98556be 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -102,10 +102,43 @@ static void test_Activate(void) return; } +static void test_GetTargetComputer(void) +{ + HRESULT hres; + WCHAR *oldname; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler.\n"); + return; + } + + if (0) + { + /* This crashes on w2k */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, NULL); + ok(hres == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hres); + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok((hres == S_OK) && oldname && oldname[0] == '\\' && oldname[1] == '\\' && oldname[2], + "got 0x%x and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); + + CoTaskMemFree(oldname); + + ITaskScheduler_Release(test_task_scheduler); + return; +} + START_TEST(task_scheduler) { CoInitialize(NULL); test_NewWorkItem(); test_Activate(); + test_GetTargetComputer(); CoUninitialize(); }

1 0

Detlef Riekenberg : mstask: Implement GetTargetComputer.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 493d85898889e4d67e1d2e65c8fb6e7abdef7cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=493d85898889e4d67e1d2e65c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 6 00:20:12 2012 +0100 mstask: Implement GetTargetComputer. --- dlls/mstask/task_scheduler.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 1d2ac21..44609b8 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -93,8 +93,30 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( ITaskScheduler* iface, LPWSTR *ppwszComputer) { - FIXME("%p, %p: stub\n", iface, ppwszComputer); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + LPWSTR buffer; + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for the zero */ + + TRACE("(%p)->(%p)\n", This, ppwszComputer); + + if (!ppwszComputer) + return E_INVALIDARG; + + /* extra space for two '\' and a zero */ + buffer = CoTaskMemAlloc((MAX_COMPUTERNAME_LENGTH + 3) * sizeof(WCHAR)); + if (buffer) + { + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + *ppwszComputer = buffer; + return S_OK; + } + CoTaskMemFree(buffer); + } + *ppwszComputer = NULL; + return HRESULT_FROM_WIN32(GetLastError()); } static HRESULT WINAPI MSTASK_ITaskScheduler_Enum(

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE3.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 10db5750442af4445f5ec538f1ccf1644878a99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db5750442af4445f5ec538f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:21 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE3. --- include/ddraw.h | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 88660ba..2ab7826 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -2133,16 +2133,18 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawSurface3 methods ***/ - STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ IDirectDrawSurface3 *attachment) PURE; STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; - STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; + STDMETHOD(Blt)(THIS_ RECT *dst_rest, IDirectDrawSurface3 *src_surface, RECT *src_rect, + DWORD flags, DDBLTFX *fx) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; - STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; - STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; + STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface3 *src_surface, + RECT *src_rect, DWORD flags) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface3 *attachment) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; - STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; - STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE3 *lplpDDAttachedSurface) PURE; + STDMETHOD(Flip)(THIS_ IDirectDrawSurface3 *dst_surface, DWORD flags) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface3 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE; @@ -2163,9 +2165,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; - STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE3 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *src_rect, IDirectDrawSurface3 *dst_surface, RECT *dst_rect, + DWORD flags, DDOVERLAYFX *fx) PURE; STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSReference) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD flags, IDirectDrawSurface3 *reference_surface) PURE; /* added in v2 */ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE2.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: b146861c362f163a8c3f6ee74ae9ac1f5779f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b146861c362f163a8c3f6ee74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:22 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE2. --- dlls/ddraw/tests/dsurface.c | 6 +++--- include/ddraw.h | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 513183f..400f2ea 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -776,8 +776,8 @@ static ULONG getref(IUnknown *iface) static void GetDDInterface_1(void) { + IDirectDrawSurface2 *dsurface2; LPDIRECTDRAWSURFACE dsurface; - LPDIRECTDRAWSURFACE2 dsurface2; DDSURFACEDESC surface; HRESULT ret; IDirectDraw2 *dd2; @@ -840,8 +840,8 @@ static void GetDDInterface_1(void) static void GetDDInterface_2(void) { + IDirectDrawSurface2 *dsurface2; LPDIRECTDRAWSURFACE dsurface; - LPDIRECTDRAWSURFACE2 dsurface2; DDSURFACEDESC surface; HRESULT ret; IDirectDraw2 *dd2; @@ -902,7 +902,7 @@ static void GetDDInterface_2(void) static void GetDDInterface_4(void) { IDirectDrawSurface4 *dsurface4; - LPDIRECTDRAWSURFACE2 dsurface2; + IDirectDrawSurface2 *dsurface2; DDSURFACEDESC2 surface; HRESULT ret; IDirectDraw2 *dd2; diff --git a/include/ddraw.h b/include/ddraw.h index 2ab7826..df4589c 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1990,16 +1990,18 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawSurface2 methods ***/ - STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ IDirectDrawSurface2 *attachment) PURE; STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; - STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; + STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface2 *src_surface, RECT *src_rect, + DWORD flags, DDBLTFX *fx) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; - STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE2 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; - STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSAttachedSurface) PURE; + STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface2 *src_surface, + RECT *src_rect, DWORD flags) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface2 *attachment) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; - STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE2 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; - STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE2 *lplpDDAttachedSurface) PURE; + STDMETHOD(Flip)(THIS_ IDirectDrawSurface2 *dst_surface, DWORD flags) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface2 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE; @@ -2020,9 +2022,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; - STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE2 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *src_rect, IDirectDrawSurface2 *dst_surface, RECT *dst_rect, + DWORD flags, DDOVERLAYFX *fx) PURE; STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE2 lpDDSReference) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD flags, IDirectDrawSurface2 *reference_surface) PURE; /* added in v2 */ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;

1 0

Piotr Caban : msvcrt: Improved _wcstod_l precision.
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Module: wine Branch: master Commit: 505e5a162fb94e5a3789191121e5b5fd32687d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=505e5a162fb94e5a378919112… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 6 10:33:40 2012 +0100 msvcrt: Improved _wcstod_l precision. --- dlls/msvcrt/wcs.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 32ee76b..08628d4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -202,7 +202,8 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, int exp=0, sign=1; const MSVCRT_wchar_t *p; double ret; - BOOL found_digit = FALSE; + long double lret=1, expcnt = 10; + BOOL found_digit = FALSE, negexp; if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; @@ -287,10 +288,16 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - if(exp>0) - ret = (double)sign*d*pow(10, exp); - else - ret = (double)sign*d/pow(10, -exp); + negexp = (exp < 0); + if(negexp) + exp = -exp; + while(exp) { + if(exp & 1) + lret *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + ret = (long double)sign * (negexp ? d/lret : d*lret); _control87(fpcontrol, 0xffffffff);

1 0