July 2014 - Wine-Commits - list.winehq.org

Thomas Faber : strmbase: Separate BaseFilter destructor from Release.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 992f5345edb52e89087ff444fe5023b4a5d3a896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992f5345edb52e89087ff444f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jul 18 22:19:40 2014 +0200 strmbase: Separate BaseFilter destructor from Release. --- dlls/strmbase/filter.c | 21 +++++++++++++-------- include/wine/strmbase.h | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index e2cf807..697b243 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -69,14 +69,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - { - if (This->pClock) - IReferenceClock_Release(This->pClock); - - This->IBaseFilter_iface.lpVtbl = NULL; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); - } + BaseFilter_Destroy(This); return refCount; } @@ -218,3 +211,15 @@ HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, c return S_OK; } + +HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) +{ + if (This->pClock) + IReferenceClock_Release(This->pClock); + + This->IBaseFilter_iface.lpVtbl = NULL; + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); + + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9727fb4..1370198 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -194,6 +194,7 @@ LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter* This); VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable); +HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);

1 0

Thomas Faber : strmbase: Destroy base class after child class.
by Alexandre Julliard July 21, 2014

July 21, 2014

Module: wine Branch: master Commit: 3dbcadc2785236c2518777d592d17853ea260f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbcadc2785236c2518777d59… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jul 18 22:23:36 2014 +0200 strmbase: Destroy base class after child class. --- dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/transform.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index bb91236..766e467 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -294,7 +294,7 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) { BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); if (!refCount) { @@ -319,6 +319,7 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) CloseHandle(This->ThreadSignal); CloseHandle(This->RenderEvent); QualityControlImpl_Destroy(This->qcimpl); + BaseFilter_Destroy(&This->filter); } return refCount; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index eba7ad2..0fc7515 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -313,7 +313,7 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) { TransformFilter *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -343,6 +343,7 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); IUnknown_Release(This->seekthru_unk); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0;

1 0

Nikolay Sivov : kernel32/tests: Skip working tests properly.
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: 509bdae8e222d9df92159713714dd6dc1aae2669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509bdae8e222d9df921597137… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 18 13:26:29 2014 +0400 kernel32/tests: Skip working tests properly. --- dlls/kernel32/tests/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9e7f410..aad58b2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3128,7 +3128,7 @@ static void test_EnumDateFormatsA(void) ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_YEARMONTH); if (!ret && (GetLastError() == ERROR_INVALID_FLAGS)) { - skip("DATE_YEARMONTH is only present on W2K and later\n"); + win_skip("DATE_YEARMONTH is only present on W2K and later\n"); return; } ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %d\n", GetLastError()); @@ -3183,7 +3183,7 @@ static void test_GetCPInfo(void) ret = GetCPInfo(CP_UTF7, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) { - skip("Codepage CP_UTF7 is not installed/available\n"); + win_skip("Codepage CP_UTF7 is not installed/available\n"); } else { @@ -3199,7 +3199,7 @@ static void test_GetCPInfo(void) ret = GetCPInfo(CP_UTF8, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) { - skip("Codepage CP_UTF8 is not installed/available\n"); + win_skip("Codepage CP_UTF8 is not installed/available\n"); } else { @@ -3982,7 +3982,7 @@ static void test_EnumSystemGeoID(void) geoidenum_count = 0; ret = pEnumSystemGeoID(GEOCLASS_REGION, 39070, test_geoid_enumproc2); if (ret == 0) - skip("GEOCLASS_REGION is not supported in EnumSystemGeoID.\n"); + win_skip("GEOCLASS_REGION is not supported in EnumSystemGeoID.\n"); else { ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count);

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateStrokeStyle().
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: c903192243e4438ab08e5426e24604b93c231493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c903192243e4438ab08e5426e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:56 2014 +0200 d2d1: Implement d2d_factory_CreateStrokeStyle(). --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 9 +++ dlls/d2d1/factory.c | 14 +++- dlls/d2d1/stroke.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index ed451ef..3c01957 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = uuid C_SRCS = \ brush.c \ factory.c \ - render_target.c + render_target.c \ + stroke.c RC_SRCS = version.rc diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2bcb594..720a96d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -55,4 +55,13 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; +struct d2d_stroke_style +{ + ID2D1StrokeStyle ID2D1StrokeStyle_iface; + LONG refcount; +}; + +void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, + const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 139c478..1003f0d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -144,10 +144,20 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { - FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n", + struct d2d_stroke_style *object; + + TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_stroke_style_init(object, iface, desc, dashes, dash_count); + + TRACE("Created stroke style %p.\n", object); + *stroke_style = &object->ID2D1StrokeStyle_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory *iface, diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c new file mode 100644 index 0000000..81d3dde --- /dev/null +++ b/dlls/d2d1/stroke.c @@ -0,0 +1,165 @@ +/* + * Copyright 2014 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_stroke_style *impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_stroke_style_QueryInterface(ID2D1StrokeStyle *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1StrokeStyle) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1StrokeStyle_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle *iface) +{ + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + ULONG refcount = InterlockedIncrement(&style->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) +{ + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + ULONG refcount = InterlockedDecrement(&style->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, style); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_CAP_STYLE_FLAT; +} + +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_CAP_STYLE_FLAT; +} + +static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_CAP_STYLE_FLAT; +} + +static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_LINE_JOIN_MITER; +} + +static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_DASH_STYLE_SOLID; +} + +static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d2d_stroke_style_GetDashes(ID2D1StrokeStyle *iface, float *dashes, UINT32 count) +{ + FIXME("iface %p, dashes %p, count %u stub!\n", iface, dashes, count); +} + +static const struct ID2D1StrokeStyleVtbl d2d_stroke_style_vtbl = +{ + d2d_stroke_style_QueryInterface, + d2d_stroke_style_AddRef, + d2d_stroke_style_Release, + d2d_stroke_style_GetFactory, + d2d_stroke_style_GetStartCap, + d2d_stroke_style_GetEndCap, + d2d_stroke_style_GetDashCap, + d2d_stroke_style_GetMiterLimit, + d2d_stroke_style_GetLineJoin, + d2d_stroke_style_GetDashOffset, + d2d_stroke_style_GetDashStyle, + d2d_stroke_style_GetDashesCount, + d2d_stroke_style_GetDashes, +}; + +void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, + const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) +{ + FIXME("Ignoring stroke style properties.\n"); + + style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; + style->refcount = 1; +}

1 0

Henri Verbeet : d2d1: Implement D2D1MakeRotateMatrix().
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: 6944803ccc2422e83608a4281b421145b74de819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6944803ccc2422e83608a4281… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:57 2014 +0200 d2d1: Implement D2D1MakeRotateMatrix(). --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 19 +++++++++++++++++++ include/d2d1.idl | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index b1bfe9b..26d17c6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -1,5 +1,5 @@ @ stdcall D2D1CreateFactory(long ptr ptr ptr) -@ stub D2D1MakeRotateMatrix +@ stdcall D2D1MakeRotateMatrix(float float float ptr) @ stub D2D1MakeSkewMatrix @ stub D2D1IsMatrixInvertible @ stub D2D1InvertMatrix diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 1003f0d..0bc465e 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -264,3 +264,22 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, return hr; } + +void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix) +{ + float theta, sin_theta, cos_theta; + + TRACE("angle %.8e, center {%.8e, %.8e}, matrix %p.\n", angle, center.x, center.y, matrix); + + theta = angle * (M_PI / 180.0f); + sin_theta = sinf(theta); + cos_theta = cosf(theta); + + /* translate(center) * rotate(theta) * translate(-center) */ + matrix->_11 = cos_theta; + matrix->_12 = sin_theta; + matrix->_21 = -sin_theta; + matrix->_22 = cos_theta; + matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; + matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; +} diff --git a/include/d2d1.idl b/include/d2d1.idl index a6d0d36..4637338 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1248,3 +1248,4 @@ interface ID2D1Factory : IUnknown [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); +[local] void __stdcall D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix);

