wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Henri Verbeet : d2d1: Add the ID2D1Factory interface.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: a96135aeaeddb47debce4b5051e3de3e6fe4e0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96135aeaeddb47debce4b505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:02 2014 +0200 d2d1: Add the ID2D1Factory interface. --- include/d2d1.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index b76e51f..a6d0d36 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -34,6 +34,7 @@ interface IDWriteRenderingParams; interface IDWriteTextFormat; interface IDWriteTextLayout; interface IWICBitmapSource; +interface IWICBitmap; typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; @@ -279,6 +280,14 @@ typedef enum D2D1_DC_INITIALIZE_MODE D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_DC_INITIALIZE_MODE; +typedef enum D2D1_PRESENT_OPTIONS +{ + D2D1_PRESENT_OPTIONS_NONE = 0x00000000, + D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001, + D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002, + D2D1_PRESENT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_PRESENT_OPTIONS; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -397,6 +406,24 @@ typedef struct D2D1_RENDER_TARGET_PROPERTIES D2D1_FEATURE_LEVEL minLevel; } D2D1_RENDER_TARGET_PROPERTIES; +typedef struct D2D1_STROKE_STYLE_PROPERTIES +{ + D2D1_CAP_STYLE startCap; + D2D1_CAP_STYLE endCap; + D2D1_CAP_STYLE dashCap; + D2D1_LINE_JOIN lineJoin; + float miterLimit; + D2D1_DASH_STYLE dashStyle; + float dashOffset; +} D2D1_STROKE_STYLE_PROPERTIES; + +typedef struct D2D1_HWND_RENDER_TARGET_PROPERTIES +{ + HWND hwnd; + D2D1_SIZE_U pixelSize; + D2D1_PRESENT_OPTIONS presentOptions; +} D2D1_HWND_RENDER_TARGET_PROPERTIES; + [ local, object, @@ -1149,5 +1176,75 @@ interface ID2D1GdiInteropRenderTarget : IUnknown ); } +[ + local, + object, + uuid(06152247-6f50-465a-9245-118bfd3b6007) +] +interface ID2D1Factory : IUnknown +{ + HRESULT ReloadSystemMetrics(); + void GetDesktopDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CreateRectangleGeometry( + [in] const D2D1_RECT_F *rect, + [out] ID2D1RectangleGeometry **geometry + ); + HRESULT CreateRoundedRectangleGeometry( + [in] const D2D1_ROUNDED_RECT *rect, + [out] ID2D1RoundedRectangleGeometry **geometry + ); + HRESULT CreateEllipseGeometry( + [in] const D2D1_ELLIPSE *ellipse, + [out] ID2D1EllipseGeometry **geometry + ); + HRESULT CreateGeometryGroup( + [in] D2D1_FILL_MODE fill_mode, + [in, size_is(geometry_count)] ID2D1Geometry *geometry, + [in] UINT32 geometry_count, + [out] ID2D1GeometryGroup **group + ); + HRESULT CreateTransformedGeometry( + [in] ID2D1Geometry *src_geometry, + [in] const D2D1_MATRIX_3X2_F *transform, + [out] ID2D1TransformedGeometry **transformed_geometry + ); + HRESULT CreatePathGeometry( + [out] ID2D1PathGeometry *geometry + ); + HRESULT CreateStrokeStyle( + [in] const D2D1_STROKE_STYLE_PROPERTIES *desc, + [in, size_is(dash_count)] const float *dashes, + [in] UINT32 dash_count, + [out] ID2D1StrokeStyle **stroke_style + ); + HRESULT CreateDrawingStateBlock( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc, + [in] IDWriteRenderingParams *text_rendering_params, + [out] ID2D1DrawingStateBlock **state_block + ); + HRESULT CreateWicBitmapRenderTarget( + [in] IWICBitmap *target, + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1RenderTarget **render_target + ); + HRESULT CreateHwndRenderTarget( + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [in] const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, + [out] ID2D1HwndRenderTarget **render_target + ); + HRESULT CreateDxgiSurfaceRenderTarget( + [in] IDXGISurface *surface, + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1RenderTarget **render_target + ); + HRESULT CreateDCRenderTarget( + [in] const D2D1_RENDER_TARGET_PROPERTIES *desc, + [out] ID2D1DCRenderTarget **render_target + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GdiInteropRenderTarget interface.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: bfcce57b9b9ed59fc648a8996fb1047e9b99af10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcce57b9b9ed59fc648a8996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:01 2014 +0200 d2d1: Add the ID2D1GdiInteropRenderTarget interface. --- include/d2d1.idl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2c9db1a..b76e51f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -272,6 +272,13 @@ typedef enum D2D1_WINDOW_STATE D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, } D2D1_WINDOW_STATE; +typedef enum D2D1_DC_INITIALIZE_MODE +{ + D2D1_DC_INITIALIZE_MODE_COPY = 0, + D2D1_DC_INITIALIZE_MODE_CLEAR = 1, + D2D1_DC_INITIALIZE_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_DC_INITIALIZE_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1126,5 +1133,21 @@ interface ID2D1DCRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(e0db51c3-6f77-4bae-b3d5-e47509b35838) +] +interface ID2D1GdiInteropRenderTarget : IUnknown +{ + HRESULT GetDC( + [in] D2D1_DC_INITIALIZE_MODE mode, + [out] HDC *dc + ); + HRESULT ReleaseDC( + [in] const RECT *update + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1DCRenderTarget interface.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: 60de2d686cac484d1784b14872c7a86f762a0fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60de2d686cac484d1784b1487… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:21:00 2014 +0200 d2d1: Add the ID2D1DCRenderTarget interface. --- include/d2d1.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 899c1d7..2c9db1a 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1113,5 +1113,18 @@ interface ID2D1HwndRenderTarget : ID2D1RenderTarget HWND GetHwnd(); } +[ + local, + object, + uuid(1c51bc64-de61-46fd-9899-63a5d8f03950) +] +interface ID2D1DCRenderTarget : ID2D1RenderTarget +{ + HRESULT BindDC( + [in] const HDC dc, + [in] const RECT rect + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1HwndRenderTarget interface.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: d76e60501059a29fd632a7b321da459400c8f10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76e60501059a29fd632a7b32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 19 08:20:59 2014 +0200 d2d1: Add the ID2D1HwndRenderTarget interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 722f65f..899c1d7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -265,6 +265,13 @@ typedef enum D2D1_FEATURE_LEVEL D2D1_FEATURE_LEVEL_FORCE_DWORD = 0xffffffff, } D2D1_FEATURE_LEVEL; +typedef enum D2D1_WINDOW_STATE +{ + D2D1_WINDOW_STATE_NONE = 0x0000000, + D2D1_WINDOW_STATE_OCCLUDED = 0x0000001, + D2D1_WINDOW_STATE_FORCE_DWORD = 0xffffffff, +} D2D1_WINDOW_STATE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -1092,5 +1099,19 @@ interface ID2D1BitmapRenderTarget : ID2D1RenderTarget ); } +[ + local, + object, + uuid(2cd90698-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1HwndRenderTarget : ID2D1RenderTarget +{ + D2D1_WINDOW_STATE CheckWindowState(); + HRESULT Resize( + [in] const D2D1_SIZE_U size + ); + HWND GetHwnd(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Nikolay Sivov : scrrun: Return disk space as VT_I4 if it fits.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: 9d95788f121d58c7cde90da8e5debb0bd8ad8b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d95788f121d58c7cde90da8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 20:55:58 2014 +0400 scrrun: Return disk space as VT_I4 if it fits. --- dlls/scrrun/filesystem.c | 27 +++++++++++++++++++++------ dlls/scrrun/tests/filesystem.c | 14 ++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f5afb91..9412491 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -888,6 +888,24 @@ static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder) return E_NOTIMPL; } +static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v) +{ + HRESULT hr = S_OK; + + if (src->HighPart) + { + V_VT(v) = VT_R8; + hr = VarR8FromUI8(src->QuadPart, &V_R8(v)); + } + else + { + V_VT(v) = VT_I4; + V_I4(v) = src->LowPart; + } + + return hr; +} + static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); @@ -901,8 +919,7 @@ static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(avail.QuadPart, &V_R8(v)); + return variant_from_largeint(&avail, v); } static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) @@ -918,8 +935,7 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, &freespace, NULL, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(freespace.QuadPart, &V_R8(v)); + return variant_from_largeint(&freespace, v); } static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) @@ -935,8 +951,7 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) return E_FAIL; - V_VT(v) = VT_R8; - return VarR8FromUI8(total.QuadPart, &V_R8(v)); + return variant_from_largeint(&total, v); } static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 531b732..61cadb9 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1294,14 +1294,20 @@ static void test_DriveCollection(void) V_VT(&size) = VT_EMPTY; hr = IDrive_get_AvailableSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); V_VT(&size) = VT_EMPTY; hr = IDrive_get_FreeSpace(drive, &size); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size)); - ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size)); + if (V_VT(&size) == VT_R8) + ok(V_R8(&size) > 0, "got %f\n", V_R8(&size)); + else + ok(V_I4(&size) > 0, "got %d\n", V_I4(&size)); } VariantClear(&var); }

