November 2015 - Wine-Commits

Józef Kucia : d3d11: Implement d3d11_immediate_context_SetPredication().
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 8daf9a65f6c1a2465cfc6d74f5a49d67297562e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daf9a65f6c1a2465cfc6d74f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:46 2015 +0100 d3d11: Implement d3d11_immediate_context_SetPredication(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 8 ++++++++ dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 11 ++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 1e96fb3..66640a2 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -163,6 +163,14 @@ static const struct ID3D11QueryVtbl d3d11_query_vtbl = d3d11_query_GetDesc, }; +struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_query_vtbl); + return CONTAINING_RECORD(iface, struct d3d_query, ID3D11Query_iface); +} + /* ID3D10Query methods */ static inline struct d3d_query *impl_from_ID3D10Query(ID3D10Query *iface) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 474943b..873e17d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -372,6 +372,7 @@ struct d3d_query HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc, BOOL predicate, struct d3d_query **query) DECLSPEC_HIDDEN; +struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; /* ID3D11DeviceContext - immediate context */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 71408cf..8321593 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -483,7 +483,16 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext *iface, ID3D11Predicate *predicate, BOOL value) { - FIXME("iface %p, predicate %p, value %#x stub!\n", iface, predicate, value); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_query *query; + + TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); + + query = unsafe_impl_from_ID3D11Query((ID3D11Query *)predicate); + + wined3d_mutex_lock(); + wined3d_device_set_predication(device->wined3d_device, query ? query->wined3d_query : NULL, value); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSSetShaderResources().
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 9b245ff05f5de6aca12556603b744e4365545fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b245ff05f5de6aca12556603… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:41 2015 +0100 d3d11: Implement d3d11_immediate_context_VSSetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f732cd2..32d5bb2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -423,7 +423,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_vs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11DeviceContext *iface,

1 0

