August 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : combase: Move CoMarshalInterThreadInterfaceInStream().
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 0bcbc4693e0ba0fff8a7a69abd0510d03bab5fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bcbc4693e0ba0fff8a7a69a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:28 2020 +0300 combase: Move CoMarshalInterThreadInterfaceInStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 29 +++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 45 --------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 8c471f5ef6..5ee52d950e 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -129,7 +129,7 @@ @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected @ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal @ stdcall CoMarshalHresult(ptr long) -@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface @ stub CoPopServiceDomain @ stub CoPushServiceDomain diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 54151e21c8..fe4c2f3adf 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -55,3 +55,32 @@ HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void IStream_Release(stream); return hr; } + +/*********************************************************************** + * CoMarshalInterThreadInterfaceInStream (combase.@) + */ +HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, IUnknown *unk, IStream **stream) +{ + ULARGE_INTEGER xpos; + LARGE_INTEGER seekto; + HRESULT hr; + + TRACE("%s, %p, %p\n", debugstr_guid(riid), unk, stream); + + hr = CreateStreamOnHGlobal(NULL, TRUE, stream); + if (FAILED(hr)) return hr; + hr = CoMarshalInterface(*stream, riid, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + + if (SUCCEEDED(hr)) + { + memset(&seekto, 0, sizeof(seekto)); + IStream_Seek(*stream, seekto, STREAM_SEEK_SET, &xpos); + } + else + { + IStream_Release(*stream); + *stream = NULL; + } + + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 51db5a7e69..cf1e55babe 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2079,51 +2079,6 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *pStream) return hr; } - -/*********************************************************************** - * CoMarshalInterThreadInterfaceInStream [OLE32.@] - * - * Marshal an interface across threads in the same process. - * - * PARAMS - * riid [I] Identifier of the interface to be marshalled. - * pUnk [I] Pointer to IUnknown-derived interface that will be marshalled. - * ppStm [O] Pointer to IStream object that is created and then used to store the marshalled interface. - * - * RETURNS - * Success: S_OK - * Failure: E_OUTOFMEMORY and other COM error codes - * - * SEE ALSO - * CoMarshalInterface(), CoUnmarshalInterface() and CoGetInterfaceAndReleaseStream() - */ -HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( - REFIID riid, LPUNKNOWN pUnk, LPSTREAM * ppStm) -{ - ULARGE_INTEGER xpos; - LARGE_INTEGER seekto; - HRESULT hres; - - TRACE("(%s, %p, %p)\n",debugstr_guid(riid), pUnk, ppStm); - - hres = CreateStreamOnHGlobal(NULL, TRUE, ppStm); - if (FAILED(hres)) return hres; - hres = CoMarshalInterface(*ppStm, riid, pUnk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - - if (SUCCEEDED(hres)) - { - memset(&seekto, 0, sizeof(seekto)); - IStream_Seek(*ppStm, seekto, STREAM_SEEK_SET, &xpos); - } - else - { - IStream_Release(*ppStm); - *ppStm = NULL; - } - - return hres; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d5e5607e03..1587f92638 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -58,7 +58,7 @@ @ stdcall CoLoadLibrary(wstr long) @ stdcall CoLockObjectExternal(ptr long long) @ stdcall CoMarshalHresult(ptr long) combase.CoMarshalHresult -@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) combase.CoMarshalInterThreadInterfaceInStream @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @ stub CoQueryAuthenticationServices @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryClientBlanket

1 0

Nikolay Sivov : ole32: Reduce duplication for global interface table factory.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: b59b5da85676e99953dba18acc529fb59cede1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b59b5da85676e99953dba18a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:31 2020 +0300 ole32: Reduce duplication for global interface table factory. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/git.c | 60 ++++---------------------------------------- dlls/ole32/oleproxy.c | 15 +++++++++-- 3 files changed, 21 insertions(+), 57 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e151241673..3156f86f89 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -319,6 +319,9 @@ extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLS extern HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN; +extern HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, + void **obj) DECLSPEC_HIDDEN; +extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 8683f3592a..e761c99b77 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -290,62 +290,12 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return S_OK; } -/* Classfactory definition - despite what MSDN says, some programs need this */ - -static HRESULT WINAPI -GITCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI GITCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; -} - -static ULONG WINAPI GITCF_Release(LPCLASSFACTORY iface) -{ - return 1; -} - -static HRESULT WINAPI -GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, - REFIID riid, LPVOID *ppv) +HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - IGlobalInterfaceTable *git = get_std_git(); - HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - IGlobalInterfaceTable_Release(git); - return hr; -} - -static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl GITClassFactoryVtbl = { - GITCF_QueryInterface, - GITCF_AddRef, - GITCF_Release, - GITCF_CreateInstance, - GITCF_LockServer -}; - -static IClassFactory git_classfactory = { &GITClassFactoryVtbl }; - -HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) -{ - *ppv = &git_classfactory; - TRACE("Returning GIT classfactory\n"); - return S_OK; + IGlobalInterfaceTable *git = get_std_git(); + HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, obj); + IGlobalInterfaceTable_Release(git); + return hr; } /* Virtual function table */ diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index b5c08ff1c5..93ff5b0da8 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -159,6 +159,17 @@ static const IClassFactoryVtbl GlobalOptionsCFVtbl = IClassFactory GlobalOptionsCF = { &GlobalOptionsCFVtbl }; +static const IClassFactoryVtbl GlobalInterfaceTableCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + GlobalInterfaceTable_CreateInstance, + ClassFactory_LockServer +}; + +IClassFactory GlobalInterfaceTableCF = { &GlobalInterfaceTableCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -173,8 +184,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) ) ) return MARSHAL_GetStandardMarshalCF(ppv); - if (IsEqualIID(rclsid,&CLSID_StdGlobalInterfaceTable) && (IsEqualIID(iid,&IID_IClassFactory) || IsEqualIID(iid,&IID_IUnknown))) - return StdGlobalInterfaceTable_GetFactory(ppv); + if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) + return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker))

