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

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

21 May '18

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: Remove implicit extern keywords from function declarations.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 3526746b06d483f5a312ab97869084c06cc825ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=3526746b06d483f5a312ab97… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 21 13:35:01 2018 +0000 regedit: Remove implicit extern keywords from function declarations. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.h | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index af61252..218e8ec 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,33 +117,31 @@ extern const WCHAR* reg_class_namesW[]; #define INDEX_HKEY_CURRENT_USER 4 #define INDEX_HKEY_DYN_DATA 5 - - /* about.c */ -extern void ShowAboutBox(HWND hWnd); +void ShowAboutBox(HWND hWnd); /* childwnd.c */ -extern LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); -extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); +LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); /* framewnd.c */ -extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); -extern void SetupStatusBar(HWND hWnd, BOOL bResize); -extern void UpdateStatusBar(void); +LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); +void SetupStatusBar(HWND hWnd, BOOL bResize); +void UpdateStatusBar(void); /* listview.c */ -extern BOOL update_listview_path(const WCHAR *path); -extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); -extern void OnGetDispInfo(NMLVDISPINFOW *plvdi); -extern HWND CreateListView(HWND hwndParent, UINT id); -extern int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); -extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); -extern HWND StartValueRename(HWND hwndLV); -extern LPWSTR GetItemText(HWND hwndLV, UINT item); -extern LPCWSTR GetValueName(HWND hwndLV); -extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); -extern BOOL IsDefaultValue(HWND hwndLV, int i); +BOOL update_listview_path(const WCHAR *path); +void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); +void OnGetDispInfo(NMLVDISPINFOW *plvdi); +HWND CreateListView(HWND hwndParent, UINT id); +int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); +BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); +HWND StartValueRename(HWND hwndLV); +LPWSTR GetItemText(HWND hwndLV, UINT item); +LPCWSTR GetValueName(HWND hwndLV); +BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); +BOOL IsDefaultValue(HWND hwndLV, int i); /* regedit.c */ void WINAPIV output_message(unsigned int id, ...); @@ -158,27 +156,27 @@ void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); -extern BOOL RefreshTreeView(HWND hWndTV); -extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); -extern LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); -extern BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); -extern HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); -extern HWND StartKeyRename(HWND hwndTV); -extern HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); -extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); +HWND CreateTreeView(HWND hwndParent, LPWSTR pHostName, UINT id); +BOOL RefreshTreeView(HWND hWndTV); +BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEWW* pnmtv); +LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +BOOL DeleteNode(HWND hwndTV, HTREEITEM hItem); +HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPWSTR name); +HWND StartKeyRename(HWND hwndTV); +HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); +HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); /* edit.c */ -extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); -extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); -extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -extern int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); +BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); +BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); /* hexedit.c */ -extern void HexEdit_Register(void); +void HexEdit_Register(void); #endif /* __MAIN_H__ */

1 0

Hugh McMaster : regedit: Sort function declarations alphabetically by source file.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 5509d84e9a69796b3c7f197b42703ef5792abdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5509d84e9a69796b3c7f197b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 21 13:35:02 2018 +0000 regedit: Sort function declarations alphabetically by source file. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/main.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 218e8ec..6e901b3 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -124,11 +124,24 @@ void ShowAboutBox(HWND hWnd); LPWSTR GetItemFullPath(HWND hwndTV, HTREEITEM hItem, BOOL bFull); LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +/* edit.c */ +BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); +BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); +BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); +BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); +BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); +int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); + /* framewnd.c */ LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); void SetupStatusBar(HWND hWnd, BOOL bResize); void UpdateStatusBar(void); +/* hexedit.c */ +void HexEdit_Register(void); + /* listview.c */ BOOL update_listview_path(const WCHAR *path); void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); @@ -166,17 +179,4 @@ HWND StartKeyRename(HWND hwndTV); HTREEITEM FindPathInTree(HWND hwndTV, LPCWSTR lpKeyName); HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, int *row); -/* edit.c */ -BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR newKeyName); -BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPWSTR valueName); -BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName); -BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); -BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); -BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...); - -/* hexedit.c */ -void HexEdit_Register(void); - #endif /* __MAIN_H__ */

1 0

Matteo Bruni : wined3d: Implement YUV blits in the GLSL blitter.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 0b0c0c9a19e614223f79cd0971b4cfcd96900fe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0c0c9a19e614223f79cd09… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 21 23:02:44 2018 +0430 wined3d: Implement YUV blits in the GLSL blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 353 +++++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/utils.c | 9 +- 2 files changed, 333 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b0c0c9a19e614223f79…

