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

Zhiyi Zhang : user32/edit: Let DefWindowProcA/W() handle WM_IME_CHAR.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: ac9c3ef5aae3f769ec2e92929359c7e30c5a8db1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac9c3ef5aae3f769ec2e92929359c7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/edit: Let DefWindowProcA/W() handle WM_IME_CHAR. So that WM_IME_CHAR will be converted to WM_CHAR in DefWindowProcA/W(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 14 -------------- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index bee158586b9..6593ee6dce2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4976,20 +4976,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B } break; - case WM_IME_CHAR: - if (!unicode) - { - WCHAR charW; - CHAR strng[2]; - - strng[0] = wParam >> 8; - strng[1] = wParam & 0xff; - if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); - else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); - result = EDIT_WM_Char(es, charW); - break; - } - /* fall through */ case WM_CHAR: { WCHAR charW; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index adda16a0f3b..2d43c1ad1aa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12271,7 +12271,7 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) flush_sequence(); SendMessageA(hwnd, WM_IME_CHAR, '0', 1); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", TRUE); + ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", FALSE); /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); @@ -12292,7 +12292,7 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) flush_sequence(); SendMessageA(hwnd, WM_IME_CHAR, '0', 1); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", TRUE); + ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", FALSE); ImmReleaseContext(hwnd, himc); DestroyWindow(hwnd);

1 0

