- Wine-Commits - list.winehq.org

Damjan Jovanovic : opengl32: Implement filtering on all the ChoosePixelFormat() flags that are ignored when unset.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: f70fc9cbfc1b91864d99c6b3a527a77ad0106ad7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f70fc9cbfc1b91864d99c6b3a527a7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jun 26 19:18:37 2023 +0200 opengl32: Implement filtering on all the ChoosePixelFormat() flags that are ignored when unset. When any of these flags: - PFD_DRAW_TO_WINDOW - PFD_DRAW_TO_BITMAP - PFD_SUPPORT_GDI - PFD_SUPPORT_OPENGL are set on the PIXELFORMATDESCRIPTOR parameter to ChoosePixelFormat(), the returned pixel format must also have them set, but when they are unset, the returned pixel format may or may not have them set. Also add support for filtering on all these flags. In particular, the lack of filtering on PFD_SUPPORT_GDI, was causing (at least) Java 1.3 to fail to initialize graphics, because we were returning a pixel format without the PFD_SUPPORT_GDI flag it asked for. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=7767 --- dlls/opengl32/tests/opengl.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 21 ++++++++++++++++++--- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ca66818c408..e3ca82a9b03 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -406,6 +406,43 @@ static void test_choosepixelformat(void) pfd.cDepthBits = 0; } +static void test_choosepixelformat_flag_is_ignored_when_unset(DWORD flag) +{ + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + flag, + PFD_TYPE_RGBA, + 0, /* color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 0, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + PIXELFORMATDESCRIPTOR ret_fmt; + int set_idx; + int clear_idx; + + set_idx = test_pfd(&pfd, &ret_fmt); + if (set_idx > 0) + { + ok( ret_fmt.dwFlags & flag, "flag 0x%08lu not set\n", flag ); + /* now search for that pixel format with the flag cleared: */ + pfd = ret_fmt; + pfd.dwFlags &= ~flag; + clear_idx = test_pfd(&pfd, &ret_fmt); + ok( set_idx == clear_idx, "flag 0x%08lu matched different pixel formats when set vs cleared\n", flag ); + ok( ret_fmt.dwFlags & flag, "flag 0x%08lu not still set\n", flag ); + } else skip( "couldn't find a pixel format with flag 0x%08lu\n", flag ); +} + static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam) { @@ -2064,6 +2101,10 @@ START_TEST(opengl) } test_choosepixelformat(); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_DRAW_TO_WINDOW); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_DRAW_TO_BITMAP); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_SUPPORT_GDI); + test_choosepixelformat_flag_is_ignored_when_unset(PFD_SUPPORT_OPENGL); test_wglChoosePixelFormatARB(hdc); test_debug_message_callback(); test_setpixelformat(hdc); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f57f7703409..b3cffa00a3e 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -145,10 +145,25 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } - /* only use bitmap capable for formats for bitmap rendering */ - if( (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) != (format.dwFlags & PFD_DRAW_TO_BITMAP)) + if ((ppfd->dwFlags & PFD_DRAW_TO_BITMAP) && !(format.dwFlags & PFD_DRAW_TO_BITMAP)) { - TRACE( "PFD_DRAW_TO_BITMAP mismatch for iPixelFormat=%d\n", i ); + TRACE( "PFD_DRAW_TO_BITMAP required but not found for iPixelFormat=%d\n", i ); + continue; + } + if ((ppfd->dwFlags & PFD_DRAW_TO_WINDOW) && !(format.dwFlags & PFD_DRAW_TO_WINDOW)) + { + TRACE( "PFD_DRAW_TO_WINDOW required but not found for iPixelFormat=%d\n", i ); + continue; + } + + if ((ppfd->dwFlags & PFD_SUPPORT_GDI) && !(format.dwFlags & PFD_SUPPORT_GDI)) + { + TRACE( "PFD_SUPPORT_GDI required but not found for iPixelFormat=%d\n", i ); + continue; + } + if ((ppfd->dwFlags & PFD_SUPPORT_OPENGL) && !(format.dwFlags & PFD_SUPPORT_OPENGL)) + { + TRACE( "PFD_SUPPORT_OPENGL required but not found for iPixelFormat=%d\n", i ); continue; }

