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

Chip Davis : kernel32: Forward power request functions to ntdll.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 49ffaddf9bc4d3fbf73abb16c31dec48b48b9a6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ffaddf9bc4d3fbf73abb16… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 31 21:40:29 2019 -0500 kernel32: Forward power request functions to ntdll. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 53 +++++++++++++++++++++++++++++++++++++---------- include/winnt.h | 5 +++++ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 056dd9d..190dc01 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -19,10 +19,15 @@ #include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(powermgnt); @@ -113,10 +118,36 @@ EXECUTION_STATE WINAPI SetThreadExecutionState(EXECUTION_STATE flags) */ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) { - FIXME("(%p): stub\n", context); + COUNTED_REASON_CONTEXT nt_context; + HANDLE handle; + NTSTATUS status; + WCHAR module_name[MAX_PATH]; + + TRACE( "(%p)\n", context ); + + nt_context.Version = context->Version; + nt_context.Flags = context->Flags; + if (context->Flags & POWER_REQUEST_CONTEXT_SIMPLE_STRING) + RtlInitUnicodeString( &nt_context.u.SimpleString, context->Reason.SimpleReasonString ); + else if (context->Flags & POWER_REQUEST_CONTEXT_DETAILED_STRING) + { + int i; + + GetModuleFileNameW( context->Reason.Detailed.LocalizedReasonModule, module_name, ARRAY_SIZE(module_name) ); + RtlInitUnicodeString( &nt_context.u.s.ResourceFileName, module_name ); + nt_context.u.s.ResourceReasonId = context->Reason.Detailed.LocalizedReasonId; + nt_context.u.s.StringCount = context->Reason.Detailed.ReasonStringCount; + nt_context.u.s.ReasonStrings = heap_alloc( nt_context.u.s.StringCount * sizeof(UNICODE_STRING) ); + for (i = 0; i < nt_context.u.s.StringCount; i++) + RtlInitUnicodeString( &nt_context.u.s.ReasonStrings[i], context->Reason.Detailed.ReasonStrings[i] ); + } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return INVALID_HANDLE_VALUE; + status = NtCreatePowerRequest( &handle, &nt_context ); + if (nt_context.Flags & POWER_REQUEST_CONTEXT_DETAILED_STRING) + heap_free( nt_context.u.s.ReasonStrings ); + if (status) + SetLastError( RtlNtStatusToDosError(status) ); + return status == STATUS_SUCCESS ? handle : INVALID_HANDLE_VALUE; } /*********************************************************************** @@ -124,10 +155,10 @@ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) */ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) { - FIXME("(%p, %u): stub\n", request, type); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status = NtSetPowerRequest( request, type ); + if (status) + SetLastError( RtlNtStatusToDosError(status) ); + return status == STATUS_SUCCESS; } /*********************************************************************** @@ -135,8 +166,8 @@ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) */ BOOL WINAPI PowerClearRequest(HANDLE request, POWER_REQUEST_TYPE type) { - FIXME("(%p, %u): stub\n", request, type); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status = NtClearPowerRequest( request, type ); + if (status) + SetLastError( RtlNtStatusToDosError(status) ); + return status == STATUS_SUCCESS; } diff --git a/include/winnt.h b/include/winnt.h index 613f858..d8aae39 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5585,6 +5585,11 @@ typedef enum _POWER_REQUEST_TYPE PowerRequestAwayModeRequired } POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; +#define POWER_REQUEST_CONTEXT_VERSION 0 + +#define POWER_REQUEST_CONTEXT_SIMPLE_STRING 0x00000001 +#define POWER_REQUEST_CONTEXT_DETAILED_STRING 0x00000002 + typedef union _FILE_SEGMENT_ELEMENT { PVOID64 Buffer; ULONGLONG Alignment;

1 0