1 0

Damjan Jovanovic : winex11.drv: Translate the WM_DROPFILES point into client coordinates whenever possible.
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: 846a8f6c8dcf7ad0bc72437d7ea79cc9e00c8ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846a8f6c8dcf7ad0bc72437d7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 21:08:24 2014 +0200 winex11.drv: Translate the WM_DROPFILES point into client coordinates whenever possible. --- dlls/winex11.drv/xdnd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 26df943..6618edd 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -570,10 +570,11 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) GlobalUnlock(current->contents); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, - ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); + lpDrop->fNC = !ScreenToClient(hwnd, &lpDrop->pt); + TRACE("Sending WM_DROPFILES: hWnd=0x%p, fNC=%d, x=%d, y=%d, files=%p(%s)\n", hwnd, + lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles, + debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); - if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) GlobalFree(dropHandle); }

1 0

Henri Verbeet : wined3d: Track synchronized buffer maps.
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: bc019fcbbd7f0014280a292bc58ef618cfbe34c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc019fcbbd7f0014280a292bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:55 2014 +0200 wined3d: Track synchronized buffer maps. Instead of trying to infer unsynchronized ones. --- dlls/wined3d/buffer.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d5dbc87..4d3e32a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ #define WINED3D_BUFFER_FLUSH 0x08 /* Manual unmap flushing. */ #define WINED3D_BUFFER_DISCARD 0x10 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_NOSYNC 0x20 /* All locks since the last preload had NOOVERWRITE set. */ +#define WINED3D_BUFFER_SYNC 0x20 /* There has been at least one synchronized map since the last preload. */ #define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ @@ -662,7 +662,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (flags & WINED3D_BUFFER_DISCARD) mapflags |= GL_MAP_INVALIDATE_BUFFER_BIT; - if (flags & WINED3D_BUFFER_NOSYNC) + else if (!(flags & WINED3D_BUFFER_SYNC)) mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); @@ -675,7 +675,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined DWORD syncflags = 0; if (flags & WINED3D_BUFFER_DISCARD) syncflags |= WINED3D_MAP_DISCARD; - if (flags & WINED3D_BUFFER_NOSYNC) + else if (!(flags & WINED3D_BUFFER_SYNC)) syncflags |= WINED3D_MAP_NOOVERWRITE; buffer_sync_apple(This, syncflags, gl_info); } @@ -713,14 +713,14 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined void buffer_mark_used(struct wined3d_buffer *buffer) { - buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); + buffer->flags &= ~(WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); } /* Context activation is done by the caller. */ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { - DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); + DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; const struct wined3d_gl_info *gl_info; @@ -939,7 +939,6 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { - BOOL dirty = buffer_is_dirty(buffer); LONG count; BYTE *base; @@ -1032,11 +1031,8 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (flags & WINED3D_MAP_DISCARD) buffer->flags |= WINED3D_BUFFER_DISCARD; - - if (!(flags & WINED3D_MAP_NOOVERWRITE)) - buffer->flags &= ~WINED3D_BUFFER_NOSYNC; - else if (!dirty) - buffer->flags |= WINED3D_BUFFER_NOSYNC; + else if (!(flags & WINED3D_MAP_NOOVERWRITE)) + buffer->flags |= WINED3D_BUFFER_SYNC; } base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory;

1 0

Henri Verbeet : wined3d: Use the previous "dirty" status to set WINED3D_BUFFER_NOSYNC in wined3d_buffer_map().
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: 01251f3d3cb9c5f7b8cb006f91eb242f4f32bf4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01251f3d3cb9c5f7b8cb006f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:54 2014 +0200 wined3d: Use the previous "dirty" status to set WINED3D_BUFFER_NOSYNC in wined3d_buffer_map(). This (presumably) fixes a regression introduced by commit c1032e977bb9f850e3aea28dd79e3d7c2244cd6c. --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fa9ff92..d5dbc87 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -939,6 +939,7 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { + BOOL dirty = buffer_is_dirty(buffer); LONG count; BYTE *base; @@ -1034,7 +1035,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (!(flags & WINED3D_MAP_NOOVERWRITE)) buffer->flags &= ~WINED3D_BUFFER_NOSYNC; - else if (!buffer_is_dirty(buffer)) + else if (!dirty) buffer->flags |= WINED3D_BUFFER_NOSYNC; }

