March 2022 - Wine-devel - list.winehq.org

[PATCH v3] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 31 Mar '22

31 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). v3: implement X11DRV_FindXIC(..) for getting exists XIC. --- dlls/winex11.drv/ime.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 31 +++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..2fe78234671 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -753,6 +753,8 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); + bRet = TRUE; } break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f389f3e0836..de882a532f3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,7 @@ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +XIC X11DRV_FindXIC(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_ForceXIMReset(HWND hwnd) DECLSPEC_HIDDEN; extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..7a4ec432bbf 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -249,9 +249,36 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, TRACE("Finished\n"); } +/** + * X11DRV_FindXIC + * + * This function finds the already created XIC in itself and parents. + * If only the specified handle is get via X11DRV_get_ic, the XIC can be exists + * in the parents and cannot be get. + */ +XIC X11DRV_FindXIC(HWND hwnd) +{ + HWND hwndParent = hwnd; + XIC ic; + if (!hwndParent) + return NULL; + for (;;) + { + ic = get_win_data( hwndParent )->xic; + if (ic) + break; + else + hwndParent = GetParent(hwnd); + + if (!hwndParent) + return NULL; + } + return ic; +} + void X11DRV_ForceXIMReset(HWND hwnd) { - XIC ic = X11DRV_get_ic(hwnd); + XIC ic = X11DRV_FindXIC(hwnd); if (ic) { char* leftover; @@ -267,7 +294,7 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) XIMPreeditState state; XVaNestedList attr; - ic = X11DRV_get_ic(hwnd); + ic = X11DRV_FindXIC(hwnd); if (!ic) return; -- 2.32.0

1 0

[PATCH v2] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 30 Mar '22

30 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: When XmbResetIC is called and KeyEvent occurs, it is a problem with some IME (i.e., ibus-hangul). --- dlls/winex11.drv/ime.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..f44b50550ec 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -704,6 +704,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { case CPS_COMPLETE: { + HWND hwnd; HIMCC newCompStr; DWORD cplen = 0; LPWSTR cpstr; @@ -753,6 +754,12 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + hwnd = GetActiveWindow(); + if (hwnd) + { + X11DRV_ForceXIMReset(hwnd); + } + bRet = TRUE; } break; -- 2.32.0

1 0

[PATCH v2] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 30 Mar '22

30 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: Initialize imeStartIndex with -1 on ME_MakeEditor. --- dlls/riched20/editor.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..ff6edfc145f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3045,6 +3046,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->back_style = TXTBACK_OPAQUE; ITextHost_TxGetBackStyle( ed->texthost, &ed->back_style ); + ed->imeStartIndex = -1; + list_init( &ed->reobj_list ); OleInitialize(NULL); @@ -3888,6 +3891,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3922,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4554,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

1 0

[PATCH] winex11.drv: call XIMReset on CPS_COMPLETE
by Alex Kwak 30 Mar '22

30 Mar '22

The composition on the IME message is end, but the XIM string is in-composition state, and the same string remains on the XIM afterwards. so, call X11DRV_ForceXIMReset and finish composition state in the XIM. When XmbResetIC is performed in the composition state, a KeyEvent is generated to empty the existing buffer. However, Wine directly manages the Composition state, so the following strings are unnecessary. so, ignore it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/winex11.drv/ime.c | 1 + dlls/winex11.drv/xim.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..69ab2e4e850 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -752,6 +752,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) myPrivate->bInComposition = FALSE; ImmUnlockIMCC(lpIMC->hPrivate); + X11DRV_ForceXIMReset(lpIMC->hWnd); bRet = TRUE; } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..098a520e629 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -44,6 +44,7 @@ BOOL ximInComposeMode=FALSE; static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; +static BOOL ignoreNextLookupChars = FALSE; #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) @@ -106,6 +107,12 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) TRACE("%p %u\n", str, count); + if (ignoreNextLookupChars) + { + ignoreNextLookupChars = FALSE; + return; + } + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, NULL, 0); wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwOutput); if (wcOutput == NULL) @@ -255,8 +262,20 @@ void X11DRV_ForceXIMReset(HWND hwnd) if (ic) { char* leftover; + BOOL bInCompose = ximInComposeMode; + TRACE("Forcing Reset %p\n",ic); leftover = XmbResetIC(ic); + + /* + * When Reset is performed in the composition state, a KeyEvent is + * generated to empty the existing buffer. + * + * However, Wine directly manages the Composition state, so the + * following strings are unnecessary. + */ + ignoreNextLookupChars = bInCompose && leftover; + XFree(leftover); } } -- 2.32.0

