September 2019 - Wine-Commits

Francois Gouget : testbot/Engine: Kill the child before forking a new one for sacrifices.
by Alexandre Julliard Sept. 23, 2019

Sept. 23, 2019

Module: tools Branch: master Commit: a2dbe176c15c58b4c6c8fdfe53ba285129b9a963 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a2dbe176c15c58b4c6c8fdf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Sep 21 20:33:32 2019 +0200 testbot/Engine: Kill the child before forking a new one for sacrifices. VM::Run() now checks that no process is actively using the VM before starting the new one. Killing the current process makes more sense anyway and could help ensure it won't interfere with the new one by sending TestAgent commands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index e9a3ff9..7375337 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -765,6 +765,7 @@ sub _SacrificeVM($$$) $Host->{$Victim->Status}--; $Host->{dirty}++; $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); + $Victim->KillChild(); $Victim->RunPowerOff(); return 1; }

1 0

Jacek Caban : scrobj: Suport scriptlet registration.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 2974c8e574929ccc371d75a1cb58bbe021a653b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2974c8e574929ccc371d75a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:23:15 2019 +0200 scrobj: Suport scriptlet registration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 168 ++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 18 +++-- 2 files changed, 180 insertions(+), 6 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 6de0e8ce01..e1dc6182f3 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Nikolay Sivov + * Copyright 2019 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -679,6 +680,151 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto return S_OK; } +static HRESULT register_scriptlet(struct scriptlet_factory *factory) +{ + HKEY key, clsid_key, obj_key; + LSTATUS status; + HRESULT hres; + + if (factory->classid_str) + { + WCHAR *url; + + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"CLSID", &clsid_key); + if (status) return E_ACCESSDENIED; + + status = RegCreateKeyW(clsid_key, factory->classid_str, &obj_key); + RegCloseKey(clsid_key); + if (status) return E_ACCESSDENIED; + + hres = IMoniker_GetDisplayName(factory->moniker, NULL, NULL, &url); + if (FAILED(hres)) + { + RegCloseKey(obj_key); + return hres; + } + status = RegCreateKeyW(obj_key, L"ScriptletURL", &key); + if (!status) + { + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)url, + (wcslen(url) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + CoTaskMemFree(url); + + if (factory->description) + status = RegSetValueExW(obj_key, NULL, 0, REG_SZ, (BYTE*)factory->description, + (wcslen(factory->description) + 1) * sizeof(WCHAR)); + + if (!status) + { + status = RegCreateKeyW(obj_key, L"InprocServer32", &key); + if (!status) + { + WCHAR str[MAX_PATH]; + GetModuleFileNameW(scrobj_instance, str, MAX_PATH); + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)str, (wcslen(str) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + } + + if (!status && factory->versioned_progid) + { + status = RegCreateKeyW(obj_key, L"ProgID", &key); + if (!status) + { + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->versioned_progid, + (wcslen(factory->versioned_progid) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + } + + if (!status && factory->progid) + { + status = RegCreateKeyW(obj_key, L"VersionIndependentProgID", &key); + if (!status) + { + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->progid, + (wcslen(factory->progid) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + } + + RegCloseKey(obj_key); + if (status) return E_ACCESSDENIED; + } + + if (factory->progid) + { + status = RegCreateKeyW(HKEY_CLASSES_ROOT, factory->progid, &key); + if (status) return E_ACCESSDENIED; + + if (factory->description) + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->description, + (wcslen(factory->description) + 1) * sizeof(WCHAR)); + + if (!status && factory->classid_str) + { + status = RegCreateKeyW(key, L"CLSID", &clsid_key); + if (!status) + { + status = RegSetValueExW(clsid_key, NULL, 0, REG_SZ, (BYTE*)factory->classid_str, + (wcslen(factory->classid_str) + 1) * sizeof(WCHAR)); + RegCloseKey(clsid_key); + } + } + + RegCloseKey(key); + if (status) return E_ACCESSDENIED; + } + + if (factory->versioned_progid) + { + status = RegCreateKeyW(HKEY_CLASSES_ROOT, factory->versioned_progid, &key); + if (status) return E_ACCESSDENIED; + + if (factory->description) + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->description, + (wcslen(factory->description) + 1) * sizeof(WCHAR)); + + if (!status && factory->classid_str) + { + status = RegCreateKeyW(key, L"CLSID", &clsid_key); + if (!status) + { + status = RegSetValueExW(clsid_key, NULL, 0, REG_SZ, (BYTE*)factory->classid_str, + (wcslen(factory->classid_str) + 1) * sizeof(WCHAR)); + RegCloseKey(clsid_key); + } + } + + RegCloseKey(key); + if (status) return E_ACCESSDENIED; + } + + return S_OK; +} + +static HRESULT unregister_scriptlet(struct scriptlet_factory *factory) +{ + LSTATUS status; + + if (factory->classid_str) + { + HKEY clsid_key; + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"CLSID", &clsid_key); + if (!status) + { + RegDeleteTreeW(clsid_key, factory->classid_str); + RegCloseKey(clsid_key); + } + } + + if (factory->progid) RegDeleteTreeW(HKEY_CLASSES_ROOT, factory->progid); + if (factory->versioned_progid) RegDeleteTreeW(HKEY_CLASSES_ROOT, factory->versioned_progid); + return S_OK; +} + struct scriptlet_typelib { IGenScriptletTLib IGenScriptletTLib_iface; @@ -1020,6 +1166,7 @@ HRESULT WINAPI DllUnregisterServer(void) */ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) { + struct scriptlet_factory *factory; HRESULT hres; if (install) @@ -1030,8 +1177,25 @@ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) else if (!arg) return DllUnregisterServer(); - FIXME("argument %s not supported\n", debugstr_w(arg)); - return E_NOTIMPL; + hres = create_scriptlet_factory(arg, &factory); + if (SUCCEEDED(hres)) + { + if (factory->have_registration) + { + if (install) + hres = register_scriptlet(factory); + else + hres = unregister_scriptlet(factory); + } + else + { + FIXME("No registration info\n"); + hres = E_FAIL; + } + IClassFactory_Release(&factory->IClassFactory_iface); + } + + return hres; } static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index bfd864dbee..259417e60e 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -730,7 +730,6 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) CHECK_CALLED(SetScriptState_UNINITIALIZED); todo_wine CHECK_CALLED(Close); - todo_wine ok(hres == S_OK, "DllInstall failed: %08x\n", hres); if (FAILED(hres)) return; @@ -769,10 +768,7 @@ static void test_create_object(void) hres = CoGetClassObject(&CLSID_WineTest, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf); - todo_wine ok(hres == S_OK, "Could not get class factory: %08x\n", hres); - if (FAILED(hres)) - return; parse_flags = SCRIPTTEXT_ISPERSISTENT | SCRIPTTEXT_ISVISIBLE; @@ -790,20 +786,34 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Clone); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); + todo_wine ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); + todo_wine CHECK_CALLED(Clone); + todo_wine CHECK_CALLED(CreateInstance); + todo_wine CHECK_CALLED(QI_IActiveScriptParse); + todo_wine CHECK_CALLED(InitNew); + todo_wine CHECK_CALLED(SetScriptSite); + todo_wine CHECK_CALLED(AddNamedItem_scriptlet); + todo_wine CHECK_CALLED(AddNamedItem_globals); + todo_wine CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); + todo_wine CHECK_CALLED(GetDispID_wtTest); + todo_wine CHECK_CALLED(SetScriptState_STARTED); + todo_wine CHECK_CALLED(ParseScriptText); + if (FAILED(hres)) + return; hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres);

