wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

Zebediah Figura : quartz/vmr9: Do not bother setting the cookie when using the default presenter.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 966bad6aa5736ebf02510bf494edfd0c52825fc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/966bad6aa5736ebf02510bf494edfd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:46:55 2023 -0500 quartz/vmr9: Do not bother setting the cookie when using the default presenter. We do not use it in this case. --- dlls/quartz/vmr9.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7e50748a822..80c2d7bedb9 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1349,8 +1349,6 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface { case VMR9Mode_Windowed: case VMR9Mode_Windowless: - This->cookie = ~0; - if (FAILED(hr = default_presenter_create(This, &default_presenter))) { ERR("Failed to create default presenter, hr %#lx.\n", hr);

1 0

Zebediah Figura : quartz/vmr9: Return a default_presenter structure from the default presenter constructor.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 0ea07738b8f26156eb5a94fbc64ca4b2926dcec8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ea07738b8f26156eb5a94fbc64ca4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:45:36 2023 -0500 quartz/vmr9: Return a default_presenter structure from the default presenter constructor. --- dlls/quartz/vmr9.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d2840f6fb76..7e50748a822 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -201,7 +201,7 @@ static inline struct default_presenter *impl_from_IVMRSurfaceAllocator9(IVMRSurf return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocator9_iface); } -static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); +static HRESULT default_presenter_create(struct quartz_vmr *parent, struct default_presenter **presenter); static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) { @@ -1332,6 +1332,7 @@ static HRESULT WINAPI VMR9FilterConfig_GetRenderingPrefs(IVMRFilterConfig9 *ifac static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface, DWORD mode) { + struct default_presenter *default_presenter; HRESULT hr = S_OK; struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); @@ -1350,21 +1351,14 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface case VMR9Mode_Windowless: This->cookie = ~0; - if (FAILED(hr = VMR9DefaultAllocatorPresenterImpl_create(This, (void **)&This->presenter))) + if (FAILED(hr = default_presenter_create(This, &default_presenter))) { ERR("Failed to create default presenter, hr %#lx.\n", hr); break; } - - if (FAILED(hr = IVMRImagePresenter9_QueryInterface(This->presenter, - &IID_IVMRSurfaceAllocator9, (void **)&This->allocator))) - { - ERR("Failed to query for IVMRSurfaceAllocator9, hr %#lx.\n", hr); - IVMRImagePresenter9_Release(This->presenter); - This->allocator = NULL; - This->presenter = NULL; - break; - } + This->allocator = &default_presenter->IVMRSurfaceAllocator9_iface; + This->presenter = &default_presenter->IVMRImagePresenter9_iface; + IVMRImagePresenter9_AddRef(This->presenter); hr = IVMRSurfaceAllocator9_AdviseNotify(This->allocator, &This->IVMRSurfaceAllocatorNotify9_iface); break; @@ -3102,7 +3096,7 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) return d3d9_create(D3D_SDK_VERSION); } -static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) +static HRESULT default_presenter_create(struct quartz_vmr *parent, struct default_presenter **presenter) { struct default_presenter *object; @@ -3124,6 +3118,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren object->pVMR9 = parent; TRACE("Created default presenter %p.\n", object); - *ppv = &object->IVMRImagePresenter9_iface; + *presenter = object; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Do not clear the previous allocator and presenter in IVMRFilterConfig9::SetRenderingMode().
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: f6c1548bf87b6f9e7c543908e1eff735d3db62c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6c1548bf87b6f9e7c543908e1eff7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 4 13:37:59 2023 -0500 quartz/vmr9: Do not clear the previous allocator and presenter in IVMRFilterConfig9::SetRenderingMode(). There cannot be any previous allocator and presenter. They can only be set by this function, which cannot be called more than once, or by IVMRSurfaceAllocatorNotify9::AdviseSurfaceAllocator(), which can only be called after setting the rendering mode. --- dlls/quartz/vmr9.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2330f8fc0c9..d2840f6fb76 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1344,14 +1344,6 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface return VFW_E_WRONG_STATE; } - if (This->allocator) - IVMRSurfaceAllocator9_Release(This->allocator); - if (This->presenter) - IVMRImagePresenter9_Release(This->presenter); - - This->allocator = NULL; - This->presenter = NULL; - switch (mode) { case VMR9Mode_Windowed:

1 0

Eric Pouech : kernel32/tests: Workaround broken behavior in Win7 Pro64.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 8ad9ddaa28b6f6449d0987079f3e43004d82f539 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ad9ddaa28b6f6449d0987079f3e43… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:04:09 2023 +0200 kernel32/tests: Workaround broken behavior in Win7 Pro64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/console.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8d569ad6410..c2a8e99458f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3300,10 +3300,12 @@ static void test_ReadConsole(HANDLE input) SetLastError(0xdeadbeef); ret = GetFileSize(input, NULL); - ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#lx\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE || - GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ - "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + ok(ret == INVALID_FILE_SIZE || broken(TRUE), /* only Win7 pro64 on 64bit returns a valid file size here */ + "expected INVALID_FILE_SIZE, got %#lx\n", ret); + if (ret == INVALID_FILE_SIZE) + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ + "expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); bytes = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

Eric Pouech : winedbg: Don't crash when no search path has been set.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 24069aad307829c710f4eaee5aa2b35586bd7f14 URL: https://gitlab.winehq.org/wine/wine/-/commit/24069aad307829c710f4eaee5aa2b3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:09:38 2023 +0200 winedbg: Don't crash when no search path has been set. Note: it's anyway wrong to search source files inside modules' path (a proper fix will require revisiting source file handling). This fix will actually be sufficient when running wine from within its build tree. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/source.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index 044eccaab5e..74f31d986c6 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -122,17 +122,18 @@ static BOOL source_locate_file(const char* srcfile, char* path) strcpy(path, srcfile); found = TRUE; } - else if (dbg_curr_process->search_path) + else { const char* spath; - + const char* sp = dbg_curr_process->search_path; + if (!sp) sp = "."; spath = srcfile; while (!found) { while (*spath && *spath != '/' && *spath != '\\') spath++; if (!*spath) break; spath++; - found = SearchPathA(dbg_curr_process->search_path, spath, NULL, MAX_PATH, path, NULL); + found = SearchPathA(sp, spath, NULL, MAX_PATH, path, NULL); } } return found;