1 0

Zebediah Figura : opengl32: Do not report a GL version higher than 4.3 on wow64.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: f3b28f34c9a91cb235ae5c12a5db1408b7536818 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3b28f34c9a91cb235ae5c12a5db14… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 12 18:25:55 2023 -0500 opengl32: Do not report a GL version higher than 4.3 on wow64. --- dlls/opengl32/unix_wgl.c | 53 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index efb16464d64..e58e5b5d9b5 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -412,6 +412,21 @@ static BOOL check_extension_support( TEB *teb, const char *extension, const char return FALSE; } +static void parse_gl_version( const char *gl_version, int *major, int *minor ) +{ + const char *ptr = gl_version; + + *major = atoi( ptr ); + if (*major <= 0) + ERR( "Invalid OpenGL major version %d.\n", *major ); + + while (isdigit( *ptr )) ++ptr; + if (*ptr++ != '.') + ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); + + *minor = atoi( ptr ); +} + static void wrap_glGetIntegerv( TEB *teb, GLenum pname, GLint *data ) { const struct opengl_funcs *funcs = teb->glTable; @@ -421,6 +436,21 @@ static void wrap_glGetIntegerv( TEB *teb, GLenum pname, GLint *data ) if (pname == GL_NUM_EXTENSIONS && (disabled = disabled_extensions_index( teb ))) while (*disabled++ != ~0u) (*data)--; + + if (is_win64 && is_wow64()) + { + /* 4.4 depends on ARB_buffer_storage, which we don't support on wow64. */ + if (pname == GL_MAJOR_VERSION && *data > 4) + *data = 4; + else if (pname == GL_MINOR_VERSION) + { + GLint major; + + funcs->gl.p_glGetIntegerv( GL_MAJOR_VERSION, &major ); + if (major == 4 && *data > 3) + *data = 3; + } + } } static const GLubyte *wrap_glGetString( TEB *teb, GLenum name ) @@ -428,12 +458,25 @@ static const GLubyte *wrap_glGetString( TEB *teb, GLenum name ) const struct opengl_funcs *funcs = teb->glTable; const GLubyte *ret; - if ((ret = funcs->gl.p_glGetString( name )) && name == GL_EXTENSIONS) + if ((ret = funcs->gl.p_glGetString( name ))) { - struct wgl_handle *ptr = get_current_context_ptr( teb ); - GLubyte **extensions = &ptr->u.context->extensions; - GLuint **disabled = &ptr->u.context->disabled_exts; - if (*extensions || filter_extensions( teb, (const char *)ret, extensions, disabled )) return *extensions; + if (name == GL_EXTENSIONS) + { + struct wgl_handle *ptr = get_current_context_ptr( teb ); + GLubyte **extensions = &ptr->u.context->extensions; + GLuint **disabled = &ptr->u.context->disabled_exts; + if (*extensions || filter_extensions( teb, (const char *)ret, extensions, disabled )) return *extensions; + } + else if (name == GL_VERSION && is_win64 && is_wow64()) + { + int major, minor; + + parse_gl_version( (const char *)ret, &major, &minor ); + + /* 4.4 depends on ARB_buffer_storage, which we don't support on wow64. */ + if (major > 4 || (major == 4 && minor >= 4)) + return (const GLubyte *)"4.3"; + } } return ret;

1 0

