January 2020 - Wine-devel - list.winehq.org

[PATCH] user32/tests: Work around a failure on Windows < Vista.
by Zebediah Figura 01 Jan '20

01 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/winstation.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560ac..4aa5565b96c 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -51,7 +51,12 @@ static void register_class(void) WNDCLASSA cls; cls.style = CS_DBLCLKS; - cls.lpfnWndProc = DefWindowProcA; + /* Windows < Vista apparently checks lpfnWndProc against the address of + * DefWindowProcA(), and for some reason fails to change the thread desktop + * after creating and destroying a window if it doesn't match. Using an IAT + * (as is default) or a wrapper triggers this, so use GetProcAddress() as + * a workaround. */ + cls.lpfnWndProc = (void *)GetProcAddress(GetModuleHandleA("user32"), "DefWindowProcA"); cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); -- 2.24.0

1 0

[PATCH] [include] Add IWbemContext and IWebCallResult interface and other class definitions
by Vijay Kiran Kamuju 01 Jan '20

01 Jan '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/wbemcli.idl | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 54cdb886aac..4d5123b77ac 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3A,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") +cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3a,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") cpp_quote("DEFINE_GUID(CLSID_WbemStatusCode, 0xeb87e1bd,0x3233,0x11d2,0xae,0xc9,0x00,0xc0,0x4f,0xb6,0x88,0x20);") import "oaidl.idl"; @@ -333,6 +333,47 @@ typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE WBEM_FLAG_STRONG_VALIDATION = 0x100000 } WBEM_GENERIC_FLAG_TYPE; +[ + object, + restricted, + uuid(44aca674-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemContext : IUnknown +{ + HRESULT Clone( + [out] IWbemContext **ppNewCopy); + + HRESULT GetNames( + [in] long lFlags, + [out] SAFEARRAY(BSTR*) pNames); + + HRESULT BeginEnumeration( + [in] long lFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *pstrName, + [out] VARIANT *pValue); + + HRESULT EndEnumeration(); + + HRESULT SetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [in] VARIANT *pValue); + + HRESULT GetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pValue); + + HRESULT DeleteValue( + [in, string] LPCWSTR wszName, + [in] long lFlags); + + HRESULT DeleteAll(); +} + [ object, restricted, @@ -486,6 +527,30 @@ interface IWbemServices : IUnknown [in] IWbemObjectSink *pResponseHandler); } +[ + object, + restricted, + uuid(44aca675-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemCallResult : IUnknown +{ + HRESULT GetResultObject( + [in] long lTimeout, + [out] IWbemClassObject **ppResultObject); + + HRESULT GetResultString( + [in] long lTimeout, + [out] BSTR *pstrResultString); + + HRESULT GetResultServices( + [in] long lTimeout, + [out] IWbemServices **ppServices); + + HRESULT GetCallStatus( + [in] long lTimeout, + [out] long *plStatus); +} + [ object, restricted, @@ -703,3 +768,19 @@ coclass UnsecuredApartment interface IUnsecuredApartment; interface IWbemUnsecuredApartment; }; + +[ + uuid(9a653086-174f-11d2-b5f9-00104b703efd) +] +coclass WbemClassObject +{ + interface IWbemClassObject; +}; + +[ + uuid(eb87e1bd-3233-11d2-aec9-00c04fb68820) +] +coclass WbemStatusCodeText +{ + interface IWbemStatusCodeText; +}; -- 2.21.0

3 4

[PATCH v2] include: Add IWbemContext and IWbemCallResult interface and other class definitions
by Vijay Kiran Kamuju 01 Jan '20

