September 2012 - Wine-commits

James Eder : ntdll: Remove outdated comment.
by Alexandre Julliard 11 Sep '12

11 Sep '12

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

Alexandre Julliard : server: Ignore color-keyed windows when updating the z-order.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 43d465f86a083a3b1481c421a667630f9a35e067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d465f86a083a3b1481c421a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 18:12:16 2012 +0200 server: Ignore color-keyed windows when updating the z-order. --- server/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index b6fcde0..47b94e2 100644 --- a/server/window.c +++ b/server/window.c @@ -2471,6 +2471,7 @@ DECL_HANDLER(update_window_zorder) if (ptr == win) break; if (!(ptr->style & WS_VISIBLE)) continue; if (ptr->ex_style & WS_EX_TRANSPARENT) continue; + if (ptr->is_layered && (ptr->layered_flags & LWA_COLORKEY)) continue; if (!intersect_rect( &tmp, &ptr->visible_rect, &rect )) continue; if (ptr->win_region) {

1 0

Alexandre Julliard : user32: Check for the need to flush window surfaces every time a window finishes painting .
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 1a4a1e53233f5313e969fadd9cac006dd97c162a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4a1e53233f5313e969fadd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 19:14:05 2012 +0200 user32: Check for the need to flush window surfaces every time a window finishes painting. --- dlls/user32/painting.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 4def070..1a6de87 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -805,7 +805,6 @@ void move_window_bits( HWND hwnd, struct window_surface *old_surface, static void update_now( HWND hwnd, UINT rdw_flags ) { HWND child = 0; - int count = 0; /* desktop window never gets WM_PAINT, only WM_ERASEBKGND */ if (hwnd == GetDesktopWindow()) erase_now( hwnd, rdw_flags | RDW_NOCHILDREN ); @@ -822,10 +821,8 @@ static void update_now( HWND hwnd, UINT rdw_flags ) if (!flags) break; /* nothing more to do */ SendMessageW( child, WM_PAINT, 0, 0 ); - count++; if (rdw_flags & RDW_NOCHILDREN) break; } - if (count) flush_window_surfaces( FALSE ); } @@ -936,6 +933,7 @@ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) if (!lps) return FALSE; release_dc( hwnd, lps->hdc, TRUE ); ShowCaret( hwnd ); + flush_window_surfaces( FALSE ); return TRUE; }

1 0