Zebediah Figura : opengl32: Do not expose ARB_buffer_storage on wow64.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: fd92954df8cf12c61e08c7ef7acf172efb7c44ad URL: https://gitlab.winehq.org/wine/wine/-/commit/fd92954df8cf12c61e08c7ef7acf17… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 12 18:24:26 2023 -0500 opengl32: Do not expose ARB_buffer_storage on wow64. --- dlls/opengl32/unix_wgl.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 6c3379b90a2..efb16464d64 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -43,6 +43,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); + +static BOOL is_wow64(void) +{ + return !!NtCurrentTeb()->WowTebOffset; +} + static pthread_mutex_t wgl_lock = PTHREAD_MUTEX_INITIALIZER; /* handle management */ @@ -168,7 +175,13 @@ static GLubyte *filter_extensions_list( const char *extensions, const char *disa memcpy( p, extensions, end - extensions ); p[end - extensions] = 0; - if (!has_extension( disabled, p, strlen( p ) )) + /* We do not support GL_MAP_PERSISTENT_BIT, and hence + * ARB_buffer_storage, on wow64. */ + if (is_win64 && is_wow64() && (!strcmp( p, "GL_ARB_buffer_storage" ) || !strcmp( p, "GL_EXT_buffer_storage" ))) + { + TRACE( "-- %s (disabled due to wow64)\n", p ); + } + else if (!has_extension( disabled, p, strlen( p ) )) { TRACE( "++ %s\n", p ); p += end - extensions; @@ -208,7 +221,15 @@ static GLuint *filter_extensions_index( TEB *teb, const char *disabled ) for (j = 0; j < extensions_count; ++j) { ext = (const char *)funcs->ext.p_glGetStringi( GL_EXTENSIONS, j ); - if (!has_extension( disabled, ext, strlen( ext ) )) + + /* We do not support GL_MAP_PERSISTENT_BIT, and hence + * ARB_buffer_storage, on wow64. */ + if (is_win64 && is_wow64() && (!strcmp( ext, "GL_ARB_buffer_storage" ) || !strcmp( ext, "GL_EXT_buffer_storage" ))) + { + TRACE( "-- %s (disabled due to wow64)\n", ext ); + disabled_index[i++] = j; + } + else if (!has_extension( disabled, ext, strlen( ext ) )) { TRACE( "++ %s\n", ext ); } @@ -329,7 +350,6 @@ static BOOL filter_extensions( TEB * teb, const char *extensions, GLubyte **exts else disabled = ""; } - if (!disabled[0]) return FALSE; if (extensions && !*exts_list) *exts_list = filter_extensions_list( extensions, disabled ); if (!*disabled_exts) *disabled_exts = filter_extensions_index( teb, disabled ); return (exts_list && *exts_list) || *disabled_exts;

1 0

Jacek Caban : winegcc: Disable exporting all symbols on mingw targets.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: b0908666639d5dfe825b5d5f3b9893bed00822d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0908666639d5dfe825b5d5f3b9893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 21:00:54 2023 +0200 winegcc: Disable exporting all symbols on mingw targets. Mingw targets export all symbols by default if there is no explicit export. We generate export table in winebuild and don't use explicit exports. This may make linker generate an unused export-all table. Spotted by Gabriel Ivăncescu. --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b6a6c42068d..9d73252411b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -407,6 +407,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->nostartfiles || opts->use_msvcrt) strarray_add( &flags, "-nostartfiles" ); if (opts->subsystem) strarray_add( &flags, strmake("-Wl,--subsystem,%s", opts->subsystem )); + strarray_add( &flags, "-Wl,--exclude-all-symbols" ); strarray_add( &flags, "-Wl,--nxcompat" ); if (opts->image_base) strarray_add( &flags, strmake("-Wl,--image-base,%s", opts->image_base ));

1 0

