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

[PATCH] setupapi: Rewrite DiskSpaceList logic using lists.
by Vijay Kiran Kamuju March 28, 2019

March 28, 2019

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/diskspace.c | 184 +++++++++++++++++++++----------------- 1 file changed, 102 insertions(+), 82 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 1ca45f9691..7c33542e5a 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -1,6 +1,7 @@ /* * SetupAPI DiskSpace functions * + * Copyright 2016 Michael Müller * Copyright 2004 CodeWeavers (Aric Stewart) * * This library is free software; you can redistribute it and/or @@ -27,69 +28,51 @@ #include "winnls.h" #include "winreg.h" #include "setupapi.h" +#include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" +#include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -typedef struct { - WCHAR lpzName[20]; - LONGLONG dwFreeSpace; - LONGLONG dwWantedSpace; -} DRIVE_ENTRY, *LPDRIVE_ENTRY; +struct file_entry +{ + struct list entry; + WCHAR *path; + UINT operation; + LONGLONG size; +}; + +struct space_list +{ + struct list files; + UINT flags; +}; -typedef struct { - DWORD dwDriveCount; - DRIVE_ENTRY Drives[26]; -} DISKSPACELIST, *LPDISKSPACELIST; /*********************************************************************** * SetupCreateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID reserved1, DWORD reserved2, UINT flags) { - WCHAR drives[255]; - DWORD rc; - WCHAR *ptr; - LPDISKSPACELIST list=NULL; + struct space_list *list; - TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + TRACE("(%p, %u, 0x%08x)\n", reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) + if (reserved1 || reserved2 || flags & ~SPDSL_IGNORE_DISK) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - rc = GetLogicalDriveStringsW(255,drives); - - if (rc == 0) - return NULL; - - list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); - - list->dwDriveCount = 0; - - ptr = drives; - - while (*ptr) + list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)); + if (list) { - DWORD type = GetDriveTypeW(ptr); - if (type == DRIVE_FIXED) - { - DWORD clusters; - DWORD sectors; - DWORD bytes; - DWORD total; - lstrcpyW(list->Drives[list->dwDriveCount].lpzName,ptr); - GetDiskFreeSpaceW(ptr,&sectors,&bytes,&clusters,&total); - list->Drives[list->dwDriveCount].dwFreeSpace = clusters * sectors * - bytes; - list->Drives[list->dwDriveCount].dwWantedSpace = 0; - list->dwDriveCount++; - } - ptr += lstrlenW(ptr) + 1; + list->flags = flags; + list_init(&list->files); } + return list; } @@ -105,32 +88,58 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListA(PVOID Reserved1, DWORD Reserved2, UINT /*********************************************************************** * SetupDuplicateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC diskspace, PVOID reserved1, DWORD reserved2, UINT flags) { - DISKSPACELIST *list_copy, *list_original = DiskSpace; + struct space_list *list_copy, *list = diskspace; + struct file_entry *file, *file_copy; + + TRACE("(%p, %p, %u, %u)\n", diskspace, reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags) + if (reserved1 || reserved2 || flags) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (!DiskSpace) + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } - list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(DISKSPACELIST)); + list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*list_copy)); if (!list_copy) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - *list_copy = *list_original; + list_copy->flags = list->flags; + list_init(&list_copy->files); + + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + file_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*file_copy)); + if (!file_copy) goto error; + + file_copy->path = strdupW(file->path); + if (!file_copy->path) + { + HeapFree(GetProcessHeap(), 0, file_copy); + goto error; + } + + file_copy->operation = file->operation; + file_copy->size = file->size; + list_add_head(&list_copy->files, &file->entry); + } return list_copy; + +error: + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetupDestroyDiskSpaceList(list_copy); + return NULL; } /*********************************************************************** @@ -155,55 +164,51 @@ BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, /*********************************************************************** * SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, - LPCWSTR DriveSpec, LONGLONG *SpaceRequired, - PVOID Reserved1, UINT Reserved2) +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC diskspace, + LPCWSTR drivespec, LONGLONG *required, + PVOID reserved1, UINT reserved2) { - WCHAR *driveW; - unsigned int i; - LPDISKSPACELIST list = DiskSpace; - BOOL rc = FALSE; - static const WCHAR bkslsh[]= {'\\',0}; + struct space_list *list = diskspace; + struct file_entry *file; + LONGLONG sum = 0; - if (!DiskSpace) + TRACE("(%p, %s, %p, %p, %u)\n", diskspace, debugstr_w(drivespec), required, reserved1, reserved2); + + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DriveSpec) + if (!drivespec || !drivespec[0]) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(drivespec ? ERROR_INVALID_DRIVE : ERROR_INVALID_DRIVE); return FALSE; } - driveW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(DriveSpec) + 2) * sizeof(WCHAR)); - if (!driveW) + if (!required) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - lstrcpyW(driveW,DriveSpec); - lstrcatW(driveW,bkslsh); - - TRACE("Looking for drive %s\n",debugstr_w(driveW)); - - for (i = 0; i < list->dwDriveCount; i++) + if (tolowerW(drivespec[0]) < 'a' || tolowerW(drivespec[0]) > 'z' || + drivespec[1] != ':' || drivespec[2] != 0) { - TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); - if (lstrcmpW(driveW,list->Drives[i].lpzName)==0) - { - rc = TRUE; - *SpaceRequired = list->Drives[i].dwWantedSpace; - break; - } + FIXME("UNC paths not yet supported (%s)\n", debugstr_w(drivespec)); + SetLastError((GetVersion() & 0x80000000) ? ERROR_INVALID_DRIVE : ERROR_INVALID_PARAMETER); + return FALSE; } - HeapFree(GetProcessHeap(), 0, driveW); + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + if (tolowerW(file->path[0]) == tolowerW(drivespec[0]) && + file->path[1] == ':' && file->path[2] == '\\') + sum += file->size; + } - if (!rc) SetLastError(ERROR_INVALID_DRIVE); - return rc; + *required = sum; + return TRUE; } /*********************************************************************** @@ -253,10 +258,25 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, /*********************************************************************** * SetupDestroyDiskSpaceList (SETUPAPI.@) */ -BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) +BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC diskspace) { - LPDISKSPACELIST list = DiskSpace; - HeapFree(GetProcessHeap(),0,list); + struct space_list *list = diskspace; + struct file_entry *file, *file2; + + if (!diskspace) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(file, file2, &list->files, struct file_entry, entry) + { + HeapFree(GetProcessHeap(), 0, file->path); + list_remove(&file->entry); + HeapFree(GetProcessHeap(), 0, file); + } + + HeapFree(GetProcessHeap(), 0, list); return TRUE; } -- 2.21.0

