wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Austin English : advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of ERROR_CALL_NOT_IMPLEMENTED.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 80b0fb95e8e1915aea336b120e45b52bf867daa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b0fb95e8e1915aea336b12… Author: Austin English <austinenglish(a)gmail.com> Date: Sun May 5 02:22:35 2019 -0500 advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of ERROR_CALL_NOT_IMPLEMENTED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46905 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a5ad9e65d241e40b85c424ac561249b97161576) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/eventlog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 32066c5fef..71108c9642 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -603,7 +603,7 @@ BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_HANDLE_EOF); return FALSE; } @@ -618,7 +618,7 @@ BOOL WINAPI ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf FIXME("(%p,0x%08x,0x%08x,%p,0x%08x,%p,%p) stub\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_HANDLE_EOF); return FALSE; }

1 0

Vijay Kiran Kamuju : virtdisk: Add stub and tests for OpenVirtualDisk.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: f94821e59ee6d6bb5f53bf97a6d7d499feab02ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94821e59ee6d6bb5f53bf97… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 26 05:10:39 2019 +0200 virtdisk: Add stub and tests for OpenVirtualDisk. Based on patch from Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45947 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 081fd1e9972ac1ee0fba66d265e8ecf13217bdf3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/virtdisk/tests/virtdisk.c | 41 +++++++++++++++++++++++++++++++++++ dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 14 ++++++++++++ include/virtdisk.h | 49 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index d1f699fe45..23d070574a 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -18,11 +18,13 @@ #include <stdarg.h> #include "windef.h" +#include "initguid.h" #include "virtdisk.h" #include "wine/heap.h" #include "wine/test.h" static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); +static DWORD (WINAPI *pOpenVirtualDisk)(PVIRTUAL_STORAGE_TYPE,PCWSTR,VIRTUAL_DISK_ACCESS_MASK,OPEN_VIRTUAL_DISK_FLAG,POPEN_VIRTUAL_DISK_PARAMETERS,PHANDLE); static void test_GetStorageDependencyInformation(void) { @@ -47,6 +49,38 @@ static void test_GetStorageDependencyInformation(void) CloseHandle(handle); } +static void test_OpenVirtualDisk(void) +{ + DWORD ret; + HANDLE handle; + VIRTUAL_STORAGE_TYPE stgtype; + OPEN_VIRTUAL_DISK_PARAMETERS param; + static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + + ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + stgtype.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN; + stgtype.VendorId = VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN; + ret = pOpenVirtualDisk(&stgtype, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_3; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_2; + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %d\n", ret); + + param.Version = OPEN_VIRTUAL_DISK_VERSION_1; + ret = pOpenVirtualDisk(&stgtype, vdisk, 0xffffff, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NONE, &param, &handle); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); +} + START_TEST(virtdisk) { HMODULE module = LoadLibraryA("virtdisk.dll"); @@ -57,8 +91,15 @@ START_TEST(virtdisk) } pGetStorageDependencyInformation = (void *)GetProcAddress( module, "GetStorageDependencyInformation" ); + pOpenVirtualDisk = (void *)GetProcAddress( module, "OpenVirtualDisk" ); + if (pGetStorageDependencyInformation) test_GetStorageDependencyInformation(); else win_skip("GetStorageDependencyInformation is not available\n"); + + if (pOpenVirtualDisk) + test_OpenVirtualDisk(); + else + win_skip("OpenVirtualDisk is not available\n"); } diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 6bd5f146db..f35b8df524 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -15,7 +15,7 @@ @ stub GetVirtualDiskPhysicalPath @ stub MergeVirtualDisk @ stub MirrorVirtualDisk -@ stub OpenVirtualDisk +@ stdcall OpenVirtualDisk(ptr wstr long long ptr ptr) @ stub ResizeVirtualDisk @ stub SetVirtualDiskInformation @ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 3e6c5c14dc..2d384cb0ed 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -65,3 +65,17 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_ return ERROR_SUCCESS; } + +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle) +{ + FIXME("(%p, %s, %d, 0x%x, %p, %p): stub\n", type, wine_dbgstr_w(path), mask, flags, param, handle); + + if (!type || !path || (mask & ~VIRTUAL_DISK_ACCESS_ALL) || (flags & ~(OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS | OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE)) || !param) + return ERROR_INVALID_PARAMETER; + + if (param->Version != OPEN_VIRTUAL_DISK_VERSION_1) + return ERROR_INVALID_PARAMETER; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/virtdisk.h b/include/virtdisk.h index b4c07f3b69..0c81ee118e 100644 --- a/include/virtdisk.h +++ b/include/virtdisk.h @@ -27,6 +27,11 @@ extern "C" { #define VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN 0 #define VIRTUAL_STORAGE_TYPE_DEVICE_ISO 1 #define VIRTUAL_STORAGE_TYPE_DEVICE_VHD 2 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDX 3 +#define VIRTUAL_STORAGE_TYPE_DEVICE_VHDSET 4 + +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(VIRTUAL_STORAGE_TYPE_VENDOR_MICROSOFT, 0xec984aec, 0xa0f9, 0x47e9, 0x90, 0x1f, 0x71, 0x41, 0x5a, 0x66, 0x34, 0x5b); typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NONE = 0x00, @@ -37,6 +42,26 @@ typedef enum _ATTACH_VIRTUAL_DISK_FLAG { ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10 } ATTACH_VIRTUAL_DISK_FLAG; +typedef enum _OPEN_VIRTUAL_DISK_FLAG { + OPEN_VIRTUAL_DISK_FLAG_NONE = 0x00, + OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS = 0x01, + OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE = 0x02, + OPEN_VIRTUAL_DISK_FLAG_BOOT_DRIVE = 0x04, + OPEN_VIRTUAL_DISK_FLAG_CACHED_IO = 0x08, + OPEN_VIRTUAL_DISK_FLAG_CUSTOM_DIFF_CHAIN = 0x10, + OPEN_VIRTUAL_DISK_FLAG_PARENT_CACHED_IO = 0x20, + OPEN_VIRTUAL_DISK_FLAG_VHDSET_FILE_ONLY = 0x40, + OPEN_VIRTUAL_DISK_FLAG_IGNORE_RELATIVE_PARENT_LOCATOR = 0x80, + OPEN_VIRTUAL_DISK_FLAG_NO_WRITE_HARDENING = 0x100 +} OPEN_VIRTUAL_DISK_FLAG; + +typedef enum _OPEN_VIRTUAL_DISK_VERSION { + OPEN_VIRTUAL_DISK_VERSION_UNSCPECIFIED, + OPEN_VIRTUAL_DISK_VERSION_1, + OPEN_VIRTUAL_DISK_VERSION_2, + OPEN_VIRTUAL_DISK_VERSION_3 +} OPEN_VIRTUAL_DISK_VERSION; + typedef enum _ATTACH_VIRTUAL_DISK_VERSION { ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED, ATTACH_VIRTUAL_DISK_VERSION_1 @@ -156,6 +181,27 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS { } DUMMYUNIONNAME; } EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS; +typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS +{ + OPEN_VIRTUAL_DISK_VERSION Version; + __C89_NAMELESS union { + struct { + ULONG RWDepth; + } Version1; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + } Version2; + struct { + BOOL GetInfoOnly; + BOOL ReadOnly; + GUID ResiliencyGuid; + GUID SnapshotId; + } Version3; + } DUMMYUNIONNAME; +} OPEN_VIRTUAL_DISK_PARAMETERS, *POPEN_VIRTUAL_DISK_PARAMETERS; + typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1 { DEPENDENT_DISK_FLAG DependencyTypeFlags; @@ -196,6 +242,9 @@ typedef struct _VIRTUAL_DISK_PROGRESS { DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used); +DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags, + OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle); + #ifdef __cplusplus } #endif

1 0

Dmitry Timoshkov : crypt32: CryptMsgUpdate should skip broken certificates.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 70f00e62468b368fcea9f5bb9ccdb62f52fa3b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f00e62468b368fcea9f5bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 17:55:24 2019 +0800 crypt32: CryptMsgUpdate should skip broken certificates. CertOpenStore() already verifies the certificate before adding it to the memory store from the file, this patch makes CryptMsgUpdate() behave in a similar way. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45757 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1875620466d178faead9d0ccea08bd2eee7c7722) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/decode.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index e70940aa7d..a69743e9b6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -683,6 +683,13 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, &itemDecoded); if (ret) { + /* Ignore an item that failed to decode but the decoder doesn't want to fail the whole process */ + if (!size) + { + ptr += itemEncoded; + continue; + } + cItems++; if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, @@ -5631,6 +5638,25 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL verify_and_copy_certificate(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + PCCERT_CONTEXT cert; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, pbEncoded, cbEncoded); + if (!cert) + { + WARN("CertCreateCertificateContext error %#x\n", GetLastError()); + *pcbStructInfo = 0; + *pcbDecoded = 0; + return TRUE; + } + + CertFreeCertificateContext(cert); + + return CRYPT_AsnDecodeCopyBytes(pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); +} + static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5640,7 +5666,7 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, offsetof(CRYPT_SIGNED_INFO, cCertEncoded), offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), - CRYPT_AsnDecodeCopyBytes, + verify_and_copy_certificate, sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,

