wine-commits March 2023

wine-commits@winehq.org

1 participants
910 discussions

Gabriel Ivăncescu : mshtml: Grab refs to windows upfront before sending pagehide events.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 6bd162d9d2d18d328463962293560a00261b60c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6bd162d9d2d18d328463962293560a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:07 2023 +0200 mshtml: Grab refs to windows upfront before sending pagehide events. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/view.c | 74 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 346fccf4955..3f31e609e39 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -414,45 +414,73 @@ HRESULT call_set_active_object(IOleInPlaceUIWindow *window, IOleInPlaceActiveObj return IOleInPlaceUIWindow_SetActiveObject(window, act_obj, act_obj ? html_documentW : NULL); } -static void send_unload_events_impl(HTMLInnerWindow *window) +static unsigned get_window_list_num(HTMLInnerWindow *window) { HTMLOuterWindow *child; + unsigned ret = 1; + + LIST_FOR_EACH_ENTRY(child, &window->children, HTMLOuterWindow, sibling_entry) + ret += get_window_list_num(child->base.inner_window); + return ret; +} + +static HTMLInnerWindow **get_window_list(HTMLInnerWindow *window, HTMLInnerWindow **output) +{ + HTMLOuterWindow *child; + + *output++ = window; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + + LIST_FOR_EACH_ENTRY(child, &window->children, HTMLOuterWindow, sibling_entry) + output = get_window_list(child->base.inner_window, output); + return output; +} + +static void send_unload_events(HTMLDocumentObj *doc) +{ + HTMLInnerWindow **windows, *window; DOMEvent *event; + unsigned i, num; HRESULT hres; - if(!window) + if(!doc->window || !doc->doc_node->content_ready) + return; + window = doc->window->base.inner_window; + + /* Grab list of all windows ahead, and keep refs, + since it can be detached from under our feet. */ + num = get_window_list_num(window); + if(!(windows = malloc(num * sizeof(*windows)))) return; + get_window_list(window, windows); + + for(i = 0; i < num; i++) { + window = windows[i]; - if(window->doc && !window->doc->unload_sent) { - window->doc->unload_sent = TRUE; + if(window->doc && !window->doc->unload_sent) { + window->doc->unload_sent = TRUE; + + /* Native sends pagehide events prior to unload on the same window + before it moves on to the next window, so they're interleaved. */ + if(window->doc->document_mode >= COMPAT_MODE_IE11) { + hres = create_document_event(window->doc, EVENTID_PAGEHIDE, &event); + if(SUCCEEDED(hres)) { + dispatch_event(&window->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } + } - /* Native sends pagehide events prior to unload on the same window - before it moves on to the next window, so they're interleaved. */ - if(window->doc->document_mode >= COMPAT_MODE_IE11) { - hres = create_document_event(window->doc, EVENTID_PAGEHIDE, &event); + hres = create_document_event(window->doc, EVENTID_UNLOAD, &event); if(SUCCEEDED(hres)) { dispatch_event(&window->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } } - hres = create_document_event(window->doc, EVENTID_UNLOAD, &event); - if(SUCCEEDED(hres)) { - dispatch_event(&window->event_target, event); - IDOMEvent_Release(&event->IDOMEvent_iface); - } + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); } - LIST_FOR_EACH_ENTRY(child, &window->children, HTMLOuterWindow, sibling_entry) - send_unload_events_impl(child->base.inner_window); -} - -static void send_unload_events(HTMLDocumentObj *doc) -{ - if(!doc->window || !doc->doc_node->content_ready) - return; - - send_unload_events_impl(doc->window->base.inner_window); + free(windows); } /**********************************************************

1 0

Gabriel Ivăncescu : mshtml: Hold ref to the frame element during readyState notifications.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 3c2b417151c7b68155291c21a0cb4d4ade21fd66 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c2b417151c7b68155291c21a0cb4d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:06 2023 +0200 mshtml: Hold ref to the frame element during readyState notifications. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/persist.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 35ffd7824dd..78e8f609187 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -438,12 +438,15 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind static void notif_readystate(HTMLOuterWindow *window) { HTMLInnerWindow *inner_window = window->base.inner_window; + HTMLFrameBase *frame_element = window->frame_element; DOMEvent *event; HRESULT hres; window->readystate_pending = FALSE; IHTMLWindow2_AddRef(&inner_window->base.IHTMLWindow2_iface); + if(frame_element) + IHTMLDOMNode_AddRef(&frame_element->element.node.IHTMLDOMNode_iface); if(is_main_content_window(window)) call_property_onchanged(&window->browser->doc->cp_container, DISPID_READYSTATE); @@ -456,12 +459,13 @@ static void notif_readystate(HTMLOuterWindow *window) } IHTMLWindow2_Release(&inner_window->base.IHTMLWindow2_iface); - if(window->frame_element) { - hres = create_document_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, &event); + if(frame_element) { + hres = create_document_event(frame_element->element.node.doc, EVENTID_READYSTATECHANGE, &event); if(SUCCEEDED(hres)) { - dispatch_event(&window->frame_element->element.node.event_target, event); + dispatch_event(&frame_element->element.node.event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } + IHTMLDOMNode_Release(&frame_element->element.node.IHTMLDOMNode_iface); } }

1 0

Gabriel Ivăncescu : mshtml: Check if browser was detached during notifications while navigating.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: b7d75c9dcb6ef626a4869722e99b075df21099df URL: https://gitlab.winehq.org/wine/wine/-/commit/b7d75c9dcb6ef626a4869722e99b07… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:06 2023 +0200 mshtml: Check if browser was detached during notifications while navigating. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index de16232c3e3..eb365c99af9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2559,6 +2559,9 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis } } + if(!window->browser) + return S_OK; + if(is_main_content_window(window)) return super_navigate(window, uri, flags, headers, post_data, post_data_len); }

1 0

Gabriel Ivăncescu : mshtml: Hold ref to outer window when navigating.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: c3529d6bd72fcc627c898b756d024f1dfcab18b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3529d6bd72fcc627c898b756d024f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:06 2023 +0200 mshtml: Hold ref to outer window when navigating. It's possible for it to get destroyed while processing an external callback notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c78dfde43dc..de16232c3e3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1948,8 +1948,12 @@ typedef struct { static void start_doc_binding_proc(task_t *_task) { start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; + HTMLOuterWindow *window = task->window; + + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + set_current_mon(window, task->pending_window->bscallback->bsc.mon, task->flags); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); - set_current_mon(task->window, task->pending_window->bscallback->bsc.mon, task->flags); start_binding(task->pending_window, &task->pending_window->bscallback->bsc, NULL); } @@ -2016,6 +2020,7 @@ void abort_window_bindings(HTMLInnerWindow *window) HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IMoniker *mon, IStream *stream) { + HTMLOuterWindow *window = pending_window->base.outer_window; nsChannelBSC *bscallback = pending_window->bscallback; HRESULT hres = S_OK; @@ -2028,7 +2033,9 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IMoniker *mon, I if(!bscallback->nschannel->content_type) return E_OUTOFMEMORY; - set_current_mon(pending_window->base.outer_window, mon, 0); + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + set_current_mon(window, mon, 0); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); bscallback->bsc.window = pending_window; if(stream) @@ -2143,14 +2150,19 @@ typedef struct { static void navigate_proc(task_t *_task) { navigate_task_t *task = (navigate_task_t*)_task; + HTMLOuterWindow *window = task->window; HRESULT hres; - hres = set_moniker(task->window, task->mon, task->uri, NULL, task->bscallback, TRUE); + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + + hres = set_moniker(window, task->mon, task->uri, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { - set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); - set_current_uri(task->window, task->uri); - start_binding(task->window->pending_window, &task->bscallback->bsc, NULL); + set_current_mon(window, task->bscallback->bsc.mon, task->flags); + set_current_uri(window, task->uri); + start_binding(window->pending_window, &task->bscallback->bsc, NULL); } + + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); } static void navigate_task_destr(task_t *_task) @@ -2676,14 +2688,16 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u hres = create_uri(new_url, 0, &nav_uri); if(FAILED(hres)) return hres; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); hres = translate_uri(window, nav_uri, &display_uri, &uri); IUri_Release(nav_uri); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) { + hres = navigate_uri(window, uri, display_uri, NULL, flags); + IUri_Release(uri); + SysFreeString(display_uri); + } - hres = navigate_uri(window, uri, display_uri, NULL, flags); - IUri_Release(uri); - SysFreeString(display_uri); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); return hres; }

1 0

Gabriel Ivăncescu : mshtml: Hold ref to inner window when calling external code.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: fbeab911c960953fca600396df9f805fd5291864 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbeab911c960953fca600396df9f80… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:06 2023 +0200 mshtml: Hold ref to inner window when calling external code. It's possible for it to get detached while processing an external callback notification, such as when navigation happens during it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mutation.c | 12 ++++++++---- dlls/mshtml/navigate.c | 12 ++++++++++-- dlls/mshtml/persist.c | 8 ++++++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 05ebf706dd0..89bba9cb195 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -292,11 +292,13 @@ static void parse_complete(HTMLDocumentObj *doc) static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISupports *arg2) { HTMLDocumentObj *doc_obj = This->doc_obj; + HTMLInnerWindow *window = This->window; TRACE("(%p)\n", This); if(!doc_obj) return NS_OK; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); if(This == doc_obj->doc_node) { /* @@ -310,8 +312,11 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo bind_event_scripts(This); - This->window->performance_timing->dom_interactive_time = get_time_stamp(); - set_ready_state(This->outer_window, READYSTATE_INTERACTIVE); + if(This->window == window) { + window->performance_timing->dom_interactive_time = get_time_stamp(); + set_ready_state(This->outer_window, READYSTATE_INTERACTIVE); + } + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); return NS_OK; } @@ -368,14 +373,13 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa free(iter); } - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); - if(nsparser) { window->parser_callback_cnt--; nsIParser_EndEvaluatingParserInsertedScript(nsparser); nsIParser_Release(nsparser); } + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); IHTMLScriptElement_Release(&script_elem->IHTMLScriptElement_iface); return NS_OK; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b2fc0473aa1..c78dfde43dc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1419,8 +1419,11 @@ static void stop_request_task_destr(task_t *_task) static HRESULT async_stop_request(nsChannelBSC *This) { + HTMLInnerWindow *window = This->bsc.window; stop_request_task_t *task; + HRESULT hres; + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); if(!This->bsc.read) { TRACE("No data read, calling OnStartRequest\n"); on_start_nsrequest(This); @@ -1433,7 +1436,9 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - return push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.window->task_magic); + hres = push_task(&task->header, stop_request_proc, stop_request_task_destr, window->task_magic); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + return hres; } static void handle_navigation_error(nsChannelBSC *This, DWORD result) @@ -2069,6 +2074,7 @@ typedef struct { static void navigate_javascript_proc(task_t *_task) { navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; + HTMLInnerWindow *inner_window = task->window->base.inner_window; HTMLOuterWindow *window = task->window; HTMLDocumentObj *doc = NULL; BSTR code = NULL; @@ -2080,6 +2086,7 @@ static void navigate_javascript_proc(task_t *_task) doc = window->browser->doc; IUnknown_AddRef(doc->outer_unk); } + IHTMLWindow2_AddRef(&inner_window->base.IHTMLWindow2_iface); hres = IUri_GetPath(task->uri, &code); if(hres != S_OK) { @@ -2097,7 +2104,7 @@ static void navigate_javascript_proc(task_t *_task) set_download_state(doc, 1); V_VT(&v) = VT_EMPTY; - hres = exec_script(window->base.inner_window, code, L"jscript", &v); + hres = exec_script(inner_window, code, L"jscript", &v); SysFreeString(code); if(SUCCEEDED(hres) && V_VT(&v) != VT_EMPTY) { FIXME("javascirpt URL returned %s\n", debugstr_variant(&v)); @@ -2112,6 +2119,7 @@ static void navigate_javascript_proc(task_t *_task) } done: + IHTMLWindow2_Release(&inner_window->base.IHTMLWindow2_iface); if(doc) IUnknown_Release(doc->outer_unk); } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 620f6428d35..35ffd7824dd 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -437,20 +437,24 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind static void notif_readystate(HTMLOuterWindow *window) { + HTMLInnerWindow *inner_window = window->base.inner_window; DOMEvent *event; HRESULT hres; window->readystate_pending = FALSE; + IHTMLWindow2_AddRef(&inner_window->base.IHTMLWindow2_iface); + if(is_main_content_window(window)) call_property_onchanged(&window->browser->doc->cp_container, DISPID_READYSTATE); - hres = create_document_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, &event); + hres = create_document_event(inner_window->doc, EVENTID_READYSTATECHANGE, &event); if(SUCCEEDED(hres)) { event->no_event_obj = TRUE; - dispatch_event(&window->base.inner_window->doc->node.event_target, event); + dispatch_event(&inner_window->doc->node.event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } + IHTMLWindow2_Release(&inner_window->base.IHTMLWindow2_iface); if(window->frame_element) { hres = create_document_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, &event);

1 0

Gabriel Ivăncescu : mshtml: Hold ref to HTMLDocumentObj when calling external code.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: a62be201c87b02680d752753c2388d1d123711e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a62be201c87b02680d752753c2388d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 8 19:36:06 2023 +0200 mshtml: Hold ref to HTMLDocumentObj when calling external code. It's possible for it (and the GeckoBrowser) to get detached and destroyed while processing an external callback notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 6 +++- dlls/mshtml/mutation.c | 10 +++++-- dlls/mshtml/navigate.c | 75 ++++++++++++++++++++++++++++++++++---------------- dlls/mshtml/nsevents.c | 15 ++++++---- dlls/mshtml/nsio.c | 11 ++++++-- dlls/mshtml/olecmd.c | 9 +++++- dlls/mshtml/persist.c | 18 ++++++++---- dlls/mshtml/view.c | 3 ++ 8 files changed, 105 insertions(+), 42 deletions(-)

1 0

Zebediah Figura : wineandroid: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: ff64d67f765d819769fbd4c49a605a406a6e450a URL: https://gitlab.winehq.org/wine/wine/-/commit/ff64d67f765d819769fbd4c49a605a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 18:12:31 2023 -0600 wineandroid: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/wineandroid.drv/opengl.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index c8b7bf85cfb..5146fdf4df9 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -208,11 +208,10 @@ void update_gl_drawable( HWND hwnd ) } } -static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) +static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) { struct gl_drawable *gl; HWND hwnd = NtUserWindowFromDC( hdc ); - int prev = 0; if (!hwnd || hwnd == NtUserGetDesktopWindow()) { @@ -226,10 +225,18 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) } TRACE( "%p/%p format %d\n", hdc, hwnd, format ); + if (!internal) + { + /* cannot change it if already set */ + int prev = win32u_get_window_pixel_format( hwnd ); + + if (prev) + return prev == format; + } + if ((gl = get_gl_drawable( hwnd, 0 ))) { - prev = gl->format; - if (allow_change) + if (internal) { EGLint pf; p_eglGetConfigAttrib( display, pixel_formats[format - 1].config, EGL_NATIVE_VISUAL_ID, &pf ); @@ -241,8 +248,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); - if (prev && prev != format && !allow_change) return FALSE; - if (win32u_set_window_pixel_format( hwnd, format, FALSE )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format, internal )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; }

1 0

Zebediah Figura : winemac: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: f605add4fde2d94f029145573b72ee87fdc65bea URL: https://gitlab.winehq.org/wine/wine/-/commit/f605add4fde2d94f029145573b72ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 18:09:03 2023 -0600 winemac: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/winemac.drv/opengl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 6f3c3b88155..55e5704724b 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1525,7 +1525,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns * * Implementation of wglSetPixelFormat and wglSetPixelFormatWINE. */ -static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) +static BOOL set_pixel_format(HDC hdc, int fmt, BOOL internal) { struct macdrv_win_data *data; const pixel_format *pf; @@ -1540,16 +1540,19 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) return FALSE; } - if (!(data = get_win_data(hwnd))) + if (!internal) { - FIXME("DC for window %p of other process: not implemented\n", hwnd); - return FALSE; + /* cannot change it if already set */ + int prev = win32u_get_window_pixel_format( hwnd ); + + if (prev) + return prev == fmt; } - if (!allow_reset && data->pixel_format) /* cannot change it if already set */ + if (!(data = get_win_data(hwnd))) { - ret = (data->pixel_format == fmt); - goto done; + FIXME("DC for window %p of other process: not implemented\n", hwnd); + return FALSE; } /* Check if fmt is in our list of supported formats to see if it is supported. */ @@ -1588,7 +1591,7 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); if (ret && gl_surface_mode == GL_SURFACE_BEHIND) - win32u_set_window_pixel_format(hwnd, fmt, FALSE); + win32u_set_window_pixel_format(hwnd, fmt, internal); return ret; }

1 0

Zebediah Figura : winex11: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: 46c8a637525d0f1cf67830295fb460c819b800b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/46c8a637525d0f1cf67830295fb460… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 16:23:42 2023 -0600 winex11: Separately store the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/d3d8/tests/device.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- dlls/ddraw/tests/ddraw1.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- dlls/winex11.drv/opengl.c | 26 +++++++++++--------------- 7 files changed, 29 insertions(+), 33 deletions(-)

1 0

Zebediah Figura : win32u: Allow separately storing the internal pixel format set by WGL_WINE_pixel_format_passthrough.
by Alexandre Julliard 09 Mar '23

09 Mar '23

Module: wine Branch: master Commit: c2018ff466120ff2706c166ec66aea66ecea1683 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2018ff466120ff2706c166ec66aea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 20 16:17:44 2023 -0600 win32u: Allow separately storing the internal pixel format set by WGL_WINE_pixel_format_passthrough. --- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/window.c | 10 +++++++--- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 3 ++- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/gdi_driver.h | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 385e7c0ded5..5c337c722a7 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -90,6 +90,7 @@ typedef struct tagWND struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo; /* Dialog additional info (dialogs only) */ int pixel_format; /* Pixel format set by the graphics driver */ + int internal_pixel_format; /* Internal pixel format set via WGL_WINE_pixel_format_passthrough */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index a3c46dfdf31..4db9d99884c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1441,7 +1441,7 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } -BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) +BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ) { WND *win = get_win_ptr( hwnd ); @@ -1450,7 +1450,10 @@ BOOL win32u_set_window_pixel_format( HWND hwnd, int format ) WARN( "setting format %d on win %p not supported\n", format, hwnd ); return FALSE; } - win->pixel_format = format; + if (internal) + win->internal_pixel_format = format; + else + win->pixel_format = format; release_win_ptr( win ); update_window_state( hwnd ); @@ -1852,7 +1855,8 @@ static BOOL apply_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, wine_server_add_data( req, extra_rects, sizeof(extra_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; - if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; + if (win->pixel_format || win->internal_pixel_format) + req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; if ((ret = !wine_server_call( req ))) { diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 37e9c713fb1..c8b7bf85cfb 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -242,7 +242,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL allow_change ) release_gl_drawable( gl ); if (prev && prev != format && !allow_change) return FALSE; - if (win32u_set_window_pixel_format( hwnd, format )) return TRUE; + if (win32u_set_window_pixel_format( hwnd, format, FALSE )) return TRUE; destroy_gl_drawable( hwnd ); return FALSE; } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index d92276bf253..6f3c3b88155 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1587,7 +1587,8 @@ static BOOL set_pixel_format(HDC hdc, int fmt, BOOL allow_reset) done: release_win_data(data); - if (ret && gl_surface_mode == GL_SURFACE_BEHIND) win32u_set_window_pixel_format(hwnd, fmt); + if (ret && gl_surface_mode == GL_SURFACE_BEHIND) + win32u_set_window_pixel_format(hwnd, fmt, FALSE); return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 92768267bae..3006d1a2447 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1402,7 +1402,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format, BO XFlush( gdi_display ); release_gl_drawable( gl ); - win32u_set_window_pixel_format( hwnd, pixel_format_index( format )); + win32u_set_window_pixel_format( hwnd, pixel_format_index( format ), FALSE ); return TRUE; } @@ -1512,7 +1512,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) else { destroy_gl_drawable( hwnd ); - win32u_set_window_pixel_format( hwnd, 0 ); + win32u_set_window_pixel_format( hwnd, 0, FALSE ); } release_gl_drawable( old ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index eefefce695b..c492252d4ab 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -339,7 +339,7 @@ struct user_driver_funcs extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); -extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format ); +extern BOOL win32u_set_window_pixel_format( HWND hwnd, int format, BOOL internal ); extern int win32u_get_window_pixel_format( HWND hwnd ); #endif /* WINE_UNIX_LIB */

1 0

← Newer
1
...
70
71
72
73
74
75
76
...
91
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 March 2023