May 2019 - Wine-Commits - list.winehq.org

Akihiro Sagawa : advapi32/tests: Add RegLoadMUIString tests with REG_MUI_STRING_TRUNCATE flag.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 1ca4ecadeccee704345d358a3f69131884d33b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca4ecadeccee704345d358a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:29 2019 +0900 advapi32/tests: Add RegLoadMUIString tests with REG_MUI_STRING_TRUNCATE flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b8974f2..ab8655a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3907,6 +3907,22 @@ static void test_RegLoadMUIString(void) "got %u, expected %u\n", size, text_size); todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, REG_MUI_STRING_TRUNCATE, NULL); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, 0xdeadbeef, NULL); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, REG_MUI_STRING_TRUNCATE, NULL); + ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + ok(bufW[0] == textW[0], "got 0x%04x, expected 0x%04x\n", bufW[0], textW[0]); + ok(bufW[1] == 0, "got 0x%04x, expected nul\n", bufW[1]); + size = 0xdeadbeef; memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL);

1 0

Akihiro Sagawa : kernel32: Add traces to time zone functions.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 4ef37887d62e29e9ce16aa2067eef1eabc85cc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef37887d62e29e9ce16aa20… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:27 2019 +0900 kernel32: Add traces to time zone functions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 3affb72..00fcc6b 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -610,6 +610,7 @@ DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION ret ) DYNAMIC_TIME_ZONE_INFORMATION tzinfo; DWORD time_zone_id; + TRACE("(%p)\n", ret); time_zone_id = GetDynamicTimeZoneInformation( &tzinfo ); memcpy( ret, &tzinfo, sizeof(*ret) ); return time_zone_id; @@ -623,6 +624,7 @@ BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, { DYNAMIC_TIME_ZONE_INFORMATION local_dtzi, result; + TRACE("(%u,%p)\n", wYear, ptzi); if (!pdtzi) { if (GetDynamicTimeZoneInformation(&local_dtzi) == TIME_ZONE_ID_INVALID) @@ -654,6 +656,8 @@ BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, BOOL WINAPI SetTimeZoneInformation( const TIME_ZONE_INFORMATION *tzinfo ) { NTSTATUS status; + + TRACE("(%p)\n", tzinfo); status = RtlSetTimeZoneInformation( (const RTL_TIME_ZONE_INFORMATION *)tzinfo ); if ( status != STATUS_SUCCESS ) SetLastError( RtlNtStatusToDosError(status) ); @@ -1312,6 +1316,8 @@ VOID WINAPI GetSystemTime(LPSYSTEMTIME systime) BOOL WINAPI GetDaylightFlag(void) { TIME_ZONE_INFORMATION tzinfo; + + TRACE("()\n"); RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); return (TIME_ZoneID(&tzinfo) == TIME_ZONE_ID_DAYLIGHT); } @@ -1462,6 +1468,7 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo NTSTATUS status; HANDLE time_zone_key; + TRACE("(%p)\n", tzinfo); status = RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION*)tzinfo ); if ( status != STATUS_SUCCESS ) {

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: af7f3ecd3b03103a0a2f0002e2925af3a2ac93e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7f3ecd3b03103a0a2f0002… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:31 2019 +0100 gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 345 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af7f3ecd3b03103a0a2f…

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTDestroyDevice tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 13f649fde5564ce9f40e6b31b6608165e04a1881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f649fde5564ce9f40e6b31… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:30 2019 +0100 gdi32/tests: Add D3DKMTDestroyDevice tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 97b7ed7..7d7fce3 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -228,6 +228,26 @@ static void test_D3DKMTCreateDevice(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTDestroyDevice(void) +{ + D3DKMT_DESTROYDEVICE destroy_device_desc; + NTSTATUS status; + + if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTDestroyDevice() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTDestroyDevice(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&destroy_device_desc, 0, sizeof(destroy_device_desc)); + status = pD3DKMTDestroyDevice(&destroy_device_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -242,4 +262,5 @@ START_TEST(driver) test_D3DKMTOpenAdapterFromHdc(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); + test_D3DKMTDestroyDevice(); }

1 0

Alexandre Julliard : quartz/tests: Add braces to avoid a clang warning.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: c3d3ef752ba53053db7871f0444d00344478430d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d3ef752ba53053db7871f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:35:32 2019 +0200 quartz/tests: Add braces to avoid a clang warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 7155be5..5ca22ab 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -449,7 +449,7 @@ static void test_media_types(void) const WCHAR *filename = load_resource(avifile); IBaseFilter *filter = create_avi_splitter(); - AM_MEDIA_TYPE mt = {0}, *pmt; + AM_MEDIA_TYPE mt = {{0}}, *pmt; IEnumMediaTypes *enummt; IFilterGraph2 *graph; HRESULT hr;

1 0

Alexandre Julliard : ntdll: Don' t pass DLL_WINE_PREATTACH to the TLS callbacks.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 1943fb29bfe539d0a1602d58037e79ebd67ff953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1943fb29bfe539d0a1602d58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 11:22:16 2019 +0200 ntdll: Don't pass DLL_WINE_PREATTACH to the TLS callbacks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index da41fdf..1660667 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1217,6 +1217,8 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) const PIMAGE_TLS_CALLBACK *callback; ULONG dirsize; + if (reason == DLL_WINE_PREATTACH) return; + dir = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_TLS, &dirsize ); if (!dir || !dir->AddressOfCallBacks) return;

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 012d9bbc233dd9b11cad76b5e94743145398c170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=012d9bbc233dd9b11cad76b5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:26 2019 +0100 gdi32/tests: Add D3DKMTOpenAdapterFromGdiDisplayName tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/driver.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90d7223..9d82c27 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ clipping.c \ dc.c \ dib.c \ + driver.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c new file mode 100644 index 0000000..0e1fddc --- /dev/null +++ b/dlls/gdi32/tests/driver.c @@ -0,0 +1,101 @@ +/* + * Unit test suite for kernel mode graphics driver + * + * Copyright 2019 Zhiyi Zhang + * + * 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> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winternl.h" +#include "ddk/d3dkmthk.h" + +#include "wine/test.h" + +static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + +static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); + +static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + NTSTATUS status; + DWORD i; + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + if (!pD3DKMTOpenAdapterFromGdiDisplayName + || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + return; + } + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromGdiDisplayName(NULL); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_gdi_desc, 0, sizeof(open_adapter_gdi_desc)); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + lstrcpyW(open_adapter_gdi_desc.DeviceName, display_device.DeviceName); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + else + { + ok(status == STATUS_UNSUCCESSFUL, "Got unexpected return code %#x.\n", status); + continue; + } + + ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_gdi_desc.VidPnSourceId); + else + ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); + + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + +START_TEST(driver) +{ + HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); + + pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); + pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + + test_D3DKMTOpenAdapterFromGdiDisplayName(); +}

1 0

Alistair Leslie-Hughes : include: Add helicopter Direct Input defines.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: a30da077e22e7bb2df950969995f0dac67ade8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a30da077e22e7bb2df950969… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 24 04:53:36 2019 +0000 include: Add helicopter Direct Input defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index beb81a7..aca7005 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2193,6 +2193,29 @@ extern const DIDATAFORMAT c_dfDIJoystick2; #define DIPOV_ANY_4 0xFF004604 #define DIBUTTON_ANY(instance) (0xFF004400 | (instance)) +#define DIVIRTUAL_FLYING_HELICOPTER 0x06000000 +#define DIBUTTON_FLYINGH_MENU 0x060004fd +#define DIBUTTON_FLYINGH_FIRE 0x06001401 +#define DIBUTTON_FLYINGH_WEAPONS 0x06001402 +#define DIBUTTON_FLYINGH_TARGET 0x06001403 +#define DIBUTTON_FLYINGH_DEVICE 0x060044fe +#define DIBUTTON_FLYINGH_PAUSE 0x060044fc +#define DIHATSWITCH_FLYINGH_GLANCE 0x06004601 +#define DIBUTTON_FLYINGH_FIRESECONDARY 0x06004c07 +#define DIBUTTON_FLYINGH_COUNTER 0x06005404 +#define DIBUTTON_FLYINGH_VIEW 0x06006405 +#define DIBUTTON_FLYINGH_GEAR 0x06006406 +#define DIAXIS_FLYINGH_BANK 0x06008a01 +#define DIAXIS_FLYINGH_PITCH 0x06010a02 +#define DIAXIS_FLYINGH_COLLECTIVE 0x06018a03 +#define DIAXIS_FLYINGH_TORQUE 0x06025a04 +#define DIAXIS_FLYINGH_THROTTLE 0x0603da05 +#define DIBUTTON_FLYINGH_FASTER_LINK 0x0603dce0 +#define DIBUTTON_FLYINGH_SLOWER_LINK 0x0603dce8 +#define DIBUTTON_FLYINGH_GLANCE_LEFT_LINK 0x0607c4e4 +#define DIBUTTON_FLYINGH_GLANCE_RIGHT_LINK 0x0607c4ec +#define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607c4e0 +#define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607c4e8 /***************************************************************************** * IDirectInputA interface

1 0

Nikolay Sivov : kernelbase: Add remaining URL functions.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: 88ffcd5db4686bf9e285e384339ab48ac7c08604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88ffcd5db4686bf9e285e384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:01 2019 +0300 kernelbase: Add remaining URL functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 12 +- dlls/kernelbase/path.c | 403 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 409 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88ffcd5db4686bf9e285…

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTOpenAdapterFromHdc tests.
by Alexandre Julliard May 24, 2019

May 24, 2019

Module: wine Branch: master Commit: b6072314e5410dc4e5a18c0ffae54c71d43936b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6072314e5410dc4e5a18c0f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:27 2019 +0100 gdi32/tests: Add D3DKMTOpenAdapterFromHdc tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 0e1fddc..30b0207 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -35,6 +35,7 @@ static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y' static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -90,12 +91,82 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } } +static void test_D3DKMTOpenAdapterFromHdc(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + D3DKMT_OPENADAPTERFROMHDC open_adapter_hdc_desc; + D3DKMT_CLOSEADAPTER close_adapter_desc; + INT adapter_count = 0; + NTSTATUS status; + HDC hdc; + DWORD i; + + if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTOpenAdapterFromHdc(NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + /* Open adapter */ + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + adapter_count++; + + hdc = CreateDCW(0, display_device.DeviceName, 0, NULL); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + else + todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", + open_adapter_hdc_desc.VidPnSourceId); + DeleteDC(hdc); + + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } + } + + /* HDC covering more than two adapters is invalid for D3DKMTOpenAdapterFromHdc */ + hdc = GetDC(0); + open_adapter_hdc_desc.hDc = hdc; + status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + ReleaseDC(0, hdc); + todo_wine ok(status == (adapter_count > 1 ? STATUS_INVALID_PARAMETER : STATUS_SUCCESS), + "Got unexpected return code %#x.\n", status); + if (status == STATUS_SUCCESS) + { + close_adapter_desc.hAdapter = open_adapter_hdc_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); + pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); test_D3DKMTOpenAdapterFromGdiDisplayName(); + test_D3DKMTOpenAdapterFromHdc(); }

1 0