November 2015 - Wine-commits

Nikolay Sivov : nls: Added LOCALE_SSHORTTIME locale data.
by Alexandre Julliard 09 Nov '15

09 Nov '15

1 0

Jacek Caban : urlmon: Don't include 'Win32' token in user agent string.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: aab72aa943d8f6012257050a2e75c284745966ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab72aa943d8f6012257050a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 11:09:02 2015 +0100 urlmon: Don't include 'Win32' token in user agent string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index e01e647..d2e83fa 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -545,7 +545,7 @@ static void ensure_useragent(void) ' ','(','c','o','m','p','a','t','i','b','l','e',';', ' ','M','S','I','E',' ','8','.','0',';', ' ','W','i','n','d','o','w','s',' ','%','s','%','d','.','%','d',';', - ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',0}; + ' ','%','s','T','r','i','d','e','n','t','/','5','.','0',0}; static const WCHAR post_platform_keyW[] = {'S','O','F','T','W','A','R','E', '\\','M','i','c','r','o','s','o','f','t', @@ -555,9 +555,8 @@ static void ensure_useragent(void) '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; - static const WCHAR win32W[] = {'W','i','n','3','2',0}; - static const WCHAR win64W[] = {'W','i','n','6','4',0}; - static const WCHAR wow64W[] = {'W','O','W','6','4',0}; + static const WCHAR win64W[] = {'W','i','n','6','4',';',' ',0}; + static const WCHAR wow64W[] = {'W','O','W','6','4',';',' ',0}; static const WCHAR emptyW[] = {0}; if(user_agent) @@ -571,7 +570,7 @@ static void ensure_useragent(void) else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) os_type = wow64W; else - os_type = win32W; + os_type = emptyW; sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); len = strlenW(buf);

1 0

Jacek Caban : urlmon: Include 'x64' token in user agent string on win64.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: eb5f7531ac489a31d24fee538b0dc208e453d576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5f7531ac489a31d24fee538… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 11:09:11 2015 +0100 urlmon: Include 'x64' token in user agent string on win64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index d2e83fa..1df483f 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -555,7 +555,7 @@ static void ensure_useragent(void) '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; - static const WCHAR win64W[] = {'W','i','n','6','4',';',' ',0}; + static const WCHAR win64W[] = {'W','i','n','6','4',';',' ','x','6','4',';',' ',0}; static const WCHAR wow64W[] = {'W','O','W','6','4',';',' ',0}; static const WCHAR emptyW[] = {0};

1 0

Martin Storsjo : msvcrt: Pass on the return value in _callnewh.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: e66758dd531646aa6707c71f7e6f23ffec4cb1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66758dd531646aa6707c71f7… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 6 14:51:55 2015 +0200 msvcrt: Pass on the return value in _callnewh. Also try to avoid race conditions by storing the new handler in a local variable before checking whether it's non-null. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index bb265bf..02e69fe 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -234,9 +234,11 @@ int CDECL MSVCRT__set_new_mode(int mode) */ int CDECL _callnewh(MSVCRT_size_t size) { - if(MSVCRT_new_handler) - (*MSVCRT_new_handler)(size); - return 0; + int ret = 0; + MSVCRT_new_handler_func handler = MSVCRT_new_handler; + if(handler) + ret = (*handler)(size) ? 1 : 0; + return ret; } /*********************************************************************

1 0

Martin Storsjo : msvcrt: Don't lock the heap in operator_new.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 91ed0d7963cec57c3680115743939ba641ae570a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ed0d7963cec57c368011574… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Nov 6 14:51:56 2015 +0200 msvcrt: Don't lock the heap in operator_new. The native msvcrt/msvcp allow two threads to be calling the new handler simultaneously. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 02e69fe..a908846 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -131,6 +131,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; + MSVCRT_new_handler_func handler; do { @@ -141,12 +142,11 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) return retval; } - LOCK_HEAP; - if(MSVCRT_new_handler) - freed = (*MSVCRT_new_handler)(size); + handler = MSVCRT_new_handler; + if(handler) + freed = (*handler)(size); else freed = 0; - UNLOCK_HEAP; } while(freed); TRACE("(%ld) out of memory\n", size);

