- Wine-Devel - list.winehq.org

[PATCH 5/7] conhost: Import window state update from wineconsole.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 5 - programs/conhost/conhost.h | 5 + programs/conhost/window.c | 259 +++++++++++++++++++++++++++++++++++++ 3 files changed, 264 insertions(+), 5 deletions(-)

1 0

[PATCH 4/7] conhost: Import font selection support from wineconsole.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 356 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+)

1 0

[PATCH 3/7] conhost: Import loading console config from wineconsole.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/Makefile.in | 2 +- programs/conhost/conhost.c | 2 +- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 276 +++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] conhost: Pump window messages when we have a window.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)

1 0

[PATCH 1/7] conhost: Initial support for creating console window.
by Jacek Caban Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The plan is to move console window support to conhost (where it will use the new architecture), allowing removal of the code for the old console architecture in kernel32/server/wineconsole. Once we have complete support in conhost, I will change AllocConsole() to use it instead of wineconsole and reimplement wineconsole as a simple AllocConsole wrapper. This series implements enough window support to pass Wine tests (although to run tests in a way that will exercise that, patching AllocConsole as mentioned above). Interactivity support will follow. programs/conhost/Makefile.in | 6 +- programs/conhost/conhost.c | 121 +++---------------------------- programs/conhost/conhost.h | 135 +++++++++++++++++++++++++++++++++++ programs/conhost/window.c | 101 ++++++++++++++++++++++++++ 4 files changed, 248 insertions(+), 115 deletions(-) create mode 100644 programs/conhost/conhost.h create mode 100644 programs/conhost/window.c

1 0

[PATCH 1/3] comctl32/ipaddress: Select field contents on IPM_SETFOCUS.
by Nikolay Sivov Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/tests/ipaddress.c | 54 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index c75a1085650..d415a96fb74 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -393,6 +393,7 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) if (index > 3 || index < 0) index=0; + SendMessageW (infoPtr->Part[index].EditHwnd, EM_SETSEL, 0, -1); SetFocus (infoPtr->Part[index].EditHwnd); } diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index cc79b7bf11b..c1be745f258 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -62,17 +62,71 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } +struct child_enum +{ + HWND fields[4]; + unsigned int count; +}; + +static BOOL CALLBACK test_child_enum_proc(HWND hwnd, LPARAM param) +{ + struct child_enum *child_enum = (struct child_enum *)param; + char buff[16] = { 0 }; + unsigned int index; + + GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + index = atoi(buff); + ok(index < 4, "Unexpected index.\n"); + if (index < 4) + child_enum->fields[index] = hwnd; + + return ++child_enum->count < 4; +} + +static void test_IPM_SETFOCUS(void) +{ + struct child_enum child_enum = { 0 }; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + ret = SendMessageA(hwnd, IPM_SETFOCUS, 0, 0); +todo_wine + ok(ret, "Unexpected return value %u.\n", ret); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; HANDLE ctxt; test_get_set_text(); + test_IPM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); + test_IPM_SETFOCUS(); unload_v6_module(cookie, ctxt); } -- 2.28.0

1 2

[PATCH 2/2] ntdll/tests: Add tests for RtlEncode(System)Pointer.
by Myah Caron Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I'm sending this in without an implementation in case there's anything I need to change, as the implementation would mostly be a copy+paste job I believe (with the exception of implementing both process/usd cookies). It turns out that newer Windows versions rotate the cookie and the pointer right by an amount specified by the first 31/63 bits before XORing them. Unfortunately I couldn't find any mention of how this algorithm worked on google, so I had to spend some time to figure it out. If you're curious, here's the file I created to test how the the algorithm worked (sorry for the mess): https://github.com/qsniyg/wine_dll_load_test/blob/master/encodeptr.c dlls/ntdll/tests/rtl.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea05..416264bac0f 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -82,6 +82,11 @@ static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, U static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); +static VOID* (WINAPI *pRtlEncodePointer)(void *); +static VOID* (WINAPI *pRtlDecodePointer)(void *); +static VOID* (WINAPI *pRtlEncodeSystemPointer)(void *); +static VOID* (WINAPI *pRtlDecodeSystemPointer)(void *); +static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -122,6 +127,11 @@ static void InitFunctionPtrs(void) pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); + pRtlEncodePointer = (void *)GetProcAddress(hntdll, "RtlEncodePointer"); + pRtlDecodePointer = (void *)GetProcAddress(hntdll, "RtlDecodePointer"); + pRtlEncodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlEncodeSystemPointer"); + pRtlDecodeSystemPointer = (void *)GetProcAddress(hntdll, "RtlDecodeSystemPointer"); + pNtQueryInformationProcess = (void *)GetProcAddress(hntdll, "NtQueryInformationProcess"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -3483,6 +3493,78 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static void* our_encode_pointer(void* addr, ULONG cookie) +{ + int shift_amount; + uintptr_t rot_addr; + uintptr_t rot_cookie; + +#ifdef _WIN64 + shift_amount = cookie & 63; +#define ROTR _rotr64 +#else + shift_amount = cookie & 31; +#define ROTR _rotr +#endif + + rot_addr = ROTR((uintptr_t)addr, shift_amount); + rot_cookie = ROTR((uintptr_t)cookie, shift_amount); + + return (void*)(rot_addr ^ rot_cookie); +} + +static void test_RtlEncodePointer(void) +{ + void *addr = (void*)0xdeadbeef0123abcd; + void *encoded, *encoded1, *decoded; + void *our_encoded; + ULONG process_cookie = 0xdeadbeef; + ULONG system_cookie = *(ULONG*)(0x7ffe0000 + 0x330); /* user_shared_data.Cookie */ + NTSTATUS status; + + if (!pRtlEncodePointer || !pRtlDecodePointer) + { + win_skip("RtlEn/DecodePointer not available\n"); + return; + } + + encoded = pRtlEncodePointer(addr); + ok(encoded != addr, "got %p\n", encoded); + + decoded = pRtlDecodePointer(encoded); + ok(decoded == addr, "got %p\n", decoded); + + if (!pNtQueryInformationProcess) + { + win_skip("NtQueryInformationProcess not available\n"); + } + else + { + status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessCookie, &process_cookie, sizeof(process_cookie), NULL); + ok(status == S_OK, "got %08x\n", status); + ok(process_cookie != 0xdeadbeef, "got %08x\n", process_cookie); + + our_encoded = our_encode_pointer(addr, process_cookie); + todo_wine ok(encoded == our_encoded || broken(encoded == (void*)((uintptr_t)addr ^ (uintptr_t)process_cookie)), "got %p (ours %p)\n", encoded, our_encoded); + } + + if (!pRtlEncodeSystemPointer || !pRtlDecodeSystemPointer) + { + win_skip("RtlEn/DecodeSystemPointer not available\n"); + return; + } + + encoded1 = pRtlEncodeSystemPointer(addr); + ok(encoded != addr, "got %p\n", encoded); + todo_wine ok(encoded1 != encoded, "got %p\n", encoded1); + + decoded = pRtlDecodeSystemPointer(encoded1); + ok(decoded == addr, "got %p\n", decoded); + + our_encoded = our_encode_pointer(addr, system_cookie); + todo_wine ok(encoded1 == our_encoded || broken(encoded1 == (void*)((uintptr_t)addr ^ (uintptr_t)system_cookie)), "got %p (ours %p)\n", encoded1, our_encoded); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3605,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_RtlEncodePointer(); } -- 2.28.0

