March 2018 - Wine-devel - list.winehq.org

[PATCH 1/3] comdlg32: Use flat navigation toolbar
by Nikolay Sivov 21 Mar '18

21 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comdlg32/filedlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a882f80417..81f7449d46 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1443,13 +1443,13 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (fodInfos->unicode) fodInfos->DlgInfos.hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NORESIZE, rectTB.left, rectTB.top, rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); else fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NORESIZE, rectTB.left, rectTB.top, rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); -- 2.16.2

1 2

[PATCH 5/5] ntoskrnl.exe: Add ObGetFilterVersion stub
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index aba16efca5..6ef3d3121d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2327,6 +2327,16 @@ void WINAPI ObUnRegisterCallbacks(void *handle) FIXME( "stub: %p\n", handle ); } +/*********************************************************************** + * ObGetFilterVersion (NTOSKRNL.EXE.@) + */ +USHORT WINAPI ObGetFilterVersion(void) +{ + FIXME( "stub:\n" ); + + return OB_FLT_REGISTRATION_VERSION; +} + /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9f73aac60a..2d3d6f19c3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -805,6 +805,7 @@ @ stdcall ObDereferenceObject(ptr) @ stub ObDereferenceSecurityDescriptor @ stub ObFindHandleForObject +@ stdcall ObGetFilterVersion() @ stub ObGetObjectSecurity @ stub ObInsertObject @ stub ObLogSecurityDescriptor diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 438a97eb79..4fcc20dfeb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1432,6 +1432,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) } void WINAPI ObDereferenceObject(void*); +USHORT WINAPI ObGetFilterVersion(void); NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); -- 2.16.2

1 0

[PATCH 4/5] ntoskrnl.exe: Add ObUnRegisterCallbacks stub
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 63886583ec..aba16efca5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2319,6 +2319,14 @@ NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void ** return STATUS_SUCCESS; } +/*********************************************************************** + * ObUnRegisterCallbacks (NTOSKRNL.EXE.@) + */ +void WINAPI ObUnRegisterCallbacks(void *handle) +{ + FIXME( "stub: %p\n", handle ); +} + /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8c3057f06e..9f73aac60a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -822,6 +822,7 @@ @ stub ObSetHandleAttributes @ stub ObSetSecurityDescriptorInfo @ stub ObSetSecurityObjectByPointer +@ stdcall ObUnRegisterCallbacks(ptr) @ stub PfxFindPrefix @ stub PfxInitialize @ stub PfxInsertPrefix diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index ba0030f4bd..438a97eb79 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1436,6 +1436,7 @@ NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); +void WINAPI ObUnRegisterCallbacks(void*); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); -- 2.16.2

1 0

