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

Re: [PATCH] wbemprox: Return WBEM_E_ACCESS_DENIED from IEnumWbemClassObject::Next() if the object is empty.

by Hans Leidekker

On Mon, 2019-07-08 at 17:37 +0800, Dmitry Timoshkov wrote: > Looks like this is a result of executing from an MSI custom action. > > > Is there a way to detect such a case and return an appropriate error > > > value? > > > > The error code suggests that the custom action is run with insufficient > > permissions. If that's the case we'd need to do the same and add a permission > > check somewhere. > > Under Windows MSI custom action is executed in the context of an MSI server, > which probably runs as a restricted process, and which doesn't exist in Wine. Custom actions are executed in a seperate process in Wine. > Could you suggest a place in Wine where a permission check could be added? It's not clear to me if this is a general WMI thing or if it depends on the object being queried.

July 8, 2019

Re: [PATCH] wbemprox: Return WBEM_E_ACCESS_DENIED from IEnumWbemClassObject::Next() if the object is empty.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > > > > +static void test_Win32_QuickFixEngineering( IWbemServices *services ) > > > > +{ > > > > + static const WCHAR queryW[] = > > > > + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', > > > > + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',' ', > > > > + 'W','H','E','R','E',' ','H','o','t','F','i','x','I','D','=','\"','0','x','d','e','a','d','b','e','e','f','\"',0}; > > > > + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); > > > > + HRESULT hr; > > > > + IEnumWbemClassObject *result; > > > > + IWbemClassObject *obj; > > > > + ULONG count; > > > > + > > > > + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); > > > > + ok( hr == S_OK, "got %08x\n", hr ); > > > > + > > > > + count = 0xdeadbeef; > > > > + hr = IEnumWbemClassObject_Next( result, 1000, 1, &obj, &count ); > > > > + ok( hr == WBEM_E_ACCESS_DENIED || broken(hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT) /* before Win7 SP1 */, "got %08x\n", hr ); > > > > + ok( !count, "got %u\n", count ); > > > > > > I don't see this. Even up-to-date Windows 10 returns WBEM_S_FALSE here. > > > > Looks like this is a result of executing from an MSI custom action. > > Is there a way to detect such a case and return an appropriate error > > value? > > The error code suggests that the custom action is run with insufficient > permissions. If that's the case we'd need to do the same and add a permission > check somewhere. Under Windows MSI custom action is executed in the context of an MSI server, which probably runs as a restricted process, and which doesn't exist in Wine. Could you suggest a place in Wine where a permission check could be added? -- Dmitry.

July 8, 2019

Re: [PATCH] wbemprox: Return WBEM_E_ACCESS_DENIED from IEnumWbemClassObject::Next() if the object is empty.

by Hans Leidekker

On Mon, 2019-07-08 at 17:04 +0800, Dmitry Timoshkov wrote: > Hans Leidekker <hans(a)codeweavers.com> wrote: > > > On Mon, 2019-07-08 at 13:07 +0800, Dmitry Timoshkov wrote: > > > +static void test_Win32_QuickFixEngineering( IWbemServices *services ) > > > +{ > > > + static const WCHAR queryW[] = > > > + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', > > > + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',' ', > > > + 'W','H','E','R','E',' ','H','o','t','F','i','x','I','D','=','\"','0','x','d','e','a','d','b','e','e','f','\"',0}; > > > + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); > > > + HRESULT hr; > > > + IEnumWbemClassObject *result; > > > + IWbemClassObject *obj; > > > + ULONG count; > > > + > > > + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); > > > + ok( hr == S_OK, "got %08x\n", hr ); > > > + > > > + count = 0xdeadbeef; > > > + hr = IEnumWbemClassObject_Next( result, 1000, 1, &obj, &count ); > > > + ok( hr == WBEM_E_ACCESS_DENIED || broken(hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT) /* before Win7 SP1 */, "got %08x\n", hr ); > > > + ok( !count, "got %u\n", count ); > > > > I don't see this. Even up-to-date Windows 10 returns WBEM_S_FALSE here. > > Looks like this is a result of executing from an MSI custom action. > Is there a way to detect such a case and return an appropriate error > value? The error code suggests that the custom action is run with insufficient permissions. If that's the case we'd need to do the same and add a permission check somewhere.

