October 2020 - Wine-Commits

Jacek Caban : conhost: Pump window messages when we have a window.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 3d51714ce4d40506f9935e17e635f6d35be3057e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d51714ce4d40506f9935e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:00 2020 +0200 conhost: Pump window messages when we have a window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index f7db09b7da..70079e841e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2596,6 +2596,7 @@ static int main_loop( struct console *console, HANDLE signal ) unsigned short signal_id; IO_STATUS_BLOCK signal_io; NTSTATUS status; + BOOL pump_msgs; DWORD res; if (signal) @@ -2611,10 +2612,25 @@ static int main_loop( struct console *console, HANDLE signal ) wait_handles[wait_cnt++] = console->server; if (signal) wait_handles[wait_cnt++] = signal_event; if (console->input_thread) wait_handles[wait_cnt++] = console->input_thread; + pump_msgs = console->win != NULL; for (;;) { - res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE ); + if (pump_msgs) + res = MsgWaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE, QS_ALLEVENTS ); + else + res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE ); + + if (res == WAIT_OBJECT_0 + wait_cnt) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message == WM_QUIT) return 0; + DispatchMessageW(&msg); + } + continue; + } switch (res) {

1 0

Jacek Caban : conhost: Import loading console config from wineconsole.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 5c45ec90ffa8ee2f9472a9149258dd174309e203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c45ec90ffa8ee2f9472a914… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:12 2020 +0200 conhost: Import loading console config from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c45ec90ffa8ee2f9472…

1 0

Nikolay Sivov : comctl32/ipaddress: Select field contents on IPM_SETFOCUS.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 6f8957156e4207cbce33be76eef7291c70075810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8957156e4207cbce33be76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 17:03:25 2020 +0300 comctl32/ipaddress: Select field contents on IPM_SETFOCUS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 c75a108565..d415a96fb7 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 cc79b7bf11..5a5aafe7aa 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); }

1 0

Nikolay Sivov : comctl32/ipaddress: Fix IPM_SETFOCUS return value.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 6cfc5df3f5896e4fd5a6dd03db80faa48477c045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfc5df3f5896e4fd5a6dd03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 17:03:26 2020 +0300 comctl32/ipaddress: Fix IPM_SETFOCUS return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 11 ++++++----- dlls/comctl32/tests/ipaddress.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d415a96fb7..d08a2be3fd 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -387,14 +387,16 @@ static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_add } -static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) +static LRESULT IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) { - TRACE("(index=%d)\n", index); + TRACE("%d\n", index); if (index > 3 || index < 0) index=0; SendMessageW (infoPtr->Part[index].EditHwnd, EM_SETSEL, 0, -1); SetFocus (infoPtr->Part[index].EditHwnd); + + return 1; } @@ -624,9 +626,8 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IPM_SETRANGE: return IPADDRESS_SetRange (infoPtr, (int)wParam, (WORD)lParam); - case IPM_SETFOCUS: - IPADDRESS_SetFocusToField (infoPtr, (int)wParam); - break; + case IPM_SETFOCUS: + return IPADDRESS_SetFocusToField (infoPtr, (int)wParam); case IPM_ISBLANK: return IPADDRESS_IsBlank (infoPtr); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 5a5aafe7aa..939bfe7540 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -105,7 +105,6 @@ static void test_IPM_SETFOCUS(void) 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);

1 0

Hirofumi Katayama : comctl32/ipaddress: Focus first field on WM_SETFOCUS.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 3c291085235b57bb1f2ef92ccde4ca8035928a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c291085235b57bb1f2ef92c… Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> Date: Thu Oct 8 17:03:27 2020 +0300 comctl32/ipaddress: Focus first field on WM_SETFOCUS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49924 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 4 ++++ dlls/comctl32/tests/ipaddress.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d08a2be3fd..32816561e3 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -632,6 +632,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IPM_ISBLANK: return IPADDRESS_IsBlank (infoPtr); + case WM_SETFOCUS: + IPADDRESS_SetFocusToField (infoPtr, 0); + break; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 939bfe7540..c87d0f5664 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -113,6 +113,37 @@ static void test_IPM_SETFOCUS(void) DestroyWindow(hwnd); } +static void test_WM_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); + + SetFocus(child_enum.fields[3]); + + 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); + + SetFocus(hwnd); + + 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; @@ -120,12 +151,14 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); unload_v6_module(cookie, ctxt); }

1 0

