October 2020 - Wine-Commits

Nikolay Sivov : comctl32/tests: Fix loop bounds.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: c11fca37de27b6f7afc3487d99b69dd8ce422493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c11fca37de27b6f7afc3487d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:35:18 2020 +0300 comctl32/tests: Fix loop bounds. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/ipaddress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 2df25a5a65..5c4db5adc8 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -98,7 +98,7 @@ static void test_IPM_SETFOCUS(void) 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) + for (i = 0; i < 4; ++i) SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); @@ -130,7 +130,7 @@ static void test_WM_SETFOCUS(void) SetFocus(child_enum.fields[3]); - for (i = 0; i < 3; ++i) + for (i = 0; i < 4; ++i) SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to);

1 0

Nikolay Sivov : mf/evr: Implement GetMediaTypeCount().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 6408aa3ab74d4740f276c0b8cc444dd6a9e6842e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6408aa3ab74d4740f276c0b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 9 13:54:36 2020 +0300 mf/evr: Implement GetMediaTypeCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 9 +++++++-- dlls/mf/tests/mf.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ac3f17fa58..7567b1a709 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -372,9 +372,14 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType static HRESULT WINAPI video_stream_typehandler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + TRACE("%p, %p.\n", iface, count); - return E_NOTIMPL; + if (!count) + return E_POINTER; + + *count = 0; + + return S_OK; } static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a63c353a4b..db442453d6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3296,6 +3296,15 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected type %s.\n", wine_dbgstr_guid(&guid)); + /* Supported types are not advertised. */ + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 1; + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */

1 0

Alistair Leslie-Hughes : msado15: Implement _Command get/putref ActiveConnection.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: aff59389658461630206c3683d84bd754555bc30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff59389658461630206c368… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:57:15 2020 +1100 msado15: Implement _Command get/putref ActiveConnection. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index eb7b3a035e..d19108a1a2 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -35,6 +35,7 @@ struct command LONG ref; CommandTypeEnum type; BSTR text; + _Connection *connection; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -80,6 +81,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + if (command->connection) _Connection_Release(command->connection); heap_free( command->text ); heap_free( command ); } @@ -121,14 +123,23 @@ static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **prop static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + *connection = command->connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + if (command->connection) _Connection_Release(command->connection); + command->connection = connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) @@ -343,6 +354,7 @@ HRESULT Command_create( void **obj ) command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL; + command->connection = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index efcee58c56..378c2eb918 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -850,6 +850,7 @@ static void test_Command(void) Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; + _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -903,6 +904,14 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + connection = (_Connection*)0xdeadbeef; + hr = _Command_get_ActiveConnection( command, &connection ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connection == NULL, "got %p\n", connection ); + + hr = _Command_putref_ActiveConnection( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Zebediah Figura : qedit/tests: Add some basic tests for null renderer connection and streaming.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 944f91b1475a701c75e2fc0dd43112a4192a7e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944f91b1475a701c75e2fc0d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 8 11:52:28 2020 -0500 qedit/tests: Add some basic tests for null renderer connection and streaming. Adapted from the video renderer tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 464 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 464 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=944f91b1475a701c75e2…

1 0

Hans Leidekker : dssenh: Register the DSS provider.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 3ae2dd164c2e8134af573e4dc9643317d30c758e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ae2dd164c2e8134af573e4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 8 18:02:44 2020 +0200 dssenh: Register the DSS provider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/Makefile.in | 2 ++ dlls/dssenh/dssenh.rgs | 56 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dssenh/main.c | 22 ++++++++++-------- dlls/dssenh/rsrc.rc | 22 ++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 5 ++--- 5 files changed, 95 insertions(+), 12 deletions(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4f05beee51..8015768f99 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -4,3 +4,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +RC_SRCS = rsrc.rc diff --git a/dlls/dssenh/dssenh.rgs b/dlls/dssenh/dssenh.rgs new file mode 100644 index 0000000000..0e9bad7c17 --- /dev/null +++ b/dlls/dssenh/dssenh.rgs @@ -0,0 +1,56 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Base DSS Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 3 + } + ForceRemove 'Microsoft Base DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 13 + } + ForceRemove 'Microsoft DH SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Type' = d 18 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 003' + { + val 'Name' = s 'Microsoft Base DSS Cryptographic Provider' + val 'TypeName' = s 'DSS Signature' + } + ForceRemove 'Type 013' + { + val 'Name' = s 'Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider' + val 'TypeName' = s 'DSS Signature with Diffie-Hellman Key Exchange' + } + ForceRemove 'Type 018' + { + val 'Name' = s 'Microsoft DH SChannel Cryptographic Provider' + val 'TypeName' = s 'Diffie-Hellman SChannel' + } + } + } + } + } + } +} diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 80551cf578..5aa885c8b8 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,8 +22,13 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "objbase.h" +#include "rpcproxy.h" + #include "wine/debug.h" +static HINSTANCE instance; + WINE_DEFAULT_DEBUG_CHANNEL(dssenh); BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) @@ -106,11 +111,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); + break; } return TRUE; } @@ -120,8 +126,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_register_resources( instance ); } /***************************************************** @@ -129,6 +134,5 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("Not implemented.\n"); - return E_UNEXPECTED; + return __wine_unregister_resources( instance ); } diff --git a/dlls/dssenh/rsrc.rc b/dlls/dssenh/rsrc.rc new file mode 100644 index 0000000000..ac5ba6258e --- /dev/null +++ b/dlls/dssenh/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for dssenh + * + * Copyright 2020 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: dssenh.rgs */ +1 WINE_REGISTRY dssenh.rgs diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 7a16acc679..c88fcd1466 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -54,7 +54,6 @@ static void test_acquire_context(void) /* cannot acquire along with PROV_RSA_SIG, not compatible */ SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, MS_DEF_DSS_PROV_A, PROV_RSA_SIG, 0); - todo_wine ok(!result && GetLastError() == NTE_PROV_TYPE_NO_MATCH, "Expected NTE_PROV_TYPE_NO_MATCH, got %08x\n", GetLastError()); @@ -574,7 +573,7 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping encryption tests.\n"); return; @@ -665,7 +664,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptAcquireContextA( &hProv, NULL, MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); - if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + if (!result) { skip("DSSENH is currently not available, skipping block cipher mode tests.\n"); return;

