October 2008 - Wine-commits

Huw Davies : ole32: Call the object's IPersistStorage_Load() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 3019a8f1950ff163bd7e74418b9e4cae3229fa7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3019a8f1950ff163bd7e74418… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 15:16:49 2008 +0100 ole32: Call the object's IPersistStorage_Load() if the object is running. --- dlls/ole32/defaulthandler.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 87eb932..b20cb01 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1543,9 +1543,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( IPersistStorage* iface, IStorage* pStg) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, pStg); + + hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg); - return IPersistStorage_Load(This->dataCache_PersistStg, pStg); + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_Load(This->pPSDelegate, pStg); + + return hr; }

1 0

Huw Davies : ole32: Call the object's IOleObject_IsUpToData() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: ed28886f9dca9104cdf412dd9928245383c3a6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed28886f9dca9104cdf412dd9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 14:51:39 2008 +0100 ole32: Call the object's IOleObject_IsUpToData() if the object is running. --- dlls/ole32/defaulthandler.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 899ae41..87eb932 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -642,9 +642,13 @@ static HRESULT WINAPI DefaultHandler_Update( static HRESULT WINAPI DefaultHandler_IsUpToDate( IOleObject* iface) { - TRACE("(%p)\n", iface); + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p)\n", iface); - return OLE_E_NOTRUNNING; + if (object_is_running(This)) + return IOleObject_IsUpToDate(This->pOleDelegate); + + return OLE_E_NOTRUNNING; } /************************************************************************

1 0

Huw Davies : ole32: Call the object's IPersistStorage_Save() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 72f82c04eca7699e620435c3ed4596245251989c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f82c04eca7699e620435c3e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 15:37:38 2008 +0100 ole32: Call the object's IPersistStorage_Save() if the object is running. --- dlls/ole32/defaulthandler.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index f300330..7a851ca 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1572,11 +1572,18 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( static HRESULT WINAPI DefaultHandler_IPersistStorage_Save( IPersistStorage* iface, IStorage* pStgSave, - BOOL fSaveAsLoad) + BOOL fSameAsLoad) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)->(%p, %d)\n", iface, pStgSave, fSameAsLoad); - return IPersistStorage_Save(This->dataCache_PersistStg, pStgSave, fSaveAsLoad); + hr = IPersistStorage_Save(This->dataCache_PersistStg, pStgSave, fSameAsLoad); + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_Save(This->pPSDelegate, pStgSave, fSameAsLoad); + + return hr; }

1 0

Huw Davies : ole32: Call the object's IPersistStorage_SaveCompleted() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 89edf3a52f628c8e03a474f575df5f398c69aa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89edf3a52f628c8e03a474f57… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 15:43:39 2008 +0100 ole32: Call the object's IPersistStorage_SaveCompleted() if the object is running. --- dlls/ole32/defaulthandler.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 7a851ca..41a5e92 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1595,9 +1595,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( IPersistStorage* iface, IStorage* pStgNew) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, pStgNew); - return IPersistStorage_SaveCompleted(This->dataCache_PersistStg, pStgNew); + hr = IPersistStorage_SaveCompleted(This->dataCache_PersistStg, pStgNew); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_SaveCompleted(This->pPSDelegate, pStgNew); + + return hr; }

1 0

Huw Davies : ole32: Call the object's IPersistStorage_HandsOffStorage() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 3a0ed83fb00ae595e51d72b8b4d0e22ae0f8a98d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0ed83fb00ae595e51d72b8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 15:46:23 2008 +0100 ole32: Call the object's IPersistStorage_HandsOffStorage() if the object is running. --- dlls/ole32/defaulthandler.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 41a5e92..1af0797 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1616,9 +1616,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( static HRESULT WINAPI DefaultHandler_IPersistStorage_HandsOffStorage( IPersistStorage* iface) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)\n", iface); - return IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); + hr = IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_HandsOffStorage(This->pPSDelegate); + + return hr; }

1 0

Dmitry Timoshkov : winmm: MMIO_ALLOCBUF is ignored if mmioOpen gets a valid buffer.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: d40e003303d4ae2a2239ddfd5ef8b0be61959ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40e003303d4ae2a2239ddfd5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 21 19:27:16 2008 +0900 winmm: MMIO_ALLOCBUF is ignored if mmioOpen gets a valid buffer. Existing tests show that MMIO_ALLOCBUF flag is dropped if a valid buffer is being passed to mmioOpen, that means the buffer is valid in that case. --- dlls/winmm/mmio.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 60b6d0f..a750bf2 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,10 +667,11 @@ HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, refmminfo->wErrorRet = MMIO_SetBuffer(wm, refmminfo->pchBuffer, refmminfo->cchBuffer, 0); if (refmminfo->wErrorRet != MMSYSERR_NOERROR) goto error1; - if (wm->info.fccIOProc == FOURCC_MEM) - wm->bBufferLoaded = TRUE; } + if (wm->info.fccIOProc == FOURCC_MEM && !(wm->info.dwFlags & MMIO_ALLOCBUF)) + wm->bBufferLoaded = TRUE; + /* see mmioDosIOProc for that one */ wm->info.adwInfo[0] = refmminfo->adwInfo[0];

