wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Alistair Leslie-Hughes : include: Add more WM interfaces.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: b0f5c3a169ccbddfacd553391ba0ab92b548a26f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0f5c3a169ccbddfacd55339… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 21 05:31:34 2018 +0000 include: Add more WM interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1cbcd2..60d8b2c 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -495,6 +495,18 @@ interface IWMProfileManager : IUnknown [out] IWMProfile **ppProfile); } +[ + object, + uuid(7a924e51-73c1-494d-8019-23d37ed9b89a), + pointer_default(unique), + local +] +interface IWMProfileManager2 : IWMProfileManager +{ + HRESULT GetSystemProfileVersion(WMT_VERSION *version); + HRESULT SetSystemProfileVersion(WMT_VERSION version); +}; + cpp_quote("HRESULT WINAPI WMCreateProfileManager(IWMProfileManager**);") [ @@ -1615,6 +1627,73 @@ interface IWMReaderPlaylistBurn : IUnknown HRESULT EndPlaylistBurn([in] HRESULT result); } +[ + object, + uuid(72995a79-5090-42a4-9c8c-d9d0b6d34be5), + pointer_default(unique), + local +] +interface IWMPropertyVault : IUnknown +{ + HRESULT GetPropertyCount([in] DWORD *count); + + HRESULT GetPropertyByName( + [in] const WCHAR *name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *size )] BYTE *value, + [in, out] DWORD *size); + + HRESULT SetProperty( + [in] const WCHAR *name, + [in] WMT_ATTR_DATATYPE type, + [in] BYTE *value, + [in] DWORD size); + + HRESULT GetPropertyByIndex( + [in] DWORD index, + [out, size_is( *pdwNameLen )] WCHAR *name, + [in, out] DWORD *length, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *size )] BYTE *value, + [in, out] DWORD *size); + + HRESULT CopyPropertiesFrom([in] IWMPropertyVault *vault); + + HRESULT Clear(); +}; + +[ + object, + uuid(fc54a285-38c4-45b5-aa23-85b9f7cb424b), + pointer_default(unique), + local +] +interface IWMWriterPreprocess : IUnknown +{ + HRESULT GetMaxPreprocessingPasses( + [in] DWORD input, + [in] DWORD flags, + [out] DWORD *passes); + + HRESULT SetNumPreprocessingPasses( + [in] DWORD input, + [in] DWORD flags, + [in] DWORD passes); + + HRESULT BeginPreprocessingPass( + [in] DWORD input, + [in] DWORD flags); + + HRESULT PreprocessSample( + [in] DWORD input, + [in] QWORD sample_time, + [in] DWORD flags, + [in] INSSBuffer *sample); + + HRESULT EndPreprocessingPass( + [in] DWORD input, + [in] DWORD flags); +}; cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Gijs Vermeulen : include: Add DOF_* definitions.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 223a2099f4d47940394e27d3589c8b5b69e05fd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223a2099f4d47940394e27d3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 18 18:52:03 2018 +0200 include: Add DOF_* definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d0893a4..8e9e91b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2158,6 +2158,13 @@ typedef struct tagDROPSTRUCT DWORD dwControlData; } DROPSTRUCT, *PDROPSTRUCT, *LPDROPSTRUCT; +#define DOF_EXECUTABLE 0x8001 +#define DOF_DOCUMENT 0x8002 +#define DOF_DIRECTORY 0x8003 +#define DOF_MULTIPLE 0x8004 +#define DOF_PROGMAN 0x0001 +#define DOF_SHELLDATA 0x0002 + /* modifiers for RegisterHotKey */ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002

1 0

Zebediah Figura : d3d11: Implement depth clip control.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 19f2c4473b9d501c9d91347d50775739cf9456f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f2c4473b9d501c9d91347d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 19 21:08:19 2018 +0430 d3d11: Implement depth clip control. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 -- dlls/d3d11/device.c | 3 --- dlls/d3d11/state.c | 1 + dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/context.c | 2 +- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/state.c | 28 +++++++++++++++++++++++----- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 6 +++--- include/wine/wined3d.h | 1 + 12 files changed, 35 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19f2c4473b9d501c9d91…

