August 2019 - Wine-Commits - list.winehq.org

Conor McCarthy : wldap32: Use ldap_memvfree() to free array allocated by libldap.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 02feb30b0ef0cc4f31cd885f5659026711b79c07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02feb30b0ef0cc4f31cd885f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 16 23:08:57 2019 +1000 wldap32: Use ldap_memvfree() to free array allocated by libldap. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 62ffdba..e83e6d2 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -258,7 +258,7 @@ ULONG CDECL ldap_parse_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result, ldap_memfree( matchedU ); ldap_memfree( errorU ); - strarrayfreeU( referralsU ); + ldap_memvfree( (void **)referralsU ); ldap_controls_free( serverctrlsU ); #endif

1 0

Peter Dons Tychsen : msvcrt: Do not use casting in min/max constants.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: b72d6d1d86fccae000241809a0da37269c9d5632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72d6d1d86fccae000241809… Author: Peter Dons Tychsen <pdt(a)dontech.dk> Date: Sun Jul 21 23:38:02 2019 +0200 msvcrt: Do not use casting in min/max constants. Signed-off-by: Peter Dons Tychsen <pdt(a)dontech.dk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index 13bab86..7f32f08 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -30,13 +30,13 @@ #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL -#define LLONG_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define LLONG_MAX 0x7fffffffffffffffLL #define LLONG_MIN (-LLONG_MAX-1) -#define ULLONG_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define ULLONG_MAX 0xffffffffffffffffULL -#define _I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) +#define _I64_MAX 0x7fffffffffffffffLL #define _I64_MIN (-_I64_MAX-1) -#define _UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define _UI64_MAX 0xffffffffffffffffULL #define I64_MIN _I64_MIN #define I64_MAX _I64_MAX

1 0