Austin English : bthprops.cpl: Add stub dll.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: b6710c2a006234ac1a729881e7ca75d34cffb474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6710c2a006234ac1a729881e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 00:45:29 2015 -0600 bthprops.cpl: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/bthprops.cpl/Makefile.in | 1 + dlls/bthprops.cpl/bthprops.cpl.spec | 65 +++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) diff --git a/configure b/configure index e1f69e0..35705f5 100755 --- a/configure +++ b/configure @@ -964,6 +964,7 @@ enable_avifil32 enable_avrt enable_bcrypt enable_browseui +enable_bthprops_cpl enable_cabinet enable_capi2032 enable_cards @@ -17465,6 +17466,7 @@ wine_fn_config_dll bcrypt enable_bcrypt wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll browseui enable_browseui clean,po wine_fn_config_test dlls/browseui/tests browseui_test +wine_fn_config_dll bthprops.cpl enable_bthprops_cpl wine_fn_config_dll cabinet enable_cabinet implib wine_fn_config_test dlls/cabinet/tests cabinet_test wine_fn_config_dll capi2032 enable_capi2032 implib diff --git a/configure.ac b/configure.ac index b9f90c7..c6a8b3e 100644 --- a/configure.ac +++ b/configure.ac @@ -2822,6 +2822,7 @@ WINE_CONFIG_DLL(bcrypt) WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(browseui,,[clean,po]) WINE_CONFIG_TEST(dlls/browseui/tests) +WINE_CONFIG_DLL(bthprops.cpl) WINE_CONFIG_DLL(cabinet,,[implib]) WINE_CONFIG_TEST(dlls/cabinet/tests) WINE_CONFIG_DLL(capi2032,,[implib]) diff --git a/dlls/bthprops.cpl/Makefile.in b/dlls/bthprops.cpl/Makefile.in new file mode 100644 index 0000000..402ec46 --- /dev/null +++ b/dlls/bthprops.cpl/Makefile.in @@ -0,0 +1 @@ +MODULE = bthprops.cpl diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec new file mode 100644 index 0000000..bb7a6ff --- /dev/null +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -0,0 +1,65 @@ +@ stub BluetoothAddressToString +@ stub BluetoothAuthenticateDevice +@ stub BluetoothAuthenticateDeviceEx +@ stub BluetoothAuthenticateMultipleDevices +@ stub BluetoothAuthenticationAgent +@ stub BluetoothDisconnectDevice +@ stub BluetoothDisplayDeviceProperties +@ stub BluetoothEnableDiscovery +@ stub BluetoothEnableIncomingConnections +@ stub BluetoothEnumerateInstalledServices +@ stub BluetoothEnumerateInstalledServicesEx +@ stub BluetoothFindBrowseGroupClose +@ stub BluetoothFindClassIdClose +@ stub BluetoothFindDeviceClose +@ stub BluetoothFindFirstBrowseGroup +@ stub BluetoothFindFirstClassId +@ stub BluetoothFindFirstDevice +@ stub BluetoothFindFirstProfileDescriptor +@ stub BluetoothFindFirstProtocolDescriptorStack +@ stub BluetoothFindFirstProtocolEntry +@ stub BluetoothFindFirstRadio +@ stub BluetoothFindFirstService +@ stub BluetoothFindFirstServiceEx +@ stub BluetoothFindNextBrowseGroup +@ stub BluetoothFindNextClassId +@ stub BluetoothFindNextDevice +@ stub BluetoothFindNextProfileDescriptor +@ stub BluetoothFindNextProtocolDescriptorStack +@ stub BluetoothFindNextProtocolEntry +@ stub BluetoothFindNextRadio +@ stub BluetoothFindNextService +@ stub BluetoothFindProfileDescriptorClose +@ stub BluetoothFindProtocolDescriptorStackClose +@ stub BluetoothFindProtocolEntryClose +@ stub BluetoothFindRadioClose +@ stub BluetoothFindServiceClose +@ stub BluetoothGetDeviceInfo +@ stub BluetoothGetRadioInfo +@ stub BluetoothIsConnectable +@ stub BluetoothIsDiscoverable +@ stub BluetoothIsVersionAvailable +@ stub BluetoothMapClassOfDeviceToImageIndex +@ stub BluetoothMapClassOfDeviceToString +@ stub BluetoothRegisterForAuthentication +@ stub BluetoothRegisterForAuthenticationEx +@ stub BluetoothRemoveDevice +@ stub BluetoothSdpEnumAttributes +@ stub BluetoothSdpGetAttributeValue +@ stub BluetoothSdpGetContainerElementData +@ stub BluetoothSdpGetElementData +@ stub BluetoothSdpGetString +@ stub BluetoothSelectDevices +@ stub BluetoothSelectDevicesFree +@ stub BluetoothSendAuthenticationResponse +@ stub BluetoothSendAuthenticationResponseEx +@ stub BluetoothSetLocalServiceInfo +@ stub BluetoothSetServiceState +@ stub BluetoothUnregisterAuthentication +@ stub BluetoothUpdateDeviceRecord +@ stub BthpEnableAllServices +@ stub BthpFindPnpInfo +@ stub BthpMapStatusToErr +@ stub CPlApplet +@ stub DllCanUnloadNow +@ stub DllGetClassObject

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSGetState().
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 73dba1a946e8d1e6808f4e1d695cb9b53a020b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73dba1a946e8d1e6808f4e1d6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:44 2015 +0100 d3d11: Implement d3d11_immediate_context_RSGetState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b59ee0..fefeb60 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1148,7 +1148,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceC static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceContext *iface, ID3D11RasterizerState **rasterizer_state) { - FIXME("iface %p, rasterizer_state %p stub!\n", iface, rasterizer_state); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); + + if ((*rasterizer_state = device->rasterizer_state ? &device->rasterizer_state->ID3D11RasterizerState_iface : NULL)) + ID3D11RasterizerState_AddRef(*rasterizer_state); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface,

1 0

