March 2020 - Wine-devel - list.winehq.org

[PATCH 3/3] kernel32: Add stub for IsNativeVhdBoot
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by "Myah Caron" <qsniyg(a)mail.com> --- dlls/kernel32/environ.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 75da15634c..53d338a75a 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -143,3 +143,13 @@ BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE firmware_type) { SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * IsNativeVhdBoot (KERNEL32.@) + */ +BOOL WINAPI IsNativeVhdBoot(PBOOL native_vhd_boot) { + FIXME("(%p) returning false\n", native_vhd_boot); + + *native_vhd_boot = FALSE; + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 88fb9616b6..3006a924e0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -985,6 +985,7 @@ @ stdcall -import IsDebuggerPresent() @ stub -i386 IsLSCallback # @ stub IsNLSDefinedString +@ stdcall IsNativeVhdBoot(ptr) @ stdcall -import IsNormalizedString(long wstr long) @ stdcall -import IsProcessInJob(long long ptr) @ stdcall -import IsProcessorFeaturePresent(long) -- 2.25.1

1 0

(resend) [PATCH] wmvcore: Add semi-stub implementation for WMIsContentProtected
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=4868 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] kernel32: Add stub for GetFirmwareEnvironmentVariableEx
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- Sorry for the resend, I forgot the [PATCH] prefix in the first email --- dlls/kernel32/environ.c | 23 ++++++++++++++++++++++- dlls/kernel32/kernel32.spec | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 2d80600f78..93ca37fccf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void) ANSI_STRING ansi; RtlAcquirePebLock(); - + rupp = NtCurrentTeb()->Peb->ProcessParameters; startup_infoA.cb = sizeof(startup_infoA); @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c9b0c21085..b93d7a7697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -688,6 +688,8 @@ @ stdcall GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareEnvironmentVariableExA(wstr wstr ptr long ptr) +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW -- 2.25.1

3 2

kernel32: Add stub for GetFirmwareEnvironmentVariableEx
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- dlls/kernel32/environ.c | 23 ++++++++++++++++++++++- dlls/kernel32/kernel32.spec | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 2d80600f78..93ca37fccf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void) ANSI_STRING ansi; RtlAcquirePebLock(); - + rupp = NtCurrentTeb()->Peb->ProcessParameters; startup_infoA.cb = sizeof(startup_infoA); @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c9b0c21085..b93d7a7697 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -688,6 +688,8 @@ @ stdcall GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareEnvironmentVariableExA(wstr wstr ptr long ptr) +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW -- 2.25.1

2 1

[PATCH 2/2] oledb32/tests: Add ODBC provider tests
by Alistair Leslie-Hughes 15 Mar '20

15 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/database.c | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 83a4767b90..5d67bf9c41 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "oledb.h" #include "oledberr.h" +#include "msdasql.h" #include "wine/test.h" @@ -967,6 +968,87 @@ static void test_dslocator(void) } } +static void test_odbc_provider(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + DBPROPID properties[14] = + { + DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, + DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, + DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, + DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, + DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT + }; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + DBPROPIDSET propidlist; + ULONG propcnt; + DBPROPSET *propset; + + ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", + debugstr_guid(&propinfoset->guidPropertySet)); + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = propinfoset->cPropertyInfos; + propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].dwPropertyID); + ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "$d, got %d\n", i, + propinfoset->rgPropertyInfos[i].vtType); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propidlist.cPropertyIDs; i++) + { + ok(properties[i] == propidlist.rgPropertyIDs[i], "%d, got %d\n", i, + propidlist.rgPropertyIDs[i]); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; + } + + CoTaskMemFree(propidlist.rgPropertyIDs); + CoTaskMemFree(propset); + } + + IDBProperties_Release(props); +} + START_TEST(database) { OleInitialize(NULL); @@ -975,6 +1057,7 @@ START_TEST(database) test_errorinfo(); test_initializationstring(); test_dslocator(); + test_odbc_provider(); /* row position */ test_rowposition(); -- 2.25.1

1 0

[PATCH 1/2] include: Add msdasql.h
by Alistair Leslie-Hughes 15 Mar '20