1 0

Jacek Caban : scrobj: Create script engine instances for script hosts.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: c052f29c9645eb05bf9c499016c64b94b3d63942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c052f29c9645eb05bf9c4990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:24:04 2019 +0200 scrobj: Create script engine instances for script hosts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 108 +++++++++++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 5 --- 2 files changed, 105 insertions(+), 8 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 4424359d15..710cdfa738 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -26,6 +26,7 @@ #include "olectl.h" #include "rpcproxy.h" #include "activscp.h" +#include "mshtmhst.h" #include "initguid.h" #include "scrobj.h" @@ -37,6 +38,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrobj); +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + static HINSTANCE scrobj_instance; struct scriptlet_member @@ -87,9 +102,15 @@ struct script_host IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; IServiceProvider IServiceProvider_iface; + LONG ref; struct list entry; + WCHAR *language; + + IActiveScript *active_script; + IActiveScriptParse *parser; + BOOL cloned; }; typedef enum tid_t @@ -409,9 +430,71 @@ static struct script_host *find_script_host(struct list *hosts, const WCHAR *lan return NULL; } -static HRESULT create_script_host(const WCHAR *language, struct list *hosts) +static HRESULT init_script_host(struct script_host *host, IActiveScript *clone) +{ + HRESULT hres; + + if (!clone) + { + IClassFactoryEx *factory_ex; + IClassFactory *factory; + IUnknown *unk; + CLSID clsid; + + if (FAILED(hres = CLSIDFromProgID(host->language, &clsid))) + { + WARN("Could not find script engine for %s\n", debugstr_w(host->language)); + return hres; + } + + hres = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, + &IID_IClassFactory, (void**)&factory); + if (FAILED(hres)) return hres; + + hres = IClassFactory_QueryInterface(factory, &IID_IClassFactoryEx, (void**)&factory_ex); + if (SUCCEEDED(hres)) + { + FIXME("Use IClassFactoryEx\n"); + IClassFactoryEx_Release(factory_ex); + } + + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IUnknown, (void**)&unk); + IClassFactory_Release(factory); + if (FAILED(hres)) return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&host->active_script); + IUnknown_Release(unk); + if (FAILED(hres)) return hres; + } + else + { + IActiveScript_AddRef(clone); + host->active_script = clone; + host->cloned = TRUE; + } + + hres = IActiveScript_QueryInterface(host->active_script, &IID_IActiveScriptParse, (void**)&host->parser); + if (FAILED(hres)) return hres; + + if (!clone) + { + hres = IActiveScriptParse_InitNew(host->parser); + if (FAILED(hres)) + { + IActiveScriptParse_Release(host->parser); + host->parser = NULL; + return hres; + } + } + + return IActiveScript_SetScriptSite(host->active_script, &host->IActiveScriptSite_iface); +} + +static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_script, struct list *hosts) { + IActiveScript *clone = NULL; struct script_host *host; + HRESULT hres; if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; @@ -426,8 +509,16 @@ static HRESULT create_script_host(const WCHAR *language, struct list *hosts) return E_OUTOFMEMORY; } + if (origin_script) + { + hres = IActiveScript_Clone(origin_script, &clone); + if (FAILED(hres)) clone = NULL; + } + list_add_tail(hosts, &host->entry); - return S_OK; + hres = init_script_host(host, clone); + if (clone) IActiveScript_Release(clone); + return hres; } static void detach_script_hosts(struct list *hosts) @@ -436,6 +527,17 @@ static void detach_script_hosts(struct list *hosts) { struct script_host *host = LIST_ENTRY(list_head(hosts), struct script_host, entry); list_remove(&host->entry); + if (host->parser) + { + IActiveScript_Close(host->active_script); + IActiveScriptParse_Release(host->parser); + host->parser = NULL; + } + if (host->active_script) + { + IActiveScript_Release(host->active_script); + host->active_script = NULL; + } IActiveScriptSite_Release(&host->IActiveScriptSite_iface); } } @@ -448,7 +550,7 @@ static HRESULT create_scriptlet_hosts(struct scriptlet_factory *factory, struct LIST_FOR_EACH_ENTRY(script, &factory->scripts, struct scriptlet_script, entry) { if (find_script_host(hosts, script->language)) continue; - hres = create_script_host(script->language, hosts); + hres = create_script_host(script->language, NULL, hosts); if (FAILED(hres)) { detach_script_hosts(hosts); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 259417e60e..d3e5631d05 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -716,19 +716,14 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); hres = pDllInstall(do_register, file_name); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(ParseScriptText); todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); ok(hres == S_OK, "DllInstall failed: %08x\n", hres); if (FAILED(hres))