1 0

[PATCH] riched20: Send CPS_COMPLETE from mouse click event.
by Alex Kwak 30 Mar '22

30 Mar '22

When IME is in the Composition state and trying to move cursor, the composition string in the IME is inserted wrong places in next keyboard event. so, notify IME that composition has been completed and handle events related to click buttons after completing IME operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52754 Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- dlls/riched20/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..f8b28bfaef0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,6 +243,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor); HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; @@ -3888,6 +3889,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -3918,6 +3920,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ + ME_NotifyIMECPSComplete(editor); link_notify( editor, msg, wParam, lParam ); goto do_default; case WM_CONTEXTMENU: @@ -4549,3 +4552,20 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int } while (nChars > 0); return modified; } + +static BOOL ME_NotifyIMECPSComplete(ME_TextEditor *editor) +{ + if (editor->imeStartIndex >= 0) + { + HIMC hIMC = ITextHost_TxImmGetContext(editor->texthost); + if (hIMC) + { + ME_DeleteSelection(editor); + editor->imeStartIndex = ME_GetCursorOfs(&editor->pCursors[0]); + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + ITextHost_TxImmReleaseContext(editor->texthost, hIMC); + return TRUE; + } + } + return FALSE; +} -- 2.32.0

2 1

[PATCH] include: Add more URL_* flags.
by Zebediah Figura 30 Mar '22

