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

Aric Stewart : winebus.sys: Allow mapping of SDL controllers.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1528d1685a43f820a04da3041499c354b26038ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1528d1685a43f820a04da304… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 20 08:28:43 2019 -0500 winebus.sys: Allow mapping of SDL controllers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_sdl.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index eda3c26..78e3da1 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winebus.sys -IMPORTS = ntoskrnl setupapi +IMPORTS = ntoskrnl setupapi advapi32 EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5589113..b774df7 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -38,6 +38,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winreg.h" #include "winternl.h" #include "ddk/wdm.h" #include "ddk/hidtypes.h" @@ -106,6 +107,7 @@ MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); MAKE_FUNCPTR(SDL_memset); +MAKE_FUNCPTR(SDL_GameControllerAddMapping); #endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); @@ -890,9 +892,14 @@ static void process_device_event(SDL_Event *event) set_mapped_report_from_event(event); } +typedef struct _thread_args { + HANDLE event; + UNICODE_STRING *registry_path; +} thread_arguments; + static DWORD CALLBACK deviceloop_thread(void *args) { - HANDLE init_done = args; + thread_arguments *thread_args = args; SDL_Event event; if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) @@ -904,7 +911,58 @@ static DWORD CALLBACK deviceloop_thread(void *args) pSDL_JoystickEventState(SDL_ENABLE); pSDL_GameControllerEventState(SDL_ENABLE); - SetEvent(init_done); + /* Process mappings */ + if (pSDL_GameControllerAddMapping != NULL) + { + HANDLE key; + OBJECT_ATTRIBUTES attr; + WCHAR buffer[MAX_PATH]; + UNICODE_STRING regpath = {0, sizeof(buffer), buffer}; + static const WCHAR szPath[] = {'\\','m','a','p',0}; + + RtlCopyUnicodeString(&regpath, thread_args->registry_path); + RtlAppendUnicodeToString(&regpath, szPath); + InitializeObjectAttributes(&attr, &regpath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + if (NtOpenKey(&key, KEY_ALL_ACCESS, &attr) == STATUS_SUCCESS) + { + DWORD index = 0; + CHAR *buffer = NULL; + DWORD buffer_len = 0; + LSTATUS rc; + + do { + CHAR name[255]; + DWORD name_len; + DWORD type; + DWORD data_len = buffer_len; + + name_len = sizeof(name); + rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); + if (rc == ERROR_MORE_DATA || buffer == NULL) + { + if (buffer) + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, data_len); + else + buffer = HeapAlloc(GetProcessHeap(), 0, data_len); + buffer_len = data_len; + + name_len = sizeof(name); + rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); + } + + if (rc == STATUS_SUCCESS) + { + TRACE("Setting mapping %s...\n",debugstr_an(buffer,29)); + pSDL_GameControllerAddMapping(buffer); + index ++; + } + } while (rc == STATUS_SUCCESS); + HeapFree(GetProcessHeap(), 0, buffer); + NtClose(key); + } + } + + SetEvent(thread_args->event); while (1) while (pSDL_WaitEvent(&event) != 0) @@ -926,6 +984,7 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ HANDLE events[2]; DWORD result; + thread_arguments args; TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); if (sdl_handle == NULL) @@ -969,6 +1028,7 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_JoystickIsHaptic); LOAD_FUNCPTR(SDL_memset); + LOAD_FUNCPTR(SDL_GameControllerAddMapping); #undef LOAD_FUNCPTR pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); @@ -983,7 +1043,9 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) goto error; - if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) + args.event = events[0]; + args.registry_path = registry_path; + if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, &args, 0, NULL))) { CloseHandle(events[0]); goto error;

1 0