1 0

Nikolay Sivov : ntdll: Initialize critical section debug info with correct pointer value.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: d10f213840b3761920cc996bf62f00fa21884e5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10f213840b3761920cc996b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 13:19:22 2019 +0300 ntdll: Initialize critical section debug info with correct pointer value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe0f8a150fdaaf71052ab50597207086cf5f4b4a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/sync.c | 14 +++++++++++++- dlls/ntdll/critsection.c | 44 ++++++++++++++++++++++++++------------------ dlls/ntdll/tests/rtl.c | 1 - 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6d47d7004c..9f5b614508 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -402,7 +402,8 @@ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + if (crit->DebugInfo != (void *)(ULONG_PTR)-1) + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8dea3b30c3..e77c40a2f6 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2647,13 +2647,25 @@ static void test_crit_section(void) InitializeCriticalSection(&cs); ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); memset(&cs, 0, sizeof(cs)); ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); -todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + + cs.DebugInfo = NULL; + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } START_TEST(sync) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 42e432c8f6..e8ffc1ceed 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -59,6 +59,13 @@ static inline void small_pause(void) #endif } +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ @@ -226,7 +233,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; @@ -321,20 +328,21 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). */ if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = NULL; + crit->DebugInfo = no_debug_info_marker; else - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - if (crit->DebugInfo) { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } } crit->LockCount = -1; crit->RecursionCount = 0; @@ -396,7 +404,7 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->DebugInfo) + if (crit_section_has_debuginfo( crit )) { /* only free the ones we made in here */ if (!crit->DebugInfo->Spare[0]) @@ -454,7 +462,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[0]; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); @@ -472,7 +480,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (status == STATUS_WAIT_0) break; /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; /* only throw deadlock exception if configured timeout is reached */ if (timeout > 0) continue; @@ -485,7 +493,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) rec.ExceptionInformation[0] = (ULONG_PTR)crit; RtlRaiseException( &rec ); } - if (crit->DebugInfo) crit->DebugInfo->ContentionCount++; + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS; } @@ -518,7 +526,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 5fe72ec38b..62662cb438 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3152,7 +3152,6 @@ static void test_RtlInitializeCriticalSectionEx(void) memset(&cs, 0x11, sizeof(cs)); pRtlInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO); - todo_wine ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount);

