August 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetFactory().
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 414d04e27de1ae8f4eb6bfba28b0221b7431f0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=414d04e27de1ae8f4eb6bfba2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 2 18:56:06 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetFactory(). --- dlls/d2d1/brush.c | 33 +++++++++++++++++++++------------ dlls/d2d1/d2d1_private.h | 7 ++++--- dlls/d2d1/render_target.c | 8 +++++--- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 36d0a51..857ec52 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -144,7 +144,13 @@ HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *rend return S_OK; } -static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, +static void d2d_brush_destroy(struct d2d_brush *brush) +{ + ID2D1Factory_Release(brush->factory); + HeapFree(GetProcessHeap(), 0, brush); +} + +static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, enum d2d_brush_type type, const D2D1_BRUSH_PROPERTIES *desc, const struct ID2D1BrushVtbl *vtbl) { static const D2D1_MATRIX_3X2_F identity = @@ -156,6 +162,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_ta brush->ID2D1Brush_iface.lpVtbl = vtbl; brush->refcount = 1; + ID2D1Factory_AddRef(brush->factory = factory); brush->opacity = desc ? desc->opacity : 1.0f; brush->transform = desc ? desc->transform : identity; brush->type = type; @@ -205,7 +212,7 @@ static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_Release(ID2D1SolidColorBrus TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, brush); + d2d_brush_destroy(brush); return refcount; } @@ -288,12 +295,12 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = d2d_solid_color_brush_GetColor, }; -void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) { FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, render_target, D2D_BRUSH_TYPE_SOLID, desc, + d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_SOLID, desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); brush->u.solid.color = *color; } @@ -342,7 +349,7 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGrad TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, brush); + d2d_brush_destroy(brush); return refcount; } @@ -444,13 +451,13 @@ static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl d2d_linear_gradient_brush_GetGradientStopCollection, }; -void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, +void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, 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, D2D_BRUSH_TYPE_LINEAR, brush_desc, + d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_LINEAR, brush_desc, (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); } @@ -503,7 +510,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); if (brush->u.bitmap.bitmap) ID2D1Bitmap_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface); - HeapFree(GetProcessHeap(), 0, brush); + d2d_brush_destroy(brush); } return refcount; @@ -512,9 +519,11 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) static void STDMETHODCALLTYPE d2d_bitmap_brush_GetFactory(ID2D1BitmapBrush *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); - *factory = NULL; + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = brush->factory); } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetOpacity(ID2D1BitmapBrush *iface, float opacity) @@ -668,13 +677,13 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = d2d_bitmap_brush_GetBitmap, }; -HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, +HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, &render_target->ID2D1RenderTarget_iface, D2D_BRUSH_TYPE_BITMAP, + d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); if ((brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap))) ID2D1Bitmap_AddRef(&brush->u.bitmap.bitmap->ID2D1Bitmap_iface); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index c7744a3..ebc97fc 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush ID2D1Brush ID2D1Brush_iface; LONG refcount; + ID2D1Factory *factory; float opacity; D2D1_MATRIX_3X2_F transform; @@ -146,12 +147,12 @@ struct d2d_brush } u; }; -void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, +void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, 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, +void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, +HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 438fced..6737948 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -426,7 +426,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_bitmap_brush_init(object, render_target, bitmap, bitmap_brush_desc, brush_desc))) + if (FAILED(hr = d2d_bitmap_brush_init(object, render_target->factory, bitmap, bitmap_brush_desc, brush_desc))) { WARN("Failed to initialize brush, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -442,6 +442,7 @@ 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) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_brush *object; TRACE("iface %p, color %p, desc %p, brush %p.\n", iface, color, desc, brush); @@ -449,7 +450,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2 if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_solid_color_brush_init(object, iface, color, desc); + d2d_solid_color_brush_init(object, render_target->factory, color, desc); TRACE("Created brush %p.\n", object); *brush = (ID2D1SolidColorBrush *)&object->ID2D1Brush_iface; @@ -487,6 +488,7 @@ 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) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_brush *object; TRACE("iface %p, gradient_brush_desc %p, brush_desc %p, gradient %p, brush %p.\n", @@ -495,7 +497,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush 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); + d2d_linear_gradient_brush_init(object, render_target->factory, gradient_brush_desc, brush_desc, gradient); TRACE("Created brush %p.\n", object); *brush = (ID2D1LinearGradientBrush *)&object->ID2D1Brush_iface;

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_GetFactory().
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 8b893839bcbcc5b21688897a3902ed5efee1cbd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b893839bcbcc5b21688897a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 2 18:56:07 2015 +0200 d2d1: Implement d2d_linear_gradient_brush_GetFactory(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 857ec52..464fd18 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -357,9 +357,11 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGrad static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetFactory(ID2D1LinearGradientBrush *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); - *factory = NULL; + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = brush->factory); } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGradientBrush *iface, float opacity)

