wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Gabriel Ivăncescu : msscript.ocx/tests: Add tests for IScriptControl::ExecuteStatement.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: f99b9868e586e96a5957bec5f6ea512bbd87251c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99b9868e586e96a5957bec5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 25 17:01:53 2019 +0200 msscript.ocx/tests: Add tests for IScriptControl::ExecuteStatement. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 87 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index d3f0955ca7..0345b3f392 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1675,6 +1675,92 @@ static void test_IScriptControl_AddCode(void) } } +static void test_IScriptControl_ExecuteStatement(void) +{ + IScriptControl *sc; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + str = a2bstr("1 + 1"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + SysFreeString(str); + + hr = IScriptControl_ExecuteStatement(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + + str = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + str = a2bstr("1 + 1"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + SysFreeString(str); + todo_wine CHECK_ERROR(sc, 0); + + str = a2bstr("invalid syntax"); + hr = IScriptControl_ExecuteStatement(sc, str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + SysFreeString(str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + str = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(str); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_flags = 0; + str = a2bstr("1 + 1"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + SysFreeString(str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + str = a2bstr("0x100"); + hr = IScriptControl_ExecuteStatement(sc, str); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + SysFreeString(str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + IScriptControl_Release(sc); + CHECK_CALLED(Close); + } +} + START_TEST(msscript) { IUnknown *unk; @@ -1710,6 +1796,7 @@ START_TEST(msscript) test_State(); test_IScriptControl_Eval(); test_IScriptControl_AddCode(); + test_IScriptControl_ExecuteStatement(); init_registry(FALSE);

1 0

Gabriel Ivăncescu : msscript.ocx: Partially implement IScriptControl::ExecuteStatement.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 54b24725566d7bcd7dc659ddfe21f9e918f69bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b24725566d7bcd7dc659dd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 25 17:01:44 2019 +0200 msscript.ocx: Partially implement IScriptControl::ExecuteStatement. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c615e63ed4..816a99dd6c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1023,8 +1023,10 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(statement)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); + + return parse_script_text(This, statement, 0, NULL); } static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res)

1 0

Kevin Puetz : oleaut32: Fix RegisterTypeLib prototype.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: e10e59fa0e2ac33a8a174a12bcb23c32cddb7a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10e59fa0e2ac33a8a174a12… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Sep 25 16:09:41 2019 +0200 oleaut32: Fix RegisterTypeLib prototype. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 15 ++++----------- include/oleauto.h | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b13f6dccf8..d7c5c977c6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -643,11 +643,7 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t * Success: S_OK * Failure: Status */ -HRESULT WINAPI RegisterTypeLib( - ITypeLib * ptlib, /* [in] Pointer to the library*/ - OLECHAR * szFullPath, /* [in] full Path of the library*/ - OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library, - may be NULL*/ +HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const WCHAR *szHelpDir) { HRESULT res; TLIBATTR *attr; @@ -725,19 +721,18 @@ HRESULT WINAPI RegisterTypeLib( if (res == S_OK && RegCreateKeyExW(key, HELPDIRW, 0, NULL, 0, KEY_WRITE, NULL, &subKey, &disposition) == ERROR_SUCCESS) { - BOOL freeHelpDir = FALSE; + BSTR freeHelpDir = NULL; OLECHAR* pIndexStr; /* if we created a new key, and helpDir was null, set the helpdir to the directory which contains the typelib. However, if we just opened an existing key, we leave the helpdir alone */ if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { - szHelpDir = SysAllocString(szFullPath); + szHelpDir = freeHelpDir = SysAllocString(szFullPath); pIndexStr = wcsrchr(szHelpDir, '\\'); if (pIndexStr) { *pIndexStr = 0; } - freeHelpDir = TRUE; } /* if we have an szHelpDir, set it! */ @@ -748,10 +743,8 @@ HRESULT WINAPI RegisterTypeLib( } } - /* tidy up */ - if (freeHelpDir) SysFreeString(szHelpDir); + SysFreeString(freeHelpDir); RegCloseKey(subKey); - } else { res = E_FAIL; } diff --git a/include/oleauto.h b/include/oleauto.h index 32b3b463bc..cc50f18947 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -752,7 +752,7 @@ HRESULT WINAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,ITypeLib**); HRESULT WINAPI LoadTypeLib(const OLECHAR*,ITypeLib**); HRESULT WINAPI LoadTypeLibEx(LPCOLESTR,REGKIND,ITypeLib**); HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR); -HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*); +HRESULT WINAPI RegisterTypeLib(ITypeLib*,LPCOLESTR,LPCOLESTR); HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND); HRESULT WINAPI RegisterTypeLibForUser(ITypeLib*,OLECHAR*,OLECHAR*); HRESULT WINAPI UnRegisterTypeLibForUser(REFGUID,WORD,WORD,LCID,SYSKIND);

1 0

Jacek Caban : include: Add threadpoolapiset.h file.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 8bbdfbceed4944be83021ee5e6f91cb1659b94a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bbdfbceed4944be83021ee5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 25 15:51:59 2019 +0200 include: Add threadpoolapiset.h file. Based on patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/threadpoolapiset.h | 65 ++++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 29 +-------------------- include/winnt.h | 1 - 4 files changed, 67 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bbdfbceed4944be8302…

1 0

Hans Leidekker : webservices: Add support for mapped HTTP headers.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 02962d92c4f3bac1ba326b2e6940cdc74ecd8118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02962d92c4f3bac1ba326b2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 25 14:29:58 2019 +0200 webservices: Add support for mapped HTTP headers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 141 ++++++++++++++-- dlls/webservices/msg.c | 297 ++++++++++++++++++++++++++++----- dlls/webservices/proxy.c | 2 +- dlls/webservices/tests/proxy.c | 118 ++++++++++++- dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 3 +- 6 files changed, 501 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02962d92c4f3bac1ba32…

1 0

Hans Leidekker : webservices: Add support for writing WS_ENUM_TYPE values.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 7236d982c9e922bf0e15685ae3a25e1d154d710a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7236d982c9e922bf0e15685a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 25 14:29:57 2019 +0200 webservices: Add support for writing WS_ENUM_TYPE values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 35 +++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 905f397b64..18c4b7e284 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -553,6 +553,11 @@ static void test_WsWriteType(void) WS_XML_WRITER *writer; WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; const WCHAR *val_str; + enum {ONE = 1, TWO = 2}; + WS_XML_STRING one = {3, (BYTE *)"ONE" }, two = {3, (BYTE *)"TWO"}; + WS_ENUM_VALUE enum_values[] = {{ONE, &one}, {TWO, &two}}; + WS_ENUM_DESCRIPTION enum_desc; + int val_enum; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -637,6 +642,36 @@ static void test_WsWriteType(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + enum_desc.values = enum_values; + enum_desc.valueCount = ARRAY_SIZE(enum_values); + enum_desc.maxByteCount = 3; + enum_desc.nameIndices = NULL; + + val_enum = 0; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + val_enum = 3; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + val_enum = ONE; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">ONE</p:str>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4d75e859d0..f750859fbc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3876,6 +3876,35 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping return S_OK; } +static const WS_XML_STRING *get_enum_value_name( const WS_ENUM_DESCRIPTION *desc, int value ) +{ + ULONG i; + for (i = 0; i < desc->valueCount; i++) + { + if (desc->values[i].value == value) return desc->values[i].name; + } + return NULL; +} + +static HRESULT write_type_enum( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_ENUM_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size ) +{ + const WS_XML_STRING *name; + WS_XML_UTF8_TEXT utf8; + const int *ptr; + HRESULT hr; + + if (!desc) return E_INVALIDARG; + if ((hr = get_value_ptr( option, value, size, sizeof(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (!(name = get_enum_value_name( desc, *ptr ))) return E_INVALIDARG; + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = name->bytes; + utf8.value.length = name->length; + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -3939,6 +3968,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_STRUCT_TYPE: return write_type_struct( writer, mapping, desc, option, value, size ); + case WS_ENUM_TYPE: + return write_type_enum( writer, mapping, desc, option, value, size ); + default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL;

1 0

Hans Leidekker : webservices: Simplify WsAddressMessage.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: fe9a28e819f81190a8938e1729c05de291e894d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9a28e819f81190a8938e17… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 25 14:29:56 2019 +0200 webservices: Simplify WsAddressMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ed9394ef22..d6906cb5de 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -452,16 +452,13 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * } if (msg->state < WS_MESSAGE_STATE_INITIALIZED || msg->is_addressed) hr = WS_E_INVALID_OPERATION; - else + else if (addr && addr->url.length) { - if (addr && addr->url.length) + if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; + else { - if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; - else - { - memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); - msg->addr.length = addr->url.length; - } + memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); + msg->addr.length = addr->url.length; } } if (hr == S_OK) msg->is_addressed = TRUE;