1 0

Henri Verbeet : wined3d: Fix a couple of renderer strings in select_card_nvidia_binary().
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: 8c19371b628a861028f3dbfa0b8a3a53677efd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c19371b628a861028f3dbfa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 18 10:37:53 2014 +0200 wined3d: Fix a couple of renderer strings in select_card_nvidia_binary(). --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d6bb3836..5ed392d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1743,9 +1743,9 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ - {"Geforce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"Geforce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"Geforce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ + {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ + {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ + {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */

1 0

Damjan Jovanovic : winex11.drv: Allow the clipboard to copy files to other X11 apps.
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: c60d6c46bf195a0e094fd598c4129f55592e7203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60d6c46bf195a0e094fd598c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 20:14:35 2014 +0200 winex11.drv: Allow the clipboard to copy files to other X11 apps. --- dlls/winex11.drv/clipboard.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 727a2a4..b2705b4 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -163,6 +163,8 @@ static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window reques Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE X11DRV_CLIPBOARD_ExportTextHtml(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); +static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat(UINT id, Atom prop); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wFormatID); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); @@ -207,8 +209,7 @@ static const struct /* If UTF8_STRING is not available, attempt COMPOUND_TEXT */ { CF_UNICODETEXT, XATOM_COMPOUND_TEXT, X11DRV_CLIPBOARD_ImportCompoundText, X11DRV_CLIPBOARD_ExportString }, { CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, X11DRV_CLIPBOARD_ImportEnhMetaFile, X11DRV_CLIPBOARD_ExportEnhMetaFile }, - { CF_HDROP, XATOM_WCF_HDROP, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, - { CF_HDROP, XATOM_text_uri_list, X11DRV_CLIPBOARD_ImportTextUriList, X11DRV_CLIPBOARD_ExportClipboardData }, + { CF_HDROP, XATOM_text_uri_list, X11DRV_CLIPBOARD_ImportTextUriList, X11DRV_CLIPBOARD_ExportHDROP }, { CF_LOCALE, XATOM_WCF_LOCALE, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, { CF_DIBV5, XATOM_WCF_DIBV5, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, { CF_OWNERDISPLAY, XATOM_WCF_OWNERDISPLAY, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, @@ -2179,6 +2180,94 @@ end: /************************************************************************** + * X11DRV_CLIPBOARD_ExportHDROP + * + * Export CF_HDROP format to text/uri-list. + */ +static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) +{ + HDROP hDrop; + UINT i; + UINT numFiles; + HGLOBAL hClipData = NULL; + char *textUriList = NULL; + UINT textUriListSize = 32; + UINT next = 0; + + *lpBytes = 0; + + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) + { + ERR("Failed to export %04x format\n", lpdata->wFormatID); + return 0; + } + hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, textUriListSize); + if (hClipData == NULL) + return 0; + hDrop = (HDROP) lpdata->hData; + numFiles = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0); + for (i = 0; i < numFiles; i++) + { + UINT dosFilenameSize; + WCHAR *dosFilename = NULL; + char *unixFilename = NULL; + UINT uriSize; + UINT u; + + dosFilenameSize = 1 + DragQueryFileW(hDrop, i, NULL, 0); + dosFilename = HeapAlloc(GetProcessHeap(), 0, dosFilenameSize*sizeof(WCHAR)); + if (dosFilename == NULL) goto failed; + DragQueryFileW(hDrop, i, dosFilename, dosFilenameSize); + unixFilename = wine_get_unix_file_name(dosFilename); + HeapFree(GetProcessHeap(), 0, dosFilename); + if (unixFilename == NULL) goto failed; + uriSize = 8 + /* file:/// */ + 3 * (lstrlenA(unixFilename) - 1) + /* "%xy" per char except first '/' */ + 2; /* \r\n */ + if ((next + uriSize) > textUriListSize) + { + UINT biggerSize = max( 2 * textUriListSize, next + uriSize ); + HGLOBAL bigger = GlobalReAlloc(hClipData, biggerSize, 0); + if (bigger) + { + hClipData = bigger; + textUriListSize = biggerSize; + } + else + { + HeapFree(GetProcessHeap(), 0, unixFilename); + goto failed; + } + } + textUriList = GlobalLock(hClipData); + lstrcpyA(&textUriList[next], "file:///"); + next += 8; + /* URL encode everything - unnecessary, but easier/lighter than linking in shlwapi, and can't hurt */ + for (u = 1; unixFilename[u]; u++) + { + static const char hex_table[] = "0123456789abcdef"; + textUriList[next++] = '%'; + textUriList[next++] = hex_table[unixFilename[u] >> 4]; + textUriList[next++] = hex_table[unixFilename[u] & 0xf]; + } + textUriList[next++] = '\r'; + textUriList[next++] = '\n'; + GlobalUnlock(hClipData); + HeapFree(GetProcessHeap(), 0, unixFilename); + } + + *lpBytes = next; + return hClipData; + +failed: + GlobalFree(hClipData); + *lpBytes = 0; + return 0; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_QueryTargets */ static BOOL X11DRV_CLIPBOARD_QueryTargets(Display *display, Window w, Atom selection,

1 0

Damjan Jovanovic : winex11.drv: Fix a GlobalLock() reference leak.
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: 04d8b325bf266a53ddf19c2fc4df05dd6b3c189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d8b325bf266a53ddf19c2fc… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 21:08:02 2014 +0200 winex11.drv: Fix a GlobalLock() reference leak. --- dlls/winex11.drv/xdnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 3390dad..abaf4b4 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -569,6 +569,7 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); + GlobalUnlock(current->contents); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle);

1 0

Damjan Jovanovic : winex11.drv: Don't memcpy() over the DROPFILES point just after setting it.
by Alexandre Julliard July 18, 2014

July 18, 2014