1 0

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetFactory().
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 4e50527c17a004f4c3b5b6cc6957fb093983e041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e50527c17a004f4c3b5b6cc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 2 18:56:08 2015 +0200 d2d1: Implement d2d_solid_color_brush_GetFactory(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 464fd18..a2227fa 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -219,9 +219,11 @@ static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_Release(ID2D1SolidColorBrus static void STDMETHODCALLTYPE d2d_solid_color_brush_GetFactory(ID2D1SolidColorBrush *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - *factory = NULL; + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = brush->factory); } static void STDMETHODCALLTYPE d2d_solid_color_brush_SetOpacity(ID2D1SolidColorBrush *iface, float opacity)

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetFactory().
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 91b9ce69b723b4472d5471e311e80badb247428d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b9ce69b723b4472d5471e31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 2 18:56:09 2015 +0200 d2d1: Implement d2d_gradient_GetFactory(). --- dlls/d2d1/brush.c | 10 +++++++--- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/render_target.c | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index a2227fa..bf8746a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { HeapFree(GetProcessHeap(), 0, gradient->stops); + ID2D1Factory_Release(gradient->factory); HeapFree(GetProcessHeap(), 0, gradient); } @@ -76,9 +77,11 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection static void STDMETHODCALLTYPE d2d_gradient_GetFactory(ID2D1GradientStopCollection *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = gradient->factory); } static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientStopCollection *iface) @@ -128,13 +131,14 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = d2d_gradient_GetExtendMode, }; -HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, +HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1Factory *factory, 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; + ID2D1Factory_AddRef(gradient->factory = factory); gradient->stop_count = stop_count; if (!(gradient->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ebc97fc..3f2ac3e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -112,11 +112,12 @@ struct d2d_gradient ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + ID2D1Factory *factory; D2D1_GRADIENT_STOP *stops; UINT32 stop_count; }; -HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, +HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1Factory *factory, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 6737948..99cb7c8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -462,6 +462,7 @@ 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) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_gradient *object; HRESULT hr; @@ -471,7 +472,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode))) + if (FAILED(hr = d2d_gradient_init(object, render_target->factory, stops, stop_count, gamma, extend_mode))) { WARN("Failed to initialize gradient, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);

1 0

Nikolay Sivov : comdlg32/tests: Test that different IFileDialogCustomize IIDs return same pointer.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: da8fd0525163fb8e233ba50dc4719a541773da2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8fd0525163fb8e233ba50dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 2 23:52:23 2015 +0300 comdlg32/tests: Test that different IFileDialogCustomize IIDs return same pointer. --- dlls/comdlg32/tests/itemdlg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 9a3f851..ddf21f6 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -322,7 +322,7 @@ static BOOL test_instantiation(void) IFileSaveDialog *pfsd; IServiceProvider *psp; IOleWindow *pow; - IUnknown *punk; + IUnknown *punk, *unk2; HRESULT hr; LONG ref; @@ -331,7 +331,7 @@ static BOOL test_instantiation(void) &IID_IFileOpenDialog, (void**)&pfod); if(FAILED(hr)) { - skip("Could not instantiate the FileOpenDialog.\n"); + win_skip("Could not instantiate the FileOpenDialog.\n"); return FALSE; } ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -342,11 +342,12 @@ static BOOL test_instantiation(void) hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomize, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomizeAlt, (void**)&punk); + hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileDialogCustomizeAlt, (void**)&unk2); ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); + ok(punk == unk2, "got %p, %p\n", punk, unk2); + IUnknown_Release(punk); + IUnknown_Release(unk2); hr = IFileOpenDialog_QueryInterface(pfod, &IID_IFileSaveDialog, (void**)&pfsd); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr); @@ -448,11 +449,12 @@ static BOOL test_instantiation(void) hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomize, (void**)&punk); ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomizeAlt, (void**)&punk); + hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileDialogCustomizeAlt, (void**)&unk2); ok(hr == S_OK, "got 0x%08x.\n", hr); - if(SUCCEEDED(hr)) IUnknown_Release(punk); + ok(punk == unk2, "got %p, %p\n", punk, unk2); + IUnknown_Release(punk); + IUnknown_Release(unk2); hr = IFileSaveDialog_QueryInterface(pfsd, &IID_IFileOpenDialog, (void**)&pfod); ok(hr == E_NOINTERFACE, "got 0x%08x.\n", hr);

