May 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] d2d1: Add ID2D1Device stub.
by Nikolay Sivov May 15, 2018

May 15, 2018

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Comparing to what's in staging now, I renamed some things for consistency, and used existing source file. Same for device context, I think we should consider using render_target.c for it, or rename it to devicecontext.c. dlls/d2d1/factory.c | 143 +++++++++++++++++++++++++++++++++++++++++++- include/d2d1_1.idl | 61 ++++++++++++++++++- 2 files changed, 201 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c..1ea27614e4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,6 +30,135 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID2D1Device) + || IsEqualGUID(riid, &IID_ID2D1Resource) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *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 == 0) + { + 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, +}; + +static 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); +} + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -375,9 +504,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 1fbbb301dd..8f8b40b1d9 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 = 0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -77,6 +87,55 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0, + D2D1_COLOR_SPACE_SRGB = 1, + D2D1_COLOR_SPACE_SCRGB = 2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + FLOAT rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + +[ + 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), -- 2.17.0

1 1

[PATCH] user32: Simplify CheckMenuRadioItem().
by Huw Davies May 15, 2018

May 15, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/menu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5b83703ace..8c541cc4f9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5253,27 +5253,19 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, UINT check, UINT flags) { - POPUPMENU *first_menu = NULL, *check_menu = NULL; - UINT i, first_pos, check_pos; + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; BOOL done = FALSE; for (i = first; i <= last; i++) { MENUITEM *item; - if (!first_menu) - { - if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) - continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; - check_pos = first_pos; - check_menu = grab_menu_ptr(first_menu->obj.handle); - } - else - { - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - } + if (!first_menu) + first_menu = grab_menu_ptr(check_menu->obj.handle); if (first_menu != check_menu) { -- 2.16.2

1 0

[PATCH 3/3] mstask: Implement ITask::GetExitCode().
by Dmitry Timoshkov May 15, 2018

May 15, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 4bf916660e..d487aeb5a5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -59,10 +59,9 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; - DWORD priority, maxRunTime; + DWORD flags, priority, maxRunTime, exit_code; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -492,10 +491,12 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) { - FIXME("(%p, %p): stub\n", iface, exit_code); + TaskImpl *This = impl_from_ITask(iface); - *exit_code = 0; - return SCHED_S_TASK_HAS_NOT_RUN; + TRACE("(%p, %p)\n", iface, exit_code); + + *exit_code = This->exit_code; + return SCHED_S_TASK_HAS_NOT_RUN; /* FIXME */ } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) @@ -1073,6 +1074,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("maximum_runtime %u\n", fixed->maximum_runtime); This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); + This->exit_code = fixed->exit_code; TRACE("status %08x\n", fixed->status); This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); @@ -1428,7 +1430,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.idle_deadline = This->deadline_minutes; fixed.priority = This->priority; fixed.maximum_runtime = This->maxRunTime; - fixed.exit_code = 0; + fixed.exit_code = This->exit_code; if (This->status == SCHED_S_TASK_NOT_SCHEDULED && This->trigger_count) This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; @@ -1656,6 +1658,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->task_name = heap_strdupW(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; + This->exit_code = 0; This->idle_minutes = 10; This->deadline_minutes = 60; This->priority = NORMAL_PRIORITY_CLASS; -- 2.16.3

1 0

[PATCH 2/3] mstask: When writing triggers access the trigger data directly to avoid noise in the traces.
by Dmitry Timoshkov May 15, 2018

May 15, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5129d9a513..4bf916660e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1311,46 +1311,41 @@ static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) return WriteFile(hfile, data, data_size, &size, NULL); } -static HRESULT write_triggers(ITask *task, HANDLE hfile) +static HRESULT write_triggers(TaskImpl *This, HANDLE hfile) { WORD count, i, idx = 0xffff; DWORD size; - HRESULT hr; + HRESULT hr = S_OK; ITaskTrigger *trigger; - hr = ITask_GetTriggerCount(task, &count); - if (hr != S_OK) return hr; + count = This->trigger_count; /* Windows saves a .job with at least 1 trigger */ if (!count) { - hr = ITask_CreateTrigger(task, &idx, &trigger); + hr = ITask_CreateTrigger(&This->ITask_iface, &idx, &trigger); if (hr != S_OK) return hr; ITaskTrigger_Release(trigger); count = 1; } - if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); - - for (i = 0; i < count; i++) + if (WriteFile(hfile, &count, sizeof(count), &size, NULL)) { - TASK_TRIGGER task_trigger; - - hr = ITask_GetTrigger(task, i, &trigger); - if (hr != S_OK) return hr; - - hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); - ITaskTrigger_Release(trigger); - if (hr != S_OK) break; - - if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) + { + if (!WriteFile(hfile, &This->trigger[i], sizeof(This->trigger[0]), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + break; + } + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); if (idx != 0xffff) - ITask_DeleteTrigger(task, idx); + ITask_DeleteTrigger(&This->ITask_iface, idx); return hr; } @@ -1508,7 +1503,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta } /* Triggers */ - hr = write_triggers(task, hfile); + hr = write_triggers(This, hfile); if (hr != S_OK) goto failed; -- 2.16.3

