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

Nikolay Sivov : user32/menu: Replace macro checks for window style with a helper function.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: 6cae93a36e217cf45c8e09913442a805eb95e95f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cae93a36e217cf45c8e0991… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 16 14:12:13 2018 +0300 user32/menu: Replace macro checks for window style with a helper function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 20a569c..537c2eb 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -165,8 +165,6 @@ typedef struct #define STATE_MASK (~TYPE_MASK) #define MENUITEMINFO_STATE_MASK (STATE_MASK & ~(MF_BYPOSITION | MF_MOUSESELECT)) -#define WIN_ALLOWED_MENU(style) ((style & (WS_CHILD | WS_POPUP)) != WS_CHILD) - static SIZE menucharsize; static UINT ODitemheight; /* default owner drawn item height */ @@ -182,6 +180,11 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFO static BOOL SetMenuItemInfo_common( MENUITEM *, const MENUITEMINFOW *, BOOL); +static BOOL is_win_menu_disallowed(HWND hwnd) +{ + return (GetWindowLongW(hwnd, GWL_STYLE) & (WS_CHILD | WS_POPUP)) == WS_CHILD; +} + /********************************************************************* * menu class descriptor */ @@ -3442,7 +3445,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) /* find window that has a menu */ - while (!WIN_ALLOWED_MENU(GetWindowLongW( hwnd, GWL_STYLE ))) + while (is_win_menu_disallowed(hwnd)) if (!(hwnd = GetAncestor( hwnd, GA_PARENT ))) return; /* check if we have to track a system menu */ @@ -4375,7 +4378,7 @@ BOOL MENU_SetMenu( HWND hWnd, HMENU hMenu ) WARN("hMenu %p is not a menu handle\n", hMenu); return FALSE; } - if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) + if (is_win_menu_disallowed(hWnd)) return FALSE; hWnd = WIN_GetFullHandle( hWnd ); @@ -4432,7 +4435,7 @@ BOOL WINAPI DrawMenuBar( HWND hWnd ) if (!IsWindow( hWnd )) return FALSE; - if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) + if (is_win_menu_disallowed(hWnd)) return TRUE; if ((hMenu = GetMenu( hWnd )))

1 0

Austin English : iphlpapi: Add GetIpForwardTable2 stub.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: cf9eced885cb0a2ac664c967ac3e391f0ebfdaf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf9eced885cb0a2ac664c967… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 13 16:11:15 2018 -0500 iphlpapi: Add GetIpForwardTable2 stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ include/netioapi.h | 35 +++++++++++++++++++++++++++++++++++ include/nldef.h | 9 +++++++++ 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index bbd1ed8..1686644 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -102,7 +102,7 @@ #@ stub GetIpErrorString #@ stub GetIpForwardEntry2 @ stdcall GetIpForwardTable( ptr ptr long ) -#@ stub GetIpForwardTable2 +@ stdcall GetIpForwardTable2( long ptr ) @ stub GetIpForwardTableFromStack #@ stub GetIpInterfaceEntry #@ stub GetIpInterfaceTable diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d81fb6a..7911e9d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3264,3 +3264,14 @@ PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) return getInterfaceNameByIndex(index, name); } + +/****************************************************************** + * GetIpForwardTable2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIpForwardTable2(ADDRESS_FAMILY family, PMIB_IPFORWARD_TABLE2 *table) +{ + static int once; + + if (!once++) FIXME("(%u %p): stub\n", family, table); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/netioapi.h b/include/netioapi.h index 11cadf6..f15a80f 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -21,6 +21,10 @@ #include <ntddndis.h> +#ifndef ANY_SIZE +#define ANY_SIZE 1 +#endif + typedef enum _MIB_IF_TABLE_LEVEL { MibIfTableNormal, @@ -158,6 +162,37 @@ typedef struct _MIB_UNICASTIPADDRESS_TABLE MIB_UNICASTIPADDRESS_ROW Table[1]; } MIB_UNICASTIPADDRESS_TABLE, *PMIB_UNICASTIPADDRESS_TABLE; +typedef struct _IP_ADDRESS_PREFIX +{ + SOCKADDR_INET Prefix; + UINT8 PrefixLength; +} IP_ADDRESS_PREFIX, *PIP_ADDRESS_PREFIX; + +typedef struct _MIB_IPFORWARD_ROW2 +{ + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + IP_ADDRESS_PREFIX DestinationPrefix; + SOCKADDR_INET NextHop; + UCHAR SitePrefixLength; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG Metric; + NL_ROUTE_PROTOCOL Protocol; + BOOLEAN Loopback; + BOOLEAN AutoconfigureAddress; + BOOLEAN Publish; + BOOLEAN Immortal; + ULONG Age; + NL_ROUTE_ORIGIN Origin; +} MIB_IPFORWARD_ROW2, *PMIB_IPFORWARD_ROW2; + +typedef struct _MIB_IPFORWARD_TABLE2 +{ + ULONG NumEntries; + MIB_IPFORWARD_ROW2 Table[ANY_SIZE]; +} MIB_IPFORWARD_TABLE2, *PMIB_IPFORWARD_TABLE2; + typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, MIB_NOTIFICATION_TYPE); typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, diff --git a/include/nldef.h b/include/nldef.h index 1f96773..983b96c 100644 --- a/include/nldef.h +++ b/include/nldef.h @@ -28,6 +28,15 @@ typedef enum IpPrefixOriginUnchanged = 16, } NL_PREFIX_ORIGIN; +typedef enum _NL_ROUTE_ORIGIN +{ + NlroManual, + NlroWellKnown, + NlroDHCP, + NlroRouterAdvertisement, + Nlro6to4, +} NL_ROUTE_ORIGIN, *PNL_ROUTE_ORIGIN; + typedef enum { IpSuffixOriginOther = 0,

