June 2022 - Wine-Devel - list.winehq.org

[PATCH v3 1/2] winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer.

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 84 ++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 017a8813caa..468d10fbbae 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -209,26 +209,6 @@ struct wgl_context struct list entry; }; -struct wgl_pbuffer -{ - Drawable drawable; - const struct wgl_pixel_format* fmt; - int width; - int height; - int* attribList; - int use_render_texture; /* This is also the internal texture format */ - int texture_bind_target; - int texture_bpp; - GLint texture_format; - GLuint texture_target; - GLenum texture_type; - GLuint texture; - int texture_level; - GLXContext tmp_context; - GLXContext prev_context; - struct list entry; -}; - enum dc_gl_type { DC_GL_NONE, /* no GL support (pixel format not set yet) */ @@ -252,6 +232,26 @@ struct gl_drawable BOOL mutable_pf; }; +struct wgl_pbuffer +{ + struct gl_drawable *gl; + const struct wgl_pixel_format* fmt; + int width; + int height; + int* attribList; + int use_render_texture; /* This is also the internal texture format */ + int texture_bind_target; + int texture_bpp; + GLint texture_format; + GLuint texture_target; + GLenum texture_type; + GLuint texture; + int texture_level; + GLXContext tmp_context; + GLXContext prev_context; + struct list entry; +}; + enum glx_swap_control_method { GLX_SWAP_CONTROL_NONE, @@ -2276,9 +2276,19 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat } PUSH1(attribs, None); - object->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); - TRACE("new Pbuffer drawable as %lx\n", object->drawable); - if (!object->drawable) { + if (!(object->gl = calloc( 1, sizeof(*object->gl) ))) + { + SetLastError(ERROR_NO_SYSTEM_RESOURCES); + goto create_failed; + } + object->gl->type = DC_GL_PBUFFER; + object->gl->format = object->fmt; + object->gl->ref = 1; + + object->gl->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); + TRACE("new Pbuffer drawable as %p (%lx)\n", object->gl, object->gl->drawable); + if (!object->gl->drawable) { + free( object->gl ); SetLastError(ERROR_NO_SYSTEM_RESOURCES); goto create_failed; /* unexpected error */ } @@ -2306,7 +2316,8 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) pthread_mutex_lock( &context_mutex ); list_remove( &object->entry ); pthread_mutex_unlock( &context_mutex ); - pglXDestroyPbuffer(gdi_display, object->drawable); + pglXDestroyPbuffer(gdi_display, object->gl->drawable); + release_gl_drawable( object->gl ); if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); free( object ); @@ -2321,30 +2332,21 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) { struct x11drv_escape_set_drawable escape; - struct gl_drawable *gl, *prev; + struct gl_drawable *prev; HDC hdc; hdc = NtGdiOpenDCW( NULL, NULL, NULL, 0, TRUE, NULL, NULL, NULL ); if (!hdc) return 0; - if (!(gl = calloc( 1, sizeof(*gl) ))) - { - NtGdiDeleteObjectApp( hdc ); - return 0; - } - gl->type = DC_GL_PBUFFER; - gl->drawable = object->drawable; - gl->format = object->fmt; - gl->ref = 1; - pthread_mutex_lock( &context_mutex ); if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&prev )) release_gl_drawable( prev ); - XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)gl ); + grab_gl_drawable( object->gl ); + XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)object->gl ); pthread_mutex_unlock( &context_mutex ); escape.code = X11DRV_SET_DRAWABLE; - escape.drawable = object->drawable; + escape.drawable = object->gl->drawable; escape.mode = IncludeInferiors; SetRect( &escape.dc_rect, 0, 0, object->width, object->height ); NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); @@ -2364,10 +2366,10 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut switch (iAttribute) { case WGL_PBUFFER_WIDTH_ARB: - pglXQueryDrawable(gdi_display, object->drawable, GLX_WIDTH, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->gl->drawable, GLX_WIDTH, (unsigned int*) piValue); break; case WGL_PBUFFER_HEIGHT_ARB: - pglXQueryDrawable(gdi_display, object->drawable, GLX_HEIGHT, (unsigned int*) piValue); + pglXQueryDrawable(gdi_display, object->gl->drawable, GLX_HEIGHT, (unsigned int*) piValue); break; case WGL_PBUFFER_LOST_ARB: @@ -2981,7 +2983,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) FIXME("partial stub!\n"); } - TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); + TRACE("drawable=%p (%lx), context=%p\n", object->gl, object->gl->drawable, prev_context); if (!object->tmp_context || object->prev_context != prev_context) { if (object->tmp_context) pglXDestroyContext(gdi_display, object->tmp_context); @@ -2992,7 +2994,7 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ - pglXMakeCurrent(gdi_display, object->drawable, object->tmp_context); + pglXMakeCurrent(gdi_display, object->gl->drawable, object->tmp_context); /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. * After that copy the pbuffer texture data. */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/244

June 20, 2022

[PATCH v3 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used

by Paul Gofman (＠gofman)

Other drawable types are ref counted and destroyed only when nothing (e. g., existing contexts) reference them anymore, making sure that if we have a context referencing drawable the GLX drawable is still valid. That was probably left behind for PBuffers. -- v3: winex11.drv: Destroy GLX pbuffer when destroying drawable. winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer. https://gitlab.winehq.org/wine/wine/-/merge_requests/244

June 20, 2022

Re: [PATCH 5/7] win32u: Move WM_PRINT implementation from user32.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117310 Your paranoid android. === debian11 (64 bit WoW report) === user32: input.c:2870: Test failed: 15: expected WM_INPUT message input.c:2873: Test failed: 15: expected RIM_INPUT message

June 20, 2022

Re: [PATCH 3/7] win32u: Move WM_WINDOWPOSCHANGED implementation from user32.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117308 Your paranoid android. === debian11 (32 bit Chinese:China report) === user32: win.c:11787: Test failed: 011D00CE: expected NOT topmost win.c:11606: Test succeeded inside todo block: 5: hwnd 00C00042 is still topmost

June 20, 2022

Re: [PATCH v3 0/9] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.

by Matteo Bruni (＠Mystral)

I'm still looking through the patches but I might as well mention right away that we don't want to add any new code to d3dx10_43_main.c. In fact we moved a few functions out of that file when implementing them (but, as far as I'm concerned, pretty much any excuse is good to move stuff out). async.c seems like a good place for the thread pump implementation but I'd consider other options too. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/272#note_2358

June 20, 2022

Re: [PATCH 0/1] MR253: wineboot: Allow Wine to display custom boot initialization resource

by Dan Mondrik (＠danrm)

@julliard I see you are the one who has accepted `wineboot` merges in mainline before. Am I as a submitter expected to do anything other than post here and wait? Thanks. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/253#note_2357

June 20, 2022

Re: [PATCH 2/7] win32u: Move WM_APPCOMMAND implementation from user32.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117307 Your paranoid android. === debian11 (64 bit WoW report) === user32: win.c:11770: Test succeeded inside todo block: child should be topmost win.c:11773: Test failed: grandchild should be topmost win.c:11781: Test failed: child should NOT be topmost win.c:11784: Test succeeded inside todo block: grandchild should NOT be topmost win.c:11787: Test failed: 00000000007200BA: expected NOT topmost win.c:11606: Test succeeded inside todo block: 5: hwnd 0000000001320054 is still topmost

June 20, 2022

Re: [PATCH v2 0/3] MR281: A few fixes in xmllite

by Nikolay Sivov (＠nsivov)

Hi, David. This looks fine, but please push an update to use spaces instead of tabs, and reformat commit subjects to be "xmllite/reader" or "xmllite/writer", depending one the change. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/281#note_2354

June 20, 2022

[PATCH 7/7] win32u: Move WM_SHOWWINDOW implementation from user32.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 84 ++++++++++++++------------------------------ dlls/win32u/defwnd.c | 25 +++++++++++++ 2 files changed, 51 insertions(+), 58 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 96dd2e873fa..16442b6899e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -73,57 +73,6 @@ HBRUSH DEFWND_ControlColor( HDC hDC, UINT ctlType ) } -/*********************************************************************** - * DEFWND_DefWinProc - * - * Default window procedure for messages that are the same in Ansi and Unicode. - */ -static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - switch(msg) - { - case WM_NCMOUSEMOVE: - return NC_HandleNCMouseMove( hwnd, wParam, lParam ); - - case WM_NCMOUSELEAVE: - return NC_HandleNCMouseLeave( hwnd ); - - case WM_SYSCOMMAND: - return NC_HandleSysCommand( hwnd, wParam, lParam ); - - case WM_SHOWWINDOW: - { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - WND *pWnd; - if (!lParam) return 0; /* sent from ShowWindow */ - if ((style & WS_VISIBLE) && wParam) return 0; - if (!(style & WS_VISIBLE) && !wParam) return 0; - if (!GetWindow( hwnd, GW_OWNER )) return 0; - if (!(pWnd = WIN_GetPtr( hwnd ))) return 0; - if (pWnd == WND_OTHER_PROCESS) return 0; - if (wParam) - { - if (!(pWnd->flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) - { - WIN_ReleasePtr( pWnd ); - return 0; - } - pWnd->flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; - } - else pWnd->flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; - WIN_ReleasePtr( pWnd ); - NtUserShowWindow( hwnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE ); - break; - } - - default: - return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); - - } - - return 0; -} - static LPARAM DEFWND_GetTextA( WND *wndPtr, LPSTR dest, WPARAM wParam ) { LPARAM result = 0; @@ -184,6 +133,18 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } break; + case WM_NCMOUSEMOVE: + result = NC_HandleNCMouseMove( hwnd, wParam, lParam ); + break; + + case WM_NCMOUSELEAVE: + result = NC_HandleNCMouseLeave( hwnd ); + break; + + case WM_SYSCOMMAND: + result = NC_HandleSysCommand( hwnd, wParam, lParam ); + break; + case WM_GETTEXTLENGTH: { WND *wndPtr = WIN_GetPtr( hwnd ); @@ -207,11 +168,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } break; - case WM_SETTEXT: - case WM_SYSCHAR: - result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); - break; - case WM_IME_CHAR: if (HIBYTE(wParam)) PostMessageA( hwnd, WM_CHAR, HIBYTE(wParam), lParam ); PostMessageA( hwnd, WM_CHAR, LOBYTE(wParam), lParam ); @@ -281,7 +237,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; default: - result = DEFWND_DefWinProc( hwnd, msg, wParam, lParam ); + result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); break; } @@ -357,6 +313,18 @@ LRESULT WINAPI DefWindowProcW( } break; + case WM_NCMOUSEMOVE: + result = NC_HandleNCMouseMove( hwnd, wParam, lParam ); + break; + + case WM_NCMOUSELEAVE: + result = NC_HandleNCMouseLeave( hwnd ); + break; + + case WM_SYSCOMMAND: + result = NC_HandleSysCommand( hwnd, wParam, lParam ); + break; + case WM_GETTEXTLENGTH: { WND *wndPtr = WIN_GetPtr( hwnd ); @@ -431,7 +399,7 @@ LRESULT WINAPI DefWindowProcW( break; default: - result = DEFWND_DefWinProc( hwnd, msg, wParam, lParam ); + result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); break; } SPY_ExitMessage( SPY_RESULT_DEFWND, hwnd, msg, result, wParam, lParam ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 5625f15d42a..90323e304fc 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2530,6 +2530,31 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, handle_set_cursor( hwnd, wparam, lparam ); break; + case WM_SHOWWINDOW: + { + LONG style = get_window_long( hwnd, GWL_STYLE ); + WND *win; + if (!lparam) break; /* sent from ShowWindow */ + if ((style & WS_VISIBLE) && wparam) break; + if (!(style & WS_VISIBLE) && !wparam) break; + if (!get_window_relative( hwnd, GW_OWNER )) break; + if (!(win = get_win_ptr( hwnd ))) break; + if (win == WND_OTHER_PROCESS) break; + if (wparam) + { + if (!(win->flags & WIN_NEEDS_SHOW_OWNEDPOPUP)) + { + release_win_ptr( win ); + break; + } + win->flags &= ~WIN_NEEDS_SHOW_OWNEDPOPUP; + } + else win->flags |= WIN_NEEDS_SHOW_OWNEDPOPUP; + release_win_ptr( win ); + NtUserShowWindow( hwnd, wparam ? SW_SHOWNOACTIVATE : SW_HIDE ); + break; + } + case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/285

June 20, 2022

[PATCH 6/7] win32u: Move more default window messages implementation from user32.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 98 ------------------------------- dlls/win32u/defwnd.c | 109 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 4 files changed, 111 insertions(+), 99 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index dcc0f4d2138..96dd2e873fa 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -#define DRAG_FILE 0x454C4946 - /*********************************************************************** * DEFWND_ControlColor * @@ -90,34 +88,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); - case WM_RBUTTONUP: - { - POINT pt; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - ClientToScreen(hwnd, &pt); - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(pt.x, pt.y) ); - } - break; - - case WM_NCRBUTTONUP: - /* - * FIXME : we must NOT send WM_CONTEXTMENU on a WM_NCRBUTTONUP (checked - * in Windows), but what _should_ we do? According to MSDN : - * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND - * message to the window". When is it appropriate? - */ - break; - - case WM_XBUTTONUP: - case WM_NCXBUTTONUP: - if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2) - { - SendMessageW(hwnd, WM_APPCOMMAND, (WPARAM)hwnd, - MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam))); - } - break; - case WM_SYSCOMMAND: return NC_HandleSysCommand( hwnd, wParam, lParam ); @@ -146,74 +116,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; } - case WM_VKEYTOITEM: - case WM_CHARTOITEM: - return -1; - - case WM_DROPOBJECT: - return DRAG_FILE; - - case WM_QUERYDROPOBJECT: - return (GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) != 0; - - case WM_QUERYDRAGICON: - { - UINT len; - - HICON hIcon = (HICON)GetClassLongPtrW( hwnd, GCLP_HICON ); - HINSTANCE instance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); - if (hIcon) return (LRESULT)hIcon; - for(len=1; len<64; len++) - if((hIcon = LoadIconW(instance, MAKEINTRESOURCEW(len)))) - return (LRESULT)hIcon; - return (LRESULT)LoadIconW(0, (LPWSTR)IDI_APPLICATION); - } - break; - - case WM_ISACTIVEICON: - return (win_get_flags( hwnd ) & WIN_NCACTIVATED) != 0; - - case WM_NOTIFYFORMAT: - if (IsWindowUnicode(hwnd)) return NFR_UNICODE; - else return NFR_ANSI; - - case WM_QUERYOPEN: - case WM_QUERYENDSESSION: - return 1; - - case WM_HELP: - SendMessageW( GetParent(hwnd), msg, wParam, lParam ); - break; - - case WM_STYLECHANGED: - if (wParam == GWL_STYLE && (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) - { - STYLESTRUCT *style = (STYLESTRUCT *)lParam; - if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) - NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | - SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); - } - break; - - case WM_INPUTLANGCHANGEREQUEST: - NtUserActivateKeyboardLayout( (HKL)lParam, 0 ); - break; - - case WM_INPUTLANGCHANGE: - { - struct user_thread_info *info = get_user_thread_info(); - int count = 0; - HWND *win_array = WIN_ListChildren( hwnd ); - info->kbd_layout = (HKL)lParam; - - if (!win_array) - break; - while (win_array[count]) - SendMessageW( win_array[count++], WM_INPUTLANGCHANGE, wParam, lParam); - HeapFree(GetProcessHeap(),0,win_array); - break; - } - default: return NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 0470ed77eac..5625f15d42a 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +#define DRAG_FILE 0x454c4946 + /* bits in the dwKeyData */ #define KEYDATA_ALT 0x2000 #define KEYDATA_PREVSTATE 0x4000 @@ -2350,6 +2352,28 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_NCLBUTTONDBLCLK: return handle_nc_button_dbl_click( hwnd, wparam, lparam ); + case WM_RBUTTONUP: + { + POINT pt; + pt.x = (short)LOWORD( lparam ); + pt.y = (short)HIWORD( lparam ); + client_to_screen( hwnd, &pt ); + send_message( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM( pt.x, pt.y )); + } + break; + + case WM_NCRBUTTONUP: + break; + + case WM_XBUTTONUP: + case WM_NCXBUTTONUP: + if (HIWORD(wparam) == XBUTTON1 || HIWORD(wparam) == XBUTTON2) + { + send_message( hwnd, WM_APPCOMMAND, (WPARAM)hwnd, + MAKELPARAM( LOWORD( wparam ), FAPPCOMMAND_MOUSE | HIWORD( wparam ))); + } + break; + case WM_CONTEXTMENU: if (get_window_long( hwnd, GWL_STYLE ) & WS_CHILD) send_message( get_parent( hwnd ), msg, (WPARAM)hwnd, lparam ); @@ -2640,6 +2664,91 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, send_message( parent, msg, wparam, lparam ); break; } + + case WM_VKEYTOITEM: + case WM_CHARTOITEM: + result = -1; + break; + + case WM_DROPOBJECT: + result = DRAG_FILE; + break; + + case WM_QUERYDROPOBJECT: + result = (get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) != 0; + break; + + case WM_QUERYDRAGICON: + { + UINT len; + HICON icon = (HICON)get_class_long_ptr( hwnd, GCLP_HICON, FALSE ); + HINSTANCE instance = (HINSTANCE)get_window_long_ptr( hwnd, GWLP_HINSTANCE, FALSE ); + + if (icon) + { + result = (LRESULT)icon; + break; + } + + for (len = 1; len < 64; len++) + { + if((icon = LoadImageW( instance, MAKEINTRESOURCEW( len ), IMAGE_ICON, 0, 0, + LR_SHARED | LR_DEFAULTSIZE ))) + { + result = (LRESULT)icon; + break; + } + } + if (!result) result = (LRESULT)LoadImageW( 0, (WCHAR *)IDI_APPLICATION, IMAGE_ICON, + 0, 0, LR_SHARED | LR_DEFAULTSIZE ); + break; + } + + case WM_ISACTIVEICON: + result = (win_get_flags( hwnd ) & WIN_NCACTIVATED) != 0; + break; + + case WM_NOTIFYFORMAT: + result = is_window_unicode(hwnd) ? NFR_UNICODE : NFR_ANSI; + break; + + case WM_QUERYOPEN: + case WM_QUERYENDSESSION: + result = 1; + break; + + case WM_HELP: + send_message( get_parent( hwnd ), msg, wparam, lparam ); + break; + + case WM_STYLECHANGED: + if (wparam == GWL_STYLE && (get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED)) + { + STYLESTRUCT *style = (STYLESTRUCT *)lparam; + if ((style->styleOld ^ style->styleNew) & (WS_CAPTION|WS_THICKFRAME|WS_VSCROLL|WS_HSCROLL)) + NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | + SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE ); + } + break; + + case WM_INPUTLANGCHANGEREQUEST: + NtUserActivateKeyboardLayout( (HKL)lparam, 0 ); + break; + + case WM_INPUTLANGCHANGE: + { + struct user_thread_info *info = get_user_thread_info(); + HWND *win_array = list_window_children( 0, hwnd, NULL, 0 ); + int count = 0; + info->kbd_layout = (HKL)lparam; + + if (!win_array) + break; + while (win_array[count]) + send_message( win_array[count++], WM_INPUTLANGCHANGE, wparam, lparam ); + free( win_array ); + break; + } } return result; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index b2d16b07d8e..808d3f83e37 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -473,6 +473,7 @@ extern void user_check_not_lock(void) DECLSPEC_HIDDEN; /* window.c */ struct tagWND; extern HDWP begin_defer_window_pos( INT count ) DECLSPEC_HIDDEN; +extern BOOL client_to_screen( HWND hwnd, POINT *pt ) DECLSPEC_HIDDEN; extern void destroy_thread_windows(void) DECLSPEC_HIDDEN; extern LRESULT destroy_window( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_client_rect( HWND hwnd, RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e8562f6a685..4a6b321d391 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2840,7 +2840,7 @@ other_process: /* one of the parents may belong to another process, do it the h } /* see ClientToScreen */ -static BOOL client_to_screen( HWND hwnd, POINT *pt ) +BOOL client_to_screen( HWND hwnd, POINT *pt ) { POINT offset; BOOL mirrored; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/285

June 20, 2022