Nikolay Sivov : mfreadwrite/writer: Implement PlaceMarker().
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: b3a01e2bf0b01504feae910343c61b0d093347f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3a01e2bf0b01504feae910343c61b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 17 22:39:37 2022 +0300 mfreadwrite/writer: Implement PlaceMarker(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/writer.c | 61 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 4e4bc988c9b..10806f30cf5 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #define COBJMACROS #define NONAMELESSUNION @@ -140,6 +142,14 @@ static const IUnknownVtbl marker_context_vtbl = marker_context_Release, }; +static struct marker_context *unsafe_impl_from_marker_context_IUnknown(IUnknown *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &marker_context_vtbl); + return CONTAINING_RECORD(iface, struct marker_context, IUnknown_iface); +} + static HRESULT create_marker_context(unsigned int marker_type, void *user_context, IUnknown **ret) { @@ -587,11 +597,28 @@ static HRESULT WINAPI sink_writer_SendStreamTick(IMFSinkWriter *iface, DWORD ind return hr; } -static HRESULT WINAPI sink_writer_PlaceMarker(IMFSinkWriter *iface, DWORD index, void *context) +static HRESULT WINAPI sink_writer_PlaceMarker(IMFSinkWriter *iface, DWORD index, void *user_context) { - FIXME("%p, %lu, %p.\n", iface, index, context); + struct sink_writer *writer = impl_from_IMFSinkWriter(iface); + struct stream *stream; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %lu, %p.\n", iface, index, user_context); + + EnterCriticalSection(&writer->cs); + + if (!writer->callback) + hr = MF_E_INVALIDREQUEST; + else if (writer->state != SINK_WRITER_STATE_WRITING) + hr = MF_E_INVALIDREQUEST; + else if (!(stream = sink_writer_get_stream(writer, index))) + hr = MF_E_INVALIDSTREAMNUMBER; + else + hr = sink_writer_queue_marker(writer, stream, MFSTREAMSINK_MARKER_DEFAULT, 0, user_context); + + LeaveCriticalSection(&writer->cs); + + return hr; } static HRESULT WINAPI sink_writer_NotifyEndOfSegment(IMFSinkWriter *iface, DWORD index) @@ -768,14 +795,18 @@ static HRESULT WINAPI sink_writer_callback_GetParameters(IMFAsyncCallback *iface return E_NOTIMPL; } -static struct stream *sink_writer_get_stream_for_stream_sink(struct sink_writer *writer, IMFStreamSink *stream_sink) +static struct stream *sink_writer_get_stream_for_stream_sink(struct sink_writer *writer, + IMFStreamSink *stream_sink, DWORD *index) { - size_t i; + unsigned int i; for (i = 0; i < writer->streams.count; ++i) { if (writer->streams.items[i].stream_sink == stream_sink) + { + *index = i; return &writer->streams.items[i]; + } } return NULL; @@ -784,12 +815,15 @@ static struct stream *sink_writer_get_stream_for_stream_sink(struct sink_writer static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct sink_writer *writer = impl_from_events_callback_IMFAsyncCallback(iface); + struct marker_context *context; IMFStreamSink *stream_sink; MediaEventType event_type; struct stream *stream; IMFMediaEvent *event; LONGLONG timestamp; HRESULT status, hr; + PROPVARIANT value; + DWORD index; TRACE("%p, %p.\n", iface, result); @@ -803,12 +837,14 @@ static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface TRACE("Got event %lu.\n", event_type); + PropVariantInit(&value); + EnterCriticalSection(&writer->cs); if (writer->status == S_OK && FAILED(status)) writer->status = status; - if (writer->status == S_OK && (stream = sink_writer_get_stream_for_stream_sink(writer, stream_sink))) + if (writer->status == S_OK && (stream = sink_writer_get_stream_for_stream_sink(writer, stream_sink, &index))) { switch (event_type) { @@ -824,6 +860,17 @@ static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface sink_writer_process_sample(writer, stream); break; + + case MEStreamSinkMarker: + if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) break; + if (value.vt != VT_UNKNOWN || !(context = unsafe_impl_from_marker_context_IUnknown(value.punkVal))) break; + + /* This relies on the fact that default marker type is only used for PlaceMarker(). */ + if (context->marker_type == MFSTREAMSINK_MARKER_DEFAULT) + IMFSinkWriterCallback_OnMarker(writer->callback, index, context->user_context); + + break; + default: ; } @@ -831,6 +878,8 @@ static HRESULT WINAPI sink_writer_events_callback_Invoke(IMFAsyncCallback *iface LeaveCriticalSection(&writer->cs); + PropVariantClear(&value); + IMFMediaEvent_Release(event); IMFStreamSink_BeginGetEvent(stream_sink, iface, (IUnknown *)stream_sink);

1 0

Zhiyi Zhang : user32/edit: Implement EM_SETIMESTATUS.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 6baf1198ba7d8b58910db8607c755ff924222e57 URL: https://gitlab.winehq.org/wine/wine/-/commit/6baf1198ba7d8b58910db8607c755f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/edit: Implement EM_SETIMESTATUS. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 10 +++++++++- dlls/user32/tests/msg.c | 10 ---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 496d5e7287f..7bfe18e952e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - EM_GETIMESTATUS, EM_SETIMESTATUS + * - EM_GETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC * - ES_OEMCONVERT @@ -138,6 +138,7 @@ typedef struct */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ + UINT ime_status; /* IME status flag */ /* * Uniscribe Data */ @@ -4928,6 +4929,13 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETIMESTATUS: + if (wParam == EMSIS_COMPOSITIONSTRING) + es->ime_status = lParam & 0xFFFF; + + result = 1; + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 42026b7a889..dcfeb329abc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12199,21 +12199,18 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) /* Note that EM_SETIMESTATUS always return 1, which is contrary to what MSDN says about * returning the previous LPARAM value */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_CANCELCOMPSTRINFOCUS); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine ok(lr == EIMES_CANCELCOMPSTRINFOCUS, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_COMPLETECOMPSTRKILLFOCUS); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine @@ -12221,7 +12218,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine @@ -12229,7 +12225,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); @@ -12244,26 +12239,22 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, 0, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0xFFFFFFFF); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine ok(lr == 0xFFFF, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); @@ -12291,7 +12282,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); todo_wine

1 0

Zhiyi Zhang : user32/tests: Link directly to imm32.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 0c78cfce976bc14145f56cb61f72ed1a798db42e URL: https://gitlab.winehq.org/wine/wine/-/commit/0c78cfce976bc14145f56cb61f72ed… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/tests: Link directly to imm32. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/Makefile.in | 2 +- dlls/user32/tests/input.c | 12 ++---------- dlls/user32/tests/msg.c | 13 ++----------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index dd101d69f3c..344a3b66d2b 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = user32.dll -IMPORTS = user32 gdi32 advapi32 hid +IMPORTS = user32 gdi32 advapi32 hid imm32 C_SRCS = \ broadcast.c \ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0d003c6cc21..f508ed69b74 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -55,6 +55,7 @@ #include "winnls.h" #include "winreg.h" #include "ddk/hidsdi.h" +#include "imm.h" #include "wine/test.h" @@ -1188,8 +1189,6 @@ static void test_Input_unicode(void) WNDCLASSW wclass; HANDLE hInstance = GetModuleHandleW(NULL); HHOOK hook; - HMODULE hModuleImm32; - BOOL (WINAPI *pImmDisableIME)(DWORD); BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); if (!us_kbd) { @@ -1212,14 +1211,7 @@ static void test_Input_unicode(void) return; } - hModuleImm32 = LoadLibraryA("imm32.dll"); - if (hModuleImm32) { - pImmDisableIME = (void *)GetProcAddress(hModuleImm32, "ImmDisableIME"); - if (pImmDisableIME) - pImmDisableIME(0); - } - pImmDisableIME = NULL; - FreeLibrary(hModuleImm32); + ImmDisableIME(0); /* create the test window that will receive the keystrokes */ hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2705914d5e5..9f8522d4ac8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -32,6 +32,7 @@ #include "winnls.h" #include "dbt.h" #include "commctrl.h" +#include "imm.h" #include "wine/test.h" @@ -18794,8 +18795,6 @@ START_TEST(msg) char **test_argv; BOOL ret; BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ - HMODULE hModuleImm32; - BOOL (WINAPI *pImmDisableIME)(DWORD); int argc; argc = winetest_get_mainargs( &test_argv ); @@ -18810,15 +18809,7 @@ START_TEST(msg) InitializeCriticalSection( &sequence_cs ); init_procs(); - - hModuleImm32 = LoadLibraryA("imm32.dll"); - if (hModuleImm32) { - pImmDisableIME = (void *)GetProcAddress(hModuleImm32, "ImmDisableIME"); - if (pImmDisableIME) - pImmDisableIME(0); - } - pImmDisableIME = NULL; - FreeLibrary(hModuleImm32); + ImmDisableIME(0); if (!RegisterWindowClasses()) assert(0);

1 0

Zhiyi Zhang : user32/tests: Add IME tests for edit control.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: d06f4a5ed27f37c2ccea98b5ce554d6d2fbc9aba URL: https://gitlab.winehq.org/wine/wine/-/commit/d06f4a5ed27f37c2ccea98b5ce554d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/tests: Add IME tests for edit control. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9f8522d4ac8..42026b7a889 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12105,6 +12105,218 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L return ret; } +static const struct message edit_wm_ime_composition_seq[] = +{ + {WM_IME_STARTCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'W'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'i'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'n'}, + {WM_IME_CHAR, sent | wparam | defwinproc, 'e'}, + {WM_IME_ENDCOMPOSITION, sent}, + {WM_CHAR, sent | wparam, 'W'}, + {WM_CHAR, sent | wparam, 'i'}, + {WM_CHAR, sent | wparam, 'n'}, + {WM_CHAR, sent | wparam, 'e'}, + {0} +}; + +static const struct message edit_wm_ime_char_seq[] = +{ + {WM_IME_CHAR, sent | wparam, '0'}, + {WM_CHAR, sent | wparam, '0'}, + {0} +}; + +static const struct message edit_eimes_getcompstratonce_seq[] = +{ + {WM_IME_STARTCOMPOSITION, sent}, + {WM_IME_COMPOSITION, sent | wparam, 'W'}, + {WM_IME_ENDCOMPOSITION, sent}, + {0} +}; + +static LRESULT CALLBACK edit_ime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct recvd_message msg = {0}; + LRESULT ret; + + msg.message = message; + msg.flags = sent | wparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + + if (message < 0xc000 && + message != WM_GETTEXTLENGTH && + message != WM_GETTEXT && + message != WM_GETFONT && + message != WM_GETICON && + message != WM_IME_SETCONTEXT && + message != WM_IME_NOTIFY && + message != WM_CTLCOLOREDIT && + message != WM_PAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + message != WM_SETCURSOR && + message != WM_MOUSEMOVE && + message != WM_MOUSEACTIVATE && + message != WM_KEYUP && + (message < EM_GETSEL || message > EM_GETIMESTATUS)) + { + add_message(&msg); + } + + defwndproc_counter++; + if (IsWindowUnicode(hwnd)) + ret = CallWindowProcW(oldproc, hwnd, message, wParam, lParam); + else + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static DWORD WINAPI test_edit_ime_messages(void *unused_arg) +{ + WNDPROC old_proc; + LRESULT lr; + HIMC himc; + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowA(WC_EDITA, "Test", WS_POPUP | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, + NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed.\n"); + + /* Test EM_{GET|SET}IMESTATUS */ + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + /* Note that EM_SETIMESTATUS always return 1, which is contrary to what MSDN says about + * returning the previous LPARAM value */ + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_CANCELCOMPSTRINFOCUS); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_CANCELCOMPSTRINFOCUS, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_COMPLETECOMPSTRKILLFOCUS); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_COMPLETECOMPSTRKILLFOCUS, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE + | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == (EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS), + "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + /* Invalid EM_{GET|SET}IMESTATUS status types and flags */ + lr = SendMessageA(hwnd, EM_GETIMESTATUS, 0, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, 0, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0xFFFFFFFF); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == 0xFFFF, "Got unexpected lr %#Ix.\n", lr); + + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + ok(lr == 0, "Got unexpected lr %#Ix.\n", lr); + + /* Test IME messages when EIMES_GETCOMPSTRATONCE is not set */ + old_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_ime_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)old_proc); + + himc = ImmGetContext(hwnd); + ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0); + ok(ret, "ImmSetCompositionStringA failed.\n"); + flush_sequence(); + ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME failed.\n"); + /* Note that the following message loop is necessary to get the WM_CHAR messages because they + * are posted. Same for the later message loops in this function. */ + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(edit_wm_ime_composition_seq, "WM_IME_COMPOSITION", TRUE); + + /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR */ + flush_sequence(); + SendMessageA(hwnd, WM_IME_CHAR, '0', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", TRUE); + + /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ + lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); + todo_wine + ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); + lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); + todo_wine + ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); + + ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0); + ok(ret, "ImmSetCompositionStringA failed.\n"); + flush_sequence(); + ret = ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ok(ret, "ImmNotifyIME failed.\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(edit_eimes_getcompstratonce_seq, + "WM_IME_COMPOSITION with EIMES_GETCOMPSTRATONCE", TRUE); + + /* Test that WM_IME_CHAR is passed to DefWindowProc() to get WM_CHAR with EIMES_GETCOMPSTRATONCE */ + flush_sequence(); + SendMessageA(hwnd, WM_IME_CHAR, '0', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", TRUE); + + ImmReleaseContext(hwnd, himc); + DestroyWindow(hwnd); + return 0; +} + static void subclass_edit(void) { WNDCLASSA cls; @@ -12124,6 +12336,7 @@ static void test_edit_messages(void) { HWND hwnd, parent; DWORD dlg_code; + HANDLE thread; subclass_edit(); log_all_parent_messages++; @@ -12215,6 +12428,11 @@ static void test_edit_messages(void) DestroyWindow(parent); log_all_parent_messages--; + + /* Test IME messages in another thread because IME is disabled in the current thread */ + thread = CreateThread(NULL, 0, test_edit_ime_messages, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); } /**************************** End of Edit test ******************************/

1 0

Nikolay Sivov : mfreadwrite/writer: Implement Flush().
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 2a5cf1b62a0e98852c55925e56f63924695adbac URL: https://gitlab.winehq.org/wine/wine/-/commit/2a5cf1b62a0e98852c55925e56f639… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 18 15:56:22 2022 +0300 mfreadwrite/writer: Implement Flush(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/writer.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 10806f30cf5..aaf972734c4 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -458,6 +458,22 @@ static HRESULT sink_writer_notify_end_of_segment(struct sink_writer *writer, uns return sink_writer_queue_marker(writer, stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, 0, NULL); } +static HRESULT sink_writer_flush(struct sink_writer *writer, unsigned int index) +{ + struct stream *stream; + + if (!(stream = sink_writer_get_stream(writer, index))) return MF_E_INVALIDSTREAMNUMBER; + + sink_writer_drop_pending_items(stream); + + IMFStreamSink_Flush(stream->stream_sink); + + if (stream->encoder) + IMFTransform_ProcessMessage(stream->encoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + + return sink_writer_place_marker(writer, stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, 0, NULL); +} + static HRESULT sink_writer_process_sample(struct sink_writer *writer, struct stream *stream) { struct pending_item *item, *next; @@ -654,9 +670,33 @@ static HRESULT WINAPI sink_writer_NotifyEndOfSegment(IMFSinkWriter *iface, DWORD static HRESULT WINAPI sink_writer_Flush(IMFSinkWriter *iface, DWORD index) { - FIXME("%p, %lu.\n", iface, index); + struct sink_writer *writer = impl_from_IMFSinkWriter(iface); + HRESULT hr = S_OK; + unsigned int i; - return E_NOTIMPL; + TRACE("%p, %lu.\n", iface, index); + + EnterCriticalSection(&writer->cs); + + if (writer->state != SINK_WRITER_STATE_WRITING) + hr = MF_E_INVALIDREQUEST; + else if (index == MF_SINK_WRITER_ALL_STREAMS) + { + for (i = 0; i < writer->streams.count; ++i) + { + if (FAILED(hr = sink_writer_flush(writer, i))) + { + WARN("Failed to flush stream %u.\n", i); + break; + } + } + } + else + hr = sink_writer_flush(writer, index); + + LeaveCriticalSection(&writer->cs); + + return hr; } static HRESULT WINAPI sink_writer_Finalize(IMFSinkWriter *iface)

1 0

Nikolay Sivov : mfreadwrite/writer: Reference user callback.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 4e410f0769ec09300fe3669970e808647f846be8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e410f0769ec09300fe3669970e808… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 17 22:12:10 2022 +0300 mfreadwrite/writer: Reference user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/writer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index a157bccd785..4e4bc988c9b 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -83,6 +83,8 @@ struct sink_writer HRESULT status; MF_SINK_WRITER_STATISTICS stats; + IMFSinkWriterCallback *callback; + CRITICAL_SECTION cs; }; @@ -215,6 +217,8 @@ static ULONG WINAPI sink_writer_Release(IMFSinkWriter *iface) IMFPresentationClock_Release(writer->clock); if (writer->sink) IMFMediaSink_Release(writer->sink); + if (writer->callback) + IMFSinkWriterCallback_Release(writer->callback); for (i = 0; i < writer->streams.count; ++i) { struct stream *stream = &writer->streams.items[i]; @@ -885,6 +889,12 @@ HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attribut object->stats.cb = sizeof(object->stats); InitializeCriticalSection(&object->cs); + if (attributes) + { + IMFAttributes_GetUnknown(attributes, &MF_SINK_WRITER_ASYNC_CALLBACK, + &IID_IMFSinkWriterCallback, (void **)&object->callback); + } + if (FAILED(hr = sink_writer_initialize_existing_streams(object, sink))) { IMFSinkWriter_Release(&object->IMFSinkWriter_iface);

1 0

Nikolay Sivov : mfreadwrite/writer: Add sample/marker queue for each stream.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 862ac14e107e845ccdc5648225c7962819178cf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/862ac14e107e845ccdc5648225c796… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 17 11:32:30 2022 +0300 mfreadwrite/writer: Add sample/marker queue for each stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/writer.c | 298 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 289 insertions(+), 9 deletions(-)

1 0

Piotr Caban : msvcp71: Use MultiByteToWideChar in _Fiopen implementation.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: e0473521935c7ac9ccc07b0053e45a9f9315d962 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0473521935c7ac9ccc07b0053e45a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 18 10:17:24 2022 +0200 msvcp71: Use MultiByteToWideChar in _Fiopen implementation. Spotted by Yeshun Ye. --- dlls/msvcp90/ios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a8014a3dfcf..d176dffa802 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3262,7 +3262,7 @@ FILE* __cdecl _Fiopen(const char *name, int mode, int prot) TRACE("(%s %d %d)\n", name, mode, prot); -#if _MSVCP_VER >= 71 && _MSVCP_VER <= 90 +#if _MSVCP_VER >= 80 && _MSVCP_VER <= 90 if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0) return NULL; #else

1 0

Jacek Caban : wow64win: Use in-place conversion in NtUserDrawText thunk.
by Alexandre Julliard Aug. 17, 2022

Aug. 17, 2022

Module: wine Branch: master Commit: 44b706f364b1f013c53e9638428cb675f989ecde URL: https://gitlab.winehq.org/wine/wine/-/commit/44b706f364b1f013c53e9638428cb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 14:46:05 2022 +0200 wow64win: Use in-place conversion in NtUserDrawText thunk. --- dlls/wow64win/user.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c8b799881b2..54079700340 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -824,22 +824,19 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) struct draw_text_params *params = arg; struct draw_text_params32 *params32; RECT *rect_ptr = params->ret_rect; - ULONG ret_len, len; + ULONG ret_len; void *ret_ptr; NTSTATUS ret; - len = (size - FIELD_OFFSET( struct draw_text_params, str )) / sizeof(WCHAR); - if (!(params32 = Wow64AllocateTemp( FIELD_OFFSET( struct draw_text_params32, str[len] )))) - return 0; - - params32->hdc = HandleToUlong( params->hdc ); - params32->count = params->count; - params32->rect = params->rect; - params32->ret_rect = 0; + params32 = (struct draw_text_params32 *)(params + 1) - 1; params32->flags = params->flags; - if (len) memcpy( params32->str, params->str, len * sizeof(WCHAR) ); + params32->ret_rect = 0; + params32->rect = params->rect; + params32->count = params->count; + params32->hdc = HandleToUlong( params->hdc ); - ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params, size, &ret_ptr, &ret_len ); + ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32, + size - sizeof(*params) + sizeof(*params32), &ret_ptr, &ret_len ); if (ret_len == sizeof(RECT) && rect_ptr) { *rect_ptr = *(const RECT *)ret_ptr;

1 0