15 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msdasql.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 include/msdasql.h diff --git a/include/msdasql.h b/include/msdasql.h new file mode 100644 index 0000000000..a7a5b9e841 --- /dev/null +++ b/include/msdasql.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _MSDASQL_H_ +#define _MSDASQL_H_ + +DEFINE_GUID(IID_SQLRequestDiagFields, 0x228972f0, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); +DEFINE_GUID(IID_ISQLGetDiagField, 0x228972f1, 0xb5ff, 0x11d0, 0x8a, 0x80, 0x00, 0xc0, 0x4f, 0xd6, 0x11, 0xcd); + +DEFINE_GUID(IID_IRowsetChangeExtInfo, 0x0c733a8f, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(CLSID_MSDASQL, 0xc8b522cb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(CLSID_MSDASQL_ENUMERATOR, 0xc8b522cd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_PROVIDERDATASOURCEINFO, 0x497c60e0, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERROWSET, 0x497c60e1, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERDBINIT, 0x497c60e2, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERSTMTATTR, 0x497c60e3, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); +DEFINE_GUID(DBPROPSET_PROVIDERCONNATTR, 0x497c60e4, 0x7123, 0x11cf, 0xb1, 0x71, 0x00, 0xaa, 0x00, 0x57, 0x59, 0x9e); + +#define KAGPROP_QUERYBASEDUPDATES 2 +#define KAGPROP_MARSHALLABLE 3 +#define KAGPROP_POSITIONONNEWROW 4 +#define KAGPROP_IRowsetChangeExtInfo 5 +#define KAGPROP_CURSOR 6 +#define KAGPROP_CONCURRENCY 7 +#define KAGPROP_BLOBSONFOCURSOR 8 +#define KAGPROP_INCLUDENONEXACT 9 +#define KAGPROP_FORCESSFIREHOSEMODE 10 +#define KAGPROP_FORCENOPARAMETERREBIND 11 +#define KAGPROP_FORCENOPREPARE 12 +#define KAGPROP_FORCENOREEXECUTE 13 + +#define KAGPROP_ACCESSIBLEPROCEDURES 2 +#define KAGPROP_ACCESSIBLETABLES 3 +#define KAGPROP_ODBCSQLOPTIEF 4 +#define KAGPROP_OJCAPABILITY 5 +#define KAGPROP_PROCEDURES 6 +#define KAGPROP_DRIVERNAME 7 +#define KAGPROP_DRIVERVER 8 +#define KAGPROP_DRIVERODBCVER 9 +#define KAGPROP_LIKEESCAPECLAUSE 10 +#define KAGPROP_SPECIALCHARACTERS 11 +#define KAGPROP_MAXCOLUMNSINGROUPBY 12 +#define KAGPROP_MAXCOLUMNSININDEX 13 +#define KAGPROP_MAXCOLUMNSINORDERBY 14 +#define KAGPROP_MAXCOLUMNSINSELECT 15 +#define KAGPROP_MAXCOLUMNSINTABLE 16 +#define KAGPROP_NUMERICFUNCTIONS 17 +#define KAGPROP_ODBCSQLCONFORMANCE 18 +#define KAGPROP_OUTERJOINS 19 +#define KAGPROP_STRINGFUNCTIONS 20 +#define KAGPROP_SYSTEMFUNCTIONS 21 +#define KAGPROP_TIMEDATEFUNCTIONS 22 +#define KAGPROP_FILEUSAGE 23 +#define KAGPROP_ACTIVESTATEMENTS 24 + +#define KAGPROP_AUTH_TRUSTEDCONNECTION 2 +#define KAGPROP_AUTH_SERVERINTEGRATED 3 + +#define KAGPROPVAL_CONCUR_ROWVER 0x00000001 +#define KAGPROPVAL_CONCUR_VALUES 0x00000002 +#define KAGPROPVAL_CONCUR_LOCK 0x00000004 +#define KAGPROPVAL_CONCUR_READ_ONLY 0x00000008 + +#endif -- 2.25.1

1 0

