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

patch [1/5] ddraw: Port Enumdevices to ddraw7
by David Adam April 3, 2019

April 3, 2019

2 1

[PATCH] ksecdd.sys: add stub driver
by Austin English April 3, 2019

April 3, 2019

With this, the installer completes and 'inventory.exe' runs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46898 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ksecdd.sys/Makefile.in | 7 +++ dlls/ksecdd.sys/ksecdd.sys.spec | 104 ++++++++++++++++++++++++++++++++ dlls/ksecdd.sys/main.c | 35 +++++++++++ dlls/ksecdd.sys/version.rc | 26 ++++++++ loader/wine.inf.in | 2 + 7 files changed, 177 insertions(+) create mode 100644 dlls/ksecdd.sys/Makefile.in create mode 100644 dlls/ksecdd.sys/ksecdd.sys.spec create mode 100644 dlls/ksecdd.sys/main.c create mode 100644 dlls/ksecdd.sys/version.rc diff --git a/configure b/configure index 6f9013c3a5..27c7689ea3 100755 --- a/configure +++ b/configure @@ -1358,6 +1358,7 @@ enable_jsproxy enable_kerberos enable_kernel32 enable_kernelbase +enable_ksecdd_sys enable_ksuser enable_ktmw32 enable_l3codeca_acm @@ -19652,6 +19653,7 @@ wine_fn_config_makefile dlls/kernelbase enable_kernelbase wine_fn_config_makefile dlls/kernelbase/tests enable_tests wine_fn_config_makefile dlls/keyboard.drv16 enable_win16 wine_fn_config_makefile dlls/krnl386.exe16 enable_win16 +wine_fn_config_makefile dlls/ksecdd.sys enable_ksecdd_sys wine_fn_config_makefile dlls/ksuser enable_ksuser wine_fn_config_makefile dlls/ktmw32 enable_ktmw32 wine_fn_config_makefile dlls/l3codeca.acm enable_l3codeca_acm diff --git a/configure.ac b/configure.ac index 6c725667dc..38e8d393e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3372,6 +3372,7 @@ WINE_CONFIG_MAKEFILE(dlls/kernelbase) WINE_CONFIG_MAKEFILE(dlls/kernelbase/tests) WINE_CONFIG_MAKEFILE(dlls/keyboard.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/krnl386.exe16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/ksecdd.sys) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) diff --git a/dlls/ksecdd.sys/Makefile.in b/dlls/ksecdd.sys/Makefile.in new file mode 100644 index 0000000000..9b6430e0e8 --- /dev/null +++ b/dlls/ksecdd.sys/Makefile.in @@ -0,0 +1,7 @@ +MODULE = ksecdd.sys +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/ksecdd.sys/ksecdd.sys.spec b/dlls/ksecdd.sys/ksecdd.sys.spec new file mode 100644 index 0000000000..31b1b35d71 --- /dev/null +++ b/dlls/ksecdd.sys/ksecdd.sys.spec @@ -0,0 +1,104 @@ +@ stub SystemPrng +@ stub AcceptSecurityContext +@ stub AcquireCredentialsHandleW +@ stub AddCredentialsW +@ stub ApplyControlToken +@ stub BCryptCloseAlgorithmProvider +@ stub BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeriveKey +@ stub BCryptDeriveKeyCapi +@ stub BCryptDeriveKeyPBKDF2 +@ stub BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stub BCryptEnumAlgorithms +@ stub BCryptEnumProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stub BCryptFinishHash +@ stub BCryptFreeBuffer +@ stub BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stub BCryptGetFipsAlgorithmMode +@ stub BCryptGetProperty +@ stub BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stub BCryptOpenAlgorithmProvider +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptVerifySignature +@ stub CompleteAuthToken +@ stub CredMarshalTargetInfo +@ stub DeleteSecurityContext +@ stub EnumerateSecurityPackagesW +@ stub ExportSecurityContext +@ stub FreeContextBuffer +@ stub FreeCredentialsHandle +@ stub GetSecurityUserInfo +@ stub ImpersonateSecurityContext +@ stub ImportSecurityContextW +@ stub InitSecurityInterfaceW +@ stub InitializeSecurityContextW +@ stub KSecRegisterSecurityProvider +@ stub KSecValidateBuffer +@ stub LsaEnumerateLogonSessions +@ stub LsaGetLogonSessionData +@ stub MakeSignature +@ stub MapSecurityError +@ stub QueryContextAttributesW +@ stub QueryCredentialsAttributesW +@ stub QuerySecurityContextToken +@ stub QuerySecurityPackageInfoW +@ stub RevertSecurityContext +@ stub SealMessage +@ stub SecLookupAccountName +@ stub SecLookupAccountSid +@ stub SecLookupWellKnownSid +@ stub SecMakeSPN +@ stub SecMakeSPNEx +@ stub SecMakeSPNEx2 +@ stub SecSetPagingMode +@ stub SetCredentialsAttributesW +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslExportKey +@ stub SslFreeObject +@ stub SslGetServerIdentity +@ stub SslImportKey +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenProvider +@ stub SspiAcceptSecurityContextAsync +@ stub SspiAcquireCredentialsHandleAsyncW +@ stub SspiCompareAuthIdentities +@ stub SspiCopyAuthIdentity +@ stub SspiCreateAsyncContext +@ stub SspiDeleteSecurityContextAsync +@ stub SspiEncodeAuthIdentityAsStrings +@ stub SspiEncodeStringsAsAuthIdentity +@ stub SspiFreeAsyncContext +@ stub SspiFreeAuthIdentity +@ stub SspiFreeCredentialsHandleAsync +@ stub SspiGetAsyncCallStatus +@ stub SspiInitializeSecurityContextAsyncW +@ stub SspiLocalFree +@ stub SspiMarshalAuthIdentity +@ stub SspiReinitAsyncContext +@ stub SspiSetAsyncNotifyCallback +@ stub SspiUnmarshalAuthIdentity +@ stub SspiValidateAuthIdentity +@ stub SspiZeroAuthIdentity +@ stub TokenBindingGetKeyTypesServer +@ stub TokenBindingVerifyMessage +@ stub UnsealMessage +@ stub VerifySignature diff --git a/dlls/ksecdd.sys/main.c b/dlls/ksecdd.sys/main.c new file mode 100644 index 0000000000..2773c4936b --- /dev/null +++ b/dlls/ksecdd.sys/main.c @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Austin English + * + * 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 + */ +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ksecdd); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ksecdd.sys/version.rc b/dlls/ksecdd.sys/version.rc new file mode 100644 index 0000000000..5cea75fe9d --- /dev/null +++ b/dlls/ksecdd.sys/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2019 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ksecdd.sys" +#define WINE_FILENAME_STR "ksecdd.sys" +#define WINE_FILEVERSION 10,0,14393,187 +#define WINE_FILEVERSION_STR "10.0.14393.187" +#define WINE_PRODUCTVERSION 10,0,14393,197 +#define WINE_PRODUCTVERSION_STR "10.0.14393.197" + +#include "wine/wine_common_ver.rc" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1fe8b1150a..48a9f4b917 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- 12,,tdi.sys,- @@ -2602,6 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,ksecdd.sys, 12,,mountmgr.sys 12,,ndis.sys 12,,tdi.sys -- 2.19.2