1 0

Nikolay Sivov : ole32: Expose ManualResetEvent as registered class.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 964a8c909d48419390cb6e28a8f1c826ab8af862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964a8c909d48419390cb6e28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:32 2020 +0300 ole32: Expose ManualResetEvent as registered class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 6 +++--- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/oleproxy.c | 13 +++++++++++++ dlls/ole32/tests/marshal.c | 5 +++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 32283e6d95..8e78519dc8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -922,12 +922,12 @@ static const ISynchronizeHandleVtbl SynchronizeHandleVtbl = { SynchronizeHandle_GetHandle }; -static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) +HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **ppv) { MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); HRESULT hr; - if(punkouter) + if (outer) FIXME("Aggregation not implemented.\n"); This->ref = 1; @@ -3004,7 +3004,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( } if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { - hres = ManualResetEvent_Construct(pUnkOuter, pResults[0].pIID, (void**)&unk); + hres = ManualResetEvent_CreateInstance(&ManualResetEventCF, pUnkOuter, pResults[0].pIID, (void**)&unk); if (FAILED(hres)) return hres; return return_multi_qi(unk, cmq, pResults, TRUE); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 3156f86f89..974c230ddc 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -322,6 +322,9 @@ extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN; extern HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; +extern HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, + void **obj) DECLSPEC_HIDDEN; +extern IClassFactory ManualResetEventCF DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 93ff5b0da8..29cd391e12 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -170,6 +170,17 @@ static const IClassFactoryVtbl GlobalInterfaceTableCFVtbl = IClassFactory GlobalInterfaceTableCF = { &GlobalInterfaceTableCFVtbl }; +static const IClassFactoryVtbl ManualResetEventCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ManualResetEvent_CreateInstance, + ClassFactory_LockServer +}; + +IClassFactory ManualResetEventCF = { &ManualResetEventCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -186,6 +197,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return MARSHAL_GetStandardMarshalCF(ppv); if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return IClassFactory_QueryInterface(&ManualResetEventCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e2608ecb76..ef608e66d0 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4006,11 +4006,16 @@ static void test_manualresetevent(void) { ISynchronizeHandle *sync_handle; ISynchronize *psync1, *psync2; + IClassFactory *factory; IUnknown *punk; HANDLE handle; LONG ref; HRESULT hr; + hr = pDllGetClassObject(&CLSID_ManualResetEvent, &IID_IClassFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(factory); + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!punk, "Got NULL.\n");

1 0

Jacek Caban : include: Add missing console mode defines.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 63cbf7fb57e3ae4f640f976d03aed2747e51ae44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cbf7fb57e3ae4f640f976d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 15:08:28 2020 +0200 include: Add missing console mode defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/consoleapi.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/include/consoleapi.h b/include/consoleapi.h index 5bba09d37f..82f8dec896 100644 --- a/include/consoleapi.h +++ b/include/consoleapi.h @@ -22,18 +22,22 @@ #include <wincontypes.h> /* Console Mode flags */ -#define ENABLE_PROCESSED_INPUT 0x0001 -#define ENABLE_LINE_INPUT 0x0002 -#define ENABLE_ECHO_INPUT 0x0004 -#define ENABLE_WINDOW_INPUT 0x0008 -#define ENABLE_MOUSE_INPUT 0x0010 -#define ENABLE_INSERT_MODE 0x0020 -#define ENABLE_QUICK_EDIT_MODE 0x0040 -#define ENABLE_EXTENDED_FLAGS 0x0080 -#define ENABLE_AUTO_POSITION 0x0100 +#define ENABLE_PROCESSED_INPUT 0x0001 +#define ENABLE_LINE_INPUT 0x0002 +#define ENABLE_ECHO_INPUT 0x0004 +#define ENABLE_WINDOW_INPUT 0x0008 +#define ENABLE_MOUSE_INPUT 0x0010 +#define ENABLE_INSERT_MODE 0x0020 +#define ENABLE_QUICK_EDIT_MODE 0x0040 +#define ENABLE_EXTENDED_FLAGS 0x0080 +#define ENABLE_AUTO_POSITION 0x0100 +#define ENABLE_VIRTUAL_TERMINAL_INPUT 0x0200 -#define ENABLE_PROCESSED_OUTPUT 0x01 -#define ENABLE_WRAP_AT_EOL_OUTPUT 0x02 +#define ENABLE_PROCESSED_OUTPUT 0x0001 +#define ENABLE_WRAP_AT_EOL_OUTPUT 0x0002 +#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 +#define DISABLE_NEWLINE_AUTO_RETURN 0x0008 +#define ENABLE_LVB_GRID_WORLDWIDE 0x0010 #define PSEUDOCONSOLE_INHERIT_CURSOR 0x01

1 0

Jacek Caban : kernel32/tests: Add console title tests.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: cd8971399e35a8feaa841025ab74857a85bf5678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8971399e35a8feaa841025… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 15:10:45 2020 +0200 kernel32/tests: Add console title tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5e7754d648..2facdf91fa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3679,6 +3679,30 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) CloseHandle(std_input); } +static void test_console_title(void) +{ + WCHAR buf[64]; + BOOL ret; + + ret = SetConsoleTitleW(L"test"); + ok(ret, "SetConsoleTitleW failed: %u\n", GetLastError()); + + ret = GetConsoleTitleW(buf, ARRAY_SIZE(buf)); + ok(ret, "GetConsoleTitleW failed: %u\n", GetLastError()); + ok(!wcscmp(buf, L"test"), "title = %s\n", wine_dbgstr_w(buf)); + + if (!skip_nt) + { + ret = GetConsoleTitleW(buf, 2); + ok(ret, "GetConsoleTitleW failed: %u\n", GetLastError()); + ok(!wcscmp(buf, L"t"), "title = %s\n", wine_dbgstr_w(buf)); + + ret = GetConsoleTitleW(buf, 4); + ok(ret, "GetConsoleTitleW failed: %u\n", GetLastError()); + ok(!wcscmp(buf, L"tes"), "title = %s\n", wine_dbgstr_w(buf)); + } +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -4046,6 +4070,7 @@ START_TEST(console) test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); + test_console_title(); if (!test_current) { test_AttachConsole(hConOut);

1 0

Rémi Bernon : ntdll/tests: Add broken FltSave results for w2008 / w8.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 94ee27097228ac37f1576565c9f93f6186ff66a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ee27097228ac37f1576565… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 12 10:15:01 2020 +0200 ntdll/tests: Add broken FltSave results for w2008 / w8. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0efe189891..f60327cebf 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3080,6 +3080,7 @@ static void test_thread_context(void) XMM_SAVE_AREA32 FltSave; WORD SegCs, SegDs, SegEs, SegFs, SegGs, SegSs; } expect; + XMM_SAVE_AREA32 broken_fltsave; NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = (void *)code_mem; static const BYTE call_func[] = @@ -3240,7 +3241,12 @@ static void test_thread_context(void) COMPARE( SegFs ); COMPARE( SegGs ); COMPARE( SegSs ); - ok( !memcmp( &context.FltSave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )), + + broken_fltsave = context.FltSave; + memset( &broken_fltsave.ErrorOpcode, 0xcc, 0x12 ); + + ok( !memcmp( &context.FltSave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )) || + broken( !memcmp( &broken_fltsave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )) ) /* w2008, w8 */, "wrong FltSave\n" ); for (i = 6; i < 16; i++) ok( !memcmp( &context.Xmm0 + i, &expect.FltSave.XmmRegisters[i], sizeof(context.Xmm0) ),

1 0

Jacek Caban : kernel32/tests: Add an option to test current console.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 5a6341d8c7cbd19308dead261ef67c5c1e5e4f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6341d8c7cbd19308dead26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 15:10:37 2020 +0200 kernel32/tests: Add an option to test current console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 136 ++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 65 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 69d9ae2da0..5e7754d648 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3872,14 +3872,9 @@ static void test_AllocConsole(void) START_TEST(console) { - static const char font_name[] = "Lucida Console"; HANDLE hConIn, hConOut; - BOOL ret; + BOOL ret, test_current; CONSOLE_SCREEN_BUFFER_INFO sbi; - LONG err; - HKEY console_key; - char old_font[LF_FACESIZE]; - BOOL delete = FALSE; DWORD size; char **argv; int argc; @@ -3902,62 +3897,67 @@ START_TEST(console) return; } - /* be sure we have a clean console (and that's our own) - * FIXME: this will make the test fail (currently) if we don't run - * under X11 - * Another solution would be to rerun the test under wineconsole with - * the curses backend - */ + test_current = argc >= 3 && !strcmp(argv[2], "--current"); - /* ReadConsoleOutputW doesn't retrieve characters from the output buffer - * correctly for characters that don't have a glyph in the console font. So, - * we first set the console font to Lucida Console (which has a wider - * selection of glyphs available than the default raster fonts). We want - * to be able to restore the original font afterwards, so don't change - * if we can't read the original font. - */ - err = RegOpenKeyExA(HKEY_CURRENT_USER, "Console", 0, - KEY_QUERY_VALUE | KEY_SET_VALUE, &console_key); - if (err == ERROR_SUCCESS) - { - size = sizeof(old_font); - err = RegQueryValueExA(console_key, "FaceName", NULL, NULL, - (LPBYTE) old_font, &size); - if (err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND) + if (!test_current) + { + static const char font_name[] = "Lucida Console"; + HKEY console_key; + char old_font[LF_FACESIZE]; + BOOL delete = FALSE; + LONG err; + + /* ReadConsoleOutputW doesn't retrieve characters from the output buffer + * correctly for characters that don't have a glyph in the console font. So, + * we first set the console font to Lucida Console (which has a wider + * selection of glyphs available than the default raster fonts). We want + * to be able to restore the original font afterwards, so don't change + * if we can't read the original font. + */ + err = RegOpenKeyExA(HKEY_CURRENT_USER, "Console", 0, + KEY_QUERY_VALUE | KEY_SET_VALUE, &console_key); + if (err == ERROR_SUCCESS) { - delete = (err == ERROR_FILE_NOT_FOUND); - err = RegSetValueExA(console_key, "FaceName", 0, REG_SZ, - (const BYTE *) font_name, sizeof(font_name)); - if (err != ERROR_SUCCESS) - trace("Unable to change default console font, error %d\n", err); + size = sizeof(old_font); + err = RegQueryValueExA(console_key, "FaceName", NULL, NULL, + (LPBYTE) old_font, &size); + if (err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND) + { + delete = (err == ERROR_FILE_NOT_FOUND); + err = RegSetValueExA(console_key, "FaceName", 0, REG_SZ, + (const BYTE *) font_name, sizeof(font_name)); + if (err != ERROR_SUCCESS) + trace("Unable to change default console font, error %d\n", err); + } + else + { + trace("Unable to query default console font, error %d\n", err); + RegCloseKey(console_key); + console_key = NULL; + } } else { - trace("Unable to query default console font, error %d\n", err); - RegCloseKey(console_key); + trace("Unable to open HKCU\\Console, error %d\n", err); console_key = NULL; } - } - else - { - trace("Unable to open HKCU\\Console, error %d\n", err); - console_key = NULL; - } - /* Now detach and open a fresh console to play with */ - FreeConsole(); - ok(AllocConsole(), "Couldn't alloc console\n"); + /* Now detach and open a fresh console to play with */ + FreeConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); - /* Restore default console font if needed */ - if (console_key != NULL) - { - if (delete) - err = RegDeleteValueA(console_key, "FaceName"); - else - err = RegSetValueExA(console_key, "FaceName", 0, REG_SZ, - (const BYTE *) old_font, strlen(old_font) + 1); - ok(err == ERROR_SUCCESS, "Unable to restore default console font, error %d\n", err); + /* Restore default console font if needed */ + if (console_key != NULL) + { + if (delete) + err = RegDeleteValueA(console_key, "FaceName"); + else + err = RegSetValueExA(console_key, "FaceName", 0, REG_SZ, + (const BYTE *) old_font, strlen(old_font) + 1); + ok(err == ERROR_SUCCESS, "Unable to restore default console font, error %d\n", err); + } } + hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); @@ -3993,19 +3993,22 @@ START_TEST(console) /* will test all the scrolling operations */ testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ - testScreenBuffer(hConOut); + if (!test_current) testScreenBuffer(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); - /* clear duplicated console font table */ - CloseHandle(hConIn); - CloseHandle(hConOut); - FreeConsole(); - ok(AllocConsole(), "Couldn't alloc console\n"); - hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); - ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + if (!test_current) + { + /* clear duplicated console font table */ + CloseHandle(hConIn); + CloseHandle(hConOut); + FreeConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); + hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); + ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + } testCtrlHandler(); /* still to be done: access rights & access on objects */ @@ -4043,7 +4046,10 @@ START_TEST(console) test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); - test_AttachConsole(hConOut); - test_AllocConsole(); - test_FreeConsole(); + if (!test_current) + { + test_AttachConsole(hConOut); + test_AllocConsole(); + test_FreeConsole(); + } }