Mark Jansen : wintrust: Verify image hash in WinVerifyTrust.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 93ed3356d892a6b7ade1694cb5e3a880f481eec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ed3356d892a6b7ade1694c… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Thu Mar 28 14:49:20 2019 +0100 wintrust: Verify image hash in WinVerifyTrust. Includes various improvements by Sebastian Lackner. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/softpub.c | 173 ++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 8 +- 2 files changed, 177 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d65d2b6..1273a58 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -1,5 +1,6 @@ /* * Copyright 2007 Juan Lang + * Copyright 2016 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wintrust.h" #include "mssip.h" #include "softpub.h" @@ -208,6 +210,174 @@ static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, return err; } +static BOOL hash_file_data( HANDLE file, DWORD start, DWORD end, HCRYPTHASH hash ) +{ + DWORD bytes_read, size = end - start; + DWORD buffer_size = min( size, 1024*1024 ); + BYTE *buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ); + + if (!buffer) return FALSE; + SetFilePointer( file, start, NULL, FILE_BEGIN ); + while (size) + { + if (!ReadFile( file, buffer, min( buffer_size, size ), &bytes_read, NULL )) break; + if (!bytes_read) break; + if (!CryptHashData( hash, buffer, bytes_read, 0 )) break; + size -= bytes_read; + } + HeapFree( GetProcessHeap(), 0, buffer ); + return !size; +} + +/* See https://www.cs.auckland.ac.nz/~pgut001/pubs/authenticode.txt + * for details about the hashing. + */ +static BOOL SOFTPUB_HashPEFile(HANDLE file, HCRYPTHASH hash) +{ + DWORD checksum, security_dir; + IMAGE_DOS_HEADER dos_header; + union + { + IMAGE_NT_HEADERS32 nt32; + IMAGE_NT_HEADERS64 nt64; + } nt_header; + IMAGE_DATA_DIRECTORY secdir; + LARGE_INTEGER file_size; + DWORD bytes_read; + BOOL ret; + + if (!GetFileSizeEx(file, &file_size)) + return FALSE; + + SetFilePointer(file, 0, NULL, FILE_BEGIN); + ret = ReadFile(file, &dos_header, sizeof(dos_header), &bytes_read, NULL); + if (!ret || bytes_read != sizeof(dos_header)) + return FALSE; + + if (dos_header.e_magic != IMAGE_DOS_SIGNATURE) + return FALSE; + if (dos_header.e_lfanew >= 256 * 1024 * 1024) /* see RtlImageNtHeaderEx */ + return FALSE; + if (dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion) > file_size.QuadPart) + return FALSE; + + SetFilePointer(file, dos_header.e_lfanew, NULL, FILE_BEGIN); + ret = ReadFile(file, &nt_header, sizeof(nt_header), &bytes_read, NULL); + if (!ret || bytes_read < FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader.Magic) + + sizeof(nt_header.nt32.OptionalHeader.Magic)) + return FALSE; + + if (nt_header.nt32.Signature != IMAGE_NT_SIGNATURE) + return FALSE; + + if (nt_header.nt32.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + if (bytes_read < sizeof(nt_header.nt32)) + return FALSE; + + checksum = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader.CheckSum); + security_dir = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]); + secdir = nt_header.nt32.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]; + } + else if (nt_header.nt32.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + if (bytes_read < sizeof(nt_header.nt64)) + return FALSE; + + checksum = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader.CheckSum); + security_dir = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]); + secdir = nt_header.nt64.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]; + } + else + return FALSE; + + if (secdir.VirtualAddress < security_dir + sizeof(IMAGE_DATA_DIRECTORY)) + return FALSE; + if (secdir.VirtualAddress > file_size.QuadPart) + return FALSE; + if (secdir.VirtualAddress + secdir.Size != file_size.QuadPart) + return FALSE; + + if (!hash_file_data( file, 0, checksum, hash )) return FALSE; + if (!hash_file_data( file, checksum + sizeof(DWORD), security_dir, hash )) return FALSE; + if (!hash_file_data( file, security_dir + sizeof(IMAGE_DATA_DIRECTORY), secdir.VirtualAddress, hash )) + return FALSE; + + return TRUE; +} + +static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) +{ + SPC_INDIRECT_DATA_CONTENT *indirect = (SPC_INDIRECT_DATA_CONTENT *)data->u.pPDSip->psIndirectData; + DWORD err, hash_size, length; + BYTE *hash_data; + BOOL release_prov = FALSE; + HCRYPTPROV prov = data->hProv; + HCRYPTHASH hash = 0; + ALG_ID algID; + + if (((ULONG_PTR)indirect->Data.pszObjId >> 16) == 0 || + strcmp(indirect->Data.pszObjId, SPC_PE_IMAGE_DATA_OBJID)) + { + FIXME("Cannot verify hash for pszObjId=%s\n", debugstr_a(indirect->Data.pszObjId)); + return ERROR_SUCCESS; + } + + if (!(algID = CertOIDToAlgId(indirect->DigestAlgorithm.pszObjId))) + return TRUST_E_SYSTEM_ERROR; /* FIXME */ + + if (!prov) + { + if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + return GetLastError(); + release_prov = TRUE; + } + + if (!CryptCreateHash(prov, algID, 0, 0, &hash)) + { + err = GetLastError(); + goto done; + } + + if (!SOFTPUB_HashPEFile(file, hash)) + { + err = TRUST_E_NOSIGNATURE; + goto done; + } + + length = sizeof(hash_size); + if (!CryptGetHashParam(hash, HP_HASHSIZE, (BYTE *)&hash_size, &length, 0)) + { + err = GetLastError(); + goto done; + } + + if (!(hash_data = data->psPfns->pfnAlloc(hash_size))) + { + err = ERROR_OUTOFMEMORY; + goto done; + } + + if (!CryptGetHashParam(hash, HP_HASHVAL, hash_data, &hash_size, 0)) + { + err = GetLastError(); + data->psPfns->pfnFree(hash_data); + goto done; + } + + err = (hash_size == indirect->Digest.cbData && + !memcmp(hash_data, indirect->Digest.pbData, hash_size)) ? S_OK : TRUST_E_BAD_DIGEST; + data->psPfns->pfnFree(hash_data); + +done: + if (hash) + CryptDestroyHash(hash); + if (release_prov) + CryptReleaseContext(prov, 0); + return err; +} + + static DWORD SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) { DWORD err = ERROR_SUCCESS; @@ -371,6 +541,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) if (err) goto error; err = SOFTPUB_DecodeInnerContent(data); + if (err) + goto error; + err = SOFTPUB_VerifyImageHash(data, data->pWintrustData->u.pFile->hFile); error: if (err && data->fOpenedFile && data->pWintrustData->u.pFile) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5d6d62c..914f04d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1152,7 +1152,7 @@ static void test_wintrust_digest(void) { {{ SelfSignedFile32, sizeof(SelfSignedFile32) }, { Dummy, sizeof(Dummy) }}, - { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_NOSIGNATURE, FALSE }, { TRUST_E_NOSIGNATURE, FALSE } }, { {{ Dummy, sizeof(Dummy) }, @@ -1163,7 +1163,7 @@ static void test_wintrust_digest(void) {{ SelfSignedFile32, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile32 + 19 + sizeof(Dummy), sizeof(SelfSignedFile32) - 19 - sizeof(Dummy) }}, - { TRUST_E_BAD_DIGEST, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_BAD_DIGEST, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } }, { {{ SelfSignedFile32, sizeof(IMAGE_DOS_HEADER) }}, @@ -1182,7 +1182,7 @@ static void test_wintrust_digest(void) { {{ SelfSignedFile64, sizeof(SelfSignedFile64) }, { Dummy, sizeof(Dummy) }}, - { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_NOSIGNATURE, FALSE }, { TRUST_E_NOSIGNATURE, FALSE } }, { {{ Dummy, sizeof(Dummy) }, @@ -1193,7 +1193,7 @@ static void test_wintrust_digest(void) {{ SelfSignedFile64, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile64 + 19 + sizeof(Dummy), sizeof(SelfSignedFile64) - 19 - sizeof(Dummy) }}, - { TRUST_E_BAD_DIGEST, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_BAD_DIGEST, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } }, { {{ SelfSignedFile64, sizeof(IMAGE_DOS_HEADER) }},

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExInitializeResourceLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1304b4c71b8a49d4cd76d7d4a11c64870cc17b0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1304b4c71b8a49d4cd76d7d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:10 2019 -0500 ntoskrnl.exe: Implement ExInitializeResourceLite(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45819 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 --------- dlls/ntoskrnl.exe/sync.c | 10 ++++++++ include/ddk/wdm.h | 54 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d570a61..41dd178 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2370,17 +2370,6 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) HeapFree( GetProcessHeap(), 0, ptr ); } - -/*********************************************************************** - * ExInitializeResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) -{ - FIXME( "stub: %p\n", Resource ); - return STATUS_NOT_IMPLEMENTED; -} - - /*********************************************************************** * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 12dacae..168c6d1 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -717,3 +717,13 @@ void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) if (count < 1) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } + +/*********************************************************************** + * ExInitializeResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + memset(resource, 0, sizeof(*resource)); + return STATUS_SUCCESS; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e5804c0..a653621 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -153,12 +153,63 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _OWNER_ENTRY +{ + ERESOURCE_THREAD OwnerThread; + union + { + struct + { + ULONG IoPriorityBoosted : 1; + ULONG OwnerReferenced : 1; + ULONG IoQoSPriorityBoosted : 1; + ULONG OwnerCount : 29; + }; + ULONG TableSize; + }; +} OWNER_ENTRY, *POWNER_ENTRY; + +#define ResourceNeverExclusive 0x0010 +#define ResourceReleaseByOtherThread 0x0020 +#define ResourceOwnedExclusive 0x0080 + +typedef struct _ERESOURCE +{ + LIST_ENTRY SystemResourcesList; + OWNER_ENTRY *OwnerTable; + SHORT ActiveCount; + union + { + USHORT Flag; + struct + { + UCHAR ReservedLowFlags; + UCHAR WaiterPriority; + }; + }; + KSEMAPHORE *SharedWaiters; + KEVENT *ExclusiveWaiters; + OWNER_ENTRY OwnerEntry; + ULONG ActiveEntries; + ULONG ContentionCount; + ULONG NumberOfSharedWaiters; + ULONG NumberOfExclusiveWaiters; +#ifdef _WIN64 + void *Reserved2; +#endif + union + { + void *Address; + ULONG_PTR CreatorBackTraceIndex; + }; + KSPIN_LOCK SpinLock; +} ERESOURCE, *PERESOURCE; + typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; -typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; @@ -1469,6 +1520,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); +NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireResourceExclusiveLite() .
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 257c56f5f34f80176337382b99b18f86d78dca09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=257c56f5f34f80176337382b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:11 2019 -0500 ntoskrnl.exe: Implement ExAcquireResourceExclusiveLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 ------ dlls/ntoskrnl.exe/sync.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 41dd178..454d6f5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3356,15 +3356,6 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ } /*********************************************************************** - * ExAcquireResourceExclusiveLite (NTOSKRNL.EXE.@) - */ -BOOLEAN WINAPI ExAcquireResourceExclusiveLite( PERESOURCE resource, BOOLEAN wait ) -{ - FIXME( ":%p %u stub\n", resource, wait ); - return TRUE; -} - -/*********************************************************************** * ExDeleteResourceLite (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 168c6d1..0c8d02f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -30,6 +30,7 @@ #include "ddk/wdm.h" #include "wine/debug.h" +#include "wine/heap.h" #include "ntoskrnl_private.h" @@ -718,6 +719,19 @@ void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } +/* Use of the fields of an ERESOURCE structure seems to vary wildly between + * Windows versions. The below implementation uses them as follows: + * + * OwnerTable - contains a list of shared owners, including threads which do + * not currently own the resource + * OwnerTable[i].OwnerThread - shared owner TID + * OwnerTable[i].OwnerCount - recursion count of this shared owner (may be 0) + * OwnerEntry.OwnerThread - the owner TID if exclusively owned + * OwnerEntry.TableSize - the number of entries in OwnerTable, including threads + * which do not currently own the resource + * ActiveEntries - total number of acquisitions (incl. recursive ones) + */ + /*********************************************************************** * ExInitializeResourceLite (NTOSKRNL.EXE.@) */ @@ -727,3 +741,60 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) memset(resource, 0, sizeof(*resource)); return STATUS_SUCCESS; } + +/*********************************************************************** + * ExAcquireResourceExclusiveLite (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireResourceExclusiveLite( ERESOURCE *resource, BOOLEAN wait ) +{ + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + /* In order to avoid a race between waiting for the ExclusiveWaiters event + * and grabbing the lock, do not grab the resource if it is unclaimed but + * has waiters; instead queue ourselves. */ + else if (!resource->ActiveEntries && !resource->NumberOfExclusiveWaiters && !resource->NumberOfSharedWaiters) + { + resource->Flag |= ResourceOwnedExclusive; + resource->OwnerEntry.OwnerThread = (ERESOURCE_THREAD)KeGetCurrentThread(); + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + else if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->ExclusiveWaiters) + { + resource->ExclusiveWaiters = heap_alloc( sizeof(*resource->ExclusiveWaiters) ); + KeInitializeEvent( resource->ExclusiveWaiters, SynchronizationEvent, FALSE ); + } + resource->NumberOfExclusiveWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->ExclusiveWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + resource->Flag |= ResourceOwnedExclusive; + resource->OwnerEntry.OwnerThread = (ERESOURCE_THREAD)KeGetCurrentThread(); + resource->ActiveEntries++; + resource->NumberOfExclusiveWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a653621..6991605 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1512,6 +1512,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); +BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireResourceSharedLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: dcfc7ab1659f864caaed815eded81419c8c43905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcfc7ab1659f864caaed815e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:12 2019 -0500 ntoskrnl.exe: Implement ExAcquireResourceSharedLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 82 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 508f9e6..177800a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -121,7 +121,7 @@ @ stdcall DbgQueryDebugFilterState(long long) @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) -@ stub ExAcquireResourceSharedLite +@ stdcall ExAcquireResourceSharedLite(ptr long) @ stub ExAcquireSharedStarveExclusive @ stub ExAcquireSharedWaitForExclusive @ stub ExAllocateFromPagedLookasideList diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0c8d02f..82667e8 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include <limits.h> #include <stdarg.h> #include "ntstatus.h" @@ -742,6 +743,25 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) return STATUS_SUCCESS; } +/* Find an existing entry in the shared owner list, or create a new one. */ +static OWNER_ENTRY *resource_get_shared_entry( ERESOURCE *resource, ERESOURCE_THREAD thread ) +{ + ULONG i, count; + + for (i = 0; i < resource->OwnerEntry.TableSize; ++i) + { + if (resource->OwnerTable[i].OwnerThread == thread) + return &resource->OwnerTable[i]; + } + + count = ++resource->OwnerEntry.TableSize; + resource->OwnerTable = heap_realloc(resource->OwnerTable, count * sizeof(*resource->OwnerTable)); + resource->OwnerTable[count - 1].OwnerThread = thread; + resource->OwnerTable[count - 1].OwnerCount = 0; + + return &resource->OwnerTable[count - 1]; +} + /*********************************************************************** * ExAcquireResourceExclusiveLite (NTOSKRNL.EXE.@) */ @@ -798,3 +818,65 @@ BOOLEAN WINAPI ExAcquireResourceExclusiveLite( ERESOURCE *resource, BOOLEAN wait return TRUE; } + +/*********************************************************************** + * ExAcquireResourceSharedLite (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireResourceSharedLite( ERESOURCE *resource, BOOLEAN wait ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + /* We own the resource exclusively, so increase recursion. */ + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + } + else if (entry->OwnerCount || !resource->NumberOfExclusiveWaiters) + { + /* Either we already own the resource shared, or there are no exclusive + * owners or waiters, so we can grab it shared. */ + entry->OwnerCount++; + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + + if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->SharedWaiters) + { + resource->SharedWaiters = heap_alloc( sizeof(*resource->SharedWaiters) ); + KeInitializeSemaphore( resource->SharedWaiters, 0, INT_MAX ); + } + resource->NumberOfSharedWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->SharedWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry->OwnerCount++; + resource->ActiveEntries++; + resource->NumberOfSharedWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6991605..a153942 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1513,6 +1513,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); +BOOLEAN WINAPI ExAcquireResourceSharedLite(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireSharedStarveExclusive() .
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: f0499323d804afb3833ca3dd651cc42c38420aae URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0499323d804afb3833ca3dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:13 2019 -0500 ntoskrnl.exe: Implement ExAcquireSharedStarveExclusive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 64 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 177800a..347febb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -122,7 +122,7 @@ @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stdcall ExAcquireResourceSharedLite(ptr long) -@ stub ExAcquireSharedStarveExclusive +@ stdcall ExAcquireSharedStarveExclusive(ptr long) @ stub ExAcquireSharedWaitForExclusive @ stub ExAllocateFromPagedLookasideList @ stdcall ExAllocatePool(long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 82667e8..2b362ef 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -880,3 +880,67 @@ BOOLEAN WINAPI ExAcquireResourceSharedLite( ERESOURCE *resource, BOOLEAN wait ) return TRUE; } + +/*********************************************************************** + * ExAcquireSharedStarveExclusive (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireSharedStarveExclusive( ERESOURCE *resource, BOOLEAN wait ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + } + /* We are starving exclusive waiters, but we cannot steal the resource out + * from under an exclusive waiter who is about to acquire it. (Because of + * locking, and because exclusive waiters are always waked first, this is + * guaranteed to be the case if the resource is unowned and there are + * exclusive waiters.) */ + else if (!(!resource->ActiveEntries && resource->NumberOfExclusiveWaiters)) + { + entry->OwnerCount++; + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + + if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->SharedWaiters) + { + resource->SharedWaiters = heap_alloc( sizeof(*resource->SharedWaiters) ); + KeInitializeSemaphore( resource->SharedWaiters, 0, INT_MAX ); + } + resource->NumberOfSharedWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->SharedWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry->OwnerCount++; + resource->ActiveEntries++; + resource->NumberOfSharedWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a153942..8023fda 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1514,6 +1514,7 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); BOOLEAN WINAPI ExAcquireResourceSharedLite(ERESOURCE*,BOOLEAN); +BOOLEAN WINAPI ExAcquireSharedStarveExclusive(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExReleaseResourceForThreadLite() .
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 9dfa9f6b26d4d50d3b6f74bc2760ebbe0f8d0350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dfa9f6b26d4d50d3b6f74bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:15 2019 -0500 ntoskrnl.exe: Implement ExReleaseResourceForThreadLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ------ dlls/ntoskrnl.exe/sync.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 454d6f5..2d8bdb5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3365,14 +3365,6 @@ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) } /*********************************************************************** - * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) - */ -void WINAPI ExReleaseResourceForThreadLite( PERESOURCE resource, ERESOURCE_THREAD tid ) -{ - FIXME( "stub: %p %lu\n", resource, tid ); -} - -/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index e89fddc..88c9ea7 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1006,3 +1006,63 @@ BOOLEAN WINAPI ExAcquireSharedWaitForExclusive( ERESOURCE *resource, BOOLEAN wai return TRUE; } + +/*********************************************************************** + * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) + */ +void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREAD thread ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, thread %#lx.\n", resource, thread); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == thread) + { + if (!--resource->ActiveEntries) + { + resource->OwnerEntry.OwnerThread = 0; + resource->Flag &= ~ResourceOwnedExclusive; + } + } + else + { + ERR("Trying to release %p for thread %#lx, but resource is exclusively owned by %#lx.\n", + resource, thread, resource->OwnerEntry.OwnerThread); + return; + } + } + else + { + entry = resource_get_shared_entry( resource, thread ); + if (entry->OwnerCount) + { + entry->OwnerCount--; + resource->ActiveEntries--; + } + else + { + ERR("Trying to release %p for thread %#lx, but resource is not owned by that thread.\n", resource, thread); + return; + } + } + + if (!resource->ActiveEntries) + { + if (resource->NumberOfExclusiveWaiters) + { + KeSetEvent( resource->ExclusiveWaiters, IO_NO_INCREMENT, FALSE ); + } + else if (resource->NumberOfSharedWaiters) + { + KeReleaseSemaphore( resource->SharedWaiters, IO_NO_INCREMENT, + resource->NumberOfSharedWaiters, FALSE ); + } + } + + KeReleaseSpinLock( &resource->SpinLock, irql ); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4609790..1a3f6bb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1529,6 +1529,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); +void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI IoAcquireCancelSpinLock(KIRQL*);

