May 2020 - Wine-Devel - list.winehq.org

[PATCH] include: Add cfg.h.
by Gijs Vermeulen May 25, 2020

May 25, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/Makefile.in | 1 + include/cfg.h | 197 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+) create mode 100644 include/cfg.h diff --git a/include/Makefile.in b/include/Makefile.in index 2f2d94d574..9796dd8e5d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -55,6 +55,7 @@ SOURCES = \ bthsdpdef.h \ cderr.h \ cdosys.idl \ + cfg.h \ cfgmgr32.h \ cguid.h \ chprst.idl \ diff --git a/include/cfg.h b/include/cfg.h new file mode 100644 index 0000000000..30d30b4bee --- /dev/null +++ b/include/cfg.h @@ -0,0 +1,197 @@ +/* + * Copyright 2020 Gijs Vermeulen + * + * 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 _CFG_INCLUDED_ +#define _CFG_INCLUDED_ + +typedef enum _PNP_VETO_TYPE { + PNP_VetoTypeUnknown, + PNP_VetoLegacyDevice, + PNP_VetoPendingClose, + PNP_VetoWindowsApp, + PNP_VetoWindowsService, + PNP_VetoOutstandingOpen, + PNP_VetoDevice, + PNP_VetoDriver, + PNP_VetoIllegalDeviceRequest, + PNP_VetoInsufficientPower, + PNP_VetoNonDisableable, + PNP_VetoLegacyDriver, + PNP_VetoInsufficientRights, + PNP_VetoAlreadyRemoved +} PNP_VETO_TYPE, *PPNP_VETO_TYPE; + +#define CM_PROB_NOT_CONFIGURED (0x00000001) +#define CM_PROB_DEVLOADER_FAILED (0x00000002) +#define CM_PROB_OUT_OF_MEMORY (0x00000003) +#define CM_PROB_ENTRY_IS_WRONG_TYPE (0x00000004) +#define CM_PROB_LACKED_ARBITRATOR (0x00000005) +#define CM_PROB_BOOT_CONFIG_CONFLICT (0x00000006) +#define CM_PROB_FAILED_FILTER (0x00000007) +#define CM_PROB_DEVLOADER_NOT_FOUND (0x00000008) +#define CM_PROB_INVALID_DATA (0x00000009) +#define CM_PROB_FAILED_START (0x0000000A) +#define CM_PROB_LIAR (0x0000000B) +#define CM_PROB_NORMAL_CONFLICT (0x0000000C) +#define CM_PROB_NOT_VERIFIED (0x0000000D) +#define CM_PROB_NEED_RESTART (0x0000000E) +#define CM_PROB_REENUMERATION (0x0000000F) +#define CM_PROB_PARTIAL_LOG_CONF (0x00000010) +#define CM_PROB_UNKNOWN_RESOURCE (0x00000011) +#define CM_PROB_REINSTALL (0x00000012) +#define CM_PROB_REGISTRY (0x00000013) +#define CM_PROB_VXDLDR (0x00000014) +#define CM_PROB_WILL_BE_REMOVED (0x00000015) +#define CM_PROB_DISABLED (0x00000016) +#define CM_PROB_DEVLOADER_NOT_READY (0x00000017) +#define CM_PROB_DEVICE_NOT_THERE (0x00000018) +#define CM_PROB_MOVED (0x00000019) +#define CM_PROB_TOO_EARLY (0x0000001A) +#define CM_PROB_NO_VALID_LOG_CONF (0x0000001B) +#define CM_PROB_FAILED_INSTALL (0x0000001C) +#define CM_PROB_HARDWARE_DISABLED (0x0000001D) +#define CM_PROB_CANT_SHARE_IRQ (0x0000001E) +#define CM_PROB_FAILED_ADD (0x0000001F) +#define CM_PROB_DISABLED_SERVICE (0x00000020) +#define CM_PROB_TRANSLATION_FAILED (0x00000021) +#define CM_PROB_NO_SOFTCONFIG (0x00000022) +#define CM_PROB_BIOS_TABLE (0x00000023) +#define CM_PROB_IRQ_TRANSLATION_FAILED (0x00000024) +#define CM_PROB_FAILED_DRIVER_ENTRY (0x00000025) +#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD (0x00000026) +#define CM_PROB_DRIVER_FAILED_LOAD (0x00000027) +#define CM_PROB_DRIVER_SERVICE_KEY_INVALID (0x00000028) +#define CM_PROB_LEGACY_SERVICE_NO_DEVICES (0x00000029) +#define CM_PROB_DUPLICATE_DEVICE (0x0000002A) +#define CM_PROB_FAILED_POST_START (0x0000002B) +#define CM_PROB_HALTED (0x0000002C) +#define CM_PROB_PHANTOM (0x0000002D) +#define CM_PROB_SYSTEM_SHUTDOWN (0x0000002E) +#define CM_PROB_HELD_FOR_EJECT (0x0000002F) +#define CM_PROB_DRIVER_BLOCKED (0x00000030) +#define CM_PROB_REGISTRY_TOO_LARGE (0x00000031) +#define CM_PROB_SETPROPERTIES_FAILED (0x00000032) +#define CM_PROB_WAITING_ON_DEPENDENCY (0x00000033) +#define CM_PROB_UNSIGNED_DRIVER (0x00000034) +#define CM_PROB_USED_BY_DEBUGGER (0x00000035) +#define CM_PROB_DEVICE_RESET (0x00000036) +#define CM_PROB_CONSOLE_LOCKED (0x00000037) +#define CM_PROB_NEED_CLASS_CONFIG (0x00000038) +#define CM_PROB_GUEST_ASSIGNMENT_FAILED (0x00000039) + +#define NUM_CM_PROB_V1 (0x00000025) +#define NUM_CM_PROB_V2 (0x00000032) +#define NUM_CM_PROB_V3 (0x00000033) +#define NUM_CM_PROB_V4 (0x00000034) +#define NUM_CM_PROB_V5 (0x00000035) +#define NUM_CM_PROB_V6 (0x00000036) +#define NUM_CM_PROB_V7 (0x00000037) +#define NUM_CM_PROB_V8 (0x00000039) +#define NUM_CM_PROB_V9 (0x0000003A) + +#define NUM_CM_PROB NUM_CM_PROB_V9 + +#define DN_ROOT_ENUMERATED (0x00000001) +#define DN_DRIVER_LOADED (0x00000002) +#define DN_ENUM_LOADED (0x00000004) +#define DN_STARTED (0x00000008) +#define DN_MANUAL (0x00000010) +#define DN_NEED_TO_ENUM (0x00000020) +#define DN_NOT_FIRST_TIME (0x00000040) +#define DN_HARDWARE_ENUM (0x00000080) +#define DN_LIAR (0x00000100) +#define DN_HAS_MARK (0x00000200) +#define DN_HAS_PROBLEM (0x00000400) +#define DN_FILTERED (0x00000800) +#define DN_MOVED (0x00001000) +#define DN_DISABLEABLE (0x00002000) +#define DN_REMOVABLE (0x00004000) +#define DN_PRIVATE_PROBLEM (0x00008000) +#define DN_MF_PARENT (0x00010000) +#define DN_MF_CHILD (0x00020000) +#define DN_WILL_BE_REMOVED (0x00040000) + +#define DN_NOT_FIRST_TIMEE 0x00080000 +#define DN_STOP_FREE_RES 0x00100000 +#define DN_REBAL_CANDIDATE 0x00200000 +#define DN_BAD_PARTIAL 0x00400000 +#define DN_NT_ENUMERATOR 0x00800000 +#define DN_NT_DRIVER 0x01000000 + +#define DN_NEEDS_LOCKING 0x02000000 +#define DN_ARM_WAKEUP 0x04000000 +#define DN_APM_ENUMERATOR 0x08000000 +#define DN_APM_DRIVER 0x10000000 +#define DN_SILENT_INSTALL 0x20000000 +#define DN_NO_SHOW_IN_DM 0x40000000 +#define DN_BOOT_LOG_PROB 0x80000000 + +#define DN_NEED_RESTART DN_LIAR +#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME +#define DN_LEGACY_DRIVER DN_MOVED +#define DN_CHILD_WITH_INVALID_ID DN_HAS_MARK +#define DN_DEVICE_DISCONNECTED DN_NEEDS_LOCKING +#define DN_QUERY_REMOVE_PENDING DN_MF_PARENT +#define DN_QUERY_REMOVE_ACTIVE DN_MF_CHILD + +#define DN_CHANGEABLE_FLAGS (DN_NOT_FIRST_TIME+DN_HARDWARE_ENUM+DN_HAS_MARK+DN_DISABLEABLE+DN_REMOVABLE+DN_MF_CHILD+DN_MF_PARENT+DN_NOT_FIRST_TIMEE+DN_STOP_FREE_RES+DN_REBAL_CANDIDATE+DN_NT_ENUMERATOR+DN_NT_DRIVER+DN_SILENT_INSTALL+DN_NO_SHOW_IN_DM) + +#define LCPRI_FORCECONFIG (0x00000000) +#define LCPRI_BOOTCONFIG (0x00000001) +#define LCPRI_DESIRED (0x00002000) +#define LCPRI_NORMAL (0x00003000) +#define LCPRI_LASTBESTCONFIG (0x00003FFF) +#define LCPRI_SUBOPTIMAL (0x00005000) +#define LCPRI_LASTSOFTCONFIG (0x00007FFF) +#define LCPRI_RESTART (0x00008000) +#define LCPRI_REBOOT (0x00009000) +#define LCPRI_POWEROFF (0x0000A000) +#define LCPRI_HARDRECONFIG (0x0000C000) +#define LCPRI_HARDWIRED (0x0000E000) +#define LCPRI_IMPOSSIBLE (0x0000F000) +#define LCPRI_DISABLED (0x0000FFFF) +#define MAX_LCPRI (0x0000FFFF) + +#define CM_DEVICE_PANEL_SIDE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SIDE_TOP (0x00000001) +#define CM_DEVICE_PANEL_SIDE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_SIDE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_SIDE_RIGHT (0x00000004) +#define CM_DEVICE_PANEL_SIDE_FRONT (0x00000005) +#define CM_DEVICE_PANEL_SIDE_BACK (0x00000006) + +#define CM_DEVICE_PANEL_EDGE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_EDGE_TOP (0x00000001) +#define CM_DEVICE_PANEL_EDGE_BOTTOM (0x00000002) +#define CM_DEVICE_PANEL_EDGE_LEFT (0x00000003) +#define CM_DEVICE_PANEL_EDGE_RIGHT (0x00000004) + +#define CM_DEVICE_PANEL_SHAPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_SHAPE_RECTANGLE (0x00000001) +#define CM_DEVICE_PANEL_SHAPE_OVAL (0x00000002) + +#define CM_DEVICE_PANEL_ORIENTATION_HORIZONTAL (0x00000000) +#define CM_DEVICE_PANEL_ORIENTATION_VERTICAL (0x00000001) + +#define CM_DEVICE_PANEL_JOINT_TYPE_UNKNOWN (0x00000000) +#define CM_DEVICE_PANEL_JOINT_TYPE_PLANAR (0x00000001) +#define CM_DEVICE_PANEL_JOINT_TYPE_HINGE (0x00000002) +#define CM_DEVICE_PANEL_JOINT_TYPE_PIVOT (0x00000003) +#define CM_DEVICE_PANEL_JOINT_TYPE_SWIVEL (0x00000004) + +#endif /* _CFG_INCLUDED_ */ -- 2.26.2