1 0

Austin English : ntdsapi: Add DsCrackNamesA/W stubs.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: 369c163929dc82c66b65077a5e28d0821ec8b382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=369c163929dc82c66b65077a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 13 16:11:47 2018 -0500 ntdsapi: Add DsCrackNamesA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ...-win-security-activedirectoryclient-l1-1-0.spec | 2 +- dlls/ntdsapi/ntdsapi.c | 23 +++++++++ dlls/ntdsapi/ntdsapi.spec | 4 +- include/ntdsapi.h | 59 ++++++++++++++++++++++ 4 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec index eef1c40..8f897f7 100644 --- a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub DsBindWithSpnExW -@ stub DsCrackNamesW +@ stdcall DsCrackNamesW(ptr long long long long ptr ptr) ntdsapi.DsCrackNamesW @ stub DsFreeDomainControllerInfoW @ stub DsFreeNameResultW @ stub DsFreePasswordCredentials diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index ee0c837..003b1a2 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -204,6 +204,9 @@ DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClas return ERROR_CALL_NOT_IMPLEMENTED; } +/*********************************************************************** + * DsClientMakeSpnForTargetServerW (NTDSAPI.@) + */ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD *buflen, LPWSTR buf) { DWORD len; @@ -229,3 +232,23 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD return ERROR_SUCCESS; } + +/*********************************************************************** + * DsCrackNamesA (NTDSAPI.@) + */ +DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, + DWORD num, const CHAR **names, PDS_NAME_RESULTA *result) +{ + FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsCrackNamesW (NTDSAPI.@) + */ +DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, + DWORD num, const WCHAR **names, PDS_NAME_RESULTW *result) +{ + FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index 925cb71..bc7827d 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -8,8 +8,8 @@ @ stub DsBindWithSpnW @ stub DsClientMakeSpnForTargetServerA @ stdcall DsClientMakeSpnForTargetServerW(wstr wstr ptr ptr) -@ stub DsCrackNamesA -@ stub DsCrackNamesW +@ stdcall DsCrackNamesA(ptr long long long long ptr ptr) +@ stdcall DsCrackNamesW(ptr long long long long ptr ptr) @ stub DsCrackSpn2A @ stub DsCrackSpn2W @ stub DsCrackSpn3W diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 672ea63..099c205 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -35,6 +35,30 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWS typedef enum { + DS_NAME_NO_FLAGS = 0x0, + DS_NAME_FLAG_SYNTACTICAL_ONLY = 0x1, + DS_NAME_FLAG_EVAL_AT_DC = 0x2, + DS_NAME_FLAG_GCVERIFY = 0x4, + DS_NAME_FLAG_TRUST_REFERRAL = 0x8 +} DS_NAME_FLAGS; + +typedef enum +{ + DS_UNKNOWN_NAME = 0, + DS_FQDN_1779_NAME = 1, + DS_NT4_ACCOUNT_NAME = 2, + DS_DISPLAY_NAME = 3, + DS_UNIQUE_ID_NAME = 6, + DS_CANONICAL_NAME = 7, + DS_USER_PRINCIPAL_NAME = 8, + DS_CANONICAL_NAME_EX = 9, + DS_SERVICE_PRINCIPAL_NAME = 10, + DS_SID_OR_SID_HISTORY_NAME = 11, + DS_DNS_DOMAIN_NAME = 12 +} DS_NAME_FORMAT; + +typedef enum +{ DS_SPN_DNS_HOST = 0, DS_SPN_DN_HOST = 1, DS_SPN_NB_HOST = 2, @@ -50,6 +74,41 @@ typedef enum DS_SPN_DELETE_SPN_OP = 2 } DS_SPN_WRITE_OP; +typedef struct +{ + DWORD status; + LPSTR pDomain; + LPSTR pName; +} DS_NAME_RESULT_ITEMA, *PDS_NAME_RESULT_ITEMA; + +typedef struct +{ + DWORD status; + LPWSTR pDomain; + LPWSTR pName; +} DS_NAME_RESULT_ITEMW, *PDS_NAME_RESULT_ITEMW; + +DECL_WINELIB_TYPE_AW(DS_NAME_RESULT_ITEM) +DECL_WINELIB_TYPE_AW(PDS_NAME_RESULT_ITEM) + +typedef struct +{ + DWORD cItems; + PDS_NAME_RESULT_ITEMA rItems; +} DS_NAME_RESULTA, *PDS_NAME_RESULTA; + +typedef struct +{ + DWORD cItems; + PDS_NAME_RESULT_ITEMW rItems; +} DS_NAME_RESULTW, *PDS_NAME_RESULTW; + +DECL_WINELIB_TYPE_AW(DS_NAME_RESULT) +DECL_WINELIB_TYPE_AW(PDS_NAME_RESULT) + +DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const CHAR **names, PDS_NAME_RESULTA *result); +DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const WCHAR **names, PDS_NAME_RESULTW *result); +#define DsCrackNames WINELIB_NAME_AW(DsCrackNames) DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN); DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN); #define DsServerRegisterSpn WINELIB_NAME_AW(DsServerRegisterSpn)

