September 2012 - Wine-Commits

Charles Davis : configure: Fix ipstat tests to work on Mac OS.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: fd05f5412f25e9e55f42d4a516391b4de47e970f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd05f5412f25e9e55f42d4a51… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 11 09:11:30 2012 -0600 configure: Fix ipstat tests to work on Mac OS. --- configure | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 48d854b..97e4664 100755 --- a/configure +++ b/configure @@ -14199,7 +14199,16 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_inhist" "ac_cv_member_struct_icmpstat_icps_inhist" "#ifdef HAVE_NETINET_ICMP_VAR +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_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif " @@ -14243,7 +14252,7 @@ ac_fn_c_check_member "$LINENO" "struct icmpstat" "icps_outhist" "ac_cv_member_st #ifdef HAVE_NETINET_IP_ICMP_H #include <netinet/ip_icmp.h> #endif -#ifdef HAVE_NETINET_ICMP_VAR +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif " @@ -14257,7 +14266,16 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct ipstat" "ips_total" "ac_cv_member_struct_ipstat_ips_total" "#ifdef HAVE_NETINET_IP_VAR_H +ac_fn_c_check_member "$LINENO" "struct ipstat" "ips_total" "ac_cv_member_struct_ipstat_ips_total" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif " @@ -14285,7 +14303,19 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct tcpstat" "tcps_connattempt" "ac_cv_member_struct_tcpstat_tcps_connattempt" "#ifdef HAVE_NETINET_TCP_VAR_H +ac_fn_c_check_member "$LINENO" "struct tcpstat" "tcps_connattempt" "ac_cv_member_struct_tcpstat_tcps_connattempt" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif +#ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif " @@ -14313,7 +14343,19 @@ _ACEOF fi -ac_fn_c_check_member "$LINENO" "struct udpstat" "udps_ipackets" "ac_cv_member_struct_udpstat_udps_ipackets" "#ifdef HAVE_NETINET_UDP_VAR_H +ac_fn_c_check_member "$LINENO" "struct udpstat" "udps_ipackets" "ac_cv_member_struct_udpstat_udps_ipackets" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_UDP_H +#include <netinet/udp.h> +#endif +#ifdef HAVE_NETINET_UDP_VAR_H #include <netinet/udp_var.h> #endif " diff --git a/configure.ac b/configure.ac index 9a15200..7e761af 100644 --- a/configure.ac +++ b/configure.ac @@ -2311,7 +2311,16 @@ AC_CHECK_MEMBERS([ns_msg._msg_ptr],,, dnl Check for struct icmpstat AC_CHECK_MEMBERS([struct icmpstat.icps_inhist],,, -[#ifdef HAVE_NETINET_ICMP_VAR +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif]) @@ -2347,13 +2356,22 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #ifdef HAVE_NETINET_IP_ICMP_H #include <netinet/ip_icmp.h> #endif -#ifdef HAVE_NETINET_ICMP_VAR +#ifdef HAVE_NETINET_ICMP_VAR_H #include <netinet/icmp_var.h> #endif]) dnl Check for struct ipstat AC_CHECK_MEMBERS([struct ipstat.ips_total],,, -[#ifdef HAVE_NETINET_IP_VAR_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif]) @@ -2365,7 +2383,19 @@ AC_CHECK_MEMBERS([struct ip_stats.ips_total],,, dnl Check for struct tcpstat AC_CHECK_MEMBERS([struct tcpstat.tcps_connattempt],,, -[#ifdef HAVE_NETINET_TCP_VAR_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif +#ifdef HAVE_NETINET_TCP_VAR_H #include <netinet/tcp_var.h> #endif]) @@ -2377,7 +2407,19 @@ AC_CHECK_MEMBERS([struct tcp_stats.tcps_connattempt],,, dnl Check for struct udpstat AC_CHECK_MEMBERS([struct udpstat.udps_ipackets],,, -[#ifdef HAVE_NETINET_UDP_VAR_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IP_VAR_H +#include <netinet/ip_var.h> +#endif +#ifdef HAVE_NETINET_UDP_H +#include <netinet/udp.h> +#endif +#ifdef HAVE_NETINET_UDP_VAR_H #include <netinet/udp_var.h> #endif])