Jacek Caban : ieframe: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 7b9d0a1b6b5e59adfd986810809db08bb3495e39 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b9d0a1b6b5e59adfd986810809db0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 27 12:32:12 2023 +0200 ieframe: Don't use DECLSPEC_HIDDEN. --- dlls/ieframe/ieframe.h | 128 ++++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 9a42bd801df..b5194f3b5fe 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -244,63 +244,63 @@ struct InternetExplorer { struct list entry; }; -void WebBrowser_OleObject_Init(WebBrowser*) DECLSPEC_HIDDEN; -void WebBrowser_ViewObject_Init(WebBrowser*) DECLSPEC_HIDDEN; -void WebBrowser_Persist_Init(WebBrowser*) DECLSPEC_HIDDEN; -void WebBrowser_ClassInfo_Init(WebBrowser*) DECLSPEC_HIDDEN; - -void WebBrowser_OleObject_Destroy(WebBrowser*) DECLSPEC_HIDDEN; - -void DocHost_Init(DocHost*,IWebBrowser2*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; -void DocHost_Release(DocHost*) DECLSPEC_HIDDEN; -void DocHost_ClientSite_Init(DocHost*) DECLSPEC_HIDDEN; -void DocHost_ClientSite_Release(DocHost*) DECLSPEC_HIDDEN; -void DocHost_Frame_Init(DocHost*) DECLSPEC_HIDDEN; -void release_dochost_client(DocHost*) DECLSPEC_HIDDEN; - -void IEHTMLWindow_Init(DocHost*) DECLSPEC_HIDDEN; -void NewWindowManager_Init(DocHost*) DECLSPEC_HIDDEN; - -void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*) DECLSPEC_HIDDEN; -BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**) DECLSPEC_HIDDEN; - -HRESULT create_browser_service(DocHost*,ShellBrowser**) DECLSPEC_HIDDEN; -void detach_browser_service(ShellBrowser*) DECLSPEC_HIDDEN; -HRESULT create_shell_ui_helper(IShellUIHelper2**) DECLSPEC_HIDDEN; - -void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*) DECLSPEC_HIDDEN; -void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN; - -void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; -HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; -HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; -HRESULT go_forward(DocHost*) DECLSPEC_HIDDEN; -HRESULT refresh_document(DocHost*,const VARIANT*) DECLSPEC_HIDDEN; -HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; -HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; -void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; -HRESULT dochost_object_available(DocHost*,IUnknown*) DECLSPEC_HIDDEN; -void set_doc_state(DocHost*,READYSTATE) DECLSPEC_HIDDEN; -void activate_document(DocHost*) DECLSPEC_HIDDEN; -void deactivate_document(DocHost*) DECLSPEC_HIDDEN; -void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; -void on_commandstate_change(DocHost*,LONG,BOOL) DECLSPEC_HIDDEN; -void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; -void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN; +void WebBrowser_OleObject_Init(WebBrowser*); +void WebBrowser_ViewObject_Init(WebBrowser*); +void WebBrowser_Persist_Init(WebBrowser*); +void WebBrowser_ClassInfo_Init(WebBrowser*); + +void WebBrowser_OleObject_Destroy(WebBrowser*); + +void DocHost_Init(DocHost*,IWebBrowser2*,const IDocHostContainerVtbl*); +void DocHost_Release(DocHost*); +void DocHost_ClientSite_Init(DocHost*); +void DocHost_ClientSite_Release(DocHost*); +void DocHost_Frame_Init(DocHost*); +void release_dochost_client(DocHost*); + +void IEHTMLWindow_Init(DocHost*); +void NewWindowManager_Init(DocHost*); + +void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*); +BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**); + +HRESULT create_browser_service(DocHost*,ShellBrowser**); +void detach_browser_service(ShellBrowser*); +HRESULT create_shell_ui_helper(IShellUIHelper2**); + +void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*); +void ConnectionPointContainer_Destroy(ConnectionPointContainer*); + +void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); +HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); +HRESULT go_home(DocHost*); +HRESULT go_back(DocHost*); +HRESULT go_forward(DocHost*); +HRESULT refresh_document(DocHost*,const VARIANT*); +HRESULT get_location_url(DocHost*,BSTR*); +HRESULT set_dochost_url(DocHost*,const WCHAR*); +void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*); +HRESULT dochost_object_available(DocHost*,IUnknown*); +void set_doc_state(DocHost*,READYSTATE); +void activate_document(DocHost*); +void deactivate_document(DocHost*); +void create_doc_view_hwnd(DocHost*); +void on_commandstate_change(DocHost*,LONG,BOOL); +void notify_download_state(DocHost*,BOOL); +void update_navigation_commands(DocHost *dochost); #define WM_DOCHOSTTASK (WM_USER+0x300) -void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; -void abort_dochost_tasks(DocHost*,task_proc_t) DECLSPEC_HIDDEN; -LRESULT process_dochost_tasks(DocHost*) DECLSPEC_HIDDEN; +void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL); +void abort_dochost_tasks(DocHost*,task_proc_t); +LRESULT process_dochost_tasks(DocHost*); -void InternetExplorer_WebBrowser_Init(InternetExplorer*) DECLSPEC_HIDDEN; -HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR) DECLSPEC_HIDDEN; -void released_obj(void) DECLSPEC_HIDDEN; -DWORD release_extern_ref(InternetExplorer*,BOOL) DECLSPEC_HIDDEN; +void InternetExplorer_WebBrowser_Init(InternetExplorer*); +HRESULT update_ie_statustext(InternetExplorer*, LPCWSTR); +void released_obj(void); +DWORD release_extern_ref(InternetExplorer*,BOOL); -void register_iewindow_class(void) DECLSPEC_HIDDEN; -void unregister_iewindow_class(void) DECLSPEC_HIDDEN; +void register_iewindow_class(void); +void unregister_iewindow_class(void); #define TID_LIST \ XCLSID(WebBrowser) \ @@ -316,20 +316,20 @@ TID_LIST LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +HRESULT get_typeinfo(tid_t,ITypeInfo**); -HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI InternetExplorerManager_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory*,IUnknown*,REFIID,void**); -extern IClassFactory InternetExplorerFactory DECLSPEC_HIDDEN; -extern IClassFactory InternetExplorerManagerFactory DECLSPEC_HIDDEN; +extern IClassFactory InternetExplorerFactory; +extern IClassFactory InternetExplorerManagerFactory; -extern LONG module_ref DECLSPEC_HIDDEN; -extern HINSTANCE ieframe_instance DECLSPEC_HIDDEN; +extern LONG module_ref; +extern HINSTANCE ieframe_instance; static inline void lock_module(void) { InterlockedIncrement(&module_ref);