1 0

Alistair Leslie-Hughes : ntoskrnl: Add FsRtlRegisterFileSystemFilterCallbacks stub.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: f8f7b46ea4fb85285d8dc93195287c2ede096251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8f7b46ea4fb85285d8dc931… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 17 05:09:00 2018 +0000 ntoskrnl: Add FsRtlRegisterFileSystemFilterCallbacks stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 82 +++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8e6fde2..99f5f92 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3516,3 +3516,12 @@ HANDLE WINAPI PsGetProcessId(PEPROCESS process) return 0; } + +/********************************************************************* + * FsRtlRegisterFileSystemFilterCallbacks (NTOSKRNL.@) + */ +NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, PFS_FILTER_CALLBACKS callbacks) +{ + FIXME("stub: %p %p\n", object, callbacks); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ce9f93c..0bece17 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -273,7 +273,7 @@ @ stub FsRtlPrepareMdlWriteDev @ stub FsRtlPrivateLock @ stub FsRtlProcessFileLock -@ stub FsRtlRegisterFileSystemFilterCallbacks +@ stdcall FsRtlRegisterFileSystemFilterCallbacks(ptr ptr) @ stdcall FsRtlRegisterUncProvider(ptr ptr long) @ stub FsRtlReleaseFile @ stub FsRtlRemoveLargeMcbEntry diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 8c63d0b..50aaabe 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -46,6 +46,88 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +typedef enum _FS_FILTER_STREAM_FO_NOTIFICATION_TYPE +{ + NotifyTypeCreate = 0, + NotifyTypeRetired +} FS_FILTER_STREAM_FO_NOTIFICATION_TYPE, *PFS_FILTER_STREAM_FO_NOTIFICATION_TYPE; + +typedef union _FS_FILTER_PARAMETERS +{ + struct + { + PLARGE_INTEGER EndingOffset; + PERESOURCE *ResourceToRelease; + } AcquireForModifiedPageWriter; + + struct + { + PERESOURCE ResourceToRelease; + } ReleaseForModifiedPageWriter; + + struct + { + FS_FILTER_SECTION_SYNC_TYPE SyncType; + ULONG PageProtection; + PFS_FILTER_SECTION_SYNC_OUTPUT OutputInformation; + } AcquireForSectionSynchronization; + + struct + { + FS_FILTER_STREAM_FO_NOTIFICATION_TYPE NotificationType; + BOOLEAN POINTER_ALIGNMENT SafeToRecurse; + } NotifyStreamFileObject; + + struct + { + PIRP Irp; + void *FileInformation; + PULONG Length; + FILE_INFORMATION_CLASS FileInformationClass; + NTSTATUS CompletionStatus; + } QueryOpen; + + struct + { + void *Argument1; + void *Argument2; + void *Argument3; + void *Argument4; + void *Argument5; + } Others; + +} FS_FILTER_PARAMETERS, *PFS_FILTER_PARAMETERS; + +typedef struct _FS_FILTER_CALLBACK_DATA +{ + ULONG SizeOfFsFilterCallbackData; + UCHAR Operation; + UCHAR Reserved; + struct _DEVICE_OBJECT *DeviceObject; + struct _FILE_OBJECT *FileObject; + FS_FILTER_PARAMETERS Parameters; +} FS_FILTER_CALLBACK_DATA, *PFS_FILTER_CALLBACK_DATA; + +typedef NTSTATUS (WINAPI *PFS_FILTER_CALLBACK)(PFS_FILTER_CALLBACK_DATA, void **); +typedef void (WINAPI *PFS_FILTER_COMPLETION_CALLBACK)(PFS_FILTER_CALLBACK_DATA, NTSTATUS, void *context); + +typedef struct _FS_FILTER_CALLBACKS +{ + ULONG SizeOfFsFilterCallbacks; + ULONG Reserved; + PFS_FILTER_CALLBACK PreAcquireForSectionSynchronization; + PFS_FILTER_COMPLETION_CALLBACK PostAcquireForSectionSynchronization; + PFS_FILTER_CALLBACK PreReleaseForSectionSynchronization; + PFS_FILTER_COMPLETION_CALLBACK PostReleaseForSectionSynchronization; + PFS_FILTER_CALLBACK PreAcquireForCcFlush; + PFS_FILTER_COMPLETION_CALLBACK PostAcquireForCcFlush; + PFS_FILTER_CALLBACK PreReleaseForCcFlush; + PFS_FILTER_COMPLETION_CALLBACK PostReleaseForCcFlush; + PFS_FILTER_CALLBACK PreAcquireForModifiedPageWriter; + PFS_FILTER_COMPLETION_CALLBACK PostAcquireForModifiedPageWriter; + PFS_FILTER_CALLBACK PreReleaseForModifiedPageWriter; + PFS_FILTER_COMPLETION_CALLBACK PostReleaseForModifiedPageWriter; +} FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG);