1 0

Nikolay Sivov : scrrun: Implement Count() property for file collection.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: 108c27313bc1c5d4c95f1ddc5d7d8ee57a79071c URL: http://source.winehq.org/git/wine.git/?a=commit;h=108c27313bc1c5d4c95f1ddc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 15:15:42 2014 +0400 scrrun: Implement Count() property for file collection. --- dlls/scrrun/filesystem.c | 28 ++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 4 ---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index aead0d2..f5afb91 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1831,8 +1831,32 @@ static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **p static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + static const WCHAR allW[] = {'\\','*',0}; + WIN32_FIND_DATAW data; + WCHAR pathW[MAX_PATH]; + HANDLE handle; + + TRACE("(%p)->(%p)\n", This, count); + + if(!count) + return E_POINTER; + + *count = 0; + + strcpyW(pathW, This->path); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + do + { + if (is_file_data(&data)) + *count += 1; + } while (FindNextFileW(handle, &data)); + FindClose(handle); + + return S_OK; } static const IFileCollectionVtbl filecollectionvtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c004eaf..531b732 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1084,9 +1084,7 @@ static void test_FileCollection(void) count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %d\n", count); lstrcpyW(pathW, buffW); @@ -1097,9 +1095,7 @@ todo_wine /* every time property is requested it scans directory */ count = 0; hr = IFileCollection_get_Count(files, &count); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 3, "got %d\n", count); hr = IFileCollection_get__NewEnum(files, NULL);