1 0

Nikolay Sivov : shell32/ebrowser: Use proper color for pane separator.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 118c46959828fbf16208103dd3c6a8c1b159739d URL: http://source.winehq.org/git/wine.git/?a=commit;h=118c46959828fbf16208103dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 2 23:52:43 2015 +0300 shell32/ebrowser: Use proper color for pane separator. --- dlls/shell32/ebrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index afeb821..d50a4fc 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -704,7 +704,7 @@ static void initialize_navpane(ExplorerBrowserImpl *This, HWND hwnd_parent, RECT wc.hInstance = shell32_hInstance; wc.hIcon = 0; wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_SIZEWE); - wc.hbrBackground = (HBRUSH)(COLOR_HIGHLIGHT + 1); + wc.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wc.lpszMenuName = NULL; wc.lpszClassName = navpane_classname;

1 0

Nikolay Sivov : shell32/ebrowser: Implement EBO_NOBORDER option.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: e46c32ab46029492c28534b5a7adeb5f81ff7b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46c32ab46029492c28534b5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 2 23:53:03 2015 +0300 shell32/ebrowser: Implement EBO_NOBORDER option. --- dlls/shell32/ebrowser.c | 6 ++++-- dlls/shell32/tests/ebrowser.c | 28 ++++++++++++++++++++++++++-- include/shobjidl.idl | 4 +++- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index d50a4fc..0cee30f 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -876,7 +876,9 @@ static HRESULT WINAPI IExplorerBrowser_fnInitialize(IExplorerBrowser *iface, if (!RegisterClassW(&wc)) return E_FAIL; } - style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER; + style = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; + if (!(This->eb_options & EBO_NOBORDER)) + style |= WS_BORDER; This->hwnd_main = CreateWindowExW(WS_EX_CONTROLPARENT, EB_CLASS_NAME, NULL, style, prc->left, prc->top, prc->right - prc->left, prc->bottom - prc->top, @@ -1030,7 +1032,7 @@ static HRESULT WINAPI IExplorerBrowser_fnSetOptions(IExplorerBrowser *iface, { ExplorerBrowserImpl *This = impl_from_IExplorerBrowser(iface); static const EXPLORER_BROWSER_OPTIONS unsupported_options = - EBO_ALWAYSNAVIGATE | EBO_NOWRAPPERWINDOW | EBO_HTMLSHAREPOINTVIEW; + EBO_ALWAYSNAVIGATE | EBO_NOWRAPPERWINDOW | EBO_HTMLSHAREPOINTVIEW | EBO_NOPERSISTVIEWSTATE; TRACE("%p (0x%x)\n", This, dwFlag); diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c9d81a4..7a01d56 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -759,8 +759,10 @@ static void test_initialization(void) { IExplorerBrowser *peb; IShellBrowser *psb; + HWND eb_hwnd; HRESULT hr; ULONG lres; + LONG style; RECT rc; ebrowser_instantiate(&peb); @@ -807,10 +809,9 @@ static void test_initialization(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - HWND eb_hwnd; RECT eb_rc; char buf[1024]; - LONG style, expected_style; + LONG expected_style; static const RECT exp_rc = {0, 0, 48, 58}; hr = IShellBrowser_GetWindow(psb, &eb_hwnd); @@ -856,6 +857,29 @@ static void test_initialization(void) ok(lres == 0, "Got refcount %d\n", lres); } + /* check window style with EBO_NOBORDER */ + ebrowser_instantiate(&peb); + hr = IExplorerBrowser_SetOptions(peb, EBO_NOBORDER); + ok(hr == S_OK, "got 0x%08x\n", hr); + rc.left = 50; rc.top = 20; rc.right = 100; rc.bottom = 80; + + hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = IShellBrowser_GetWindow(psb, &eb_hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + style = GetWindowLongPtrW(eb_hwnd, GWL_STYLE); + ok(!(style & WS_BORDER) || broken(style & WS_BORDER) /* before win8 */, "got style 0x%08x\n", style); + + IShellBrowser_Release(psb); + IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); + + /* empty rectangle */ ebrowser_instantiate(&peb); rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 455045d..b021178 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2258,7 +2258,9 @@ typedef [v1_enum] enum tagEXPLORER_BROWSER_OPTIONS { EBO_ALWAYSNAVIGATE = 0x04, EBO_NOTRAVELLOG = 0x08, EBO_NOWRAPPERWINDOW = 0x10, - EBO_HTMLSHAREPOINTVIEW = 0x20 + EBO_HTMLSHAREPOINTVIEW = 0x20, + EBO_NOBORDER = 0x40, + EBO_NOPERSISTVIEWSTATE = 0x80, } EXPLORER_BROWSER_OPTIONS; cpp_quote("#define SID_SExplorerBrowserFrame IID_ICommDlgBrowser")

1 0

Nikolay Sivov : comdlg32: Remove browser border for common item dialog.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: ae2794eac9ed621af01b41b07d241048ec69ae63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2794eac9ed621af01b41b07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 2 23:53:27 2015 +0300 comdlg32: Remove browser border for common item dialog. --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index b5093b8..99448eb 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1418,7 +1418,7 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This) return hr; } - IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES); + IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES | EBO_NOBORDER); hr = IExplorerBrowser_Initialize(This->peb, This->dlg_hwnd, &rc, NULL); if(FAILED(hr))