1 0

[PATCH] wintrust: Verify image hash in WinVerifyTrust. (v2)
by Vijay Kiran Kamuju March 28, 2019

March 28, 2019

From: Mark Jansen <learn0more+wine(a)gmail.com> Includes various improvements by Sebastian Lackner <sebastian(a)fds-team.de>. Changes in v2: * Do not use memory mapping (based on a patch by Mark Jansen). From: Mark Jansen <learn0more+wine(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wintrust/softpub.c | 194 ++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 8 +- 2 files changed, 198 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d65d2b681d..ae1300eb19 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,195 @@ static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, return err; } +/* 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 pos, 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; + BYTE buffer[1024]; + 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) + { + ERR("Unrecognized IMAGE_DOS_HEADER magic %04x\n", dos_header.e_magic); + 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) + { + ERR("Unrecognized IMAGE_NT_HEADERS signature %08x\n", nt_header.nt32.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 + { + ERR("Unrecognized OptionalHeader magic %04x\n", nt_header.nt32.OptionalHeader.Magic); + 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; + + /* Hash until checksum. */ + SetFilePointer(file, 0, NULL, FILE_BEGIN); + for (pos = 0; pos < checksum; pos += bytes_read) + { + ret = ReadFile(file, buffer, min(sizeof(buffer), checksum - pos), &bytes_read, NULL); + if (!ret || !bytes_read) + return FALSE; + if (!CryptHashData(hash, buffer, bytes_read, 0)) + return FALSE; + } + + /* Hash until the DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY] entry. */ + checksum += sizeof(DWORD); + SetFilePointer(file, checksum, NULL, FILE_BEGIN); + for (pos = checksum; pos < security_dir; pos += bytes_read) + { + ret = ReadFile(file, buffer, min(sizeof(buffer), security_dir - pos), &bytes_read, NULL); + if (!ret || !bytes_read) + return FALSE; + if (!CryptHashData(hash, buffer, bytes_read, 0)) + return FALSE; + } + + /* Hash until the end of the file. */ + security_dir += sizeof(IMAGE_DATA_DIRECTORY); + SetFilePointer(file, security_dir, NULL, FILE_BEGIN); + for (pos = security_dir; pos < secdir.VirtualAddress; pos += bytes_read) + { + ret = ReadFile(file, buffer, min(sizeof(buffer), secdir.VirtualAddress - pos), &bytes_read, NULL); + if (!ret || !bytes_read) + return FALSE; + if (!CryptHashData(hash, buffer, bytes_read, 0)) + 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 +562,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 5d6d62c9e9..914f04d7c0 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) }}, -- 2.21.0