1 0

Jacek Caban : conhost: Update window config in ioctl handlers when needed.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: c2ffbe5d364d07971e0c893c6d52e5606dfbaef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2ffbe5d364d07971e0c893c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:48 2020 +0200 conhost: Update window config in ioctl handlers when needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 13 ++++++++++--- programs/conhost/conhost.h | 2 ++ programs/conhost/window.c | 13 +++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 5c5f184e6e..ac7508ed8e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1162,6 +1162,7 @@ static void update_read_output( struct console *console ) if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); tty_sync( screen_buffer->console ); + update_window_config( screen_buffer->console ); } static NTSTATUS process_console_input( struct console *console ) @@ -1632,9 +1633,10 @@ static NTSTATUS screen_buffer_activate( struct screen_buffer *screen_buffer ) RECT update_rect; TRACE( "%p\n", screen_buffer ); screen_buffer->console->active = screen_buffer; - SetRect( &update_rect, 0, 0, screen_buffer->width - 1, screen_buffer->height - 1); + SetRect( &update_rect, 0, 0, screen_buffer->width - 1, screen_buffer->height - 1 ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); + update_window_config( screen_buffer->console ); return STATUS_SUCCESS; } @@ -1840,7 +1842,11 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, } } - if (is_active( screen_buffer )) tty_sync( screen_buffer->console ); + if (is_active( screen_buffer )) + { + tty_sync( screen_buffer->console ); + update_window_config( screen_buffer->console ); + } return STATUS_SUCCESS; } @@ -1898,6 +1904,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); + update_window_config( screen_buffer->console ); return STATUS_SUCCESS; } @@ -2384,7 +2391,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, blocking = in_size && *(unsigned int *)in_data; if (blocking && !console->record_count && *out_size) { - TRACE( "pending read" ); + TRACE( "pending read\n" ); console->read_ioctl = IOCTL_CONDRV_READ_INPUT; console->pending_read = *out_size; return STATUS_PENDING; diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 49c3cccbce..690472dcc7 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -131,6 +131,8 @@ struct screen_buffer }; BOOL init_window( struct console *console ); +void update_window_config( struct console *console ); + NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4085fd7a57..7d9b416e25 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(conhost); +#define WM_UPDATE_CONFIG (WM_USER + 1) + enum update_state { UPDATE_NONE, @@ -927,6 +929,10 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp PostQuitMessage( 0 ); break; + case WM_UPDATE_CONFIG: + update_window( console ); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); } @@ -934,6 +940,13 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp return 0; } +void update_window_config( struct console *console ) +{ + if (!console->win || console->window->update_state != UPDATE_NONE) return; + console->window->update_state = UPDATE_PENDING; + PostMessageW( console->win, WM_UPDATE_CONFIG, 0, 0 ); +} + BOOL init_window( struct console *console ) { struct console_config config;

1 0

Jacek Caban : conhost: Import window state update from wineconsole.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 632676d071a936199d6d91d804f2e62321c870f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=632676d071a936199d6d91d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:41 2020 +0200 conhost: Import window state update from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 5 - programs/conhost/conhost.h | 5 + programs/conhost/window.c | 259 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 264 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=632676d071a936199d6d…

1 0

Jacek Caban : conhost: Import font selection support from wineconsole.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 7d48e0c564ef9a65608c01cc55657734f7d5004e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d48e0c564ef9a65608c01cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:27 2020 +0200 conhost: Import font selection support from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d48e0c564ef9a65608c…

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection get/put Mode.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: f3508490390adc5c4b9b0bb9d67ec69f90c572d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3508490390adc5c4b9b0bb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 8 14:00:36 2020 +0200 msado15: Implement _Connection get/put Mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 499f8b2256..357834a95f 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 bedca96368..8e8553c3b8 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);

1 0

Jacek Caban : conhost: Initial support for creating console window.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: bbd4196814e9aa262112b338bfa976a575e64e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd4196814e9aa262112b338… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:29:51 2020 +0200 conhost: Initial support for creating console window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbd4196814e9aa262112…

1 0