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

[PATCH 06/13] include : Added missing Button_* defines.
by Alistair Leslie-Hughes July 31, 2019

July 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index b2deb11f8b..399a3972d4 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 */ -- 2.17.1

1 0

[PATCH 05/13] include : Added missing Header_* defines.
by Alistair Leslie-Hughes July 31, 2019

July 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 69a2e145ce..b2deb11f8b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1002,6 +1002,14 @@ typedef struct tagNMHDFILTERBTNCLICK (BOOL)SNDMSG((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define Header_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd),HDM_GETUNICODEFORMAT,0,0) +#define Header_GetItemDropDownRect(hwnd,iItem,lprc) \ + (BOOL)SNDMSG((hwnd), HDM_GETITEMDROPDOWNRECT, (WPARAM)iItem, (LPARAM)lprc) +#define Header_GetOverflowRect(hwnd, rc) \ + (BOOL)SNDMSG((hwnd), HDM_GETOVERFLOWRECT, 0, (LPARAM)(rc)) +#define Header_GetFocusedItem(hwnd) \ + (INT)SNDMSG((hwnd), HDM_GETFOCUSEDITEM, (WPARAM)(0), (LPARAM)(0)) +#define Header_SetFocusedItem(hwnd, item) \ + (BOOL)SNDMSG((hwnd), HDM_SETFOCUSEDITEM, (WPARAM)(0), (LPARAM)(item)) /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button" -- 2.17.1

1 0

[PATCH 04/13] include: Use macro SNDMSG to send messages
by Alistair Leslie-Hughes July 31, 2019

July 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 745a0286b6..69a2e145ce 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5166,9 +5166,9 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; #define CB_GETCUEBANNER (CBM_FIRST + 4) #define ComboBox_GetMinVisible(hwnd) \ - ((int)SendMessage((hwnd), CB_GETMINVISIBLE, 0, 0)) + ((INT)SNDMSG((hwnd), CB_GETMINVISIBLE, 0, 0)) #define ComboBox_SetMinVisible(hwnd, count) \ - ((BOOL)SendMessage((hwnd), CB_SETMINVISIBLE, (WPARAM)(count), 0)) + ((BOOL)SNDMSG((hwnd), CB_SETMINVISIBLE, (WPARAM)(count), 0)) /************************************************************************** * Edit control -- 2.17.1

1 0

[PATCH 03/13] include: Correct LVINSERTMARK define
by Alistair Leslie-Hughes July 31, 2019