1 0

[PATCH] propvarutil.h: add extern "C" if __cplusplus is defined
by Austin English April 3, 2019

April 3, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46939 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- include/propvarutil.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index a4eedefdb6..e0a21faf8c 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -22,6 +22,10 @@ #include <shtypes.h> #include <shlwapi.h> +#ifdef __cplusplus +extern "C" { +#endif + enum tagPROPVAR_CHANGE_FLAGS { PVCHF_DEFAULT = 0x00000000, @@ -120,7 +124,12 @@ inline HRESULT InitPropVariantFromInt64(LONGLONG llVal, PROPVARIANT *ppropvar) return S_OK; } -#endif +#endif /* NO_PROPVAR_INLINES */ +#endif /* __cplusplus */ + + +#ifdef __cplusplus +} #endif #endif /* __WINE_PROPVARUTIL_H */ -- 2.19.2

1 0

patch [5/5] ddraw: Remove Enumdevices from d3d
by David Adam April 3, 2019

April 3, 2019

1 0

[PATCH] dinput: Do not wait for hook thread startup in IDirectInput8::Initialize.
by Zhiyi Zhang April 3, 2019

April 3, 2019

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21403 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 54777da2d9..66dc6e34b2 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1719,7 +1719,7 @@ static DWORD WINAPI hook_thread_proc(void *param) /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(*(LPHANDLE)param); + SetEvent(param); while (GetMessageW( &msg, 0, 0, 0 )) { @@ -1785,6 +1785,7 @@ static DWORD WINAPI hook_thread_proc(void *param) } static DWORD hook_thread_id; +static HANDLE hook_thread_event; static CRITICAL_SECTION_DEBUG dinput_critsect_debug = { @@ -1803,24 +1804,21 @@ static BOOL check_hook_thread(void) TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { - HANDLE event; - - event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &hook_thread_id); - if (event && hook_thread) - { - HANDLE handles[2]; - handles[0] = event; - handles[1] = hook_thread; - WaitForMultipleObjects(2, handles, FALSE, INFINITE); - } + hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); LeaveCriticalSection(&dinput_hook_crit); - CloseHandle(event); } else if (list_empty(&direct_input_list) && hook_thread) { DWORD tid = hook_thread_id; + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); LeaveCriticalSection(&dinput_hook_crit); @@ -1861,6 +1859,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) callwndproc_hook = NULL; } + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); LeaveCriticalSection(&dinput_hook_crit); -- 2.20.1