1 0

Rémi Bernon : winex11: Set x11drv_win_data XIC out of X11DRV_CreateIC.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 2be535a221cd324f8da172c4bdb677f6d59dae59 URL: https://gitlab.winehq.org/wine/wine/-/commit/2be535a221cd324f8da172c4bdb677… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Apr 2 22:54:20 2023 +0200 winex11: Set x11drv_win_data XIC out of X11DRV_CreateIC. --- dlls/winex11.drv/window.c | 22 ---------------------- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/xim.c | 22 +++++++++++++++++----- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ceaa5552f25..3b49b7e1d08 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2311,28 +2311,6 @@ Window X11DRV_get_whole_window( HWND hwnd ) } -/*********************************************************************** - * X11DRV_get_ic - * - * Return the X input context associated with a window - */ -XIC X11DRV_get_ic( HWND hwnd ) -{ - struct x11drv_win_data *data = get_win_data( hwnd ); - XIM xim; - XIC ret = 0; - - if (data) - { - x11drv_thread_data()->last_xic_hwnd = hwnd; - ret = data->xic; - if (!ret && (xim = x11drv_thread_data()->xim)) ret = X11DRV_CreateIC( xim, hwnd, data ); - release_win_data( data ); - } - return ret; -} - - /*********************************************************************** * X11DRV_GetDC (X11DRV.@) */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 893099489e3..e7db96f35cb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,7 +641,6 @@ struct x11drv_win_data extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; -extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; extern Window get_dummy_parent(void) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, BOOL known_child ) DECLSPEC_HIDDEN; @@ -820,9 +819,9 @@ extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; /* XIM support */ extern BOOL xim_init( const WCHAR *input_style ) DECLSPEC_HIDDEN; -extern XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern void xim_thread_attach( struct x11drv_thread_data *data ) DECLSPEC_HIDDEN; extern void X11DRV_XIMLookupChars( const char *str, UINT count ) DECLSPEC_HIDDEN; +extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; #define XEMBED_MAPPED (1 << 0) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 0251677eef9..b7f5f696ba5 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -448,7 +448,7 @@ static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg ) return TRUE; } -XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data ) +static XIC xic_create( XIM xim, HWND hwnd, Window win ) { XICCallback destroy = {.callback = xic_destroy, .client_data = (XPointer)hwnd}; XICCallback preedit_caret = {.callback = xic_preedit_caret, .client_data = (XPointer)hwnd}; @@ -462,10 +462,9 @@ XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data ) XPoint spot = {0}; XVaNestedList preedit, status; XIC xic; - Window win = data->whole_window; XFontSet fontSet = x11drv_thread_data()->font_set; - TRACE( "xim %p, hwnd %p, data %p\n", xim, hwnd, data ); + TRACE( "xim %p, hwnd %p/%lx\n", xim, hwnd, win ); preedit = XVaCreateNestedList( 0, XNFontSet, fontSet, XNPreeditCaretCallback, &preedit_caret, @@ -483,10 +482,23 @@ XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data ) XNClientWindow, win, XNFocusWindow, win, XNDestroyCallback, &destroy, NULL ); TRACE( "created XIC %p\n", xic ); - data->xic = xic; - XFree( preedit ); XFree( status ); return xic; } + +XIC X11DRV_get_ic( HWND hwnd ) +{ + struct x11drv_win_data *data; + XIM xim; + XIC ret; + + if (!(data = get_win_data( hwnd ))) return 0; + x11drv_thread_data()->last_xic_hwnd = hwnd; + if (!(ret = data->xic) && (xim = x11drv_thread_data()->xim)) + ret = data->xic = xic_create( xim, hwnd, data->whole_window ); + release_win_data( data ); + + return ret; +}