1 0

Nikolay Sivov : d2d1/tests: Add a simple test for creating d2d devices.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: e202a9ea25363eaed3be9d155f96a34061e69ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e202a9ea25363eaed3be9d15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 19 21:08:18 2018 +0430 d2d1/tests: Add a simple test for creating d2d devices. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f833294..8299ceb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -19,7 +19,7 @@ #define COBJMACROS #include <limits.h> #include <math.h> -#include "d2d1.h" +#include "d2d1_1.h" #include "wincrypt.h" #include "wine/test.h" #include "initguid.h" @@ -6426,6 +6426,47 @@ static void test_bezier_intersect(void) DestroyWindow(window); } +static void test_create_device(void) +{ + ID3D10Device1 *d3d_device; + IDXGIDevice *dxgi_device; + ID2D1Factory1 *factory; + ID2D1Factory *factory2; + ID2D1Device *device; + ULONG refcount; + HRESULT hr; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + + ID2D1Device_GetFactory(device, &factory2); + ok(factory2 == (ID2D1Factory *)factory, "Got unexpected factory %p, expected %p.\n", factory2, factory); + ID2D1Factory_Release(factory2); + ID2D1Device_Release(device); + + IDXGIDevice_Release(dxgi_device); + ID3D10Device1_Release(d3d_device); + + refcount = ID2D1Factory1_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + START_TEST(d2d1) { test_clip(); @@ -6454,4 +6495,5 @@ START_TEST(d2d1) test_gdi_interop(); test_layer(); test_bezier_intersect(); + test_create_device(); }

1 0