1 0

[PATCH v2] msado15: Implement _Command get/put CommandType
by Aaro Altonen May 25, 2020

May 25, 2020

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - fix variable type - set default value before _Command_get_CommandType() in tests (thanks Hans) --- dlls/msado15/command.c | 34 ++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index a96fd73990..9081f1554f 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,8 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -193,14 +194,34 @@ static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **para static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) { - FIXME( "%p, %d\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %d\n", iface, type ); + + switch (type) + { + case adCmdUnspecified: + case adCmdUnknown: + case adCmdText: + case adCmdTable: + case adCmdStoredProc: + case adCmdFile: + case adCmdTableDirect: + command->type = type; + return S_OK; + } + + return MAKE_ADO_HRESULT( adErrInvalidArgument ); } static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, type ); + + *type = command->type; + return S_OK; } static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) @@ -305,6 +326,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->type = adCmdUnknown; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index fb77936bba..b17430a93d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -742,6 +742,7 @@ static void test_Command(void) _ADO *ado; Command15 *command15; Command25 *command25; + CommandTypeEnum cmd_type = adCmdUnspecified; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -758,6 +759,18 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); Command25_Release( command25 ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); + + _Command_put_CommandType( command, adCmdText ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); + + hr = _Command_put_CommandType( command, 0xdeadbeef ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + _Command_Release( command ); } -- 2.26.2