30 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/shlwapi.h | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index a282ae6d993..6149c7081a3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -648,28 +648,34 @@ typedef enum { /* The following are used by UrlEscape..., UrlUnEscape..., * UrlCanonicalize..., and UrlCombine... routines */ -#define URL_WININET_COMPATIBILITY 0x80000000 -#define URL_PLUGGABLE_PROTOCOL 0x40000000 -#define URL_ESCAPE_UNSAFE 0x20000000 -#define URL_UNESCAPE 0x10000000 +#define URL_WININET_COMPATIBILITY 0x80000000 +#define URL_PLUGGABLE_PROTOCOL 0x40000000 +#define URL_ESCAPE_UNSAFE 0x20000000 +#define URL_UNESCAPE 0x10000000 -#define URL_DONT_SIMPLIFY 0x08000000 -#define URL_NO_META URL_DONT_SIMPLIFY -#define URL_ESCAPE_SPACES_ONLY 0x04000000 -#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO -#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_SIMPLIFY 0x08000000 +#define URL_ESCAPE_SPACES_ONLY 0x04000000 +#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000 -#define URL_INTERNAL_PATH 0x00800000 /* Will escape #'s in paths */ -#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 -#define URL_CONVERT_IF_DOSPATH 0x00200000 -#define URL_UNESCAPE_INPLACE 0x00100000 +#define URL_INTERNAL_PATH 0x00800000 +#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000 +#define URL_CONVERT_IF_DOSPATH 0x00200000 +#define URL_UNESCAPE_INPLACE 0x00100000 -#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_ESCAPE_ASCII_URI_COMPONENT 0x00080000 +#define URL_ESCAPE_AS_UTF8 0x00040000 +#define URL_DONT_UNESCAPE 0x00020000 +#define URL_FILE_USE_PATHURL 0x00010000 -#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 -#define URL_ESCAPE_PERCENT 0x00001000 +#define URL_ESCAPE_SEGMENT_ONLY 0x00002000 +#define URL_ESCAPE_PERCENT 0x00001000 + +#define URL_BROWSER_MODE URL_DONT_ESCAPE_EXTRA_INFO +#define URL_DONT_UNESCAPE_EXTRA_INFO URL_DONT_ESCAPE_EXTRA_INFO +#define URL_ESCAPE_URI_COMPONENT (URL_ESCAPE_ASCII_URI_COMPONENT | URL_ESCAPE_AS_UTF8) +#define URL_NO_META URL_DONT_SIMPLIFY +#define URL_UNESCAPE_AS_UTF8 URL_ESCAPE_AS_UTF8 +#define URL_UNESCAPE_URI_COMPONENT URL_UNESCAPE_AS_UTF8 HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD); HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -- 2.34.1

1 0

[PATCH v2 1/5] windows.media.speech: Add IVector<Inspectable*>.
by Bernhard Kölbl 30 Mar '22

30 Mar '22

And use it in recognizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Add C asserts for flexible arrays. --- dlls/windows.media.speech/private.h | 6 + dlls/windows.media.speech/recognizer.c | 21 +- dlls/windows.media.speech/vector.c | 279 +++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index 3c8371ccdbe..348c060c1c6 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -61,6 +61,11 @@ extern IActivationFactory *synthesizer_factory; +struct vector_iids +{ + const GUID *vector; +}; + HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args ); @@ -68,6 +73,7 @@ HRESULT typed_event_handlers_clear( struct list* list ); HRESULT vector_hstring_create( IVector_HSTRING **out ); HRESULT vector_hstring_create_copy( IIterable_HSTRING *iterable, IVector_HSTRING **out ); +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ); #define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ static inline impl_type *impl_from( iface_type *iface ) \ diff --git a/dlls/windows.media.speech/recognizer.c b/dlls/windows.media.speech/recognizer.c index da219d6bd0a..e552779937b 100644 --- a/dlls/windows.media.speech/recognizer.c +++ b/dlls/windows.media.speech/recognizer.c @@ -233,6 +233,7 @@ struct recognizer LONG ref; ISpeechContinuousRecognitionSession *session; + IVector_ISpeechRecognitionConstraint *constraints; }; /* @@ -296,6 +297,7 @@ static ULONG WINAPI recognizer_Release( ISpeechRecognizer *iface ) if (!ref) { ISpeechContinuousRecognitionSession_Release(impl->session); + IVector_ISpeechRecognitionConstraint_Release(impl->constraints); free(impl); } @@ -637,13 +639,22 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface { struct recognizer *impl; struct session *session; + struct vector_iids constraints_iids = + { + .vector = &IID_IVector_ISpeechRecognitionConstraint, + }; + HRESULT hr; TRACE("iface %p, language %p, speechrecognizer %p.\n", iface, language, speechrecognizer); *speechrecognizer = NULL; if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; - if (!(session = calloc(1, sizeof(*session)))) return E_OUTOFMEMORY; + if (!(session = calloc(1, sizeof(*session)))) + { + hr = E_OUTOFMEMORY; + goto error; + } if (language) FIXME("language parameter unused. Stub!\n"); @@ -658,11 +669,19 @@ static HRESULT WINAPI recognizer_factory_Create( ISpeechRecognizerFactory *iface impl->ISpeechRecognizer2_iface.lpVtbl = &speech_recognizer2_vtbl; impl->session = &session->ISpeechContinuousRecognitionSession_iface; impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&constraints_iids, (IVector_IInspectable**)&impl->constraints))) + goto error; TRACE("created SpeechRecognizer %p.\n", impl); *speechrecognizer = &impl->ISpeechRecognizer_iface; return S_OK; + +error: + free(session); + free(impl); + + return hr; } static const struct ISpeechRecognizerFactoryVtbl speech_recognizer_factory_vtbl = diff --git a/dlls/windows.media.speech/vector.c b/dlls/windows.media.speech/vector.c index fcb7f483e03..e3a802fc020 100644 --- a/dlls/windows.media.speech/vector.c +++ b/dlls/windows.media.speech/vector.c @@ -771,3 +771,282 @@ error: IVector_HSTRING_Release(*out); return hr; } + +/* + * + * IVector<Inspectable*> + * + */ + +struct vector_inspectable +{ + IVector_IInspectable IVector_IInspectable_iface; + struct vector_iids iids; + LONG ref; + + UINT32 size; + UINT32 capacity; + IInspectable **elements; +}; + +static inline struct vector_inspectable *impl_from_IVector_IInspectable( IVector_IInspectable *iface ) +{ + return CONTAINING_RECORD(iface, struct vector_inspectable, IVector_IInspectable_iface); +} + +static HRESULT WINAPI vector_inspectable_QueryInterface( IVector_IInspectable *iface, REFIID iid, void **out ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, impl->iids.vector)) + { + IInspectable_AddRef((*out = &impl->IVector_IInspectable_iface)); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI vector_inspectable_AddRef( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); + return ref; +} + +static ULONG WINAPI vector_inspectable_Release( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); + + if (!ref) + { + IVector_IInspectable_Clear(iface); + free(impl); + } + + return ref; +} + +static HRESULT WINAPI vector_inspectable_GetIids( IVector_IInspectable *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetRuntimeClassName( IVector_IInspectable *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetTrustLevel( IVector_IInspectable *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_GetAt( IVector_IInspectable *iface, UINT32 index, IInspectable **value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + *value = NULL; + if (index >= impl->size) return E_BOUNDS; + + IInspectable_AddRef((*value = impl->elements[index])); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_get_Size( IVector_IInspectable *iface, UINT32 *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->size; + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetView( IVector_IInspectable *iface, IVectorView_IInspectable **value ) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI vector_inspectable_IndexOf( IVector_IInspectable *iface, + IInspectable *element, UINT32 *index, BOOLEAN *found ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + ULONG i; + + TRACE("iface %p, element %p, index %p, found %p.\n", iface, element, index, found); + + for (i = 0; i < impl->size; ++i) if (impl->elements[i] == element) break; + if ((*found = (i < impl->size))) *index = i; + else *index = 0; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_SetAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_InsertAt( IVector_IInspectable *iface, UINT32 index, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + IInspectable **tmp = impl->elements; + + TRACE("iface %p, index %u, value %p.\n", iface, index, value); + + if (impl->size == impl->capacity) + { + impl->capacity = max(32, impl->capacity * 3 / 2); + if (!(impl->elements = realloc(impl->elements, impl->capacity * sizeof(*impl->elements)))) + { + impl->elements = tmp; + return E_OUTOFMEMORY; + } + } + + memmove(impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements)); + IInspectable_AddRef((impl->elements[index] = value)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_RemoveAt( IVector_IInspectable *iface, UINT32 index ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= impl->size) return E_BOUNDS; + IInspectable_Release(impl->elements[index]); + memmove(impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements)); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Append( IVector_IInspectable *iface, IInspectable *value ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p, value %p.\n", iface, value); + + return IVector_IInspectable_InsertAt(iface, impl->size, value); +} + +static HRESULT WINAPI vector_inspectable_RemoveAtEnd( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + if (impl->size) IInspectable_Release(impl->elements[--impl->size]); + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_Clear( IVector_IInspectable *iface ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + + TRACE("iface %p.\n", iface); + + while (impl->size) IVector_IInspectable_RemoveAtEnd(iface); + free(impl->elements); + impl->capacity = 0; + impl->elements = NULL; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_GetMany( IVector_IInspectable *iface, UINT32 start_index, + UINT32 items_size, IInspectable **items, UINT *count ) +{ + struct vector_inspectable *impl = impl_from_IVector_IInspectable(iface); + UINT32 i; + + TRACE("iface %p, start_index %u, items_size %u, items %p, count %p.\n", + iface, start_index, items_size, items, count); + + if (start_index >= impl->size) return E_BOUNDS; + + for (i = start_index; i < impl->size; ++i) + { + if (i - start_index >= items_size) break; + IInspectable_AddRef((items[i - start_index] = impl->elements[i])); + } + *count = i - start_index; + + return S_OK; +} + +static HRESULT WINAPI vector_inspectable_ReplaceAll( IVector_IInspectable *iface, UINT32 count, IInspectable **items ) +{ + HRESULT hr; + ULONG i; + + TRACE("iface %p, count %u, items %p.\n", iface, count, items); + + hr = IVector_IInspectable_Clear(iface); + for (i = 0; i < count && SUCCEEDED(hr); ++i) hr = IVector_IInspectable_Append(iface, items[i]); + return hr; +} + +static const struct IVector_IInspectableVtbl vector_inspectable_vtbl = +{ + /* IUnknown methods */ + vector_inspectable_QueryInterface, + vector_inspectable_AddRef, + vector_inspectable_Release, + /* IInspectable methods */ + vector_inspectable_GetIids, + vector_inspectable_GetRuntimeClassName, + vector_inspectable_GetTrustLevel, + /* IVector<IInspectable*> methods */ + vector_inspectable_GetAt, + vector_inspectable_get_Size, + vector_inspectable_GetView, + vector_inspectable_IndexOf, + vector_inspectable_SetAt, + vector_inspectable_InsertAt, + vector_inspectable_RemoveAt, + vector_inspectable_Append, + vector_inspectable_RemoveAtEnd, + vector_inspectable_Clear, + vector_inspectable_GetMany, + vector_inspectable_ReplaceAll +}; + +HRESULT vector_inspectable_create( const struct vector_iids *iids, IVector_IInspectable **out ) +{ + struct vector_inspectable *impl; + + TRACE("iid %s, out %p.\n", debugstr_guid(iids->vector), out); + + if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IVector_IInspectable_iface.lpVtbl = &vector_inspectable_vtbl; + impl->iids = *iids; + impl->ref = 1; + + *out = &impl->IVector_IInspectable_iface; + TRACE("created %p\n", *out); + return S_OK; +} -- 2.35.1