1 0

Nikolay Sivov : combase: Move CLSIDFromProgIDEx().
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 7f50f877eed401895e4254342a478978bed09e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f50f877eed401895e425434… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:30 2020 +0300 combase: Move CLSIDFromProgIDEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 1 + dlls/ole32/compobj.c | 10 ---------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index f7c70e1232..edd6ac0b28 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1063,6 +1063,16 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, CLSID *clsid) return clsid_from_string_reg(progid, clsid); } +/****************************************************************************** + * CLSIDFromProgIDEx (combase.@) + */ +HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, CLSID *clsid) +{ + FIXME("%s, %p: semi-stub\n", debugstr_w(progid), clsid); + + return CLSIDFromProgID(progid, clsid); +} + /****************************************************************************** * CLSIDFromString (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 79410be8be..6698c23c76 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -68,6 +68,7 @@ @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stub CLSIDFromOle1Class @ stdcall CLSIDFromProgID(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stub CleanupOleStateInAllTls @ stdcall CleanupTlsOleState(ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 33e617cca0..32283e6d95 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2255,16 +2255,6 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey return S_OK; } -/****************************************************************************** - * CLSIDFromProgIDEx [OLE32.@] - */ -HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) -{ - FIXME("%s,%p: semi-stub\n", debugstr_w(progid), clsid); - - return CLSIDFromProgID(progid, clsid); -} - static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid) { HKEY hkey; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d1dedd39c3..c83f0b2716 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -4,7 +4,7 @@ @ stdcall CLIPFORMAT_UserSize(ptr long ptr) combase.CLIPFORMAT_UserSize @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) combase.CLIPFORMAT_UserUnmarshal @ stdcall CLSIDFromProgID(wstr ptr) combase.CLSIDFromProgID -@ stdcall CLSIDFromProgIDEx(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) combase.CLSIDFromProgIDEx @ stdcall CLSIDFromString(wstr ptr) combase.CLSIDFromString @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr)

