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

[PATCH] winecrt0: Make __wine_(un)register_resources() cdecl.
by Zebediah Figura Feb. 10, 2020

Feb. 10, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> This fixes a bug where 64-bit winegstreamer.dll would fail to (un)register CLSID_VideoProcessorMFT when run manually with regsvr32. The bug occurs because __wine_(un)register_resources() in winecrt0 is built with -mabi=ms and thus expects its first argument in %rcx, but winegstreamer passes it in %rdi. Fixes: d401837994a31277103042fbe091e364c2fa55ea Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I didn't test explicitly that d40183799 is the first broken commit, but unless something else broke this earlier, it logically should be. Based on e.g. 1f6681f47 and 60df3b14b I'm guessing this is the preferred fix. An alternative fix would of course be not to use MSVCRTFLAGS if we are not cross-compiling. I don't understand why that's not the preferred fix, given that MSVCRTFLAGS seems to append nothing that would make a difference if we were not cross-compiling (unless -fno-builtin makes a difference, but I can't tell why it would). dlls/winecrt0/register.c | 4 ++-- include/rpcproxy.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 8c15d1be721..cb5e7a50f76 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -94,7 +94,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } -HRESULT __wine_register_resources( HMODULE module ) +HRESULT __cdecl __wine_register_resources( HMODULE module ) { struct reg_info info; @@ -106,7 +106,7 @@ HRESULT __wine_register_resources( HMODULE module ) return info.result; } -HRESULT __wine_unregister_resources( HMODULE module ) +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) { struct reg_info info; diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 4d2c63e62d6..5b184329bd4 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -203,8 +203,8 @@ RPCRTAPI HRESULT RPC_ENTRY RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); -HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; -HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __cdecl __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \ -- 2.25.0

1 0

[PATCH 1/3] user32: Move ChangeDisplaySettingsExW() common code to user32.
by Zhiyi Zhang Feb. 10, 2020

Feb. 10, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 110 +++++++++++++++++++++++++++++++++++- dlls/winemac.drv/display.c | 36 ------------ dlls/winex11.drv/settings.c | 71 +---------------------- 3 files changed, 111 insertions(+), 106 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2ff5b2f909..2523df6bf2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3200,6 +3200,71 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h return ret; } +#define _X_FIELD(prefix, bits) \ + if ((fields) & prefix##_##bits) \ + { \ + p += sprintf(p, "%s%s", first ? "" : ",", #bits); \ + first = FALSE; \ + } + +static const CHAR *_CDS_flags(DWORD fields) +{ + BOOL first = TRUE; + CHAR buf[128]; + CHAR *p = buf; + + _X_FIELD(CDS, UPDATEREGISTRY) + _X_FIELD(CDS, TEST) + _X_FIELD(CDS, FULLSCREEN) + _X_FIELD(CDS, GLOBAL) + _X_FIELD(CDS, SET_PRIMARY) + _X_FIELD(CDS, RESET) + _X_FIELD(CDS, SETRECT) + _X_FIELD(CDS, NORESET) + + *p = 0; + return wine_dbg_sprintf("%s", buf); +} + +static const CHAR *_DM_fields(DWORD fields) +{ + BOOL first = TRUE; + CHAR buf[128]; + CHAR *p = buf; + + _X_FIELD(DM, BITSPERPEL) + _X_FIELD(DM, PELSWIDTH) + _X_FIELD(DM, PELSHEIGHT) + _X_FIELD(DM, DISPLAYFLAGS) + _X_FIELD(DM, DISPLAYFREQUENCY) + _X_FIELD(DM, POSITION) + _X_FIELD(DM, DISPLAYORIENTATION) + + *p = 0; + return wine_dbg_sprintf("%s", buf); +} + +#undef _X_FIELD + +static void trace_devmode(const DEVMODEW *devmode) +{ + TRACE("dmFields=%s ", _DM_fields(devmode->dmFields)); + if (devmode->dmFields & DM_BITSPERPEL) + TRACE("dmBitsPerPel=%u ", devmode->dmBitsPerPel); + if (devmode->dmFields & DM_PELSWIDTH) + TRACE("dmPelsWidth=%u ", devmode->dmPelsWidth); + if (devmode->dmFields & DM_PELSHEIGHT) + TRACE("dmPelsHeight=%u ", devmode->dmPelsHeight); + if (devmode->dmFields & DM_DISPLAYFREQUENCY) + TRACE("dmDisplayFrequency=%u ", devmode->dmDisplayFrequency); + if (devmode->dmFields & DM_POSITION) + TRACE("dmPosition=(%d,%d) ", devmode->u1.s2.dmPosition.x, devmode->u1.s2.dmPosition.y); + if (devmode->dmFields & DM_DISPLAYFLAGS) + TRACE("dmDisplayFlags=%#x ", devmode->u2.dmDisplayFlags); + if (devmode->dmFields & DM_DISPLAYORIENTATION) + TRACE("dmDisplayOrientation=%u ", devmode->u1.s2.dmDisplayOrientation); + TRACE("\n"); +} /*********************************************************************** * ChangeDisplaySettingsExW (USER32.@) @@ -3207,7 +3272,50 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - return USER_Driver->pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam ); + BOOL def_mode = TRUE; + DEVMODEW dm; + + TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); + TRACE("flags=%s\n", _CDS_flags(flags)); + + if (devmode) + { + trace_devmode(devmode); + + /* This is the minimal dmSize that XP accepts */ + if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) + return DISP_CHANGE_FAILED; + + if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) + { + if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || + ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || + ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || + ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) + def_mode = FALSE; + } + } + + if (def_mode) + { + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) + { + ERR("Default mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + TRACE("Return to original display mode\n"); + devmode = &dm; + } + + if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) + { + WARN("devmode doesn't specify the resolution: %#x\n", devmode->dmFields); + return DISP_CHANGE_BADMODE; + } + + return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b58a9d172b..4c610c4573 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -755,8 +755,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, { LONG ret = DISP_CHANGE_BADMODE; int bpp; - DEVMODEW dm; - BOOL def_mode = TRUE; struct macdrv_display *displays; int num_displays; CFArrayRef display_modes; @@ -770,40 +768,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); - if (devmode) - { - /* this is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; - - if (devmode->dmSize >= FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(devmode->dmFields)) - { - if (((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel) || - ((devmode->dmFields & DM_PELSWIDTH) && devmode->dmPelsWidth) || - ((devmode->dmFields & DM_PELSHEIGHT) && devmode->dmPelsHeight) || - ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency)) - def_mode = FALSE; - } - } - - if (def_mode) - { - if (!macdrv_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) - { - ERR("Default mode not found!\n"); - return DISP_CHANGE_BADMODE; - } - - TRACE("Return to original display mode\n"); - devmode = &dm; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); - return DISP_CHANGE_BADMODE; - } - if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a4f172037c..24644db620 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -311,30 +311,6 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo return FALSE; } -#define _X_FIELD(prefix, bits) if ((fields) & prefix##_##bits) {p+=sprintf(p, "%s%s", first ? "" : ",", #bits); first=FALSE;} -static const char * _CDS_flags(DWORD fields) -{ - BOOL first = TRUE; - char buf[128]; - char *p = buf; - _X_FIELD(CDS,UPDATEREGISTRY);_X_FIELD(CDS,TEST);_X_FIELD(CDS,FULLSCREEN); - _X_FIELD(CDS,GLOBAL);_X_FIELD(CDS,SET_PRIMARY);_X_FIELD(CDS,RESET); - _X_FIELD(CDS,SETRECT);_X_FIELD(CDS,NORESET); - *p = 0; - return wine_dbg_sprintf("%s", buf); -} -static const char * _DM_fields(DWORD fields) -{ - BOOL first = TRUE; - char buf[128]; - char *p = buf; - _X_FIELD(DM,BITSPERPEL);_X_FIELD(DM,PELSWIDTH);_X_FIELD(DM,PELSHEIGHT); - _X_FIELD(DM,DISPLAYFLAGS);_X_FIELD(DM,DISPLAYFREQUENCY);_X_FIELD(DM,POSITION); - *p = 0; - return wine_dbg_sprintf("%s", buf); -} -#undef _X_FIELD - /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -342,57 +318,14 @@ static const char * _DM_fields(DWORD fields) LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - DWORD i, dwBpp = 0; - DEVMODEW dm; - BOOL def_mode = TRUE; char bpp_buffer[16], freq_buffer[18]; - - TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); - TRACE("flags=%s\n",_CDS_flags(flags)); - if (devmode) - { - /* this is the minimal dmSize that XP accepts */ - if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_FAILED; - - TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields)); - TRACE("width=%d height=%d bpp=%d freq=%d (%s)\n", - devmode->dmPelsWidth,devmode->dmPelsHeight, - devmode->dmBitsPerPel,devmode->dmDisplayFrequency, handler_name); - - dwBpp = devmode->dmBitsPerPel; - if (devmode->dmFields & DM_BITSPERPEL) def_mode &= !dwBpp; - if (devmode->dmFields & DM_PELSWIDTH) def_mode &= !devmode->dmPelsWidth; - if (devmode->dmFields & DM_PELSHEIGHT) def_mode &= !devmode->dmPelsHeight; - if (devmode->dmFields & DM_DISPLAYFREQUENCY) def_mode &= !devmode->dmDisplayFrequency; - } - - if (def_mode || !dwBpp) - { - if (!X11DRV_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) - { - ERR("Default mode not found!\n"); - return DISP_CHANGE_BADMODE; - } - if (def_mode) - { - TRACE("Return to original display mode (%s)\n", handler_name); - devmode = &dm; - } - dwBpp = dm.dmBitsPerPel; - } - - if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) - { - WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); - return DISP_CHANGE_BADMODE; - } + DWORD i; for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) { - if (dwBpp != dd_modes[i].bpp) + if (devmode->dmBitsPerPel != dd_modes[i].bpp) continue; } if (devmode->dmFields & DM_PELSWIDTH) -- 2.20.1