1 0

Nikolay Sivov : kernel32/tests: Add a test for critical section DebugInfo initial value.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 0a77cef2eef6fcb17cfecaa21ae7aed5cae535b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a77cef2eef6fcb17cfecaa2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 25 12:31:55 2019 +0300 kernel32/tests: Add a test for critical section DebugInfo initial value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bf174815ba8529bfbbda8697503d3c2539f82359) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/sync.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f7be51e972..8dea3b30c3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2636,6 +2636,26 @@ static void test_apc_deadlock(void) CloseHandle(pi.hProcess); } +static void test_crit_section(void) +{ + CRITICAL_SECTION cs; + BOOL ret; + + /* Win8+ does not initialize debug info, one has to use RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO + to override that. */ + memset(&cs, 0, sizeof(cs)); + InitializeCriticalSection(&cs); + ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + + memset(&cs, 0, sizeof(cs)); + ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ok(ret, "Failed to initialize critical section.\n"); +todo_wine + ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); +} + START_TEST(sync) { char **argv; @@ -2694,4 +2714,5 @@ START_TEST(sync) test_srwlock_example(); test_alertable_wait(); test_apc_deadlock(); + test_crit_section(); }

1 0

Erich E. Hoover : advapi32: Fix the initialization of combined DACLs when the new DACL is empty.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 97cf4f154dd5c7dc912fc55de8720ca9f64f305d URL: https://source.winehq.org/git/wine.git/?a=commit;h=97cf4f154dd5c7dc912fc55d… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 25 11:36:15 2019 +0200 advapi32: Fix the initialization of combined DACLs when the new DACL is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38423 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 92ee3543e549b02a916c2b6d4bcc9335d35b435e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/security.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5c4ddde112..ecaddd96d2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5966,6 +5966,7 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) { + NTSTATUS status; ACL *combined; int i; @@ -5974,8 +5975,23 @@ static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) if (!combined) return STATUS_NO_MEMORY; - memcpy(combined, child, child->AclSize); - combined->AclSize = child->AclSize+parent->AclSize; + status = RtlCreateAcl(combined, parent->AclSize+child->AclSize, ACL_REVISION); + if (status != STATUS_SUCCESS) + { + heap_free(combined); + return status; + } + + /* copy the new ACEs */ + for (i=0; i<child->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(child, i, (void*)&ace)) + continue; + if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding new ACE\n"); + } /* copy the inherited ACEs */ for (i=0; i<parent->AceCount; i++)

