July 2023 - Wine-Commits - list.winehq.org

Francois Gouget : windows.media.speech/tests: Fix the spelling of some speech ok() messages.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 5792307c61c64aadaea0c6ed527fce393863e578 URL: https://gitlab.winehq.org/wine/wine/-/commit/5792307c61c64aadaea0c6ed527fce… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 26 11:43:07 2023 +0200 windows.media.speech/tests: Fix the spelling of some speech ok() messages. --- dlls/windows.media.speech/tests/speech.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 74336b802e5..49a4915332a 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1213,7 +1213,7 @@ static void test_SpeechRecognizer(void) completed_event_handler_create_static(&completed_handler); hr = ISpeechContinuousRecognitionSession_add_Completed(session, &completed_handler.IHandler_RecognitionCompleted_iface, &token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); - ok(token.value != 0xdeadbeef, "Got unexpexted token: %#I64x.\n", token.value); + ok(token.value != 0xdeadbeef, "Got unexpected token: %#I64x.\n", token.value); hr = ISpeechContinuousRecognitionSession_remove_Completed(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); @@ -1225,7 +1225,7 @@ static void test_SpeechRecognizer(void) recognition_result_handler_create_static(&result_handler); hr = ISpeechContinuousRecognitionSession_add_ResultGenerated(session, &result_handler.IHandler_RecognitionResult_iface, &token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); - ok(token.value != 0xdeadbeef, "Got unexpexted token: %#I64x.\n", token.value); + ok(token.value != 0xdeadbeef, "Got unexpected token: %#I64x.\n", token.value); hr = ISpeechContinuousRecognitionSession_remove_ResultGenerated(session, token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_remove_ResultGenerated failed, hr %#lx.\n", hr); @@ -1708,7 +1708,7 @@ static void test_Recognition(void) recognition_result_handler_create_static(&result_handler); hr = ISpeechContinuousRecognitionSession_add_ResultGenerated(session, &result_handler.IHandler_RecognitionResult_iface, &token); ok(hr == S_OK, "ISpeechContinuousRecognitionSession_add_ResultGenerated failed, hr %#lx.\n", hr); - ok(token.value != 0xdeadbeef, "Got unexpexted token: %#I64x.\n", token.value); + ok(token.value != 0xdeadbeef, "Got unexpected token: %#I64x.\n", token.value); recog_state = 0xdeadbeef; hr = ISpeechRecognizer2_get_State(recognizer2, &recog_state);

1 0