Damjan Jovanovic : ws2_32: Avoid data corruption of WSAPROTOCOL_INFO in ws_protocol_info().
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: c722d819eac5987bd0659c3e9b9fe2f4392cb501 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c722d819eac5987bd0659c3e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 1 06:11:32 2019 +0200 ws2_32: Avoid data corruption of WSAPROTOCOL_INFO in ws_protocol_info(). WS_EnterSingleProtocol[A/W]() fills WSAPROTOCOL_INFO with zeroes, ovewriting what was already there, so in ws_protocol_info(), populate the address family, socket type and protocol only AFTER calling it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 16 +++++++++++----- dlls/ws2_32/tests/sock.c | 5 ++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0034787..d82172a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2328,6 +2328,9 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) { NTSTATUS status; + int address_family; + int socket_type; + int protocol; *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); memset(buffer, 0, *size); @@ -2338,9 +2341,9 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i status = wine_server_call( req ); if (!status) { - buffer->iAddressFamily = convert_af_u2w(reply->family); - buffer->iSocketType = convert_socktype_u2w(reply->type); - buffer->iProtocol = convert_proto_u2w(reply->protocol); + address_family = convert_af_u2w(reply->family); + socket_type = convert_socktype_u2w(reply->type); + protocol = convert_proto_u2w(reply->protocol); } } SERVER_END_REQ; @@ -2353,9 +2356,12 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i } if (unicode) - WS_EnterSingleProtocolW( buffer->iProtocol, buffer); + WS_EnterSingleProtocolW( protocol, buffer); else - WS_EnterSingleProtocolA( buffer->iProtocol, (WSAPROTOCOL_INFOA *)buffer); + WS_EnterSingleProtocolA( protocol, (WSAPROTOCOL_INFOA *)buffer); + buffer->iAddressFamily = address_family; + buffer->iSocketType = socket_type; + buffer->iProtocol = protocol; return TRUE; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 03f4e68..e97cd38 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1668,9 +1668,8 @@ todo_wine "SO_PROTOCOL_INFO[A/W] comparison failed\n"); /* Remove IF when WSAEnumProtocols support IPV6 data */ - todo_wine_if (prottest[i].family == AF_INET6) - ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", - prottest[i].family, infoA.iAddressFamily); + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", prottest[i].type, infoA.iSocketType); ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n",

1 0

Alistair Leslie-Hughes : include: Added Animate_IsPlaying define.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: e45ca0bebbbb5910f56a62322f8940d9e4c9bf52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e45ca0bebbbb5910f56a6232… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:02 2019 +0000 include: Added Animate_IsPlaying define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 88b9416..d8ba974 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4608,6 +4608,7 @@ static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', #define ACM_OPEN WINELIB_NAME_AW(ACM_OPEN) #define ACM_PLAY (WM_USER+101) #define ACM_STOP (WM_USER+102) +#define ACM_ISPLAYING (WM_USER+104) #define ACN_START 1 #define ACN_STOP 2 @@ -4635,7 +4636,8 @@ static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', (BOOL)SNDMSG(hwnd,ACM_OPENA,0,0) #define Animate_Seek(hwnd,frame) \ (BOOL)SNDMSG(hwnd,ACM_PLAY,1,(LPARAM)MAKELONG(frame,frame)) - +#define Animate_IsPlaying(hwnd) \ + (BOOL)SNDMSG(hwnd, ACM_ISPLAYING, 0, 0) /************************************************************************** * IP Address control

1 0