Gijs Vermeulen : wmp: Improve playlist creation.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 649e294886ec452afd99d43b764f67680ebce2ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=649e294886ec452afd99d43b… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:54 2019 +0200 wmp: Improve playlist creation. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 19 +++++++++++++++---- dlls/wmp/tests/oleobj.c | 4 +--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index de0f15b..9437124 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -286,11 +286,18 @@ static HRESULT WINAPI WMPPlayer4_get_network(IWMPPlayer4 *iface, IWMPNetwork **p return S_OK; } -static HRESULT WINAPI WMPPlayer4_get_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist **ppPL) +static HRESULT WINAPI WMPPlayer4_get_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist **playlist) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppPL); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, playlist); + + *playlist = NULL; + + if (This->playlist == NULL) + return S_FALSE; + + return create_playlist(This->playlist->name, This->playlist->url, playlist); } static HRESULT WINAPI WMPPlayer4_put_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist *pPL) @@ -2197,6 +2204,8 @@ void unregister_player_msg_class(void) { BOOL init_player(WindowsMediaPlayer *wmp) { IWMPPlaylist *playlist; + BSTR name; + static const WCHAR nameW[] = {'P','l','a','y','l','i','s','t','1',0}; InitOnceExecuteOnce(&class_init_once, register_player_msg_class, NULL, NULL); wmp->msg_window = CreateWindowW( MAKEINTRESOURCEW(player_msg_class), NULL, 0, 0, @@ -2216,10 +2225,12 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->IWMPControls_iface.lpVtbl = &WMPControlsVtbl; wmp->IWMPNetwork_iface.lpVtbl = &WMPNetworkVtbl; - if (SUCCEEDED(create_playlist(NULL, NULL, &playlist))) + name = SysAllocString(nameW); + if (SUCCEEDED(create_playlist(name, NULL, &playlist))) wmp->playlist = unsafe_impl_from_IWMPPlaylist(playlist); else wmp->playlist = NULL; + SysFreeString(name); wmp->invoke_urls = VARIANT_TRUE; wmp->auto_start = VARIANT_TRUE; diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index dbd9e93..db466bf 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -945,12 +945,10 @@ static void test_wmp_ifaces(IOleObject *oleobj) playlist = NULL; hres = IWMPPlayer4_get_currentPlaylist(player4, &playlist); -todo_wine { ok(hres == S_OK, "IWMPPlayer4_get_currentPlaylist failed: %08x\n", hres); ok(playlist != NULL, "playlist != NULL\n"); -} - if (playlist) IWMPPlaylist_Release(playlist); + IWMPPlaylist_Release(playlist); media = NULL; hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPMedia, (void**)&media);

1 0

Alexandre Julliard : makefiles: Default to an msvcrt build for static libraries.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 2477aa7a1060837919a09da1ac0cd35ae06ea435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2477aa7a1060837919a09da1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 5 18:57:47 2019 +0200 makefiles: Default to an msvcrt build for static libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 2 -- dlls/winecrt0/Makefile.in | 2 -- tools/makedep.c | 4 +++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index d22e986..c58a359 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,7 +1,5 @@ MODULE = libstrmbase.a -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ dispatch.c \ dllfunc.c \ diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6edbd04..79ba92f 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,7 +1,5 @@ MODULE = libwinecrt0.a -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ debug.c \ delay_load.c \ diff --git a/tools/makedep.c b/tools/makedep.c index 24866b3..e37bd8d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4160,7 +4160,9 @@ static void load_sources( struct makefile *make ) make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; - if (make->testdll) strarray_add( &make->extradllflags, "-mno-cygwin" ); + + if ((make->module && make->staticlib) || make->testdll) + strarray_add( &make->extradllflags, "-mno-cygwin" ); strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" )); make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir );

1 0

Gijs Vermeulen : wmp: Fake success in IWMPPlaylist::appendItem.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 8f1d707737284a409a6240b4a8c1768f427f04d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1d707737284a409a6240b4… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:56 2019 +0200 wmp: Fake success in IWMPPlaylist::appendItem. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index cd729cb..f846760 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -2120,7 +2120,7 @@ static HRESULT WINAPI WMPPlaylist_appendItem(IWMPPlaylist *iface, IWMPMedia *med { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); FIXME("(%p)->(%p)\n", This, media); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WMPPlaylist_removeItem(IWMPPlaylist *iface, IWMPMedia *media)

1 0

Zebediah Figura : qcap: Share source with strmbase.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 4c2c98934154e2587348d45b1d4b05e66f253830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c2c98934154e2587348d45b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:55 2019 -0500 qcap: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index e161e06..12cc917 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,13 +1,19 @@ MODULE = qcap.dll -IMPORTS = strmiids strmbase uuid ole32 oleaut32 gdi32 advapi32 +IMPORTS = strmiids uuid ole32 oleaut32 gdi32 advapi32 DELAYIMPORTS = msvfw32 +PARENTSRC = ../strmbase C_SRCS = \ audiorecord.c \ avico.c \ avimux.c \ capturegraph.c \ + dllfunc.c \ enummedia.c \ + enumpins.c \ + filter.c \ + mediatype.c \ + pin.c \ qcap_main.c \ smartteefilter.c \ v4l.c \

1 0

Gijs Vermeulen : wmp: Implement IWMPPlaylist::get_count.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 188992a1d263afb83fb442547f34b465d3eeac33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=188992a1d263afb83fb44254… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:55 2019 +0200 wmp: Implement IWMPPlaylist::get_count. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 19 +++++++++++++------ dlls/wmp/wmp_private.h | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 9437124..cd729cb 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -297,7 +297,7 @@ static HRESULT WINAPI WMPPlayer4_get_currentPlaylist(IWMPPlayer4 *iface, IWMPPla if (This->playlist == NULL) return S_FALSE; - return create_playlist(This->playlist->name, This->playlist->url, playlist); + return create_playlist(This->playlist->name, This->playlist->url, This->playlist->count, playlist); } static HRESULT WINAPI WMPPlayer4_put_currentPlaylist(IWMPPlayer4 *iface, IWMPPlaylist *pPL) @@ -355,7 +355,8 @@ static HRESULT WINAPI WMPPlayer4_newPlaylist(IWMPPlayer4 *iface, BSTR name, BSTR TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(name), debugstr_w(url), playlist); - return create_playlist(name, url, playlist); + /* FIXME: count should be the number of items in the playlist */ + return create_playlist(name, url, 0, playlist); } static HRESULT WINAPI WMPPlayer4_newMedia(IWMPPlayer4 *iface, BSTR url, IWMPMedia **media) @@ -2036,8 +2037,13 @@ static HRESULT WINAPI WMPPlaylist_Invoke(IWMPPlaylist *iface, DISPID dispIdMembe static HRESULT WINAPI WMPPlaylist_get_count(IWMPPlaylist *iface, LONG *count) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%p)\n", This, count); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_POINTER; + *count = This->count; + + return S_OK; } static HRESULT WINAPI WMPPlaylist_get_name(IWMPPlaylist *iface, BSTR *name) @@ -2226,7 +2232,7 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->IWMPNetwork_iface.lpVtbl = &WMPNetworkVtbl; name = SysAllocString(nameW); - if (SUCCEEDED(create_playlist(name, NULL, &playlist))) + if (SUCCEEDED(create_playlist(name, NULL, 0, &playlist))) wmp->playlist = unsafe_impl_from_IWMPPlaylist(playlist); else wmp->playlist = NULL; @@ -2325,7 +2331,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) return E_OUTOFMEMORY; } -HRESULT create_playlist(BSTR name, BSTR url, IWMPPlaylist **ppPlaylist) +HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist) { WMPPlaylist *playlist; @@ -2337,6 +2343,7 @@ HRESULT create_playlist(BSTR name, BSTR url, IWMPPlaylist **ppPlaylist) playlist->url = url ? heap_strdupW(url) : heap_strdupW(emptyW); playlist->name = name ? heap_strdupW(name) : heap_strdupW(emptyW); playlist->ref = 1; + playlist->count = count; if (playlist->url) { diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 32b4e1f..e1a1e03 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -65,6 +65,7 @@ typedef struct { IWMPPlaylist IWMPPlaylist_iface; LONG ref; + LONG count; WCHAR *url; WCHAR *name; @@ -116,7 +117,7 @@ void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; WMPPlaylist *unsafe_impl_from_IWMPPlaylist(IWMPPlaylist *iface) DECLSPEC_HIDDEN; HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; -HRESULT create_playlist(BSTR name, BSTR url, IWMPPlaylist **ppPlaylist) DECLSPEC_HIDDEN; +HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlaylist) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) DECLSPEC_HIDDEN;

1 0

Gijs Vermeulen : wmp: Implement IWMPPlaylist::[get|put]_name.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: a3fe1f20c6c38d7525622a57a6e0578787d88d80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3fe1f20c6c38d7525622a57… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Aug 3 17:45:57 2019 +0200 wmp: Implement IWMPPlaylist::[get|put]_name. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f846760..03a7d26 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -2049,15 +2049,22 @@ static HRESULT WINAPI WMPPlaylist_get_count(IWMPPlaylist *iface, LONG *count) static HRESULT WINAPI WMPPlaylist_get_name(IWMPPlaylist *iface, BSTR *name) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%p)\n", This, name); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, name); + + return return_bstr(This->name, name); } static HRESULT WINAPI WMPPlaylist_put_name(IWMPPlaylist *iface, BSTR name) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(name)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(name)); + + if (!name) return E_POINTER; + + This->name = heap_strdupW(name); + return S_OK; } static HRESULT WINAPI WMPPlaylist_get_attributeCount(IWMPPlaylist *iface, LONG *count)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_current().
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 360e1a46d8d632c7779e92962929eecd4fb2747e URL: https://source.winehq.org/git/wine.git/?a=commit;h=360e1a46d8d632c7779e9296… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:54 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_current(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb39339..80124c1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1255,13 +1255,13 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (context_gl->c.destroyed || !swapchain) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) { - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1272,7 +1272,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1280,7 +1280,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", context_gl->dc, GetLastError()); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1297,7 +1297,7 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD { ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", gl_ctx, dc, GetLastError()); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); } } @@ -1508,13 +1508,14 @@ struct wined3d_context *context_get_current(void) return TlsGetValue(wined3d_context_tls_idx); } -BOOL context_set_current(struct wined3d_context *ctx) +BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) { + struct wined3d_context *ctx = context_gl ? &context_gl->c : NULL; struct wined3d_context *old = context_get_current(); if (old == ctx) { - TRACE("Already using D3D context %p.\n", ctx); + TRACE("Already using D3D context %p.\n", context_gl); return TRUE; } @@ -1532,20 +1533,18 @@ BOOL context_set_current(struct wined3d_context *ctx) if (wglGetCurrentContext()) { const struct wined3d_gl_info *gl_info = old->gl_info; - TRACE("Flushing context %p before switching to %p.\n", old, ctx); + TRACE("Flushing context %p before switching to %p.\n", old, context_gl); gl_info->gl_ops.gl.p_glFlush(); } old->current = 0; } } - if (ctx) + if (context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); - if (!context_gl->valid) { - ERR("Trying to make invalid context %p current\n", ctx); + ERR("Trying to make invalid context %p current.\n", context_gl); return FALSE; } @@ -1553,7 +1552,7 @@ BOOL context_set_current(struct wined3d_context *ctx) context_gl, context_gl->gl_ctx, context_gl->dc); if (!wined3d_context_gl_set_gl_context(context_gl)) return FALSE; - ctx->current = 1; + context_gl->c.current = 1; } else if (wglGetCurrentContext()) { @@ -2146,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->needs_set = 1; /* Set up the context defaults */ - if (!context_set_current(context)) + if (!wined3d_context_gl_set_current(context_gl)) { ERR("Cannot activate context to set up defaults.\n"); context_release(context); @@ -4201,7 +4200,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (&context_gl->c != context_get_current()) { - if (!context_set_current(&context_gl->c)) + if (!wined3d_context_gl_set_current(context_gl)) ERR("Failed to activate the new context.\n"); } else if (context_gl->needs_set) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 132c978..5d60a44 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -820,7 +820,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) break; case DLL_THREAD_DETACH: - if (!context_set_current(NULL)) + if (!wined3d_context_gl_set_current(NULL)) { ERR("Failed to clear current context.\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38a607f..8a920b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2116,6 +2116,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; @@ -2271,7 +2272,6 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state_id) D void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Inhibit the screensaver while a full-screen application has focus.
by Alexandre Julliard Aug. 5, 2019

Aug. 5, 2019

Module: wine Branch: master Commit: 236f590fd61a9cf7e186a03218c704621e7461c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=236f590fd61a9cf7e186a032… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 18:43:35 2019 +0430 wined3d: Inhibit the screensaver while a full-screen application has focus. This matches Windows behaviour at least as of Windows 7. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/swapchain.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a6b005..6b4b079 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -912,6 +912,8 @@ static void destroy_default_samplers(struct wined3d_device *device, struct wined HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { + unsigned int screensaver_active; + TRACE("device %p, window %p.\n", device, window); if (!wined3d_register_window(NULL, window, device, 0)) @@ -922,6 +924,9 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); return WINED3D_OK; } @@ -932,6 +937,11 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) if (device->focus_window) wined3d_unregister_window(device->focus_window); InterlockedExchangePointer((void **)&device->focus_window, NULL); + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } } static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 04ee045..63fd7a1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1172,6 +1172,7 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa { struct wined3d_device *device = swapchain->device; HWND window = swapchain->state.device_window; + unsigned int screensaver_active; BOOL focus_messages, filter; /* This code is not protected by the wined3d mutex, so it may run while @@ -1184,6 +1185,10 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa if (activate) { + SystemParametersInfoW(SPI_GETSCREENSAVEACTIVE, 0, &screensaver_active, 0); + if ((device->restore_screensaver = !!screensaver_active)) + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) { /* The d3d versions do not agree on the exact messages here. D3d8 restores @@ -1209,6 +1214,12 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa } else { + if (device->restore_screensaver) + { + SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, NULL, 0); + device->restore_screensaver = FALSE; + } + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, NULL))) ERR("Failed to set display mode.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7d9cd7..f7fd136 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3180,7 +3180,8 @@ struct wined3d_device BYTE d3d_initialized : 1; BYTE inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ BYTE softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ - BYTE padding : 4; + BYTE restore_screensaver : 1; + BYTE padding : 3; unsigned char surface_alignment; /* Line Alignment of surfaces */

1 0