Module: wine Branch: master Commit: f2f8d187e4a1164122b61a90e7753a6d29dfaeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f8d187e4a1164122b61a90e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 17 21:08:12 2014 +0200 winex11.drv: Don't memcpy() over the DROPFILES point just after setting it. --- dlls/winex11.drv/xdnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index abaf4b4..26df943 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -566,10 +566,10 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); - lpDrop->pt.x = XDNDxy.x; - lpDrop->pt.y = XDNDxy.y; memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); GlobalUnlock(current->contents); + lpDrop->pt.x = XDNDxy.x; + lpDrop->pt.y = XDNDxy.y; TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle);

1 0

Alexandre Julliard : ntdll: Use a custom signal restorer for Android.
by Alexandre Julliard July 17, 2014

July 17, 2014

Module: wine Branch: master Commit: 1b1ea639cd66c8c3ea690afc5a346651364d36b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1ea639cd66c8c3ea690afc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 17 14:51:12 2014 +0200 ntdll: Use a custom signal restorer for Android. Bionic doesn't provide one, even when vdso has been unmapped by the preloader. --- dlls/ntdll/signal_i386.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5f8b8fd..7b4bc72 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -135,6 +135,12 @@ typedef struct ucontext #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) +/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ +void rt_sigreturn(void); +__ASM_GLOBAL_FUNC( rt_sigreturn, + "movl $173,%eax\n\t" /* NR_rt_sigreturn */ + "int $0x80" ); + #elif defined (__linux__) typedef ucontext_t SIGCONTEXT; @@ -2327,7 +2333,10 @@ void signal_init_process(void) #ifdef SA_ONSTACK sig_act.sa_flags |= SA_ONSTACK; #endif - +#ifdef __ANDROID__ + sig_act.sa_flags |= SA_RESTORER; + sig_act.sa_restorer = rt_sigreturn; +#endif sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; sig_act.sa_sigaction = fpe_handler;

1 0

Zhenbo Li : mshtml: Added IHTMLFormElement::reset method implementation.
by Alexandre Julliard July 17, 2014

July 17, 2014

Module: wine Branch: master Commit: d734935a2c8e1fba97b4848ba9939bfb7064efd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d734935a2c8e1fba97b4848ba… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jul 17 23:48:36 2014 +0800 mshtml: Added IHTMLFormElement::reset method implementation. --- dlls/mshtml/htmlform.c | 12 ++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 6cbf1f6..86af350 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -436,8 +436,16 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->()\n", This); + nsres = nsIDOMHTMLFormElement_Reset(This->nsform); + if (NS_FAILED(nsres)) { + ERR("Reset failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 532bbfb..487c25c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3764,6 +3764,17 @@ static void _test_form_elements(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } +#define test_form_reset(a) _test_form_reset(__LINE__,a) +static void _test_form_reset(unsigned line, IUnknown *unk) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + HRESULT hres; + + hres = IHTMLFormElement_reset(form); + ok_(__FILE__,line)(hres == S_OK, "reset failed: %08x\n", hres); + + IHTMLFormElement_Release(form); +} #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -7330,6 +7341,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); test_form_encoding((IUnknown*)elem, "multipart/form-data"); test_form_elements((IUnknown*)elem); + test_form_reset((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Francois Gouget : winetest: Improve the scripts documentation.
by Alexandre Julliard July 17, 2014

July 17, 2014

Module: tools Branch: master Commit: f1198690004363f900204d627a8a48f809cd84eb URL: http://source.winehq.org/git/tools.git/?a=commit;h=f1198690004363f900204d62… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 17 18:34:53 2014 +0200 winetest: Improve the scripts documentation. --- winetest/README | 19 ------------------- winetest/build-index | 18 ++++++++++++++++-- winetest/dissect | 25 ++++++++++++++----------- winetest/gather | 24 ++++++++++++++---------- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/winetest/README b/winetest/README index 49ca6d0..68e185a 100644 --- a/winetest/README +++ b/winetest/README @@ -25,25 +25,6 @@ file in $queuedir, then renames it to repXXXXX/report. Sample crontab entry illustrating the intended use of the tools. -* dissect - -This program looks for a file matching $queuedir/rep*/report, takes it -apart in its directory while also creating summary.txt. If an error -occurs the directory is renamed to errXXXXX to avoid future attempts -at processing this report. If everything goes flawlessly the whole -directory is renamed (based on the information learned in the process) -to $datadir/BUILD/VERSION_TAG_DIGIT where DIGIT is for resolving name -clashes and $datadir/BUILD/outdated is created to signal the change in -the given build. See also the head of the file. - -* gather - -This program is intended to run as a second stage. See the sample -crontab file. Races and concurrency problems must be dealt with on -that higher level. The program looks for a file matching -$datadir/*/outdated, creates index.html in the same directory and -removes the outdated file. See also the head of the file. - * summary.css, summary.js, resultform.html These files are referenced by the index.html files created by gather. diff --git a/winetest/build-index b/winetest/build-index index 8e12c01..186a2de 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,9 +1,23 @@ #!/usr/bin/perl -w # -# Build the global index for winetest result data -# # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> # +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program creates the global index of all the builds for which we have +# WineTest result data. use strict; use open ':utf8'; diff --git a/winetest/dissect b/winetest/dissect index 5187cf0..a243a23 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -1,16 +1,5 @@ #!/usr/bin/perl -w # -# Searches for $queuedir/rep*/report.txt-s, preprocesses and moves -# them into the appropriate $datadir/build/version directories, and -# creates $datadir/build/outdated. Each generated file has .txt extension. -# -# Files: winetest.conf -# -# Exit: 0 - successfully processed a report, call again -# 1 - failure processing a report, call again -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong -# # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard # @@ -27,6 +16,20 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program looks for a WineTest report file matching $queuedir/rep*/report, +# takes it apart in its directory while also creating summary.txt. If an error +# occurs the directory is renamed to errXXXXX to avoid future attempts at +# processing this report. +# If everything goes flawlessly the whole directory is renamed (based on the +# information learned in the process) to $datadir/BUILD/VERSION_TAG_DIGIT +# where DIGIT is for resolving name clashes and $datadir/BUILD/outdated is +# created to signal the change in the given build. +# +# Exit: 0 - successfully processed a report, call again +# 1 - failed to process a report, call again +# 2 - there was nothing to do +# 3 - fatal error, something went utterly wrong use strict; use open ':utf8'; diff --git a/winetest/gather b/winetest/gather index 97a5a37..5023ac6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,15 +1,5 @@ #!/usr/bin/perl -w # -# Searches for a $datadir/*/outdated, updates the corresponding -# index.html and removes the outdated. -# -# Files: winetest.conf -# -# Exit: 0 - successfully processed a build, call again -# 1 - should not happen -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong -# # Copyright (C) 2004 Ferenc Wagner # # This library is free software; you can redistribute it and/or @@ -25,6 +15,20 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program looks for builds that have received new reports. These are +# identified by the presence of a file matching $datadir/*/outdated. It then +# creates an index.html file in the same directory and removes the outdated +# file. +# +# It is thus intended to run as a second stage invoked by the winetest.cron +# script. Races and concurrency problems must be dealt with on that higher +# level. +# +# Exit: 0 - successfully processed a build, call again +# 1 - should not happen +# 2 - there was nothing to do +# 3 - fatal error, something went utterly wrong use strict; use CGI qw(:standard);