1 0

Alistair Leslie-Hughes : dplayx: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 907fd64ac58fb484793495d00c7951b5a0196060 URL: https://gitlab.winehq.org/wine/wine/-/commit/907fd64ac58fb484793495d00c7951… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 20:31:12 2023 +1000 dplayx: Remove DECLSPEC_HIDDEN usage. --- dlls/dplayx/dplay_global.h | 18 +++++++++--------- dlls/dplayx/dplayx_global.h | 24 ++++++++++++------------ dlls/dplayx/dplayx_messages.h | 12 ++++++------ dlls/dplayx/dplayx_queue.h | 2 +- dlls/dplayx/dplobby.c | 2 +- dlls/dplayx/lobbysp.h | 2 +- dlls/dplayx/name_server.h | 26 +++++++++++++------------- 7 files changed, 43 insertions(+), 43 deletions(-)

1 0

Alistair Leslie-Hughes : dpvoice: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: cffe6e0c1ad3f8bb6444a1b94f5f0db4418058a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/cffe6e0c1ad3f8bb6444a1b94f5f0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 20:32:10 2023 +1000 dpvoice: Remove DECLSPEC_HIDDEN usage. --- dlls/dpvoice/dvoice_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index ededeab3563..3765148258d 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -20,9 +20,9 @@ #ifndef __DVOICE_PRIVATE_H__ #define __DVOICE_PRIVATE_H__ -extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj); +extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj); +extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj); +extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags); #endif

1 0

Alistair Leslie-Hughes : dpnet: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: d17796bcd196d6a0250cc29da775dfed2eec9a94 URL: https://gitlab.winehq.org/wine/wine/-/commit/d17796bcd196d6a0250cc29da775df… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 27 20:27:34 2023 +1000 dpnet: Remove DECLSPEC_HIDDEN usage. --- dlls/dpnet/dpnet_private.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 2e36b9ffeee..13702549613 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -122,18 +122,18 @@ struct IDirectPlay8ThreadPoolImpl /** * factories */ -extern HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; - -extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; -extern void init_winsock(void) DECLSPEC_HIDDEN; +extern HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8Server(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj); + +extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps); +extern void init_winsock(void); extern HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, - DWORD * const buf_size, DWORD * const returned) DECLSPEC_HIDDEN; + DWORD * const buf_size, DWORD * const returned); /* used for generic dumping (copied from ddraw) */ typedef struct {