2 9

[PATCH 1/2] hid: Implement HidD_GetPhysicalDescriptor.
by Rémi Bernon 30 Mar '22

30 Mar '22

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> The game INVERSUS Deluxe calls upon this function and crashes without it. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 37dfdbce307..67c4473129d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -9,7 +9,7 @@ @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor @ stdcall HidD_GetNumInputBuffers(long ptr) -@ stub HidD_GetPhysicalDescriptor +@ stdcall HidD_GetPhysicalDescriptor(long ptr long) @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stdcall HidD_GetSerialNumberString(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 3b2e5a9fe4e..af024b456b4 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -121,6 +121,12 @@ BOOLEAN WINAPI HidD_SetNumInputBuffers( HANDLE file, ULONG num_buffer ) return sync_ioctl( file, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &num_buffer, sizeof(num_buffer), NULL, 0 ); } +BOOLEAN WINAPI HidD_GetPhysicalDescriptor( HANDLE file, void *buffer, ULONG buffer_len ) +{ + TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); + return sync_ioctl( file, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, buffer, buffer_len ); +} + BOOLEAN WINAPI HidD_GetProductString( HANDLE file, void *buffer, ULONG buffer_len ) { TRACE( "file %p, buffer %p, buffer_len %lu.\n", file, buffer, buffer_len ); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 22f64e687e7..72470079a79 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -41,6 +41,7 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers); +BOOLEAN WINAPI HidD_GetPhysicalDescriptor(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); -- 2.35.1