1 0

Nikolay Sivov : scrrun/tests: Fix tests to depend on current codepage.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: 2b628405cd2edaf771399abb8ed34f5891608900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b628405cd2edaf771399abb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 17 14:42:05 2014 +0400 scrrun/tests: Fix tests to depend on current codepage. --- dlls/scrrun/tests/filesystem.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 409cf4b..c004eaf 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -41,6 +41,7 @@ static inline ULONG get_refcount(IUnknown *iface) } static const WCHAR crlfW[] = {'\r','\n',0}; +static const char utf16bom[] = {0xff,0xfe,0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -1317,8 +1318,7 @@ static void test_CreateTextFile(void) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; - static const WCHAR bomAW[] = {0xff,0xfe,0}; - WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; HANDLE file; @@ -1365,11 +1365,16 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, bomAW), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); SysFreeString(str); ITextStream_Release(stream); @@ -1506,7 +1511,9 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1653,7 +1660,11 @@ static void test_Read(void) str = NULL; hr = ITextStream_Read(stream, 2, &str); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(str[0] == 0x00ff && str[1] == 0x00fe, "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); + + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); + + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream);

1 0

Bruno Jesus : ws2_32: Take care of EINTR inside the helpers.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: 25bc6de842dcc9870d2f1df721d30e73ddee478f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc6de842dcc9870d2f1df72… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat May 17 17:42:11 2014 -0300 ws2_32: Take care of EINTR inside the helpers. --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5499753..88d3deb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1921,8 +1921,11 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - if ( (n = recvmsg(fd, &hdr, wsa->flags)) == -1 ) - return -1; + while ((n = recvmsg(fd, &hdr, wsa->flags)) == -1) + { + if (errno != EINTR) + return -1; + } #ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS if (wsa->control) @@ -1981,7 +1984,7 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat } else { - if (errno == EINTR || errno == EAGAIN) + if (errno == EAGAIN) { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_READ, 0, 0 ); @@ -2172,17 +2175,19 @@ static int WS2_send( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - ret = sendmsg(fd, &hdr, wsa->flags); - if (ret >= 0) + while ((ret = sendmsg(fd, &hdr, wsa->flags)) == -1) { - n = ret; - while (wsa->first_iovec < wsa->n_iovecs && wsa->iovec[wsa->first_iovec].iov_len <= n) - n -= wsa->iovec[wsa->first_iovec++].iov_len; - if (wsa->first_iovec < wsa->n_iovecs) - { - wsa->iovec[wsa->first_iovec].iov_base = (char*)wsa->iovec[wsa->first_iovec].iov_base + n; - wsa->iovec[wsa->first_iovec].iov_len -= n; - } + if (errno != EINTR) + return -1; + } + + n = ret; + while (wsa->first_iovec < wsa->n_iovecs && wsa->iovec[wsa->first_iovec].iov_len <= n) + n -= wsa->iovec[wsa->first_iovec++].iov_len; + if (wsa->first_iovec < wsa->n_iovecs) + { + wsa->iovec[wsa->first_iovec].iov_base = (char*)wsa->iovec[wsa->first_iovec].iov_base + n; + wsa->iovec[wsa->first_iovec].iov_len -= n; } return ret; } @@ -2222,7 +2227,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu iosb->Information += result; } - else if (errno == EINTR || errno == EAGAIN) + else if (errno == EAGAIN) { status = STATUS_PENDING; } @@ -4554,11 +4559,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, totalLength += lpBuffers[i].len; } - for (;;) - { - n = WS2_send( fd, wsa ); - if (n != -1 || errno != EINTR) break; - } + n = WS2_send( fd, wsa ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -4651,7 +4652,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } n = WS2_send( fd, wsa ); - if (n == -1 && errno != EAGAIN && errno != EINTR) + if (n == -1 && errno != EAGAIN) { err = wsaErrno(); goto error; @@ -6570,7 +6571,6 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, n = WS2_recv( fd, wsa ); if (n == -1) { - if (errno == EINTR) continue; if (errno != EAGAIN) { int loc_errno = errno;

1 0

Piotr Caban : vbscript: Parse doubles with bigger precision in parse_numeric_literal.
by Alexandre Julliard 19 May '14

19 May '14

Module: wine Branch: master Commit: 7c7ccc0ef510af4a27144f28e96be63fbebb586e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7ccc0ef510af4a27144f28e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 16 17:22:37 2014 +0200 vbscript: Parse doubles with bigger precision in parse_numeric_literal. --- dlls/vbscript/lex.c | 43 ++++++++++++++++++++++++++++++++---------- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 65d2334..dc5a9fe 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include "vbscript.h" @@ -258,28 +261,48 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) { - double n = 0; + LONGLONG d = 0, hlp; + int exp = 0; if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') return *ctx->ptr++; - do { - n = n*10 + *ctx->ptr++ - '0'; - }while('0' <= *ctx->ptr && *ctx->ptr <= '9'); + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>MAXLONGLONG/10 || hlp<0) { + exp++; + break; + } + else + d = hlp; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + exp++; + ctx->ptr++; + } if(*ctx->ptr != '.') { - if((LONG)n == n) { - LONG l = n; + if(!exp && (LONG)d == d) { + LONG l = d; *(LONG*)ret = l; return (short)l == l ? tShort : tLong; } }else { - double e = 1.0; - while('0' <= *++ctx->ptr && *ctx->ptr <= '9') - n += (e /= 10.0)*(*ctx->ptr-'0'); + ctx->ptr++; + + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>MAXLONGLONG/10 || hlp<0) + break; + + d = hlp; + exp--; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) + ctx->ptr++; } - *(double*)ret = n; + *(double*)ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); return tDouble; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c24ffa6..530c5dd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -187,6 +187,7 @@ Call ok(2*3 = 6, "2*3 = " & (2*3)) Call ok(3/2 = 1.5, "3/2 = " & (3/2)) Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1)) Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2)) +Call ok(5/1000000 = 0.000005, "5/1000000 = " & (5/1000000)) Call ok(2^3 = 8, "2^3 = " & (2^3)) Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2))

1 0

Frédéric Delanoy : French translation for release 1.7.19
by Jeremy Newman 19 May '14

19 May '14

Module: website Branch: master Commit: 2251e68252229bf477b6a79decdbb023ad6583b6 URL: http://source.winehq.org/git/website.git/?a=commit;h=2251e68252229bf477b6a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 16 21:48:24 2014 +0200 French translation for release 1.7.19 --- news/fr/2014051601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2014051601.xml b/news/fr/2014051601.xml new file mode 100644 index 0000000..4c8ad2f --- /dev/null +++ b/news/fr/2014051601.xml @@ -0,0 +1,16 @@ +<news> +<date>16 mai 2014</date> +<title>Sortie de Wine 1.7.19</title> +<body> + La version de développement 1.7.19 de Wine est disponible. + <a href="{$root}/announce/1.7.19">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle DLL JSProxy pour une configuration automatique des serveurs mandataires.</li> + <li>Meilleurs prise en charge de l'API OLE Accessible Object.</li> + <li>Améliorations dans le rédacteur XML.</li> + <li>Correctifs pour divers problèmes mémoire détectés par Valgrind.</li> + <li>Fichiers d'en-tête initiaux pour la prise en charge de Direct2D.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.19.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
41
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 May 2014