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

[PATCH] gdi32/tests: Fix a copy/paste error in an ok() message.
by Francois Gouget Nov. 25, 2019

Nov. 25, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 3920b8c0c43..9a2584fd908 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -994,7 +994,7 @@ static void test_mf_SaveDC(void) ok(ret, "ret = %d\n", ret); hMetafile = CloseMetaFile(hdcMetafile); - ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); ret = DeleteMetaFile(hMetafile); ok( ret, "DeleteMetaFile error %d\n", GetLastError()); -- 2.20.1

2 1

[PATCH v2] shcore: Add stub for GetScaleFactorForMonitor
by Vijay Kiran Kamuju Nov. 25, 2019

Nov. 25, 2019

Based on patch from Esdras Tarsis <esdrastarsis at gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 4 ++++ include/shtypes.idl | 21 +++++++++++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9dfc..9ebda5164c1d 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f52..3f95c1ffd872 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5c8..d5b7a342e319 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d598280..6f2f7188738e 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -34,6 +36,8 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c8038187..c83562a24bb1 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR; -- 2.21.0

1 0

[PATCH v2] ntoskrnl.exe: Add tests for METHOD_NEITHER ioctl behavior.
by Chip Davis Nov. 25, 2019

Nov. 25, 2019

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Send just the tests. Correct an incorrect test. dlls/ntoskrnl.exe/tests/driver.c | 30 ++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 ++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index a0f63ade791..6827b74a3c9 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1855,6 +1855,34 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG return ZwUnloadDriver(&name); } +static NTSTATUS test_mismatched_status_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + char *buffer = irp->UserBuffer; + + if (!buffer) + { + irp->IoStatus.Status = STATUS_ACCESS_VIOLATION; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_ACCESS_VIOLATION; + } + + if (length < sizeof(teststr)) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + memcpy(buffer, teststr, sizeof(teststr)); + + /* This is deliberate; some broken drivers do this */ + *info = 0; + irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -1916,6 +1944,8 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) IoDetachDevice(lower_device); status = STATUS_SUCCESS; break; + case IOCTL_WINETEST_MISMATCHED_STATUS: + return test_mismatched_status_ioctl(irp, stack, &irp->IoStatus.Information); default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 313d554a37b..aa9de674e2f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -33,6 +33,7 @@ #define IOCTL_WINETEST_GET_CLOSE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_MISMATCHED_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80b, METHOD_NEITHER, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 76bcf0d0ce6..c2422e067af 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -208,6 +208,19 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, "Wine is no"), "got '%s'\n", buf); } +static void test_mismatched_status_ioctl(void) +{ + DWORD written = 0xdeadbeef; + char buf[32]; + BOOL res; + + res = DeviceIoControl(device, IOCTL_WINETEST_MISMATCHED_STATUS, NULL, 0, buf, + sizeof(buf), &written, NULL); + todo_wine ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + todo_wine ok(written == 0xdeadbeef, "size = %u\n", written); + todo_wine ok(!strcmp(buf, teststr), "got '%s'\n", buf); +} + static void test_overlapped(void) { OVERLAPPED overlapped, overlapped2, *o; @@ -514,6 +527,7 @@ START_TEST(ntoskrnl) ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); test_basic_ioctl(); + test_mismatched_status_ioctl(); main_test(); test_overlapped(); test_load_driver(service2); -- 2.21.0

2 1

[PATCH] winex11.drv/wintab: Fix values for lcSys* and lcOut*
by John Chadwick Nov. 25, 2019

Nov. 25, 2019