1 0

Nikolay Sivov : comdlg32: Remove some casts.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 9da369b4554a6bf7c53de180147403a721db88fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da369b4554a6bf7c53de1801… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 2 23:53:56 2015 +0300 comdlg32: Remove some casts. --- dlls/comdlg32/itemdlg.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 99448eb..d1a52cd 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1194,7 +1194,7 @@ static HRESULT init_custom_controls(FileDialogImpl *This) This->cctrls_hwnd = CreateWindowExW(0, ctrl_container_classname, NULL, WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, NULL, 0, - COMDLG32_hInstance, (void*)This); + COMDLG32_hInstance, This); if(!This->cctrls_hwnd) return E_FAIL; @@ -1403,6 +1403,7 @@ static void update_layout(FileDialogImpl *This) static HRESULT init_explorerbrowser(FileDialogImpl *This) { IShellItem *psi_folder; + IObjectWithSite *client; FOLDERSETTINGS fos; RECT rc = {0}; HRESULT hr; @@ -1439,9 +1440,14 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This) IExplorerBrowser_SetFolderSettings(This->peb, &fos); - hr = IUnknown_SetSite((IUnknown*)This->peb, (IUnknown*)This); - if(FAILED(hr)) - ERR("SetSite (ExplorerBrowser) failed.\n"); + hr = IExplorerBrowser_QueryInterface(This->peb, &IID_IObjectWithSite, (void**)&client); + if (hr == S_OK) + { + hr = IObjectWithSite_SetSite(client, (IUnknown*)&This->IFileDialog2_iface); + IObjectWithSite_Release(client); + if(FAILED(hr)) + ERR("SetSite failed, 0x%08x\n", hr); + } /* Browse somewhere */ psi_folder = This->psi_setfolder ? This->psi_setfolder : This->psi_defaultfolder; @@ -3829,12 +3835,12 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p if(FAILED(hr)) { ERR("Failed to initialize custom controls (0x%08x).\n", hr); - IUnknown_Release((IUnknown*)fdimpl); + IFileDialog2_Release(&fdimpl->IFileDialog2_iface); return E_FAIL; } - hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv); - IUnknown_Release((IUnknown*)fdimpl); + hr = IFileDialog2_QueryInterface(&fdimpl->IFileDialog2_iface, riid, ppv); + IFileDialog2_Release(&fdimpl->IFileDialog2_iface); return hr; }