Francois Gouget : ntdll/tests: Fix the spelling of some exception ok() messages.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 541695ae00090f5f861d817a278f2f34916c3b87 URL: https://gitlab.winehq.org/wine/wine/-/commit/541695ae00090f5f861d817a278f2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 26 11:42:03 2023 +0200 ntdll/tests: Fix the spelling of some exception ok() messages. --- dlls/ntdll/tests/exception.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index ed3939e9c04..4560de0001b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -9628,7 +9628,7 @@ static void wait_for_thread_next_suspend(HANDLE thread) DWORD result; result = ResumeThread(thread); - ok(result == 1, "Got unexpexted suspend count %lu.\n", result); + ok(result == 1, "Got unexpected suspend count %lu.\n", result); /* NtQueryInformationThread(ThreadSuspendCount, ...) is not supported on older Windows. */ while (!(result = SuspendThread(thread))) @@ -9636,9 +9636,9 @@ static void wait_for_thread_next_suspend(HANDLE thread) ResumeThread(thread); Sleep(1); } - ok(result == 1, "Got unexpexted suspend count %lu.\n", result); + ok(result == 1, "Got unexpected suspend count %lu.\n", result); result = ResumeThread(thread); - ok(result == 2, "Got unexpexted suspend count %lu.\n", result); + ok(result == 2, "Got unexpected suspend count %lu.\n", result); } #define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL) @@ -9808,7 +9808,7 @@ static void test_extended_context(void) bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); - ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length); + ok(length2 == expected_length, "Got unexpected length %#lx.\n", length); ok((BYTE *)context == context_buffer, "Got unexpected context %p, flags %#lx.\n", context, flags); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); @@ -9938,7 +9938,7 @@ static void test_extended_context(void) bret = pInitializeContext(context_buffer2 + 2, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); - ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length); + ok(length2 == expected_length, "Got unexpected length %#lx.\n", length); ok(!memcmp(context_buffer2 + align, context_buffer, sizeof(context_buffer2) - align), "Context data do not match, flags %#lx.\n", flags); @@ -9984,7 +9984,7 @@ static void test_extended_context(void) bret = pInitializeContext2(context_buffer2 + 2, flags, &context, &length2, 0); ok(bret && GetLastError() == 0xdeadbeef, "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); - ok(length2 == expected_length, "Got unexpexted length %#lx.\n", length); + ok(length2 == expected_length, "Got unexpected length %#lx.\n", length); ok(!memcmp(context_buffer2 + align, context_buffer, sizeof(context_buffer2) - align), "Context data do not match, flags %#lx.\n", flags); @@ -10095,7 +10095,7 @@ static void test_extended_context(void) bret = pInitializeContext(context_buffer, flags, &context, &length2); ok(bret && GetLastError() == 0xdeadbeef, "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); - ok(length2 == length, "Got unexpexted length %#lx.\n", length); + ok(length2 == length, "Got unexpected length %#lx.\n", length); ok((BYTE *)context == context_buffer, "Got unexpected context %p.\n", context); context_flags = *(DWORD *)(context_buffer + context_arch[test].flags_offset); @@ -10233,7 +10233,7 @@ static void test_extended_context(void) bret = pInitializeContext2(context_buffer, flags, &context, &length2, 0); ok(bret && GetLastError() == 0xdeadbeef, "Got unexpected bret %#x, GetLastError() %lu, flags %#lx.\n", bret, GetLastError(), flags); - ok(length2 == length, "Got unexpexted length %#lx.\n", length); + ok(length2 == length, "Got unexpected length %#lx.\n", length); ok((BYTE *)context == context_buffer, "Got unexpected context %p.\n", context); length2 = 0xdeadbeef;

1 0

Francois Gouget : dxgi: Fix a typo in a comment.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: aeeaad0ea5cec70a9fd1761a82929933ed0c541d URL: https://gitlab.winehq.org/wine/wine/-/commit/aeeaad0ea5cec70a9fd1761a829299… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 26 11:41:39 2023 +0200 dxgi: Fix a typo in a comment. --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 64c5958f780..d567056062e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2180,7 +2180,7 @@ static HRESULT d3d12_swapchain_op_present_execute(struct d3d12_swapchain *swapch if (swapchain->frame_latency_fence) { /* Use the same bias as d3d12_swapchain_present(). Add one to - * account for the "++swapchain->frame_numer" there. */ + * account for the "++swapchain->frame_number" there. */ uint64_t number = op->present.frame_number + DXGI_MAX_SWAP_CHAIN_BUFFERS + 1; if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue,

1 0

Rémi Bernon : imm32: Hide the composition window if the string is empty.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 428120441bd39f9311d75aa6ebad97d342837f45 URL: https://gitlab.winehq.org/wine/wine/-/commit/428120441bd39f9311d75aa6ebad97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 25 11:35:19 2023 +0200 imm32: Hide the composition window if the string is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55258 --- dlls/imm32/ime.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c index 0470f3b6d6c..60672b366ab 100644 --- a/dlls/imm32/ime.c +++ b/dlls/imm32/ime.c @@ -98,6 +98,8 @@ static void input_context_set_comp_str( INPUTCONTEXT *ctx, const WCHAR *str, UIN UINT size; BYTE *dst; + TRACE( "ctx %p, str %s\n", ctx, debugstr_wn( str, len ) ); + size = sizeof(*compstr); size += len * sizeof(WCHAR); /* GCS_COMPSTR */ size += len; /* GCS_COMPSTRATTR */ @@ -310,20 +312,17 @@ static void ime_ui_paint( HIMC himc, HWND hwnd ) static void ime_ui_update_window( INPUTCONTEXT *ctx, HWND hwnd ) { - COMPOSITIONSTRING *string; - - if (ctx->hCompStr) string = ImmLockIMCC( ctx->hCompStr ); - else string = NULL; + WCHAR *str; + UINT len; - if (!string || string->dwCompStrLen == 0) + if (!(str = input_context_get_comp_str( ctx, FALSE, &len )) || !*str) ShowWindow( hwnd, SW_HIDE ); else { ShowWindow( hwnd, SW_SHOWNOACTIVATE ); RedrawWindow( hwnd, NULL, NULL, RDW_ERASENOW | RDW_INVALIDATE ); } - - if (string) ImmUnlockIMCC( ctx->hCompStr ); + free( str ); ctx->hWnd = GetFocus(); }