Lucian Poston : d2d1: Add ID2D1Device stub.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 02603467e942c7318ef418bc80af803e329c8c11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02603467e942c7318ef418bc… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Sat May 19 21:08:17 2018 +0430 d2d1: Add ID2D1Device stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 +++ dlls/d2d1/{render_target.c => device.c} | 121 ++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 14 +++- include/d2d1_1.idl | 61 +++++++++++++++- 5 files changed, 204 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 20d3f26..4bfe3b5 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,12 +8,12 @@ C_SRCS = \ bitmap_render_target.c \ brush.c \ dc_render_target.c \ + device.c \ factory.c \ geometry.c \ hwnd_render_target.c \ layer.c \ mesh.c \ - render_target.c \ state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dbfb83c..21e2b88 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,16 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/device.c similarity index 97% rename from dlls/d2d1/render_target.c rename to dlls/d2d1/device.c index 7afbc84..f74e9f8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/device.c @@ -38,6 +38,11 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -3289,3 +3294,119 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 return S_OK; } + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Device) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Device_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 WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc85..7810e95 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -375,9 +375,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb30..2b1ef2e 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0x0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 0x1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -50,6 +60,22 @@ typedef enum D2D1_UNIT_MODE D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, } D2D1_UNIT_MODE; +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0x0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 0x1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 0x2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0x0, + D2D1_COLOR_SPACE_SRGB = 0x1, + D2D1_COLOR_SPACE_SCRGB = 0x2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 @@ -75,10 +101,43 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 D2D1_UNIT_MODE unitMode; } D2D1_DRAWING_STATE_DESCRIPTION1; +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + float rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + +[ + object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), local, ]

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for TDN_TIMER notification.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: f267a3606983adbdd8fa99fbafca33c9e3f02976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f267a3606983adbdd8fa99fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat May 19 18:28:19 2018 +0300 comctl32/taskdialog: Add support for TDN_TIMER notification. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 22 +++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 52 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 644f60f..ec04485 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -48,10 +48,13 @@ static const UINT DIALOG_MIN_WIDTH = 240; static const UINT DIALOG_SPACING = 5; static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; +static const UINT DIALOG_TIMER_MS = 200; static const UINT ID_MAIN_INSTRUCTION = 0xf000; static const UINT ID_CONTENT = 0xf001; +static const UINT ID_TIMER = 1; + struct taskdialog_control { struct list entry; @@ -85,6 +88,7 @@ struct taskdialog_info { HWND hwnd; const TASKDIALOGCONFIG *taskconfig; + DWORD last_timer_tick; }; static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) @@ -535,7 +539,15 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) { + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + dialog_info->hwnd = hwnd; + + if (taskconfig->dwFlags & TDF_CALLBACK_TIMER) + { + SetTimer(hwnd, ID_TIMER, DIALOG_TIMER_MS, NULL); + dialog_info->last_timer_tick = GetTickCount(); + } } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -574,9 +586,19 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_HELP: taskdialog_notify(dialog_info, TDN_HELP, 0, 0); break; + case WM_TIMER: + if (ID_TIMER == wParam) + { + DWORD elapsed = GetTickCount() - dialog_info->last_timer_tick; + if (taskdialog_notify(dialog_info, TDN_TIMER, elapsed, 0) == S_FALSE) + dialog_info->last_timer_tick = GetTickCount(); + } + break; case WM_DESTROY: taskdialog_notify(dialog_info, TDN_DESTROYED, 0, 0); RemovePropW(hwnd, taskdialog_info_propnameW); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) + KillTimer(hwnd, ID_TIMER); break; default: return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index ad45555..432b89b 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -323,6 +323,57 @@ static void test_help(void) run_test(&info, IDOK, msg_got_tdn_help, "send f1"); } +struct timer_notification_data +{ + DWORD last_elapsed_ms; + DWORD num_fired; +}; + +static HRESULT CALLBACK taskdialog_callback_proc_timer(HWND hwnd, UINT notification, + WPARAM wParam, LPARAM lParam, LONG_PTR ref_data) +{ + struct timer_notification_data *data = (struct timer_notification_data *)ref_data; + + if (notification == TDN_TIMER) + { + DWORD elapsed_ms; + int delta; + + elapsed_ms = (DWORD)wParam; + + if (data->num_fired == 3) + ok(data->last_elapsed_ms > elapsed_ms, "Expected reference time update.\n"); + else + { + delta = elapsed_ms - data->last_elapsed_ms; + ok(delta > 0, "Expected positive time tick difference.\n"); + } + data->last_elapsed_ms = elapsed_ms; + + if (data->num_fired == 3) + PostMessageW(hwnd, TDM_CLICK_BUTTON, IDOK, 0); + + ++data->num_fired; + return data->num_fired == 3 ? S_FALSE : S_OK; + } + + return S_OK; +} + +static void test_timer(void) +{ + struct timer_notification_data data = { 0 }; + TASKDIALOGCONFIG info = { 0 }; + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc_timer; + info.lpCallbackData = (LONG_PTR)&data; + info.dwFlags = TDF_CALLBACK_TIMER; + info.dwCommonButtons = TDCBF_OK_BUTTON; + + pTaskDialogIndirect(&info, NULL, NULL, NULL); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -360,6 +411,7 @@ START_TEST(taskdialog) test_callback(); test_buttons(); test_help(); + test_timer(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Zhiyi Zhang : comctl32/taskdialog: Add a helper to initialize dialog data.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: be1b8c9e1e7cc0c523163b965b3ec6ee8b3699ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1b8c9e1e7cc0c523163b96… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat May 19 18:28:18 2018 +0300 comctl32/taskdialog: Add a helper to initialize dialog data. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ba19ed5..644f60f 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -533,6 +533,11 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD EndDialog(dialog_info->hwnd, command_id); } +static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) +{ + dialog_info->hwnd = hwnd; +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; @@ -550,9 +555,10 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; - dialog_info->hwnd = hwnd; - SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + taskdialog_init(dialog_info, hwnd); + + SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); break; case WM_SHOWWINDOW:

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Exit if we cannot replace the latest WineTest.
by Alexandre Julliard 21 May '18