1 0

Qian Hong : gdi32: Initialize system font link registry.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: e50cd3b06b920bb19e677ccde4b26d2cddcea6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50cd3b06b920bb19e677ccde… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Nov 9 14:38:12 2015 +0800 gdi32: Initialize system font link registry. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9f2a9fb..693a54d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3839,6 +3839,82 @@ static void update_font_association_info(UINT current_ansi_codepage) RegDeleteTreeA(HKEY_LOCAL_MACHINE, font_assoc_reg_key); } +static void set_multi_value_key(HKEY hkey, const WCHAR *name, const WCHAR *value, DWORD len) +{ + if (value) + RegSetValueExW(hkey, name, 0, REG_MULTI_SZ, (const BYTE *)value, len); + else if (name) + RegDeleteValueW(hkey, name); +} + +static void update_font_system_link_info(UINT current_ansi_codepage) +{ + static const WCHAR system_link_simplified_chinese[] = + {'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', + 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','u','\0', + 'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', + 'B','A','T','A','N','G','.','T','T','C',',','B','a','t','a','n','g','\0', + '\0'}; + static const WCHAR system_link_traditional_chinese[] = + {'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','u','\0', + 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', + 'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', + 'B','A','T','A','N','G','.','T','T','C',',','B','a','t','a','n','g','\0', + '\0'}; + static const WCHAR system_link_japanese[] = + {'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', + 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','U','\0', + 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', + 'G','U','L','I','M','.','T','T','C',',','G','u','l','i','m','\0', + '\0'}; + static const WCHAR system_link_korean[] = + {'G','U','L','I','M','.','T','T','C',',','G','u','l','i','m','\0', + 'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', + 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','U','\0', + 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', + '\0'}; + static const WCHAR system_link_non_cjk[] = + {'M','S','G','O','T','H','I','C','.','T','T','C',',','M','S',' ','U','I',' ','G','o','t','h','i','c','\0', + 'M','I','N','G','L','I','U','.','T','T','C',',','P','M','i','n','g','L','i','U','\0', + 'S','I','M','S','U','N','.','T','T','C',',','S','i','m','S','u','n','\0', + 'G','U','L','I','M','.','T','T','C',',','G','u','l','i','m','\0', + '\0'}; + HKEY hkey; + + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, system_link, &hkey) == ERROR_SUCCESS) + { + const WCHAR *link; + DWORD len; + + switch (current_ansi_codepage) + { + case 932: + link = system_link_japanese; + len = sizeof(system_link_japanese); + break; + case 936: + link = system_link_simplified_chinese; + len = sizeof(system_link_simplified_chinese); + break; + case 949: + link = system_link_korean; + len = sizeof(system_link_korean); + break; + case 950: + link = system_link_traditional_chinese; + len = sizeof(system_link_traditional_chinese); + break; + default: + link = system_link_non_cjk; + len = sizeof(system_link_non_cjk); + } + set_multi_value_key(hkey, Lucida_Sans_Unicode, link, len); + set_multi_value_key(hkey, Microsoft_Sans_Serif, link, len); + set_multi_value_key(hkey, Tahoma, link, len); + RegCloseKey(hkey); + } +} + static void update_font_info(void) { static const WCHAR logpixels[] = { 'L','o','g','P','i','x','e','l','s',0 }; @@ -3951,10 +4027,13 @@ static void update_font_info(void) if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); - /* update locale dependent font association info in registry. + /* update locale dependent font association info and font system link info in registry. update only when codepages changed, not logpixels. */ if (strcmp(buf, cpbuf) != 0) + { update_font_association_info(ansi_cp); + update_font_system_link_info(ansi_cp); + } } static BOOL init_freetype(void)

1 0