Testing using the Wacom wintab32 (from driver version 6.3.37-3) on Windows 10, it appears that the values for lcOut* were likely accidentally mixed up with the values for lcSys*. The lcSys* values are, according to the documentation, supposed to specify the extent of the screen mapping area for the cursor, wheras lcOut* simply specifies the output coordinate space for the given context. There is no logical reason I'm aware of for why lcOut* would have different default values from lcIn*, and in testing Wacom wintab32 defaults lcOut* to match lcIn*. In addition, lcSysExt* should use SM_C*VIRTUALSCREEN instead of SM_C*SCREEN, to handle multi-monitor setups properly. Setting lcSysExt* to these values works even if the tablet is mapped to a subset of this area. After this change, PaintTool SAI 2 appears to work out of the box. Other wintab clients I tested appear to be unaffected (such as the Wintab SDK demos and Adobe Photoshop CS2.) Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/winex11.drv/wintab.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 12eb89ac7f..ef42a1f07c 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -537,8 +537,8 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSensZ = 65536; gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; - gSysContext.lcOutExtX= GetSystemMetrics(SM_CXSCREEN); - gSysContext.lcOutExtY= GetSystemMetrics(SM_CYSCREEN); + gSysContext.lcSysExtX = GetSystemMetrics(SM_CXVIRTUALSCREEN); + gSysContext.lcSysExtY = GetSystemMetrics(SM_CYVIRTUALSCREEN); /* initialize cursors */ disable_system_cursors(); @@ -671,9 +671,9 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.X.axUnits = TU_INCHES; gSysDevice.X.axResolution = Axis->resolution; gSysContext.lcInOrgX = Axis->min_value; - gSysContext.lcSysOrgX = Axis->min_value; + gSysContext.lcOutOrgX = Axis->min_value; gSysContext.lcInExtX = Axis->max_value; - gSysContext.lcSysExtX = Axis->max_value; + gSysContext.lcOutExtX = Axis->max_value; Axis++; } if (Val->num_axes>=2) @@ -684,9 +684,9 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.Y.axUnits = TU_INCHES; gSysDevice.Y.axResolution = Axis->resolution; gSysContext.lcInOrgY = Axis->min_value; - gSysContext.lcSysOrgY = Axis->min_value; + gSysContext.lcOutOrgY = Axis->min_value; gSysContext.lcInExtY = Axis->max_value; - gSysContext.lcSysExtY = Axis->max_value; + gSysContext.lcOutExtY = Axis->max_value; Axis++; } if (Val->num_axes>=3) -- 2.23.0

1 0

[PATCH vkd3d v2 2/2] vkd3d/tests: Add and modify tests for GetResourceAllocationInfo().
by Conor McCarthy Nov. 25, 2019

Nov. 25, 2019