Austin English : wmplayer: Add stub program.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: b871ebdc7756b5b5be4a6b6140fcda49fa77a22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b871ebdc7756b5b5be4a6b614… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 10:57:00 2015 -0600 wmplayer: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + loader/wine.inf.in | 2 ++ programs/wmplayer/Makefile.in | 7 +++++++ programs/wmplayer/main.c | 33 +++++++++++++++++++++++++++++++++ programs/wmplayer/version.rc | 27 +++++++++++++++++++++++++++ 6 files changed, 72 insertions(+) diff --git a/configure b/configure index 35705f5..7161077 100755 --- a/configure +++ b/configure @@ -1485,6 +1485,7 @@ enable_winetest enable_winhlp32 enable_winver enable_wmic +enable_wmplayer enable_wordpad enable_write enable_wscript @@ -18225,6 +18226,7 @@ wine_fn_config_program winhlp32 enable_winhlp32 install,po wine_fn_config_program winoldap.mod16 enable_win16 install wine_fn_config_program winver enable_winver install wine_fn_config_program wmic enable_wmic install,po +wine_fn_config_program wmplayer enable_wmplayer install wine_fn_config_program wordpad enable_wordpad install,po wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript clean,install diff --git a/configure.ac b/configure.ac index c6a8b3e..84420a9 100644 --- a/configure.ac +++ b/configure.ac @@ -3581,6 +3581,7 @@ WINE_CONFIG_PROGRAM(winhlp32,,[install,po]) WINE_CONFIG_PROGRAM(winoldap.mod16,enable_win16,[install]) WINE_CONFIG_PROGRAM(winver,,[install]) WINE_CONFIG_PROGRAM(wmic,,[install,po]) +WINE_CONFIG_PROGRAM(wmplayer,,[install]) WINE_CONFIG_PROGRAM(wordpad,,[install,po]) WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[clean,install]) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b6b1e00..343bc6a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml6.dll 11,,shdocvw.dll 16422,Internet Explorer,iexplore.exe +16422,Windows Media Player,wmplayer.exe 11,,* [FakeDlls] @@ -2567,6 +2568,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16410,Microsoft, 16412,Microsoft, 16422,Internet Explorer,iexplore.exe +16422,Windows Media Player,wmplayer.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,* diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in new file mode 100644 index 0000000..be345a0 --- /dev/null +++ b/programs/wmplayer/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wmplayer.exe +APPMODE = -mwindows -municode + +RC_SRCS = version.rc + +C_SRCS = \ + main.c diff --git a/programs/wmplayer/main.c b/programs/wmplayer/main.c new file mode 100644 index 0000000..899835f --- /dev/null +++ b/programs/wmplayer/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmplayer); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/wmplayer/version.rc b/programs/wmplayer/version.rc new file mode 100644 index 0000000..4e29aac --- /dev/null +++ b/programs/wmplayer/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Windows Media Player" +#define WINE_FILENAME_STR "wmplayer.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 12,0,7601,18840 +#define WINE_FILEVERSION_STR "12.0.7601.18840" +#define WINE_PRODUCTVERSION 12,0,7601,18840 +#define WINE_PRODUCTVERSION_STR "12.0.7601.18840" + +#include "wine/wine_common_ver.rc"

1 0

Ken Thomases : winemac: Fix a crash on versions of OS X prior to 10.9 which don't have the -[ NSImage drawInRect:] method.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: 682820d3cb5abf8fc1b0d98a3f9f9d1e4ed16fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682820d3cb5abf8fc1b0d98a3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 10 02:29:18 2015 -0600 winemac: Fix a crash on versions of OS X prior to 10.9 which don't have the -[NSImage drawInRect:] method. [image drawInRect:rect] is documented as being "exactly equivalent to calling [image drawInRect:rect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1 respectFlipped:YES hints:nil]". So, that's what I replace it with. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 15fa16f..75f5605 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1841,7 +1841,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } CGContextDrawImage(cgcontext, rect, windowImage); - [appImage drawInRect:NSMakeRect(156, 4, 96, 96)]; + [appImage drawInRect:NSMakeRect(156, 4, 96, 96) + fromRect:NSZeroRect + operation:NSCompositeSourceOver + fraction:1 + respectFlipped:YES + hints:nil]; [dockIcon unlockFocus];

1 0

Alexandre Julliard : makefiles: Always build .in files.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: b06ff1e55f6e0b2a2d0bcf08e8f67b4e3f93d5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06ff1e55f6e0b2a2d0bcf08e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 18:28:28 2015 +0900 makefiles: Always build .in files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 +++------ configure.ac | 5 +---- tools/Makefile.in | 2 -- tools/makedep.c | 3 +-- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 376b3f2..e1f69e0 100755 --- a/configure +++ b/configure @@ -705,11 +705,11 @@ COREFOUNDATION_LIBS LIBWINE_RULES SOCKET_LIBS DLLTOOL -LOADER_RULES ALL_TEST_RESOURCES READELF OTOOL LDD +LOADER_RULES LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS @@ -7139,6 +7139,8 @@ LDRPATH_INSTALL="" LDRPATH_LOCAL="" +LOADER_RULES="" + LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -7863,11 +7865,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` -LOADER_RULES=" -all: wine.inf -" - - case $host_os in cygwin*|mingw32*) if test -n "$ac_tool_prefix"; then diff --git a/configure.ac b/configure.ac index a516b19..b9f90c7 100644 --- a/configure.ac +++ b/configure.ac @@ -677,6 +677,7 @@ AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") +AC_SUBST(LOADER_RULES,"") LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" @@ -689,10 +690,6 @@ test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` -AC_SUBST(LOADER_RULES,[" -all: wine.inf -"]) - case $host_os in cygwin*|mingw32*) AC_CHECK_TOOL(DLLTOOL,dlltool,false) diff --git a/tools/Makefile.in b/tools/Makefile.in index bc13cc9..adf53bb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -6,5 +6,3 @@ C_SRCS = \ IN_SRCS = \ wineapploader.in - -all: wineapploader diff --git a/tools/makedep.c b/tools/makedep.c index e4ba7c4..d8cf2f5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2155,9 +2155,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar strmake( "y%s/%s.%s", dir, symlinks.str[i], section )); free( dest ); free( dir ); - strarray_add( &all_targets, xstrdup(obj) ); } - else strarray_add( &clean_files, xstrdup(obj) ); + strarray_add( &all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj_dir_path( make, obj ));