1 0

[PATCH 1/3] mstask: Prefer built-in implementation.
by Dmitry Timoshkov May 15, 2018

May 15, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index e747af69e8..b028b151e8 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -41,8 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL; -- 2.16.3

1 0

[PATCH v2 2/5] msi/tests: More accurately calculate estimated size.
by Zebediah Figura May 15, 2018

May 15, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: query for page size dlls/msi/tests/action.c | 113 +++++++++++------------------------------------- 1 file changed, 26 insertions(+), 87 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 8e72ff4..849975d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2321,45 +2321,6 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, - "Expected %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); -} - -static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD expected5, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4 || - val == expected5, - "Expected %d, %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, expected5, val); -} - #define CHECK_REG_STR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, TRUE, __LINE__); @@ -2387,24 +2348,6 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e RegDeleteValueA(prodkey, name); \ } while(0) -#define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); - -#define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - do { \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - -#define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ - check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); - -#define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - do { \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2414,6 +2357,22 @@ static void get_date_str(LPSTR date) sprintf(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay); } +/* EstimatedSize is the size in KiB of .msi + installed files, rounded up to page size. */ +static DWORD get_estimated_size(void) +{ + SYSTEM_INFO si; + HANDLE file; + DWORD size; + + GetSystemInfo(&si); + + file = CreateFileA(msifile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + size = ((GetFileSize(file, NULL) + si.dwPageSize - 1) / si.dwPageSize + 1); + size = size * si.dwPageSize / 1024; + CloseHandle(file); + return size; +} + static void test_register_product(void) { UINT r; @@ -2505,9 +2464,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2547,9 +2504,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -2616,9 +2571,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2658,9 +2611,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -3525,9 +3476,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3631,9 +3580,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3714,9 +3661,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3774,9 +3719,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3834,9 +3777,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -20, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3917,9 +3858,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); -- 2.7.4

2 1

[PATCH] testbot/Engine: Don't delete the old logs when requeuing a Task.
by Francois Gouget May 15, 2018

May 15, 2018

This makes it possible to access its logs for diagnosis until it actually gets restarted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 0f8de82af..ce3509440 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -143,7 +143,6 @@ sub Cleanup($;$$) if ($Requeue) { LogMsg "Requeuing $TaskKey\n"; - $Task->RmTree(); $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); -- 2.17.0

1 0

[PATCH] testbot: Keep the old logs around.
by Francois Gouget May 15, 2018

May 15, 2018