3 2

[PATCH 1/5] setupapi/tests: Add some tests for COM self-registration.
by Zebediah Figura Feb. 10, 2020

Feb. 10, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/setupapi/tests/Makefile.in | 6 ++- dlls/setupapi/tests/install.c | 90 ++++++++++++++++++++++++++++++++ dlls/setupapi/tests/selfreg.c | 50 ++++++++++++++++++ dlls/setupapi/tests/selfreg.spec | 2 + 4 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 dlls/setupapi/tests/selfreg.c create mode 100644 dlls/setupapi/tests/selfreg.spec diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 83f751c7dbd..df7c6687875 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = setupapi.dll -IMPORTS = advapi32 cabinet setupapi shell32 uuid user32 +IMPORTS = advapi32 cabinet ole32 setupapi shell32 uuid user32 + +selfreg_IMPORTS = uuid advapi32 ole32 SOURCES = \ coinst.c \ @@ -11,6 +13,8 @@ SOURCES = \ misc.c \ parser.c \ query.c \ + selfreg.c \ + selfreg.spec \ setupapi.rc \ setupcab.c \ stringtable.c diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fd10fd91332..b918bb21f60 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -54,6 +54,24 @@ static char CURR_DIR[MAX_PATH]; * Helpers */ +static void load_resource(const char *name, const char *filename) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", filename, GetLastError()); + + res = FindResourceA(NULL, name, "TESTDLL"); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; @@ -2040,6 +2058,77 @@ static void test_start_copy(void) delete_file("dst/"); } +static void test_register_dlls(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "RegisterDlls=register_section\n" + "UnregisterDlls=register_section\n" + "[register_section]\n" + "40000,,winetest_selfreg.dll,1\n"; + + void *context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + char path[MAX_PATH]; + HRESULT hr; + HINF hinf; + BOOL ret; + HKEY key; + LONG l; + + create_inf_file("test.inf", inf_data); + sprintf(path, "%s\\test.inf", CURR_DIR); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#x.\n", GetLastError()); + + load_resource("selfreg.dll", "winetest_selfreg.dll"); + ret = SetupSetDirectoryIdA(hinf, 40000, CURR_DIR); + ok(ret, "Failed to set directory ID, error %u.\n", GetLastError()); + + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + todo_wine ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(!l, "Got error %u.\n", l); + RegCloseKey(key); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#x.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + ok(l == ERROR_FILE_NOT_FOUND, "Got error %u.\n", l); + + CoUninitialize(); + + SetupCloseInfFile(hinf); + ret = DeleteFileA("test.inf"); + ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); + ret = DeleteFileA("winetest_selfreg.dll"); + ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); +} + START_TEST(install) { char temp_path[MAX_PATH], prev_path[MAX_PATH]; @@ -2069,6 +2158,7 @@ START_TEST(install) test_close_queue(); test_install_file(); test_start_copy(); + test_register_dlls(); UnhookWindowsHookEx(hhook); diff --git a/dlls/setupapi/tests/selfreg.c b/dlls/setupapi/tests/selfreg.c new file mode 100644 index 00000000000..f687990f3bc --- /dev/null +++ b/dlls/setupapi/tests/selfreg.c @@ -0,0 +1,50 @@ +/* + * DLL for testing COM self-registration + * + * Copyright 2020 Zebediah Figura 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 + */ + +#define COBJMACROS +#include "msxml.h" + +HRESULT WINAPI DllRegisterServer(void) +{ + IUnknown *unk; + HKEY key; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegCreateKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key); + RegCloseKey(key); + IUnknown_Release(unk); + } + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + IUnknown *unk; + + if (CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk) == S_OK) + { + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg"); + IUnknown_Release(unk); + } + return S_OK; +} diff --git a/dlls/setupapi/tests/selfreg.spec b/dlls/setupapi/tests/selfreg.spec new file mode 100644 index 00000000000..0f9b07355f7 --- /dev/null +++ b/dlls/setupapi/tests/selfreg.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() -- 2.25.0