1 0

Francois Gouget : win32u/tests: Fix the spelling of a comment.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 0b275e5b8e86bc8cec0b9a3e4ed8fce7a4db42ad URL: https://gitlab.winehq.org/wine/wine/-/commit/0b275e5b8e86bc8cec0b9a3e4ed8fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 26 11:42:42 2023 +0200 win32u/tests: Fix the spelling of a comment. --- dlls/win32u/tests/win32u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 8d72dba243a..aaa27361206 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1394,7 +1394,7 @@ static void check_params( const struct lparam_hook_test *test, UINT message, static void poison_lparam( const struct lparam_hook_test *test, LPARAM lparam ) { - /* message copy is never transfered back in hooks */ + /* message copy is never transferred back in hooks */ if (test->lparam_size && lparam != (LPARAM)lparam_buffer) memset( (void *)lparam, 0xc0, test->lparam_size ); }

1 0

Maxim Karasev : kerberos: Implement KerbQueryTicketCacheExMessage.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 1b26b17e058078e46fe328ead884045f7254faeb URL: https://gitlab.winehq.org/wine/wine/-/commit/1b26b17e058078e46fe328ead88404… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Wed Jul 19 23:16:28 2023 +0300 kerberos: Implement KerbQueryTicketCacheExMessage. --- dlls/kerberos/krb5_ap.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/kerberos/unixlib.c | 100 ++++++++++++++++++++++++++++---------------- dlls/kerberos/unixlib.h | 2 +- 3 files changed, 168 insertions(+), 41 deletions(-)

1 0

Gijs Vermeulen : configure: Use PCSC.framework when pcsclite is not available on macOS.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: f74c4af257e0856e6607d2823e4f03109111a4b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f74c4af257e0856e6607d2823e4f03… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 25 17:54:48 2023 +0200 configure: Use PCSC.framework when pcsclite is not available on macOS. --- configure | 12 ++++++++++++ configure.ac | 6 ++++++ include/config.h.in | 3 +++ 3 files changed, 21 insertions(+) diff --git a/configure b/configure index 36ae965fe34..9c15f952298 100755 --- a/configure +++ b/configure @@ -7854,6 +7854,12 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "PCSC/pcsclite.h" "ac_cv_header_PCSC_pcsclite_h" "$ac_includes_default" +if test "x$ac_cv_header_PCSC_pcsclite_h" = xyes +then : + printf "%s\n" "#define HAVE_PCSC_PCSCLITE_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" if test "x$ac_cv_header_arpa_inet_h" = xyes @@ -15843,6 +15849,12 @@ then : fi + if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" + then + PCSCLITE_LIBS="-framework PCSC" + + ac_cv_lib_pcsclite_SCardEstablishContext=yes + fi fi if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes then : diff --git a/configure.ac b/configure.ac index c782c17ac61..dab2bb07302 100644 --- a/configure.ac +++ b/configure.ac @@ -403,6 +403,7 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ + PCSC/pcsclite.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ @@ -1393,6 +1394,11 @@ dnl **** Check for libpcsclite **** if test "x$with_pcsclite" != "xno" then AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) + if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" + then + AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") + ac_cv_lib_pcsclite_SCardEstablishContext=yes + fi fi WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes], [libpcsclite not found, smart cards won't be supported.], diff --git a/include/config.h.in b/include/config.h.in index 9836ec64cf9..41011c3b0b8 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,6 +297,9 @@ /* Define to 1 if you have the <pcap/pcap.h> header file. */ #undef HAVE_PCAP_PCAP_H +/* Define to 1 if you have the <PCSC/pcsclite.h> header file. */ +#undef HAVE_PCSC_PCSCLITE_H + /* Define to 1 if you have the `pipe2' function. */ #undef HAVE_PIPE2