1 0

Jacek Caban : kernel32/tests: Enable debug break exception race tests on i386 Wine.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 27da4fa4498c3b6e0e46c72a9cdd13b620726e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27da4fa4498c3b6e0e46c72a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:33:53 2019 +0200 kernel32/tests: Enable debug break exception race tests on i386 Wine. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 6b4e68f29f..93d12a56eb 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1357,7 +1357,7 @@ static void test_debugger(const char *argv0) } else win_skip("call_debug_service_code not supported on this architecture\n"); - if (sizeof(loop_code) > 1 && (sizeof(void*) == 8 || broken(1) /* FIXME: broken in Wine */)) + if (sizeof(loop_code) > 1) { memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code));

1 0

Hans Leidekker : wbemprox: Implement Win32_DisplayControllerConfiguration.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 31c0cb48622ae869cfc358be8531821ec1eda7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31c0cb48622ae869cfc358be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 20 13:37:15 2019 +0200 wbemprox: Implement Win32_DisplayControllerConfiguration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47782 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 73 +++++++++++++++++++++++++++++++++++++-------- dlls/wbemprox/tests/query.c | 44 +++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 94f077a7c4..2aca2f8693 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -74,6 +74,9 @@ static const WCHAR class_diskdrivetodiskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; static const WCHAR class_diskpartitionW[] = {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; +static const WCHAR class_displaycontrollerconfigW[] = + {'W','i','n','3','2','_','D','i','s','p','l','a','y','C','o','n','t','r','o','l','l','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; static const WCHAR class_ip4routetableW[] = {'W','i','n','3','2','_','I','P','4','R','o','u','t','e','T','a','b','l','e',0}; static const WCHAR class_logicaldiskW[] = @@ -151,6 +154,8 @@ static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; static const WCHAR prop_binaryrepresentationW[] = {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; +static const WCHAR prop_bitsperpixelW[] = + {'B','i','t','s','P','e','r','P','i','x','e','l',0}; static const WCHAR prop_boolvalueW[] = {'B','o','o','l','V','a','l','u','e',0}; static const WCHAR prop_bootableW[] = @@ -445,6 +450,8 @@ static const WCHAR prop_vendorW[] = {'V','e','n','d','o','r',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_verticalresolutionW[] = + {'V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_videoarchitectureW[] = {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_videomemorytypeW[] = @@ -568,6 +575,14 @@ static const struct column col_diskpartition[] = { prop_startingoffsetW, CIM_UINT64 }, { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_displaycontrollerconfig[] = +{ + { prop_bitsperpixelW, CIM_UINT32 }, + { prop_captionW, CIM_STRING }, + { prop_horizontalresolutionW, CIM_UINT32 }, + { prop_nameW, CIM_STRING|COL_FLAG_KEY }, + { prop_verticalresolutionW, CIM_UINT32 } +}; static const struct column col_ip4routetable[] = { { prop_destinationW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -1030,6 +1045,14 @@ struct record_diskpartition UINT64 startingoffset; const WCHAR *type; }; +struct record_displaycontrollerconfig +{ + UINT32 bitsperpixel; + const WCHAR *caption; + UINT32 horizontalresolution; + const WCHAR *name; + UINT32 verticalresolution; +}; struct record_ip4routetable { const WCHAR *destination; @@ -2699,6 +2722,41 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex return status; } +static UINT32 get_bitsperpixel( UINT *hres, UINT *vres ) +{ + HDC hdc = GetDC( NULL ); + UINT32 ret; + + if (!hdc) return 32; + ret = GetDeviceCaps( hdc, BITSPIXEL ); + *hres = GetDeviceCaps( hdc, HORZRES ); + *vres = GetDeviceCaps( hdc, VERTRES ); + ReleaseDC( NULL, hdc ); + return ret; +} + +static enum fill_status fill_displaycontrollerconfig( struct table *table, const struct expr *cond ) +{ + struct record_displaycontrollerconfig *rec; + UINT row = 0, hres = 1024, vres = 768; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_displaycontrollerconfig *)table->data; + rec->bitsperpixel = get_bitsperpixel( &hres, &vres ); + rec->caption = videocontroller_deviceidW; + rec->horizontalresolution = hres; + rec->name = videocontroller_deviceidW; + rec->verticalresolution = vres; + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_ip4_string( DWORD addr ) { static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; @@ -4250,18 +4308,6 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct return status; } -static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) -{ - HDC hdc = GetDC( NULL ); - UINT32 ret; - - if (!hdc) return 32; - ret = GetDeviceCaps( hdc, BITSPIXEL ); - *hres = GetDeviceCaps( hdc, HORZRES ); - *vres = GetDeviceCaps( hdc, VERTRES ); - ReleaseDC( NULL, hdc ); - return ret; -} static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = @@ -4335,7 +4381,7 @@ done: rec->availability = 3; /* Running or Full Power */ rec->config_errorcode = 0; /* no error */ rec->caption = heap_strdupW( name ); - rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); + rec->current_bitsperpixel = get_bitsperpixel( &hres, &vres ); rec->current_horizontalres = hres; rec->current_refreshrate = 0; /* default refresh rate */ rec->current_scanmode = 2; /* Unknown */ @@ -4380,6 +4426,7 @@ static struct table builtin_classes[] = { class_diskdriveW, C(col_diskdrive), 0, 0, NULL, fill_diskdrive }, { class_diskdrivetodiskpartitionW, C(col_diskdrivetodiskpartition), 0, 0, NULL, fill_diskdrivetodiskpartition }, { class_diskpartitionW, C(col_diskpartition), 0, 0, NULL, fill_diskpartition }, + { class_displaycontrollerconfigW, C(col_displaycontrollerconfig), 0, 0, NULL, fill_displaycontrollerconfig }, { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 81dcd190c4..ee4eac88e9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1713,6 +1713,49 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) +{ + static const WCHAR bitsperpixelW[] = + {'B','i','t','s','P','e','r','P','i','x','e','l',0}; + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; + static const WCHAR horizontalresolutionW[] = + {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','i','s','p','l','a','y','C','o','n','t','r','o','l','l','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; + static const WCHAR verticalresolutionW[] = + {'V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, bitsperpixelW, VT_I4, CIM_UINT32 ); + check_property( obj, captionW, VT_BSTR, CIM_STRING ); + check_property( obj, horizontalresolutionW, VT_I4, CIM_UINT32 ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, verticalresolutionW, VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1752,6 +1795,7 @@ START_TEST(query) test_Win32_ComputerSystem( services ); test_Win32_ComputerSystemProduct( services ); test_Win32_Bios( services ); + test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services );

1 0

Nikolay Sivov : d3d11/tests: Add a test for creating SRV for resource without D3D11_BIND_SHADER_RESOURCE.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 01d2125078e47a71d9a5aac8ec5248b0f6db2178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d2125078e47a71d9a5aac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:35 2019 +0300 d3d11/tests: Add a test for creating SRV for resource without D3D11_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1d7a7c7fe7..97ab9b4487 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4256,6 +4256,17 @@ static void test_create_shader_resource_view(void) ID3D11ShaderResourceView_Release(srview); ID3D11Buffer_Release(buffer); + /* Without D3D11_BIND_SHADER_RESOURCE. */ + buffer = create_buffer(device, 0, 1024, NULL); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11ShaderResourceView_Release(srview); + + ID3D11Buffer_Release(buffer); + if (feature_level >= D3D_FEATURE_LEVEL_11_0) { buffer_desc.ByteWidth = 1024;

1 0

Henri Verbeet : wined3d: More accurately determine whether a separate sRGB texture is required.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 74dc66ca576b741d405e20b457e7a509baba7973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74dc66ca576b741d405e20b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:27 2019 +0430 wined3d: More accurately determine whether a separate sRGB texture is required. Read control is irrelevant without WINED3D_BIND_SHADER_RESOURCE, write control is irrelevant without WINED3D_BIND_RENDER_TARGET. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d30cb315c..58977f8cd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5077,12 +5077,20 @@ static inline BOOL is_srgb_enabled(const DWORD *sampler_states) static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { - unsigned int flags = texture->resource.format_flags - & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + if (!(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return FALSE; + + if (!context->d3d_info->srgb_read_control + && (texture->resource.bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_READ)) + return TRUE; - return (!context->d3d_info->srgb_read_control - || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) - && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; + if (!context->d3d_info->srgb_write_control + && (texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET) + && (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) + return TRUE; + + return FALSE; } static inline BOOL needs_srgb_write(const struct wined3d_context *context,

1 0

Nikolay Sivov : d3d10core/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 2515c08bb6532dff5fe30370d1463c8afb7e1e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2515c08bb6532dff5fe30370… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:34 2019 +0300 d3d10core/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f65bd34a79..cc6b39ccd1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3578,6 +3578,17 @@ static void test_create_shader_resource_view(void) ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); + /* Without D3D10_BIND_SHADER_RESOURCE. */ + buffer = create_buffer(device, 0, 1024, NULL); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10ShaderResourceView_Release(srview); + + ID3D10Buffer_Release(buffer); + texture2d_desc.Width = 512; texture2d_desc.Height = 512; texture2d_desc.SampleDesc.Count = 1;

1 0

Henri Verbeet : wined3d: Explicitly initialise sRGB format info.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 59ef897514cf72ec374c6738da910b43aec1256a URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ef897514cf72ec374c6738… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:28 2019 +0430 wined3d: Explicitly initialise sRGB format info. For the GL adapter this already happens implicitly in init_format_texture_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e10d617b4e..82027bf19c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2171,6 +2171,24 @@ static BOOL init_format_decompress_info(struct wined3d_adapter *adapter) return TRUE; } +static BOOL init_srgb_formats(struct wined3d_adapter *adapter) +{ + struct wined3d_format *format, *srgb_format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (!(srgb_format = get_format_internal(adapter, format_srgb_info[i].srgb_format_id))) + return FALSE; + if (!(format = get_format_internal(adapter, format_srgb_info[i].base_format_id))) + return FALSE; + + copy_format(adapter, srgb_format, format); + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3990,6 +4008,8 @@ static BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, si goto fail; if (!init_format_decompress_info(adapter)) goto fail; + if (!init_srgb_formats(adapter)) + goto fail; return TRUE;

1 0

Henri Verbeet : wined3d: Initialise the multi-sample draw location for the Vulkan adapter.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: f8e557a74c0eddaefbe46367e6c0bc48bae9d322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e557a74c0eddaefbe46367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:30 2019 +0430 wined3d: Initialise the multi-sample draw location for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2e72269632..ef2734f055 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1105,6 +1105,17 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes, sysmem_bytes); } +static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter *adapter, uint32_t wined3d_creation_flags) +{ + struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + + d3d_info->wined3d_creation_flags = wined3d_creation_flags; + + d3d_info->texture_swizzle = TRUE; + + d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -1156,8 +1167,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; - adapter->d3d_info.texture_swizzle = TRUE; + wined3d_adapter_vk_init_d3d_info(adapter, wined3d_creation_flags); return TRUE;

1 0