July 8, 2019

Re: [PATCH] wbemprox: Return WBEM_E_ACCESS_DENIED from IEnumWbemClassObject::Next() if the object is empty.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Mon, 2019-07-08 at 13:07 +0800, Dmitry Timoshkov wrote: > > +static void test_Win32_QuickFixEngineering( IWbemServices *services ) > > +{ > > + static const WCHAR queryW[] = > > + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', > > + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',' ', > > + 'W','H','E','R','E',' ','H','o','t','F','i','x','I','D','=','\"','0','x','d','e','a','d','b','e','e','f','\"',0}; > > + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); > > + HRESULT hr; > > + IEnumWbemClassObject *result; > > + IWbemClassObject *obj; > > + ULONG count; > > + > > + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); > > + ok( hr == S_OK, "got %08x\n", hr ); > > + > > + count = 0xdeadbeef; > > + hr = IEnumWbemClassObject_Next( result, 1000, 1, &obj, &count ); > > + ok( hr == WBEM_E_ACCESS_DENIED || broken(hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT) /* before Win7 SP1 */, "got %08x\n", hr ); > > + ok( !count, "got %u\n", count ); > > I don't see this. Even up-to-date Windows 10 returns WBEM_S_FALSE here. Looks like this is a result of executing from an MSI custom action. Is there a way to detect such a case and return an appropriate error value? -- Dmitry.

July 8, 2019

Re: [PATCH] wbemprox: Return WBEM_E_ACCESS_DENIED from IEnumWbemClassObject::Next() if the object is empty.

by Hans Leidekker

On Mon, 2019-07-08 at 13:07 +0800, Dmitry Timoshkov wrote: > +static void test_Win32_QuickFixEngineering( IWbemServices *services ) > +{ > + static const WCHAR queryW[] = > + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', > + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',' ', > + 'W','H','E','R','E',' ','H','o','t','F','i','x','I','D','=','\"','0','x','d','e','a','d','b','e','e','f','\"',0}; > + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); > + HRESULT hr; > + IEnumWbemClassObject *result; > + IWbemClassObject *obj; > + ULONG count; > + > + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); > + ok( hr == S_OK, "got %08x\n", hr ); > + > + count = 0xdeadbeef; > + hr = IEnumWbemClassObject_Next( result, 1000, 1, &obj, &count ); > + ok( hr == WBEM_E_ACCESS_DENIED || broken(hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT) /* before Win7 SP1 */, "got %08x\n", hr ); > + ok( !count, "got %u\n", count ); I don't see this. Even up-to-date Windows 10 returns WBEM_S_FALSE here.

July 8, 2019

[PATCH 2/2] dxgi: Fix possible null output from d3d11_swapchain_GetFullscreenState.

by Zhiyi Zhang

When swapchain is created in windowed mode, and then enter fullscreen via Alt+Enter. Calling d3d11_swapchain_GetFullscreenState will return a null output because swapchain->target wasn't initialized. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 20 ++++++++++++++++---- dlls/dxgi/tests/dxgi.c | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab805..caf0863609 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -407,22 +407,34 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc swapchain_desc; + HRESULT hr; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); - if (fullscreen) + if (fullscreen || target) { wined3d_mutex_lock(); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); wined3d_mutex_unlock(); - *fullscreen = !swapchain_desc.windowed; } + if (fullscreen) + *fullscreen = !swapchain_desc.windowed; + if (target) { - *target = swapchain->target; - if (*target) + if (!swapchain_desc.windowed) + { + if (!swapchain->target && FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &swapchain->target))) + return hr; + + *target = swapchain->target; IDXGIOutput_AddRef(*target); + } + else + { + *target = NULL; + } } return S_OK; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index af396e9acf..f82c3d5f5b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5455,7 +5455,7 @@ static void test_window_association(void) ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); - todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Got wrong output.\n"); + ok(fullscreen ? !!output : !output, "Got wrong output.\n"); if (output) IDXGIOutput_Release(output); -- 2.20.1

July 8, 2019