1 0

Francois Gouget : mfmediaengine: Add the trailing linefeed to a WARN() message.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 37885b04f9f56c435f27b5bc1ae3d67a718b3428 URL: https://gitlab.winehq.org/wine/wine/-/commit/37885b04f9f56c435f27b5bc1ae3d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 7 08:32:11 2023 +0200 mfmediaengine: Add the trailing linefeed to a WARN() message. Also add a trailing period for consistency with this module's other messages. --- dlls/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 925d9c3566e..e664db81d1d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1048,7 +1048,7 @@ static HRESULT media_engine_create_effects(struct effect *effects, size_t count, if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) { - WARN("Failed to create transform node, hr %#lx", hr); + WARN("Failed to create transform node, hr %#lx.\n", hr); break; }

1 0

Gabriel Ivăncescu : mshtml: Add some basic documentation for the dispex and its vtbl.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: 9e8c4fd94017b7f4b3f10e34f904123bfd6e09b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e8c4fd94017b7f4b3f10e34f90412… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jul 26 14:57:57 2023 +0300 mshtml: Add some basic documentation for the dispex and its vtbl. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 59d652a828b..9a606c4e501 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -337,14 +337,31 @@ typedef struct dispex_dynamic_data_t dispex_dynamic_data_t; typedef struct DispatchEx DispatchEx; +/* + dispex is our base IDispatchEx implementation for all mshtml objects, and the vtbl allows + customizing the behavior depending on the object. Objects have basically 3 types of props: + + - builtin props: These props are implicitly generated from the TypeInfo (disp_tid and iface_tids in dispex_static_data_t). + - custom props: These props are specific to an object, they are created using vtbl below (e.g. indexed props in HTMLRectCollection). + - dynamic props: These props are generally allocated by external code (e.g. 'document.wine = 42' creates 'wine' dynamic prop on document) +*/ typedef struct { + /* Called when the object wants to handle DISPID_VALUE invocations */ HRESULT (*value)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); + + /* Used when the object has custom props, and this returns DISPIDs for them */ HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); + + /* These are called when the object implements GetMemberName, InvokeEx, DeleteMemberByDispID and GetNextDispID for custom props */ HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*delete)(DispatchEx*,DISPID); HRESULT (*next_dispid)(DispatchEx*,DISPID,DISPID*); + + /* Used by objects that want to delay their compat mode initialization until actually needed */ compat_mode_t (*get_compat_mode)(DispatchEx*); + + /* Used by objects that want to populate some dynamic props on initialization */ HRESULT (*populate_props)(DispatchEx*); } dispex_static_data_vtbl_t;

1 0

Francois Gouget : winex11.drv: Add a trailing linefeed to a WARN() message.
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: wine Branch: master Commit: c7e6f208d621045f012c5e3f334f9dcc26b9a87f URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e6f208d621045f012c5e3f334f9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 23 11:49:24 2023 +0200 winex11.drv: Add a trailing linefeed to a WARN() message. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9ada6a63d59..ed3728773af 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1526,7 +1526,7 @@ Window get_dummy_parent(void) dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, default_visual.depth, InputOutput, default_visual.visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); - WARN("Xshape support is not compiled in. Applications under XWayland may have poor performance."); + WARN("Xshape support is not compiled in. Applications under XWayland may have poor performance.\n"); #endif XMapWindow( gdi_display, dummy_parent ); }

1 0