wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

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

10 Nov '15

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

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSSetConstantBuffers().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: a2f48cc8545e5c8d2cf3dcb5f722ee8e66ef134e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f48cc8545e5c8d2cf3dcb5f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:40 2015 +0100 d3d11: Implement d3d11_immediate_context_VSSetConstantBuffers(). 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 3f80d43..f732cd2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -133,8 +133,21 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetPrimitiveTopology().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 807e019da94c927586cf41f60dcabf66bd7e05c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807e019da94c927586cf41f60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:39 2015 +0100 d3d11: Implement d3d11_immediate_context_IAGetPrimitiveTopology(). 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9f98104..3f80d43 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1010,7 +1010,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3D11DeviceContext *iface, D3D11_PRIMITIVE_TOPOLOGY *topology) { - FIXME("iface %p, topology %p stub!\n", iface, topology); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, topology %p.\n", iface, topology); + + wined3d_mutex_lock(); + wined3d_device_get_primitive_type(device->wined3d_device, (enum wined3d_primitive_type *)topology); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Austin English : wmplayer: Add stub program.
by Alexandre Julliard 10 Nov '15

10 Nov '15

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

Austin English : bthprops.cpl: Add stub dll.
by Alexandre Julliard 10 Nov '15

10 Nov '15

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

Austin English : dbghelp: Version to 6.1.7601.17514.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 4f3f8a8cb73204170ec5cdc356b45a3fae4d0484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3f8a8cb73204170ec5cdc35… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 01:19:12 2015 -0600 dbghelp: Version to 6.1.7601.17514. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/version.rc b/dlls/dbghelp/version.rc index 1818010..03f03a3 100644 --- a/dlls/dbghelp/version.rc +++ b/dlls/dbghelp/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine Image Helper" #define WINE_FILENAME_STR "dbghelp.dll" -#define WINE_FILEVERSION 5,1,2600,3264 -#define WINE_FILEVERSION_STR "5.1.2600.3264" -#define WINE_PRODUCTVERSION 5,1,2600,3264 -#define WINE_PRODUCTVERSION_STR "5.1.2600.3264" +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" #include "wine/wine_common_ver.rc"

1 0

Austin English : wine.inf: Add System\CurrentControlSet\Services\RpcSs registry key.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: f46f2149cceacab8455ce2c7f3630b05459222d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46f2149cceacab8455ce2c7f… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 01:13:10 2015 -0500 wine.inf: Add System\CurrentControlSet\Services\RpcSs registry key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0cb7a02..b6b1e00 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3238,6 +3238,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 +HKLM,"System\CurrentControlSet\Services\RpcSs",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16

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 10 Nov '15

10 Nov '15

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 10 Nov '15

10 Nov '15

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 : makefiles: Add support in make_makefiles for flags in sfd files.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: fabc25d8b7d51f2315deed048a0713cfcc8f97cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabc25d8b7d51f2315deed048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 18:09:19 2015 +0900 makefiles: Add support in make_makefiles for flags in sfd files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/Makefile.in | 4 ---- tools/make_makefiles | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 9d4ea9f..08c8264 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -11,7 +11,3 @@ FONT_SRCS = \ tahoma.sfd \ tahomabd.sfd \ wingding.sfd - -# Make sure that make_makefiles sees the generated rules -install install-lib:: -clean:: diff --git a/tools/make_makefiles b/tools/make_makefiles index 3c14751..b7f8b63 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -266,13 +266,32 @@ sub get_makedep_flags($) my %flags; open FILE, $file or die "cannot open $file"; - while (<FILE>) + if ($file =~ /\.sfd$/) { - next unless /^#\s*pragma\s+makedep\s+(.*)/; - foreach my $flag (split /\s+/, $1) + while (<FILE>) { - last if $flag eq "depend"; - $flags{$flag} = 1; + next unless /^UComments:\s*\"(.*)\"$/; + foreach my $pragma (split /\+AAoA/, $1) + { + next unless $pragma =~ /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + $flags{$flag} = 1; + last if $flag eq "font"; + } + } + } + } + else + { + while (<FILE>) + { + next unless /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + last if $flag eq "depend"; + $flags{$flag} = 1; + } } } close FILE; @@ -342,7 +361,12 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } - elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } + elsif ($name =~ /\.sfd$/) + { + ${${$make}{"=flags"}}{"clean"} = 1 if defined $flags{"font"}; + ${${$make}{"=flags"}}{"install-lib"} = 1 if defined $flags{"install"}; + push @{${$make}{"=FONT_SRCS"}}, $name; + } elsif ($name =~ /\.c$/) { ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"};

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
63
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 November 2015