1 0

[PATCH 1/5] quartz/tests: Add tests for VMR7 filter interfaces.
by Zebediah Figura April 3, 2019

April 3, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 111 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 105e6b23c7..90fcd776b7 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -24,6 +24,24 @@ #include "vmr9.h" #include "wine/test.h" +static IBaseFilter *create_vmr7(DWORD mode) +{ + IBaseFilter *filter = NULL; + IVMRFilterConfig *config; + HRESULT hr = CoCreateInstance(&CLSID_VideoMixingRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (mode) + { + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVMRFilterConfig_SetRenderingMode(config, mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRFilterConfig_Release(config); + } + return filter; +} + static void test_filter_config(void) { IVMRFilterConfig *config; @@ -130,11 +148,104 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_vmr7(0); + ULONG ref; + + check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRAspectRatioControl, TRUE); + todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl, TRUE); + check_interface(filter, &IID_IVMRFilterConfig, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerBitmap, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDirectDrawVideo, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVMRAspectRatioControl9, FALSE); + check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRFilterConfig9, FALSE); + check_interface(filter, &IID_IVMRMixerBitmap9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr7(VMRMode_Windowless); + + check_interface(filter, &IID_IVMRMonitorConfig, TRUE); + check_interface(filter, &IID_IVMRWindowlessControl, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr7(VMRMode_Renderless); + + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr7) { CoInitialize(NULL); test_filter_config(); + test_interfaces(); CoUninitialize(); } -- 2.20.1

2 6

[PATCH 1/5] ntoskrnl.exe: Support creating thread objects from server handle.
by Derek Lesho April 3, 2019