1 0

Rémi Bernon : winex11: Early return control flow in xic_preedit_caret.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: d84f8dccf0b0e62bfba257db3bf2eed72f2bff0f URL: https://gitlab.winehq.org/wine/wine/-/commit/d84f8dccf0b0e62bfba257db3bf2ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Apr 2 10:21:22 2023 +0200 winex11: Early return control flow in xic_preedit_caret. --- dlls/winex11.drv/xim.c | 67 +++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 219e5b18974..0251677eef9 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -215,46 +215,45 @@ static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg ) static int xic_preedit_caret( XIC xic, XPointer user, XPointer arg ) { - XIMPreeditCaretCallbackStruct *P_C = (void *)arg; + XIMPreeditCaretCallbackStruct *params = (void *)arg; HWND hwnd = (HWND)user; + int pos; TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg ); - if (P_C) + if (!params) return 0; + + pos = x11drv_client_call( client_ime_get_cursor_pos, 0 ); + switch (params->direction) { - int pos = x11drv_client_call( client_ime_get_cursor_pos, 0 ); - TRACE("pos: %d\n", pos); - switch(P_C->direction) - { - case XIMForwardChar: - case XIMForwardWord: - pos++; - break; - case XIMBackwardChar: - case XIMBackwardWord: - pos--; - break; - case XIMLineStart: - pos = 0; - break; - case XIMAbsolutePosition: - pos = P_C->position; - break; - case XIMDontChange: - P_C->position = pos; - return 0; - case XIMCaretUp: - case XIMCaretDown: - case XIMPreviousLine: - case XIMNextLine: - case XIMLineEnd: - FIXME("Not implemented\n"); - break; - } - x11drv_client_call( client_ime_set_cursor_pos, pos ); - P_C->position = pos; + case XIMForwardChar: + case XIMForwardWord: + pos++; + break; + case XIMBackwardChar: + case XIMBackwardWord: + pos--; + break; + case XIMLineStart: + pos = 0; + break; + case XIMAbsolutePosition: + pos = params->position; + break; + case XIMDontChange: + params->position = pos; + return 0; + case XIMCaretUp: + case XIMCaretDown: + case XIMPreviousLine: + case XIMNextLine: + case XIMLineEnd: + FIXME( "Not implemented\n" ); + break; } - TRACE("Finished\n"); + x11drv_client_call( client_ime_set_cursor_pos, pos ); + params->position = pos; + return 0; }

1 0

Rémi Bernon : winex11: Fix XIM wchar encoding in xic_preedit_draw.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 994d79903a096dccb905795a96492d87268ef6d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/994d79903a096dccb905795a96492d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Apr 2 10:18:07 2023 +0200 winex11: Fix XIM wchar encoding in xic_preedit_draw. --- dlls/winex11.drv/xim.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index a60ee4b2042..219e5b18974 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -182,24 +182,30 @@ static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg ) if (!(text = params->text)) X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, NULL, 0 ); - else if (!text->encoding_is_wchar) + else { size_t text_len; WCHAR *output; + char *str; + int len; + + if (!text->encoding_is_wchar) str = text->string.multi_byte; + else if ((len = wcstombs( NULL, text->string.wide_char, text->length )) < 0) str = NULL; + else if ((str = malloc( len + 1 ))) + { + wcstombs( str, text->string.wide_char, len ); + str[len] = 0; + } - text_len = strlen( text->string.multi_byte ); + text_len = str ? strlen( str ) : 0; if ((output = malloc( text_len * sizeof(WCHAR) ))) { - text_len = ntdll_umbstowcs( text->string.multi_byte, text_len, output, text_len ); + text_len = ntdll_umbstowcs( str, text_len, output, text_len ); X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, output, text_len ); free( output ); } - } - else - { - FIXME( "wchar PROBIBILY WRONG\n" ); - X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, - (WCHAR *)text->string.wide_char, text->length ); + + if (str != text->string.multi_byte) free( str ); } x11drv_client_call( client_ime_set_cursor_pos, params->caret );

