wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Vincent Povirk : wineboot: Terminate processes immediately after WM_ENDSESSION.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 0926dd96f69abc970709b4e5314e80c08c7d8d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0926dd96f69abc970709b4e53… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 10 12:35:18 2009 -0600 wineboot: Terminate processes immediately after WM_ENDSESSION. Once a process returns from WM_ENDSESSION, we can assume it has finished doing any cleanup it needs but will most likely not shut down on its own. --- programs/wineboot/shutdown.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index 49c03c2..ed80bf0 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MESSAGE_TIMEOUT 5000 -#define PROCQUIT_TIMEOUT 20000 struct window_info { @@ -278,12 +277,13 @@ static DWORD_PTR send_end_session_messages( struct window_info *win, UINT count, return 1; } - /* wait for app to quit on its own for a while */ - ret = WaitForSingleObject( process_handle, PROCQUIT_TIMEOUT ); + /* Check whether the app quit on its own */ + ret = WaitForSingleObject( process_handle, 0 ); CloseHandle( process_handle ); if (ret == WAIT_TIMEOUT) { - /* it didn't quit by itself in time, so terminate it with extreme prejudice */ + /* If not, it returned from all WM_ENDSESSION and is finished cleaning + * up, so we can safely kill the process. */ HANDLE handle = OpenProcess( PROCESS_TERMINATE, FALSE, win[0].pid ); if (handle) {

1 0

Vincent Povirk : wineboot: Do not force --kill when --end-session is set.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: decf64b86c437303f2cec6a3a4b009d2f9448974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=decf64b86c437303f2cec6a3a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 10 12:19:49 2009 -0600 wineboot: Do not force --kill when --end-session is set. The --kill switch ends processes from all desktops, but --end-session only applies to the current desktop. This causes windows from other desktops to dangerously close without notification that the session is ending. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 2587ef5..60a51b7 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -956,7 +956,7 @@ int main( int argc, char *argv[] ) { switch(optc) { - case 'e': end_session = kill = 1; break; + case 'e': end_session = 1; break; case 'f': force = 1; break; case 'i': init = 1; break; case 'k': kill = 1; break;

1 0

Juan Lang : crypt32: Fix CertAddCTLContextToStore for CERT_STORE_ADD_USE_EXISTING add disposition .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 7a610a907241f37e3df21edf0396492eb8d42946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a610a907241f37e3df21edf0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 10 09:06:39 2009 -0800 crypt32: Fix CertAddCTLContextToStore for CERT_STORE_ADD_USE_EXISTING add disposition. --- dlls/crypt32/ctl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 44b517a..40895fa 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -113,7 +113,13 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, break; case CERT_STORE_ADD_USE_EXISTING: if (existing) + { CtlContext_CopyProperties(existing, pCtlContext); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCTLContext(existing); + } + else + toAdd = CertDuplicateCTLContext(pCtlContext); break; default: FIXME("Unimplemented add disposition %d\n", dwAddDisposition);

1 0

Juan Lang : crypt32: Fix CertAddCRLContextToStore for CERT_STORE_ADD_USE_EXISTING add disposition .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: c7609f3c55ba93dcef98a509eefee9b810cd849f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7609f3c55ba93dcef98a509e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 10 09:06:10 2009 -0800 crypt32: Fix CertAddCRLContextToStore for CERT_STORE_ADD_USE_EXISTING add disposition. --- dlls/crypt32/store.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 9d670f9..153d3aa 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1091,7 +1091,13 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, break; case CERT_STORE_ADD_USE_EXISTING: if (existing) + { CrlContext_CopyProperties(existing, pCrlContext); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCRLContext(existing); + } + else + toAdd = CertDuplicateCRLContext(pCrlContext); break; default: FIXME("Unimplemented add disposition %d\n", dwAddDisposition);

1 0

Juan Lang : crypt32: Don't dereference an output pointer which may be NULL.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 0444cd93c42a61c66074007720e6280b0221c229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0444cd93c42a61c6607400772… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 10 08:58:20 2009 -0800 crypt32: Don't dereference an output pointer which may be NULL. --- dlls/crypt32/store.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 3a786b0..9d670f9 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -899,7 +899,8 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, if (existing) { CertContext_CopyProperties(existing, pCertContext); - *ppStoreContext = CertDuplicateCertificateContext(existing); + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(existing); } else toAdd = CertDuplicateCertificateContext(pCertContext);

1 0

Juan Lang : crypt32: Trace chain final error status.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 1740d9fe44f427dab5828afd851fec8ce64f404a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1740d9fe44f427dab5828afd8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 10 07:49:05 2009 -0800 crypt32: Trace chain final error status. --- dlls/crypt32/chain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5cc46b7..dd92af2 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2641,6 +2641,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, if (!pChain->TrustStatus.dwErrorStatus) CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); CRYPT_CheckUsages(pChain, pChainPara); + TRACE_(chain)("error status: %08x\n", + pChain->TrustStatus.dwErrorStatus); if (ppChainContext) *ppChainContext = pChain; else

1 0

Paul Vriens : comctl32/tests: Fix a test failure on older comctl32.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 1d0e02b63e3680ff38393e1e2af0c40ce8ff6d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0e02b63e3680ff38393e1e2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 10 16:23:31 2009 +0100 comctl32/tests: Fix a test failure on older comctl32. --- dlls/comctl32/tests/datetime.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index a871930..a97ab34 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -667,7 +667,8 @@ static void test_wm_set_get_text(void) ret = SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)a_str); ok(CB_ERR == ret || - broken(1 == ret), /* comctl32 <= 4.72 */ + broken(0 == ret) || /* comctl32 <= 4.72 */ + broken(1 == ret), /* comctl32 <= 4.70 */ "Expected CB_ERR, got %ld\n", ret); buff[0] = 0;