2 1

[PATCH] msado15: Implement _Command get/put CommandType
by Aaro Altonen May 25, 2020

May 25, 2020

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/command.c | 30 ++++++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index a96fd73990..02e41e702d 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -33,6 +33,7 @@ struct command { _Command Command_iface; LONG ref; + int type; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -193,14 +194,34 @@ static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **para static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) { - FIXME( "%p, %d\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %d\n", iface, type ); + + switch (type) + { + case adCmdUnspecified: + case adCmdUnknown: + case adCmdText: + case adCmdTable: + case adCmdStoredProc: + case adCmdFile: + case adCmdTableDirect: + command->type = type; + return S_OK; + } + + return MAKE_ADO_HRESULT( adErrInvalidArgument ); } static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, type ); + + *type = command->type; + return S_OK; } static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) @@ -305,6 +326,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->type = adCmdUnknown; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index fb77936bba..3f45bf2bc7 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -742,6 +742,7 @@ static void test_Command(void) _ADO *ado; Command15 *command15; Command25 *command25; + CommandTypeEnum cmd_type; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -758,6 +759,18 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); Command25_Release( command25 ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); + + _Command_put_CommandType( command, adCmdText ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); + + hr = _Command_put_CommandType( command, 0xdeadbeef ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + _Command_Release( command ); } -- 2.26.2

2 2

[PATCH 3/3] wbemprox: Get the disk drive serial number from mountmgr.
by Hans Leidekker May 25, 2020

May 25, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49160 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 40 +++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ddd12d6ebcb..6a35737da59 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -44,6 +44,8 @@ #include "ntsecapi.h" #include "winspool.h" #include "setupapi.h" +#define WINE_MOUNTMGR_EXTENSIONS +#include <ddk/mountmgr.h> #include "wine/asm.h" #include "wine/debug.h" @@ -140,7 +142,7 @@ static const struct column col_diskdrive[] = { L"MediaType", CIM_STRING }, { L"Model", CIM_STRING }, { L"PNPDeviceID", CIM_STRING }, - { L"SerialNumber", CIM_STRING }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Size", CIM_UINT64 }, }; static const struct column col_diskdrivetodiskpartition[] = @@ -2081,6 +2083,40 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) } return free.QuadPart; } +static WCHAR *get_diskdrive_serialnumber( WCHAR drive_letter ) +{ + WCHAR *ret = NULL; + struct mountmgr_unix_drive input; + struct mountmgr_unix_drive *data; + HANDLE handle; + DWORD size = 256; + + memset( &input, 0, sizeof(input) ); + input.letter = drive_letter; + + if ((handle = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) goto done; + for (;;) + { + if (!(data = heap_alloc( size ))) break; + + if (DeviceIoControl( handle, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, &input, sizeof(input), data, size, NULL, NULL )) + { + if (data->disk_serial_offset) ret = heap_strdupAW( (const char *)data + data->disk_serial_offset ); + heap_free( data ); + break; + } + + heap_free( data ); + if (GetLastError() == ERROR_MORE_DATA) size = data->size; + else break; + } + CloseHandle( handle ); + +done: + if (!ret) return heap_strdupW( L"WINEHDISK" ); + return ret; +} static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { @@ -2114,7 +2150,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * rec->mediatype = (type == DRIVE_FIXED) ? L"Fixed hard disk" : L"Removable media"; rec->model = L"Wine Disk Drive"; rec->pnpdevice_id = L"IDE\\Disk\\VEN_WINE"; - rec->serialnumber = L"WINEHDISK"; + rec->serialnumber = get_diskdrive_serialnumber( root[0] ); get_freespace( root, &size ); rec->size = size; if (!match_row( table, row, cond, &status )) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a9b4910ebfa..578e9308df7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1456,6 +1456,31 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DiskDrive( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DiskDrive" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ); @@ -1561,6 +1586,7 @@ START_TEST(query) test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); test_Win32_DesktopMonitor( services ); + test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services ); -- 2.20.1

