December 2009 - Wine-commits

Vincent Povirk : ole32: Add a stub transacted storage type.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: d799f7e18962669c445aebdf06dac3befa888e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799f7e18962669c445aebdf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 10:59:47 2009 -0600 ole32: Add a stub transacted storage type. TransactedSnapshotImpl acts as a proxy between the user and the storage interfaces that modify the file directly (or another transacted storage). Currently, it does not change the operations. --- dlls/ole32/storage32.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ole32/storage32.h | 5 + 2 files changed, 271 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d799f7e18962669c445ae…

1 0

Vincent Povirk : ole32: Implement transacted storage.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 226363f5dfb9caa8313e425c7f85ed9fe581f1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=226363f5dfb9caa8313e425c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 17:33:50 2009 -0600 ole32: Implement transacted storage. --- dlls/ole32/storage32.c | 214 +++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/storage32.c | 8 +- 2 files changed, 201 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=226363f5dfb9caa8313e4…

1 0

Vincent Povirk : ole32: Implement Revert for transacted storage objects.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 3ff33e9303df1696c1d87c21a95fe06159dc9c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff33e9303df1696c1d87c21a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 18:02:59 2009 -0600 ole32: Implement Revert for transacted storage objects. --- dlls/ole32/storage32.c | 18 +++++++++++++++++- dlls/ole32/tests/storage32.c | 12 +++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bd755e9..479c2a5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4044,7 +4044,23 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( static HRESULT WINAPI TransactedSnapshotImpl_Revert( IStorage* iface) { - FIXME("(%p): stub\n", iface); + TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; + StorageBaseImpl *newSnapshot; + HRESULT hr; + + TRACE("(%p)\n", iface); + + /* Create a new copy of the parent data. */ + hr = CreateSnapshotFile(This->transactedParent, &newSnapshot); + if (FAILED(hr)) return hr; + + /* Destroy the open objects. */ + StorageBaseImpl_DeleteAll(&This->base); + + /* Replace our current snapshot. */ + IStorage_Release((IStorage*)This->snapshot); + This->snapshot = newSnapshot; + return S_OK; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0494369..f89a787 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1195,7 +1195,6 @@ static void test_revert(void) r = IStorage_Revert(stg); /* all open objects become invalid */ - todo_wine { r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); @@ -1207,7 +1206,6 @@ static void test_revert(void) r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); - } IStream_Release(stm); IStream_Release(stm2); @@ -1226,17 +1224,13 @@ static void test_revert(void) r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); - todo_wine { r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); - } if (r == S_OK) IStream_Release(stm); - todo_wine { r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); - } if (r == S_OK) IStorage_Release(stg2); @@ -1258,7 +1252,7 @@ static void test_revert(void) IStorage_Release(stg3); r = IStorage_OpenStorage(stg2, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); if (r == S_OK) IStorage_Release(stg3); @@ -1398,7 +1392,7 @@ static void test_nonroot_transacted(void) IStream_Release(stm); r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -1460,7 +1454,7 @@ static void test_nonroot_transacted(void) IStream_Release(stm); r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm);

1 0

Marcus Meissner : jscript: Fixed uninitialized usage of i (Coverity).
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: aaff57da2276083086ea5d84e09ea6e4370db2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaff57da2276083086ea5d84e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 10 23:56:21 2009 +0100 jscript: Fixed uninitialized usage of i (Coverity). --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7819bc4..4f4a87f 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -669,7 +669,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t parser_ctx_t *parser; DispatchEx *function; BSTR *params = NULL; - int i, j=0; + int i=0, j=0; HRESULT hres = S_OK; static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('};

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

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: 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: 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

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

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