1 0

Nikolay Sivov : mfmediaengine/tests: Remove unnecessary broken() result.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 2775fe31cdfe5a66f5a130c7f62eee4b3690bba2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2775fe31cdfe5a66f5a130c7f62eee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 16:41:25 2023 +0200 mfmediaengine/tests: Remove unnecessary broken() result. --- dlls/mfmediaengine/tests/mfmediaengine.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 1af6858aca3..c6baaed5942 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1316,10 +1316,8 @@ static void test_TransferVideoFrame(void) ok(!res, "Unexpected res %#lx.\n", res); SetRect(&dst_rect, 0, 0, desc.Width, desc.Height); - hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, NULL, NULL); - ok(hr == S_OK || broken(hr == E_POINTER) /* w1064v1507 */, "Unexpected hr %#lx.\n", hr); - if (hr == E_POINTER) - goto done; + hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, &dst_rect, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ID3D11Texture2D_GetDesc(texture, &desc); desc.Usage = D3D11_USAGE_STAGING;

1 0

Nikolay Sivov : mfmediaengine/tests: Allocate notification object on heap for frame transfer tests.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 6b9eb2d09fc97d6e868e84c97ec8e286a43141eb URL: https://gitlab.winehq.org/wine/wine/-/commit/6b9eb2d09fc97d6e868e84c97ec8e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 16:31:28 2023 +0200 mfmediaengine/tests: Allocate notification object on heap for frame transfer tests. --- dlls/mfmediaengine/tests/mfmediaengine.c | 78 ++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 655b19af050..26f006a2335 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1136,12 +1136,18 @@ static IMFByteStream *load_resource(const WCHAR *name, const WCHAR *mime) struct test_transfer_notify { IMFMediaEngineNotify IMFMediaEngineNotify_iface; + LONG refcount; IMFMediaEngineEx *media_engine; HANDLE ready_event; HRESULT error; }; +static struct test_transfer_notify *impl_from_test_transfer_notify(IMFMediaEngineNotify *iface) +{ + return CONTAINING_RECORD(iface, struct test_transfer_notify, IMFMediaEngineNotify_iface); +} + static HRESULT WINAPI test_transfer_notify_QueryInterface(IMFMediaEngineNotify *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown) @@ -1158,17 +1164,27 @@ static HRESULT WINAPI test_transfer_notify_QueryInterface(IMFMediaEngineNotify * static ULONG WINAPI test_transfer_notify_AddRef(IMFMediaEngineNotify *iface) { - return 2; + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); + return InterlockedIncrement(&notify->refcount); } static ULONG WINAPI test_transfer_notify_Release(IMFMediaEngineNotify *iface) { - return 1; + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); + ULONG refcount = InterlockedDecrement(&notify->refcount); + + if (!refcount) + { + CloseHandle(notify->ready_event); + free(notify); + } + + return refcount; } static HRESULT WINAPI test_transfer_notify_EventNotify(IMFMediaEngineNotify *iface, DWORD event, DWORD_PTR param1, DWORD param2) { - struct test_transfer_notify *notify = CONTAINING_RECORD(iface, struct test_transfer_notify, IMFMediaEngineNotify_iface); + struct test_transfer_notify *notify = impl_from_test_transfer_notify(iface); IMFMediaEngineEx *media_engine = notify->media_engine; DWORD width, height; HRESULT hr; @@ -1211,13 +1227,26 @@ static IMFMediaEngineNotifyVtbl test_transfer_notify_vtbl = test_transfer_notify_EventNotify, }; +static struct test_transfer_notify *create_transfer_notify(void) +{ + struct test_transfer_notify *object; + + object = calloc(1, sizeof(*object)); + object->IMFMediaEngineNotify_iface.lpVtbl = &test_transfer_notify_vtbl; + object->refcount = 1; + object->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(!!object->ready_event, "Failed to create an event, error %lu.\n", GetLastError()); + + return object; +} + static void test_TransferVideoFrame(void) { - struct test_transfer_notify notify = {{&test_transfer_notify_vtbl}}; + struct test_transfer_notify *notify; WCHAR url[] = {L"i420-64x64.avi"}; - ID3D11Texture2D *texture, *rb_texture; + ID3D11Texture2D *texture = NULL, *rb_texture; D3D11_MAPPED_SUBRESOURCE map_desc; - IMFMediaEngineEx *media_engine; + IMFMediaEngineEx *media_engine = NULL; IMFDXGIDeviceManager *manager; ID3D11DeviceContext *context; D3D11_TEXTURE2D_DESC desc; @@ -1230,13 +1259,12 @@ static void test_TransferVideoFrame(void) stream = load_resource(L"i420-64x64.avi", L"video/avi"); - notify.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - ok(!!notify.ready_event, "CreateEventW failed, error %lu\n", GetLastError()); + notify = create_transfer_notify(); if (!(device = create_d3d11_device())) { skip("Failed to create a D3D11 device, skipping tests.\n"); - return; + goto done; } hr = pMFCreateDXGIDeviceManager(&token, &manager); @@ -1244,13 +1272,12 @@ static void test_TransferVideoFrame(void) hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - media_engine = create_media_engine_ex(&notify.IMFMediaEngineNotify_iface, - manager, DXGI_FORMAT_B8G8R8X8_UNORM); + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface, manager, DXGI_FORMAT_B8G8R8X8_UNORM); IMFDXGIDeviceManager_Release(manager); - if (!(notify.media_engine = media_engine)) - return; + if (!(notify->media_engine = media_engine)) + goto done; memset(&desc, 0, sizeof(desc)); desc.Width = 64; @@ -1266,12 +1293,12 @@ static void test_TransferVideoFrame(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFByteStream_Release(stream); - res = WaitForSingleObject(notify.ready_event, 5000); + res = WaitForSingleObject(notify->ready_event, 5000); ok(!res, "Unexpected res %#lx.\n", res); - if (FAILED(notify.error)) + if (FAILED(notify->error)) { - win_skip("Media engine reported error %#lx, skipping tests.\n", notify.error); + win_skip("Media engine reported error %#lx, skipping tests.\n", notify->error); goto done; } @@ -1281,13 +1308,13 @@ static void test_TransferVideoFrame(void) ok(res == 1, "Unexpected stream count %lu.\n", res); /* FIXME: Wine first video frame is often full of garbage, wait for another update */ - res = WaitForSingleObject(notify.ready_event, 500); + res = WaitForSingleObject(notify->ready_event, 500); /* It's also missing the MF_MEDIA_ENGINE_EVENT_TIMEUPDATE notifications */ todo_wine ok(!res, "Unexpected res %#lx.\n", res); SetRect(&dst_rect, 0, 0, desc.Width, desc.Height); - hr = IMFMediaEngineEx_TransferVideoFrame(notify.media_engine, (IUnknown *)texture, NULL, NULL, NULL); + hr = IMFMediaEngineEx_TransferVideoFrame(notify->media_engine, (IUnknown *)texture, NULL, NULL, NULL); ok(hr == S_OK || broken(hr == E_POINTER) /* w1064v1507 */, "Unexpected hr %#lx.\n", hr); if (hr == E_POINTER) goto done; @@ -1317,13 +1344,18 @@ static void test_TransferVideoFrame(void) ID3D11Texture2D_Release(rb_texture); done: - IMFMediaEngineEx_Shutdown(media_engine); - IMFMediaEngineEx_Release(media_engine); + if (media_engine) + { + IMFMediaEngineEx_Shutdown(media_engine); + IMFMediaEngineEx_Release(media_engine); + } - ID3D11Texture2D_Release(texture); - ID3D11Device_Release(device); + if (texture) + ID3D11Texture2D_Release(texture); + if (device) + ID3D11Device_Release(device); - CloseHandle(notify.ready_event); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } START_TEST(mfmediaengine)

1 0