This helps figure out why the test was rerun: was it because it timed out the first time around? Because there was a network glitch? Or because the TestBot script got stuck or died unexpectedly? The error message in the old logs will make it clear. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 27 +++++++++++- testbot/web/JobDetails.pl | 75 ++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 29 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 36cbfadbe..69d551b84 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -83,7 +83,32 @@ sub _SetupTask($$) my ($VM, $self) = @_; # Remove the previous run's files if any - $self->RmTree(); + my $Dir = $self->GetDir(); + if (-d $Dir) + { + mkpath("$Dir.new", 0, 0775); + rename "$Dir/log.old", "$Dir.new/log.old" if (-f "$Dir/log.old"); + rename "$Dir/err.old", "$Dir.new/err.old" if (-f "$Dir/err.old"); + foreach my $Filename ("log", "err") + { + if (open(my $Src, "<", "$Dir/$Filename")) + { + if (open(my $Dst, ">>", "$Dir.new/$Filename.old")) + { + print $Dst "----- Run ", ($self->TestFailures || 0), " $Filename\n"; + while (my $Line = <$Src>) + { + print $Dst $Line; + } + close($Dst); + } + close($Src); + } + } + + $self->RmTree(); + rename("$Dir.new", $Dir); + } # Capture Perl errors in the task's generic error log my $TaskDir = $self->CreateDir(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 0213eb5e2..4d9a77a57 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -249,16 +249,21 @@ sub GenerateBody($) $self->CGI->escapeHTML($VM->Details || "No details!"), "</details>\n"; - my $ScreenshotParamName = "scrshot_$Key"; my $FullLogParamName = "log_$Key"; - my $LogName = "$TaskDir/log"; - my $ErrName = "$TaskDir/err"; + my $FullLog = $self->GetParam($FullLogParamName); + $FullLog = "" if ($FullLog !~ /^[12]$/); + + my $ScreenshotParamName = "scrshot_$Key"; + my $Screenshot = $self->GetParam($ScreenshotParamName); + $Screenshot = "" if ($Screenshot ne "1"); + + print "<div class='TaskMoreInfoLinks'>\n"; # FIXME: Disable live screenshots for now if (0 && $StepTask->Status eq "running" && ($StepTask->Type eq "single" || $StepTask->Type eq "suite")) { - if (defined($self->GetParam($ScreenshotParamName))) + if ($Screenshot) { my $URI = "/Screenshot.pl?VMName=" . uri_escape($VM->Name); print "<div class='Screenshot'><img src='" . @@ -277,7 +282,7 @@ sub GenerateBody($) } elsif (-r "$TaskDir/screenshot.png") { - if (defined($self->GetParam($ScreenshotParamName))) + if ($Screenshot) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo) . @@ -289,10 +294,7 @@ sub GenerateBody($) { my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . "&$ScreenshotParamName=1"; - if (defined($self->GetParam($FullLogParamName))) - { - $URI .= "&$FullLogParamName=1"; - } + $URI .= "&$FullLogParamName=$FullLog"; $URI .= "#k" . uri_escape($Key); print "<div class='TaskMoreInfoLink'><a href='" . $self->CGI->escapeHTML($URI) . @@ -300,29 +302,46 @@ sub GenerateBody($) print "\n"; } } - my $FullLog = !1; - if (-r $LogName) + + my $LogName = "$TaskDir/log"; + my $ErrName = "$TaskDir/err"; + if (-r $LogName and $FullLog != "1") { - if (defined($self->GetParam($FullLogParamName))) - { - $FullLog = 1; - } - else - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=1"; - if (defined($self->GetParam($ScreenshotParamName))) - { - $URI .= "&$ScreenshotParamName=1"; - } - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show full log</a></div>\n"; - } + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . + "&$FullLogParamName=1"; + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show full log</a></div>\n"; + } + if ((-r $LogName or -r $ErrName) and $FullLog == "2") + { + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}); + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show latest log</a></div>\n"; + } + if ((-r "$LogName.old" or -r "$ErrName.old") and $FullLog != "2") + { + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . + "&$FullLogParamName=2"; + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show old logs</a></div>\n"; } print "</div>\n"; + if ($FullLog eq "2") + { + $LogName .= ".old"; + $ErrName .= ".old"; + } + if (open LOGFILE, "<$LogName") { my $HasLogEntries = !1; -- 2.17.0

1 0

[PATCH 2/2] d3d11: Return valid values for shader class instances
by Alistair Leslie-Hughes May 15, 2018

May 15, 2018

From: Lucian Poston <lucian.poston(a)gmail.com> Instead of returning garbage data for class instances, return 0 class instances. https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 6 ------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4d8760..5bc5018 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1522,6 +1522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) @@ -1577,6 +1579,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) @@ -1745,6 +1749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) @@ -2187,6 +2193,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) @@ -2294,6 +2302,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) @@ -2426,6 +2436,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1345b0e..72ca70f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9722,7 +9722,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9744,7 +9743,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9766,7 +9764,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9788,7 +9785,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9811,7 +9807,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9834,7 +9829,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) -- 1.9.1

1 0

[PATCH 1/2] d3d11: Test shader class instance count
by Alistair Leslie-Hughes May 15, 2018

May 15, 2018

From: Lucian Poston <lucian.poston(a)gmail.com> https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d11/tests/d3d11.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..1345b0e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9688,7 +9688,7 @@ static void test_clear_state(void) UINT sample_mask; UINT stencil_ref; ULONG refcount; - UINT count, i; + UINT count, i, instance_count; HRESULT hr; device_desc.feature_level = &feature_level; @@ -9719,8 +9719,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9738,8 +9741,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9757,8 +9763,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9776,8 +9785,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9796,8 +9808,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9816,8 +9831,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 1.9.1

1 0