1 0

Alexandre Julliard : lxr: Run LXR update in the background since it' s so slow.
by Alexandre Julliard July 17, 2014

July 17, 2014

Module: tools Branch: master Commit: aeed6c973fa4b806bacf782a4f2011006fb6870d URL: http://source.winehq.org/git/tools.git/?a=commit;h=aeed6c973fa4b806bacf782a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 11 20:26:49 2014 +0200 lxr: Run LXR update in the background since it's so slow. --- lxr/update-version | 4 +--- wine_release | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lxr/update-version b/lxr/update-version index 6a323c9..bed9714 100755 --- a/lxr/update-version +++ b/lxr/update-version @@ -16,10 +16,8 @@ fi version=$1 -tools_dir="/home/winehq/opt/git-tools" - cd /home/winehq/opt/source (echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions -$tools_dir/lxr/genxref --url=http://source.winehq.org --version=wine-$version +./genxref --url=http://source.winehq.org --version=wine-$version diff --git a/wine_release b/wine_release index 7306aa6..af9e5a7 100755 --- a/wine_release +++ b/wine_release @@ -86,7 +86,6 @@ fi echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql # make cross reference database for LXR -echo "==== UPDATING LXR ====" -$tools_dir/lxr/update-version $version +$tools_dir/lxr/update-version $version & # end

1 0

Alexandre Julliard : lxr: Only markup potential filenames surrounded by spaces.
by Alexandre Julliard July 17, 2014

July 17, 2014