1 0

Jacek Caban : kernel32/tests: Fix ReadConsoleOutputW tests on Windows 8.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: dc8085142528305605ef4af621ba56f2aa75da65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc8085142528305605ef4af6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 15:08:35 2020 +0200 kernel32/tests: Fix ReadConsoleOutputW tests on Windows 8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c9b30e3b50..7b7b4fb65f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2860,8 +2860,8 @@ static void test_ReadConsoleOutput(HANDLE console) coord.Y = 3; set_region(&region, 200, 7, 15, 211); ret = ReadConsoleOutputW(console, char_info_buf, size, coord, &region); - ok(!ret && GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "ReadConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); - check_region(&region, 200, 7, 15, 211); + ok(!ret, "ReadConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 200, 7, -15, -211); size.X = 23; size.Y = 17;

1 0

Jacek Caban : kernel32/tests: Disable ENABLE_VIRTUAL_TERMINAL_PROCESSING mode in testWriteNotWrappedProcessed.
by Alexandre Julliard Aug. 12, 2020

Aug. 12, 2020

Module: wine Branch: master Commit: 3d4be8e150bf37607b25dce0db2931384e5cadd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d4be8e150bf37607b25dce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 15:10:21 2020 +0200 kernel32/tests: Disable ENABLE_VIRTUAL_TERMINAL_PROCESSING mode in testWriteNotWrappedProcessed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 7b7b4fb65f..69d9ae2da0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -301,7 +301,8 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) int p; WORD attr; - ok(GetConsoleMode(hCon, &mode) && SetConsoleMode(hCon, (mode | ENABLE_PROCESSED_OUTPUT) & ~ENABLE_WRAP_AT_EOL_OUTPUT), + ok(GetConsoleMode(hCon, &mode) && SetConsoleMode(hCon, (mode | ENABLE_PROCESSED_OUTPUT) & + ~(ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING)), "clearing wrap at EOL & setting processed output\n"); /* write line, wrapping disabled, buffer exceeds sb width */

1 0