1 0

Erich E. Hoover : advapi32: Move the DACL combining code into a separate routine.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: dfcef81b5b9a87de076cc632b1a914943028d5df URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfcef81b5b9a87de076cc632… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Thu Apr 25 11:36:14 2019 +0200 advapi32: Move the DACL combining code into a separate routine. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9aac7ca191e137eca6c7d820e0de1a84d42ef50a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/security.c | 79 +++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da40e7..5c4ddde112 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5964,6 +5964,48 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) return TRUE; } +static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) +{ + ACL *combined; + int i; + + /* initialize a combined DACL containing both inherited and new ACEs */ + combined = heap_alloc_zero(child->AclSize+parent->AclSize); + if (!combined) + return STATUS_NO_MEMORY; + + memcpy(combined, child, child->AclSize); + combined->AclSize = child->AclSize+parent->AclSize; + + /* copy the inherited ACEs */ + for (i=0; i<parent->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(parent, i, (void*)&ace)) + continue; + if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) + continue; + if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != + (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) + { + FIXME("unsupported flags: %x\n", ace->AceFlags); + continue; + } + + if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) + ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); + ace->AceFlags &= ~INHERIT_ONLY_ACE; + ace->AceFlags |= INHERITED_ACE; + + if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding inherited ACE\n"); + } + + *result = combined; + return STATUS_SUCCESS; +} + /****************************************************************************** * SetSecurityInfo [ADVAPI32.@] */ @@ -6063,41 +6105,10 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, if (!err) { - int i; - - dacl = heap_alloc_zero(pDacl->AclSize+parent_dacl->AclSize); - if (!dacl) - { - LocalFree(parent_sd); - return ERROR_NOT_ENOUGH_MEMORY; - } - memcpy(dacl, pDacl, pDacl->AclSize); - dacl->AclSize = pDacl->AclSize+parent_dacl->AclSize; - - for (i=0; i<parent_dacl->AceCount; i++) - { - ACE_HEADER *ace; - - if (!GetAce(parent_dacl, i, (void*)&ace)) - continue; - if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) - continue; - if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != - (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) - { - FIXME("unsupported flags: %x\n", ace->AceFlags); - continue; - } - - if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) - ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); - ace->AceFlags &= ~INHERIT_ONLY_ACE; - ace->AceFlags |= INHERITED_ACE; - - if(!AddAce(dacl, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) - WARN("error adding inherited ACE\n"); - } + status = combine_dacls(parent_dacl, pDacl, &dacl); LocalFree(parent_sd); + if (status != STATUS_SUCCESS) + return RtlNtStatusToDosError(status); } } else

