June 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Don't add const setting entries with zero count.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 4c7653ef5d48670f40ee28d14df20e0631b99298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7653ef5d48670f40ee28d14… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 31 23:35:52 2017 +0200 d3dx9: Don't add const setting entries with zero count. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 5974329..7afbc03 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1226,6 +1226,11 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info); + if (!info.count) + { + TRACE("%s has zero count, skipping.\n", debugstr_a(param->name)); + return D3D_OK; + } if (table_type_from_param_type(param->type) == PRES_VT_COUNT) return D3DERR_INVALIDCALL;

1 0

Paul Gofman : d3dx9: Merge constant setting for child parameters when possible.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 730832d2d87287b6891ca000bfe0763b768dfe98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730832d2d87287b6891ca000b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:32 2017 +0300 d3dx9: Merge constant setting for child parameters when possible. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 160 ++++++++++++++++++++++++++++++++---------- 2 files changed, 124 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=730832d2d87287b6891ca…

1 0

Nikolay Sivov : include: Add some missing Common Controls definitions.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 15c7e654a570899f08507e698998fb40715169b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c7e654a570899f08507e698… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 09:38:13 2017 +0300 include: Add some missing Common Controls definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index d176b4f..587caae 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2165,6 +2165,7 @@ static const WCHAR TRACKBAR_CLASSW[] = { 'm','s','c','t','l','s','_', #define TBM_SETTIPSIDE (WM_USER+31) #define TBM_SETBUDDY (WM_USER+32) #define TBM_GETBUDDY (WM_USER+33) +#define TBM_SETPOSNOTIFY (WM_USER+34) #define TBM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT @@ -3285,6 +3286,14 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_MAPINDEXTOID (LVM_FIRST + 180) #define LVM_MAPIDTOINDEX (LVM_FIRST + 181) #define LVM_ISITEMVISIBLE (LVM_FIRST + 182) +#define LVM_GETEMPTYTEXT (LVM_FIRST + 204) +#define LVM_GETFOOTERRECT (LVM_FIRST + 205) +#define LVM_GETFOOTERINFO (LVM_FIRST + 206) +#define LVM_GETFOOTERITEMRECT (LVM_FIRST + 207) +#define LVM_GETFOOTERITEM (LVM_FIRST + 208) +#define LVM_GETITEMINDEXRECT (LVM_FIRST + 209) +#define LVM_SETITEMINDEXSTATE (LVM_FIRST + 210) +#define LVM_GETNEXTITEMINDEX (LVM_FIRST + 211) #define LVN_FIRST (0U-100U) #define LVN_LAST (0U-199U) @@ -5211,6 +5220,59 @@ enum _TASKDIALOG_FLAGS }; typedef int TASKDIALOG_FLAGS; +typedef enum _TASKDIALOG_MESSAGES +{ + TDM_NAVIGATE_PAGE = WM_USER + 101, + TDM_CLICK_BUTTON = WM_USER + 102, + TDM_SET_MARQUEE_PROGRESS_BAR = WM_USER + 103, + TDM_SET_PROGRESS_BAR_STATE = WM_USER + 104, + TDM_SET_PROGRESS_BAR_RANGE = WM_USER + 105, + TDM_SET_PROGRESS_BAR_POS = WM_USER + 106, + TDM_SET_PROGRESS_BAR_MARQUEE = WM_USER + 107, + TDM_SET_ELEMENT_TEXT = WM_USER + 108, + TDM_CLICK_RADIO_BUTTON = WM_USER + 110, + TDM_ENABLE_BUTTON = WM_USER + 111, + TDM_ENABLE_RADIO_BUTTON = WM_USER + 112, + TDM_CLICK_VERIFICATION = WM_USER + 113, + TDM_UPDATE_ELEMENT_TEXT = WM_USER + 114, + TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = WM_USER + 115, + TDM_UPDATE_ICON = WM_USER + 116, +} TASKDIALOG_MESSAGES; + +typedef enum _TASKDIALOG_NOTIFICATIONS +{ + TDN_CREATED, + TDN_NAVIGATED, + TDN_BUTTON_CLICKED, + TDN_HYPERLINK_CLICKED, + TDN_TIMER, + TDN_DESTROYED, + TDN_RADIO_BUTTON_CLICKED, + TDN_DIALOG_CONSTRUCTED, + TDN_VERIFICATION_CLICKED, + TDN_HELP, + TDN_EXPANDO_BUTTON_CLICKED, +} TASKDIALOG_NOTIFICATIONS; + +typedef enum _TASKDIALOG_ELEMENTS +{ + TDE_CONTENT, + TDE_EXPANDED_INFORMATION, + TDE_FOOTER, + TDE_MAIN_INSTRUCTION, +} TASKDIALOG_ELEMENTS; + +typedef enum _TASKDIALOG_ICON_ELEMENTS +{ + TDIE_ICON_MAIN, + TDIE_ICON_FOOTER, +} TASKDIALOG_ICON_ELEMENTS; + +#define TD_WARNING_ICON MAKEINTRESOURCEW(-1) +#define TD_ERROR_ICON MAKEINTRESOURCEW(-2) +#define TD_INFORMATION_ICON MAKEINTRESOURCEW(-3) +#define TD_SHIELD_ICON MAKEINTRESOURCEW(-4) + enum _TASKDIALOG_COMMON_BUTTON_FLAGS { TDCBF_OK_BUTTON = 0x0001, @@ -5266,6 +5328,8 @@ typedef struct _TASKDIALOGCONFIG UINT cxWidth; } TASKDIALOGCONFIG; +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button); HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *); #include <poppack.h>

1 0

Nikolay Sivov : comctl32/taskdialog: Added TaskDialog() export.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 9e3ebed4a417cc32e58ca5ac255c066b0a00a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ebed4a417cc32e58ca5ac2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 09:38:14 2017 +0300 comctl32/taskdialog: Added TaskDialog() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/taskdialog.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 8 ++++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 9287346..4e1aead 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -61,6 +61,7 @@ 340 stdcall -ordinal DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) +344 stdcall -ordinal TaskDialog(long long wstr wstr wstr long wstr ptr) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) 350 stdcall -noname -private StrChrA(str long) 351 stdcall -noname -private StrRChrA(str str long) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index fcc7db7..dc90160 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -22,6 +22,8 @@ #include <stdarg.h> #include <string.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -384,3 +386,26 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto return S_OK; } + +/*********************************************************************** + * TaskDialog [COMCTL32.@] + */ +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button) +{ + TASKDIALOGCONFIG taskconfig; + + TRACE("%p, %p, %s, %s, %s, %#x, %s, %p\n", owner, hinst, debugstr_w(title), debugstr_w(main_instruction), + debugstr_w(content), common_buttons, debugstr_w(icon), button); + + memset(&taskconfig, 0, sizeof(taskconfig)); + taskconfig.cbSize = sizeof(taskconfig); + taskconfig.hwndParent = owner; + taskconfig.hInstance = hinst; + taskconfig.dwCommonButtons = common_buttons; + taskconfig.pszWindowTitle = title; + taskconfig.u.pszMainIcon = icon; + taskconfig.pszMainInstruction = main_instruction; + taskconfig.pszContent = content; + return TaskDialogIndirect(&taskconfig, button, NULL, NULL); +} diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8a9d164..c937127 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -28,6 +28,8 @@ #include "v6util.h" static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); +static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, + TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); START_TEST(taskdialog) { @@ -50,6 +52,12 @@ START_TEST(taskdialog) return; } + pTaskDialog = (void *)GetProcAddress(hinst, "TaskDialog"); + + ptr_ordinal = GetProcAddress(hinst, (const char *)344); + ok(pTaskDialog == ptr_ordinal, "got wrong pointer for ordinal 344, %p expected %p\n", + ptr_ordinal, pTaskDialog); + ptr_ordinal = GetProcAddress(hinst, (const char *)345); ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect);

