September 2018 - Wine-devel

[PATCH 1/7] ntdll/tests: Fix compilation with PSDK.
by Dmitry Timoshkov 27 Sep '18

27 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d9d029b7f3..87c3339d31 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1044,7 +1044,7 @@ static void test_iocp_fileio(HANDLE h) ok( !count, "Unexpected msg count: %ld\n", count ); /* using APCs on handle with associated completion port is not allowed */ - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -1070,7 +1070,7 @@ static void test_iocp_fileio(HANDLE h) count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res); U(iosb).Status = 0xdeadbeef; @@ -1092,7 +1092,7 @@ static void test_iocp_fileio(HANDLE h) ok( !count, "Unexpected msg count: %ld\n", count ); /* using APCs on handle with associated completion port is not allowed */ - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -4197,7 +4197,7 @@ static void test_ioctl(void) ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status); memset(&iosb, 0x55, sizeof(iosb)); - status = NtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, + status = pNtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &peek_buf, sizeof(peek_buf)); todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status); -- 2.17.1

2 1

[PATCH] crypt32: Add CRYPT_STRING_BINARY mode for CryptBinaryToStringW().
by Nikolay Sivov 27 Sep '18

27 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/base64.c | 25 ++++++++++++++++++++++++- dlls/crypt32/tests/base64.c | 5 +---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index ac288b7c5e..f21476ecfe 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -294,6 +294,27 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); } +static BOOL EncodeBinaryToBinaryW(const BYTE *in_buf, DWORD in_len, DWORD flags, WCHAR *out_buf, DWORD *out_len) +{ + BOOL ret = TRUE; + + if (out_buf) + { + if (*out_len < in_len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else if (in_len) + memcpy(out_buf, in_buf, in_len); + } + else + + *out_len = in_len; + + return ret; +} + static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, WCHAR* out_buf, DWORD *out_len) { @@ -472,13 +493,15 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, switch (dwFlags & 0x0fffffff) { + case CRYPT_STRING_BINARY: + encoder = EncodeBinaryToBinaryW; + break; case CRYPT_STRING_BASE64: case CRYPT_STRING_BASE64HEADER: case CRYPT_STRING_BASE64REQUESTHEADER: case CRYPT_STRING_BASE64X509CRLHEADER: encoder = BinaryToBase64W; break; - case CRYPT_STRING_BINARY: case CRYPT_STRING_HEX: case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index e6adc7ab38..4ff76272e3 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -284,17 +284,14 @@ static void test_CryptBinaryToString(void) strLen = 0; ret = CryptBinaryToStringW(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, NULL, &strLen); - todo_wine { ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); ok(strLen == tests[i].toEncodeLen, "Unexpected required length %u.\n", strLen); - } + strLen2 = strLen; strW = heap_alloc(strLen); ret = CryptBinaryToStringW(tests[i].toEncode, tests[i].toEncodeLen, CRYPT_STRING_BINARY, strW, &strLen2); - todo_wine ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); ok(strLen == strLen2, "Expected length %u, got %u\n", strLen, strLen2); - todo_wine ok(!memcmp(strW, tests[i].toEncode, tests[i].toEncodeLen), "Unexpected value\n"); heap_free(strW); -- 2.19.0

2 1

[PATCH 7/7] server: Fail to open a file if it has explicit delete disposition set.
by Dmitry Timoshkov 27 Sep '18

27 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/file.c | 10 ---------- server/fd.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 363fe3f6fc..82f2a6a390 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2681,16 +2681,11 @@ todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted file */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); -todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); /* can't open the deleted file (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, 0, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; @@ -2889,16 +2884,11 @@ todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); -todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); CloseHandle( handle2 ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; diff --git a/server/fd.c b/server/fd.c index 7069938e6f..ab0f94705f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1827,6 +1827,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, { unsigned int err; struct inode *inode = get_inode( st.st_dev, st.st_ino, fd->unix_fd ); + struct list *ptr; if (!inode) { @@ -1841,6 +1842,16 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, list_add_head( &inode->open, &fd->inode_entry ); closed_fd = NULL; + LIST_FOR_EACH( ptr, &inode->open ) + { + struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); + if (fd_ptr->closed->unlink == 1 /* only explicit disposition matters */) + { + set_error( STATUS_DELETE_PENDING ); + goto error; + } + } + /* check directory options */ if ((options & FILE_DIRECTORY_FILE) && !S_ISDIR(st.st_mode)) { -- 2.17.1

1 0

[PATCH 6/7] server: Track separately implicit and explicit file disposition.
by Dmitry Timoshkov 27 Sep '18

27 Sep '18

This simplifies next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/fd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/fd.c b/server/fd.c index 65ff087f18..7069938e6f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -166,7 +166,7 @@ struct closed_fd { struct list entry; /* entry in inode closed list */ int unix_fd; /* the unix file descriptor */ - int unlink; /* whether to unlink on close */ + int unlink; /* whether to unlink on close: -1 - implicit FILE_DELETE_ON_CLOSE, 1 - explicit disposition */ char *unix_name; /* name to unlink on close, points to parent fd unix_name */ }; @@ -1866,7 +1866,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, goto error; } - fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; + fd->closed->unlink = (options & FILE_DELETE_ON_CLOSE) ? -1 : 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) @@ -2254,7 +2254,9 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - fd->closed->unlink = unlink || (fd->options & FILE_DELETE_ON_CLOSE); + fd->closed->unlink = unlink != 0; + if (fd->options & FILE_DELETE_ON_CLOSE) + fd->closed->unlink = -1; } /* set new name for the fd */ -- 2.17.1

