February 2017 - Wine-Commits

Charles Davis : iphlpapi: Add missing header to configure test.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 99d247ad5af0747c619f1a7e9b75fcfdf3d36fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d247ad5af0747c619f1a7e9… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Sun Feb 12 02:01:51 2017 -0800 iphlpapi: Add missing header to configure test. This lets GetIcmpStatistics() work again on FreeBSD. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 3 +++ dlls/iphlpapi/ipstats.c | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a7e350e..b2abca4 100755 --- a/configure +++ b/configure @@ -16768,6 +16768,9 @@ fi ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif diff --git a/configure.ac b/configure.ac index 413bfc9..8bffab9 100644 --- a/configure.ac +++ b/configure.ac @@ -2380,6 +2380,9 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, [#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5965bf9..47df7eb 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -510,7 +510,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) @@ -520,6 +520,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) if(sysctl(mib, MIB_LEN, &icmp_stat, &needed, NULL, 0) != -1) { +#ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST /*in stats */ stats->stats.icmpInStats.dwMsgs = icmp_stat.icps_badcode + icmp_stat.icps_checksum + icmp_stat.icps_tooshort + icmp_stat.icps_badlen; for(i = 0; i <= ICMP_MAXTYPE; i++) @@ -538,6 +539,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) stats->stats.icmpInStats.dwTimestampReps = icmp_stat.icps_inhist[ICMP_TSTAMPREPLY]; stats->stats.icmpInStats.dwAddrMasks = icmp_stat.icps_inhist[ICMP_MASKREQ]; stats->stats.icmpInStats.dwAddrMaskReps = icmp_stat.icps_inhist[ICMP_MASKREPLY]; +#endif #ifdef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST /* out stats */

1 0

Francois Gouget : gdi32/tests: Add inline, __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 4099ddb52171529e8c1121e02145f69c0cd08a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4099ddb52171529e8c1121e02… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:43:36 2017 +0100 gdi32/tests: Add inline, __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their formatting and parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 96c4623..91ea932 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -107,20 +107,20 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } -static void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_realloc( void *p, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - if (!p) return heap_alloc( len ); - return HeapReAlloc( GetProcessHeap(), 0, p, len ); + if (!mem) return heap_alloc(size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static void heap_free( void *p ) +static inline BOOL heap_free(void *mem) { - HeapFree( GetProcessHeap(), 0, p ); + return HeapFree(GetProcessHeap(), 0, mem); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)

1 0

Francois Gouget : atl: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: de24275696e4ccadf0e9788f69813d56e4b83c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de24275696e4ccadf0e9788f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:17:22 2017 +0100 atl: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 23be343..884ff78 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -33,9 +33,9 @@ HINSTANCE atl_instance; typedef unsigned char cpp_bool; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : jsproxy: Add a __WINE_ALLOC_SIZE attribute to heap_alloc ().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 2b094f9845c94d87ee556ba857e831fdd9f8ac0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b094f9845c94d87ee556ba85… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:17:42 2017 +0100 jsproxy: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its formatting, type names, etc. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 1ad57aa..a52fbb4 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -87,14 +87,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free( LPVOID mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupAW( const char *src, int len )

1 0

Francois Gouget : inseng: Add a __WINE_ALLOC_SIZE attribute to heap_alloc( ).
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: dabb5899cc6bc9d81799698ebb765df6b1010a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabb5899cc6bc9d81799698eb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:18:03 2017 +0100 inseng: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/inseng_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 03ec984..c95d2c7 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -36,9 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(inseng); -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : wmvcore: Add a __WINE_ALLOC_SIZE attribute to heap_alloc ().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: c4f829c0f2c679bf3fd67419547a7ca4bb974379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f829c0f2c679bf3fd674195… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:17:30 2017 +0100 wmvcore: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/wmvcore.h b/dlls/wmvcore/wmvcore.h index f4b0963..ca06e0a 100644 --- a/dlls/wmvcore/wmvcore.h +++ b/dlls/wmvcore/wmvcore.h @@ -25,9 +25,9 @@ #include "windef.h" #include "winbase.h" -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Andrey Semakin : winemine: Mine random placing fix.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 9b90266cfbc0a52f0217eecea8c5c89327b844df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b90266cfbc0a52f0217eecea… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sun Feb 12 12:50:04 2017 +0500 winemine: Mine random placing fix. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 71ff75e..da47359 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -343,8 +343,8 @@ static void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) /* create mines */ i = 0; while( (unsigned) i < p_board->mines ) { - col = (int) (p_board->cols * (float) rand() / RAND_MAX + 1); - row = (int) (p_board->rows * (float) rand() / RAND_MAX + 1); + col = rand() % p_board->cols + 1; + row = rand() % p_board->rows + 1; if( !p_board->box[col][row].IsMine ) { i++;

1 0

Francois Gouget : dpnet/tests: A spelling fix in a variable name.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: fc8fcc344fa610e1b72fc65562097644f7d1dd37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8fcc344fa610e1b72fc6556… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:40:32 2017 +0100 dpnet/tests: A spelling fix in a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 422e6d6..89dd020 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -237,7 +237,7 @@ HRESULT set_firewall( enum firewall_op op ) { static const WCHAR dpnsvrW[] = {'d','p','n','s','v','r','.','e','x','e',0}; - static const WCHAR seperator[] = {'\\',0}; + static const WCHAR separator[] = {'\\',0}; static const WCHAR clientW[] = {'d','p','n','e','t','_','c','l','i','e','n','t',0}; static const WCHAR serverW[] = @@ -262,7 +262,7 @@ HRESULT set_firewall( enum firewall_op op ) SysFreeString( image ); return E_FAIL; } - lstrcatW(path, seperator); + lstrcatW(path, separator); lstrcatW(path, dpnsvrW); init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED );

1 0

Francois Gouget : explorerframe: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: d1f668ee72f55a95aa6afb3fec683b9ecb1eb753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f668ee72f55a95aa6afb3fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:18:40 2017 +0100 explorerframe: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index e6cea63..ec8b363 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,9 +34,9 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 8e8919fe60fed7a59ef54d94cbf9b10725c7f8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8919fe60fed7a59ef54d94c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 21:12:59 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 0dec23c..25a4e97 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 09:41+0300\n" +"PO-Revision-Date: 2017-02-11 02:32+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -9352,10 +9352,8 @@ msgid "Confidentiality Required" msgstr "Требуется конфиденциальность" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Система подготавливается к отключению.\n" +msgstr "Выполняется привязка с помощью SASL" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11945,17 +11943,11 @@ msgstr "Не удалось переименовать выбранное зна #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Ключи и значения из «%1» были успешно добавлены в реестр." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Не удалось переименовать ключ «%1».\n" -"Ключ с указанным именем уже существует." +msgstr "Не удалось импортировать «%1». Некорректный файл реестра." #: regedit.rc:373 msgid ""

1 0