Test large DepthOrArraySize for small resources, and test compressed textures at the 64KB limit. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1485396..0a8cecb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29394,7 +29394,6 @@ static void test_resource_allocation_info(void) ID3D12Device *device; unsigned int i, j; ULONG refcount; - uint64_t size; static const unsigned int alignments[] = { @@ -29429,12 +29428,15 @@ static void test_resource_allocation_info(void) { 4, 4, 1, 1, DXGI_FORMAT_R8_UINT}, { 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, {16, 16, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, - {16, 16, 6, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {16, 16, 1024, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, + {256, 512, 1, 10, DXGI_FORMAT_BC1_UNORM}, + {256, 512, 64, 1, DXGI_FORMAT_BC1_UNORM}, {1024, 1024, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 2, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 3, DXGI_FORMAT_R8G8B8A8_UNORM}, {1024, 1024, 1, 0, DXGI_FORMAT_R8G8B8A8_UNORM}, + {260, 512, 1, 1, DXGI_FORMAT_BC1_UNORM}, }; if (!(device = create_device())) @@ -29506,8 +29508,7 @@ static void test_resource_allocation_info(void) info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &desc); ok(info.Alignment >= D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT, "Got unexpected alignment %"PRIu64".\n", info.Alignment); - size = desc.Width * desc.Height * desc.DepthOrArraySize * format_size(desc.Format); - if (size <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + if (i < 6) { check_alignment(info.SizeInBytes, info.Alignment); } -- 2.24.0

1 0

[PATCH] shcore: Add stub for GetScaleFactorForMonitor
by Vijay Kiran Kamuju Nov. 25, 2019

Nov. 25, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 +++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 4 ++++ include/shtypes.idl | 21 +++++++++++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9dfc..9ebda5164c1d 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f52..3f95c1ffd872 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5c8..d5b7a342e319 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d598280..6f2f7188738e 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -34,6 +36,8 @@ typedef enum PROCESS_DPI_AWARENESS PROCESS_PER_MONITOR_DPI_AWARE } PROCESS_DPI_AWARENESS; +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); + HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c8038187..c83562a24bb1 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR; -- 2.21.0

2 2

[PATCH] ntdll: Implement SystemBatteryState for Mac OS.
by Chip Davis Nov. 25, 2019

Nov. 25, 2019

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/nt.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ceda544a4df..3aa17b4f422 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -38,6 +38,9 @@ #endif #ifdef HAVE_IOKIT_IOKITLIB_H # include <IOKit/IOKitLib.h> +# include <IOKit/pwr_mgt/IOPM.h> +# include <IOKit/pwr_mgt/IOPMLib.h> +# include <IOKit/ps/IOPowerSources.h> #endif #include <ctype.h> @@ -3338,6 +3341,73 @@ static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) return STATUS_SUCCESS; } +#elif defined(HAVE_IOKIT_IOKITLIB_H) + +static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) +{ + CFArrayRef batteries; + CFDictionaryRef battery; + CFNumberRef prop; + uint32_t value, voltage; + CFTimeInterval remain; + + if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess) + return STATUS_ACCESS_DENIED; + + if (CFArrayGetCount( batteries ) == 0) + { + /* Just assume we're on AC with no battery. */ + bs->AcOnLine = TRUE; + return STATUS_SUCCESS; + } + /* Just use the first battery. */ + battery = CFArrayGetValueAtIndex( batteries, 0 ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryFlagsKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + + if (value & kIOBatteryInstalled) + bs->BatteryPresent = TRUE; + else + /* Since we are executing code, we must have AC power. */ + bs->AcOnLine = TRUE; + if (value & kIOBatteryChargerConnect) + { + bs->AcOnLine = TRUE; + if (value & kIOBatteryCharge) + bs->Charging = TRUE; + } + else + bs->Discharging = TRUE; + + /* We'll need the voltage to be able to interpret the other values. */ + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryVoltageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &voltage ); + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCapacityKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->MaxCapacity = value * voltage; + /* Apple uses "estimated time < 10:00" and "22%" for these, but we'll follow + * Windows for now (5% and 33%). */ + bs->DefaultAlert1 = bs->MaxCapacity / 20; + bs->DefaultAlert2 = bs->MaxCapacity / 3; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryCurrentChargeKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->RemainingCapacity = value * voltage; + + prop = CFDictionaryGetValue( battery, CFSTR(kIOBatteryAmperageKey) ); + CFNumberGetValue( prop, kCFNumberSInt32Type, &value ); + bs->Rate = value * voltage; + + remain = IOPSGetTimeRemainingEstimate(); + if (remain != kIOPSTimeRemainingUnknown && remain != kIOPSTimeRemainingUnlimited) + bs->EstimatedTime = (ULONG)remain; + + CFRelease( batteries ); + return STATUS_SUCCESS; +} + #else static NTSTATUS fill_battery_state(SYSTEM_BATTERY_STATE *bs) -- 2.21.0

2 1

[PATCH 1/4] ntoskrnl.exe: Return driver dispatch result to caller.
by Chip Davis Nov. 25, 2019

Nov. 25, 2019

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a810dee573f..3a3c543be83 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -479,9 +479,10 @@ struct dispatch_context void *in_buff; }; -static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_context *context ) +static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_context *context ) { LARGE_INTEGER count; + NTSTATUS status; IoSetCompletionRoutine( irp, dispatch_irp_completion, context->handle, TRUE, TRUE, TRUE ); context->handle = 0; @@ -491,9 +492,10 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte context->irp = irp; device->CurrentIrp = irp; KeEnterCriticalRegion(); - IoCallDriver( device, irp ); + status = IoCallDriver( device, irp ); KeLeaveCriticalRegion(); device->CurrentIrp = NULL; + return status; } /* process a create request for a given file */ @@ -536,9 +538,7 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irp->UserEvent = NULL; irp->Flags |= IRP_CREATE_OPERATION; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a close request for a given file */ @@ -574,9 +574,7 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irp->UserEvent = NULL; irp->Flags |= IRP_CLOSE_OPERATION; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a read request for a given device */ @@ -616,9 +614,7 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) irp->Flags |= IRP_READ_OPERATION; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a write request for a given device */ @@ -652,9 +648,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) irp->Flags |= IRP_WRITE_OPERATION; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process a flush request for a given device */ @@ -681,9 +675,7 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) irpsp = IoGetNextIrpStackLocation( irp ); irpsp->FileObject = file; - dispatch_irp( device, irp, context ); - - return STATUS_SUCCESS; + return dispatch_irp( device, irp, context ); } /* process an ioctl request for a given device */ @@ -696,6 +688,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) DEVICE_OBJECT *device; FILE_OBJECT *file = wine_server_get_ptr( context->params.ioctl.file ); ULONG out_size = context->params.ioctl.out_size; + NTSTATUS status; if (!file) return STATUS_INVALID_HANDLE; @@ -744,10 +737,10 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ - dispatch_irp( device, irp, context ); + status = dispatch_irp( device, irp, context ); HeapFree( GetProcessHeap(), 0, to_free ); - return STATUS_SUCCESS; + return status; } static NTSTATUS dispatch_free( struct dispatch_context *context ) -- 2.21.0