01 Jan '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/wbemcli.idl | 84 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 54cdb886aac..5b5ca61bec1 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3A,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") +cpp_quote("DEFINE_GUID(CLSID_WbemLocator, 0x4590f811,0x1d3a,0x11d0,0x89,0x1f,0x00,0xaa,0x00,0x4b,0x2e,0x24);") cpp_quote("DEFINE_GUID(CLSID_WbemStatusCode, 0xeb87e1bd,0x3233,0x11d2,0xae,0xc9,0x00,0xc0,0x4f,0xb6,0x88,0x20);") import "oaidl.idl"; @@ -333,6 +333,48 @@ typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE WBEM_FLAG_STRONG_VALIDATION = 0x100000 } WBEM_GENERIC_FLAG_TYPE; +[ + object, + restricted, + local, + uuid(44aca674-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemContext : IUnknown +{ + HRESULT Clone( + [out] IWbemContext **ppNewCopy); + + HRESULT GetNames( + [in] long lFlags, + [out] SAFEARRAY(BSTR) *pNames); + + HRESULT BeginEnumeration( + [in] long lFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *pstrName, + [out] VARIANT *pValue); + + HRESULT EndEnumeration(); + + HRESULT SetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [in] VARIANT *pValue); + + HRESULT GetValue( + [in, string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pValue); + + HRESULT DeleteValue( + [in, string] LPCWSTR wszName, + [in] long lFlags); + + HRESULT DeleteAll(); +} + [ object, restricted, @@ -486,6 +528,30 @@ interface IWbemServices : IUnknown [in] IWbemObjectSink *pResponseHandler); } +[ + object, + restricted, + uuid(44aca675-e8fc-11d0-a07c-00c04fb68820) +] +interface IWbemCallResult : IUnknown +{ + HRESULT GetResultObject( + [in] long lTimeout, + [out] IWbemClassObject **ppResultObject); + + HRESULT GetResultString( + [in] long lTimeout, + [out] BSTR *pstrResultString); + + HRESULT GetResultServices( + [in] long lTimeout, + [out] IWbemServices **ppServices); + + HRESULT GetCallStatus( + [in] long lTimeout, + [out] long *plStatus); +} + [ object, restricted, @@ -703,3 +769,19 @@ coclass UnsecuredApartment interface IUnsecuredApartment; interface IWbemUnsecuredApartment; }; + +[ + uuid(9a653086-174f-11d2-b5f9-00104b703efd) +] +coclass WbemClassObject +{ + interface IWbemClassObject; +}; + +[ + uuid(eb87e1bd-3233-11d2-aec9-00c04fb68820) +] +coclass WbemStatusCodeText +{ + interface IWbemStatusCodeText; +}; -- 2.21.0

1 0

[PATCH] user32/tests: Fix a test failure on Windows < Vista.
by Zebediah Figura 01 Jan '20

01 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/winstation.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560ac..233ce966355 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -68,7 +68,10 @@ static HDESK initial_desktop; static DWORD CALLBACK thread( LPVOID arg ) { HDESK d1, d2; - HWND hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); ok( hwnd != 0, "CreateWindow failed\n" ); d1 = GetThreadDesktop(GetCurrentThreadId()); trace( "thread %p desktop: %p\n", arg, d1 ); @@ -92,9 +95,13 @@ static DWORD CALLBACK thread( LPVOID arg ) "bad last error %d\n", GetLastError() ); DestroyWindow( hwnd ); - ok( SetThreadDesktop( d2 ), "set thread desktop failed\n" ); - d1 = GetThreadDesktop(GetCurrentThreadId()); - ok( d1 == d2, "GetThreadDesktop did not return set desktop %p/%p\n", d1, d2 ); + ret = SetThreadDesktop( d2 ); + ok(ret || broken(!ret) /* < Vista */, "failed to set desktop, error %u\n", GetLastError()); + if (ret) + { + d1 = GetThreadDesktop(GetCurrentThreadId()); + ok( d1 == d2, "GetThreadDesktop did not return set desktop %p/%p\n", d1, d2 ); + } print_object( d2 ); if (arg < (LPVOID)5) { -- 2.24.0

2 4

[PATCH 1/4] ole32/tests: Fix some failures on Windows 10.
by Zebediah Figura 01 Jan '20

01 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/marshal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2aaa34e51b5..582b63f484a 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -61,6 +61,7 @@ static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } }; +static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -1392,7 +1393,7 @@ static ULONG WINAPI CustomMarshal_Release(IMarshal *iface) static HRESULT WINAPI CustomMarshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - CHECK_EXPECT(CustomMarshal_GetUnmarshalClass); + CHECK_EXPECT2(CustomMarshal_GetUnmarshalClass); *clsid = *unmarshal_class; return S_OK; } @@ -3329,8 +3330,8 @@ static void test_freethreadedmarshaler(void) hr = IMarshal_GetUnmarshalClass(pFTMarshal, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL, &clsid); ok_ole_success(hr, IMarshal_GetUnmarshalClass); - ok(IsEqualIID(&clsid, &CLSID_StdMarshal), "clsid = %s\n", - wine_dbgstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &CLSID_StdMarshal) || IsEqualGUID(&clsid, &CLSID_ft_unmarshaler_1809) /* Win10 1809 */, + "clsid = %s\n", wine_dbgstr_guid(&clsid)); IStream_Seek(pStream, llZero, STREAM_SEEK_SET, NULL); hr = IMarshal_MarshalInterface(pFTMarshal, pStream, &IID_IClassFactory, &Test_ClassFactory, MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); -- 2.24.0

2 6