April 3, 2019

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ++++++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 +++ server/thread.c | 46 ++++++++++++++++------------ server/thread.h | 1 + 4 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 77a610d7db..fd75cdc886 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2484,15 +2484,28 @@ PEPROCESS WINAPI IoGetCurrentProcess(void) } +static void *create_thread_object( HANDLE handle ); + static const WCHAR thread_type_name[] = {'T','h','r','e','a','d',0}; static struct _OBJECT_TYPE thread_type = { thread_type_name, + create_thread_object }; POBJECT_TYPE PsThreadType = &thread_type; +static void *create_thread_object( HANDLE handle ) +{ + PETHREAD thread; + + if (!(thread = alloc_kernel_object( PsThreadType, handle, sizeof(*thread), 0 ))) return NULL; + + thread->Header.WaitListHead.Blink = INVALID_HANDLE_VALUE; + return thread; +} + /*********************************************************************** * KeGetCurrentThread / PsGetCurrentThread (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 82ee18e56a..700738adc3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -40,6 +40,10 @@ extern POBJECT_TYPE PsThreadType; extern POBJECT_TYPE SeTokenObjectType; +struct _ETHREAD { + DISPATCHER_HEADER Header; +}; + #ifdef __i386__ #define DEFINE_FASTCALL1_WRAPPER(func) \ __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ diff --git a/server/thread.c b/server/thread.c index f5f98ebef1..b524c64452 100644 --- a/server/thread.c +++ b/server/thread.c @@ -134,28 +134,29 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) static unsigned int thread_map_access( struct object *obj, unsigned int access ); static void thread_poll_event( struct fd *fd, int event ); static void destroy_thread( struct object *obj ); +static struct list *thread_get_kernel_object_list( struct object *obj ); static const struct object_ops thread_ops = { - sizeof(struct thread), /* size */ - dump_thread, /* dump */ - thread_get_type, /* get_type */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - thread_signaled, /* signaled */ - no_satisfied, /* satisfied */ - no_signal, /* signal */ - no_get_fd, /* get_fd */ - thread_map_access, /* map_access */ - default_get_sd, /* get_sd */ - default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ - no_link_name, /* link_name */ - NULL, /* unlink_name */ - no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ - no_close_handle, /* close_handle */ - destroy_thread /* destroy */ + sizeof(struct thread), /* size */ + dump_thread, /* dump */ + thread_get_type, /* get_type */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + thread_signaled, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + thread_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + thread_get_kernel_object_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + destroy_thread /* destroy */ }; static const struct fd_ops thread_fd_ops = @@ -206,6 +207,7 @@ static inline void init_thread_structure( struct thread *thread ) thread->creation_time = current_time; thread->exit_time = 0; + list_init( &thread->kernel_object ); list_init( &thread->mutex_list ); list_init( &thread->system_apc ); list_init( &thread->user_apc ); @@ -391,6 +393,12 @@ static unsigned int thread_map_access( struct object *obj, unsigned int access ) return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static struct list *thread_get_kernel_object_list( struct object *obj ) +{ + struct thread *thread = (struct thread *)obj; + return &thread->kernel_object; +} + static void dump_thread_apc( struct object *obj, int verbose ) { struct thread_apc *apc = (struct thread_apc *)obj; diff --git a/server/thread.h b/server/thread.h index e4332df4ab..758bbf7c8c 100644 --- a/server/thread.h +++ b/server/thread.h @@ -49,6 +49,7 @@ struct inflight_fd struct thread { struct object obj; /* object header */ + struct list kernel_object; /* list of kernel object pointers */ struct list entry; /* entry in system-wide thread list */ struct list proc_entry; /* entry in per-process thread list */ struct process *process; -- 2.20.1

3 16

[PATCH] patches: Show why updating the index failed.
by Francois Gouget April 2, 2019

April 2, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- patches/update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/update b/patches/update index e45bad90..36f7cca8 100755 --- a/patches/update +++ b/patches/update @@ -477,4 +477,5 @@ foreach (keys %subdirs) !system "rsync", "-q", "-r", "--chmod=+r", "--include=$_*", "--exclude=*", "$dir/", "$dest/data/$_" or die "rsync failed: $?"; } -rename "$dest/index.html.new", "$dest/index.html" or die "failed to update index.html"; +rename "$dest/index.html.new", "$dest/index.html" or + die "failed to update index.html: $!"; -- 2.20.1

2 1

[PATCH] ntdll/tests: Fix failures in the file tests [v2]
by Detlef Riekenberg April 2, 2019

April 2, 2019

v2: Removed the test for GetLastError() on success Example test failure: http://test.winehq.org/data/c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96/win10_… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=50393 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/ntdll/tests/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d107c2ed2b..ce1619e4e1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4463,8 +4463,7 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); @@ -4492,8 +4491,7 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult should report TRUE\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError()); ok(bytes == 0, "expected 0, read %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); -- 2.21.0.windows.1

1 1

[PATCH] taskmgr: Replace repeated assignments with for loops.
by Isira Seneviratne April 2, 2019

April 2, 2019

2 1