1 0

Huw Davies : ole32: Call the object's own IOleObject_GetUserType() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 5ba96d7ae1a5951887539f0906b265455449d9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba96d7ae1a5951887539f090… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 14:48:38 2008 +0100 ole32: Call the object's own IOleObject_GetUserType() if the object is running. --- dlls/ole32/defaulthandler.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index a744718..899ae41 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -689,6 +689,8 @@ static HRESULT WINAPI DefaultHandler_GetUserType( DefaultHandler *This = impl_from_IOleObject(iface); TRACE("(%p, %d, %p)\n", iface, dwFormOfType, pszUserType); + if (object_is_running(This)) + return IOleObject_GetUserType(This->pOleDelegate, dwFormOfType, pszUserType); return OleRegGetUserType(&This->clsid, dwFormOfType, pszUserType); }

1 0

Paul Bryan Roberts : advapi32: LookupAccountSidW() - handle first user account.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 2981650435019e104da6d8c5c831dd8665550694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2981650435019e104da6d8c5c… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 21:53:24 2008 +0100 advapi32: LookupAccountSidW() - handle first user account. --- dlls/advapi32/security.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a33d6ec..29ff696 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -38,6 +38,7 @@ #include "objbase.h" #include "iads.h" #include "advapi32_misc.h" +#include "lmcons.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1953,12 +1954,6 @@ LookupAccountSidA( DWORD accountSizeW = *accountSize; DWORD domainSizeW = *domainSize; - TRACE("(%s,sid=%s,%p,%p(%u),%p,%p(%u),%p)\n", - debugstr_a(system),debugstr_sid(sid), - account,accountSize,accountSize?*accountSize:0, - domain,domainSize,domainSize?*domainSize:0, - name_use); - if (system) { len = MultiByteToWideChar( CP_ACP, 0, system, -1, NULL, 0 ); systemW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); @@ -2022,6 +2017,7 @@ LookupAccountSidW( const WCHAR * dm = NULL; SID_NAME_USE use = 0; LPWSTR computer_name = NULL; + LPWSTR account_name = NULL; TRACE("(%s,sid=%s,%p,%p(%u),%p,%p(%u),%p)\n", debugstr_w(system),debugstr_sid(sid), @@ -2108,6 +2104,16 @@ LookupAccountSidW( case DOMAIN_ALIAS_RID_RAS_SERVERS: ac = RAS_and_IAS_Servers; break; + case 1000: /* first user account */ + size = UNLEN + 1; + account_name = HeapAlloc( + GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (GetUserNameW(account_name, &size)) + ac = account_name; + else + dm = NULL; + + break; default: dm = NULL; break; @@ -2145,10 +2151,12 @@ LookupAccountSidW( else *accountSize = ac_len + 1; *name_use = use; + HeapFree(GetProcessHeap(), 0, account_name); HeapFree(GetProcessHeap(), 0, computer_name); return status; } + HeapFree(GetProcessHeap(), 0, account_name); HeapFree(GetProcessHeap(), 0, computer_name); SetLastError(ERROR_NONE_MAPPED); return FALSE;

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - use CreateWellKnownSid() properly.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: a37512ee63f33b69f3838c32a7a42abffb70d772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37512ee63f33b69f3838c32a… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 21:28:39 2008 +0100 advapi32: LookupAccountNameW() - use CreateWellKnownSid() properly. --- dlls/advapi32/security.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 03933d2..fcb048b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2536,7 +2536,26 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) { - ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); + DWORD sidLen = SECURITY_MAX_SID_SIZE; + + pSid = HeapAlloc(GetProcessHeap(), 0, sidLen); + + ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, pSid, &sidLen); + + if (ret) + { + if (*cbSid < sidLen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else if (Sid) + { + CopySid(*cbSid, Sid, pSid); + } + + *cbSid = sidLen; + } domainName = ACCOUNT_SIDS[i].domain; nameLen = strlenW(domainName); @@ -2559,6 +2578,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI *peUse = ACCOUNT_SIDS[i].name_use; } + HeapFree(GetProcessHeap(), 0, pSid); + return ret; } }

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - correct call in SetEntriesInAclW().
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: a3e0bc10bb053d4698852dd7d19c0899f1084fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e0bc10bb053d4698852dd7d… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 20:56:08 2008 +0100 advapi32: LookupAccountNameW() - correct call in SetEntriesInAclW(). --- dlls/advapi32/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 77009af..03933d2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2541,7 +2541,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI domainName = ACCOUNT_SIDS[i].domain; nameLen = strlenW(domainName); - if (*cchReferencedDomainName <= nameLen && ReferencedDomainName) + if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); nameLen += 1; @@ -3244,7 +3244,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, case TRUSTEE_IS_NAME: { DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]); - DWORD domain_size = 0; + DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1; SID_NAME_USE use; if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use)) {

1 0