21 May '18

Module: tools Branch: master Commit: 1e0aa12923fbb1801cbd0f0d2d2aac334d9c07b7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1e0aa12923fbb1801cbd0f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 21 08:11:07 2018 +0200 testbot/CheckForWinetestUpdate: Exit if we cannot replace the latest WineTest. Otherwise we would create jobs that test the old (presumably already tested) WineTest and the next CheckWinetestUpdate run will redo it all anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 37bd776..ff8c30c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -238,6 +238,8 @@ mkdir "$DataDir/latest"; if (!move($StagingFileName, $LatestFileName)) { LogMsg "Could not move '$StagingFileName' to '$LatestFileName': $!\n"; + unlink($StagingFileName); + exit 1; } utime time, $Response->last_modified, $LatestFileName;

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Hard link the latest WineTest.
by Alexandre Julliard 21 May '18

21 May '18

Module: tools Branch: master Commit: df0f0b69d4f8343cfbbf6a0c23078bd936651fb6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=df0f0b69d4f8343cfbbf6a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 21 08:10:52 2018 +0200 testbot/CheckForWinetestUpdate: Hard link the latest WineTest. This is ok because the latest WineTest executable is moved into place rather than being overwritten. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index a7abec7..37bd776 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -65,21 +65,10 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Bits) = @_; - # Create a copy in staging so it can then be moved into the job directory - my ($fh, $StagingFileName) = OpenNewFile("$DataDir/staging", "_$LatestBaseName"); - if (!$fh) - { - LogMsg "Could not create the staging file: $!\n"; - return 0; - } - if (!copy("$DataDir/latest/$LatestBaseName", $fh)) - { - LogMsg "Could not copy '$DataDir/latest/$LatestBaseName' to '$StagingFileName': $!\n"; - close($fh); - unlink($StagingFileName); - return 0; - } - close($fh); + # Create a hard link in staging so it can then be moved into the job + # directory. This is ok because the latest file is never overwritten. + my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName", + "$DataDir/staging", "_$LatestBaseName"); # First create a new job my $Jobs = CreateJobs();

1 0

Alex Henrie : comctl32/listview: Don' t invalidate when new style is same as old.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 8e9ea7a8a163147012908bad696a539454654d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e9ea7a8a163147012908bad… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 13 21:56:12 2018 -0600 comctl32/listview: Don't invalidate when new style is same as old. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 +++++--- dlls/comctl32/tests/listview.c | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d63c23a..200bf93 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11108,14 +11108,13 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - UINT uNewView = lpss->styleNew & LVS_TYPEMASK; - UINT uOldView = lpss->styleOld & LVS_TYPEMASK; + UINT uNewView, uOldView; UINT style; TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); - if (wStyleType != GWL_STYLE) return 0; + if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0; infoPtr->dwStyle = lpss->styleNew; @@ -11127,6 +11126,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, ((lpss->styleNew & WS_VSCROLL) == 0)) ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); + uNewView = lpss->styleNew & LVS_TYPEMASK; + uOldView = lpss->styleOld & LVS_TYPEMASK; + if (uNewView != uOldView) { HIMAGELIST himl; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c9a165c..c2d33c4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1781,6 +1781,7 @@ static void test_redraw(void) HDC hdc; BOOL res; DWORD r; + RECT rect; hwnd = create_listview_control(LVS_REPORT); subclass_header(hwnd); @@ -1838,6 +1839,13 @@ static void test_redraw(void) ReleaseDC(hwndparent, hdc); + /* test setting the window style to what it already was */ + UpdateWindow(hwnd); + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE)); + GetUpdateRect(hwnd, &rect, FALSE); + ok(rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0, + "Expected empty update rect, got %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018