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

Hugh McMaster : regedit: Do not directly include stdio.h any longer.
by Alexandre Julliard May 21, 2018

May 21, 2018

Module: wine Branch: master Commit: a926e05446207b3babb77d91f187a5646b84d7fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a926e05446207b3babb77d91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 21 13:34:59 2018 +0000 regedit: Do not directly include stdio.h any longer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 - programs/regedit/edit.c | 1 - programs/regedit/framewnd.c | 1 - programs/regedit/hexedit.c | 1 - programs/regedit/listview.c | 1 - programs/regedit/main.c | 1 - programs/regedit/regedit.c | 1 - programs/regedit/regproc.c | 1 - programs/regedit/treeview.c | 1 - 9 files changed, 9 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 56ef59d..d8431f1 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -21,7 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <commctrl.h> -#include <stdio.h> #include "main.h" diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 198b8ed..03bfdbd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -25,7 +25,6 @@ #include <commdlg.h> #include <cderr.h> #include <stdlib.h> -#include <stdio.h> #include <shellapi.h> #include <shlwapi.h> diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 99f7686..a6777fa 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -25,7 +25,6 @@ #include <commdlg.h> #include <cderr.h> #include <stdlib.h> -#include <stdio.h> #include <shellapi.h> #include "main.h" diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 0d28388..e082e93 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -24,7 +24,6 @@ */ #include <stdarg.h> -#include <stdio.h> #include <string.h> #include <assert.h> diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index e8bfb52..f42f9c2 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -23,7 +23,6 @@ #include <winternl.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include "main.h" #include "wine/heap.h" diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 62fd616..80f9350 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -22,7 +22,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include <fcntl.h> #include "wine/debug.h" diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7469a90..68001be 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> #include <stdlib.h> #include <windows.h> #include <commctrl.h> diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c4900e6..2dbbd10 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -22,7 +22,6 @@ */ #include <errno.h> -#include <stdio.h> #include <stdlib.h> #include <fcntl.h> #include <io.h> diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 9d75a31..d5a6767 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -26,7 +26,6 @@ #include <windows.h> #include <commctrl.h> #include <stdlib.h> -#include <stdio.h> #include <wine/debug.h> #include <shlwapi.h>

1 0

Hugh McMaster : regedit: Simplify the detection of existing registry values.
by Alexandre Julliard May 21, 2018

May 21, 2018

Module: wine Branch: master Commit: b24ee836bd8fef2cc960312d2b2b565c407b0907 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b24ee836bd8fef2cc960312d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 21 13:34:57 2018 +0000 regedit: Simplify the detection of existing registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 4307766..59221f4 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -184,12 +184,9 @@ static INT_PTR CALLBACK bin_modify_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wPara return FALSE; } -static BOOL check_value(HWND hwnd, HKEY hKey, LPCWSTR valueName) +static BOOL value_exists(HWND hwnd, HKEY hKey, const WCHAR *value_name) { - WCHAR empty = 0; - LONG lRet = RegQueryValueExW(hKey, valueName ? valueName : &empty, 0, NULL, 0, NULL); - if(lRet != ERROR_SUCCESS) return FALSE; - return TRUE; + return !RegQueryValueExW(hKey, value_name, NULL, NULL, NULL, NULL); } static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, LONG *len) @@ -508,8 +505,8 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } - /* check if the value already exists */ - if (check_value(hwnd, hKey, newName)) { + + if (value_exists(hwnd, hKey, newName)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done; }

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetNextRunTime() for DAILY trigger type.
by Alexandre Julliard May 21, 2018

May 21, 2018

Module: wine Branch: master Commit: 5443f0ee2b844030687e8521e6c8fd18f57fea95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5443f0ee2b844030687e8521… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 21 18:17:49 2018 +0800 mstask: Implement ITask::GetNextRunTime() for DAILY trigger type. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/mstask/tests/task_trigger.c | 18 +++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c004764..012bf48 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -445,6 +445,27 @@ static void get_end_time(const TASK_TRIGGER *trigger, FILETIME *ft) SystemTimeToFileTime(&st, ft); } +static void filetime_add_ms(FILETIME *ft, ULONGLONG ms) +{ + union u_ftll + { + FILETIME ft; + ULONGLONG ll; + } *ftll = (union u_ftll *)ft; + + ftll->ll += ms * (ULONGLONG)10000; +} + +static void filetime_add_hours(FILETIME *ft, ULONG hours) +{ + filetime_add_ms(ft, (ULONGLONG)hours * 60 * 60 * 1000); +} + +static void filetime_add_days(FILETIME *ft, ULONG days) +{ + filetime_add_hours(ft, (ULONGLONG)days * 24); +} + static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) { TaskImpl *This = impl_from_ITask(iface); @@ -483,6 +504,29 @@ static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *rt) } break; + case TASK_TIME_TRIGGER_DAILY: + st = current_st; + st.wHour = This->trigger[i].wStartHour; + st.wMinute = This->trigger[i].wStartMinute; + st.wSecond = 0; + st.wMilliseconds = 0; + SystemTimeToFileTime(&st, &current_ft); + while (CompareFileTime(&current_ft, &end_ft) < 0) + { + if (CompareFileTime(&current_ft, &begin_ft) >= 0) + { + if (!have_best_time || CompareFileTime(&current_ft, &best_ft) < 0) + { + best_ft = current_ft; + have_best_time = TRUE; + } + break; + } + + filetime_add_days(&current_ft, This->trigger[i].Type.Daily.DaysInterval); + } + break; + default: FIXME("trigger type %u is not handled\n", This->trigger[i].TriggerType); break; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index e880ce4..f7ab461 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -522,7 +522,23 @@ static void test_GetNextRunTime(void) st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); - /* FIXME: TASK_TIME_TRIGGER_DAILY */ + /* TASK_TIME_TRIGGER_DAILY */ + + hr = ITaskTrigger_GetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; + data.TriggerType = TASK_TIME_TRIGGER_DAILY; + data.Type.Daily.DaysInterval = 1; + hr = ITaskTrigger_SetTrigger(trigger, &data); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == S_OK, "got %#x\n", hr); + ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond); + /* FIXME: TASK_TIME_TRIGGER_WEEKLY */ /* FIXME: TASK_TIME_TRIGGER_MONTHLYDATE */ /* FIXME: TASK_TIME_TRIGGER_MONTHLYDOW */