Marcus Meissner : kernel32: Add condition variables prototypes and tests.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 7a529328dbb2da8333e565f40503be4e871fc744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a529328dbb2da8333e565f40… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Sep 3 13:54:46 2012 +0200 kernel32: Add condition variables prototypes and tests. --- dlls/kernel32/tests/sync.c | 116 ++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 8 +++ include/winnt.h | 6 ++ 3 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 5ce8f09..02c023a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -42,6 +42,11 @@ static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVO static BOOL (WINAPI *pInitOnceBeginInitialize)(PINIT_ONCE,DWORD,BOOL*,LPVOID*); static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); +static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); +static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); +static VOID (WINAPI *pWakeAllConditionVariable)(PCONDITION_VARIABLE); +static VOID (WINAPI *pWakeConditionVariable)(PCONDITION_VARIABLE); + static void test_signalandwait(void) { DWORD (WINAPI *pSignalObjectAndWait)(HANDLE, HANDLE, DWORD, BOOL); @@ -1238,6 +1243,112 @@ static void test_initonce(void) ok(initonce.Ptr == (void*)0xdeadbee2, "got %p\n", initonce.Ptr); } +static CONDITION_VARIABLE buffernotempty,buffernotfull; +static CRITICAL_SECTION buffercrit; +static BOOL condvar_stop = FALSE, condvar_sleeperr = FALSE; +static LONG bufferlen,totalproduced,totalconsumed; +static LONG condvar_producer_sleepcnt,condvar_consumer_sleepcnt; + +#define BUFFER_SIZE 10 + +static DWORD WINAPI condvar_producer(LPVOID x) { + while (1) { + Sleep(rand() % 10); + + EnterCriticalSection(&buffercrit); + while ((bufferlen == BUFFER_SIZE) && !condvar_stop) { + condvar_producer_sleepcnt++; + if (!pSleepConditionVariableCS(&buffernotfull, &buffercrit, 2000)) + condvar_sleeperr = TRUE; + } + if (condvar_stop) { + LeaveCriticalSection(&buffercrit); + break; + } + bufferlen++; + totalproduced++; + LeaveCriticalSection(&buffercrit); + pWakeConditionVariable(&buffernotempty); + } + return 0; +} + +static DWORD WINAPI condvar_consumer(LPVOID x) { + DWORD *cnt = (DWORD*)x; + + while (1) { + EnterCriticalSection(&buffercrit); + while ((bufferlen == 0) && !condvar_stop) { + condvar_consumer_sleepcnt++; + if (!pSleepConditionVariableCS (&buffernotempty, &buffercrit, 2000)) + condvar_sleeperr = TRUE; + } + if (condvar_stop && (bufferlen == 0)) { + LeaveCriticalSection(&buffercrit); + break; + } + bufferlen--; + totalconsumed++; + (*cnt)++; + LeaveCriticalSection(&buffercrit); + pWakeConditionVariable(&buffernotfull); + Sleep(rand() % 10); + } + return 0; +} + +static void test_condvars(void) +{ + HANDLE hp1,hp2,hc1,hc2; + DWORD dummy; + DWORD cnt1,cnt2; + + if (!pInitializeConditionVariable) { + /* function is not yet in XP, only in newer Windows */ + /* and not yet implemented in Wine for some days/weeks */ + todo_wine win_skip("no condition variable support.\n"); + return; + } + + /* Implement a producer / consumer scheme with non-full / non-empty triggers */ + pInitializeConditionVariable(&buffernotfull); + pInitializeConditionVariable(&buffernotempty); + InitializeCriticalSection(&buffercrit); + bufferlen = totalproduced = totalconsumed = cnt1 = cnt2 = 0; + + hp1 = CreateThread(NULL, 0, condvar_producer, NULL, 0, &dummy); + hp2 = CreateThread(NULL, 0, condvar_producer, NULL, 0, &dummy); + hc1 = CreateThread(NULL, 0, condvar_consumer, (PVOID)&cnt1, 0, &dummy); + hc2 = CreateThread(NULL, 0, condvar_consumer, (PVOID)&cnt2, 0, &dummy); + + /* Limit run to 0.5 seconds. */ + Sleep(500); + + /* tear down start */ + condvar_stop = TRUE; + + /* final wake up call */ + pWakeAllConditionVariable (&buffernotfull); + pWakeAllConditionVariable (&buffernotempty); + + WaitForSingleObject(hp1, 1000); + WaitForSingleObject(hp2, 1000); + WaitForSingleObject(hc1, 1000); + WaitForSingleObject(hc2, 1000); + + ok(totalconsumed == totalproduced, + "consumed %d != produced %d\n", totalconsumed, totalproduced); + ok (!condvar_sleeperr, "error occured during SleepConditionVariableCS\n"); + + /* Checking cnt1 - cnt2 for non-0 would be not good, the case where + * one consumer does not get anything to do is possible. */ + trace("produced %d, c1 %d, c2 %d\n", totalproduced, cnt1, cnt2); + /* The sleeps of the producer or consumer should not go above 100* produced count, + * otherwise the implementation does not sleep correctly. But yet again, this is + * not hard defined. */ + trace("producer sleep %d, consumer sleep %d\n", condvar_producer_sleepcnt, condvar_consumer_sleepcnt); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1254,6 +1365,10 @@ START_TEST(sync) pInitOnceExecuteOnce = (void *)GetProcAddress(hdll, "InitOnceExecuteOnce"); pInitOnceBeginInitialize = (void *)GetProcAddress(hdll, "InitOnceBeginInitialize"); pInitOnceComplete = (void *)GetProcAddress(hdll, "InitOnceComplete"); + pInitializeConditionVariable = (void *)GetProcAddress(hdll, "InitializeConditionVariable"); + pSleepConditionVariableCS = (void *)GetProcAddress(hdll, "SleepConditionVariableCS"); + pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); + pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); test_signalandwait(); test_mutex(); @@ -1266,4 +1381,5 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); + test_condvars(); } diff --git a/include/winbase.h b/include/winbase.h index 619120e..c1e62a3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -63,6 +63,10 @@ typedef PRTL_SRWLOCK PSRWLOCK; typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK; +#define CONDITION_VARIABLE_INIT RTL_CONDITION_VARIABLE_INIT +#define CONDITION_VARIABLE_LOCKMODE_SHARED RTL_CONDITION_VARIABLE_LOCKMODE_SHARED +typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE; + #define EXCEPTION_DEBUG_EVENT 1 #define CREATE_THREAD_DEBUG_EVENT 2 #define CREATE_PROCESS_DEBUG_EVENT 3 @@ -1880,6 +1884,7 @@ WINBASEAPI BOOL WINAPI HeapValidate(HANDLE,DWORD,LPCVOID); WINBASEAPI BOOL WINAPI HeapWalk(HANDLE,LPPROCESS_HEAP_ENTRY); WINBASEAPI BOOL WINAPI InitAtomTable(DWORD); WINADVAPI BOOL WINAPI InitializeAcl(PACL,DWORD,DWORD); +WINBASEAPI VOID WINAPI InitializeConditionVariable(PCONDITION_VARIABLE); WINBASEAPI void WINAPI InitializeCriticalSection(CRITICAL_SECTION *lpCrit); WINBASEAPI BOOL WINAPI InitializeCriticalSectionAndSpinCount(CRITICAL_SECTION *,DWORD); WINBASEAPI BOOL WINAPI InitializeCriticalSectionEx(CRITICAL_SECTION *,DWORD,DWORD); @@ -2172,6 +2177,7 @@ WINBASEAPI BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD); WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC); WINBASEAPI VOID WINAPI Sleep(DWORD); +WINBASEAPI BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); WINBASEAPI DWORD WINAPI SleepEx(DWORD,BOOL); WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID); @@ -2224,6 +2230,8 @@ WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe) +WINBASEAPI VOID WINAPI WakeAllConditionVariable(PCONDITION_VARIABLE); +WINBASEAPI VOID WINAPI WakeConditionVariable(PCONDITION_VARIABLE); WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); diff --git a/include/winnt.h b/include/winnt.h index 5625e37..5106701 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5082,6 +5082,12 @@ typedef struct _RTL_SRWLOCK { #define RTL_SRWLOCK_INIT {0} +typedef struct _RTL_CONDITION_VARIABLE { + PVOID Ptr; +} RTL_CONDITION_VARIABLE, *PRTL_CONDITION_VARIABLE; +#define RTL_CONDITION_VARIABLE_INIT {0} +#define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1 + typedef VOID (NTAPI * WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); typedef VOID (NTAPI * PFLS_CALLBACK_FUNCTION) ( PVOID );