Module: tools Branch: master Commit: d2264373dc9461f1962aafbaa7d37018a28a3403 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d2264373dc9461f1962aafba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 21:12:53 2014 +0200 lxr: Only markup potential filenames surrounded by spaces. Otherwise it considers a version name like wine-1.7 to be a filename. --- lxr/lib/LXR/Markup.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxr/lib/LXR/Markup.pm b/lxr/lib/LXR/Markup.pm index 6c5a33c..94d0c78 100644 --- a/lxr/lib/LXR/Markup.pm +++ b/lxr/lib/LXR/Markup.pm @@ -111,7 +111,7 @@ sub markupstring { $string =~ s/(<)(.*@.*)(>)/$1<a class='offshore' href=\"mailto:$2\">$2<\/a>$3/g; # HTMLify file names, assuming file is in the directory defined by $virtp. - $string =~ s{\b([\w\-_\/]+\.\w{1,5}|README)\b} + $string =~ s{\s([\w\-_\/]+\.\w{1,5}|README)\s} {fileref($1, '', $virtp . $1);}ge; return ($string);

1 0

Stefan Dösinger : ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 8b367c79098690445553a1ee228070789bfdc021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b367c79098690445553a1ee2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:11 2014 +0200 ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority. --- dlls/ddraw/tests/ddraw7.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 393cea3..3e29164 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7448,6 +7448,127 @@ static void test_lost_device(void) DestroyWindow(window); } +static void test_resource_priority(void) +{ + IDirectDrawSurface7 *surface, *mipmap; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, 0}; + DDCAPS hal_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY | DDSCAPS_MIPMAP; + unsigned int i; + DWORD priority; + static const struct + { + DWORD caps, caps2; + const char *name; + HRESULT hr; + /* SetPriority on offscreenplain surfaces crashes on AMD GPUs on Win7. */ + BOOL crash; + } + test_data[] = + { + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, 0, "vidmem texture", DDERR_INVALIDPARAMS, FALSE}, + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, 0, "sysmem texture", DDERR_INVALIDPARAMS, FALSE}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, "managed texture", DD_OK, FALSE}, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY, 0, "vidmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, + {DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, 0, "sysmem offscreenplain", DDERR_INVALIDOBJECT, TRUE}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps + || !(hal_caps.ddsCaps.dwCaps & DDSCAPS2_TEXTUREMANAGE)) + { + skip("Required surface types not supported, skipping test.\n"); + goto done; + } + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); i++) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + surface_desc.ddsCaps.dwCaps = test_data[i].caps; + surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, type %s.\n", hr, test_data[i].name); + + /* Priority == NULL segfaults. */ + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(test_data[i].hr)) + ok(priority == 0, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + else + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + + if (!test_data[i].crash) + { + hr = IDirectDrawSurface7_SetPriority(surface, 1); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + if (SUCCEEDED(test_data[i].hr)) + { + ok(priority == 1, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + hr = IDirectDrawSurface7_SetPriority(surface, 2); + ok(hr == test_data[i].hr, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); + } + else + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); + } + + IDirectDrawSurface7_Release(surface); + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_MIPMAPCOUNT; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; + U2(surface_desc).dwMipMapCount = 2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + + priority = 0xdeadbeef; + hr = IDirectDrawSurface7_GetPriority(mipmap, &priority); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type managed mipmap.\n", hr); + ok(priority == 0xdeadbeef, "Got unexpected priority %u, type managed mipmap.\n", priority); + /* SetPriority on the mipmap surface crashes. */ + hr = IDirectDrawSurface7_GetPriority(surface, &priority); + ok(SUCCEEDED(hr), "Failed to get priority, hr %#x.\n", hr); + ok(priority == 0, "Got unexpected priority %u, type managed mipmap.\n", priority); + + IDirectDrawSurface7_Release(mipmap); + refcount = IDirectDrawSurface7_Release(surface); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + +done: + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -7519,4 +7640,5 @@ START_TEST(ddraw7) test_palette_alpha(); test_vb_writeonly(); test_lost_device(); + test_resource_priority(); }

1 0

Alexandre Julliard : cmd: Use array indexing syntax to access array members.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: fd17c93224a75323c5e9b912521a046da81fbf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd17c93224a75323c5e9b9125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 16 14:53:18 2014 +0200 cmd: Use array indexing syntax to access array members. --- programs/cmd/directory.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 58fff44..678e2a1 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -283,18 +283,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Load all files into an in memory structure */ WINE_TRACE("Looking for matches to '%s'\n", wine_dbgstr_w(real_path)); - hff = FindFirstFileW(real_path, (fd+entry_count)); + hff = FindFirstFileW(real_path, &fd[entry_count]); if (hff != INVALID_HANDLE_VALUE) { do { /* Skip any which are filtered out by attribute */ - if (((fd+entry_count)->dwFileAttributes & attrsbits) != showattrs) continue; + if ((fd[entry_count].dwFileAttributes & attrsbits) != showattrs) continue; entry_count++; /* Keep running track of longest filename for wide output */ if (wide || orderByCol) { - int tmpLen = strlenW((fd+(entry_count-1))->cFileName) + 3; - if ((fd+(entry_count-1))->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; + int tmpLen = strlenW(fd[entry_count-1].cFileName) + 3; + if (fd[entry_count-1].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; if (tmpLen > widest) widest = tmpLen; } @@ -305,7 +305,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le errorlevel = 1; return parms->next; } - } while (FindNextFileW(hff, (fd+entry_count)) != 0); + } while (FindNextFileW(hff, &fd[entry_count]) != 0); FindClose (hff); } @@ -362,23 +362,23 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* /L convers all names to lower case */ if (lower) { - WCHAR *p = (fd+i)->cFileName; + WCHAR *p = fd[i].cFileName; while ( (*p = tolower(*p)) ) ++p; } /* /Q gets file ownership information */ if (usernames) { strcpyW (string, inputparms->dirName); - strcatW (string, (fd+i)->cFileName); + strcatW (string, fd[i].cFileName); WCMD_getfileowner(string, username, sizeof(username)/sizeof(WCHAR)); } if (dirTime == Written) { - FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftLastWriteTime, &ft); } else if (dirTime == Access) { - FileTimeToLocalFileTime (&(fd+i)->ftLastAccessTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftLastAccessTime, &ft); } else { - FileTimeToLocalFileTime (&(fd+i)->ftCreationTime, &ft); + FileTimeToLocalFileTime (&fd[i].ftCreationTime, &ft); } FileTimeToSystemTime (&ft, &st); GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, @@ -389,18 +389,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (wide) { tmp_width = cur_width; - if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { static const WCHAR fmt[] = {'[','%','1',']','\0'}; - WCMD_output (fmt, (fd+i)->cFileName); + WCMD_output (fmt, fd[i].cFileName); dir_count++; - tmp_width = tmp_width + strlenW((fd+i)->cFileName) + 2; + tmp_width = tmp_width + strlenW(fd[i].cFileName) + 2; } else { static const WCHAR fmt[] = {'%','1','\0'}; - WCMD_output (fmt, (fd+i)->cFileName); - tmp_width = tmp_width + strlenW((fd+i)->cFileName) ; + WCMD_output (fmt, fd[i].cFileName); + tmp_width = tmp_width + strlenW(fd[i].cFileName) ; file_count++; - file_size.u.LowPart = (fd+i)->nFileSizeLow; - file_size.u.HighPart = (fd+i)->nFileSizeHigh; + file_size.u.LowPart = fd[i].nFileSizeLow; + file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; } cur_width = cur_width + widest; @@ -412,18 +412,18 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le WCMD_output(padfmt, cur_width - tmp_width, nullW); } - } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + } else if (fd[i].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { dir_count++; if (!bare) { WCMD_output (fmtDir, datestring, timestring); - if (shortname) WCMD_output (fmt2, (fd+i)->cAlternateFileName); + if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); - WCMD_output(fmt4,(fd+i)->cFileName); + WCMD_output(fmt4,fd[i].cFileName); } else { - if (!((strcmpW((fd+i)->cFileName, dotW) == 0) || - (strcmpW((fd+i)->cFileName, dotdotW) == 0))) { - WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); + if (!((strcmpW(fd[i].cFileName, dotW) == 0) || + (strcmpW(fd[i].cFileName, dotdotW) == 0))) { + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, fd[i].cFileName); } else { addNewLine = FALSE; } @@ -431,17 +431,17 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } else { file_count++; - file_size.u.LowPart = (fd+i)->nFileSizeLow; - file_size.u.HighPart = (fd+i)->nFileSizeHigh; + file_size.u.LowPart = fd[i].nFileSizeLow; + file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { WCMD_output (fmtFile, datestring, timestring, WCMD_filesize64(file_size.QuadPart)); - if (shortname) WCMD_output (fmt2, (fd+i)->cAlternateFileName); + if (shortname) WCMD_output (fmt2, fd[i].cAlternateFileName); if (usernames) WCMD_output (fmt3, username); - WCMD_output(fmt4,(fd+i)->cFileName); + WCMD_output(fmt4,fd[i].cFileName); } else { - WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, fd[i].cFileName); } } }

1 0