1 0

[PATCH 1/3] shell32/autocomplete: Forward to the original listbox proc outside the switch
by Gabriel Ivăncescu March 28, 2019

March 28, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is consistent with the edit box proc and will be needed in the future when adding the grip. dlls/shell32/autocomplete.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index bd9b872..ed8b270 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -801,23 +801,21 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_MOUSEMOVE: sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); SendMessageW(hwnd, LB_SETCURSEL, sel, 0); - break; + return 0; case WM_LBUTTONDOWN: sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); if (sel < 0) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXTLEN, sel, 0); if (!(msg = heap_alloc((len + 1) * sizeof(WCHAR)))) - break; + return 0; len = SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); set_text_and_selection(This, This->hwndEdit, msg, 0, len); hide_listbox(This, hwnd, TRUE); heap_free(msg); - break; - default: - return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + return 0; } - return 0; + return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } static void create_listbox(IAutoCompleteImpl *This) -- 2.20.1

2 3

[PATCH] secur32: Handle a new, undefined SECPKG_FLAG value [untested]
by Detlef Riekenberg March 28, 2019

March 28, 2019

Recent Windows versions (current 8.1 / 1709 or older win.1ß) started using a new Flag with the value 0x02000000, but there is no definition in the last SDK release (Mircosoft has a prerelease for an updated SDK, but access to that is restricted to "Windows insider") Example failures (full report with 90 failures after upgrading from win7 to win10) http://test.winehq.org/queue/errksCfJ/report an 8.1 machine: http://test.winehq.org/data/829170f3d6b875f7a6f065072cc3334a20ff805e/win8_d… untested: I have no compiler toolchain on this windows machine and the Patch is still queued (Testbot down), https://testbot.winehq.org/JobDetails.pl?Key=50051 After this is comitted, we need a similar patch for other testfiles (secur32/tests/ntlm.c as example) -- ... bye bye Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/secur32/tests/secur32.c | 6 +++++- include/sspi.h | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 2d2c2a6925..f640813632 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -32,6 +32,9 @@ #include "wine/test.h" +/* FIXME: Microsoft is using 0x02000000 (not defined in the 10.0.17763 SDK) */ +#define SECPKG_FLAG_0x02000000 0x02000000 + static HMODULE secdll; static SECURITY_STATUS (SEC_ENTRY *pSspiEncodeAuthIdentityAsStrings) @@ -440,7 +443,8 @@ static void test_kerberos(void) | SECPKG_FLAG_READONLY_WITH_CHECKSUM; static const ULONG optional_mask = SECPKG_FLAG_RESTRICTED_TOKENS - | SECPKG_FLAG_APPCONTAINER_CHECKS; + | SECPKG_FLAG_APPCONTAINER_CHECKS + | SECPKG_FLAG_0x02000000; status = QuerySecurityPackageInfoA(provider, &info); ok(status == SEC_E_OK, "Kerberos package not installed, skipping test\n"); diff --git a/include/sspi.h b/include/sspi.h index 0e248fbef0..d1c8e2b192 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -171,8 +171,10 @@ SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); #define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 #define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 #define SECPKG_FLAG_NEGOTIABLE2 0x00200000 -#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 -#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_CREDENTIAL_ISOLATION_ENABLED 0x01000000 +/* FIXME: Microsoft is using 0x02000000 (not defined in the 10.0.17763 SDK) */ #define SECPKG_ID_NONE 0xffff -- 2.21.0.windows.1