1 4

[PATCH 1/5] d3d9: Retrieve the vertex shader from the primary stateblock.
by Zebediah Figura Feb. 10, 2020

Feb. 10, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d5bc77ed7..c95e1a003e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3524,7 +3524,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->vs)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface; -- 2.25.0

4 10

[PATCH 1/4] hid: Add HidP_GetLinkCollectionNodes stub.
by Rémi Bernon Feb. 10, 2020

Feb. 10, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 8 ++++++++ include/ddk/hidpi.h | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b50e04d197f..b8e29fef16a 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -22,7 +22,7 @@ @ stdcall HidP_GetCaps(ptr ptr) @ stdcall HidP_GetData(long ptr ptr ptr ptr long) @ stub HidP_GetExtendedAttributes -@ stub HidP_GetLinkCollectionNodes +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) @ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) @ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 9d631912c85..5f18f57dd93 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -927,3 +927,11 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U return rc; } + +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, + ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + TRACE("stub (%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 042c84dd1c5..51d61ea8541 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -175,6 +175,19 @@ typedef struct _HIDP_DATA { } DUMMYUNIONNAME; } HIDP_DATA, *PHIDP_DATA; +typedef struct _HIDP_LINK_COLLECTION_NODE { + USAGE LinkUsage; + USAGE LinkUsagePage; + USHORT Parent; + USHORT NumberOfChildren; + USHORT NextSibling; + USHORT FirstChild; + ULONG CollectionType : 8; + ULONG IsAlias : 1; + ULONG Reserved : 23; + PVOID UserContext; +} HIDP_LINK_COLLECTION_NODE, *PHIDP_LINK_COLLECTION_NODE; + typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES) (VOID *Context, CHAR *NewScanCodes, ULONG Length); @@ -196,6 +209,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE Usa NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, ULONG *DataLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11 -- 2.25.0

2 5

[PATCH] gdiplus: Make GdipGetNearestColor print FIXME only if indexed bitmap is associated with the graphics object.
by Dmitry Timoshkov Feb. 10, 2020

Feb. 10, 2020

This avoids printing walls of FIXMEs running many .net graphics applications. I've added quite a bit of tests for various bitmap formats associated with the graphics object (manually created and created from GDI bitmaps, with and without explicitly assigned palette, with different colors (with alpha 0-255)), and GdipGetNearestColor() always returns unmodified color. So, it's better to limit printing a FIXME only for graphics objects with an indexed bitmap. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/graphics.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c52fa65445..8f3272b281 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4775,7 +4775,7 @@ GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics *graphics, /* FIXME: Need to handle color depths less than 24bpp */ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) { - FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + TRACE("(%p, %p)\n", graphics, argb); if(!graphics || !argb) return InvalidParameter; @@ -4783,6 +4783,13 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; + if (graphics->image->type == ImageTypeBitmap) + { + GpBitmap *bitmap = (GpBitmap *)graphics->image; + if (IsIndexedPixelFormat(bitmap->format)) + FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); + } + return Ok; } -- 2.20.1