Jacek Caban : conhost: Support painting screen buffer.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 3a6da8defa65e6615e9f29e5c600e62cea0a9bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a6da8defa65e6615e9f29e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:57 2020 +0200 conhost: Support painting screen buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 12 ++++++++++-- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index ac7508ed8e..68e27f74b8 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -318,10 +318,18 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) char_info_t *ch; char buf[8]; - if (!is_active( screen_buffer ) || !screen_buffer->console->tty_output) return; - if (rect->top > rect->bottom || rect->right < rect->left) return; + if (!is_active( screen_buffer ) || rect->top > rect->bottom || rect->right < rect->left) + return; + TRACE( "%s\n", wine_dbgstr_rect( rect )); + if (screen_buffer->console->win) + { + update_window_region( screen_buffer->console, rect ); + return; + } + if (!screen_buffer->console->tty_output) return; + hide_tty_cursor( screen_buffer->console ); for (y = rect->top; y <= rect->bottom; y++) diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 690472dcc7..c47253a755 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -131,6 +131,7 @@ struct screen_buffer }; BOOL init_window( struct console *console ); +void update_window_region( struct console *console, const RECT *update ); void update_window_config( struct console *console ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 7d9b416e25..2e94eb5969 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -933,6 +933,22 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp update_window( console ); break; + case WM_PAINT: + { + PAINTSTRUCT ps; + + BeginPaint( console->win, &ps ); + BitBlt( ps.hdc, 0, 0, + (console->active->win.right - console->active->win.left + 1) * console->active->font.width, + (console->active->win.bottom - console->active->win.top + 1) * console->active->font.height, + console->window->mem_dc, + console->active->win.left * console->active->font.width, + console->active->win.top * console->active->font.height, + SRCCOPY ); + EndPaint( console->win, &ps ); + break; + } + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); } @@ -947,6 +963,16 @@ void update_window_config( struct console *console ) PostMessageW( console->win, WM_UPDATE_CONFIG, 0, 0 ); } +void update_window_region( struct console *console, const RECT *update ) +{ + RECT *window_rect = &console->window->update; + window_rect->left = min( window_rect->left, update->left ); + window_rect->top = min( window_rect->top, update->top ); + window_rect->right = max( window_rect->right, update->right ); + window_rect->bottom = max( window_rect->bottom, update->bottom ); + update_window_config( console ); +} + BOOL init_window( struct console *console ) { struct console_config config;

1 0

Hans Leidekker : dssenh: Add stub implementations for a couple of functions.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: c690a31acf55bea967336504d81237b475ee5a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c690a31acf55bea967336504… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 8 18:02:43 2020 +0200 dssenh: Add stub implementations for a couple of functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 28 +++++++++--------- dlls/dssenh/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index c5c2545281..2d93a98796 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -1,27 +1,27 @@ -@ stub CPAcquireContext -@ stub CPCreateHash +@ stdcall CPAcquireContext(ptr str long ptr) +@ stdcall CPCreateHash(ptr long ptr long ptr) @ stub CPDecrypt -@ stub CPDeriveKey -@ stub CPDestroyHash -@ stub CPDestroyKey +@ stdcall CPDeriveKey(ptr long ptr long ptr) +@ stdcall CPDestroyHash(ptr ptr) +@ stdcall CPDestroyKey(ptr ptr) @ stub CPDuplicateHash @ stub CPDuplicateKey @ stub CPEncrypt -@ stub CPExportKey -@ stub CPGenKey +@ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) +@ stdcall CPGenKey(ptr long long ptr) @ stub CPGenRandom -@ stub CPGetHashParam +@ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam -@ stub CPGetProvParam +@ stdcall CPGetProvParam(ptr long ptr ptr long) @ stub CPGetUserKey -@ stub CPHashData +@ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey -@ stub CPImportKey -@ stub CPReleaseContext +@ stdcall CPImportKey(ptr ptr long ptr long ptr) +@ stdcall CPReleaseContext(ptr long) @ stub CPSetHashParam @ stub CPSetKeyParam @ stub CPSetProvParam -@ stub CPSignHash -@ stub CPVerifySignature +@ stdcall CPSignHash(ptr ptr long wstr long ptr ptr) +@ stdcall CPVerifySignature(ptr ptr ptr long ptr wstr long) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index b60b3447a3..80551cf578 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -21,10 +21,85 @@ #include "windef.h" #include "winbase.h" +#include "wincrypt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) +{ + return FALSE; +} + +BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetProvParam( HCRYPTPROV hprov, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyKey( HCRYPTPROV hprov, HCRYPTKEY hkey ) +{ + return FALSE; +} + +BOOL WINAPI CPImportKey( HCRYPTPROV hprov, const BYTE *data, DWORD len, HCRYPTKEY hpubkey, DWORD flags, + HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPExportKey( HCRYPTPROV hprov, HCRYPTKEY hkey, HCRYPTKEY hexpkey, DWORD blobtype, DWORD flags, + BYTE *data, DWORD *len ) +{ + return FALSE; +} + +BOOL WINAPI CPCreateHash( HCRYPTPROV hprov, ALG_ID algid, HCRYPTKEY hkey, DWORD flags, HCRYPTHASH *ret_hash ) +{ + return FALSE; +} + +BOOL WINAPI CPDestroyHash( HCRYPTPROV hprov, HCRYPTHASH hhash ) +{ + return FALSE; +} + +BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DWORD len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) +{ + return FALSE; +} + +BOOL WINAPI CPDeriveKey( HCRYPTPROV hprov, ALG_ID algid, HCRYPTHASH hhash, DWORD flags, HCRYPTKEY *ret_key ) +{ + return FALSE; +} + +BOOL WINAPI CPSignHash( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD keyspec, const WCHAR *desc, DWORD flags, BYTE *sig, + DWORD *siglen ) +{ + return FALSE; +} + +BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *sig, DWORD siglen, HCRYPTKEY hpubkey, + const WCHAR *desc, DWORD flags ) +{ + return FALSE; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);