1 0

Charles Davis : configure: Prefer stabs debug info on Mac OS.
by Alexandre Julliard 11 Sep '12

11 Sep '12

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

Charles Davis : configure: Fix ipstat tests to work on Mac OS.
by Alexandre Julliard 11 Sep '12

11 Sep '12

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

Dmitry Timoshkov : windowscodecs: Implement Image Descriptor metadata reader.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 97fc6be67da0c086e8fbe56e409884c5dfb8e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fc6be67da0c086e8fbe56e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 11 16:49:50 2012 +0900 windowscodecs: Implement Image Descriptor metadata reader. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 94 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 +++++++ dlls/windowscodecs/tests/metadata.c | 1 - dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++ 6 files changed, 128 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 3f1328c..dc70c04 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -63,6 +63,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, + {&CLSID_WICIMDMetadataReader, IMDReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index c4ee566..f6a7d27 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -146,6 +146,100 @@ HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&LSDReader_Vtbl, pUnkOuter, iid, ppv); } +static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD options, + MetadataItem **items, DWORD *count) +{ + struct image_descriptor + { + USHORT left; + USHORT top; + USHORT width; + USHORT height; + BYTE packed; + /* local_color_table_flag : 1; + * interlace_flag : 1; + * sort_flag : 1; + * reserved : 2; + * local_color_table_size : 3; + */ + } imd_data; + HRESULT hr; + ULONG bytesread, i; + MetadataItem *result; + + *items = NULL; + *count = 0; + + hr = IStream_Read(stream, &imd_data, sizeof(imd_data), &bytesread); + if (FAILED(hr) || bytesread != sizeof(imd_data)) return S_OK; + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 8); + if (!result) return E_OUTOFMEMORY; + + for (i = 0; i < 8; i++) + { + PropVariantInit(&result[i].schema); + PropVariantInit(&result[i].id); + PropVariantInit(&result[i].value); + } + + result[0].id.vt = VT_LPWSTR; + result[0].id.u.pwszVal = strdupAtoW("Left"); + result[0].value.vt = VT_UI2; + result[0].value.u.uiVal = imd_data.left; + + result[1].id.vt = VT_LPWSTR; + result[1].id.u.pwszVal = strdupAtoW("Top"); + result[1].value.vt = VT_UI2; + result[1].value.u.uiVal = imd_data.top; + + result[2].id.vt = VT_LPWSTR; + result[2].id.u.pwszVal = strdupAtoW("Width"); + result[2].value.vt = VT_UI2; + result[2].value.u.uiVal = imd_data.width; + + result[3].id.vt = VT_LPWSTR; + result[3].id.u.pwszVal = strdupAtoW("Height"); + result[3].value.vt = VT_UI2; + result[3].value.u.uiVal = imd_data.height; + + result[4].id.vt = VT_LPWSTR; + result[4].id.u.pwszVal = strdupAtoW("LocalColorTableFlag"); + result[4].value.vt = VT_BOOL; + result[4].value.u.boolVal = (imd_data.packed >> 7) & 1; + + result[5].id.vt = VT_LPWSTR; + result[5].id.u.pwszVal = strdupAtoW("InterlaceFlag"); + result[5].value.vt = VT_BOOL; + result[5].value.u.boolVal = (imd_data.packed >> 6) & 1; + + result[6].id.vt = VT_LPWSTR; + result[6].id.u.pwszVal = strdupAtoW("SortFlag"); + result[6].value.vt = VT_BOOL; + result[6].value.u.boolVal = (imd_data.packed >> 5) & 1; + + result[7].id.vt = VT_LPWSTR; + result[7].id.u.pwszVal = strdupAtoW("LocalColorTableSize"); + result[7].value.vt = VT_UI1; + result[7].value.u.bVal = imd_data.packed & 7; + + *items = result; + *count = 8; + + return S_OK; +} + +static const MetadataHandlerVtbl IMDReader_Vtbl = { + 0, + &CLSID_WICIMDMetadataReader, + load_IMD_metadata +}; + +HRESULT IMDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&IMDReader_Vtbl, pUnkOuter, iid, ppv); +} + typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index cb48d63..c232778 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1532,6 +1532,21 @@ static const struct reader_containers lsd_containers[] = { { NULL } /* list terminator */ }; +static const BYTE imd_magic[] = { 0x2c }; + +static const struct metadata_pattern imd_metadata_pattern[] = { + { 0, 1, imd_magic, mask_all, 1 }, + { 0 } +}; + +static const struct reader_containers imd_containers[] = { + { + &GUID_ContainerFormatGif, + imd_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, "The Wine Project", @@ -1573,6 +1588,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, lsd_containers }, + { &CLSID_WICIMDMetadataReader, + "The Wine Project", + "Image Descriptor Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatIMD, + 0, 0, 0, + imd_containers + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index fd81e6f..bfa9116 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1365,7 +1365,6 @@ static void test_metadata_IMD(void) hr = CoCreateInstance(&CLSID_WICIMDMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, "CoCreateInstance error %#x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 908b2e6..e26eec0 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -96,5 +96,6 @@ extern HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID extern HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT PngTextReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT IMDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index d360ae5..942cbb7 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -149,3 +149,10 @@ coclass WICPngTextMetadataReader { interface IWICMetadataReader; } uuid(41070793-59e4-479a-a1f7-954adc2ef5fc) ] coclass WICLSDMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC IMD Metadata Reader"), + threading(both), + uuid(7447a267-0015-42c8-a8f1-fb3b94c68361) +] +coclass WICIMDMetadataReader { interface IWICMetadataReader; }

1 0

Dmitry Timoshkov : windowscodecs: Implement Graphic Control Extension metadata reader.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 26628b4c0a5cac045303470124bcd5b5a7eb08f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26628b4c0a5cac04530347012… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 11 16:50:42 2012 +0900 windowscodecs: Implement Graphic Control Extension metadata reader. --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/gifformat.c | 78 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 ++++++++ dlls/windowscodecs/tests/metadata.c | 1 - dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 ++ 6 files changed, 112 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index dc70c04..a42aeab 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -64,6 +64,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, {&CLSID_WICIMDMetadataReader, IMDReader_CreateInstance}, + {&CLSID_WICGCEMetadataReader, GCEReader_CreateInstance}, {0}}; typedef struct { diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index f6a7d27..318dc5d 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -240,6 +240,84 @@ HRESULT IMDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&IMDReader_Vtbl, pUnkOuter, iid, ppv); } +static HRESULT load_GCE_metadata(IStream *stream, const GUID *vendor, DWORD options, + MetadataItem **items, DWORD *count) +{ +#include "pshpack1.h" + struct graphic_control_extenstion + { + BYTE packed; + /* reservred: 3; + * disposal : 3; + * user_input_flag : 1; + * transparency_flag : 1; + */ + USHORT delay; + BYTE transparent_color_index; + } gce_data; +#include "poppack.h" + HRESULT hr; + ULONG bytesread, i; + MetadataItem *result; + + *items = NULL; + *count = 0; + + hr = IStream_Read(stream, &gce_data, sizeof(gce_data), &bytesread); + if (FAILED(hr) || bytesread != sizeof(gce_data)) return S_OK; + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem) * 5); + if (!result) return E_OUTOFMEMORY; + + for (i = 0; i < 5; i++) + { + PropVariantInit(&result[i].schema); + PropVariantInit(&result[i].id); + PropVariantInit(&result[i].value); + } + + result[0].id.vt = VT_LPWSTR; + result[0].id.u.pwszVal = strdupAtoW("Disposal"); + result[0].value.vt = VT_UI1; + result[0].value.u.bVal = (gce_data.packed >> 2) & 7; + + result[1].id.vt = VT_LPWSTR; + result[1].id.u.pwszVal = strdupAtoW("UserInputFlag"); + result[1].value.vt = VT_BOOL; + result[1].value.u.boolVal = (gce_data.packed >> 1) & 1; + + result[2].id.vt = VT_LPWSTR; + result[2].id.u.pwszVal = strdupAtoW("TransparencyFlag"); + result[2].value.vt = VT_BOOL; + result[2].value.u.boolVal = gce_data.packed & 1; + + result[3].id.vt = VT_LPWSTR; + result[3].id.u.pwszVal = strdupAtoW("Delay"); + result[3].value.vt = VT_UI2; + result[3].value.u.uiVal = gce_data.delay; + + result[4].id.vt = VT_LPWSTR; + result[4].id.u.pwszVal = strdupAtoW("TransparentColorIndex"); + result[4].value.vt = VT_UI1; + result[4].value.u.bVal = gce_data.transparent_color_index; + + *items = result; + *count = 5; + + return S_OK; +} + +static const MetadataHandlerVtbl GCEReader_Vtbl = { + 0, + &CLSID_WICGCEMetadataReader, + load_GCE_metadata +}; + +HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) +{ + return MetadataReader_Create(&GCEReader_Vtbl, pUnkOuter, iid, ppv); +} + typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c232778..a7ac4b2 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1547,6 +1547,21 @@ static const struct reader_containers imd_containers[] = { { NULL } /* list terminator */ }; +static const BYTE gce_magic[] = { 0x21, 0xf9, 0x04 }; + +static const struct metadata_pattern gce_metadata_pattern[] = { + { 0, 3, gce_magic, mask_all, 3 }, + { 0 } +}; + +static const struct reader_containers gce_containers[] = { + { + &GUID_ContainerFormatGif, + gce_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static struct regsvr_metadatareader const metadatareader_list[] = { { &CLSID_WICUnknownMetadataReader, "The Wine Project", @@ -1598,6 +1613,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 0, 0, 0, imd_containers }, + { &CLSID_WICGCEMetadataReader, + "The Wine Project", + "Graphic Control Extension Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatGCE, + 0, 0, 0, + gce_containers + }, { NULL } /* list terminator */ }; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index bfa9116..e274106 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1440,7 +1440,6 @@ static void test_metadata_GCE(void) hr = CoCreateInstance(&CLSID_WICGCEMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void **)&reader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, "CoCreateInstance error %#x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index e26eec0..b712b2f 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -97,5 +97,6 @@ extern HRESULT IfdMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, extern HRESULT PngTextReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT IMDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT GCEReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) DECLSPEC_HIDDEN; #endif /* WINCODECS_PRIVATE_H */ diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 942cbb7..e109bf2 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -156,3 +156,10 @@ coclass WICLSDMetadataReader { interface IWICMetadataReader; } uuid(7447a267-0015-42c8-a8f1-fb3b94c68361) ] coclass WICIMDMetadataReader { interface IWICMetadataReader; } + +[ + helpstring("WIC GCE Metadata Reader"), + threading(both), + uuid(b92e345d-f52d-41f3-b562-081bc772e3b9) +] +coclass WICGCEMetadataReader { interface IWICMetadataReader; }

1 0

Qian Hong : gdi32/tests: Fixed a typo in style name test.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: e7dcb0e26027634c112a195b51416b2e1f419c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7dcb0e26027634c112a195b5… Author: Qian Hong <fracting(a)gmail.com> Date: Tue Sep 11 01:04:52 2012 +0800 gdi32/tests: Fixed a typo in style name test. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3f7af21..22c3209 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4135,7 +4135,7 @@ static void test_fullname2_helper(const char *Family) 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", FaceName, bufA); + ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName; ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr);

1 0

Qian Hong : gdi32/tests: Better trace in test_fullname2_helper.
by Alexandre Julliard 11 Sep '12

11 Sep '12

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