1 1

[PATCH 1/2] include: Add _rot[rl]64.
by Myah Caron Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- include/msvcrt/stdlib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 00acd374346..c3dac816f59 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -169,7 +169,9 @@ size_t __cdecl _mbstrlen(const char*); _onexit_t __cdecl _onexit(_onexit_t); int __cdecl _putenv(const char*); unsigned int __cdecl _rotl(unsigned int,int); +unsigned __int64 __cdecl _rotl64(unsigned __int64,int); unsigned int __cdecl _rotr(unsigned int,int); +unsigned __int64 __cdecl _rotr64(unsigned __int64,int); void __cdecl _searchenv(const char*,const char*,char*); int __cdecl _set_error_mode(int); void __cdecl _seterrormode(int); -- 2.28.0

1 0

[PATCH v2 2/2] msado15: Implement _Connection get/put Mode
by Hans Leidekker Oct. 8, 2020

Oct. 8, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Initialize mode with a different value in the test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 499f8b22563..357834a95fe 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -54,6 +54,7 @@ struct connection LONG timeout; WCHAR *datasource; WCHAR *provider; + ConnectModeEnum mode; struct connection_point cp_connev; }; @@ -336,14 +337,22 @@ static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorL static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, mode ); + + *mode = connection->mode; + return S_OK; } static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, mode ); + + connection->mode = mode; + return S_OK; } static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) @@ -664,6 +673,7 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); + connection->mode = adModeUnknown; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bedca96368d..8e8553c3b8d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -675,6 +675,7 @@ static void test_Connection(void) IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2, str3; + ConnectModeEnum mode; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -718,6 +719,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + mode = 0xdeadbeef; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeUnknown, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeShareDenyNone); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + mode = adModeUnknown; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeShareDenyNone, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeUnknown); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + /* Default */ str = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str); -- 2.28.0

1 0

[PATCH v2 1/2] msado15: Implement _Connection Get/Put Provider
by Hans Leidekker Oct. 8, 2020

Oct. 8, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v2: Remove redundant NULL check. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 26 +++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 37 +++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 5d8f78f53e8..499f8b22563 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -53,6 +53,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + WCHAR *provider; struct connection_point cp_connev; }; @@ -96,6 +97,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) IUnknown_Release( connection->cp_connev.sinks[i] ); } heap_free( connection->cp_connev.sinks ); + heap_free( connection->provider ); heap_free( connection->datasource ); heap_free( connection ); } @@ -346,14 +348,29 @@ static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum m static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR provider = NULL; + + TRACE( "%p, %p\n", iface, str ); + + if (connection->provider && !(provider = SysAllocString( connection->provider ))) return E_OUTOFMEMORY; + *str = provider; + return S_OK; } static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *provider = NULL; + + TRACE( "%p, %s\n", iface, debugstr_w(str) ); + + if (!str) return MAKE_ADO_HRESULT(adErrInvalidArgument); + + if (!(provider = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->provider ); + connection->provider = provider; + return S_OK; } static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) @@ -646,6 +663,7 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; + connection->provider = SysAllocString(L"MSDASQL"); connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1629fe15bed..bedca96368d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -718,15 +718,50 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + /* Default */ str = (BSTR)0xdeadbeef; - hr = _Connection_get_ConnectionString(connection, &str); + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL"), "wrong string %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"MSDASQL.1"); + hr = _Connection_put_Provider(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str)); + + /* Restore default */ + str = SysAllocString(L"MSDASQL"); + hr = _Connection_put_Provider(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + hr = _Connection_put_Provider(connection, NULL); + ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %p\n", str); str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); hr = _Connection_put_ConnectionString(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + /* Show put_ConnectionString effects Provider */ + str3 = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str3); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str3 != NULL, "Expected value got NULL\n"); + todo_wine ok(!wcscmp(str3, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str3)); + SysFreeString(str3); + if (0) /* Crashes on windows */ { hr = _Connection_get_ConnectionString(connection, NULL); -- 2.28.0

1 0