[PATCH] ntoskrnl.exe: Implement IoOpenDeviceRegistryKey().
by Zebediah Figura 15 Mar '20

15 Mar '20

Needed by many native PnP drivers, including the FA-124 USB driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 29 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6b5b127a62..40341d8f0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -423,7 +423,7 @@ @ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey -@ stub IoOpenDeviceRegistryKey +@ stdcall IoOpenDeviceRegistryKey(ptr long long ptr) @ stub IoPageRead @ stub IoPnPDeliverServicePowerNotification @ stdcall IoQueryDeviceDescription(ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d53..2acc7ade47 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -844,6 +844,35 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla return status; } +/*********************************************************************** + * IoOpenDeviceRegistryKey (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCESS_MASK access, HANDLE *key ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key); + + if ((status = get_device_instance_id( device, device_instance_id ))) + { + ERR("Failed to get device instance ID, error %#x.\n", status); + return status; + } + + set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL ); + + SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ); + + *key = SetupDiOpenDevRegKey( set, &sp_device, DICS_FLAG_GLOBAL, 0, type, access ); + if (*key == INVALID_HANDLE_VALUE) + return GetLastError(); + SetupDiDestroyDeviceInfoList( set ); + return STATUS_SUCCESS; +} + /*********************************************************************** * PoSetPowerState (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 53ea9e17cf..b4325cec6c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1607,6 +1607,7 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); -- 2.25.1

2 1

[PATCH 1/5] kernel32/tests: Add some tests for mounted folders.
by Zebediah Figura 15 Mar '20

15 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- The goal of these tests is not immediately to guide an implementation of mounted folders (though they could certainly help), but rather to show how other volume-related functions behave around mounted folders. The end goal is to sanely treat Unix mount points other than / as mounted folders on the Z: drive. This allows us to do away with Unix file I/O in GetVolumePathName(), while still returning the correct mount point for any given file. In particular, [1] documents the original purpose of the implementation—that the path returned by GetVolumePathName() be the on the same host partition that the input file is on. Mounted folders respect this invariant, including where symlinks are concerned. To that end, I've also added some documentation regarding symlinks across volumes, which cannot be systematically tested. [1] <https://www.winehq.org/pipermail/wine-patches/2011-October/107470.html> dlls/kernel32/tests/volume.c | 219 +++++++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index b9121a4af4c..f8fb09d74e4 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "winioctl.h" #include "ntddstor.h" +#include "winternl.h" #include <stdio.h> #include "ddk/ntddcdvd.h" #include "ddk/mountmgr.h" @@ -59,6 +60,7 @@ static BOOL (WINAPI *pGetVolumePathNameA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNameW)(LPWSTR, LPWSTR, DWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameA)(LPCSTR, LPSTR, DWORD, LPDWORD); static BOOL (WINAPI *pGetVolumePathNamesForVolumeNameW)(LPCWSTR, LPWSTR, DWORD, LPDWORD); +static BOOL (WINAPI *pCreateSymbolicLinkA)(const char *, const char *, DWORD); /* ############################### */ @@ -1302,6 +1304,221 @@ static void test_cdrom_ioctl(void) } +static void test_mounted_folder(void) +{ + char name_buffer[200], path[MAX_PATH], volume_name[100], *p; + FILE_NAME_INFORMATION *name = (FILE_NAME_INFORMATION *)name_buffer; + FILE_ATTRIBUTE_TAG_INFO info; + IO_STATUS_BLOCK io; + BOOL ret, got_path; + NTSTATUS status; + HANDLE file; + DWORD size; + + ret = CreateDirectoryA("C:\\winetest_mnt", NULL); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough permissions to create a mounted folder.\n"); + return; + } + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumeNameForVolumeMountPointA( "C:\\", volume_name, sizeof(volume_name) ); + ok(ret, "got error %u\n", GetLastError()); + + ret = SetVolumeMountPointA( "C:\\winetest_mnt\\", volume_name ); + todo_wine ok(ret, "got error %u\n", GetLastError()); + if (!ret) + { + RemoveDirectoryA( "C:\\winetest_mnt" ); + return; + } + + file = CreateFileA( "C:\\winetest_mnt", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok((info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(info.ReparseTag == IO_REPARSE_TAG_MOUNT_POINT, "got reparse tag %#x\n", info.ReparseTag); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\winetest_mnt") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\winetest_mnt", wcslen(L"\\winetest_mnt")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + file = CreateFileA( "C:\\winetest_mnt", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileAttributeTagInformation ); + ok(!status, "got status %#x\n", status); + ok(!(info.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + && (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY), "got attributes %#x\n", info.FileAttributes); + ok(!info.ReparseTag, "got reparse tag %#x\n", info.ReparseTag); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\", wcslen(L"\\")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + file = CreateFileA( "C:\\winetest_mnt\\windows", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\windows") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\windows", wcslen(L"\\windows")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + ret = GetVolumePathNameA( "C:\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_mnt", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %u\n", GetLastError()); + + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\windows", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\windows\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_A_REPARSE_POINT, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\windows\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_DIR_NOT_ROOT, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\nonexistent\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\nonexistent\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\nonexistent\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_mnt\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_mnt\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_mnt\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:/winetest_mnt/../winetest_mnt/.", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:/winetest_mnt/../winetest_mnt/.\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:/winetest_mnt/../winetest_mnt/.\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNamesForVolumeNameA( volume_name, path, sizeof(path), &size ); + ok(ret, "got error %u\n", GetLastError()); + got_path = FALSE; + for (p = path; *p; p += strlen(p) + 1) + { + if (!strcmp( p, "C:\\winetest_mnt\\" )) + got_path = TRUE; + ok(strcmp( p, "C:\\winetest_mnt\\winetest_mnt\\" ), "GetVolumePathNamesForVolumeName() should not recurse\n"); + } + ok(got_path, "mount point was not enumerated\n"); + + /* test interaction with symbolic links */ + + if (pCreateSymbolicLinkA) + { + ret = pCreateSymbolicLinkA( "C:\\winetest_link", "C:\\winetest_mnt\\", SYMBOLIC_LINK_FLAG_DIRECTORY ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", path); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_link\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\windows\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", path); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\windows\\", path, sizeof(path) ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_NOT_A_REPARSE_POINT, "wrong error %u\n", GetLastError()); + ret = GetVolumeInformationA( "C:\\winetest_link\\windows\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_DIR_NOT_ROOT, "wrong error %u\n", GetLastError()); + + ret = GetVolumePathNameA( "C:\\winetest_link\\winetest_mnt", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\winetest_link\\winetest_mnt\\"), "got %s\n", debugstr_a(path)); + ret = GetVolumeNameForVolumeMountPointA( "C:\\winetest_link\\winetest_mnt\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, volume_name), "expected %s, got %s\n", debugstr_a(volume_name), debugstr_a(path)); + ret = GetVolumeInformationA( "C:\\winetest_link\\winetest_mnt\\", NULL, 0, NULL, NULL, NULL, NULL, 0 ); + ok(ret, "got error %u\n", GetLastError()); + + /* The following test makes it clear that when we encounter a symlink + * while resolving, we resolve *every* junction in the path, i.e. both + * mount points and symlinks. */ + ret = GetVolumePathNameA( "C:\\winetest_link\\winetest_mnt\\winetest_link\\windows\\", path, sizeof(path) ); + ok(ret, "got error %u\n", GetLastError()); + ok(!strcmp(path, "C:\\"), "got %s\n", debugstr_a(path)); + + file = CreateFileA( "C:\\winetest_link\\winetest_mnt\\winetest_link\\windows\\", 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + status = NtQueryInformationFile( file, &io, name, sizeof(name_buffer), FileNameInformation ); + ok(!status, "got status %#x\n", status); + ok(name->FileNameLength == wcslen(L"\\windows") * sizeof(WCHAR), "got length %u\n", name->FileNameLength); + ok(!wcsnicmp(name->FileName, L"\\windows", wcslen(L"\\windows")), "got name %s\n", + debugstr_wn(name->FileName, name->FileNameLength / sizeof(WCHAR))); + + CloseHandle( file ); + + ret = RemoveDirectoryA( "C:\\winetest_link\\" ); + ok(ret, "got error %u\n", GetLastError()); + + /* The following cannot be automatically tested: + * + * Suppose C: and D: are mount points of different volumes. If C:/a is + * symlinked to D:/b, GetVolumePathName("C:\\a") will return "D:\\" if + * "a" is a directory, but "C:\\" if "a" is a file. + * Moreover, if D: is mounted at C:/mnt, and C:/a is symlinked to + * C:/mnt, GetVolumePathName("C:\\mnt\\b") will still return "D:\\". */ + } + + ret = DeleteVolumeMountPointA( "C:\\winetest_mnt\\" ); + ok(ret, "got error %u\n", GetLastError()); + ret = RemoveDirectoryA( "C:\\winetest_mnt" ); + ok(ret, "got error %u\n", GetLastError()); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -1317,6 +1534,7 @@ START_TEST(volume) pGetVolumePathNameW = (void *) GetProcAddress(hdll, "GetVolumePathNameW"); pGetVolumePathNamesForVolumeNameA = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameA"); pGetVolumePathNamesForVolumeNameW = (void *) GetProcAddress(hdll, "GetVolumePathNamesForVolumeNameW"); + pCreateSymbolicLinkA = (void *) GetProcAddress(hdll, "CreateSymbolicLinkA"); test_query_dos_deviceA(); test_dos_devices(); @@ -1334,4 +1552,5 @@ START_TEST(volume) test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); test_cdrom_ioctl(); + test_mounted_folder(); } -- 2.25.1

3 7

[PATCH] psapi/tests: NtQueryVirtualMemory() 3rd parameter is MEMORY_INFORMATION_CLASS, not ULONG.
by Serge Gautherie 15 Mar '20

15 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 0df247e..0ea1b1f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -39,7 +39,7 @@ #include "wine/test.h" static NTSTATUS (WINAPI *pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); -static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, ULONG, PVOID, SIZE_T, SIZE_T *); +static NTSTATUS (WINAPI *pNtQueryVirtualMemory)(HANDLE, LPCVOID, MEMORY_INFORMATION_CLASS, PVOID, SIZE_T, SIZE_T *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); -- 2.10.0.windows.1

1 0

[PATCH v2] wineconsole: Don't allow resizing while computing positions.
by Roman Pišl 14 Mar '20

14 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48747 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/wineconsole/user.c | 5 +++++ programs/wineconsole/winecon_user.h | 1 + 2 files changed, 6 insertions(+) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..05bb924518 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -216,6 +216,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) RECT r; int dx, dy; + PRIVATE(data)->computing_pos = TRUE; + /* compute window size from desired client size */ r.left = r.top = 0; r.right = data->curcfg.win_width * data->curcfg.cell_width; @@ -256,6 +258,8 @@ static void WCUSER_ComputePositions(struct inner_data* data) SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE); WCUSER_ShapeCursor(data, data->curcfg.cursor_size, data->curcfg.cursor_visible, TRUE); WCUSER_PosCursor(data); + + PRIVATE(data)->computing_pos = FALSE; } /****************************************************************** @@ -1328,6 +1332,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM WCUSER_SetMenuDetails(data, GetSystemMenu(data->hWnd, FALSE)); break; case WM_SIZE: + if (PRIVATE(data)->computing_pos) break; WINECON_ResizeWithContainer(data, LOWORD(lParam) / data->curcfg.cell_width, HIWORD(lParam) / data->curcfg.cell_height); break; diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index bd026ef771..cc63a4fd96 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -38,6 +38,7 @@ struct inner_data_user { BOOL has_selection; /* an area is being selected (selectPt[12] are edges of the rect) */ COORD selectPt1; /* start (and end) point of a mouse selection */ COORD selectPt2; + BOOL computing_pos; /* barrier to avoid resizing while computing positions */ }; #define PRIVATE(data) ((struct inner_data_user*)((data)->private)) -- 2.20.1

2 1