1 0

Alexandre Julliard : user32: Reimplement AdjustWindowRectEx using NONCLIENTMETRICSW.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: 77013e97960e10a7e0ea4dd7e239dc0668d54f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77013e97960e10a7e0ea4dd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 11:22:52 2018 +0200 user32: Reimplement AdjustWindowRectEx using NONCLIENTMETRICSW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 100 +++++++++--------------------------------------- dlls/user32/tests/win.c | 32 +++++++--------- 2 files changed, 33 insertions(+), 99 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 3f3d96a..1bdb823 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -55,54 +55,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(nonclient); (((exStyle) & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == \ WS_EX_STATICEDGE) -#define HAS_ANYFRAME(style,exStyle) \ - (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \ - ((exStyle) & WS_EX_DLGMODALFRAME) || \ - !((style) & (WS_CHILD | WS_POPUP))) - #define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) -/****************************************************************************** - * NC_AdjustRectOuter - * - * Computes the size of the "outside" parts of the window based on the - * parameters of the client area. - * - * PARAMS - * LPRECT rect - * DWORD style - * BOOL menu - * DWORD exStyle - * - * NOTES - * "Outer" parts of a window means the whole window frame, caption and - * menu bar. It does not include "inner" parts of the frame like client - * edge, static edge or scroll bars. - * - *****************************************************************************/ - -static void -NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle) +static void adjust_window_rect( RECT *rect, DWORD style, BOOL menu, DWORD exStyle, NONCLIENTMETRICSW *ncm ) { - int adjust; + int adjust = 0; - if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == - WS_EX_STATICEDGE) - { + if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) adjust = 1; /* for the outer frame always present */ - } - else - { - adjust = 0; - if ((exStyle & WS_EX_DLGMODALFRAME) || - (style & (WS_THICKFRAME|WS_DLGFRAME))) adjust = 2; /* outer */ - } + else if ((exStyle & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) + adjust = 2; /* outer */ + if (style & WS_THICKFRAME) - adjust += ( GetSystemMetrics (SM_CXFRAME) - - GetSystemMetrics (SM_CXDLGFRAME)); /* The resize border */ - if ((style & (WS_BORDER|WS_DLGFRAME)) || - (exStyle & WS_EX_DLGMODALFRAME)) + adjust += ncm->iBorderWidth + ncm->iPaddedBorderWidth; /* The resize border */ + + if ((style & (WS_BORDER|WS_DLGFRAME)) || (exStyle & WS_EX_DLGMODALFRAME)) adjust++; /* The other border */ InflateRect (rect, adjust, adjust); @@ -110,50 +78,17 @@ NC_AdjustRectOuter (LPRECT rect, DWORD style, BOOL menu, DWORD exStyle) if ((style & WS_CAPTION) == WS_CAPTION) { if (exStyle & WS_EX_TOOLWINDOW) - rect->top -= GetSystemMetrics(SM_CYSMCAPTION); + rect->top -= ncm->iSmCaptionHeight + 1; else - rect->top -= GetSystemMetrics(SM_CYCAPTION); + rect->top -= ncm->iCaptionHeight + 1; } - if (menu) rect->top -= GetSystemMetrics(SM_CYMENU); -} + if (menu) rect->top -= ncm->iMenuHeight + 1; - -/****************************************************************************** - * NC_AdjustRectInner - * - * Computes the size of the "inside" part of the window based on the - * parameters of the client area. - * - * PARAMS - * LPRECT rect - * DWORD style - * DWORD exStyle - * - * NOTES - * "Inner" part of a window means the window frame inside of the flat - * window frame. It includes the client edge, the static edge and the - * scroll bars. - * - *****************************************************************************/ - -static void -NC_AdjustRectInner (LPRECT rect, DWORD style, DWORD exStyle) -{ if (exStyle & WS_EX_CLIENTEDGE) InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE)); - - if (style & WS_VSCROLL) - { - if((exStyle & WS_EX_LEFTSCROLLBAR) != 0) - rect->left -= GetSystemMetrics(SM_CXVSCROLL); - else - rect->right += GetSystemMetrics(SM_CXVSCROLL); - } - if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL); } - static HICON NC_IconForWindow( HWND hwnd ) { HICON hIcon = 0; @@ -378,13 +313,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRect( LPRECT rect, DWORD style, BOOL m */ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) { + NONCLIENTMETRICSW ncm; + if (style & WS_MINIMIZE) return TRUE; - style &= ~(WS_HSCROLL | WS_VSCROLL); TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); - NC_AdjustRectOuter( rect, style, menu, exStyle ); - NC_AdjustRectInner( rect, style, exStyle ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + + adjust_window_rect( rect, style, menu, exStyle, &ncm ); return TRUE; } @@ -411,7 +349,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (!(style & WS_MINIMIZE)) { - NC_AdjustRectOuter( &tmpRect, style, FALSE, exStyle ); + AdjustWindowRectEx( &tmpRect, style, FALSE, exStyle & ~WS_EX_CLIENTEDGE); winRect->left -= tmpRect.left; winRect->top -= tmpRect.top; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e8d0b0f..61bb736 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1014,23 +1014,19 @@ static void FixedAdjustWindowRectEx(RECT* rc, LONG style, BOOL menu, LONG exstyl /* reimplement it to check that the Wine algorithm gives the correct result */ static void wine_AdjustWindowRectEx( RECT *rect, LONG style, BOOL menu, LONG exStyle ) { - int adjust; + NONCLIENTMETRICSW ncm; + int adjust = 0; - if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == - WS_EX_STATICEDGE) - { + ncm.cbSize = offsetof( NONCLIENTMETRICSW, iPaddedBorderWidth ); + SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + + if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) adjust = 1; /* for the outer frame always present */ - } - else - { - adjust = 0; - if ((exStyle & WS_EX_DLGMODALFRAME) || - (style & (WS_THICKFRAME|WS_DLGFRAME))) adjust = 2; /* outer */ - } - if (style & WS_THICKFRAME) - adjust += GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXDLGFRAME); /* The resize border */ - if ((style & (WS_BORDER|WS_DLGFRAME)) || - (exStyle & WS_EX_DLGMODALFRAME)) + else if ((exStyle & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) + adjust = 2; /* outer */ + + if (style & WS_THICKFRAME) adjust += ncm.iBorderWidth; /* The resize border */ + if ((style & (WS_BORDER|WS_DLGFRAME)) || (exStyle & WS_EX_DLGMODALFRAME)) adjust++; /* The other border */ InflateRect (rect, adjust, adjust); @@ -1038,11 +1034,11 @@ static void wine_AdjustWindowRectEx( RECT *rect, LONG style, BOOL menu, LONG exS if ((style & WS_CAPTION) == WS_CAPTION) { if (exStyle & WS_EX_TOOLWINDOW) - rect->top -= GetSystemMetrics(SM_CYSMCAPTION); + rect->top -= ncm.iSmCaptionHeight + 1; else - rect->top -= GetSystemMetrics(SM_CYCAPTION); + rect->top -= ncm.iCaptionHeight + 1; } - if (menu) rect->top -= GetSystemMetrics(SM_CYMENU); + if (menu) rect->top -= ncm.iMenuHeight + 1; if (exStyle & WS_EX_CLIENTEDGE) InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));

1 0

Alexandre Julliard : user32: Implement AdjustWindowRectExForDpi().
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: 300217e38b63a61a3539c1ba20ad1cd1c1a69dbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=300217e38b63a61a3539c1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 11:23:29 2018 +0200 user32: Implement AdjustWindowRectExForDpi(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 19 +++++++++++++++++++ dlls/user32/tests/win.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 1bdb823..4444a2c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -323,7 +323,26 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); adjust_window_rect( rect, style, menu, exStyle, &ncm ); + return TRUE; +} + + +/*********************************************************************** + * AdjustWindowRectExForDpi (USER32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style, BOOL menu, + DWORD exStyle, UINT dpi ) +{ + NONCLIENTMETRICSW ncm; + + if (style & WS_MINIMIZE) return TRUE; + + TRACE("(%s) %08x %d %08x %u\n", wine_dbgstr_rect(rect), style, menu, exStyle, dpi ); + ncm.cbSize = sizeof(ncm); + SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); + + adjust_window_rect( rect, style, menu, exStyle, &ncm ); return TRUE; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 61bb736..d409918 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -69,6 +69,8 @@ static DWORD (WINAPI *pGetLayout)(HDC hdc); static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL (WINAPI *pGetWindowDisplayAffinity)(HWND hwnd, DWORD *affinity); static BOOL (WINAPI *pSetWindowDisplayAffinity)(HWND hwnd, DWORD affinity); +static BOOL (WINAPI *pAdjustWindowRectExForDpi)(LPRECT,DWORD,BOOL,DWORD,UINT); +static BOOL (WINAPI *pSystemParametersInfoForDpi)(UINT,UINT,void*,UINT,UINT); static BOOL test_lbuttondown_flag; static DWORD num_gettext_msgs; @@ -1053,6 +1055,39 @@ static void wine_AdjustWindowRectEx( RECT *rect, LONG style, BOOL menu, LONG exS if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL); } +static void wine_AdjustWindowRectExForDpi( RECT *rect, LONG style, BOOL menu, LONG exStyle, UINT dpi ) +{ + NONCLIENTMETRICSW ncm; + int adjust = 0; + + ncm.cbSize = sizeof(ncm); + pSystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); + + if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) + adjust = 1; /* for the outer frame always present */ + else if ((exStyle & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) + adjust = 2; /* outer */ + + if (style & WS_THICKFRAME) adjust += ncm.iBorderWidth + ncm.iPaddedBorderWidth; + + if ((style & (WS_BORDER|WS_DLGFRAME)) || (exStyle & WS_EX_DLGMODALFRAME)) + adjust++; /* The other border */ + + InflateRect (rect, adjust, adjust); + + if ((style & WS_CAPTION) == WS_CAPTION) + { + if (exStyle & WS_EX_TOOLWINDOW) + rect->top -= ncm.iSmCaptionHeight + 1; + else + rect->top -= ncm.iCaptionHeight + 1; + } + if (menu) rect->top -= ncm.iMenuHeight + 1; + + if (exStyle & WS_EX_CLIENTEDGE) + InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE)); +} + static void test_nonclient_area(HWND hwnd) { DWORD style, exstyle; @@ -5282,8 +5317,15 @@ static void test_AWR_flags(void) rect2 = rect; AdjustWindowRectEx( &rect, style, FALSE, exstyle ); wine_AdjustWindowRectEx( &rect2, style, FALSE, exstyle ); - ok( EqualRect( &rect, &rect2 ), "rects do not match: win %s wine %s\n", - wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); + ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n", + style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); + if (pAdjustWindowRectExForDpi) + { + pAdjustWindowRectExForDpi( &rect, style, FALSE, exstyle, 192 ); + wine_AdjustWindowRectExForDpi( &rect2, style, FALSE, exstyle, 192 ); + ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n", + style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); + } } } } @@ -10521,6 +10563,8 @@ START_TEST(win) pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); pGetWindowDisplayAffinity = (void *)GetProcAddress( user32, "GetWindowDisplayAffinity" ); pSetWindowDisplayAffinity = (void *)GetProcAddress( user32, "SetWindowDisplayAffinity" ); + pAdjustWindowRectExForDpi = (void *)GetProcAddress( user32, "AdjustWindowRectExForDpi" ); + pSystemParametersInfoForDpi = (void *)GetProcAddress( user32, "SystemParametersInfoForDpi" ); if (argc==4 && !strcmp(argv[2], "create_children")) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 3314518..8d9058b 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -2,6 +2,7 @@ @ stdcall AddClipboardFormatListener(long) @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) +@ stdcall AdjustWindowRectExForDpi(ptr long long long long) @ stdcall AlignRects(ptr long long long) # @ stub AllowForegroundActivation @ stdcall AllowSetForegroundWindow (long) diff --git a/include/winuser.h b/include/winuser.h index ab3aba2..86cdbf6 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3369,6 +3369,7 @@ WINUSERAPI HKL WINAPI ActivateKeyboardLayout(HKL,UINT); WINUSERAPI BOOL WINAPI AddClipboardFormatListener(HWND); WINUSERAPI BOOL WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL); WINUSERAPI BOOL WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD); +WINUSERAPI BOOL WINAPI AdjustWindowRectExForDpi(RECT*,DWORD,BOOL,DWORD,UINT); WINUSERAPI BOOL WINAPI AllowSetForegroundWindow(DWORD); WINUSERAPI BOOL WINAPI AnimateWindow(HWND,DWORD,DWORD); #define AnsiLowerA CharLowerA