1 0

Zhiyi Zhang : winex11.drv: Handle XRandR not reporting any providers.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: ffd4caa5f0e401cf973078fbbd54e4950d408792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd4caa5f0e401cf973078fb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 15:28:15 2019 +0800 winex11.drv: Handle XRandR not reporting any providers. Some XRandR implementations, e.g., the QXL driver used on Debian 10 TestBots, don't report any providers. In this case, we can still search in XRandR screen resources to get adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2a1c7ce594..6bb2b18ce7 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -662,6 +662,7 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { + static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; struct x11drv_gpu *gpus = NULL; XRRScreenResources *screen_resources = NULL; XRRProviderResources *provider_resources = NULL; @@ -680,10 +681,22 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) if (!provider_resources) goto done; - gpus = heap_calloc( provider_resources->nproviders, sizeof(*gpus) ); + gpus = heap_calloc( provider_resources->nproviders ? provider_resources->nproviders : 1, sizeof(*gpus) ); if (!gpus) goto done; + /* Some XRandR implementations don't support providers. + * In this case, report a fake one to try searching adapters in screen resources */ + if (!provider_resources->nproviders) + { + WARN("XRandR implementation doesn't report any providers, faking one.\n"); + lstrcpyW( gpus[0].name, wine_adapterW ); + *new_gpus = gpus; + *count = 1; + ret = TRUE; + goto done; + } + primary_rect = get_primary_rect( screen_resources ); for (i = 0; i < provider_resources->nproviders; ++i) { @@ -751,6 +764,8 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new XRRProviderInfo *provider_info = NULL; XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; XRROutputInfo *output_info = NULL; + RROutput *outputs; + INT crtc_count, output_count; INT primary_adapter = 0; INT adapter_count = 0; BOOL mirrored, detached; @@ -762,19 +777,33 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!screen_resources) goto done; - provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); - if (!provider_info) - goto done; + if (gpu_id) + { + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); + if (!provider_info) + goto done; + + crtc_count = provider_info->ncrtcs; + output_count = provider_info->noutputs; + outputs = provider_info->outputs; + } + /* Fake provider id, search adapters in screen resources */ + else + { + crtc_count = screen_resources->ncrtc; + output_count = screen_resources->noutput; + outputs = screen_resources->outputs; + } /* Actual adapter count could be less */ - adapters = heap_calloc( provider_info->ncrtcs, sizeof(*adapters) ); + adapters = heap_calloc( crtc_count, sizeof(*adapters) ); if (!adapters) goto done; primary_rect = get_primary_rect( screen_resources ); - for (i = 0; i < provider_info->noutputs; ++i) + for (i = 0; i < output_count; ++i) { - output_info = pXRRGetOutputInfo( gdi_display, screen_resources, provider_info->outputs[i] ); + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, outputs[i] ); if (!output_info) goto done; @@ -830,7 +859,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new { /* Use RROutput as adapter id. The reason of not using RRCrtc is that we need to detect inactive but * attached monitors */ - adapters[adapter_count].id = provider_info->outputs[i]; + adapters[adapter_count].id = outputs[i]; if (!detached) adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; if (is_crtc_primary( primary_rect, crtc_info ))

1 0

Zhiyi Zhang : winex11.drv: Trace display device counts.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 10b2a996babece63e493999d1ddcfbeeaef40257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10b2a996babece63e493999d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 15:28:03 2019 +0800 winex11.drv: Trace display device counts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f96fd93a54..107719a26f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -472,6 +472,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) goto done; + TRACE("GPU count: %d\n", gpu_count); for (gpu = 0; gpu < gpu_count; gpu++) { @@ -481,11 +482,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize adapters */ if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; + TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) @@ -494,6 +497,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) { + TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) goto done; }