Conor McCarthy : dxgi: Implement d3d12_swapchain_ResizeTarget().
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 6d64bfc28b7619445dee8e62e299dd8d1ab57cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d64bfc28b7619445dee8e62… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 1 01:17:47 2019 +0430 dxgi: Implement d3d12_swapchain_ResizeTarget(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 44 ++------------------------- dlls/dxgi/dxgi_private.h | 5 ++-- dlls/dxgi/swapchain.c | 75 +++++++++++++++++++++++++++++++---------------- dlls/dxgi/utils.c | 53 +++++++++++++++++++++++++++++++-- dlls/wined3d/swapchain.c | 23 +++++++++++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 3 ++ 7 files changed, 133 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d64bfc28b7619445dee…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context structure to fragment_pipeline.enable_extension().
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 9cb81bfad4d6910556963a11122d0a846803c4ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb81bfad4d6910556963a11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 1 01:06:06 2019 +0430 wined3d: Pass a wined3d_context structure to fragment_pipeline.enable_extension(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/arb_program_shader.c | 17 ++++++++++------- dlls/wined3d/ati_fragment_shader.c | 7 +++++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/nvidia_texture_shader.c | 16 +++++++++++----- dlls/wined3d/shader.c | 10 ++++------ dlls/wined3d/state.c | 13 ++++++------- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 9 files changed, 57 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cb81bfad4d691055696…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to glsl_free_blitter_program().
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: fe17f2adf974204b339d079d1fd78ab854cb2000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe17f2adf974204b339d079d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 1 01:06:05 2019 +0430 wined3d: Pass a wined3d_context_gl structure to glsl_free_blitter_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 828638b..954a768 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12298,9 +12298,10 @@ static int glsl_blitter_args_compare(const void *key, const struct wine_rb_entry static void glsl_free_blitter_program(struct wine_rb_entry *entry, void *ctx) { struct glsl_blitter_program *program = WINE_RB_ENTRY_VALUE(entry, struct glsl_blitter_program, entry); - struct wined3d_context *context = ctx; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = ctx; + const struct wined3d_gl_info *gl_info; + gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteProgram(program->id)); checkGLcall("glDeleteProgram()"); heap_free(program); @@ -12309,6 +12310,7 @@ static void glsl_free_blitter_program(struct wine_rb_entry *entry, void *ctx) /* Context activation is done by the caller. */ static void glsl_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_glsl_blitter *glsl_blitter; struct wined3d_blitter *next; @@ -12321,7 +12323,7 @@ static void glsl_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d if (glsl_blitter->palette_texture) gl_info->gl_ops.gl.p_glDeleteTextures(1, &glsl_blitter->palette_texture); - wine_rb_destroy(&glsl_blitter->programs, glsl_free_blitter_program, context); + wine_rb_destroy(&glsl_blitter->programs, glsl_free_blitter_program, context_gl); string_buffer_list_cleanup(&glsl_blitter->string_buffers); heap_free(glsl_blitter);

1 0

Alistair Leslie-Hughes : include: Added missing ListView_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

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

Alistair Leslie-Hughes : include: Added Pager_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

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 Button_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: cd337b099ac6dcbf9efc33830b459bffaa8ff8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd337b099ac6dcbf9efc3383… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:58 2019 +0000 include: Added missing Button_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 84bdcad..203d3ea 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1112,6 +1112,14 @@ typedef struct tagNMBCHOTITEM (BOOL)SNDMSG(button, BCM_SETTEXTMARGIN, 0, (LPARAM)(margin)) #define Button_GetIdealSize(button, size) \ (BOOL)SNDMSG(button, BCM_GETIDEALSIZE, 0, (LPARAM)(size)) +#define Button_SetSplitInfo(hwnd, info) \ + (BOOL)SNDMSG((hwnd), BCM_SETSPLITINFO, 0, (LPARAM)(info)) +#define Button_GetSplitInfo(hwnd, info) \ + (BOOL)SNDMSG((hwnd), BCM_GETSPLITINFO, 0, (LPARAM)(info)) +#define Button_SetElevationRequiredState(hwnd, required) \ + (LRESULT)SNDMSG((hwnd), BCM_SETSHIELD, 0, (LPARAM)required) +#define Button_SetDropDownState(hwnd, dropdown) \ + (BOOL)SNDMSG((hwnd), BCM_SETDROPDOWNSTATE, (WPARAM)(dropdown), 0) /* Toolbar */

1 0

Alistair Leslie-Hughes : include: Correct LVINSERTMARK define.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 8a430feec4f481194da313403fe14b465a920ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a430feec4f481194da31340… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:55 2019 +0000 include: Correct LVINSERTMARK define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 14d40a2..745a028 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3756,7 +3756,7 @@ typedef struct LVINSERTMARK DWORD dwFlags; int iItem; DWORD dwReserved; -} LVINSERTMARK, *PLVINSERTMARK; +} LVINSERTMARK, *LPLVINSERTMARK; typedef struct tagTCHITTESTINFO {

1 0