1 0

Dmitry Timoshkov : schedsvc: Add a thread for monitoring version 1 task files.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: 2eb6f886708f83dea275d0ba14305a51de443f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb6f886708f83dea275d0ba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 15:12:03 2018 +0800 schedsvc: Add a thread for monitoring version 1 task files. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 73 +++++++++++++++++++++++++++++++++++++++++++++--- loader/wine.inf.in | 1 + 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8713bdb..3de0253 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -36,6 +36,66 @@ static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; static SERVICE_STATUS_HANDLE schedsvc_handle; static HANDLE done_event; +static DWORD WINAPI tasks_monitor_thread(void *arg) +{ + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + WCHAR path[MAX_PATH]; + HANDLE htasks; + OVERLAPPED ov; + + TRACE("Starting...\n"); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + + htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); + if (htasks == INVALID_HANDLE_VALUE) return -1; + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + for (;;) + { + struct + { + FILE_NOTIFY_INFORMATION data; + WCHAR name_buffer[MAX_PATH]; + } info; + HANDLE events[2]; + DWORD ret; + + /* the buffer must be DWORD aligned */ + C_ASSERT(!(sizeof(info) & 3)); + + memset(&info, 0, sizeof(info)); + + ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, NULL); + if (!ret) break; + + events[0] = done_event; + events[1] = ov.hEvent; + + ret = WaitForMultipleObjects(2, events, FALSE, INFINITE); + if (ret == WAIT_OBJECT_0) break; + + switch (info.data.Action) + { + default: + FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); + break; + } + } + + CloseHandle(ov.hEvent); + CloseHandle(htasks); + + TRACE("Finished.\n"); + + return 0; +} + void schedsvc_auto_start(void) { static DWORD start_type; @@ -201,6 +261,9 @@ static void RPC_finish(void) void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { + HANDLE thread; + DWORD tid; + TRACE("starting Task Scheduler Service\n"); schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); @@ -210,14 +273,16 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) return; } - done_event = CreateEventW(NULL, TRUE, FALSE, NULL); - schedsvc_update_status(SERVICE_START_PENDING); - if (RPC_init() == RPC_S_OK) + done_event = CreateEventW(NULL, TRUE, FALSE, NULL); + thread = CreateThread(NULL, 0, tasks_monitor_thread, NULL, 0, &tid); + + if (thread && RPC_init() == RPC_S_OK) { schedsvc_update_status(SERVICE_RUNNING); - WaitForSingleObject(done_event, INFINITE); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); RPC_finish(); } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0df7622..627c6ef 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2579,6 +2579,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,help, 10,inf, 10,logs, +10,tasks, 10,temp, 11,catroot, 11,mui,