5 9

[PATCH v2 1/2] mountmgr: Return the disk serial from IOCTL_STORAGE_QUERY_PROPERTY(StorageDeviceProperty).
by Hans Leidekker May 25, 2020

May 25, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/dbus.c | 13 ++++--- dlls/mountmgr.sys/device.c | 69 +++++++++++++++++++++++++++++------- dlls/mountmgr.sys/mountmgr.h | 2 +- 3 files changed, 65 insertions(+), 19 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 27b35acd9c..98b2a47ba6 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -317,7 +317,7 @@ static void udisks_new_device( const char *udi ) if (device) { if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); - else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); } p_dbus_message_unref( reply ); @@ -385,7 +385,7 @@ static const char *udisks2_string_from_array( DBusMessageIter *iter ) /* find the drive entry in the dictionary and get its parameters */ static void udisks2_get_drive_info( const char *drive_name, DBusMessageIter *dict, - enum device_type *drive_type, int *removable ) + enum device_type *drive_type, int *removable, const char **serial ) { DBusMessageIter iter, drive, variant; const char *name; @@ -403,6 +403,8 @@ static void udisks2_get_drive_info( const char *drive_name, DBusMessageIter *dic p_dbus_message_iter_get_basic( &variant, removable ); else if (!strcmp( name, "MediaCompatibility" )) *drive_type = udisks_parse_media_compatibility( &variant ); + else if (!strcmp( name, "Id" )) + p_dbus_message_iter_get_basic( &variant, serial ); } } } @@ -415,6 +417,7 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess const char *mount_point = NULL; const char *type = NULL; const char *drive = NULL; + const char *id = NULL; GUID guid, *guid_ptr = NULL; const char *iface, *name; int removable = FALSE; @@ -448,7 +451,7 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess else if (!strcmp( name, "Drive" )) { p_dbus_message_iter_get_basic( &variant, &drive ); - udisks2_get_drive_info( drive, dict, &drive_type, &removable ); + udisks2_get_drive_info( drive, dict, &drive_type, &removable, &id ); } else if (!strcmp( name, "IdUUID" )) { @@ -483,7 +486,7 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess if (device) { if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); - else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, id ); } } @@ -799,7 +802,7 @@ static void hal_new_device( LibHalContext *ctx, const char *udi ) /* add property watch for mount point */ p_libhal_device_add_property_watch( ctx, udi, &error ); } - else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, NULL ); done: if (type) p_libhal_free_string( type ); diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index a6794fa6ac..c29ce9f924 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -89,6 +89,7 @@ struct disk_device STORAGE_DEVICE_NUMBER devnum; /* device number info */ char *unix_device; /* unix device path */ char *unix_mount; /* unix mount point path */ + char *serial; /* disk serial number */ }; struct volume @@ -873,6 +874,7 @@ static void delete_disk_device( struct disk_device *device ) } RtlFreeHeap( GetProcessHeap(), 0, device->unix_device ); RtlFreeHeap( GetProcessHeap(), 0, device->unix_mount ); + RtlFreeHeap( GetProcessHeap(), 0, device->serial ); RtlFreeUnicodeString( &device->name ); IoDeleteDevice( device->dev_obj ); } @@ -1078,9 +1080,40 @@ static BOOL get_volume_device_info( struct volume *volume ) return TRUE; } +/* set disk serial for dos devices that reside on a given Unix device */ +static void set_dos_devices_disk_serial( struct disk_device *device ) +{ + struct dos_drive *drive; + struct stat dev_st, drive_st; + char *path, *p; + + if (!device->serial || !device->unix_mount || stat( device->unix_mount, &dev_st ) == -1) return; + + if (!(path = get_dosdevices_path( &p ))) return; + p[2] = 0; + + LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) + { + /* drives mapped to Unix devices already have serial set, if available */ + if (drive->volume->device->unix_device) continue; + + p[0] = 'a' + drive->drive; + + /* copy serial if drive resides on this Unix device */ + if (stat( path, &drive_st ) != -1 && drive_st.st_rdev == dev_st.st_rdev) + { + HeapFree( GetProcessHeap(), 0, drive->volume->device->serial ); + drive->volume->device->serial = strdupA( device->serial ); + } + } + + HeapFree( GetProcessHeap(), 0, path ); +} + /* change the information for an existing volume */ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, const char *device, - const char *mount_point, enum device_type type, const GUID *guid ) + const char *mount_point, enum device_type type, const GUID *guid, + const char *disk_serial ) { void *id = NULL; unsigned int id_len = 0; @@ -1107,9 +1140,12 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, { RtlFreeHeap( GetProcessHeap(), 0, disk_device->unix_device ); RtlFreeHeap( GetProcessHeap(), 0, disk_device->unix_mount ); + RtlFreeHeap( GetProcessHeap(), 0, disk_device->serial ); } disk_device->unix_device = strdupA( device ); disk_device->unix_mount = strdupA( mount_point ); + disk_device->serial = strdupA( disk_serial ); + set_dos_devices_disk_serial( disk_device ); if (!get_volume_device_info( volume )) { @@ -1306,7 +1342,7 @@ static void create_drive_devices(void) { /* don't reset uuid if we used an existing volume */ const GUID *guid = volume ? NULL : get_default_uuid(i); - set_volume_info( drive->volume, drive, device, link, drive_type, guid ); + set_volume_info( drive->volume, drive, device, link, drive_type, guid, NULL ); } else { @@ -1459,7 +1495,7 @@ void set_scsi_device_name( SCSI_ADDRESS *scsi_addr, const UNICODE_STRING *dev ) /* create a new disk volume */ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, - enum device_type type, const GUID *guid ) + enum device_type type, const GUID *guid, const char *disk_serial ) { struct volume *volume; NTSTATUS status = STATUS_SUCCESS; @@ -1480,13 +1516,13 @@ NTSTATUS add_volume( const char *udi, const char *device, const char *mount_poin else status = create_volume( udi, type, &volume ); found: - if (!status) status = set_volume_info( volume, NULL, device, mount_point, type, guid ); + if (!status) status = set_volume_info( volume, NULL, device, mount_point, type, guid, disk_serial ); if (volume) release_volume( volume ); LeaveCriticalSection( &device_section ); return status; } -/* create a new disk volume */ +/* remove a disk volume */ NTSTATUS remove_volume( const char *udi ) { NTSTATUS status = STATUS_NO_SUCH_DEVICE; @@ -1560,7 +1596,7 @@ found: p[0] = 'a' + drive->drive; p[2] = 0; update_symlink( path, mount_point, volume->device->unix_mount ); - set_volume_info( volume, drive, device, mount_point, type, guid ); + set_volume_info( volume, drive, device, mount_point, type, guid, NULL ); TRACE( "added device %c: udi %s for %s on %s type %u\n", 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device), @@ -1713,7 +1749,7 @@ NTSTATUS query_unix_device( ULONGLONG unix_dev, enum device_type *type, return status; } -static void query_property(IRP *irp) +static void query_property( struct disk_device *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); STORAGE_PROPERTY_QUERY *query = irp->AssociatedIrp.SystemBuffer; @@ -1737,6 +1773,9 @@ static void query_property(IRP *irp) case StorageDeviceProperty: { STORAGE_DEVICE_DESCRIPTOR *descriptor; + DWORD len = sizeof(*descriptor); + + if (device->serial) len += strlen( device->serial ) + 1; if (!irp->UserBuffer || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) @@ -1745,7 +1784,7 @@ static void query_property(IRP *irp) { descriptor = irp->UserBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); - descriptor->Size = sizeof(STORAGE_DEVICE_DESCRIPTOR); + descriptor->Size = len; irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); irp->IoStatus.u.Status = STATUS_SUCCESS; } @@ -1756,7 +1795,7 @@ static void query_property(IRP *irp) memset( irp->UserBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); descriptor = irp->UserBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); - descriptor->Size = sizeof(STORAGE_DEVICE_DESCRIPTOR); + descriptor->Size = len; descriptor->DeviceType = FILE_DEVICE_DISK; descriptor->DeviceTypeModifier = 0; descriptor->RemovableMedia = FALSE; @@ -1764,11 +1803,15 @@ static void query_property(IRP *irp) descriptor->VendorIdOffset = 0; descriptor->ProductIdOffset = 0; descriptor->ProductRevisionOffset = 0; - descriptor->SerialNumberOffset = 0; descriptor->BusType = BusTypeScsi; descriptor->RawPropertiesLength = 0; - - irp->IoStatus.Information = sizeof(STORAGE_DEVICE_DESCRIPTOR); + if (!device->serial) descriptor->SerialNumberOffset = 0; + else + { + descriptor->SerialNumberOffset = sizeof(*descriptor); + strcpy( (char *)descriptor + descriptor->SerialNumberOffset, device->serial ); + } + irp->IoStatus.Information = len; irp->IoStatus.u.Status = STATUS_SUCCESS; } @@ -1854,7 +1897,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; } case IOCTL_STORAGE_QUERY_PROPERTY: - query_property( irp ); + query_property( dev, irp ); break; default: { diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index 82d783a7a0..5fb43119c6 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -51,7 +51,7 @@ enum device_type }; extern NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, - enum device_type type, const GUID *guid ) DECLSPEC_HIDDEN; + enum device_type type, const GUID *guid, const char *disk_serial ) DECLSPEC_HIDDEN; extern NTSTATUS remove_volume( const char *udi ) DECLSPEC_HIDDEN; extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid, -- 2.20.1