1 0

Alexandre Julliard : makedep: Don' t store install rules in the makefile object.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: bf6af2825c25e812645ad9bb91265766f362baf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6af2825c25e812645ad9bb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:03:52 2015 +0900 makedep: Don't store install rules in the makefile object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 82 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6af2825c25e812645ad…

1 0

Ken Thomases : winemac: Stop the CVDisplayLink when there are no more changes to flush.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: b4fc81bdf28264c381719966ead058fcafe299ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4fc81bdf28264c381719966e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Nov 9 20:31:22 2015 -0600 winemac: Stop the CVDisplayLink when there are no more changes to flush. The change to a CVDisplayLink-driven display mechanism introduced a problem: a Wine process never went completely idle for long periods. The display link would fire for every refresh cycle of the display, waking a CPU from idle and wasting energy. To fix that, I have the display link stop itself when it determines that none of its windows need to be displayed. When a window is subsequently marked as needing display, it either temporarily re-enables Cocoa's normal autodisplay mechanism so that it displays at the end of the current turn of the run loop, or it restarts the display link. It chooses the former if it's been a long time since the window was last displayed so that the display is done more immediately. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 116 ++++++++++++++++++++++++++++++++++------ 2 files changed, 102 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 5d581b2..19e5778 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,6 +44,7 @@ pthread_mutex_t* surface_mutex; CGDirectDisplayID _lastDisplayID; + NSTimeInterval _lastDisplayTime; NSBezierPath* shape; NSData* shapeData; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 49afd18..15fa16f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -161,6 +161,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif CGDirectDisplayID _displayID; CVDisplayLinkRef _link; NSMutableSet* _windows; + + NSTimeInterval _actualRefreshPeriod; + NSTimeInterval _nominalRefreshPeriod; } - (id) initWithDisplayID:(CGDirectDisplayID)displayID; @@ -168,6 +171,10 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) addWindow:(WineWindow*)window; - (void) removeWindow:(WineWindow*)window; + - (NSTimeInterval) refreshPeriod; + + - (void) start; + @end @implementation WineDisplayLink @@ -234,12 +241,41 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi windows = [_windows copy]; } dispatch_async(dispatch_get_main_queue(), ^{ + BOOL anyDisplayed = FALSE; for (WineWindow* window in windows) - [window displayIfNeeded]; + { + if ([window viewsNeedDisplay]) + { + [window displayIfNeeded]; + anyDisplayed = YES; + } + } + if (!anyDisplayed) + CVDisplayLinkStop(_link); }); [windows release]; } + - (NSTimeInterval) refreshPeriod + { + if (_actualRefreshPeriod || (_actualRefreshPeriod = CVDisplayLinkGetActualOutputVideoRefreshPeriod(_link))) + return _actualRefreshPeriod; + + if (_nominalRefreshPeriod) + return _nominalRefreshPeriod; + + CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(_link); + if (time.flags & kCVTimeIsIndefinite) + return 1.0 / 60.0; + _nominalRefreshPeriod = time.timeValue / (double)time.timeScale; + return _nominalRefreshPeriod; + } + + - (void) start + { + CVDisplayLinkStart(_link); + } + static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp* inNow, const CVTimeStamp* inOutputTime, CVOptionFlags flagsIn, CVOptionFlags* flagsOut, void* displayLinkContext) { WineDisplayLink* link = displayLinkContext; @@ -690,6 +726,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi window->savedContentMinSize = NSZeroSize; window->savedContentMaxSize = NSMakeSize(FLT_MAX, FLT_MAX); window->resizable = wf->resizable; + window->_lastDisplayTime = [[NSDate distantPast] timeIntervalSinceReferenceDate]; [window registerForDraggedTypes:[NSArray arrayWithObjects:(NSString*)kUTTypeData, (NSString*)kUTTypeContent, @@ -1663,21 +1700,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } - - (void) checkWineDisplayLink + - (NSMutableDictionary*) displayIDToDisplayLinkMap { - NSScreen* screen = self.screen; - if (![self isVisible] || ![self isOnActiveSpace] || [self isMiniaturized] || [self isEmptyShaped]) - screen = nil; -#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 - if ([self respondsToSelector:@selector(occlusionState)] && !(self.occlusionState & NSWindowOcclusionStateVisible)) - screen = nil; -#endif - - NSNumber* displayIDNumber = [screen.deviceDescription objectForKey:@"NSScreenNumber"]; - CGDirectDisplayID displayID = [displayIDNumber unsignedIntValue]; - if (displayID == _lastDisplayID) - return; - static NSMutableDictionary* displayIDToDisplayLinkMap; if (!displayIDToDisplayLinkMap) { @@ -1693,6 +1717,34 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [displayIDToDisplayLinkMap removeObjectsForKeys:[badDisplayIDs allObjects]]; }]; } + return displayIDToDisplayLinkMap; + } + + - (WineDisplayLink*) wineDisplayLink + { + if (!_lastDisplayID) + return nil; + + NSMutableDictionary* displayIDToDisplayLinkMap = [self displayIDToDisplayLinkMap]; + return [displayIDToDisplayLinkMap objectForKey:[NSNumber numberWithUnsignedInt:_lastDisplayID]]; + } + + - (void) checkWineDisplayLink + { + NSScreen* screen = self.screen; + if (![self isVisible] || ![self isOnActiveSpace] || [self isMiniaturized] || [self isEmptyShaped]) + screen = nil; +#if defined(MAC_OS_X_VERSION_10_9) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 + if ([self respondsToSelector:@selector(occlusionState)] && !(self.occlusionState & NSWindowOcclusionStateVisible)) + screen = nil; +#endif + + NSNumber* displayIDNumber = [screen.deviceDescription objectForKey:@"NSScreenNumber"]; + CGDirectDisplayID displayID = [displayIDNumber unsignedIntValue]; + if (displayID == _lastDisplayID) + return; + + NSMutableDictionary* displayIDToDisplayLinkMap = [self displayIDToDisplayLinkMap]; if (_lastDisplayID) { @@ -2026,6 +2078,40 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super toggleFullScreen:sender]; } + - (void) setViewsNeedDisplay:(BOOL)value + { + if (value && ![self viewsNeedDisplay]) + { + WineDisplayLink* link = [self wineDisplayLink]; + if (link) + { + NSTimeInterval now = [[NSProcessInfo processInfo] systemUptime]; + if (_lastDisplayTime + [link refreshPeriod] < now) + [self setAutodisplay:YES]; + else + { + [link start]; + _lastDisplayTime = now; + } + } + } + [super setViewsNeedDisplay:value]; + } + + - (void) display + { + _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; + [super display]; + [self setAutodisplay:NO]; + } + + - (void) displayIfNeeded + { + _lastDisplayTime = [[NSProcessInfo processInfo] systemUptime]; + [super displayIfNeeded]; + [self setAutodisplay:NO]; + } + - (NSArray*) childWineWindows { NSArray* childWindows = self.childWindows;

1 0

Andrew Eikum : maintainers: Add myself to a few entries.
by Alexandre Julliard Nov. 10, 2015

Nov. 10, 2015

Module: wine Branch: master Commit: fab05936921661e6b99589ce4010cd1bc61216da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab05936921661e6b99589ce4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 9 13:08:44 2015 -0600 maintainers: Add myself to a few entries. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 41e2ffe..19c390d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -35,6 +35,7 @@ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ F: dlls/winecoreaudio.drv/ F: dlls/wineoss.drv/ +F: dlls/winepulse.drv/ F: dlls/winmm/ F: dlls/x3daudio*/ F: dlls/xapofx*/ @@ -236,6 +237,7 @@ F: dlls/msxml*/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> +P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com>

1 0