1 0

Rémi Bernon : winex11: Reorder control flow in xic_preedit_draw.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: 1a0ba03cd7530a1cd3568baa08aedf2f02cc419e URL: https://gitlab.winehq.org/wine/wine/-/commit/1a0ba03cd7530a1cd3568baa08aedf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Apr 2 10:06:50 2023 +0200 winex11: Reorder control flow in xic_preedit_draw. --- dlls/winex11.drv/xim.c | 55 +++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index e73e019d448..a60ee4b2042 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -172,47 +172,38 @@ static int xic_preedit_done( XIC xic, XPointer user, XPointer arg ) static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg ) { - XIMPreeditDrawCallbackStruct *P_DR = (void *)arg; + XIMPreeditDrawCallbackStruct *params = (void *)arg; HWND hwnd = (HWND)user; + XIMText *text; TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg ); - if (P_DR) + if (!params) return 0; + + if (!(text = params->text)) + X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, NULL, 0 ); + else if (!text->encoding_is_wchar) { - int sel = P_DR->chg_first; - int len = P_DR->chg_length; - if (P_DR->text) + size_t text_len; + WCHAR *output; + + text_len = strlen( text->string.multi_byte ); + if ((output = malloc( text_len * sizeof(WCHAR) ))) { - if (! P_DR->text->encoding_is_wchar) - { - size_t text_len; - WCHAR *output; - - TRACE("multibyte\n"); - text_len = strlen( P_DR->text->string.multi_byte ); - if ((output = malloc( text_len * sizeof(WCHAR) ))) - { - text_len = ntdll_umbstowcs( P_DR->text->string.multi_byte, text_len, - output, text_len ); - - X11DRV_ImmSetInternalString( sel, len, output, text_len ); - free( output ); - } - } - else - { - FIXME("wchar PROBIBILY WRONG\n"); - X11DRV_ImmSetInternalString (sel, len, - (LPWSTR)P_DR->text->string.wide_char, - P_DR->text->length); - } + text_len = ntdll_umbstowcs( text->string.multi_byte, text_len, output, text_len ); + X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, output, text_len ); + free( output ); } - else - X11DRV_ImmSetInternalString (sel, len, NULL, 0); - x11drv_client_call( client_ime_set_cursor_pos, P_DR->caret ); + } + else + { + FIXME( "wchar PROBIBILY WRONG\n" ); + X11DRV_ImmSetInternalString( params->chg_first, params->chg_length, + (WCHAR *)text->string.wide_char, text->length ); } - TRACE("Finished\n"); + x11drv_client_call( client_ime_set_cursor_pos, params->caret ); + return 0; }

1 0

Rémi Bernon : winex11: Refactor XIM input style selection.
by Alexandre Julliard 05 Apr '23

05 Apr '23