[PATCH 1/2] dxgi/tests: Test output after using Alt+Enter to switch fullscreen.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ab65725ccf..af396e9acf 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5305,6 +5305,7 @@ static void test_window_association(void) LONG_PTR original_wndproc, wndproc; IDXGIFactory *factory, *factory2; IDXGISwapChain *swapchain; + IDXGIOutput *output; IDXGIAdapter *adapter; IDXGIDevice *device; HWND hwnd, hwnd2; @@ -5448,11 +5449,15 @@ static void test_window_association(void) PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); flush_events(); - hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + output = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Got wrong output.\n"); + if (output) + IDXGIOutput_Release(output); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", -- 2.20.1

July 8, 2019

[PATCH] wbemprox: Return WBEM_E_ACCESS_DENIED from IEnumWbemClassObject::Next() if the object is empty.

by Dmitry Timoshkov

I have an installer that goes into an infinite loop if IEnumWbemClassObject::Next() returns either WBEM_S_FALSE or WBEM_S_TIMEDOUT for an empty object when the installer queries for a missing KB update. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/class.c | 1 + dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 042ebebdcd..e4ab2624fe 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -123,6 +123,7 @@ static HRESULT WINAPI enum_class_object_Next( if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; + if (!view->count) return WBEM_E_ACCESS_DENIED; if (ec->index >= view->count) return WBEM_S_FALSE; hr = create_class_object( view->table->name, iface, ec->index, NULL, apObjects ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 2c1ca7f91d..a03c75f9d1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1566,6 +1566,31 @@ static void test_Win32_PnPEntity( IWbemServices *services ) IEnumWbemClassObject_Release( enm ); } +static void test_Win32_QuickFixEngineering( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',' ', + 'W','H','E','R','E',' ','H','o','t','F','i','x','I','D','=','\"','0','x','d','e','a','d','b','e','e','f','\"',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + HRESULT hr; + IEnumWbemClassObject *result; + IWbemClassObject *obj; + ULONG count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 0xdeadbeef; + hr = IEnumWbemClassObject_Next( result, 1000, 1, &obj, &count ); + ok( hr == WBEM_E_ACCESS_DENIED || broken(hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT) /* before Win7 SP1 */, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + IEnumWbemClassObject_Release( result ); + SysFreeString( wql ); + SysFreeString( query ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1613,6 +1638,7 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_Printer( services ); test_Win32_PnPEntity( services ); + test_Win32_QuickFixEngineering( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.20.1

July 8, 2019

Re: specific api functions for screen readers questions

by Zebediah Figura

Hello Janusz, I'm not entirely sure what you're asking, but Wine does currently support many core windowing APIs, including e.g. GetFocus(), GetForegroundWindow(), GetWindowText(), GetClassName(), etc., which seems to be what you're looking for. As for compilers, note that Wine isn't emulating anything at the machine code level. The loader should be capable of loading any binary that Windows can load, and there's no known reason that any given compiler would be an exception to this. If it's not, please file a bug at <https://bugs.winehq.org/>. ἔρρωσο, Zeb On 7/5/19 1:23 PM, Mgr. Janusz Chmiel wrote: > Dear specialists, > Does somebody of you know, if Wine support API functions which could be > used by very simple focusable object based screen reader? This screen > reader would react on key events and other internal WIne events such as > if dialog window have been displaied. > Screen reader should send textual content of focusable objects such as > buttons, comboboxes, dialog windows, menu items to speech output. > Because screen reader which I would like to develop can not use > Microsoft components including Microsoft C run-times, SAPI5, 4 or newest > Windows 10 speech kit, there is only possibility to develop integrated > speech engine from scrath. Or ask you how complex would be for you to > develop software bridge between Wine and speech-dispatcher speech > server. This software bridge would introduce simple Speech functions and > procedures, which would allow developers to send textual data to active > speech engine by using Speech-dispatcher speech server. > FOr beginning, I would like to know, if Wine contain some USER32.dll and > other API calls, which are able to get text information from object > which have focus. > Sure, screen reader, which I would like to develop will be very simple. > It will never be comparable with NVDA, Jaws or with other complex screen > readers for Windows. I would like to only develop at least simple focus > and event based screen reader, which will be able to use with simple Win > 32 apps such as notepad, integrated explorer.exe with Wine, with > MP3directcut for Windows, ETC. > Because screen reader can not use libraries from Microsoft, I Am aware, > that my goal will never produce screen reader which will be able to > support object hiearchi browsing inside active Window. > Very important question is, if Wine contain APi calls to detect object > class name, which will be detected from object, which have focus. > Without this routine, my dream will be never possible. > Last question. > Does integrated Windows PE routines support machine code instructions, > which have been generated by Free Basic compiler for Windows? Because I > do not know, if generated machine code hhave not been specifically > prepared for original Microsoft Windows so if compiled apps, which would > run normally from original Windows will not cause random crashes and > stability issues when running it with Wine. > I can not use programming languages from Microsoft. There are 3 Basic > language compiler from other teams than from Microsoft. Power Basic, > Free Basic and Pure Basic. BUt Pure Basic is commercial, Power Basic is > commercial and Free Basic is The onlyone free Basic compiler, which > generates .exe apps which do not depend on Microsoft .dlls as default. > I have old time experience with various screen readers. > When Windows 3.11 have been developed, two very smart C++ ddevelopers > in our country have developed screen readers for Windows 3.11. It did > not used mSAA. Screen reader had its internal speech engine which had > nothing to do with Speech API, because in 1994 there was no such > routines from Microsoft. > Screen reader have reacted on keyboard events, it spoken lines of text > from editable fields, text of dialog windows, menu items. > So do you think, that APi calls which are available inside WIne now can > allow Me to develop such focusable object based screen reader? Or it is > paradox situation, that WIndows 3.11 16 Bit version from 1994 have > allowed that and modern Wine do not allow it? > Really, I do not write about Windows 95. It was really Windows FOR > WORKGROUPS 3.11 AND ITS 16 BIT VERSION, NOT Win32. > Thank you very much for yours kind acces to my questions. I will intrude > you as little as possible, I know, that you are very overloaded. I need > to know, if my dream can come true or no. > > > >

July 7, 2019

[PATCH 07/15] widl: type_new_array function now takes decl_spec_t for element rather than type_t

by Richard Pospesel

Signed-off-by: Richard Pospesel <richard(a)torproject.org> --- tools/widl/parser.y | 11 +++++++---- tools/widl/typetree.c | 6 ++++-- tools/widl/typetree.h | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 82cf36d297..f3414e1f70 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1626,11 +1626,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: cannot specify size_is for an already sized array\n", v->name); else *ptype = type_new_array((*ptype)->name, - type_array_get_element_type(*ptype), FALSE, + type_array_get_element(*ptype), FALSE, 0, dim, NULL, FC_RP); } else if (is_ptr(*ptype)) - *ptype = type_new_array((*ptype)->name, type_pointer_get_ref_type(*ptype), TRUE, + *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE, 0, dim, NULL, pointer_default); else error_loc("%s: size_is attribute applied to illegal type\n", v->name); @@ -1653,7 +1653,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (is_array(*ptype)) { *ptype = type_new_array((*ptype)->name, - type_array_get_element_type(*ptype), + type_array_get_element(*ptype), type_array_is_decl_as_ptr(*ptype), type_array_get_dim(*ptype), type_array_get_conformance(*ptype), @@ -1808,7 +1808,10 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { - return type_new_array(NULL, type_new_alias(type, "SAFEARRAY"), TRUE, 0, + decl_spec_t element_ds; + init_declspec(&element_ds, type_new_alias(type, "SAFEARRAY")); + + return type_new_array(NULL, &element_ds, TRUE, 0, NULL, NULL, FC_RP); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 4b37b0d524..6b50271377 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -220,7 +220,7 @@ type_t *type_new_coclass(char *name) } -type_t *type_new_array(const char *name, type_t *element, int declptr, +type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is, unsigned char ptr_default_fc) { @@ -232,7 +232,9 @@ type_t *type_new_array(const char *name, type_t *element, int declptr, t->details.array.size_is = size_is; else t->details.array.dim = dim; - t->details.array.elem.type = element; + if (element) { + t->details.array.elem = *element; + } t->details.array.ptr_def_fc = ptr_default_fc; return t; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index c773ddd116..59bfb29fa4 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -33,7 +33,7 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t *attrs); type_t *type_new_alias(type_t *t, const char *name); type_t *type_new_module(char *name); -type_t *type_new_array(const char *name, type_t *element, int declptr, +type_t *type_new_array(const char* name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is, unsigned char ptr_default_fc); type_t *type_new_basic(enum type_basic_type basic_type); -- 2.17.1

July 6, 2019