wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Jacek Caban : vbscript: Skip tests on too old vbscript.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 32d1bb2bbff61cf25cd513f27a593f16d4c8c4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d1bb2bbff61cf25cd513f27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 12 09:35:57 2012 +0200 vbscript: Skip tests on too old vbscript. --- dlls/vbscript/tests/run.c | 6 +++--- dlls/vbscript/tests/vbscript.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 0e292af..9c3725b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1740,13 +1740,13 @@ static void run_tests(void) static BOOL check_vbscript(void) { - IActiveScript *vbscript; + IActiveScriptParseProcedure2 *vbscript; HRESULT hres; hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IActiveScript, (void**)&vbscript); + &IID_IActiveScriptParseProcedure2, (void**)&vbscript); if(SUCCEEDED(hres)) - IActiveScript_Release(vbscript); + IActiveScriptParseProcedure2_Release(vbscript); return hres == S_OK; } diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index ec53712..27153f8 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -774,13 +774,13 @@ static void test_vbscript_initializing(void) static BOOL check_vbscript(void) { - IActiveScript *vbscript; + IActiveScriptParseProcedure2 *vbscript; HRESULT hres; hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IActiveScript, (void**)&vbscript); + &IID_IActiveScriptParseProcedure2, (void**)&vbscript); if(SUCCEEDED(hres)) - IActiveScript_Release(vbscript); + IActiveScriptParseProcedure2_Release(vbscript); return hres == S_OK; } @@ -797,7 +797,7 @@ START_TEST(vbscript) test_vbscript_initializing(); test_scriptdisp(); }else { - win_skip("VBScript engine not available\n"); + win_skip("VBScript engine not available or too old\n"); } CoUninitialize();

1 0

Michael Stefaniuc : ntdll: Always set a valid SUB_Q_HEADER AudioStatus for CD-ROMs.
by Alexandre Julliard 12 Sep '12

12 Sep '12

Module: wine Branch: master Commit: 3454bdc07c06310aee281ffbf56a284a1855b18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3454bdc07c06310aee281ffbf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 12 00:17:50 2012 +0200 ntdll: Always set a valid SUB_Q_HEADER AudioStatus for CD-ROMs. --- dlls/ntdll/cdrom.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 87e0695..ea7f01a 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -924,7 +924,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA break; default: TRACE("status=%02X !\n", sc.cdsc_audiostatus); - break; + hdr->AudioStatus = AUDIO_STATUS_NO_STATUS; } switch (fmt->Format) { @@ -1035,6 +1035,7 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA break; default: TRACE("status=%02X !\n", sc.header.audio_status); + hdr->AudioStatus = AUDIO_STATUS_NO_STATUS; } switch (fmt->Format) {

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

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

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

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

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

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

Hans Leidekker : msi: Only remove a component if the number of clients drops to zero.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 1ee3be6e8092af933d5a4e09fc3503fc1bea4001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee3be6e8092af933d5a4e09f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 11 16:20:59 2012 +0200 msi: Only remove a component if the number of clients drops to zero. --- dlls/msi/action.c | 47 +++++++++++++++++++++++++++++++++++++++++------ dlls/msi/msipriv.h | 1 + 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f874528..845a0fd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -809,6 +809,11 @@ INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) return INSTALLSTATE_UNKNOWN; } if (package->need_rollback) return comp->Installed; + if (comp->num_clients > 0 && comp->ActionRequest == INSTALLSTATE_ABSENT) + { + TRACE("%s has %u clients left\n", debugstr_w(comp->Component), comp->num_clients); + return comp->Installed; + } return comp->ActionRequest; } @@ -1620,6 +1625,27 @@ static UINT ACTION_FileCost(MSIPACKAGE *package) return ERROR_SUCCESS; } +static void get_client_counts( MSIPACKAGE *package ) +{ + MSICOMPONENT *comp; + HKEY hkey; + + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + if (!comp->ComponentId) continue; + + if (MSIREG_OpenUserDataComponentKey( comp->ComponentId, szLocalSid, &hkey, FALSE ) && + MSIREG_OpenUserDataComponentKey( comp->ComponentId, NULL, &hkey, FALSE )) + { + comp->num_clients = 0; + continue; + } + RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, NULL, (DWORD *)&comp->num_clients, + NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + } +} + static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) { MSICOMPONENT *comp; @@ -1983,6 +2009,11 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) TRACE("component %s (installed %d request %d action %d)\n", debugstr_w(component->Component), component->Installed, component->ActionRequest, component->Action); + + if (component->Action == INSTALLSTATE_LOCAL || component->Action == INSTALLSTATE_SOURCE) + component->num_clients++; + else if (component->Action == INSTALLSTATE_ABSENT) + component->num_clients--; } return ERROR_SUCCESS; @@ -2368,6 +2399,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) else comp->Enabled = TRUE; } + get_client_counts( package ); /* read components states from the registry */ ACTION_GetComponentInstallStates(package); @@ -3307,9 +3339,9 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (package->need_rollback) action = comp->Installed; else action = comp->ActionRequest; - TRACE("Component %s (%s), Keypath=%s, RefCount=%u Action=%u\n", + TRACE("Component %s (%s) Keypath=%s RefCount=%u Clients=%u Action=%u\n", debugstr_w(comp->Component), debugstr_w(squished_cc), - debugstr_w(comp->FullKeypath), comp->RefCount, action); + debugstr_w(comp->FullKeypath), comp->RefCount, comp->num_clients, action); if (action == INSTALLSTATE_LOCAL || action == INSTALLSTATE_SOURCE) { @@ -3372,10 +3404,13 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } else if (action == INSTALLSTATE_ABSENT) { - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid); - else - MSIREG_DeleteUserDataComponentKey(comp->ComponentId, NULL); + if (comp->num_clients <= 0) + { + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + MSIREG_DeleteUserDataComponentKey( comp->ComponentId, szLocalSid ); + else + MSIREG_DeleteUserDataComponentKey( comp->ComponentId, NULL ); + } } /* UI stuff */ diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 43ac194..73bccecd 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -481,6 +481,7 @@ typedef struct tagMSICOMPONENT LPWSTR FullKeypath; LPWSTR AdvertiseString; MSIASSEMBLY *assembly; + int num_clients; unsigned int anyAbsent:1; unsigned int hasAdvertiseFeature:1;

1 0

Piotr Caban : msvcp80: Fixed ctype_short__Getcat implementation.
by Alexandre Julliard 11 Sep '12

11 Sep '12

Module: wine Branch: master Commit: 7ee9bb5c4109175834da76230a97a198fce0722a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee9bb5c4109175834da76230… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 11 16:09:10 2012 +0200 msvcp80: Fixed ctype_short__Getcat implementation. --- dlls/msvcp80/msvcp80.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp80/msvcp80.c b/dlls/msvcp80/msvcp80.c index 78573d2..7dcc104 100644 --- a/dlls/msvcp80/msvcp80.c +++ b/dlls/msvcp80/msvcp80.c @@ -125,7 +125,7 @@ static BOOL init_funcs(void) pcollate_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$collate@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"); pctype_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"); pctype_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"); - pctype_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr"); + pctype_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype@G@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"); pcodecvt_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"); pnumpunct_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z"); pnumpunct_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z");

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012