Module: wine Branch: master Commit: d0691e8c9a0e4ebdbeacbbec92fa36f63d0cf1cc URL: https://gitlab.winehq.org/wine/wine/-/commit/d0691e8c9a0e4ebdbeacbbec92fa36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Apr 2 14:09:36 2023 +0200 winex11: Refactor XIM input style selection. --- dlls/winex11.drv/xim.c | 84 +++++++++++++++++--------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 1637549511b..e73e019d448 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -49,17 +49,8 @@ static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; -#define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) -#define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) -#define STYLE_ROOT (XIMPreeditNothing | XIMStatusNothing) -/* this uses all the callbacks to utilize full IME support */ -#define STYLE_CALLBACK (XIMPreeditCallbacks | XIMStatusNothing) -/* in order to enable deadkey support */ -#define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing) - -static XIMStyle ximStyle = 0; -static XIMStyle ximStyleRoot = 0; -static XIMStyle ximStyleRequest = STYLE_CALLBACK; +static XIMStyle input_style = 0; +static XIMStyle input_style_req = XIMPreeditCallbacks | XIMStatusCallbacks; static const char *debugstr_xim_style( XIMStyle style ) { @@ -338,13 +329,6 @@ BOOL xim_init( const WCHAR *input_style ) static const WCHAR overthespotW[] = {'o','v','e','r','t','h','e','s','p','o','t',0}; static const WCHAR rootW[] = {'r','o','o','t',0}; - if (!wcsicmp( input_style, offthespotW )) - ximStyleRequest = STYLE_OFFTHESPOT; - else if (!wcsicmp( input_style, overthespotW )) - ximStyleRequest = STYLE_OVERTHESPOT; - else if (!wcsicmp( input_style, rootW )) - ximStyleRequest = STYLE_ROOT; - if (!XSupportsLocale()) { WARN("X does not support locale.\n"); @@ -355,6 +339,17 @@ BOOL xim_init( const WCHAR *input_style ) WARN("Could not set locale modifiers.\n"); return FALSE; } + + if (!wcsicmp( input_style, offthespotW )) + input_style_req = XIMPreeditArea | XIMStatusArea; + else if (!wcsicmp( input_style, overthespotW )) + input_style_req = XIMPreeditPosition | XIMStatusNothing; + else if (!wcsicmp( input_style, rootW )) + input_style_req = XIMPreeditNothing | XIMStatusNothing; + + TRACE( "requesting %s style %#lx %s\n", debugstr_w(input_style), input_style_req, + debugstr_xim_style( input_style_req ) ); + return TRUE; } @@ -364,13 +359,12 @@ static void xim_destroy( XIM xim, XPointer user, XPointer arg ); static XIM xim_create( struct x11drv_thread_data *data ) { XIMCallback destroy = {.callback = xim_destroy, .client_data = (XPointer)data}; - Display *display = data->display; - XIMStyle ximStyleNone; - XIMStyles *ximStyles = NULL; + XIMStyle input_style_fallback = XIMPreeditNone | XIMStatusNone; + XIMStyles *styles = NULL; INT i; XIM xim; - if (!(xim = XOpenIM( display, NULL, NULL, NULL ))) + if (!(xim = XOpenIM( data->display, NULL, NULL, NULL ))) { WARN("Could not open input method.\n"); return NULL; @@ -382,50 +376,28 @@ static XIM xim_create( struct x11drv_thread_data *data ) TRACE( "xim %p, XDisplayOfIM %p, XLocaleOfIM %s\n", xim, XDisplayOfIM( xim ), debugstr_a(XLocaleOfIM( xim )) ); - XGetIMValues(xim, XNQueryInputStyle, &ximStyles, NULL); - if (ximStyles == 0) + XGetIMValues( xim, XNQueryInputStyle, &styles, NULL ); + if (!styles) { WARN( "Could not find supported input style.\n" ); XCloseIM( xim ); return NULL; } - ximStyleRoot = 0; - ximStyleNone = 0; - ximStyle = 0; - - TRACE( "input styles count %u\n", ximStyles->count_styles ); - for (i = 0; i < ximStyles->count_styles; ++i) + TRACE( "input styles count %u\n", styles->count_styles ); + for (i = 0, input_style = 0; i < styles->count_styles; ++i) { - XIMStyle style = ximStyles->supported_styles[i]; + XIMStyle style = styles->supported_styles[i]; TRACE( " %u: %#lx %s\n", i, style, debugstr_xim_style( style ) ); - if (!ximStyle && (ximStyles->supported_styles[i] == - ximStyleRequest)) - { - ximStyle = ximStyleRequest; - TRACE("Setting Style: ximStyle = ximStyleRequest\n"); - } - else if (!ximStyleRoot &&(ximStyles->supported_styles[i] == - STYLE_ROOT)) - { - ximStyleRoot = STYLE_ROOT; - TRACE("Setting Style: ximStyleRoot = STYLE_ROOT\n"); - } - else if (!ximStyleNone && (ximStyles->supported_styles[i] == - STYLE_NONE)) - { - TRACE("Setting Style: ximStyleNone = STYLE_NONE\n"); - ximStyleNone = STYLE_NONE; - } + if (style == input_style_req) input_style = style; + if (!input_style && (style & input_style_req)) input_style = style; + if (input_style_fallback > style) input_style_fallback = style; } - XFree(ximStyles); - - if (ximStyle == 0) - ximStyle = ximStyleRoot; + XFree(styles); - if (ximStyle == 0) - ximStyle = ximStyleNone; + if (!input_style) input_style = input_style_fallback; + TRACE( "selected style %#lx %s\n", input_style, debugstr_xim_style( input_style ) ); return xim; } @@ -511,7 +483,7 @@ XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data ) XNStatusDoneCallback, &status_done, XNStatusDrawCallback, &status_draw, NULL ); - xic = XCreateIC( xim, XNInputStyle, ximStyle, XNPreeditAttributes, preedit, XNStatusAttributes, status, + xic = XCreateIC( xim, XNInputStyle, input_style, XNPreeditAttributes, preedit, XNStatusAttributes, status, XNClientWindow, win, XNFocusWindow, win, XNDestroyCallback, &destroy, NULL ); TRACE( "created XIC %p\n", xic );

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2023