1 0

[PATCH 1/6] netio.sys: Add driver stub.
by Paul Gofman May 25, 2020

May 25, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- configure.ac | 1 + dlls/netio.sys/Makefile.in | 6 +++++ dlls/netio.sys/netio.c | 44 +++++++++++++++++++++++++++++++++++ dlls/netio.sys/netio.sys.spec | 1 + loader/wine.inf.in | 2 ++ 5 files changed, 54 insertions(+) create mode 100644 dlls/netio.sys/Makefile.in create mode 100644 dlls/netio.sys/netio.c create mode 100644 dlls/netio.sys/netio.sys.spec diff --git a/configure.ac b/configure.ac index d81f5cc88c..3b00c28d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -3556,6 +3556,7 @@ WINE_CONFIG_MAKEFILE(dlls/netapi32) WINE_CONFIG_MAKEFILE(dlls/netapi32/tests) WINE_CONFIG_MAKEFILE(dlls/netcfgx) WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests) +WINE_CONFIG_MAKEFILE(dlls/netio.sys) WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/newdev) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in new file mode 100644 index 0000000000..45bccc7971 --- /dev/null +++ b/dlls/netio.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = netio.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native + +C_SRCS = \ + netio.c diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c new file mode 100644 index 0000000000..862b08f0ac --- /dev/null +++ b/dlls/netio.sys/netio.c @@ -0,0 +1,44 @@ +/* + * WSK (Winsock Kernel) driver library. + * + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * + * 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 + */ + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netio); + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + TRACE("driver %p.\n", driver); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + driver->DriverUnload = driver_unload; + + return STATUS_SUCCESS; +} + diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec new file mode 100644 index 0000000000..792d600548 --- /dev/null +++ b/dlls/netio.sys/netio.sys.spec @@ -0,0 +1 @@ +# diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0a43cc779c..de0dd4e455 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2617,6 +2617,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,netio.sys,- 12,,scsiport.sys,- 12,,tdi.sys,- 12,,usbd.sys,- @@ -2673,6 +2674,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys +12,,netio.sys 12,,scsiport.sys 12,,tdi.sys 12,,usbd.sys -- 2.26.2