1 0

Akihiro Sagawa : gdi32/tests: Add tests for GetCharWidthInfo().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: eca601d7bb5d0f5d8c667a6eb1ceb89745b4d804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca601d7bb5d0f5d8c667a6e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 9 10:33:00 2019 +0100 gdi32/tests: Add tests for GetCharWidthInfo(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 67e8941..245fb4d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -48,6 +48,7 @@ static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); static BOOL (WINAPI *pGetCharWidth32A)(HDC hdc, UINT first, UINT last, LPINT buffer); static BOOL (WINAPI *pGetCharWidth32W)(HDC hdc, UINT first, UINT last, LPINT buffer); +static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -94,6 +95,7 @@ static void init(void) pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); pGetCharWidth32A = (void *)GetProcAddress(hgdi32, "GetCharWidth32A"); pGetCharWidth32W = (void *)GetProcAddress(hgdi32, "GetCharWidth32W"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -7004,6 +7006,189 @@ static void test_long_names(void) ReleaseDC(NULL, dc); } +typedef struct +{ + USHORT majorVersion; + USHORT minorVersion; + SHORT ascender; + SHORT descender; + SHORT lineGap; + USHORT advanceWidthMax; + SHORT minLeftSideBearing; + SHORT minRightSideBearing; + SHORT xMaxExtent; + SHORT caretSlopeRise; + SHORT caretSlopeRun; + SHORT caretOffset; + SHORT reserved[4]; + SHORT metricDataFormat; + SHORT numberOfHMetrics; +} TT_Hori_Header; + +static void test_GetCharWidthInfo(void) +{ + HDC hdc; + HFONT hfont, hfont_prev; + LOGFONTA lf; + BOOL r; + DWORD ret, i; + OUTLINETEXTMETRICA otm; + TT_Hori_Header hhea; + struct char_width_info + { + INT lsb, rsb, unk; + } info, info2; + SHORT minLeftSideBearing, minRightSideBearing; + POINT pt[2]; + const char* face_list[] = { "Symbol", "Ume Gothic", "MS Gothic" }; + + if (!pGetCharWidthInfo) + { + win_skip("GetCharWidthInfo is unavailable\n"); + return; + } + + hdc = GetDC(NULL); + + /* test default (System) font */ + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + if (r) /* win10 1803 succeeds */ + { + ok(info.lsb == 0, "expected 0, got %d\n", info.lsb); + ok(info.rsb == 0, "expected 0, got %d\n", info.rsb); + ok(info.unk == 0, "expected 0, got %d\n", info.unk); + } + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = ANSI_CHARSET; + strcpy(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); + ok(ret != 0, "GetOutlineTextMetricsA failed\n"); + DeleteObject(SelectObject(hdc, hfont_prev)); + + /* test Tahoma at the em square size */ + lf.lfHeight = -(int)otm.otmEMSquare; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetFontData(hdc, MS_MAKE_TAG('h','h','e','a'), 0, &hhea, sizeof(hhea)); + ok(ret == sizeof(hhea), "got %u\n", ret); + minLeftSideBearing = GET_BE_WORD(hhea.minLeftSideBearing); + minRightSideBearing = GET_BE_WORD(hhea.minRightSideBearing); + + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + ok(r, "GetCharWidthInfo failed\n"); + ok(info.lsb == minLeftSideBearing, "expected %d, got %d\n", minLeftSideBearing, info.lsb); + ok(info.rsb == minRightSideBearing, "expected %d, got %d\n", minRightSideBearing, info.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + + /* these values are scaled, try with smaller size */ + lf.lfHeight /= 3; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "pGetCharWidthInfo failed\n"); + ok(info2.lsb == info.lsb/3, "expected %d, got %d\n", info.lsb/3, info2.lsb); + ok(info2.rsb == info.rsb/3, "expected %d, got %d\n", info.rsb/3, info2.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); + + /* test with another mapping mode */ + hdc = GetDC(NULL); + SetMapMode(hdc, MM_ISOTROPIC); + SetWindowExtEx(hdc, 2, 2, NULL); + SetViewportExtEx(hdc, 1, 1, NULL); + + memset(pt, 0, sizeof(pt)); + pt[0].y = otm.otmEMSquare; + DPtoLP(hdc, pt, 1); + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = ANSI_CHARSET; + lf.lfHeight = -abs(pt[0].y); + strcpy(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "GetCharWidthInfo failed\n"); + pt[0].x = info.lsb; pt[0].y = 0; + pt[1].x = info.rsb; pt[1].y = 0; + DPtoLP(hdc, pt, 2); + ok(pt[0].x == info2.lsb, "expected %d, got %d\n", pt[0].x, info2.lsb); + ok(pt[1].x == info2.rsb, "expected %d, got %d\n", pt[1].x, info2.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); + + /* test with synthetic fonts */ + hdc = GetDC(NULL); + for (i = 0; i < ARRAY_SIZE(face_list); i++) + { + const char* face = face_list[i]; + if (!is_truetype_font_installed(face)) + { + skip("%s is not installed\n", face); + continue; + } + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfItalic = FALSE; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfHeight = -256; + strcpy(lf.lfFaceName, face); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + ok(r, "%s: GetCharWidthInfo failed\n", face); + + /* test with synthetic bold */ + lf.lfWeight = FW_BOLD; + lf.lfItalic = FALSE; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "%s: GetCharWidthInfo failed\n", face); + ok(info.lsb == info2.lsb, "%s: expected %d, got %d\n", face, info.lsb, info2.lsb); + ok(info.rsb == info2.rsb, "%s: expected %d, got %d\n", face, info.rsb, info2.rsb); + + /* test with synthetic italic */ + lf.lfWeight = FW_NORMAL; + lf.lfItalic = TRUE; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "%s: GetCharWidthInfo failed\n", face); + todo_wine ok(info.lsb > info2.lsb, "%s: expected less than %d, got %d\n", face, info.lsb, info2.lsb); + todo_wine ok(info.rsb > info2.rsb, "%s: expected less than %d, got %d\n", face, info.rsb, info2.rsb); + DeleteObject(SelectObject(hdc, hfont_prev)); + } + + ReleaseDC(NULL, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7072,6 +7257,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_GetCharacterPlacement(); + test_GetCharWidthInfo(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset();

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExDeleteResourceLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5698bb29a3e038a7480de3c040abcb0d87cfcfe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5698bb29a3e038a7480de3c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:17 2019 -0500 ntoskrnl.exe: Implement ExDeleteResourceLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 12 ++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06ec176..acb204d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3356,15 +3356,6 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ } /*********************************************************************** - * ExDeleteResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) -{ - FIXME("(%p): stub\n", resource); - return STATUS_NOT_IMPLEMENTED; -} - -/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2ea2e61..c8cae7d 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -743,6 +743,18 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) return STATUS_SUCCESS; } +/*********************************************************************** + * ExDeleteResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExDeleteResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + heap_free(resource->OwnerTable); + heap_free(resource->ExclusiveWaiters); + heap_free(resource->SharedWaiters); + return STATUS_SUCCESS; +} + /* Find an existing entry in the shared owner list, or create a new one. */ static OWNER_ENTRY *resource_get_shared_entry( ERESOURCE *resource, ERESOURCE_THREAD thread ) { diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1a3f6bb..41c462f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1521,6 +1521,7 @@ PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); +NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);

1 0

Nikolay Sivov : mfreadwrite: Keep media stream id for event matching.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 2d834c472d1659120a57af77d16e7f0375bd53a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d834c472d1659120a57af77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:08 2019 +0300 mfreadwrite: Keep media stream id for event matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 78d96e4..e41bdf6 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -75,6 +75,7 @@ HRESULT WINAPI DllUnregisterServer(void) struct media_stream { IMFMediaType *current; + DWORD id; }; typedef struct source_reader @@ -644,6 +645,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(object->descriptor, i, &selected, &sd))) break; + if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &object->streams[i].id))) + WARN("Failed to get stream identifier, hr %#x.\n", hr); + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); IMFStreamDescriptor_Release(sd); if (FAILED(hr))

1 0