1 0

Nikolay Sivov : dwrite: Fix outline translation before rendering.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: dc75b34ddf2cc5601676dabe40f64d76cd985145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc75b34ddf2cc5601676dabe4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 2 23:47:24 2015 +0300 dwrite: Fix outline translation before rendering. --- dlls/dwrite/freetype.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 711d601..2c02b26 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -70,7 +70,10 @@ MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Library_Version); MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_New_Memory_Face); +MAKE_FUNCPTR(FT_Outline_Copy); +MAKE_FUNCPTR(FT_Outline_Done); MAKE_FUNCPTR(FT_Outline_Get_Bitmap); +MAKE_FUNCPTR(FT_Outline_New); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); MAKE_FUNCPTR(FTC_CMapCache_Lookup); @@ -148,7 +151,10 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FT_Library_Version) LOAD_FUNCPTR(FT_Load_Glyph) LOAD_FUNCPTR(FT_New_Memory_Face) + LOAD_FUNCPTR(FT_Outline_Copy) + LOAD_FUNCPTR(FT_Outline_Done) LOAD_FUNCPTR(FT_Outline_Get_Bitmap) + LOAD_FUNCPTR(FT_Outline_New) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) LOAD_FUNCPTR(FTC_CMapCache_Lookup) @@ -509,8 +515,9 @@ void freetype_get_glyph_bitmap(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) { FT_OutlineGlyph outline = (FT_OutlineGlyph)glyph; - + const FT_Outline *src = &outline->outline; FT_Bitmap ft_bitmap; + FT_Outline copy; ft_bitmap.width = width; ft_bitmap.rows = height; @@ -518,11 +525,14 @@ void freetype_get_glyph_bitmap(IDWriteFontFace2 *fontface, FLOAT emSize, UINT16 ft_bitmap.pixel_mode = FT_PIXEL_MODE_MONO; ft_bitmap.buffer = buf; - pFT_Outline_Translate(&outline->outline, -bbox->left, -bbox->bottom); - /* Note: FreeType will only set 'black' bits for us. */ memset(buf, 0, height*pitch); - pFT_Outline_Get_Bitmap(library, &outline->outline, &ft_bitmap); + if (pFT_Outline_New(library, src->n_points, src->n_contours, &copy) == 0) { + pFT_Outline_Copy(src, &copy); + pFT_Outline_Translate(&copy, -bbox->left << 6, bbox->bottom << 6); + pFT_Outline_Get_Bitmap(library, &copy, &ft_bitmap); + pFT_Outline_Done(library, &copy); + } } else if (glyph->format == FT_GLYPH_FORMAT_BITMAP) { FT_Bitmap *bitmap = &((FT_BitmapGlyph)glyph)->bitmap;

1 0