2 10

[PATCH v2 1/6] netio.sys: Add driver stub.
by Paul Gofman May 25, 2020

May 25, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- configure.ac | 1 + dlls/netio.sys/Makefile.in | 6 +++++ dlls/netio.sys/netio.c | 49 +++++++++++++++++++++++++++++++++++ dlls/netio.sys/netio.sys.spec | 1 + loader/wine.inf.in | 2 ++ 5 files changed, 59 insertions(+) create mode 100644 dlls/netio.sys/Makefile.in create mode 100644 dlls/netio.sys/netio.c create mode 100644 dlls/netio.sys/netio.sys.spec diff --git a/configure.ac b/configure.ac index d81f5cc88c..3b00c28d7e 100644 --- a/configure.ac +++ b/configure.ac @@ -3556,6 +3556,7 @@ WINE_CONFIG_MAKEFILE(dlls/netapi32) WINE_CONFIG_MAKEFILE(dlls/netapi32/tests) WINE_CONFIG_MAKEFILE(dlls/netcfgx) WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests) +WINE_CONFIG_MAKEFILE(dlls/netio.sys) WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) WINE_CONFIG_MAKEFILE(dlls/newdev) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in new file mode 100644 index 0000000000..45bccc7971 --- /dev/null +++ b/dlls/netio.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = netio.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native + +C_SRCS = \ + netio.c diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c new file mode 100644 index 0000000000..c79b4db436 --- /dev/null +++ b/dlls/netio.sys/netio.c @@ -0,0 +1,49 @@ +/* + * WSK (Winsock Kernel) driver library. + * + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * + * 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 + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netio); + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + TRACE("driver %p.\n", driver); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + driver->DriverUnload = driver_unload; + + return STATUS_SUCCESS; +} + diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec new file mode 100644 index 0000000000..792d600548 --- /dev/null +++ b/dlls/netio.sys/netio.sys.spec @@ -0,0 +1 @@ +# diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0a43cc779c..de0dd4e455 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2617,6 +2617,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,netio.sys,- 12,,scsiport.sys,- 12,,tdi.sys,- 12,,usbd.sys,- @@ -2673,6 +2674,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys +12,,netio.sys 12,,scsiport.sys 12,,tdi.sys 12,,usbd.sys -- 2.26.2

1 0

[PATCH 1/5] dwrite: Fix array indexing when merging features.
by Nikolay Sivov May 25, 2020

May 25, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/shape.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 3d25898cf7a..77c5ba1f8a2 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -231,7 +231,7 @@ static int features_sorting_compare(const void *a, const void *b) static void shape_merge_features(struct scriptshaping_context *context, struct shaping_features *features) { const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; - unsigned int j = 0, i; + unsigned int i, j; /* For now only consider global, enabled user features. */ if (user_features && context->user_features.range_lengths) @@ -250,7 +250,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s /* Sort and merge duplicates. */ qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); - for (i = 1; i < features->count; ++i) + for (i = 1, j = 0; i < features->count; ++i) { if (features->features[i].tag != features->features[j].tag) features->features[++j] = features->features[i]; -- 2.26.2

1 4

[PATCH] ntoskrnl.exe: Return zero for unknown msr registers.
by Paul Gofman May 25, 2020

May 25, 2020

rdmsr should fault if called with the register not supported by CPU. But until we want to support the full range of CPU specific registers returning zero is probably a better fallback. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/instr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 68140c09ef..44f2ed4f51 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -815,7 +815,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Rax = (ULONG)syscall_address; break; } - default: return ExceptionContinueSearch; + default: + FIXME("reg %#x, returning 0.\n", reg); + context->Rdx = 0; + context->Rax = 0; + break; } context->Rip += prefixlen + 2; return ExceptionContinueExecution; -- 2.26.2