2 1

[PATCH] ntdll: Expand environment variables when querying them
by Fabian Maurer March 27, 2019

March 27, 2019

For a test program see the bug report. A test is hard to include since environment variables won't update without a reboot. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46901 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/env.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 367d083211..e186e3b917 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -164,11 +164,16 @@ NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR env, var = ENV_FindVariable(var, name->Buffer, namelen); if (var != NULL) { - value->Length = strlenW(var) * sizeof(WCHAR); + WCHAR buffer[UNICODE_STRING_MAX_CHARS]; + SIZE_T len; + RtlExpandEnvironmentStrings(env, (WCHAR *)var, strlenW(var), buffer, ARRAY_SIZE(buffer), &len); + + value->Length = (len - 1) * sizeof(WCHAR); /* Length without '\0' terminator */ if (value->Length <= value->MaximumLength) { - memmove(value->Buffer, var, min(value->Length + sizeof(WCHAR), value->MaximumLength)); + memmove(value->Buffer, buffer, min(value->Length + sizeof(WCHAR), value->MaximumLength)); + nts = STATUS_SUCCESS; } else nts = STATUS_BUFFER_TOO_SMALL; -- 2.21.0

2 6

[PATCH] ntdll: Add test for environment variables in PEB block
by Fabian Maurer March 27, 2019

March 27, 2019

Note that the test is interactive since it requires a reboot (on windows) and a rerun on wine. AFAIK there's no way around those limitations, so this is the test I came up with. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/tests/env.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4e2ef8222d..41cb44ecd2 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,59 @@ static void test_process_params(void) } } +static BOOL setup_environment(void) +{ + HKEY key; + LSTATUS status; + LPCSTR value1 = "%WINETESTVAR2%"; + LPCSTR value2 = "test ok"; + BOOL is_ready; + const char *path = "System\\CurrentControlSet\\Control\\Session Manager\\Environment"; + status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, path, 0, KEY_ALL_ACCESS, &key); + ok(status == ERROR_SUCCESS, "RegOpenKeyExA failed with %d\n", status); + + status = RegQueryValueExA(key, "WINETESTVAR1", NULL, NULL, NULL, NULL); + ok(status == ERROR_SUCCESS || status == ERROR_FILE_NOT_FOUND, "RegQueryValueExA failed with %d\n", status); + is_ready = (status == ERROR_SUCCESS); + if (!is_ready) + { + status = RegSetValueExA(key, "WINETESTVAR1", 0, REG_EXPAND_SZ,(LPBYTE)value1, strlen(value1) + 1); + ok(status == ERROR_SUCCESS, "RegSetValueExA failed with %d\n", status); + status = RegSetValueExA(key, "WINETESTVAR2", 0, REG_EXPAND_SZ,(LPBYTE)value2, strlen(value2) + 1); + ok(status == ERROR_SUCCESS, "RegSetValueExA failed with %d\n", status); + } + RegCloseKey(key); + + return is_ready; +} + +static void test_peb_environment(void) +{ + static const WCHAR result1[] = {'W','I','N','E','T','E','S','T','V','A','R','1','=','t','e','s','t',' ','o','k',0}; + static const WCHAR result2[] = {'W','I','N','E','T','E','S','T','V','A','R','2','=','t','e','s','t',' ','o','k',0}; + BOOL found1 = FALSE; + BOOL found2 = FALSE; + BOOL is_ready = setup_environment(); + if (is_ready) + { + WCHAR *env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + for (; *env; env += lstrlenW(env) + 1) + { + if (lstrcmpW(env, result1) == 0) + found1 = TRUE; + if (lstrcmpW(env, result2) == 0) + found2 = TRUE; + } + todo_wine + ok(found1, "Didn't find %s in the PEB environment variables\n", wine_dbgstr_w(result1)); + ok(found2, "Didn't find %s in the PEB environment variables\n", wine_dbgstr_w(result2)); + } + else + { + skip("Preparation finished. Restart when running windows, then rerun the test for the results.\n"); + } +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +588,8 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + if (winetest_interactive) + { + test_peb_environment(); + } } -- 2.21.0