1 0

[PATCH 4/7] server: Allow setting delete disposition on a read-only directory.
by Dmitry Timoshkov 27 Sep '18

27 Sep '18

This makes next patch work for RemoveDirectory() call in dlls/kernel32/tests/profile.c,test_profile_directory_readonly(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- server/fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index 6118f52dd5..65ff087f18 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2247,8 +2247,8 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } - /* can't unlink files we don't have permission to access */ - if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + /* can't unlink files we don't have permission to write */ + if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) && !S_ISDIR(st.st_mode)) { set_error( STATUS_CANNOT_DELETE ); return; -- 2.17.1

1 0

[PATCH] winex11.drv: Add a trailing '\n' to dump_PIXELFORMATDESCRIPTOR().
by Francois Gouget 27 Sep '18

27 Sep '18

In the one call location there is no guarantee another trace will add the linefeed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 13a1da32ea5..c529b898493 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -298,7 +298,7 @@ static BOOL glxRequireVersion(int requiredVersion); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE( "size %u version %u flags %u type %u color %u %u,%u,%u,%u " - "accum %u depth %u stencil %u aux %u ", + "accum %u depth %u stencil %u aux %u\n", ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); -- 2.19.0

2 1

[PATCH] appwiz.cpl: Read more application attributes from the registry.
by Hans Leidekker 27 Sep '18

27 Sep '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/appwiz.cpl/appwiz.c | 100 ++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index af893b8391..ee26e5825f 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -67,6 +67,12 @@ typedef struct APPINFO LPWSTR publisher; LPWSTR version; + LPWSTR contact; + LPWSTR helplink; + LPWSTR helptelephone; + LPWSTR readme; + LPWSTR urlupdateinfo; + LPWSTR comments; HKEY regroot; WCHAR regkey[MAX_STRING_LEN]; @@ -84,21 +90,17 @@ static const WCHAR openW[] = {'o','p','e','n',0}; static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR DisplayIconW[] = {'D','i','s','p','l','a','y','I','c','o','n',0}; -static const WCHAR DisplayVersionW[] = {'D','i','s','p','l','a','y','V','e','r', - 's','i','o','n',0}; +static const WCHAR DisplayVersionW[] = {'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0}; static const WCHAR PublisherW[] = {'P','u','b','l','i','s','h','e','r',0}; static const WCHAR ContactW[] = {'C','o','n','t','a','c','t',0}; static const WCHAR HelpLinkW[] = {'H','e','l','p','L','i','n','k',0}; -static const WCHAR HelpTelephoneW[] = {'H','e','l','p','T','e','l','e','p','h', - 'o','n','e',0}; +static const WCHAR HelpTelephoneW[] = {'H','e','l','p','T','e','l','e','p','h','o','n','e',0}; static const WCHAR ModifyPathW[] = {'M','o','d','i','f','y','P','a','t','h',0}; static const WCHAR NoModifyW[] = {'N','o','M','o','d','i','f','y',0}; static const WCHAR ReadmeW[] = {'R','e','a','d','m','e',0}; -static const WCHAR URLUpdateInfoW[] = {'U','R','L','U','p','d','a','t','e','I', - 'n','f','o',0}; +static const WCHAR URLUpdateInfoW[] = {'U','R','L','U','p','d','a','t','e','I','n','f','o',0}; static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0}; -static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l', - 'S','t','r','i','n','g',0}; +static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; @@ -139,9 +141,27 @@ static void FreeAppInfo(APPINFO *info) HeapFree(GetProcessHeap(), 0, info->icon); HeapFree(GetProcessHeap(), 0, info->publisher); HeapFree(GetProcessHeap(), 0, info->version); + HeapFree(GetProcessHeap(), 0, info->contact); + HeapFree(GetProcessHeap(), 0, info->helplink); + HeapFree(GetProcessHeap(), 0, info->helptelephone); + HeapFree(GetProcessHeap(), 0, info->readme); + HeapFree(GetProcessHeap(), 0, info->urlupdateinfo); + HeapFree(GetProcessHeap(), 0, info->comments); HeapFree(GetProcessHeap(), 0, info); } +static WCHAR *get_reg_str(HKEY hkey, const WCHAR *value) +{ + DWORD len, type; + WCHAR *ret = NULL; + if (!RegQueryValueExW(hkey, value, NULL, &type, NULL, &len) && type == REG_SZ) + { + if (!(ret = HeapAlloc(GetProcessHeap(), 0, len))) return NULL; + RegQueryValueExW(hkey, value, 0, 0, (BYTE *)ret, &len); + } + return ret; +} + /****************************************************************************** * Name : ReadApplicationsFromRegistry * Description: Creates a linked list of uninstallable applications from the @@ -238,30 +258,14 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } } - /* publisher, version */ - if (RegQueryValueExW(hkeyApp, PublisherW, 0, 0, NULL, &displen) == - ERROR_SUCCESS) - { - info->publisher = HeapAlloc(GetProcessHeap(), 0, displen); - - if (!info->publisher) - goto err; - - RegQueryValueExW(hkeyApp, PublisherW, 0, 0, (LPBYTE)info->publisher, - &displen); - } - - if (RegQueryValueExW(hkeyApp, DisplayVersionW, 0, 0, NULL, &displen) == - ERROR_SUCCESS) - { - info->version = HeapAlloc(GetProcessHeap(), 0, displen); - - if (!info->version) - goto err; - - RegQueryValueExW(hkeyApp, DisplayVersionW, 0, 0, (LPBYTE)info->version, - &displen); - } + info->publisher = get_reg_str(hkeyApp, PublisherW); + info->version = get_reg_str(hkeyApp, DisplayVersionW); + info->contact = get_reg_str(hkeyApp, ContactW); + info->helplink = get_reg_str(hkeyApp, HelpLinkW); + info->helptelephone = get_reg_str(hkeyApp, HelpTelephoneW); + info->readme = get_reg_str(hkeyApp, ReadmeW); + info->urlupdateinfo = get_reg_str(hkeyApp, URLUpdateInfoW); + info->comments = get_reg_str(hkeyApp, CommentsW); /* Check if NoModify is set */ dwType = REG_DWORD; @@ -616,28 +620,16 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L RegOpenKeyExW(iter->regroot, key, 0, KEY_READ, &hkey); /* Load our "not specified" string */ - LoadStringW(hInst, IDS_NOT_SPECIFIED, notfound, - ARRAY_SIZE(notfound)); - - /* Update the data for items already read into the structure */ - SetInfoDialogText(NULL, iter->publisher, notfound, hWnd, - IDC_INFO_PUBLISHER); - SetInfoDialogText(NULL, iter->version, notfound, hWnd, - IDC_INFO_VERSION); - - /* And now update the data for those items in the registry */ - SetInfoDialogText(hkey, ContactW, notfound, hWnd, - IDC_INFO_CONTACT); - SetInfoDialogText(hkey, HelpLinkW, notfound, hWnd, - IDC_INFO_SUPPORT); - SetInfoDialogText(hkey, HelpTelephoneW, notfound, hWnd, - IDC_INFO_PHONE); - SetInfoDialogText(hkey, ReadmeW, notfound, hWnd, - IDC_INFO_README); - SetInfoDialogText(hkey, URLUpdateInfoW, notfound, hWnd, - IDC_INFO_UPDATES); - SetInfoDialogText(hkey, CommentsW, notfound, hWnd, - IDC_INFO_COMMENTS); + LoadStringW(hInst, IDS_NOT_SPECIFIED, notfound, ARRAY_SIZE(notfound)); + + SetInfoDialogText(NULL, iter->publisher, notfound, hWnd, IDC_INFO_PUBLISHER); + SetInfoDialogText(NULL, iter->version, notfound, hWnd, IDC_INFO_VERSION); + SetInfoDialogText(hkey, iter->contact, notfound, hWnd, IDC_INFO_CONTACT); + SetInfoDialogText(hkey, iter->helplink, notfound, hWnd, IDC_INFO_SUPPORT); + SetInfoDialogText(hkey, iter->helptelephone, notfound, hWnd, IDC_INFO_PHONE); + SetInfoDialogText(hkey, iter->readme, notfound, hWnd, IDC_INFO_README); + SetInfoDialogText(hkey, iter->urlupdateinfo, notfound, hWnd, IDC_INFO_UPDATES); + SetInfoDialogText(hkey, iter->comments, notfound, hWnd, IDC_INFO_COMMENTS); /* Update the main label with the app name */ if (GetWindowTextW(GetDlgItem(hWnd, IDC_INFO_LABEL), oldtitle, -- 2.11.0

1 0

[PATCH 5/5] ole32: Add more IStorage clipboard tests.
by Piotr Caban 27 Sep '18

27 Sep '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 90 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 84 insertions(+), 6 deletions(-)

2 1

[PATCH 4/5] ole32: Improve OleClipboardData GetData implementation.
by Piotr Caban 27 Sep '18

27 Sep '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/clipboard.c | 47 +++++++++++++++++++++++++++++++++++--------- dlls/ole32/tests/clipboard.c | 14 ++++++------- 2 files changed, 45 insertions(+), 16 deletions(-)

2 1

[PATCH 3/5] ole32: Change DataObjectImpl_GetData return value to show more implementation problems.
by Piotr Caban 27 Sep '18

27 Sep '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)

2 1