Stefan Dösinger : wined3d: Remove wined3d_buffer_set/ get_priority.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: cf11933701a4e0f6c9fbabda97d11df6465aff43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf11933701a4e0f6c9fbabda9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:14 2014 +0200 wined3d: Remove wined3d_buffer_set/get_priority. --- dlls/d3d8/buffer.c | 16 ++++++++++++---- dlls/d3d9/buffer.c | 16 ++++++++++++---- dlls/wined3d/buffer.c | 10 ---------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 4 ++-- 8 files changed, 32 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf11933701a4e0f6c9fba…

1 0

Shuai Meng : vbscript: Implemented Abs.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 997820f735c468b7826b7630aef844fdbbbff663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997820f735c468b7826b7630a… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Jul 15 23:02:55 2014 +0800 vbscript: Implemented Abs. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa06353..af7a27d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1246,8 +1246,23 @@ static HRESULT Global_ChrW(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Abs(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT dst; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = VarAbs(arg, &dst); + if(FAILED(hres)) + return hres; + + if (res) + *res = dst; + else + VariantClear(&dst); + + return S_OK; } static HRESULT Global_Fix(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 33596d3..0d27c8d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -909,4 +909,43 @@ End Sub Call testSgnError(Null, 94) +Call ok(Abs(Empty) = 0, "Abs(Empty) = " & Abs(Empty)) +Call ok(getVT(Abs(Empty)) = "VT_I2", "getVT(Abs(Empty)) = " & getVT(Abs(Empty))) +Call ok(IsNull(Abs(Null)), "Is Abs(Null) not Null?") +Call ok(getVT(Abs(Null)) = "VT_NULL", "getVT(Abs(Null)) = " & getVT(Abs(Null))) +Call ok(Abs(0) = 0, "Abs(0) = " & Abs(0)) +Call ok(getVT(Abs(0)) = "VT_I2", "getVT(Abs(0)) = " & getVT(Abs(0))) +Call ok(Abs(-32769) = 32769, "Abs(-32769) = " & Abs(-32769)) +Call ok(getVT(Abs(-32769)) = "VT_I4", "getVT(Abs(-32769)) = " & getVT(Abs(-32769))) +Call ok(Abs(CSng(-0.5)) = 0.5, "Abs(CSng(-0.5)) = " & Abs(CSng(-0.5))) +Call ok(getVT(Abs(CSng(-0.5))) = "VT_R4", "getVT(Abs(CSng(-0.5))) = " & getVT(Abs(CSng(-0.5)))) +Call ok(Abs(0.5) = 0.5, "Abs(0.5) = " & Abs(0.5)) +Call ok(getVT(Abs(0.5)) = "VT_R8", "getVT(Abs(0.5)) = " & getVT(Abs(0.5))) +Call ok(Abs(CCur(-1)) = 1, "Abs(CCur(-1)) = " & Abs(CCur(-1))) +Call ok(getVT(Abs(CCur(-1))) = "VT_CY", "getVT(Abs(CCur(-1))) = " & getVT(Abs(CCur(-1)))) +Call ok(Abs("-1") = 1, "Abs(""-1"") = " & Abs("-1")) +Call ok(getVT(Abs("-1")) = "VT_R8", "getVT(Abs(""-1"")) = " & getVT(Abs("-1"))) +Call ok(Abs(False) = 0, "Abs(False) = " & Abs(False)) +Call ok(getVT(Abs(False)) = "VT_I2", "getVT(Abs(False)) = " & getVT(Abs(False))) +Call ok(Abs(True) = 1, "Abs(True) = " & Abs(True)) +Call ok(getVT(Abs(True)) = "VT_I2", "getVT(Abs(True)) = " & getVT(Abs(True))) +Call ok(Abs(CByte(1)) = 1, "Abs(CByte(1)) = " & Abs(CByte(1))) +Call ok(getVT(Abs(CByte(1))) = "VT_UI1", "getVT(Abs(CByte(1))) = " & getVT(Abs(CByte(1)))) + +Sub testAbsError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = Abs(strings) + Call ok(Err.number = error_num1, "Err.number1 = " & Err.number) + + Call Err.clear() + Call Abs(strings) + Call ok(Err.number = error_num2, "Err.number2 = " & Err.number) +End Sub + +Call testAbsError("strings", 13, 13) +Call testAbsError(-4, 0, 0) + Call reportSuccess()

1 0

Ken Thomases : winemac: Don' t query the position of the one-past-the-end character with IMR_QUERYCHARPOSITION.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: cafb192ecc93880d508493cda012267bdb0ed6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafb192ecc93880d508493cda… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 16 12:59:03 2014 -0500 winemac: Don't query the position of the one-past-the-end character with IMR_QUERYCHARPOSITION. This means the resulting rectangle will be short, but we don't have much choice. Some apps don't cope properly with the one-past-the-end character. For example, Excel 2007 gets stuck in an infinite loop. --- dlls/winemac.drv/ime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index b62736f..7f98914 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1509,7 +1509,7 @@ BOOL query_ime_char_rect(macdrv_query* query) *rect = CGRectMake(charpos.pt.x, charpos.pt.y, 0, charpos.cLineHeight); /* iterate over rest of length to extend rect */ - for (i = 1; i <= range->length; i++) + for (i = 1; i < range->length; i++) { charpos.dwSize = sizeof(charpos); charpos.dwCharPos = range->location + i;

1 0

Stefan Dösinger : ddraw: Add validation to SetPriority / GetPriority.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 5b9f91c18d7e21ecdd1dfb662682c34cd143d4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9f91c18d7e21ecdd1dfb662… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 16 14:39:10 2014 +0200 ddraw: Add validation to SetPriority / GetPriority. --- dlls/ddraw/surface.c | 72 +++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3d61e61..355a88b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2229,63 +2229,59 @@ static HRESULT WINAPI ddraw_surface1_GetCaps(IDirectDrawSurface *iface, DDSCAPS return hr; } -/***************************************************************************** - * IDirectDrawSurface7::SetPriority - * - * Sets a texture priority for managed textures. - * - * Params: - * Priority: The new priority - * - * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::SetPriority - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD Priority) +static HRESULT WINAPI ddraw_surface7_SetPriority(IDirectDrawSurface7 *iface, DWORD priority) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; HRESULT hr; - TRACE("iface %p, priority %u.\n", iface, Priority); + TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - hr = wined3d_surface_set_priority(surface->wined3d_surface, Priority); + /* No need to check for offscreen plain surfaces or mipmap sublevels. SetPriority + * calls on such surfaces segfault on Windows. */ + if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed)) + { + WARN("Called on non-managed texture returning DDERR_INVALIDPARAMS.\n"); + hr = DDERR_INVALIDPARAMS; + } + else + { + wined3d_surface_set_priority(surface->wined3d_surface, priority); + hr = DD_OK; + } wined3d_mutex_unlock(); return hr; } -/***************************************************************************** - * IDirectDrawSurface7::GetPriority - * - * Returns the surface's priority - * - * Params: - * Priority: Address of a variable to write the priority to - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Priority == NULL - * For more details, see IWineD3DSurface::GetPriority - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *Priority) +static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWORD *priority) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + DWORD managed = DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE; + HRESULT hr; - TRACE("iface %p, priority %p.\n", iface, Priority); + TRACE("iface %p, priority %p.\n", iface, priority); - if(!Priority) + wined3d_mutex_lock(); + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN) { - return DDERR_INVALIDPARAMS; + WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); + hr = DDERR_INVALIDOBJECT; + } + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->wined3d_texture) + { + WARN("Called on non-managed texture or mipmap sublevel, returning DDERR_INVALIDPARAMS.\n"); + hr = DDERR_INVALIDPARAMS; + } + else + { + *priority = wined3d_surface_get_priority(surface->wined3d_surface); + hr = DD_OK; } - - wined3d_mutex_lock(); - *Priority = wined3d_surface_get_priority(surface->wined3d_surface); wined3d_mutex_unlock(); - return DD_OK; + return hr; } /*****************************************************************************

1 0

Jacek Caban : wininet: Include trailing slash in URL cache hashes.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 2aaff6e19f9ef97a241d7ca36497d47d52b4c523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaff6e19f9ef97a241d7ca36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 16 11:06:24 2014 +0200 wininet: Include trailing slash in URL cache hashes. --- dlls/wininet/tests/urlcache.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 35ef77d..f735d73 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1035,6 +1035,45 @@ static void test_GetDiskInfoA(void) ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); } +static BOOL cache_entry_exists(const char *url) +{ + static char buf[10000]; + DWORD size = sizeof(buf); + BOOL ret; + + ret = GetUrlCacheEntryInfoA(url, (void*)buf, &size); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "GetUrlCacheEntryInfoA returned %x (%u)\n", ret, GetLastError()); + + return ret; +} + +static void test_trailing_slash(void) +{ + char filename[MAX_PATH]; + BYTE zero_byte = 0; + BOOL ret; + + static const FILETIME filetime_zero; + static char url_with_slash[] = "http://testing.cache.com/"; + + + ret = CreateUrlCacheEntryA(url_with_slash, 0, "html", filename, 0); + ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + + create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + + ret = CommitUrlCacheEntryA("Visited: http://testing.cache.com/", NULL, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); + ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); + + ok(cache_entry_exists("Visited: http://testing.cache.com/"), "cache entry does not exist\n"); + ok(!cache_entry_exists("Visited: http://testing.cache.com"), "cache entry exists\n"); + + ret = DeleteUrlCacheEntryA("Visited: http://testing.cache.com/"); + ok(ret, "DeleteCacheEntryA failed\n"); + DeleteFileA(filename); +} + START_TEST(urlcache) { HMODULE hdll; @@ -1058,4 +1097,5 @@ START_TEST(urlcache) test_urlcacheW(); test_FindCloseUrlCache(); test_GetDiskInfoA(); + test_trailing_slash(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f0a731b..3487aa8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1487,7 +1487,7 @@ static DWORD urlcache_hash_key(LPCSTR lpszKey) for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[(*lpszKey + i) & 0xFF]; - for (lpszKey++; *lpszKey && ((lpszKey[0] != '/') || (lpszKey[1] != 0)); lpszKey++) + for (lpszKey++; *lpszKey; lpszKey++) { for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[*lpszKey ^ key[i]];

1 0

Shuai Meng : vbscript/tests: Added tests for the subtype of TypeName.
by Alexandre Julliard July 16, 2014

July 16, 2014

Module: wine Branch: master Commit: 95db4ce751ca4393c7eb5f090056778f8da2c8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95db4ce751ca4393c7eb5f090… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Jul 15 23:06:01 2014 +0800 vbscript/tests: Added tests for the subtype of TypeName. --- dlls/vbscript/tests/api.vbs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0d27c8d..813f5e8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -845,17 +845,26 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) -Dim MyEmpty +Call ok(TypeName(Empty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(getVT(TypeName(Empty)) = "VT_BSTR", "getVT(TypeName(Empty)) = " & getVT(TypeName(Empty))) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(Null)) = "VT_BSTR", "getVT(TypeName(Null)) = " & getVT(TypeName(Null))) Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(getVT(TypeName(CByte(255))) = "VT_BSTR", "getVT(TypeName(CByte(255))) = " & getVT(TypeName(CByte(255)))) Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(getVT(TypeName(255)) = "VT_BSTR", "getVT(TypeName(255)) = " & getVT(TypeName(255))) Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(getVT(TypeName(32768)) = "VT_BSTR", "getVT(TypeName(32768)) = " & getVT(TypeName(32768))) Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(getVT(TypeName(CSng(0.5))) = "VT_BSTR", "getVT(TypeName(CSng(0.5))) = " & getVT(TypeName(CSng(0.5)))) Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(getVT(TypeName(-0.5)) = "VT_BSTR", "getVT(TypeName(-0.5)) = " & getVT(TypeName(-0.5))) Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(getVT(TypeName(CCur(0.5))) = "VT_BSTR", "getVT(TypeName(CCur(0.5))) = " & getVT(TypeName(CCur(0.5)))) Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5)))) Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) -Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) -Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty)))

1 0