2 7

[PATCH 1/2] include: Use __fastcall directly in winelib builds, too.
by Chip Davis Nov. 25, 2019

Nov. 25, 2019

It's still not safe to call a __fastcall function from Wine source, though, since we can't rely on this being present. winebuild still wants the old wrapper names, so for now we define aliases. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/hal/hal.c | 2 +- include/ddk/wdm.h | 6 +++--- include/windef.h | 21 +++++++++++++++------ include/wine/asm.h | 26 +++++++++++++++++++------- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 21ce6e12c99..2365cac57d0 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ -#ifndef _WIN32 +#if !defined(_WIN32) && ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a092216b824..3094fdbe42d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1554,9 +1554,9 @@ ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); -PSLIST_ENTRY WINAPI ExInterlockedFlushSList(PSLIST_HEADER); -PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); -PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); +PSLIST_ENTRY FASTCALL ExInterlockedFlushSList(PSLIST_HEADER); +PSLIST_ENTRY FASTCALL ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); +PSLIST_ENTRY FASTCALL ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); diff --git a/include/windef.h b/include/windef.h index 0074d5cf6c4..b52f5eb836c 100644 --- a/include/windef.h +++ b/include/windef.h @@ -101,10 +101,22 @@ extern "C" { #endif /* __cdecl */ #ifndef __fastcall -# ifndef _MSC_VER +# ifdef __i386__ +# ifdef __GNUC__ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# define __fastcall __attribute__((__fastcall__)) __attribute__((__force_align_arg_pointer__)) +# elif (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)) +# define __fastcall __attribute__((__fastcall__)) +# else +# define __fastcall __stdcall +# endif +# elif !defined(_MSC_VER) +# define __fastcall __stdcall +# endif +# else # define __fastcall __stdcall # endif -#endif +#endif /* __fastcall */ #ifndef __thiscall # define __thiscall __stdcall @@ -150,10 +162,7 @@ extern "C" { #define _stdcall __ONLY_IN_WINELIB(__stdcall) #endif #ifndef _fastcall -#define _fastcall __ONLY_IN_WINELIB(__stdcall) -#endif -#ifndef __fastcall -#define __fastcall __ONLY_IN_WINELIB(__stdcall) +#define _fastcall __ONLY_IN_WINELIB(__fastcall) #endif #ifndef __export #define __export __ONLY_IN_WINELIB(__stdcall) diff --git a/include/wine/asm.h b/include/wine/asm.h index 8c664476ef1..c45d84c7307 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -29,8 +29,10 @@ #if defined(_WIN32) && defined(__i386__) # define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args +# define __ASM_FASTCALL(name, args) "@" name "@" #args #else # define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_FASTCALL(name, args) __ASM_NAME(name) #endif #if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) @@ -56,22 +58,22 @@ #endif #ifdef __GNUC__ -# define __ASM_DEFINE_FUNC(name,code) \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); +# define __ASM_GLOBAL(code) asm(code); #else -# define __ASM_DEFINE_FUNC(name,code) void __asm_dummy_##__LINE__(void) { \ - asm(".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ - __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); } +# define __ASM_GLOBAL(code) void __asm_dummy_##__LINE__(void) { asm(code); } #endif +#define __ASM_DEFINE_FUNC(name,code) \ + __ASM_GLOBAL( ".text\n\t.align 4\n\t.globl " name "\n\t" __ASM_FUNC_TYPE(name) __ASM_SEH("\n\t.seh_proc " name) "\n" name ":\n\t" \ + __ASM_CFI(".cfi_startproc\n\t") code __ASM_CFI("\n\t.cfi_endproc") __ASM_SEH("\n\t.seh_endproc") ); + #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) /* fastcall support */ -#if defined(__i386__) && !defined(_WIN32) +#if defined(__i386__) && !defined(_WIN32) && ((__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ < 4))) # define DEFINE_FASTCALL1_WRAPPER(func) \ __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ @@ -87,6 +89,16 @@ "pushl %eax\n\t" \ "jmp " __ASM_STDCALL(#func,args) ) +#elif defined(__i386__) && !defined(_WIN32) + +/* winebuild still uses the thunk names, so provide them */ +# define DEFINE_FASTCALL1_WRAPPER(func) \ + __ASM_GLOBAL( ".globl " __ASM_STDCALL("__fastcall_" #func, 4) "\n\t" \ + __ASM_STDCALL("__fastcall_" #func, 4) " = " __ASM_FASTCALL(#func, 4) "\n\t" ); +# define DEFINE_FASTCALL_WRAPPER(func,args) \ + __ASM_GLOBAL( ".globl " __ASM_STDCALL("__fastcall_" #func, args) "\n\t" \ + __ASM_STDCALL("__fastcall_" #func, args) " = " __ASM_FASTCALL(#func, args) "\n\t" ); + #else /* __i386__ */ # define DEFINE_FASTCALL1_WRAPPER(func) /* nothing */ -- 2.21.0