2 1

[PATCH] libwine: Add WINEUSER environment variable
by Myah Caron Feb. 10, 2020

Feb. 10, 2020

This environment variable is useful in a few cases: * If a user would rather not use their own username in the prefix. * If a user wants multiple users in a wine prefix (e.g. as separate profiles for programs). * If the prefix was created with proton, which replaces the username with steamuser, this allows the data under the home directory to be usable under vanilla wine without needing symlinks or renaming the directory. * Similarly, this allows prefixes created under a different username (e.g. transferred from a different system) to be used. Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- libs/wine/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 2a3314cbfd..d05f021267 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -263,14 +263,14 @@ static void init_paths(void) struct stat st; const char *home = getenv( "HOME" ); - const char *user = NULL; + const char *user = getenv( "WINEUSER" ); const char *prefix = getenv( "WINEPREFIX" ); char uid_str[32]; struct passwd *pwd = getpwuid( getuid() ); if (pwd) { - user = pwd->pw_name; + if (!user) user = pwd->pw_name; if (!home) home = pwd->pw_dir; } if (!user) -- 2.25.0

3 3

[PATCH] d3d9: Return a stub interface from Direct3DShaderValidatorCreate9().
by Henri Verbeet Feb. 10, 2020

Feb. 10, 2020

From: Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46735 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 178279. dlls/d3d9/d3d9_main.c | 124 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 66 +++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 21df2a34cd2..75e627dd765 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -75,18 +75,124 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E return D3D_OK; } -/******************************************************************* - * Direct3DShaderValidatorCreate9 (D3D9.@) +/* The callback is called on any error encountered during validation, including + * improper IDirect3DShaderValidator9 method calls. + * - "file" and "line" are passed through directly from Instruction(). "line" + * is provably 32-bit, as 64-bit values passed to Instruction() will be + * truncated. + * - "arg3" has been observed to be at least 0, 2, and 6. The integer size is + * not known. + * - "message_id" is a numeric error code. fxc.exe adds 5000 before printing + * it. The integer size is not known. + * - "context" is passed through directly from Begin(). * - * No documentation available for this function. - * SDK only says it is internal and shouldn't be used. - */ -void* WINAPI Direct3DShaderValidatorCreate9(void) + * Improper calls to IDirect3DShaderValidator9 methods, or other errors not + * generated by specific Instruction() calls, yield NULL as the file, and + * either 0 or -1 as the line. + * + * The callback return type is not known, but programs (fxc.exe, The Sims 2) + * seem to consistently return 0. + * + * The interface and method names below are derived from the messages that + * native d3d9 prints on said improper method calls. + * + * Calls to Begin(), Instruction(), End() have been observed to return S_OK and + * E_FAIL. E_FAIL is not always returned if an error message is handed to the + * callback. */ + +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +static HRESULT WINAPI shader_validator_QueryInterface(IDirect3DShaderValidator9 *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI shader_validator_AddRef(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 2; +} + +static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 1; +} + +/* The size and type of the third argument is not known. The Sims 2 passes 0; + * fxc.exe passes 1. */ +static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3) +{ + FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); + + return S_OK; +} + +/* - "file" and "line" are passed directly through to the callback. + * - "tokens" comprises a single instruction; the caller must determine its + * length. + * - "token_count" is in DWORDs. */ +static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count) +{ + FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", + iface, debugstr_a(file), line, tokens, token_count); + + return S_OK; +} + +static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface) +{ + FIXME("iface %p, stub!\n", iface); + + return S_OK; +} + +static const struct IDirect3DShaderValidator9Vtbl shader_validator_vtbl = +{ + shader_validator_QueryInterface, + shader_validator_AddRef, + shader_validator_Release, + shader_validator_Begin, + shader_validator_Instruction, + shader_validator_End, +}; + +static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl}; + +IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void) { - static int once; + TRACE("Returning validator %p.\n", &shader_validator); - if (!once++) FIXME("stub\n"); - return NULL; + return &shader_validator; } /*********************************************************************** diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 156cb188f05..8c1ebc1719c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -53,6 +53,8 @@ struct device_desc static DEVMODEW registry_mode; +static void *(WINAPI *Direct3DShaderValidatorCreate9)(void); + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ @@ -13447,8 +13449,69 @@ static void test_multi_adapter(void) IDirect3D9_Release(d3d); } +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, + DWORD_PTR message_id, const char *message, void *context) +{ + ok(0, "Unexpected call.\n"); + return S_OK; +} + +static void test_shader_validator(void) +{ + IDirect3DShaderValidator9 *validator; + ULONG refcount; + HRESULT hr; + + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, NULL, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[0], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[1], 3); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[4], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[8], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[12], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[16], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[20], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); +} + START_TEST(device) { + HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); WNDCLASSA wc = {0}; IDirect3D9 *d3d9; DEVMODEW current_mode; @@ -13476,6 +13539,8 @@ START_TEST(device) wc.lpszClassName = "d3d9_test_wc"; RegisterClassA(&wc); + Direct3DShaderValidatorCreate9 = (void *)GetProcAddress(d3d9_handle, "Direct3DShaderValidatorCreate9"); + test_get_set_vertex_declaration(); test_get_declaration(); test_fvf_decl_conversion(); @@ -13575,6 +13640,7 @@ START_TEST(device) test_vertex_buffer_read_write(); test_get_display_mode(); test_multi_adapter(); + test_shader_validator(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.11.0

2 1

[PATCH 1/2] wined3d: Support AMD alpha to coverage state.
by Paul Gofman Feb. 10, 2020

Feb. 10, 2020

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/state.c | 21 +++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 859f3e5f1f..b4991d4e5e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27100,7 +27100,7 @@ static void test_alpha_to_coverage(void) colour = get_readback_color(&rb, 64, 64); /* Nvidia is probably using some proprietary algorithm for averaging sample colour values. */ - todo_wine ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cc7afe5165..d4bd0d25ca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12173,6 +12173,8 @@ static void glsl_vertex_pipe_pointsize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; + + state_alpha_to_coverage(context, state, state_id); } static void glsl_vertex_pipe_pointscale(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87e1ca4bac..97fab9cd40 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1507,6 +1507,25 @@ static void state_psizemin_arb(struct wined3d_context *context, const struct win checkGLcall("glPointParameterfARB(...)"); } +void state_alpha_to_coverage(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + + if (!gl_info->supported[ARB_MULTISAMPLE]) + return; + + if (state->render_states[WINED3D_RS_POINTSIZE] == WINED3D_ALPHA_TO_COVERAGE_ENABLE) + { + gl_info->gl_ops.gl.p_glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE)"); + } + else if (state->render_states[WINED3D_RS_POINTSIZE] == WINED3D_ALPHA_TO_COVERAGE_DISABLE) + { + gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); + checkGLcall("glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE)"); + } +} + static void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; @@ -1532,6 +1551,8 @@ static void state_pscale(struct wined3d_context *context, const struct wined3d_s gl_info->gl_ops.gl.p_glPointSize(max(pointsize, FLT_MIN)); checkGLcall("glPointSize(...);"); + + state_alpha_to_coverage(context, state, state_id); } static void state_debug_monitor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b9b342441..8e595db65d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -76,6 +76,9 @@ #define WINED3D_MAX_DIRTY_REGION_COUNT 7 +#define WINED3D_ALPHA_TO_COVERAGE_ENABLE MAKEFOURCC('A','2','M','1') +#define WINED3D_ALPHA_TO_COVERAGE_DISABLE MAKEFOURCC('A','2','M','0') + struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; @@ -4608,6 +4611,8 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_shademode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; +void state_alpha_to_coverage(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; enum wined3d_primitive_type d3d_primitive_type_from_gl(GLenum primitive_type) DECLSPEC_HIDDEN; -- 2.24.1

2 4

[PATCH 1/5] wined3d: Initialise outputs in wined3d_init().
by Zhiyi Zhang Feb. 10, 2020

Feb. 10, 2020

Place all outputs in struct wined3d so that D3D9 and older versions of D3D can index into outputs as adapters because older versions of D3D treat outputs as adapters. And put outputs to the adapters they belong to so that DXGI can find the outputs of an adapter as well. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 82 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 12 +++-- 3 files changed, 71 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7167f208e9..3d676f7e10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -26,6 +26,7 @@ #include "wined3d_private.h" #include "winternl.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -155,7 +156,6 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { - wined3d_output_cleanup(&adapter->output); heap_free(adapter->formats); } @@ -168,6 +168,32 @@ ULONG CDECL wined3d_incref(struct wined3d *wined3d) return refcount; } +static void wined3d_cleanup(struct wined3d *wined3d) +{ + unsigned int i; + + if (wined3d->outputs) + { + for (i = 0; i < wined3d->output_count; ++i) + wined3d_output_cleanup(&wined3d->outputs[i]); + } + + if (wined3d->adapters) + { + for (i = 0; i < wined3d->adapter_count; ++i) + { + struct wined3d_adapter *adapter = wined3d->adapters[i]; + if (!adapter) + break; + + adapter->adapter_ops->adapter_destroy(adapter); + } + } + + heap_free(wined3d->outputs); + heap_free(wined3d->adapters); +} + ULONG CDECL wined3d_decref(struct wined3d *wined3d) { ULONG refcount = InterlockedDecrement(&wined3d->ref); @@ -176,14 +202,7 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) if (!refcount) { - unsigned int i; - - for (i = 0; i < wined3d->adapter_count; ++i) - { - struct wined3d_adapter *adapter = wined3d->adapters[i]; - - adapter->adapter_ops->adapter_destroy(adapter); - } + wined3d_cleanup(wined3d); heap_free(wined3d); } @@ -920,7 +939,7 @@ struct wined3d_output * CDECL wined3d_get_adapter_output(const struct wined3d *w if (adapter_idx >= wined3d->adapter_count) return NULL; - return &wined3d->adapters[adapter_idx]->output; + return &wined3d->adapters[adapter_idx]->outputs[0]; } /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes @@ -2811,7 +2830,6 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; - HRESULT hr; adapter->ordinal = ordinal; @@ -2819,16 +2837,10 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->device_name, display_device.DeviceName); - if (FAILED(hr = wined3d_output_init(&adapter->output, adapter->device_name))) - { - ERR("Failed to initialise output, hr %#x.\n", hr); - return FALSE; - } if (!AllocateLocallyUniqueId(&adapter->luid)) { ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - wined3d_output_cleanup(&adapter->output); return FALSE; } TRACE("Allocated LUID %08x:%08x for adapter %p.\n", @@ -2863,17 +2875,45 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { + HRESULT hr = E_FAIL; + wined3d->ref = 1; wined3d->flags = flags; - TRACE("Initialising adapters.\n"); + TRACE("Initialising adapters and outputs.\n"); + + wined3d->adapter_count = 1; + wined3d->output_count = 1; + + wined3d->adapters = heap_calloc(wined3d->adapter_count, sizeof(*wined3d->adapters)); + if (!wined3d->adapters) + goto fail; + + wined3d->outputs = heap_calloc(wined3d->output_count, sizeof(*wined3d->outputs)); + if (!wined3d->outputs) + goto fail; if (!(wined3d->adapters[0] = wined3d_adapter_create(0, flags))) { WARN("Failed to create adapter.\n"); - return E_FAIL; + goto fail; } - wined3d->adapter_count = 1; - return WINED3D_OK; + wined3d->adapters[0]->outputs = wined3d->outputs; + wined3d->adapters[0]->output_count = 1; + if (FAILED(hr = wined3d_output_init(&wined3d->outputs[0], wined3d->adapters[0]->device_name))) + { + WARN("Failed to create output, hr %#x.\n", hr); + goto fail; + } + + TRACE("adapter count: %u, output count: %u.\n", wined3d->adapter_count, wined3d->output_count); + hr = WINED3D_OK; +fail: + if (FAILED(hr)) + { + ERR("Initialising wined3d failed!\n"); + wined3d_cleanup(wined3d); + } + return hr; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 05684aeb3b..3e20028b81 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -126,7 +126,7 @@ struct wined3d * CDECL wined3d_create(DWORD flags) struct wined3d *object; HRESULT hr; - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d, adapters[1])))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate wined3d object memory.\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52b..c7ace57324 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2893,6 +2893,7 @@ struct wined3d_adapter_ops struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; +/* The output structure, represents a video card output */ struct wined3d_output { D3DKMT_HANDLE kmt_adapter; @@ -2900,7 +2901,7 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; -/* The adapter structure */ +/* The adapter structure, represents a video card */ struct wined3d_adapter { unsigned int ordinal; @@ -2910,7 +2911,10 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; - struct wined3d_output output; + + struct wined3d_output *outputs; /* Outputs in this adapter */ + unsigned int output_count; + UINT64 vram_bytes_used; GUID driver_uuid; GUID device_uuid; @@ -3117,7 +3121,9 @@ struct wined3d LONG ref; unsigned int flags; unsigned int adapter_count; - struct wined3d_adapter *adapters[1]; + struct wined3d_adapter **adapters; + unsigned int output_count; + struct wined3d_output *outputs; /* Outputs of all adapters, d3d8/9 treat outputs as adapters */ }; BOOL wined3d_filter_messages(HWND window, BOOL filter) DECLSPEC_HIDDEN; -- 2.20.1

2 2