1 0

Alistair Leslie-Hughes : include: Add IMFReadWriteClassFactory interface.
by Alexandre Julliard May 21, 2018

May 21, 2018

Module: wine Branch: master Commit: 62862b3574d8f2ec65b32b712c4c0628fe3f9a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62862b3574d8f2ec65b32b71… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 21 05:37:44 2018 +0000 include: Add IMFReadWriteClassFactory interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index ad1cef6..8547b80 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -131,6 +131,20 @@ interface IMFSinkWriterEx : IMFSinkWriter [out] IMFTransform **transform); } +[ + object, + uuid(e7fe2e12-661c-40da-92f9-4f002ab67627), + local +] +interface IMFReadWriteClassFactory : IUnknown +{ + HRESULT CreateInstanceFromURL([in] REFCLSID clsid, [in] LPCWSTR url, [in] IMFAttributes *attributes, + [in] REFIID riid, [out, iid_is(riid)] void **object ); + + HRESULT CreateInstanceFromObject([in] REFCLSID clsid, [in] IUnknown *unk, [in] IMFAttributes *attributes, + [in] REFIID riid, [out, iid_is(riid)] void **object ); +} + cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," )

1 0

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

May 21, 2018

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

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

May 21, 2018

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 May 21, 2018

May 21, 2018

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 May 21, 2018

May 21, 2018

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 May 21, 2018

May 21, 2018

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

Jacek Caban : mshtml: Added IHTMLWindow7:: innerWidth and innerHeight implementation.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 127df7021dd99a6698286a33fe97f2c7e3a90aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=127df7021dd99a6698286a33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 18 13:53:38 2018 +0200 mshtml: Added IHTMLWindow7::innerWidth and innerHeight implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e198ed1..ec20e8f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2330,15 +2330,37 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT * static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 ret; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetInnerWidth(This->outer_window->nswindow, &ret); + if(NS_FAILED(nsres)) { + ERR("GetInnerWidth failed: %08x\n", nsres); + return E_FAIL; + } + + *p = ret; + return S_OK; } static HRESULT WINAPI HTMLWindow7_get_innerHeight(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 ret; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetInnerHeight(This->outer_window->nswindow, &ret); + if(NS_FAILED(nsres)) { + ERR("GetInnerWidth failed: %08x\n", nsres); + return E_FAIL; + } + + *p = ret; + return S_OK; } static HRESULT WINAPI HTMLWindow7_get_pageXOffset(IHTMLWindow7 *iface, LONG *p)

1 0