1 0

Zhiyi Zhang : winemac.drv: Trace display device counts.
by Alexandre Julliard 25 Sep '19

25 Sep '19

Module: wine Branch: master Commit: 20336127a480037dfaf469ffc2727511c55fab11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20336127a480037dfaf469ff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 25 07:16:11 2019 -0500 winemac.drv: Trace display device counts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index cb9f1ebcab..cc5e9beaff 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1658,6 +1658,7 @@ void macdrv_init_display_devices(BOOL force) /* Initialize GPUs */ if (macdrv_get_gpus(&gpus, &gpu_count)) goto done; + TRACE("GPU count: %d\n", gpu_count); for (gpu = 0; gpu < gpu_count; gpu++) { @@ -1667,11 +1668,13 @@ void macdrv_init_display_devices(BOOL force) /* Initialize adapters */ if (macdrv_get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; + TRACE("GPU: %#llx %s, adapter count: %d\n", gpus[gpu].id, gpus[gpu].name, adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { if (macdrv_get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; + TRACE("adapter: %#x, monitor count: %d\n", adapters[adapter].id, monitor_count); if (!macdrv_init_adapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) @@ -1680,6 +1683,7 @@ void macdrv_init_display_devices(BOOL force) /* Initialize monitors */ for (monitor = 0; monitor < monitor_count; monitor++) { + TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) goto done; }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019