July 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 14d40a254d..745a0286b6 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 { -- 2.17.1

1 0

[PATCH 02/13] include: Add PF_INET6 define
by Alistair Leslie-Hughes July 31, 2019

July 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winsock2.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/winsock2.h b/include/winsock2.h index a2563f4df2..3f41562cbf 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -92,6 +92,16 @@ extern "C" { #define WS_SOCK_SEQPACKET 5 #endif /* USE_WS_PREFIX */ +/* protocol families */ + +#ifndef USE_WS_PREFIX +#ifndef PF_INET6 +#define PF_INET6 AF_INET6 +#endif +#else +#define WS_PF_INET6 AF_INET6 +#endif /* USE_WS_PREFIX */ + /* option flags per socket */ #define FD_MAX_EVENTS 10 -- 2.17.1

1 0

[PATCH 01/13] include: Added thumbcache.idl
by Alistair Leslie-Hughes July 31, 2019

July 31, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/thumbcache.idl | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 include/thumbcache.idl diff --git a/include/Makefile.in b/include/Makefile.in index 908d92f101..5b4dac5ebe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -633,6 +633,7 @@ SOURCES = \ tcpmib.h \ textserv.h \ textstor.idl \ + thumbcache.idl \ timezoneapi.h \ tlhelp32.h \ tlogstg.idl \ diff --git a/include/thumbcache.idl b/include/thumbcache.idl new file mode 100644 index 0000000000..1d312163e9 --- /dev/null +++ b/include/thumbcache.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; + +typedef [v1_enum] enum WTS_FLAGS +{ + WTS_NONE = 0x00000000, + WTS_EXTRACT = 0x00000000, + WTS_INCACHEONLY = 0x00000001, + WTS_FASTEXTRACT = 0x00000002, + WTS_FORCEEXTRACTION = 0x00000004, + WTS_SLOWRECLAIM = 0x00000008, + WTS_EXTRACTDONOTCACHE = 0x00000020, + WTS_SCALETOREQUESTEDSIZE = 0x00000040, + WTS_SKIPFASTEXTRACT = 0x00000080, + WTS_EXTRACTINPROC = 0x00000100, + WTS_CROPTOSQUARE = 0x00000200, + WTS_INSTANCESURROGATE = 0x00000400, + WTS_REQUIRESURROGATE = 0x00000800, + WTS_APPSTYLE = 0x00002000, + WTS_WIDETHUMBNAILS = 0x00004000, + WTS_IDEALCACHESIZEONLY = 0x00008000, + WTS_SCALEUP = 0x00010000, +} WTS_FLAGS; + +typedef [v1_enum] enum WTS_ALPHATYPE +{ + WTSAT_UNKNOWN = 0, + WTSAT_RGB = 1, + WTSAT_ARGB = 2 +} WTS_ALPHATYPE; -- 2.17.1

1 0

[PATCH v2 3/4] ntdll: Stub power request APIs.
by Chip Davis July 31, 2019

July 31, 2019

This is an educated guess on what these would be, based on: *) The power request APIs in kernel32. *) The power request APIs exposed for drivers' use in ntoskrnl. *) Other NtXxx calls. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Move POWER_REQUEST_TYPE to winnt.h to try to fix the build. dlls/ntdll/nt.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 6 ++++++ include/winbase.h | 7 ------- include/winnt.h | 7 +++++++ include/winternl.h | 20 ++++++++++++++++++++ 5 files changed, 66 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index cdfbd9fa822..a9985fbc224 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3073,6 +3073,39 @@ NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_ return STATUS_SUCCESS; } +/****************************************************************************** + * NtCreatePowerRequest [NTDLL.@] + * + */ +NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) +{ + FIXME( "(%p, %p): stub\n", handle, context ); + + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtSetPowerRequest [NTDLL.@] + * + */ +NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtClearPowerRequest [NTDLL.@] + * + */ +NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + + return STATUS_NOT_IMPLEMENTED; +} + #ifdef linux /* Fallback using /proc/cpuinfo for Linux systems without cpufreq. For * most distributions on recent enough hardware, this is only likely to diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 278699c7077..32b2f614468 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -142,6 +142,7 @@ @ stdcall NtCancelIoFileEx(long ptr ptr) @ stdcall NtCancelTimer(long ptr) @ stdcall NtClearEvent(long) +@ stdcall NtClearPowerRequest(long long) @ stdcall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys @@ -167,6 +168,7 @@ @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @ stdcall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall NtCreatePort(ptr ptr long long ptr) +@ stdcall NtCreatePowerRequest(ptr ptr) @ stub NtCreateProcess # @ stub NtCreateProcessEx @ stub NtCreateProfile @@ -374,6 +376,7 @@ @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair @ stub NtSetLowWaitHighThread +@ stdcall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall NtSetSecurityObject(long long ptr) @ stub NtSetSystemEnvironmentValue @@ -1094,6 +1097,7 @@ @ stdcall -private ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @ stdcall -private ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private ZwClearEvent(long) NtClearEvent +@ stdcall -private ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys @@ -1118,6 +1122,7 @@ @ stdcall -private ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @ stdcall -private ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private ZwCreatePort(ptr ptr long long ptr) NtCreatePort +@ stdcall -private ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest @ stub ZwCreateProcess # @ stub ZwCreateProcessEx @ stub ZwCreateProfile @@ -1323,6 +1328,7 @@ @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread +@ stdcall -private ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private ZwSetSecurityObject(long long ptr) NtSetSecurityObject @ stub ZwSetSystemEnvironmentValue diff --git a/include/winbase.h b/include/winbase.h index 086a8b36459..9ee290a5b6c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -966,13 +966,6 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; -typedef enum _POWER_REQUEST_TYPE -{ - PowerRequestDisplayRequired, - PowerRequestSystemRequired, - PowerRequestAwayModeRequired -} POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; - typedef struct _SYSTEM_INFO { union { diff --git a/include/winnt.h b/include/winnt.h index 40d883e3a92..a9ecd5a5a99 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5582,6 +5582,13 @@ typedef struct _SYSTEM_POWER_POLICY { } SYSTEM_POWER_POLICY, *PSYSTEM_POWER_POLICY; +typedef enum _POWER_REQUEST_TYPE +{ + PowerRequestDisplayRequired, + PowerRequestSystemRequired, + PowerRequestAwayModeRequired +} POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; + typedef union _FILE_SEGMENT_ELEMENT { PVOID64 Buffer; ULONGLONG Alignment; diff --git a/include/winternl.h b/include/winternl.h index d6543917e64..fd898e93f05 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2070,6 +2070,23 @@ typedef enum _SHUTDOWN_ACTION { ShutdownPowerOff } SHUTDOWN_ACTION, *PSHUTDOWN_ACTION; +typedef struct _COUNTED_REASON_CONTEXT +{ + ULONG Version; + ULONG Flags; + union + { + struct + { + UNICODE_STRING ResourceFileName; + USHORT ResourceReasonId; + ULONG StringCount; + UNICODE_STRING *ReasonStrings; + } DUMMYSTRUCTNAME; + UNICODE_STRING SimpleString; + } DUMMYUNIONNAME; +} COUNTED_REASON_CONTEXT, *PCOUNTED_REASON_CONTEXT; + typedef enum _KPROFILE_SOURCE { ProfileTime, ProfileAlignmentFixup, @@ -2326,6 +2343,7 @@ NTSYSAPI NTSTATUS WINAPI NtCancelIoFile(HANDLE,PIO_STATUS_BLOCK); NTSYSAPI NTSTATUS WINAPI NtCancelIoFileEx(HANDLE,PIO_STATUS_BLOCK,PIO_STATUS_BLOCK); NTSYSAPI NTSTATUS WINAPI NtCancelTimer(HANDLE, BOOLEAN*); NTSYSAPI NTSTATUS WINAPI NtClearEvent(HANDLE); +NTSYSAPI NTSTATUS WINAPI NtClearPowerRequest(HANDLE,POWER_REQUEST_TYPE); NTSYSAPI NTSTATUS WINAPI NtClose(HANDLE); NTSYSAPI NTSTATUS WINAPI NtCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCompleteConnectPort(HANDLE); @@ -2345,6 +2363,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIB NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreatePagingFile(PUNICODE_STRING,PLARGE_INTEGER,PLARGE_INTEGER,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreatePort(PHANDLE,POBJECT_ATTRIBUTES,ULONG,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtCreatePowerRequest(HANDLE*,COUNTED_REASON_CONTEXT*); NTSYSAPI NTSTATUS WINAPI NtCreateProcess(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,BOOLEAN,HANDLE,HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCreateProfile(PHANDLE,HANDLE,PVOID,ULONG,ULONG,PVOID,ULONG,KPROFILE_SOURCE,KAFFINITY); NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); @@ -2510,6 +2529,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighThread(VOID); +NTSYSAPI NTSTATUS WINAPI NtSetPowerRequest(HANDLE,POWER_REQUEST_TYPE); NTSYSAPI NTSTATUS WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); NTSYSAPI NTSTATUS WINAPI NtSetSystemEnvironmentValue(PUNICODE_STRING,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); -- 2.21.0

1 1