August 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : include: Added Pager_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: c87a83d98947073934aa684436473c530694657f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c87a83d98947073934aa6844… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:59 2019 +0000 include: Added Pager_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 203d3ea..f22c3b8 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2313,6 +2313,34 @@ typedef struct INT iHeight; } NMPGCALCSIZE, *LPNMPGCALCSIZE; +#define Pager_SetChild(hwnd, child) \ + SNDMSG((hwnd), PGM_SETCHILD, 0, (LPARAM)(child)) +#define Pager_RecalcSize(hwnd) \ + SNDMSG((hwnd), PGM_RECALCSIZE, 0, 0) +#define Pager_ForwardMouse(hwnd, forward) \ + SNDMSG((hwnd), PGM_FORWARDMOUSE, (WPARAM)(forward), 0) +#define Pager_SetBkColor(hwnd, clr) \ + (COLORREF)SNDMSG((hwnd), PGM_SETBKCOLOR, 0, (LPARAM)(clr)) +#define Pager_GetBkColor(hwnd) \ + (COLORREF)SNDMSG((hwnd), PGM_GETBKCOLOR, 0, 0) +#define Pager_SetBorder(hwnd, border) \ + (INT)SNDMSG((hwnd), PGM_SETBORDER, 0, (LPARAM)(border)) +#define Pager_GetBorder(hwnd) \ + (INT)SNDMSG((hwnd), PGM_GETBORDER, 0, 0) +#define Pager_SetPos(hwnd, pos) \ + (INT)SNDMSG((hwnd), PGM_SETPOS, 0, (LPARAM)(pos)) +#define Pager_GetPos(hwnd) \ + (INT)SNDMSG((hwnd), PGM_GETPOS, 0, 0) +#define Pager_SetButtonSize(hwnd, size) \ + (INT)SNDMSG((hwnd), PGM_SETBUTTONSIZE, 0, (LPARAM)(size)) +#define Pager_GetButtonSize(hwnd) \ + (INT)SNDMSG((hwnd), PGM_GETBUTTONSIZE, 0, 0) +#define Pager_GetButtonState(hwnd, button) \ + (DWORD)SNDMSG((hwnd), PGM_GETBUTTONSTATE, 0, (LPARAM)(button)) +#define Pager_GetDropTarget(hwnd, dt) \ + SNDMSG((hwnd), PGM_GETDROPTARGET, 0, (LPARAM)(dt)) +#define Pager_SetScrollInfo(hwnd, timeout, lines, pixels) \ + SNDMSG((hwnd), PGM_SETSCROLLINFO, timeout, MAKELONG(lines, pixels)) /* Treeview control */

1 0

Alistair Leslie-Hughes : include: Added missing ListView_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 18c813f3c1adfa01ac5d99ed91ff95ed55b8c16c URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c813f3c1adfa01ac5d99ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:00 2019 +0000 include: Added missing ListView_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index f22c3b8..88b9416 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3333,6 +3333,9 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_GETTOOLTIPS (LVM_FIRST+78) #define LVM_GETUNICODEFORMAT (CCM_GETUNICODEFORMAT) #define LVM_SETUNICODEFORMAT (CCM_SETUNICODEFORMAT) +#define LVM_GETGROUPSTATE (LVM_FIRST + 92) +#define LVM_GETFOCUSEDGROUP (LVM_FIRST + 93) +#define LVM_GETGROUPRECT (LVM_FIRST + 98) #define LVM_SETSELECTEDCOLUMN (LVM_FIRST + 140) #define LVM_SETTILEWIDTH (LVM_FIRST + 141) #define LVM_SETVIEW (LVM_FIRST + 142) @@ -3342,6 +3345,8 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_GETGROUPINFO (LVM_FIRST + 149) #define LVM_REMOVEGROUP (LVM_FIRST + 150) #define LVM_MOVEGROUP (LVM_FIRST + 151) +#define LVM_GETGROUPCOUNT (LVM_FIRST + 152) +#define LVM_GETGROUPINFOBYINDEX (LVM_FIRST + 153) #define LVM_MOVEITEMTOGROUP (LVM_FIRST + 154) #define LVM_SETGROUPMETRICS (LVM_FIRST + 155) #define LVM_GETGROUPMETRICS (LVM_FIRST + 156) @@ -4157,6 +4162,25 @@ typedef struct NMLVSCROLL (BOOL)SNDMSG((hwnd), LVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define ListView_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd), LVM_GETUNICODEFORMAT, 0, 0) +#define ListView_GetGroupInfoByIndex(hwnd, index, grp) \ + SNDMSG((hwnd), LVM_GETGROUPINFOBYINDEX, (WPARAM)(index), (LPARAM)(grp)) +#define ListView_SetGroupState(hwnd, group, masks, states) \ +{ LVGROUP level; level.cbSize = sizeof(level); level.mask = LVGF_STATE; \ + level.stateMask = masks; level.state = states; \ + SNDMSG((hwnd), LVM_SETGROUPINFO, (WPARAM)(group), (LPARAM)(LVGROUP *)&level); } +#define ListView_IsItemVisible(hwnd, index) \ + (UINT)SNDMSG((hwnd), LVM_ISITEMVISIBLE, (WPARAM)(index), (LPARAM)0) +#define ListView_GetGroupState(hwnd, group, mask) \ + (UINT)SNDMSG((hwnd), LVM_GETGROUPSTATE, (WPARAM)(group), (LPARAM)(mask)) +#define ListView_GetFocusedGroup(hwnd) \ + SNDMSG((hwnd), LVM_GETFOCUSEDGROUP, 0, 0) +#define ListView_GetGroupRect(hwnd, group, type, rc) \ + SNDMSG((hwnd), LVM_GETGROUPRECT, (WPARAM)(group), \ + ((rc) ? (((RECT*)(rc))->top = type), (LPARAM)(RECT*)(rc) : (LPARAM)(RECT*)NULL)) +#define ListView_GetGroupCount(hwnd) \ + SNDMSG((hwnd), LVM_GETGROUPCOUNT, (WPARAM)0, (LPARAM)0) +#define ListView_GetGroupInfoByIndex(hwnd, index, grp) \ + SNDMSG((hwnd), LVM_GETGROUPINFOBYINDEX, (WPARAM)(index), (LPARAM)(grp)) /* Tab Control */

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to arbfp_free_blit_shader().
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: d627239cac081c8763971c2e2a9035c61f28ef26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d627239cac081c8763971c2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 1 01:06:02 2019 +0430 wined3d: Pass a wined3d_context_gl structure to arbfp_free_blit_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f91ff87..d4de02f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6906,10 +6906,10 @@ static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *ctx) { struct arbfp_blit_desc *entry_arb = WINE_RB_ENTRY_VALUE(entry, struct arbfp_blit_desc, entry); const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; - context = ctx; - gl_info = context->gl_info; + context_gl = ctx; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteProgramsARB(1, &entry_arb->shader)); checkGLcall("glDeleteProgramsARB(1, &entry_arb->shader)"); @@ -6919,6 +6919,7 @@ static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *ctx) /* Context activation is done by the caller. */ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_arbfp_blitter *arbfp_blitter; struct wined3d_blitter *next; @@ -6928,7 +6929,7 @@ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3 arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter); - wine_rb_destroy(&arbfp_blitter->shaders, arbfp_free_blit_shader, context); + wine_rb_destroy(&arbfp_blitter->shaders, arbfp_free_blit_shader, context_gl); checkGLcall("Delete blit programs"); if (arbfp_blitter->palette_texture)

1 0