2 2

[tools 1/3] testbot/web: Document the Fcntl usage.
by Francois Gouget 30 Mar '22

30 Mar '22

Use Fcntl qw(O_RDONLY) for simple cases. This is better than adding a comment which may get out-of-date if more constants are needed. But still use a comment to avoid too much duplication in more complex cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- testbot/lib/WineTestBot/Utils.pm | 2 +- testbot/web/GetFile.pl | 2 +- testbot/web/GetTaskFile.pl | 2 +- testbot/web/Screenshot.pl | 2 +- testbot/web/Submit.pl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index db9d82d30..7880b8e80 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -37,7 +37,7 @@ sub BEGIN } use Errno qw(EAGAIN); -use Fcntl; +use Fcntl; # For O_XXX and FD_XXX use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 27b222fd2..5315c75d4 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -33,7 +33,7 @@ our @EXPORT = qw(SecureConnection MakeSecureURL GetTaskURL GenerateRandomString BuildTag SanitizeTag LocaleName NotifyAdministrator BatchQuote ShQuote ShArgv2Cmd); -use Fcntl; +use Fcntl qw(O_CREAT O_EXCL O_WRONLY); use WineTestBot::Config; diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index a8699497b..59602bf19 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -21,7 +21,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use WineTestBot::Jobs; diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 41111197d..0b7f167d2 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; -use Fcntl; # for O_READONLY +use Fcntl qw(O_RDONLY); use WineTestBot::Config; diff --git a/testbot/web/Screenshot.pl b/testbot/web/Screenshot.pl index a8a3d88ed..685c4a45c 100644 --- a/testbot/web/Screenshot.pl +++ b/testbot/web/Screenshot.pl @@ -22,7 +22,7 @@ use strict; use Apache2::Const -compile => qw(REDIRECT); use CGI; use CGI::Cookie; -use Fcntl; +use Fcntl qw(O_RDONLY); use WineTestBot::Config; use WineTestBot::CGI::Sessions; use WineTestBot::Engine::Notify; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 472622dd5..e2173d898 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,7 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use CGI qw(:standard); -use Fcntl; # For O_XXX +use Fcntl qw(O_RDONLY); use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; -- 2.30.2

1 2

[tools] testbot/web: Add an Apache module import for the Munin redirects.
by Francois Gouget 30 Mar '22

30 Mar '22

Fortunately it is only needed in the error case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Munin.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Munin.pl b/testbot/web/Munin.pl index c2464d055..513c6901b 100644 --- a/testbot/web/Munin.pl +++ b/testbot/web/Munin.pl @@ -19,6 +19,7 @@ use strict; +use Apache2::Const -compile => qw(REDIRECT); use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::VMs; -- 2.30.2

1 0