1 0

Dmitry Timoshkov : schedsvc: Add support for reading .job files.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: 2b8d47694d07c6d82fe27589cb40c4d9a6084e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8d47694d07c6d82fe27589… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 15:12:06 2018 +0800 schedsvc: Add support for reading .job files. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 301 +++++++++++++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 9 ++ include/mstask.idl | 14 ++ 4 files changed, 325 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b8d47694d07c6d82fe2…

1 0

Dmitry Timoshkov : schedsvc: Remove job from the list when job file is deleted.
by Alexandre Julliard 17 Apr '18

17 Apr '18

Module: wine Branch: master Commit: c85bc14d55e0f75de1591cf2b0f50c36898c9cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c85bc14d55e0f75de1591cf2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 15:12:08 2018 +0800 schedsvc: Remove job from the list when job file is deleted. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 28 ++++++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 8 ++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index baa808a..7b1c60b 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -327,6 +327,34 @@ void add_job(const WCHAR *name) } } +static struct job_t *find_job(DWORD jobid, const WCHAR *name) +{ + struct job_t *job; + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if ((name && !lstrcmpiW(job->name, name)) || job->info.JobId == jobid) + return job; + } + + return NULL; +} + +void remove_job(const WCHAR *name) +{ + struct job_t *job; + + EnterCriticalSection(&at_job_list_section); + job = find_job(0, name); + if (job) + { + list_remove(&job->entry); + heap_free(job->name); + heap_free(job); + } + LeaveCriticalSection(&at_job_list_section); +} + DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { FIXME("%s,%p,%p: stub\n", debugstr_w(server_name), info, jobid); diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 1e5d575..215bba0 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -24,6 +24,7 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; +void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 0835d71..1ccc345 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -91,6 +91,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) add_job(path); break; + case FILE_ACTION_REMOVED: + TRACE("FILE_ACTION_REMOVED %s\n", debugstr_w(info.data.FileName)); + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + lstrcatW(path, info.data.FileName); + remove_job(path); + break; + default: FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break;

1 0

Nikolay Sivov : wined3d: Add support for setting multiple viewports.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: wine Branch: master Commit: 853f6538e4415c146ce56e8839b9bcd3bccff4fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=853f6538e4415c146ce56e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 14 12:12:38 2018 +0300 wined3d: Add support for setting multiple viewports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/cs.c | 35 +++++++++------ dlls/wined3d/device.c | 52 +++++++++++++--------- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++----- dlls/wined3d/state.c | 92 +++++++++++++++++++++++++++++---------- dlls/wined3d/stateblock.c | 12 +++-- dlls/wined3d/utils.c | 17 ++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 29 +++++++----- include/wine/wined3d.h | 5 ++- 14 files changed, 202 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=853f6538e4415c146ce5…

1 0