1 0

testbot debian vm is down
by Vijay Kiran Kamuju March 27, 2019

March 27, 2019

Hi All, It seems the testbot debian vm has crashed and is down Can someone check it. ------ Vijay

1 0

[PATCH] secur32: Handle a new, undefined SECPKG_FLAG value [untested, v2]
by Detlef Riekenberg March 27, 2019

March 27, 2019

Recent Windows versions (current 8.1 and win 10 v1709 or older) started using a new SECPKG_FLAG with the value 0x02000000, but there is no definition in any SDK or online documentation. v2: with suggestions from Dimitry Example failures (full report with 90 failures after upgrading from win7 to win10) http://test.winehq.org/queue/errksCfJ/report an 8.1 machine: http://test.winehq.org/data/829170f3d6b875f7a6f065072cc3334a20ff805e/win8_d… untested: I have no compiler toolchain on this windows machine and the similar Patch is still queued (Testbot down), https://testbot.winehq.org/JobDetails.pl?Key=50051 After this is comitted, we need a similar patch for other testfiles (secur32/tests/ntlm.c as example) -- ... bye bye Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/secur32/tests/secur32.c | 4 +++- include/sspi.h | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 2d2c2a6925..8fd421ca73 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -440,7 +440,9 @@ static void test_kerberos(void) | SECPKG_FLAG_READONLY_WITH_CHECKSUM; static const ULONG optional_mask = SECPKG_FLAG_RESTRICTED_TOKENS - | SECPKG_FLAG_APPCONTAINER_CHECKS; + | SECPKG_FLAG_APPCONTAINER_CHECKS + | 0x02000000; /* not defined in the SDK */ + status = QuerySecurityPackageInfoA(provider, &info); ok(status == SEC_E_OK, "Kerberos package not installed, skipping test\n"); diff --git a/include/sspi.h b/include/sspi.h index 0e248fbef0..ad423eed90 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -171,8 +171,9 @@ SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); #define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 #define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 #define SECPKG_FLAG_NEGOTIABLE2 0x00200000 -#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 -#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_CREDENTIAL_ISOLATION_ENABLED 0x01000000 #define SECPKG_ID_NONE 0xffff -- 2.21.0.windows.1

1 0

[PATCH] d3d9: Actually test two return values
by Michael Stefaniuc March 27, 2019

March 27, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ffeb6b4734..f79f26125c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13341,7 +13341,7 @@ static void test_get_display_mode(void) hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); @@ -13371,7 +13371,7 @@ static void test_get_display_mode(void) ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D9_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); -- 2.20.1

3 2

[PATCH] d3d8: Actually test two return values
by Michael Stefaniuc March 27, 2019

March 27, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 90b90e99e8..c5ec9aa736 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9655,7 +9655,7 @@ static void test_get_display_mode(void) hr = IDirect3DDevice8_GetDisplayMode(device, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); @@ -9679,7 +9679,7 @@ static void test_get_display_mode(void) ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); -- 2.20.1

3 2