1 0

Gabriel Ivăncescu : qedit/nullrenderer: Wait in Receive() while paused.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 412db7789379549c4f821acb11c92f7aabab71c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=412db7789379549c4f821acb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 8 11:52:29 2020 -0500 qedit/nullrenderer: Wait in Receive() while paused. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 24 ++++++++++++++++++++++++ dlls/qedit/tests/nullrenderer.c | 10 +++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index c64d5e2987..a8594eade8 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); struct null_renderer { struct strmbase_renderer renderer; + HANDLE run_event; }; static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_renderer *iface) @@ -41,7 +42,14 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac struct null_renderer *filter = impl_from_strmbase_renderer(iface); if (filter->renderer.filter.state == State_Paused) + { + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + SetEvent(filter->renderer.state_event); + LeaveCriticalSection(&filter->renderer.csRenderLock); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->renderer.csRenderLock); + } return S_OK; } @@ -56,14 +64,29 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) { struct null_renderer *filter = impl_from_strmbase_renderer(iface); + CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter); } +static void null_renderer_start_stream(struct strmbase_renderer *iface) +{ + struct null_renderer *filter = impl_from_strmbase_renderer(iface); + SetEvent(filter->run_event); +} + +static void null_renderer_stop_stream(struct strmbase_renderer *iface) +{ + struct null_renderer *filter = impl_from_strmbase_renderer(iface); + ResetEvent(filter->run_event); +} + static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = NullRenderer_CheckMediaType, .pfnDoRenderSample = NullRenderer_DoRenderSample, + .renderer_start_stream = null_renderer_start_stream, + .renderer_stop_stream = null_renderer_stop_stream, .renderer_destroy = null_renderer_destroy, }; @@ -75,6 +98,7 @@ HRESULT null_renderer_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_renderer_init(&object->renderer, outer, &CLSID_NullRenderer, L"In", &renderer_ops); + object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); TRACE("Created null renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 3285e22e5c..754228d770 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -615,7 +615,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -648,7 +648,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -674,7 +674,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -742,7 +742,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_FALSE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -766,7 +766,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection Get/Put Provider.
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 2262e048270061eb148453d3d25bd3b1282ef9f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2262e048270061eb148453d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 8 14:00:35 2020 +0200 msado15: Implement _Connection Get/Put Provider. 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 | 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 5d8f78f53e..499f8b2256 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 1629fe15be..bedca96368 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);

1 0

Paul Gofman : ntdll: Allocate TEB FLS data in LdrInitializeThunk().
by Alexandre Julliard Oct. 8, 2020

Oct. 8, 2020

Module: wine Branch: master Commit: 87ea7698ab8c859f0b7e4f363339b0b15c31abd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ea7698ab8c859f0b7e4f36… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 6 13:04:49 2020 +0300 ntdll: Allocate TEB FLS data in LdrInitializeThunk(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 3 +-- dlls/ntdll/loader.c | 2 ++ dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index fecbee3ba1..8e8834239b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2629,8 +2629,7 @@ todo_wine SetLastError(0xdeadbeef); value = pFlsGetValue(fls_index); ok(!value, "FlsGetValue returned %p, expected NULL\n", value); - todo_wine - ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "FlsGetValue failed with error %u\n", GetLastError()); ret = pFlsSetValue(fls_index, (void*) 0x31415); ok(ret, "FlsSetValue failed\n"); fls_count++; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1d5ffc33f5..8374dd9732 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3511,6 +3511,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks ); RtlReleasePebLock(); + NtCurrentTeb()->FlsSlots = fls_alloc_data(); + if (!attach_done) /* first time around */ { attach_done = 1; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 19bf574a44..41e8666a25 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -129,5 +129,6 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) /* FLS data */ extern void init_global_fls_data(void) DECLSPEC_HIDDEN; +extern TEB_FLS_DATA *fls_alloc_data(void) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6b88d0ed8e..822dc21fbb 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -294,7 +294,7 @@ static unsigned int fls_chunk_index_from_index( unsigned int index, unsigned int return chunk_index; } -static TEB_FLS_DATA * fls_alloc_data(void) +TEB_FLS_DATA *fls_alloc_data(void) { TEB_FLS_DATA *fls;

1 0