1 0

wine-5.0.1-rc1 Available
by Michael Stefaniuc May 24, 2020

May 24, 2020

Hello guys, I have pushed wine-5.0.1-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ The money piece for this release is the compilation fix for gcc 10. The timezone patches are huge but just because they touch all po files. The rest of the patches are fairly normal. What's new in this release (see below for details): - Fix compilation with gcc 10 - Add some timezones - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 5.0.1 (total 37): 36059 Multiple Steam games fail to install DirectX runtime prerequisite, resulting in repeated install attempt on startup ('xinput1_3.dll' locked by client) 42038 Cannot scroll documents being compared in winmerge (Followup to bug 20695) 42585 Final Fantasy V Corrupt Fonts 45049 Multiple programs need d2d1 CreateRoundedRectangleGeometry (playchessV7, Paint.Net 4.*) 45481 Spintires: MudRunner crashes at launch 46005 Multiple games and applications fail due to missing interface proxy information in registry (oleautomation/dual interfaces referenced in coclass section inside of library block) 46735 Multiple applications need Direct3DShaderValidatorCreate9() implementation (The Sims 2 demo, Armed Assault) 47288 Gaea 1.0.19 (.NET 4.7 WPF app) diagnostic tool 'Watson.exe' crashes due to 'kernel32.SetConsoleScreenBufferInfoEx' stub 47668 Logos 8 (.NET/WPF 4.7.2 application) fails to download resources (needs ReOpenFile implementation) 48018 QuickTime 7.0.x installer fails, 'rundll32.exe "C:\Program Files (x86)\QuickTime\QTSystem\QTJava.dll,QTPostInstallProc"' crashes due to invalid cdecl dll entry 48338 DIB images with bpp <= 8 get wrong palette when converted to GpBitmap 48371 Home Designer Suite 21.3.1.1x64 reports "Error #272000009 A serious error occurred (SEH)." 48386 Some CPU features are not reported for Intel CPU (Detroit: Become Human is affected) 48387 User shared data area should have NumberOfPhysicalPages field filled in (used by Detroit: Become Human) 48480 dlls/krnl386.exe16 - thunk.c argument logic incorrect for CallProcEx32W16 48484 winecfg doesn't allow disabling Desktop Integration for Downloads 48491 _searchenv & co do not understand quoted directories 48510 Lotus Organizer 97 crashes when selecting a Backup folder using 'Browse' button 48549 Arma Cold War Assault: Cursor stuck at low fps since Wine 5.0-rc6 48557 Multiple installers crash (Hot Wired, Croc installer) : Setup is unable to initialize the language dialogbox: Error 106 48561 Cadence Allegro Professional 16.6 crashes at startup 48569 Infinite drag & drop loop crashes WinSCP 48571 Firefox 72.0.* crashes on every tab (unless dwrite is disabled) 48577 DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY and other enums are the wrong size 48580 Discord connecting to voice needs unimplemented function qwave.dll.QOSAddSocketToFlow 48594 AnyDesk crashes directly on startup (low WORD of instance handle must be ignored when looking up window classes) 48635 Asuka 120% Return BURNING Fest: Crashes after character selection. 48639 Shrew Soft VPN client needs setupapi.dll.SetupDiGetSelectedDriverA() 48646 QQMusicAgent crashes when started after installation 48648 Gothic II Night of the Raven:unhandled exception in Wine 5.2 48664 kernel32:process - Intermittent test_Toolhelp() failure 48669 iphlpapi.NotifyUnicastIpAddressChange() should call the callback initially if requested (required for Far Cry 5 online mode) 48694 The Bat! (64bit) crashes right after start 48706 Wineconsole freezes when restoring from minimized to maximized window 48723 Torchlight - Loading times are excessively long 48735 Wine builtin services.exe process_send_command: OVERLAPPED struct for control pipe has uninitialized Offset and OffsetHigh fields 48846 msvcr90/tests/msvcr90.c: error: variadic functions must use the base AAPCS variant ---------------------------------------------------------------- Changes since 5.0: Aaro Altonen (3): kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx(). kernelbase: Implement SetConsoleScreenBufferInfoEx(). urlmon: Add URLOpenPullStreamW() stub. Akihiro Sagawa (3): dsound/tests: Add a test whether the buffer is a valid global memory. dsound: Make GlobalHandle() for the sound buffer failed. po: Update Japanese translation. Alexandre Julliard (2): rundll32: Add wrapper to call entry point on i386. ver: Use the 16-bit resource function in GetFileVersionInfo16(). Alistair Leslie-Hughes (3): d3dx9: Implement D3DXCreateKeyframedAnimationSet. dmstyle: IDirectMusicStyle8 GetDefaultBand return S_FALSE. qwave: Add QOSAddSocketToFlow stub. Aurimas Fišeras (3): po: Update Lithuanian translation. po: Update Lithuanian translation. po: Update Lithuanian translation. Brendan Shanks (4): include: Fix size of DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY enum. include: Fix size of tomConstants enum. include: Fix size of RecordCreateOptionsEnum. wined3d: Add GPU information for NVIDIA GeForce GTX 1060 3GB. Charles Davis (1): msvcrt: Correct return value of ___mb_cur_max_l_func(). Damjan Jovanovic (1): gdiplus: In CompositingModeSourceCopy, fully transparent pixels are drawn black. Daniel Lehman (5): tzres: Add Haiti Time Zone. tzres: Add Aleutian Time Zone. loader: Add Chatham Islands Standard Time Zone. loader: Add Bougainville Standard Time Zone. loader: Add Marquesas Standard Time Zone. Dirk Niggemann (1): krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments. Dmitry Timoshkov (4): schedsvc/tests: Fix compilation with recent gcc/clang versions. gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. user32/tests: Add some tests for classes with non-zero low word instance. server: Ignore low word of a class instance when looking up for a window class. François Gouget (1): kernel32/tests: Fix test_Toolhelp()'s nested process lookup. Gerald Pfeifer (2): winedump: Add a default case to numeric_leaf(). msi: Properly declare variables in msi/tests/utils.h as extern. Giovanni Mascellani (1): d2d1: Implement rounded rectangle drawing. Hans Leidekker (1): wbemprox: Implement Win32_DesktopMonitor.Name. Henri Verbeet (1): wined3d: Properly validate the stage index in wined3d_stateblock_set_texture_stage_state() (Coverity). Jacek Caban (1): rpcrt4: Use MustFree for all non-base types in get_param_pointer_info. Jefferson Carpenter (1): services: Initialize OVERLAPPED Offset and OffsetHigh. Kevin Puetz (1): rpcrt4: Fix ITypeInfo leak in get_iface_info. Lauri Kenttä (2): po: Update Finnish translation. po: Update Finnish translation. Lukáš Horáček (1): wined3d: Add GTX 1660 SUPER as a card. Matteo Bruni (1): maintainers: Drop Józef Kucia. Michael Cronenworth (12): crypt32: Global variable compatibility update for gcc 10. dsound: Global variable compatibility update for gcc 10. mshtml: Global variable compatibility update for gcc 10. secur32: Global variable compatibility update for gcc 10. winebus: Global variable compatibility update for gcc 10. wbemprox: Global variable compatibility update for gcc 10. xinput: Global variable compatibility update for gcc 10. twain_32: Global variable compatibility update for gcc 10. msi: Global variable compatibility update for gcc 10. webservices: Global variable compatibility update for gcc 10. gphoto2.ds: Global variable compatibility update for gcc 10. sane.ds: Global variable compatibility update for gcc 10. Michael Müller (1): setupapi: Implement SP_COPY_IN_USE_NEEDS_REBOOT. Michael Stefaniuc (1): tools: Get the ANNOUNCE bug list from the stable-notes git notes. Mingcong Bai (1): po: Update Simplified Chinese translation. Nikolay Sivov (5): ucrtbase: Add _query_new_handler() and _query_new_mode(). dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace(). user32: Improve window state handling in SetScrollInfo(). ole32: Fix a leak when creating pointer moniker through activation. ole32: Fix a leak when creating antimoniker through activation. Olivier F. R. Dierick (1): winecfg: Add Downloads and Templates to shell folders UI interface. Paul Gofman (6): ntdll: Fill NumberOfPhysicalPages field in user shared data area. ntdll: Report rdtsc processor feature if supported. iphlpapi: Support InitialNotification flag in NotifyUnicastIpAddressChange(). ntdll: Zero init reg_tzi in find_reg_tz_info(). include: Add Vista+ PEB_LDR_DATA structure fields. wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM. Piotr Caban (11): msvcrt: Add support for quoted paths in _searchenv. msvcrt: Add support for quoted paths in _searchenv_s. msvcrt: Don't duplicate _searchenv_s code in _searchenv. msvcrt: Add support for quoted paths in _wsearchenv_s. msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv. msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors. msvcrt: Optimize _strnicmp_l implementation. msvcr90/tests: Fix swscanf tests compilation on arm. winemac: Fix leaks in macdrv_surface_destroy. gdiplus: Fix gdi handles leak in GdipMeasureCharacterRanges. gdiplus: Fix leak in SOFTWARE_GdipDrawDriverString. Roman Pišl (3): shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc. ole32: Avoid calling QueryContinueDrag recursively. wineconsole: Allow maximization. Rémi Bernon (1): dinput: Increase device buffer size to 1024. Sven Baars (1): wined3d: Avoid accessing freed memory in wined3d_view_gl_destroy() (Valgrind). Vijay Kiran Kamuju (3): include: Add missing defines to icm.h. mscms: Add stub for WcsGetDefaultColorProfileSize. mscms: Add stub for WcsGetDefaultRenderingIntent. Zebediah Figura (5): widl: Output a registry script for all interfaces written into the typelib. kernelbase: Implement ReOpenFile(). d3d9: Return a stub interface from Direct3DShaderValidatorCreate9(). setupapi: Implement SetupDiGetSelectedDriver(). ddraw: Avoid leaking the primary stateblock. Zhiyi Zhang (1): wined3d: Add GPU information for NVIDIA GeForce GTX 1650 SUPER. -- Michael Stefaniuc mstefani(a)winehq.org

1 0