Józef Kucia : include: Add some missing D3D11 constants.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 905b579743523d8fe861eb939eabf8cbf12f363e URL: http://source.winehq.org/git/wine.git/?a=commit;h=905b579743523d8fe861eb939… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 17:32:20 2015 +0100 include: Add some missing D3D11 constants. 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> --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index cf8d93d..605befd 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -87,12 +87,17 @@ const UINT D3D11_DEFAULT_VIEWPORT_WIDTH = 0; cpp_quote("#define D3D11_FLOAT32_MAX (3.402823466e+38f)") +const UINT D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; + const unsigned int D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D11_MAX_MAXANISOTROPY = 16; const UINT D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT = 32; const UINT D3D11_VIEWPORT_BOUNDS_MAX = 32767; const INT D3D11_VIEWPORT_BOUNDS_MIN = -32768; +const UINT D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX = 15; +const UINT D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; + const UINT D3D11_SHADER_MAJOR_VERSION = 5; const UINT D3D11_SHADER_MAX_INSTANCES = 65535; const UINT D3D11_SHADER_MAX_INTERFACES = 253;

1 0

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

09 Nov '15

Module: wine Branch: master Commit: f175b236655ac690ebc0e2698754fade1047d251 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f175b236655ac690ebc0e2698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:10 2015 +0100 d3d11: Implement d3d11_immediate_context_PSSetSamplers(). 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 15 ++++++++++++++- dlls/d3d11/state.c | 9 +++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 2ac6129..c680249 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -352,6 +352,7 @@ struct d3d_sampler_state HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, const D3D11_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; +struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D11Query, ID3D10Query */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 566cd16..c44ec4a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -164,8 +164,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_ps_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b412ed6..3ec9b1f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1221,6 +1221,15 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic return S_OK; } +struct d3d_sampler_state *unsafe_impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_sampler_state_vtbl); + + return impl_from_ID3D11SamplerState(iface); +} + struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) { if (!iface)

1 0

Alexandre Julliard : makefiles: Only set the manpage flag for programs.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: d9e9599310fcab7f6009c9790361a04ee8c82133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e9599310fcab7f6009c9790… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 8 14:07:39 2015 +0900 makefiles: Only set the manpage flag for programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 18 +++++++++--------- configure.ac | 18 +++++++++--------- tools/make_makefiles | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 6da7b76..08f1ec1 100755 --- a/configure +++ b/configure @@ -18147,7 +18147,7 @@ wine_fn_config_makefile include enable_include clean,install-dev wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine clean,config,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader clean,config,install-lib,manpage +wine_fn_config_makefile loader enable_loader clean,config,install-lib wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install,po @@ -18239,16 +18239,16 @@ wine_fn_config_test programs/wscript/tests wscript.exe_test wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test -wine_fn_config_makefile server enable_server clean,install-lib,manpage +wine_fn_config_makefile server enable_server clean,install-lib wine_fn_config_tool tools clean wine_fn_config_tool tools/sfnt2fon clean -wine_fn_config_tool tools/widl clean,install-dev,manpage -wine_fn_config_tool tools/winebuild clean,install-dev,manpage -wine_fn_config_tool tools/winedump clean,install-dev,manpage -wine_fn_config_tool tools/winegcc clean,install-dev,manpage -wine_fn_config_tool tools/winemaker install-dev,manpage -wine_fn_config_tool tools/wmc clean,install-dev,manpage -wine_fn_config_tool tools/wrc clean,install-dev,manpage +wine_fn_config_tool tools/widl clean,install-dev +wine_fn_config_tool tools/winebuild clean,install-dev +wine_fn_config_tool tools/winedump clean,install-dev +wine_fn_config_tool tools/winegcc clean,install-dev +wine_fn_config_tool tools/winemaker clean,install-dev +wine_fn_config_tool tools/wmc clean,install-dev +wine_fn_config_tool tools/wrc clean,install-dev LINGUAS="\ ar \ diff --git a/configure.ac b/configure.ac index 68fd411..c514192 100644 --- a/configure.ac +++ b/configure.ac @@ -3501,7 +3501,7 @@ WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine],,[clean,config,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install,po]) @@ -3593,16 +3593,16 @@ WINE_CONFIG_TEST(programs/wscript/tests) WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) -WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([server],,[clean,install-lib]) WINE_CONFIG_TOOL(tools,[clean]) WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) -WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage]) -WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage]) -WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools/widl,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/winemaker,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev]) +WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev]) AC_SUBST([LINGUAS],["\ ar \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 28e448a..3c14751 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -373,7 +373,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.man\.in$/) { push @{${$make}{"=MANPAGES"}}, $name; - ${${$make}{"=flags"}}{"manpage"} = 1; + ${${$make}{"=flags"}}{($file =~ /^programs\//) ? "manpage" : "clean"} = 1; } elsif ($name =~ /\.in$/) {

1 0

Alexandre Julliard : makefiles: Get rid of the DLLPREFIX variable.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 1fa7710ff92dd9555b2b4753e22ce5fc7629cab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa7710ff92dd9555b2b4753e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 11:37:51 2015 +0900 makefiles: Get rid of the DLLPREFIX variable. Android libraries will be handled differently. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 - aclocal.m4 | 8 ++++---- configure | 12 ++++-------- configure.ac | 2 -- dlls/dbghelp/Makefile.in | 2 +- dlls/dbghelp/module.c | 11 ----------- libs/wine/Makefile.in | 1 - libs/wine/config.c | 3 +-- libs/wine/loader.c | 7 ++----- tools/makedep.c | 3 --- 10 files changed, 12 insertions(+), 38 deletions(-) diff --git a/Makefile.in b/Makefile.in index fc37ae2..4c41640 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,6 @@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ EXEEXT = @EXEEXT@ -DLLPREFIX = @DLLPREFIX@ TOOLSEXT = @TOOLSEXT@ DLLTOOL = @DLLTOOL@ AR = @AR@ diff --git a/aclocal.m4 b/aclocal.m4 index 5c2bbb8..774377d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -432,10 +432,10 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -562,10 +562,10 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "$ac_dir/install:: $ac_dir - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin then diff --git a/configure b/configure index 08f1ec1..2bfa2b9 100755 --- a/configure +++ b/configure @@ -713,7 +713,6 @@ LDD LDRPATH_LOCAL LDRPATH_INSTALL DLLFLAGS -DLLPREFIX dlldir CPP OPENGL_LIBS @@ -7135,8 +7134,6 @@ done dlldir="\${libdir}/wine" -DLLPREFIX="" - DLLFLAGS="-D_REENTRANT" LDRPATH_INSTALL="" @@ -7622,10 +7619,10 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir - \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_dll$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_dll.fake \$(DESTDIR)\$(fakedlldir)/$ac_dll $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_dll$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_dll" else wine_fn_append_rule \ "$ac_dir/install-lib:: $ac_dir @@ -7755,10 +7752,10 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "$ac_dir/install:: $ac_dir - \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT + \$(INSTALL_PROGRAM) $ac_dir/$ac_program$DLLEXT \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(INSTALL_DATA) $ac_dir/$ac_program.fake \$(DESTDIR)\$(fakedlldir)/$ac_program $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" if test -z "$with_wine64" && wine_fn_has_flag installbin then @@ -8281,7 +8278,6 @@ $wine_binary $wine_binary-installed: wine_info.plist linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" - DLLPREFIX="lib" LDEXECFLAGS="" dlldir="\${libdir}" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 diff --git a/configure.ac b/configure.ac index c514192..138312f 100644 --- a/configure.ac +++ b/configure.ac @@ -674,7 +674,6 @@ AC_CHECK_HEADERS([libprocstat.h],,, dnl **** Check for working dll **** AC_SUBST(dlldir,"\${libdir}/wine") -AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") @@ -894,7 +893,6 @@ $wine_binary $wine_binary-installed: wine_info.plist linux-android*) DLLFLAGS="$DLLFLAGS -fPIC" - DLLPREFIX="lib" LDEXECFLAGS="" dlldir="\${libdir}" WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index e483693..86846cb 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -1,6 +1,6 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp -EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DDLLPREFIX='"$(DLLPREFIX)"' +EXTRADEFS = -D_IMAGEHLP_SOURCE_ IMPORTS = psapi DELAYIMPORTS = version EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 10b0107..69a043c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -422,16 +422,6 @@ static BOOL module_is_container_loaded(const struct process* pcs, size_t len; struct module* module; PCWSTR filename, modname; - static WCHAR* dll_prefix; - static int dll_prefix_len; - - if (!dll_prefix) - { - dll_prefix_len = MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, NULL, 0 ); - dll_prefix = HeapAlloc( GetProcessHeap(), 0, dll_prefix_len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, dll_prefix, dll_prefix_len ); - dll_prefix_len--; - } if (!base) return FALSE; filename = get_filename(ImageName, NULL); @@ -444,7 +434,6 @@ static BOOL module_is_container_loaded(const struct process* pcs, base < module->module.BaseOfImage + module->module.ImageSize) { modname = get_filename(module->module.LoadedImageName, NULL); - if (dll_prefix_len && !strncmpW( modname, dll_prefix, dll_prefix_len )) modname += dll_prefix_len; if (!strncmpiW(modname, filename, len) && !memcmp(modname + len, S_DotSoW, 3 * sizeof(WCHAR))) { diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index bc5f6fe..b012239 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -98,7 +98,6 @@ EXTRA_OBJS = version.o config_EXTRADEFS = \ -DBINDIR='"${bindir}"' \ -DDLLDIR='"${dlldir}"' \ - -DDLLPREFIX='"$(DLLPREFIX)"' \ -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \ -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \ -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..3b5dd68 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -249,10 +249,9 @@ static void init_server_dir( dev_t dev, ino_t ino ) } /* retrieve the default dll dir */ -const char *get_dlldir( const char **default_dlldir, const char **dll_prefix ) +const char *get_dlldir( const char **default_dlldir ) { *default_dlldir = DLLDIR; - *dll_prefix = "/" DLLPREFIX; return dlldir; } diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 4173945..b5b32cc 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -94,20 +94,19 @@ static load_dll_callback_t load_dll_callback; static const char *build_dir; static const char *default_dlldir; -static const char *dll_prefix; static const char **dll_paths; static unsigned int nb_dll_paths; static int dll_path_maxlen; extern void mmap_init(void); -extern const char *get_dlldir( const char **default_dlldir, const char **dll_prefix ); +extern const char *get_dlldir( const char **default_dlldir ); /* build the dll load path from the WINEDLLPATH variable */ static void build_dll_path(void) { int len, count = 0; char *p, *path = getenv( "WINEDLLPATH" ); - const char *dlldir = get_dlldir( &default_dlldir, &dll_prefix ); + const char *dlldir = get_dlldir( &default_dlldir ); if (path) { @@ -157,7 +156,6 @@ static void build_dll_path(void) if (len > dll_path_maxlen) dll_path_maxlen = len; dll_paths[nb_dll_paths++] = default_dlldir; } - dll_path_maxlen += strlen( dll_prefix ) - 1; } /* check if the library is the correct architecture */ @@ -244,7 +242,6 @@ static char *next_dll_path( struct dll_path_context *context ) default: index -= 2; if (index >= nb_dll_paths) return NULL; - path = prepend( path + 1, dll_prefix, strlen( dll_prefix )); path = prepend( path, dll_paths[index], strlen( dll_paths[index] )); return path; } diff --git a/tools/makedep.c b/tools/makedep.c index c96bf46..c56dcab 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -138,7 +138,6 @@ static const char *tools_ext; static const char *exe_ext; static const char *dll_ext; static const char *man_ext; -static const char *dll_prefix; static const char *crosstarget; static const char *fontforge; static const char *convert; @@ -3131,7 +3130,6 @@ int main( int argc, char *argv[] ) exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" ); man_ext = get_expanded_make_variable( top_makefile, "api_manext" ); dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so"; - dll_prefix = get_expanded_make_variable( top_makefile, "DLLPREFIX" ); crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); convert = get_expanded_make_variable( top_makefile, "CONVERT" ); @@ -3142,7 +3140,6 @@ int main( int argc, char *argv[] ) if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL; if (!exe_ext) exe_ext = ""; if (!tools_ext) tools_ext = ""; - if (!dll_prefix) dll_prefix = ""; if (!man_ext) man_ext = "3w"; for (i = 1; i < argc; i++) update_makefile( argv[i] );

1 0