2 2

[PATCH] setupapi: Implement CM_Get_DevNode_Property[_Ex]W().
by Chip Davis Nov. 25, 2019

Nov. 25, 2019

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/cfgmgr32/cfgmgr32.spec | 2 + dlls/setupapi/devinst.c | 105 ++++++++++++++++++++++++++---------- dlls/setupapi/setupapi.spec | 2 + 3 files changed, 81 insertions(+), 28 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 20ede7b13d1..8360048421a 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,6 +57,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) setupapi.CM_Get_DevNode_PropertyW +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyA @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da05..6871f47023c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4177,47 +4177,26 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return (have_guid || have_name); } -/*********************************************************************** - * SetupDiGetDevicePropertyW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, - const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, - DWORD prop_buff_size, DWORD *required_size, DWORD flags) +static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, DWORD prop_buff_size, DWORD *required_size, DWORD flags) { - static const WCHAR formatW[] = {'\\', '%', '0', '4', 'X', 0}; - WCHAR key_path[55] = {'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\\'}; + WCHAR key_path[55] = L"Properties\\"; HKEY hkey; DWORD value_type; DWORD value_size = 0; LSTATUS ls; - struct device *device; - - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, - required_size, flags); - - if (!(device = get_device(devinfo, device_data))) - return FALSE; if (!prop_key) - { - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return ERROR_INVALID_DATA; if (!prop_type || (!prop_buff && prop_buff_size)) - { - SetLastError(ERROR_INVALID_USER_BUFFER); - return FALSE; - } + return ERROR_INVALID_USER_BUFFER; if (flags) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } + return ERROR_INVALID_FLAGS; SETUPDI_GuidToString(&prop_key->fmtid, key_path + 11); - swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, formatW, prop_key->pid); + swprintf(key_path + 49, ARRAY_SIZE(key_path) - 49, L"\\%04X", prop_key->pid); ls = RegOpenKeyExW(device->key, key_path, 0, KEY_QUERY_VALUE, &hkey); if (!ls) @@ -4248,10 +4227,80 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ if (required_size) *required_size = value_size; + return ls; +} + +/*********************************************************************** + * SetupDiGetDevicePropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_data, + const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *prop_buff, + DWORD prop_buff_size, DWORD *required_size, DWORD flags) +{ + struct device *device; + LSTATUS ls; + + TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + required_size, flags); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); + SetLastError(ls); return !ls; } +/*********************************************************************** + * CM_Get_DevNode_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, + BYTE *prop_buff, ULONG *prop_buff_size, ULONG flags, HMACHINE machine) +{ + struct device *device = get_devnode_device(devnode); + LSTATUS ls; + + TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + flags, machine); + + if (machine) + return CR_MACHINE_UNAVAILABLE; + + if (!device) + return CR_NO_SUCH_DEVINST; + + if (!prop_buff_size) + return CR_INVALID_POINTER; + + ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags); + switch (ls) + { + case NO_ERROR: + return CR_SUCCESS; + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + case ERROR_INVALID_USER_BUFFER: + return CR_INVALID_POINTER; + case ERROR_INVALID_FLAGS: + return CR_INVALID_FLAG; + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + case ERROR_NOT_FOUND: + return CR_NO_SUCH_VALUE; + } + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE type, + PVOID buf, PULONG len, ULONG flags) +{ + return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); +} + /*********************************************************************** * SetupDiInstallDeviceInterfaces (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc1011..74c252c6fd5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -67,6 +67,8 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stdcall CM_Get_DevNode_PropertyW(long ptr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Property_ExW(long ptr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) -- 2.21.0

1 0