November 2015 - Wine-Commits

Nikolay Sivov : hnetcfg: Store port name for INetFwOpenPort.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: e9d7a9bcfb65f9f16c86a600f2af398f289656b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d7a9bcfb65f9f16c86a600f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 8 21:11:30 2015 +0300 hnetcfg: Store port name for INetFwOpenPort. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 8468d30..0ef2a1d 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -38,6 +38,7 @@ typedef struct fw_port { INetFwOpenPort INetFwOpenPort_iface; LONG refs; + BSTR name; } fw_port; static inline fw_port *impl_from_INetFwOpenPort( INetFwOpenPort *iface ) @@ -60,6 +61,7 @@ static ULONG WINAPI fw_port_Release( if (!refs) { TRACE("destroying %p\n", fw_port); + SysFreeString( fw_port->name ); HeapFree( GetProcessHeap(), 0, fw_port ); } return refs; @@ -179,8 +181,14 @@ static HRESULT WINAPI fw_port_put_Name( { fw_port *This = impl_from_INetFwOpenPort( iface ); - FIXME("%p %s\n", This, debugstr_w(name)); - return E_NOTIMPL; + TRACE("%p %s\n", This, debugstr_w(name)); + + if (!(name = SysAllocString( name ))) + return E_OUTOFMEMORY; + + SysFreeString( This->name ); + This->name = name; + return S_OK; } static HRESULT WINAPI fw_port_get_IpVersion( @@ -352,6 +360,7 @@ HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fp->INetFwOpenPort_iface.lpVtbl = &fw_port_vtbl; fp->refs = 1; + fp->name = NULL; *ppObj = &fp->INetFwOpenPort_iface;

1 0

Jacek Caban : urlmon: Don't include 'Win32' token in user agent string.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

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

Alexandre Julliard : makefiles: Remove a no longer necessary library path.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: a83da2d338a8053e9b51e88f2b358c83d6b0db91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83da2d338a8053e9b51e88f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 16:40:05 2015 +0900 makefiles: Remove a no longer necessary library path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 751baa9..376b3f2 100755 --- a/configure +++ b/configure @@ -7980,7 +7980,7 @@ fi case $host_os in mingw32*) crtlibs="-lmsvcrt" - SOCKET_LIBS="-L\$(top_builddir)/dlls/ws2_32 -lws2_32" + SOCKET_LIBS="-lws2_32" ;; esac diff --git a/configure.ac b/configure.ac index c6088f4..a516b19 100644 --- a/configure.ac +++ b/configure.ac @@ -717,7 +717,7 @@ case $host_os in case $host_os in mingw32*) crtlibs="-lmsvcrt" - AC_SUBST(SOCKET_LIBS,"-L\$(top_builddir)/dlls/ws2_32 -lws2_32") ;; + AC_SUBST(SOCKET_LIBS,"-lws2_32") ;; esac libwine_targets="libwine.dll libwine.a"

1 0

Bruno Jesus : ws2_32/tests: Add WSAPoll() tests.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 344cddb63af183570165942d333aa588360c589b URL: http://source.winehq.org/git/wine.git/?a=commit;h=344cddb63af183570165942d3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Nov 6 00:40:34 2015 +0800 ws2_32/tests: Add WSAPoll() tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=344cddb63af1835701659…

1 0

Nikolay Sivov : kernel32: Implement EnumDateFormatsExEx().
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 3d728e68d336bca49a4cb2091871e911332466ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d728e68d336bca49a4cb2091… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 8 22:28:34 2015 +0300 kernel32: Implement EnumDateFormatsExEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 27 ++++++++++++++++++++++++--- include/winnls.h | 2 ++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 958c6a7..c324347 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -401,7 +401,7 @@ @ stdcall EnumCalendarInfoW(ptr long long long) @ stdcall EnumDateFormatsA(ptr long long) @ stdcall EnumDateFormatsExA(ptr long long) -# @ stub EnumDateFormatsExEx +@ stdcall EnumDateFormatsExEx(ptr wstr long long) @ stdcall EnumDateFormatsExW(ptr long long) @ stdcall EnumDateFormatsW(ptr long long) @ stdcall EnumLanguageGroupLocalesA(ptr long long ptr) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 8f08826..48adb11 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1753,10 +1753,12 @@ struct enumdateformats_context { union { DATEFMT_ENUMPROCW callback; /* user callback pointer */ DATEFMT_ENUMPROCEXW callbackex; + DATEFMT_ENUMPROCEXEX callbackexex; } u; - LCID lcid; /* locale of interest */ - DWORD flags; - BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ + LCID lcid; /* locale of interest */ + DWORD flags; + LPARAM lParam; + BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ }; /****************************************************************************** @@ -1821,6 +1823,9 @@ static BOOL NLS_EnumDateFormats(const struct enumdateformats_context *ctxt) case CALLBACK_ENUMPROCEX: ctxt->u.callbackex(ctxt->unicode ? bufW : (WCHAR*)bufA, cal_id); break; + case CALLBACK_ENUMPROCEXEX: + ctxt->u.callbackexex(bufW, cal_id, ctxt->lParam); + break; default: ; } @@ -1900,6 +1905,22 @@ BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) } /************************************************************************** + * EnumDateFormatsExEx (KERNEL32.@) + */ +BOOL WINAPI EnumDateFormatsExEx(DATEFMT_ENUMPROCEXEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) +{ + struct enumdateformats_context ctxt; + + ctxt.type = CALLBACK_ENUMPROCEXEX; + ctxt.u.callbackexex = proc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.flags = flags; + ctxt.lParam = lParam; + + return NLS_EnumDateFormats(&ctxt); +} + +/************************************************************************** * EnumTimeFormatsA (KERNEL32.@) * * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle diff --git a/include/winnls.h b/include/winnls.h index 0f68c81..2f899f8 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -734,6 +734,7 @@ typedef struct _nlsversioninfoex { /* Define a bunch of callback types */ typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXEX)(LPWSTR,CALID,LPWSTR,LPARAM); +typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXEX)(LPWSTR,CALID,LPARAM); #if defined(STRICT) typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR); @@ -843,6 +844,7 @@ WINBASEAPI BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD); WINBASEAPI BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA,LCID,DWORD); WINBASEAPI BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW,LCID,DWORD); #define EnumDateFormatsEx WINELIB_NAME_AW(EnumDateFormatsEx) +WINBASEAPI BOOL WINAPI EnumDateFormatsExEx(DATEFMT_ENUMPROCEXEX,LPCWSTR,DWORD,LPARAM); WINBASEAPI BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD); #define EnumSystemCodePages WINELIB_NAME_AW(EnumSystemCodePages)

1 0

Nikolay Sivov : kernel32: Simplify EnumDateFormats & EnumDateFormatsEx.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 292e4153cf1cd3bf67fec0ac14dd53408864b7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292e4153cf1cd3bf67fec0ac1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 8 22:28:33 2015 +0300 kernel32: Simplify EnumDateFormats & EnumDateFormatsEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 219 ++++++++++++++++++++++------------------------- 1 file changed, 100 insertions(+), 119 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 2c81d02..8f08826 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1742,93 +1742,126 @@ error: * alternate calendars is determined. */ -/************************************************************************** - * EnumDateFormatsExA (KERNEL32.@) +enum enum_callback_type { + CALLBACK_ENUMPROC, + CALLBACK_ENUMPROCEX, + CALLBACK_ENUMPROCEXEX +}; + +struct enumdateformats_context { + enum enum_callback_type type; /* callback kind */ + union { + DATEFMT_ENUMPROCW callback; /* user callback pointer */ + DATEFMT_ENUMPROCEXW callbackex; + } u; + LCID lcid; /* locale of interest */ + DWORD flags; + BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ +}; + +/****************************************************************************** + * NLS_EnumDateFormats <internal> + * Enumerates date formats for a specified locale. * - * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle - * LOCALE_NOUSEROVERRIDE here as well? + * PARAMS + * ctxt [I] enumeration context, see 'struct enumdateformats_context' + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. Use GetLastError() to determine the cause. */ -BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA proc, LCID lcid, DWORD flags) +static BOOL NLS_EnumDateFormats(const struct enumdateformats_context *ctxt) { + WCHAR bufW[256]; + char bufA[256]; + LCTYPE lctype; CALID cal_id; - char buf[256]; + INT ret; - if (!proc) + if (!ctxt->u.callback) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (!GetLocaleInfoW(lcid, LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER, (LPWSTR)&cal_id, sizeof(cal_id)/sizeof(WCHAR))) + if (!GetLocaleInfoW(ctxt->lcid, LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER, (LPWSTR)&cal_id, sizeof(cal_id)/sizeof(WCHAR))) return FALSE; - switch (flags & ~LOCALE_USE_CP_ACP) + switch (ctxt->flags & ~LOCALE_USE_CP_ACP) { case 0: case DATE_SHORTDATE: - if (GetLocaleInfoA(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf, cal_id); + lctype = LOCALE_SSHORTDATE; break; - case DATE_LONGDATE: - if (GetLocaleInfoA(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf, cal_id); + lctype = LOCALE_SLONGDATE; break; - case DATE_YEARMONTH: - if (GetLocaleInfoA(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf, cal_id); + lctype = LOCALE_SYEARMONTH; break; - default: - FIXME("Unknown date format (%d)\n", flags); + FIXME("Unknown date format (0x%08x)\n", ctxt->flags); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + lctype |= ctxt->flags & LOCALE_USE_CP_ACP; + if (ctxt->unicode) + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + else + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + + if (ret) + { + switch (ctxt->type) + { + case CALLBACK_ENUMPROC: + ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); + break; + case CALLBACK_ENUMPROCEX: + ctxt->u.callbackex(ctxt->unicode ? bufW : (WCHAR*)bufA, cal_id); + break; + default: + ; + } + } + return TRUE; } /************************************************************************** - * EnumDateFormatsExW (KERNEL32.@) + * EnumDateFormatsExA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? */ -BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW proc, LCID lcid, DWORD flags) +BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA proc, LCID lcid, DWORD flags) { - CALID cal_id; - WCHAR buf[256]; + struct enumdateformats_context ctxt; - if (!proc) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = (DATEFMT_ENUMPROCEXW)proc; + ctxt.lcid = lcid; + ctxt.flags = flags; + ctxt.unicode = FALSE; - if (!GetLocaleInfoW(lcid, LOCALE_ICALENDARTYPE|LOCALE_RETURN_NUMBER, (LPWSTR)&cal_id, sizeof(cal_id)/sizeof(WCHAR))) - return FALSE; + return NLS_EnumDateFormats(&ctxt); +} - switch (flags & ~LOCALE_USE_CP_ACP) - { - case 0: - case DATE_SHORTDATE: - if (GetLocaleInfoW(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf, cal_id); - break; +/************************************************************************** + * EnumDateFormatsExW (KERNEL32.@) + */ +BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW proc, LCID lcid, DWORD flags) +{ + struct enumdateformats_context ctxt; - case DATE_LONGDATE: - if (GetLocaleInfoW(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf, cal_id); - break; + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = proc; + ctxt.lcid = lcid; + ctxt.flags = flags; + ctxt.unicode = TRUE; - case DATE_YEARMONTH: - if (GetLocaleInfoW(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf, cal_id); - break; - - default: - FIXME("Unknown date format (%d)\n", flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; + return NLS_EnumDateFormats(&ctxt); } /************************************************************************** @@ -1839,38 +1872,15 @@ BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW proc, LCID lcid, DWORD flags) */ BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) { - char buf[256]; - - if (!proc) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch (flags & ~LOCALE_USE_CP_ACP) - { - case 0: - case DATE_SHORTDATE: - if (GetLocaleInfoA(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; - - case DATE_LONGDATE: - if (GetLocaleInfoA(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; + struct enumdateformats_context ctxt; - case DATE_YEARMONTH: - if (GetLocaleInfoA(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; + ctxt.type = CALLBACK_ENUMPROC; + ctxt.u.callback = (DATEFMT_ENUMPROCW)proc; + ctxt.lcid = lcid; + ctxt.flags = flags; + ctxt.unicode = FALSE; - default: - FIXME("Unknown date format (%d)\n", flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; + return NLS_EnumDateFormats(&ctxt); } /************************************************************************** @@ -1878,38 +1888,15 @@ BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) */ BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) { - WCHAR buf[256]; - - if (!proc) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + struct enumdateformats_context ctxt; - switch (flags & ~LOCALE_USE_CP_ACP) - { - case 0: - case DATE_SHORTDATE: - if (GetLocaleInfoW(lcid, LOCALE_SSHORTDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; + ctxt.type = CALLBACK_ENUMPROC; + ctxt.u.callback = proc; + ctxt.lcid = lcid; + ctxt.flags = flags; + ctxt.unicode = TRUE; - case DATE_LONGDATE: - if (GetLocaleInfoW(lcid, LOCALE_SLONGDATE | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; - - case DATE_YEARMONTH: - if (GetLocaleInfoW(lcid, LOCALE_SYEARMONTH | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; - - default: - FIXME("Unknown date format (%d)\n", flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; + return NLS_EnumDateFormats(&ctxt); } /************************************************************************** @@ -1971,14 +1958,8 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return TRUE; } -enum enumcalendar_callback_type { - CALLBACK_ENUMPROC, - CALLBACK_ENUMPROCEX, - CALLBACK_ENUMPROCEXEX -}; - struct enumcalendar_context { - enum enumcalendar_callback_type type; /* callback kind */ + enum enum_callback_type type; /* callback kind */ union { CALINFO_ENUMPROCW callback; /* user callback pointer */ CALINFO_ENUMPROCEXW callbackex;

1 0

Nikolay Sivov : nls: Added LOCALE_SSHORTTIME locale data.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

1 0

Alexandre Julliard : makefiles: Get rid of the documentation makefile.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

Module: wine Branch: master Commit: 7735bb5217175e798aac45a20fe77cc9fe9e416e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7735bb5217175e798aac45a20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 9 14:09:46 2015 +0900 makefiles: Get rid of the documentation makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 9 ++++++++- configure | 2 -- configure.ac | 1 - documentation/Makefile.in | 6 ------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4c41640..eb58fd2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -112,7 +112,7 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status clean:: __clean__ distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp .gitignore - $(RM) -r autom4te.cache + $(RM) -r autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext) # Rules for uninstalling @@ -120,6 +120,13 @@ distclean:: clean uninstall:: __uninstall__ -rmdir $(DESTDIR)$(fontdir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir) +# Rules for API documentation + +install-manpages:: manpages + for i in documentation/man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done + +.PHONY: install-manpages + # Dependencies between directories # dependencies needed to build any dll or program diff --git a/configure b/configure index 2bfa2b9..751baa9 100755 --- a/configure +++ b/configure @@ -1402,7 +1402,6 @@ enable_xmllite enable_xolehlp enable_xpsprint enable_xpssvcs -enable_documentation enable_fonts enable_include enable_libs_port @@ -18137,7 +18136,6 @@ wine_fn_config_test dlls/xmllite/tests xmllite_test wine_fn_config_dll xolehlp enable_xolehlp wine_fn_config_dll xpsprint enable_xpsprint wine_fn_config_dll xpssvcs enable_xpssvcs -wine_fn_config_makefile documentation enable_documentation clean wine_fn_config_makefile fonts enable_fonts clean,install-lib wine_fn_config_makefile include enable_include clean,install-dev wine_fn_config_makefile libs/port enable_libs_port diff --git a/configure.ac b/configure.ac index 138312f..c6088f4 100644 --- a/configure.ac +++ b/configure.ac @@ -3493,7 +3493,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_DLL(xolehlp) WINE_CONFIG_DLL(xpsprint) WINE_CONFIG_DLL(xpssvcs) -WINE_CONFIG_MAKEFILE([documentation],,[clean]) WINE_CONFIG_MAKEFILE([fonts],,[clean,install-lib]) WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) diff --git a/documentation/Makefile.in b/documentation/Makefile.in deleted file mode 100644 index e3e6d40..0000000 --- a/documentation/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -install-man:: - @cd $(top_builddir) && $(MAKE) manpages - for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done - -clean:: - $(RM) -r html api-guide api-guide-xml man$(api_manext)

1 0

Alexandre Julliard : makefiles: Get rid of the DLLPREFIX variable.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

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

Qian Hong : gdi32: Initialize system font link registry.
by Alexandre Julliard Nov. 9, 2015

Nov. 9, 2015

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