1 0

Maarten Lankhorst : mmdevapi: Add initial mmdevapi dll.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: a9a3a8e15516ad982a6ed28cc72cc835b10aee15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a3a8e15516ad982a6ed28cc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 15:38:43 2009 +0100 mmdevapi: Add initial mmdevapi dll. --- configure | 9 ++ configure.ac | 1 + dlls/mmdevapi/Makefile.in | 14 ++++ dlls/mmdevapi/main.c | 59 ++++++++++++++ dlls/mmdevapi/mmdevapi.spec | 19 +++++ dlls/mmdevapi/regsvr.c | 181 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 7 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9a3a8e15516ad982a6ed…

1 0

Maarten Lankhorst : dsound: Only initialize one guid for capture and renderer.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: b474649e0e9491f938f1daec74cdca01343dd97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b474649e0e9491f938f1daec7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 15:49:12 2009 +0100 dsound: Only initialize one guid for capture and renderer. --- dlls/dsound/capture.c | 11 ++---- dlls/dsound/dsound.c | 10 ++--- dlls/dsound/dsound_main.c | 76 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 5 +-- dlls/dsound/propset.c | 14 ++++--- 5 files changed, 56 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b474649e0e9491f938f1d…

1 0

Alexandre Julliard : dbghelp: Fix an invalid pointer cast.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 891d025639bbd5dcfe27364cceb6e858cb2db2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891d025639bbd5dcfe27364cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 15:31:27 2009 +0100 dbghelp: Fix an invalid pointer cast. --- dlls/dbghelp/dbghelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 1f9f0f8..b501425 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -524,7 +524,7 @@ BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) case CBA_DEFERRED_SYMBOL_LOAD_FAILURE: case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL: case CBA_DEFERRED_SYMBOL_LOAD_START: - idslW = (IMAGEHLP_DEFERRED_SYMBOL_LOADW64*)(DWORD)data; + idslW = data; idsl.SizeOfStruct = sizeof(idsl); idsl.BaseOfImage = idslW->BaseOfImage; idsl.CheckSum = idslW->CheckSum;

1 0

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 December 2009