1 0

Piotr Caban : msvcp90: Fixed copied buffer siezes in functions operating on wchar_t.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: 5258b3a219c310175e32b837b39214dd37c5d061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5258b3a219c310175e32b837b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 11 16:08:21 2012 +0200 msvcp90: Fixed copied buffer siezes in functions operating on wchar_t. --- dlls/msvcp100/ios.c | 8 ++++---- dlls/msvcp90/ios.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 9d6ad67..57c1aa4 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -1822,11 +1822,11 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi chunk = count-copied; if(chunk > 0) { - memcpy_s(ptr+copied, size, *this->prpos, chunk); + memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t)); *this->prpos += chunk; *this->prsize -= chunk; copied += chunk; - size -= chunk; + size -= chunk*sizeof(wchar_t); }else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) { ptr[copied] = c; copied++; @@ -2315,7 +2315,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, chunk = count-copied; if(chunk > 0) { - memcpy(*this->pwpos, ptr+copied, chunk); + memcpy(*this->pwpos, ptr+copied, chunk*sizeof(wchar_t)); *this->pwpos += chunk; *this->pwsize -= chunk; copied += chunk; @@ -3948,7 +3948,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - memcpy(buf, str, count); + memcpy(buf, str, count*sizeof(wchar_t)); this->seekhigh = buf + count; this->state |= STRINGBUF_allocated; diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 82010c6..699ac98 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1812,11 +1812,11 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi chunk = count-copied; if(chunk > 0) { - memcpy_s(ptr+copied, size, *this->prpos, chunk); + memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t)); *this->prpos += chunk; *this->prsize -= chunk; copied += chunk; - size -= chunk; + size -= chunk*sizeof(wchar_t); }else if((c = call_basic_streambuf_wchar_uflow(this)) != WEOF) { ptr[copied] = c; copied++; @@ -2305,7 +2305,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, chunk = count-copied; if(chunk > 0) { - memcpy(*this->pwpos, ptr+copied, chunk); + memcpy(*this->pwpos, ptr+copied, chunk*sizeof(wchar_t)); *this->pwpos += chunk; *this->pwsize -= chunk; copied += chunk; @@ -3938,7 +3938,7 @@ void __thiscall basic_stringbuf_wchar__Init(basic_stringbuf_wchar *this, const w throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - memcpy(buf, str, count); + memcpy(buf, str, count*sizeof(wchar_t)); this->seekhigh = buf + count; this->state |= STRINGBUF_allocated;

1 0

Piotr Caban : msvcp: Prevent overflows while operating on string sizes.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: 39e9ac03179363d0586e65a753c50d9791af5673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e9ac03179363d0586e65a75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 11 16:08:56 2012 +0200 msvcp: Prevent overflows while operating on string sizes. --- dlls/msvcp100/string.c | 12 ++++++------ dlls/msvcp60/string.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index bbd01b4..5fb117f 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -977,7 +977,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_cstr_len( if(this->size < pos) MSVCP__String_base_Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = MSVCP_char_traits_char_compare(basic_string_char_const_ptr(this)+pos, @@ -1024,7 +1024,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_substr( if(compare->size < off) MSVCP__String_base_Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return MSVCP_basic_string_char_compare_substr_cstr_len(this, pos, num, @@ -1512,7 +1512,7 @@ basic_string_char* __thiscall basic_string_char_replace_substr(basic_string_char if(str->size < str_off) MSVCP__String_base_Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_char_replace_cstr_len(this, off, len, @@ -2690,7 +2690,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_cstr_len( if(this->size < pos) MSVCP__String_base_Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = MSVCP_char_traits_wchar_compare(basic_string_wchar_const_ptr(this)+pos, @@ -2743,7 +2743,7 @@ int __thiscall MSVCP_basic_string_wchar_compare_substr_substr( if(compare->size < off) MSVCP__String_base_Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return MSVCP_basic_string_wchar_compare_substr_cstr_len(this, pos, num, @@ -3218,7 +3218,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_substr(basic_string_wc if(str->size < str_off) MSVCP__String_base_Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_wchar_replace_cstr_len(this, off, len, diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 2553e5b..2180149 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -549,7 +549,7 @@ int __thiscall basic_string_char_compare_substr_cstr_len( if(this->size < pos) _Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = char_traits_char_compare(this->ptr+pos, @@ -586,7 +586,7 @@ int __thiscall basic_string_char_compare_substr_substr( if(compare->size < off) _Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return basic_string_char_compare_substr_cstr_len(this, pos, num, @@ -1338,7 +1338,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_char_npos-str_len <= this->size-len) @@ -1388,7 +1388,7 @@ basic_string_char* __thiscall basic_string_char_replace_substr(basic_string_char if(str->size < str_off) _Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_char_replace_cstr_len(this, off, len, @@ -1418,7 +1418,7 @@ basic_string_char* __thiscall basic_string_char_replace_ch(basic_string_char *th if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_char_npos-count <= this->size-len) @@ -2239,7 +2239,7 @@ int __thiscall basic_string_wchar_compare_substr_cstr_len( if(this->size < pos) _Xran(); - if(pos+num > this->size) + if(num > this->size-pos) num = this->size-pos; ans = char_traits_wchar_compare(this->ptr+pos, @@ -2276,7 +2276,7 @@ int __thiscall basic_string_wchar_compare_substr_substr( if(compare->size < off) _Xran(); - if(off+count > compare->size) + if(count > compare->size-off) count = compare->size-off; return basic_string_wchar_compare_substr_cstr_len(this, pos, num, @@ -3028,7 +3028,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_wchar_npos-str_len <= this->size-len) @@ -3078,7 +3078,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_substr(basic_string_wc if(str->size < str_off) _Xran(); - if(str_off+str_len > str->size) + if(str_len > str->size-str_off) str_len = str->size-str_off; return basic_string_wchar_replace_cstr_len(this, off, len, @@ -3108,7 +3108,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_ch(basic_string_wchar if(this->size < off) _Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(basic_string_wchar_npos-count <= this->size-len)

1 0

Charles Davis : configure: Prefer stabs debug info on Mac OS.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: f5bc7afe19763bf95cdff49645317d2d2ac0613d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5bc7afe19763bf95cdff4964… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 11 09:11:29 2012 -0600 configure: Prefer stabs debug info on Mac OS. --- configure | 31 +++++++++++++++++++++++++++++-- configure.ac | 9 ++++++--- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ec66aa3..48d854b 100755 --- a/configure +++ b/configure @@ -12290,7 +12290,33 @@ fi for ac_flag in $CFLAGS; do case $ac_flag in - -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 + -g) case $host_os in + darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstabs+" >&5 +$as_echo_n "checking whether the compiler supports -gstabs+... " >&6; } +if ${ac_cv_cflags__gstabsp+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -gstabs+" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__gstabsp=yes +else + ac_cv_cflags__gstabsp=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gstabsp" >&5 +$as_echo "$ac_cv_cflags__gstabsp" >&6; } +if test $ac_cv_cflags__gstabsp = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -gstabs+" +fi ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 $as_echo_n "checking whether the compiler supports -gdwarf-2... " >&6; } if ${ac_cv_cflags__gdwarf_2+:} false; then : $as_echo_n "(cached) " >&6 @@ -12315,7 +12341,7 @@ $as_echo "$ac_cv_cflags__gdwarf_2" >&6; } if test $ac_cv_cflags__gdwarf_2 = yes; then : EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 $as_echo_n "checking whether the compiler supports -gstrict-dwarf... " >&6; } if ${ac_cv_cflags__gstrict_dwarf+:} false; then : $as_echo_n "(cached) " >&6 @@ -12340,6 +12366,7 @@ $as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; } if test $ac_cv_cflags__gstrict_dwarf = yes; then : EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf" fi ;; + esac ;; esac done diff --git a/configure.ac b/configure.ac index 528ee90..9a15200 100644 --- a/configure.ac +++ b/configure.ac @@ -1749,11 +1749,14 @@ then WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) - dnl Default to dwarf-2 debug info + dnl On Darwin, prefer stabs; everywhere else, default to dwarf-2 debug info for ac_flag in $CFLAGS; do case $ac_flag in - -g) WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + -g) case $host_os in + darwin*) WINE_TRY_CFLAGS([-gstabs+]) ;; + *) WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + esac ;; esac done

1 0

James Eder : ntdll: Remove outdated comment.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: 07f29c2ce7a91fce069f60580fc0ec3bacaf6e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f29c2ce7a91fce069f60580… Author: James Eder <jimportal(a)gmail.com> Date: Fri Sep 7 14:29:26 2012 -0600 ntdll: Remove outdated comment. --- dlls/ntdll/nt.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2536d33..44bdc5f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -904,15 +904,6 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) * - cached_sci & cpuHZ in this file * - Peb->NumberOfProcessors * - SharedUserData->ProcessFeatures[] array - * - * It creates a registry subhierarchy, looking like: - * "\HARDWARE\DESCRIPTION\System\CentralProcessor\<processornumber>\Identifier (CPU x86)". - * Note that there is a hierarchy for every processor installed, so this - * supports multiprocessor systems. This is done like Win95 does it, I think. - * - * It creates some registry entries in the environment part: - * "\HKLM\System\CurrentControlSet\Control\Session Manager\Environment". These are - * always present. When deleted, Windows will add them again. */ void fill_cpu_info(void) {

1 0

Michael Stefaniuc : shlwapi: Remove gratuitous "stub" from TRACE messages.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: c637cbc397598cf0eeae7368cdab14bee378cc75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c637cbc397598cf0eeae7368c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 11 12:13:19 2012 +0200 shlwapi: Remove gratuitous "stub" from TRACE messages. --- dlls/shlwapi/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index a919d8a..b123036 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1425,7 +1425,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U * It was duplicated because not every version of Shlwapi.dll exports * StrRetToBufA. If you change one routine, change them both. */ - TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); if (!src) { @@ -1469,7 +1469,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U */ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, UINT len) { - TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%x strret=%p pidl=%p\n", dest, len, src, pidl); if (!src) {

1 0

Qian Hong : gdi32/tests: Added tests for symbol fonts.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: 84954c0dbe636edb7be6b4e4da7f0648af16a48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84954c0dbe636edb7be6b4e4d… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:06:19 2012 +0800 gdi32/tests: Added tests for symbol fonts. --- dlls/gdi32/tests/font.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 07f8dcb..ef4e51d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2777,6 +2777,7 @@ end: } #define TT_PLATFORM_MICROSOFT 3 +#define TT_MS_ID_SYMBOL_CS 0 #define TT_MS_ID_UNICODE_CS 1 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 #define TT_NAME_ID_FONT_FAMILY 1 @@ -2840,7 +2841,7 @@ static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_ for (i = 0; i < header->number_of_record; i++) { if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || - GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS || + (GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS && GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_SYMBOL_CS) || GET_BE_WORD(entry[i].language_id) != language_id || GET_BE_WORD(entry[i].name_id) != name_id) { @@ -4150,7 +4151,9 @@ static void test_fullname2_helper(const char *Family) ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET) + todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont); @@ -4165,6 +4168,8 @@ static void test_fullname2_helper(const char *Family) static void test_fullname2(void) { test_fullname2_helper("Lucida Sans"); + test_fullname2_helper("Webdings"); + test_fullname2_helper("Wingdings"); } static BOOL write_ttf_file(const char *fontname, char *tmp_name)

1 0

Qian Hong : gdi32: Fixed localized font style name.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: 80dbd4e9cf561c6d21723ca25782b3c8f5326460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dbd4e9cf561c6d21723ca25… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:05:57 2012 +0800 gdi32: Fixed localized font style name. --- dlls/gdi32/freetype.c | 26 ++++++++++++++++++++------ dlls/gdi32/tests/font.c | 7 ++++++- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 28ca616..efb12a4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1714,7 +1714,14 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - face->StyleName = towstr( CP_ACP, ft_face->style_name ); + face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); + if (!face->StyleName) + face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!face->StyleName) + { + face->StyleName = towstr( CP_ACP, ft_face->style_name ); + } + face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face->FullName) face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); @@ -6549,11 +6556,18 @@ static BOOL get_outline_text_metrics(GdiFont *font) lenfam = (strlenW(font->name) + 1) * sizeof(WCHAR); family_nameW = strdupW(font->name); - lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) - * sizeof(WCHAR); - style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); - MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, - style_nameW, lensty/sizeof(WCHAR)); + style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); + if (!style_nameW) + style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!style_nameW) + { + FIXME("failed to read sytle_nameW for font %s!\n", wine_dbgstr_w(font->name)); + lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) * sizeof(WCHAR); + style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); + MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, style_nameW, lensty/sizeof(WCHAR)); + } + else + lensty = (strlenW(style_nameW) + 1) * sizeof(WCHAR); face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face_nameW) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bbfa02b..07f8dcb 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4132,7 +4132,12 @@ static void test_fullname2_helper(const char *Family) bufW[0] = 0; bufA[0] = 0; - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); + if (!ret) + { + trace("no localized FONT_SUBFAMILY font.\n"); + ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + } ok(ret, "SUBFAMILY (style name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA);

1 0

Qian Hong : gdi32/tests: Better trace in test_fullname2_helper.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: 4461612e33a8ddd8abb4ef2d77ef5e261ea59f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4461612e33a8ddd8abb4ef2d7… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:05:28 2012 +0800 gdi32/tests: Better trace in test_fullname2_helper. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 22c3209..bbfa02b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4107,7 +4107,7 @@ static void test_fullname2_helper(const char *Family) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); if (!ret) { - trace("no localized name found.\n"); + trace("no localized FONT_FAMILY found.\n"); ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); } ok(ret, "FAMILY (family name) could not be read\n"); @@ -4121,7 +4121,7 @@ static void test_fullname2_helper(const char *Family) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); if (!ret) { - trace("no localized name found.\n"); + trace("no localized FULL_NAME found.\n"); ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); } ok(ret, "FULL_NAME (face name) could not be read\n");

1 0

Qian Hong : gdi32: Fixed get_name_table_entry for symbol fonts.
by Alexandre Julliard Sept. 11, 2012

Sept. 11, 2012

Module: wine Branch: master Commit: de5972081eb734366aa02d3685c27cfa13144b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5972081eb734366aa02d368… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:06:39 2012 +0800 gdi32: Fixed get_name_table_entry for symbol fonts. --- dlls/gdi32/freetype.c | 3 +-- dlls/gdi32/tests/font.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index efb12a4..9412df2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1146,7 +1146,7 @@ static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req) if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name)) { if((name.platform_id == req->platform_id) && - (name.encoding_id == req->encoding_id) && + ((name.encoding_id == TT_MS_ID_UNICODE_CS) || (name.encoding_id == TT_MS_ID_SYMBOL_CS)) && (name.language_id == req->language_id) && (name.name_id == req->name_id)) { @@ -1168,7 +1168,6 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua FT_SfntName name; name.platform_id = TT_PLATFORM_MICROSOFT; - name.encoding_id = TT_MS_ID_UNICODE_CS; name.language_id = language_id; name.name_id = name_id; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef4e51d..0c67fe7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4151,9 +4151,7 @@ static void test_fullname2_helper(const char *Family) ok(ret, "UNIQUE_ID (full name) could not be read\n"); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - if (efnd.elf[i].elfLogFont.lfCharSet == SYMBOL_CHARSET) - todo_wine ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); - else ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont);

1 0