1 0

Rosanne DiMesio : adminScreenshots: avoid database error
by Jeremy Newman 01 Jun '17

01 Jun '17

Module: appdb Branch: master Commit: 49a78f65efc9629199427b9ce859d78b8c10b6bf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49a78f65efc9629199427b9c… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 1 09:22:10 2017 -0500 adminScreenshots: avoid database error Allows the Screenshots Management page to load even if there are no screenshots in the database. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin/adminScreenshots.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/adminScreenshots.php b/admin/adminScreenshots.php index 96e3759..d552ca8 100644 --- a/admin/adminScreenshots.php +++ b/admin/adminScreenshots.php @@ -59,7 +59,10 @@ $ItemsPerPage = isset($aClean['iItemsPerPage']) ? $aClean['iItemsPerPage'] : 6; $currentPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; $ItemsPerPage = min($ItemsPerPage,100); -$totalPages = ceil(screenshot::objectGetEntriesCount('accepted')/$ItemsPerPage); +$realTotalPages = screenshot::objectGetEntriesCount('accepted'); +$totalPages = 1; +if($realTotalPages >= $ItemsPerPage) + $totalPages = ceil($realTotalPages/$ItemsPerPage); $currentPage = min($currentPage,$totalPages); $offset = (($currentPage-1) * $ItemsPerPage);

1 0