June 2014 - Wine-commits - list.winehq.org

Alex Henrie : riched20: Consider adjacent runs when computing EN_LINK range.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 6b947701a763ba7fe141ffa2a080d4c04cd6a15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b947701a763ba7fe141ffa2a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 15 23:15:43 2014 -0600 riched20: Consider adjacent runs when computing EN_LINK range. --- dlls/riched20/editor.c | 21 +++++++++++++++- dlls/riched20/tests/editor.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0127616..2af2582 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3093,6 +3093,8 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) { /* The clicked run has CFE_LINK set */ + ME_DisplayItem *di; + info.nmhdr.hwndFrom = NULL; info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; @@ -3100,8 +3102,25 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM info.wParam = wParam; info.lParam = lParam; cursor.nOffset = 0; + + /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.len; + for (di = cursor.pRun->prev; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->prev) + { + info.chrg.cpMin -= di->member.run.len; + } + + /* find the last contiguous run with CFE_LINK set */ + info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; + for (di = cursor.pRun->next; + di && di->type == diRun && (di->member.run.style->fmt.dwMask & CFM_LINK) && (di->member.run.style->fmt.dwEffects & CFE_LINK); + di = di->next) + { + info.chrg.cpMax += di->member.run.len; + } + ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); } } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2a85357..5421614 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5937,6 +5937,62 @@ static void test_WM_NOTIFY(void) DestroyWindow(parent); } +static int cpMin_EN_LINK = -1; +static int cpMax_EN_LINK = -1; + +static LRESULT WINAPI EN_LINK_ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + ENLINK* enlink = (ENLINK*)lParam; + if(message == WM_NOTIFY && enlink->nmhdr.code == EN_LINK) + { + cpMin_EN_LINK = enlink->chrg.cpMin; + cpMax_EN_LINK = enlink->chrg.cpMax; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_EN_LINK(void) +{ + HWND parent; + WNDCLASSA cls; + HWND hwndRichedit_EN_LINK; + CHARFORMAT2A cf2; + + /* register class to capture WM_NOTIFY */ + cls.style = 0; + cls.lpfnWndProc = EN_LINK_ParentMsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "EN_LINK_ParentClass"; + if(!RegisterClassA(&cls)) assert(0); + + parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + hwndRichedit_EN_LINK = new_richedit(parent); + ok(hwndRichedit_EN_LINK != 0, "Failed to create edit window\n"); + + SendMessageA(hwndRichedit_EN_LINK, EM_SETEVENTMASK, 0, ENM_LINK); + + cf2.cbSize = sizeof(CHARFORMAT2A); + cf2.dwMask = CFM_LINK; + cf2.dwEffects = CFE_LINK; + SendMessageA(hwndRichedit_EN_LINK, EM_SETCHARFORMAT, 0, (LPARAM)&cf2); + /* mixing letters and numbers causes runs to be split */ + SendMessageA(hwndRichedit_EN_LINK, WM_SETTEXT, 0, (LPARAM)"link text with at least 2 runs"); + SendMessageA(hwndRichedit_EN_LINK, WM_LBUTTONDOWN, 0, MAKELPARAM(5, 5)); + ok(cpMin_EN_LINK == 0 && cpMax_EN_LINK == 31, "Expected link range [0,31) got [%i,%i)\n", cpMin_EN_LINK, cpMax_EN_LINK); + + DestroyWindow(hwndRichedit_EN_LINK); + DestroyWindow(parent); +} + static void test_undo_coalescing(void) { HWND hwnd; @@ -7565,6 +7621,7 @@ START_TEST( editor ) test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY(); + test_EN_LINK(); test_EM_AUTOURLDETECT(); test_eventMask(); test_undo_coalescing();

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush().
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: cfde833140bab044b68652efddbaf24a16736803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfde833140bab044b68652efd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:20 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateSolidColorBrush(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/brush.c | 150 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 9 +++ dlls/d2d1/render_target.c | 14 ++++- 4 files changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 4e106ad..ed451ef 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = d2d1 IMPORTS = uuid C_SRCS = \ + brush.c \ factory.c \ render_target.c diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c new file mode 100644 index 0000000..21fac12 --- /dev/null +++ b/dlls/d2d1/brush.c @@ -0,0 +1,150 @@ +/* + * 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_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1SolidColorBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1SolidColorBrush_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_solid_color_brush_AddRef(ID2D1SolidColorBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_Release(ID2D1SolidColorBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, brush); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_GetFactory(ID2D1SolidColorBrush *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBrush *iface, float opacity) +{ + FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColorBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); +} + +static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + + FIXME("iface %p, transform %p stub!\n", iface, transform); + + *transform = identity; +} + +static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrush *iface, const D2D1_COLOR_F *color) +{ + FIXME("iface %p, color %p stub!\n", iface, color); +} + +static D2D1_COLOR_F STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface) +{ + static const D2D1_COLOR_F black = {0.0f, 0.0f, 0.0f, 1.0f}; + + FIXME("iface %p stub!\n", iface); + + return black; +} + +static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = +{ + d2d_solid_color_brush_QueryInterface, + d2d_solid_color_brush_AddRef, + d2d_solid_color_brush_Release, + d2d_solid_color_brush_GetFactory, + d2d_solid_color_brush_SetOpacity, + d2d_solid_color_brush_SetTransform, + d2d_solid_color_brush_GetOpacity, + d2d_solid_color_brush_GetTransform, + d2d_solid_color_brush_SetColor, + d2d_solid_color_brush_GetColor, +}; + +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) +{ + FIXME("Ignoring brush properties.\n"); + + brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; + brush->refcount = 1; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5609db6..9e91728 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -33,4 +33,13 @@ struct d2d_d3d_render_target void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; +struct d2d_brush +{ + ID2D1Brush ID2D1Brush_iface; + LONG refcount; +}; + +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index be9c1b6..e8c56a0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -117,9 +117,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) { - FIXME("iface %p, color %p, desc %p, brush %p stub!\n", iface, color, desc, brush); + struct d2d_brush *object; - return E_NOTIMPL; + TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_solid_color_brush_init(object, iface, color, desc); + + TRACE("Created brush %p.\n", object); + *brush = (ID2D1SolidColorBrush *)&object->ID2D1Brush_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollection(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateGradientStopCollection().
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 22a20e4016794784a65f9878d3bad064b5ac60cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a20e4016794784a65f9878d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:21 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateGradientStopCollection(). --- dlls/d2d1/brush.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 10 +++++ dlls/d2d1/render_target.c | 14 +++++- 3 files changed, 125 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 21fac12..a7e6118 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -23,6 +23,109 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); +static inline struct d2d_gradient *impl_from_ID2D1GradientStopCollection(ID2D1GradientStopCollection *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_gradient, ID2D1GradientStopCollection_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_gradient_QueryInterface(ID2D1GradientStopCollection *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1GradientStopCollection) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1GradientStopCollection_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_gradient_AddRef(ID2D1GradientStopCollection *iface) +{ + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + ULONG refcount = InterlockedIncrement(&gradient->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection *iface) +{ + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + ULONG refcount = InterlockedDecrement(&gradient->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, gradient); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_gradient_GetFactory(ID2D1GradientStopCollection *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientStopCollection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, + D2D1_GRADIENT_STOP *stops, UINT32 stop_count) +{ + FIXME("iface %p, stops %p, stop_count %u stub!\n", iface, stops, stop_count); +} + +static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_GAMMA_1_0; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_gradient_GetExtendMode(ID2D1GradientStopCollection *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_EXTEND_MODE_CLAMP; +} + +static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = +{ + d2d_gradient_QueryInterface, + d2d_gradient_AddRef, + d2d_gradient_Release, + d2d_gradient_GetFactory, + d2d_gradient_GetGradientStopCount, + d2d_gradient_GetGradientStops, + d2d_gradient_GetColorInterpolationGamma, + d2d_gradient_GetExtendMode, +}; + +void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, + const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) +{ + FIXME("Ignoring gradient properties.\n"); + + gradient->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; + gradient->refcount = 1; +} + static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) { return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9e91728..4d32856 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -33,6 +33,16 @@ struct d2d_d3d_render_target void d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) DECLSPEC_HIDDEN; +struct d2d_gradient +{ + ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; + LONG refcount; +}; + +void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, + const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, + D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; + struct d2d_brush { ID2D1Brush ID2D1Brush_iface; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index e8c56a0..abf2fd8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -136,10 +136,20 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, ID2D1GradientStopCollection **gradient) { - FIXME("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p stub!\n", + struct d2d_gradient *object; + + TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", iface, stops, stop_count, gamma, extend_mode, gradient); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode); + + TRACE("Created gradient %p.\n", object); + *gradient = &object->ID2D1GradientStopCollection_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateLinearGradientBrush().
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 8583fc4a6c45e5170d803a93d53a7ab1705f58dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8583fc4a6c45e5170d803a93d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 16 13:13:22 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateLinearGradientBrush(). --- dlls/d2d1/brush.c | 164 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 3 + dlls/d2d1/render_target.c | 14 +++- 3 files changed, 177 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index a7e6118..d8b769b 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -126,6 +126,13 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->refcount = 1; } +static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) +{ + brush->ID2D1Brush_iface.lpVtbl = vtbl; + brush->refcount = 1; +} + static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface) { return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); @@ -248,6 +255,159 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *rend { FIXME("Ignoring brush properties.\n"); - brush->ID2D1Brush_iface.lpVtbl = (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl; - brush->refcount = 1; + d2d_brush_init(brush, render_target, desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); +} + +static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1LinearGradientBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1LinearGradientBrush_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_linear_gradient_brush_AddRef(ID2D1LinearGradientBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGradientBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, brush); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetFactory(ID2D1LinearGradientBrush *iface, + ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGradientBrush *iface, float opacity) +{ + FIXME("iface %p, opacity %.8e stub!\n", iface, opacity); +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1LinearGradientBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); +} + +static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearGradientBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0.0f; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1LinearGradientBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + + FIXME("iface %p, transform %p stub!\n", iface, transform); + + *transform = identity; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetStartPoint(ID2D1LinearGradientBrush *iface, + D2D1_POINT_2F start_point) +{ + FIXME("iface %p, start_point {%.8e, %.8e} stub!\n", iface, start_point.x, start_point.y); +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetEndPoint(ID2D1LinearGradientBrush *iface, + D2D1_POINT_2F end_point) +{ + FIXME("iface %p, end_point {%.8e, %.8e} stub!\n", iface, end_point.x, end_point.y); +} + +static D2D1_POINT_2F STDMETHODCALLTYPE d2d_linear_gradient_brush_GetStartPoint(ID2D1LinearGradientBrush *iface) +{ + static const D2D1_POINT_2F point = {0.0f, 0.0f}; + + FIXME("iface %p stub!\n", iface); + + return point; +} + +static D2D1_POINT_2F STDMETHODCALLTYPE d2d_linear_gradient_brush_GetEndPoint(ID2D1LinearGradientBrush *iface) +{ + static const D2D1_POINT_2F point = {0.0f, 0.0f}; + + FIXME("iface %p stub!\n", iface); + + return point; +} + +static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetGradientStopCollection(ID2D1LinearGradientBrush *iface, + ID2D1GradientStopCollection **gradient) +{ + FIXME("iface %p, gradient %p stub!\n", iface, gradient); + + *gradient = NULL; +} + +static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl = +{ + d2d_linear_gradient_brush_QueryInterface, + d2d_linear_gradient_brush_AddRef, + d2d_linear_gradient_brush_Release, + d2d_linear_gradient_brush_GetFactory, + d2d_linear_gradient_brush_SetOpacity, + d2d_linear_gradient_brush_SetTransform, + d2d_linear_gradient_brush_GetOpacity, + d2d_linear_gradient_brush_GetTransform, + d2d_linear_gradient_brush_SetStartPoint, + d2d_linear_gradient_brush_SetEndPoint, + d2d_linear_gradient_brush_GetStartPoint, + d2d_linear_gradient_brush_GetEndPoint, + d2d_linear_gradient_brush_GetGradientStopCollection, +}; + +void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient) +{ + FIXME("Ignoring brush properties.\n"); + + d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4d32856..2bcb594 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -51,5 +51,8 @@ struct d2d_brush void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) DECLSPEC_HIDDEN; +void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index abf2fd8..34ed063 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -156,10 +156,20 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, ID2D1LinearGradientBrush **brush) { - FIXME("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p stub!\n", + struct d2d_brush *object; + + TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n", iface, gradient_brush_desc, brush_desc, gradient, brush); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_linear_gradient_brush_init(object, iface, gradient_brush_desc, brush_desc, gradient); + + TRACE("Created brush %p.\n", object); + *brush = (ID2D1LinearGradientBrush *)&object->ID2D1Brush_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush(ID2D1RenderTarget *iface,

1 0

Francois Gouget : ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 809b6aeab2c6cfa4ec2a24137f316353fd28f37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=809b6aeab2c6cfa4ec2a24137… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 16 18:23:41 2014 +0200 ole32: Fix StorageImpl_LockRegionSync() to actually wait between locking attempts. --- dlls/ole32/storage32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 757138d..f425d87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2874,6 +2874,7 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs ULARGE_INTEGER cb, DWORD dwLockType) { HRESULT hr; + int delay = 0; /* if it's a FileLockBytesImpl use LockFileEx in blocking mode */ if (SUCCEEDED(FileLockBytesImpl_LockRegionSync(This->lockBytes, offset, cb))) @@ -2882,8 +2883,6 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs /* otherwise we have to fake it based on an async lock */ do { - int delay=0; - hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); if (hr == STG_E_ACCESSDENIED)

1 0

Sebastian Lackner : msvcr110: Fix typo in exported symbol _set_SSE2_enable.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 25b069c4d84a09a5d17b92d8ff28db6f5be2d377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b069c4d84a09a5d17b92d8f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 17 00:21:35 2014 +0200 msvcr110: Fix typo in exported symbol _set_SSE2_enable. --- dlls/msvcr110/msvcr110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4f89b24..d6e5efe 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1623,7 +1623,7 @@ @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) -@ cdecl -arch=i386 __set_SSE2_enable(long) MSVCRT__set_SSE2_enable +@ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Sebastian Lackner : user32: Avoid race-condition when unloading module while hook is still active.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: e9fbcc8360e9dcdc51add3efb9d0581c63a6cd09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fbcc8360e9dcdc51add3efb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 13 20:35:41 2014 +0200 user32: Avoid race-condition when unloading module while hook is still active. Based on a patch by Sam Revitch. --- dlls/user32/hook.c | 16 ++++++++++++---- dlls/user32/message.c | 5 ++++- dlls/user32/user_private.h | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 633704b..2f6b42c 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -359,11 +359,13 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L * * Retrieve the hook procedure real value for a module-relative proc */ -void *get_hook_proc( void *proc, const WCHAR *module ) +void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) { HMODULE mod; - if (!(mod = GetModuleHandleW(module))) + GetModuleHandleExW( 0, module, &mod ); + *free_module = mod; + if (!mod) { TRACE( "loading %s\n", debugstr_w(module) ); /* FIXME: the library will never be freed */ @@ -411,12 +413,13 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } else if (info->proc) { + HMODULE free_module = 0; TRACE( "calling hook %p %s code %x wp %lx lp %lx module %s\n", info->proc, hook_names[info->id-WH_MINHOOK], code, wparam, lparam, debugstr_w(info->module) ); if (!info->module[0] || - (info->proc = get_hook_proc( info->proc, info->module )) != NULL) + (info->proc = get_hook_proc( info->proc, info->module, &free_module )) != NULL) { struct user_thread_info *thread_info = get_user_thread_info(); HHOOK prev = thread_info->hook; @@ -428,6 +431,8 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA info->prev_unicode, info->next_unicode ); thread_info->hook = prev; thread_info->hook_unicode = prev_unicode; + + if (free_module) FreeLibrary(free_module); } } @@ -897,10 +902,11 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id WINEVENTPROC proc = info.proc; if (proc) { + HMODULE free_module = 0; TRACE( "calling WH_WINEVENT hook %p event %x hwnd %p %x %x module %s\n", proc, event, hwnd, object_id, child_id, debugstr_w(info.module) ); - if (!info.module[0] || (proc = get_hook_proc( proc, info.module )) != NULL) + if (!info.module[0] || (proc = get_hook_proc( proc, info.module, &free_module )) != NULL) { if (TRACE_ON(relay)) DPRINTF( "%04x:Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", @@ -914,6 +920,8 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id DPRINTF( "%04x:Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", GetCurrentThreadId(), proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); + + if (free_module) FreeLibrary(free_module); } } else diff --git a/dlls/user32/message.c b/dlls/user32/message.c index be5d995..3167a2f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2815,6 +2815,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (size >= sizeof(msg_data->winevent)) { WINEVENTPROC hook_proc; + HMODULE free_module = 0; hook_proc = wine_server_get_ptr( msg_data->winevent.hook_proc ); size -= sizeof(msg_data->winevent); @@ -2825,7 +2826,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags size = min( size, (MAX_PATH - 1) * sizeof(WCHAR) ); memcpy( module, &msg_data->winevent + 1, size ); module[size / sizeof(WCHAR)] = 0; - if (!(hook_proc = get_hook_proc( hook_proc, module ))) + if (!(hook_proc = get_hook_proc( hook_proc, module, &free_module ))) { ERR( "invalid winevent hook module name %s\n", debugstr_w(module) ); continue; @@ -2847,6 +2848,8 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags GetCurrentThreadId(), hook_proc, msg_data->winevent.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time); + + if (free_module) FreeLibrary(free_module); } continue; case MSG_HOOK_LL: diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 2bb869a..adf3f7d 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -225,7 +225,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, struct window_surface *new_surface, const RECT *visible_rect, const RECT *old_visible_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; -extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; +extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN;

1 0

Sebastian Lackner : kernel32: Raise DBG_PRINTEXCEPTION_C exception in OutputDebugStringA.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: 1b3d67aaceaa58cbe0dfc32d4b1cb0f4e17eaf23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3d67aaceaa58cbe0dfc32d4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 14 09:39:24 2014 +0200 kernel32: Raise DBG_PRINTEXCEPTION_C exception in OutputDebugStringA. --- dlls/kernel32/debugger.c | 21 +++++++++++++++++++++ dlls/ntdll/tests/exception.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/ntstatus.h | 1 + include/winnt.h | 1 + 4 files changed, 64 insertions(+) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 5300fb5..34ef30a 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -28,6 +28,7 @@ #include "wine/server.h" #include "kernel_private.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(debugstr); @@ -227,6 +228,11 @@ BOOL WINAPI DebugActiveProcessStop( DWORD pid ) return ret; } +static LONG WINAPI debug_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == DBG_PRINTEXCEPTION_C) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} /*********************************************************************** * OutputDebugStringA (KERNEL32.@) @@ -248,7 +254,22 @@ void WINAPI OutputDebugStringA( LPCSTR str ) if (!str) str = ""; + /* raise fake exception to make copy protections happy */ + __TRY + { + ULONG_PTR args[2]; + args[0] = strlen(str) + 1; + args[1] = (ULONG_PTR)str; + RaiseException( DBG_PRINTEXCEPTION_C, 0, 2, args ); + } + __EXCEPT(debug_exception_handler) + { + } + __ENDTRY + /* send string to attached debugger */ + /* FIXME should only send to debugger if exception is not caught by user-mode application */ + SERVER_START_REQ( output_debug_string ) { req->string = wine_server_client_ptr( str ); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8a80928..05bc15c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1572,6 +1572,45 @@ static void test_dynamic_unwind(void) #endif /* __x86_64__ */ +static DWORD outputdebugstring_exceptions; + +static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == DBG_PRINTEXCEPTION_C, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, DBG_PRINTEXCEPTION_C); + ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 12, "ExceptionInformation[0] = %d instead of 12\n", (DWORD)rec->ExceptionInformation[0]); + ok(!strcmp((char *)rec->ExceptionInformation[1], "Hello World"), + "ExceptionInformation[1] = '%s' instead of 'Hello World'\n", (char *)rec->ExceptionInformation[1]); + + outputdebugstring_exceptions++; + return EXCEPTION_CONTINUE_SEARCH; +} + +static void test_outputdebugstring(void) +{ + PVOID vectored_handler; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &outputdebugstring_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + outputdebugstring_exceptions = 0; + OutputDebugStringA("Hello World"); + ok(outputdebugstring_exceptions == 1, "OutputDebugStringA generated %d exceptions, expected one\n", + outputdebugstring_exceptions); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1675,5 +1714,7 @@ START_TEST(exception) #endif + test_outputdebugstring(); + VirtualFree(code_mem, 0, MEM_FREE); } diff --git a/include/ntstatus.h b/include/ntstatus.h index 1eaae2d..9a7ca7a 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1211,6 +1211,7 @@ #define DBG_TERMINATE_THREAD ((NTSTATUS) 0x40010003) #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) +#define DBG_PRINTEXCEPTION_C ((NTSTATUS) 0x40010006) #define DBG_CONTROL_BREAK ((NTSTATUS) 0x40010008) #define DBG_COMMAND_EXCEPTION ((NTSTATUS) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS) 0x80010001) diff --git a/include/winnt.h b/include/winnt.h index 280cba0..e9e330d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -622,6 +622,7 @@ typedef DWORD FLONG; #define DBG_TERMINATE_THREAD ((DWORD) 0x40010003) #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005) +#define DBG_PRINTEXCEPTION_C ((DWORD) 0x40010006) #define DBG_CONTROL_BREAK ((DWORD) 0x40010008) #define DBG_COMMAND_EXCEPTION ((DWORD) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((DWORD) 0x80010001)

1 0

Alexandre Julliard : kernel32/tests: Silence some noisy traces.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: wine Branch: master Commit: c7eacd9e838fec7268220e02f7538d242e8fe0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7eacd9e838fec7268220e02f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 10:58:46 2014 +0200 kernel32/tests: Silence some noisy traces. --- dlls/kernel32/tests/locale.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 597de37..b4d8beb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3056,7 +3056,6 @@ static void test_EnumDateFormatsA(void) BOOL ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - trace("EnumDateFormatsA 0\n"); date_fmt_buf[0] = 0; SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, 0); @@ -3067,7 +3066,7 @@ static void test_EnumDateFormatsA(void) else { ok(ret, "EnumDateFormatsA(0) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(0): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); @@ -3075,7 +3074,6 @@ static void test_EnumDateFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } - trace("EnumDateFormatsA LOCALE_USE_CP_ACP\n"); date_fmt_buf[0] = 0; SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP); @@ -3086,7 +3084,7 @@ static void test_EnumDateFormatsA(void) else { ok(ret, "EnumDateFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(LOCALE_USE_CP_ACP): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); @@ -3094,29 +3092,26 @@ static void test_EnumDateFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } - trace("EnumDateFormatsA DATE_SHORTDATE\n"); date_fmt_buf[0] = 0; ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_SHORTDATE); ok(ret, "EnumDateFormatsA(DATE_SHORTDATE) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(DATE_SHORTDATE): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SSHORTDATE, buf, sizeof(buf)); ok(ret, "GetLocaleInfoA(LOCALE_SSHORTDATE) error %d\n", GetLastError()); ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); - trace("EnumDateFormatsA DATE_LONGDATE\n"); date_fmt_buf[0] = 0; ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_LONGDATE); ok(ret, "EnumDateFormatsA(DATE_LONGDATE) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(DATE_LONGDATE): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SLONGDATE, buf, sizeof(buf)); ok(ret, "GetLocaleInfoA(LOCALE_SLONGDATE) error %d\n", GetLastError()); ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); - trace("EnumDateFormatsA DATE_YEARMONTH\n"); date_fmt_buf[0] = 0; SetLastError(0xdeadbeef); ret = EnumDateFormatsA(enum_datetime_procA, lcid, DATE_YEARMONTH); @@ -3126,7 +3121,7 @@ static void test_EnumDateFormatsA(void) return; } ok(ret, "EnumDateFormatsA(DATE_YEARMONTH) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumDateFormatsA(DATE_YEARMONTH): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_SYEARMONTH, buf, sizeof(buf)); @@ -3141,22 +3136,20 @@ static void test_EnumTimeFormatsA(void) BOOL ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - trace("EnumTimeFormatsA 0\n"); date_fmt_buf[0] = 0; ret = EnumTimeFormatsA(enum_datetime_procA, lcid, 0); ok(ret, "EnumTimeFormatsA(0) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumTimeFormatsA(0): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT, buf, sizeof(buf)); ok(ret, "GetLocaleInfoA(LOCALE_STIMEFORMAT) error %d\n", GetLastError()); ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); - trace("EnumTimeFormatsA LOCALE_USE_CP_ACP\n"); date_fmt_buf[0] = 0; ret = EnumTimeFormatsA(enum_datetime_procA, lcid, LOCALE_USE_CP_ACP); ok(ret, "EnumTimeFormatsA(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); - trace("%s\n", date_fmt_buf); + trace("EnumTimeFormatsA(LOCALE_USE_CP_ACP): %s\n", date_fmt_buf); /* test the 1st enumerated format */ if ((p = strchr(date_fmt_buf, '\n'))) *p = 0; ret = GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT, buf, sizeof(buf));

1 0

Francois Gouget : testbot/WineRunTask: Standardize handling of WineRunTask 's arguments and add prototypes.
by Alexandre Julliard 17 Jun '14

17 Jun '14

Module: tools Branch: master Commit: 12189400e6a39e8cef0dd21443a51b7fabdd9bb8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12189400e6a39e8cef0dd214… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 16 12:18:19 2014 +0200 testbot/WineRunTask: Standardize handling of WineRunTask's arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The prototypes also document which arguments are optional. --- testbot/bin/WineRunTask.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 2413a76..86073e6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -88,7 +88,7 @@ sub FatalError($$$$$) exit 1; } -sub TakeScreenshot +sub TakeScreenshot($$) { my ($VM, $FullScreenshotFileName) = @_; @@ -111,9 +111,9 @@ sub TakeScreenshot } } -sub CountFailures +sub CountFailures($) { - my $ReportFileName = $_[0]; + my ($ReportFileName) = @_; if (! open REPORTFILE, "<$ReportFileName") {

1 0