1 0

Martin Liska : include: Avoid compound literals for WCHAR strings.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: a4aedec7f5a3c66c7b5f500b66aa42936aeacf1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4aedec7f5a3c66c7b5f500b… Author: Martin Liska <mliska(a)suse.cz> Date: Mon Jun 10 10:57:32 2019 +0200 include: Avoid compound literals for WCHAR strings. Starting from GCC 9, compound liferal's scope has changed: https://www.gnu.org/software/gcc/gcc-9/porting_to.html#complit Signed-off-by: Martin Liska <mliska(a)suse.cz> Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9afc341c4f043240f0dc3de6351550b03d24b131) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/winldap_private.h | 18 +++-- include/bcrypt.h | 157 ++++++++++++++++++++++++------------- include/commctrl.h | 131 +++++++------------------------ include/commdlg.h | 35 ++------- include/d3dcompiler.h | 4 +- include/ddeml.h | 13 +--- include/ddk/mountmgr.h | 5 +- include/dpaddr.h | 38 +-------- include/lmaccess.h | 16 +--- include/msacm.h | 15 +--- include/ntsecapi.h | 6 +- include/oledlg.h | 12 +-- include/prsht.h | 5 +- include/richedit.h | 8 +- include/schannel.h | 30 ++------ include/sddl.h | 14 +--- include/softpub.h | 62 ++------------- include/uxtheme.h | 7 +- include/vsstyle.h | 141 +++++++--------------------------- include/vssym32.h | 44 +++-------- include/wincrypt.h | 170 +++++++++-------------------------------- include/winnls.h | 8 +- include/winnt.h | 34 +-------- include/winspool.h | 116 +++++++--------------------- include/winsvc.h | 5 +- include/wintrust.h | 5 +- 26 files changed, 296 insertions(+), 803 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4aedec7f5a3c66c7b5f…

1 0

Hans Leidekker : bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 329ef8cebd47abd756df72accd15b8273fca1d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=329ef8cebd47abd756df72ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:15 2019 +0100 bcrypt: Implement BCryptGenerate/FinalizeKeyPair for ECDH P256. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46564 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 73b695f059740715ebd3ea0ce3ce88477977e628) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_internal.h | 7 +- dlls/bcrypt/bcrypt_main.c | 55 +++++++++++++- dlls/bcrypt/gnutls.c | 164 +++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/macos.c | 6 ++ dlls/bcrypt/tests/bcrypt.c | 87 ++++++++++++++-------- dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 12 +++- 8 files changed, 290 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=329ef8cebd47abd756df…

1 0

Louis Lenders : dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 00902009d0dae993c8f8448969cb4bce17035590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00902009d0dae993c8f84489… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 1 15:04:51 2019 +0200 dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31350 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit abee97e469686d1e55a7ccfe39c86d05c8c0de81) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067122..eb06d15507 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..240cf78b6e 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,13 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) +#define DWM_E_REMOTING_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80263002) +#define DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE _HRESULT_TYPEDEF_(0x80263003) +#define DWM_E_NOT_QUEUING_PRESENTS _HRESULT_TYPEDEF_(0x80263004) +#define DWM_E_ADAPTER_NOT_FOUND _HRESULT_TYPEDEF_(0x80263005) +#define DWM_S_GDI_REDIRECTION_SURFACE _HRESULT_TYPEDEF_(0x00263005) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019