1 0

Henri Verbeet : wined3d: Only create the ARBfp blitter if creating the GLSL blitter failed.
by Alexandre Julliard 21 May '18

21 May '18

Module: wine Branch: master Commit: 6fc027e5acfb7f7c7f50af421658e5442e896588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fc027e5acfb7f7c7f50af42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 21 23:02:45 2018 +0430 wined3d: Only create the ARBfp blitter if creating the GLSL blitter failed. Since the GLSL blitter can do everything the ARBfp one can. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c853b43..8257efd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1042,8 +1042,8 @@ static void wined3d_device_create_primary_opengl_context_cs(void *object) return; } wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_glsl_blitter_create(&device->blitter, device); + if (!wined3d_glsl_blitter_create(&device->blitter, device)) + wined3d_arbfp_blitter_create(&device->blitter, device); wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e433906..0d0e25a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13157,21 +13157,22 @@ static const struct wined3d_blitter_ops glsl_blitter_ops = glsl_blitter_blit, }; -void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device) +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, + const struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_glsl_blitter *blitter; if (device->shader_backend != &glsl_shader_backend) - return; + return NULL; if (!gl_info->supported[ARB_VERTEX_SHADER] || !gl_info->supported[ARB_FRAGMENT_SHADER]) - return; + return NULL; if (!(blitter = heap_alloc(sizeof(*blitter)))) { ERR("Failed to allocate blitter.\n"); - return; + return NULL; } TRACE("Created blitter %p.\n", blitter); @@ -13182,4 +13183,6 @@ void wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct win wine_rb_init(&blitter->programs, glsl_blitter_args_compare); blitter->palette_texture = 0; *next = &blitter->blitter; + + return *next; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26979b3..f2c4cd6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2143,7 +2143,7 @@ void wined3d_fbo_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_ffp_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_glsl_blitter_create(struct wined3d_blitter **next, +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

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

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

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

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

Zebediah Figura : msi/tests: Test deferral of DeleteServices.
by Alexandre Julliard 18 May '18

18 May '18

Module: wine Branch: master Commit: 5d8e16f7018b4fb0382ec991adc08e1f305bd353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d8e16f7018b4fb0382ec991… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:10 2018 -0500 msi/tests: Test deferral of DeleteServices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 10 ++++++++++ dlls/msi/tests/custom.c | 24 ++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 248439a..2cfc59b 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -custom_IMPORTS = uuid msi ole32 shell32 +custom_IMPORTS = uuid msi ole32 shell32 advapi32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ce36eda..b005529 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -282,6 +282,8 @@ static const char sds_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "StopServices\t\t5000\n" "DeleteServices\t\t5050\n" + "sds_immediate\tNOT REMOVE\t5051\n" + "sds_deferred\tNOT REMOVE\t5052\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" @@ -292,6 +294,13 @@ static const char sds_install_exec_seq_dat[] = "PublishProduct\t\t5700\n" "InstallFinalize\t\t6000\n"; +static const char sds_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "sds_immediate\t1\tcustom.dll\tsds_present\n" + "sds_deferred\t1025\tcustom.dll\tsds_absent\n"; + static const char rof_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -1823,6 +1832,7 @@ static const msi_table sds_tables[] = ADD_TABLE(feature_comp), ADD_TABLE(file), ADD_TABLE(sds_install_exec_seq), + ADD_TABLE(sds_custom_action), ADD_TABLE(service_control), ADD_TABLE(service_install), ADD_TABLE(media), diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index db6d612..4497f3c 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -23,6 +23,7 @@ #include <windef.h> #include <winbase.h> +#include <winsvc.h> #define COBJMACROS #include <shlobj.h> #include <msxml.h> @@ -1192,3 +1193,26 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !pf_exists("msitest\\shortcut.lnk"), "shortcut present\n"); return ERROR_SUCCESS; } + +UINT WINAPI sds_present(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "TestService3", GENERIC_ALL); +todo_wine + ok(hinst, !!service, "service absent: %u\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} + +UINT WINAPI sds_absent(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "TestService3", GENERIC_ALL); + ok(hinst, !service, "service present\n"); + if (service) CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 774f77b..1485546 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -7,3 +7,5 @@ @ stdcall cf_absent(long) @ stdcall crs_present(long) @ stdcall crs_absent(long) +@ stdcall sds_present(long) +@ stdcall sds_absent(long)

1 0