[PATCH 3/5] ntoskrnl.exe: Add ObRegisterCallbacks stub
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index deca120cb7..63886583ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2306,6 +2306,18 @@ void WINAPI ObfDereferenceObject( void *obj ) ObDereferenceObject( obj ); } +/*********************************************************************** + * ObRegisterCallbacks (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void **handle) +{ + FIXME( "stub: %p %p\n", callBack, handle ); + + if(handle) + *handle = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; +} /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2f54728d65..8c3057f06e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -817,6 +817,7 @@ @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) @ stdcall ObReferenceObjectByPointer(ptr long ptr long) @ stub ObReferenceSecurityDescriptor +@ stdcall ObRegisterCallbacks(ptr ptr) @ stub ObReleaseObjectSecurity @ stub ObSetHandleAttributes @ stub ObSetSecurityDescriptorInfo diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 022ccb3ad8..ba0030f4bd 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1432,6 +1432,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) } void WINAPI ObDereferenceObject(void*); +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); -- 2.16.2

1 0

[PATCH 2/5] include: Add more types to ntifs.h (resend)
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/ntifs.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 32c9e3084b..5e7dd18c7e 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,8 +19,24 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +#include "ntddk.h" + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; +typedef enum _FS_FILTER_SECTION_SYNC_TYPE +{ + SyncTypeOther = 0, + SyncTypeCreateSection +} FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE; + +typedef struct _FS_FILTER_SECTION_SYNC_OUTPUT +{ + ULONG StructureSize; + ULONG SizeReturned; + ULONG Flags; + ULONG DesiredReadAlignment; +} FS_FILTER_SECTION_SYNC_OUTPUT, *PFS_FILTER_SECTION_SYNC_OUTPUT; + typedef struct _KQUEUE { DISPATCHER_HEADER Header; @@ -30,6 +46,7 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif -- 2.16.2

1 0

[PATCH 1/5] include: Add more typedefs to wdm.h (resend)
by Alistair Leslie-Hughes 21 Mar '18

21 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/wdm.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 834f208cf9..022ccb3ad8 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -44,6 +44,7 @@ typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef ULONG_PTR ERESOURCE_THREAD; typedef ERESOURCE_THREAD *PERESOURCE_THREAD; +typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; struct _KDPC; struct _KAPC; @@ -1223,6 +1224,102 @@ typedef struct _KLOCK_QUEUE_HANDLE { typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; +typedef ULONG OB_OPERATION; + +typedef struct _OB_PRE_CREATE_HANDLE_INFORMATION { + ACCESS_MASK DesiredAccess; + ACCESS_MASK OriginalDesiredAccess; +} OB_PRE_CREATE_HANDLE_INFORMATION, *POB_PRE_CREATE_HANDLE_INFORMATION; + +typedef struct _OB_PRE_DUPLICATE_HANDLE_INFORMATION { + ACCESS_MASK DesiredAccess; + ACCESS_MASK OriginalDesiredAccess; + PVOID SourceProcess; + PVOID TargetProcess; +} OB_PRE_DUPLICATE_HANDLE_INFORMATION, *POB_PRE_DUPLICATE_HANDLE_INFORMATION; + +typedef union _OB_PRE_OPERATION_PARAMETERS { + OB_PRE_CREATE_HANDLE_INFORMATION CreateHandleInformation; + OB_PRE_DUPLICATE_HANDLE_INFORMATION DuplicateHandleInformation; +} OB_PRE_OPERATION_PARAMETERS, *POB_PRE_OPERATION_PARAMETERS; + +typedef struct _OB_PRE_OPERATION_INFORMATION { + OB_OPERATION Operation; + union { + ULONG Flags; + struct { + ULONG KernelHandle:1; + ULONG Reserved:31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + PVOID Object; + POBJECT_TYPE ObjectType; + PVOID CallContext; + POB_PRE_OPERATION_PARAMETERS Parameters; +} OB_PRE_OPERATION_INFORMATION, *POB_PRE_OPERATION_INFORMATION; + +typedef struct _OB_POST_CREATE_HANDLE_INFORMATION { + IN ACCESS_MASK GrantedAccess; +} OB_POST_CREATE_HANDLE_INFORMATION, *POB_POST_CREATE_HANDLE_INFORMATION; + +typedef struct _OB_POST_DUPLICATE_HANDLE_INFORMATION { + IN ACCESS_MASK GrantedAccess; +} OB_POST_DUPLICATE_HANDLE_INFORMATION, *POB_POST_DUPLICATE_HANDLE_INFORMATION; + +typedef union _OB_POST_OPERATION_PARAMETERS { + IN OB_POST_CREATE_HANDLE_INFORMATION CreateHandleInformation; + IN OB_POST_DUPLICATE_HANDLE_INFORMATION DuplicateHandleInformation; +} OB_POST_OPERATION_PARAMETERS, *POB_POST_OPERATION_PARAMETERS; + +typedef struct _OB_POST_OPERATION_INFORMATION { + OB_OPERATION Operation; + union { + IN ULONG Flags; + struct { + ULONG KernelHandle:1; + ULONG Reserved:31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + PVOID Object; + POBJECT_TYPE ObjectType; + PVOID CallContext; + NTSTATUS ReturnStatus; + POB_POST_OPERATION_PARAMETERS Parameters; +} OB_POST_OPERATION_INFORMATION,*POB_POST_OPERATION_INFORMATION; + +typedef enum _OB_PREOP_CALLBACK_STATUS { + OB_PREOP_SUCCESS +} OB_PREOP_CALLBACK_STATUS, *POB_PREOP_CALLBACK_STATUS; + +typedef OB_PREOP_CALLBACK_STATUS +(WINAPI *POB_PRE_OPERATION_CALLBACK)(void *context, POB_PRE_OPERATION_INFORMATION information); + +typedef void +(WINAPI *POB_POST_OPERATION_CALLBACK)(void *context, POB_POST_OPERATION_INFORMATION information); + +typedef struct _OB_OPERATION_REGISTRATION { + POBJECT_TYPE *ObjectType; + OB_OPERATION Operations; + POB_PRE_OPERATION_CALLBACK PreOperation; + POB_POST_OPERATION_CALLBACK PostOperation; +} OB_OPERATION_REGISTRATION, *POB_OPERATION_REGISTRATION; + +typedef struct _OB_CALLBACK_REGISTRATION { + USHORT Version; + USHORT OperationRegistrationCount; + UNICODE_STRING Altitude; + PVOID RegistrationContext; + OB_OPERATION_REGISTRATION *OperationRegistration; +} OB_CALLBACK_REGISTRATION, *POB_CALLBACK_REGISTRATION; + +#define OB_FLT_REGISTRATION_VERSION_0100 0x0100 +#define OB_FLT_REGISTRATION_VERSION OB_FLT_REGISTRATION_VERSION_0100 + +typedef enum _DIRECTORY_NOTIFY_INFORMATION_CLASS { + DirectoryNotifyInformation = 1, + DirectoryNotifyExtendedInformation +} DIRECTORY_NOTIFY_INFORMATION_CLASS, *PDIRECTORY_NOTIFY_INFORMATION_CLASS; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION -- 2.16.2

1 0

[PATCH] testbot: DateTimeToString() is not used anymore. Remove it.
by Francois Gouget 21 Mar '18

21 Mar '18

--- testbot/lib/WineTestBot/Utils.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index cc8e2b86d..5538ecd60 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -121,14 +121,6 @@ sub CreateNewDir($$) } } -sub DateTimeToString($) -{ - my ($Time) = @_; - -# my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); - return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); -} - sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_; -- 2.16.2

1 0

[PATCH] testbot: Trace the pid of child processes being killed.
by Francois Gouget 21 Mar '18

21 Mar '18

This helps analysing the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7a35ba742..35bbe2a59 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -292,7 +292,12 @@ It is up to the caller to save the updated VM object. sub KillChild($) { my ($self) = @_; - kill("TERM", $self->ChildPid) if ($self->ChildPid); + if ($self->ChildPid) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Killing child ". $self->ChildPid ."\n"); + kill("TERM", $self->ChildPid); + } $self->ChildPid(undef); } -- 2.16.2

1 0

[PATCH 2/2] testbot/web: Use GET to send the Activity period.
by Francois Gouget 21 Mar '18

21 Mar '18

This way when the page refreshes it automatically reuses the same period. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d5fe6f3ae..ddea602e8 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -46,6 +46,7 @@ sub _initialize($$$) } $self->SUPER::_initialize($Request, $RequiredRole); + $self->{Method} = "get"; } sub GeneratePage($) -- 2.16.2

1 0

[PATCH 1/2] testbot/web: Let web pages decide whether to POST or GET the parameters.
by Francois Gouget 21 Mar '18

21 Mar '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7669067f1..1745ec87b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -44,6 +44,7 @@ sub _initialize($$$$) $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; + $self->{Method} = "post"; } sub GetPropertyDescriptors($) @@ -136,9 +137,9 @@ sub GenerateBody($) sub GenerateFormStart($) { - #my ($self) = @_; + my ($self) = @_; print "<form action='" . $ENV{"SCRIPT_NAME"} . - "' method='post' enctype='multipart/form-data'>\n"; + "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } sub GenerateFields($) -- 2.16.2

1 0