October 2008 - Wine-Commits

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

Oct. 21, 2008

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_Save() if the object is running.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

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 IOleObject_IsUpToData() if the object is running.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

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_Load() if the object is running.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

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 IPersistStorage_InitNew() if the object is running.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: 5b1520761da33f2490bff02905a2837e83035b3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1520761da33f2490bff0290… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 15:28:03 2008 +0100 ole32: Call the object's IPersistStorage_InitNew() 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 b20cb01..f300330 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1529,9 +1529,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_InitNew( IPersistStorage* iface, IStorage* pStg) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)->(%p)\n", iface, pStg); - return IPersistStorage_InitNew(This->dataCache_PersistStg, pStg); + hr = IPersistStorage_InitNew(This->dataCache_PersistStg, pStg); + + if(SUCCEEDED(hr) && object_is_running(This)) + hr = IPersistStorage_InitNew(This->pPSDelegate, pStg); + + return hr; }

1 0

Huw Davies : ole32: Query the object's dirty state if it's running.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: 94d753c63dfad437fc37660d89a371d28504cb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d753c63dfad437fc37660d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 16:32:56 2008 +0100 ole32: Query the object's dirty state if it's running. --- dlls/ole32/defaulthandler.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 1af0797..ce44aec 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1516,9 +1516,18 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_GetClassID( static HRESULT WINAPI DefaultHandler_IPersistStorage_IsDirty( IPersistStorage* iface) { - DefaultHandler *This = impl_from_IPersistStorage(iface); + DefaultHandler *This = impl_from_IPersistStorage(iface); + HRESULT hr; + + TRACE("(%p)\n", iface); + + hr = IPersistStorage_IsDirty(This->dataCache_PersistStg); + if(hr != S_FALSE) return hr; - return IPersistStorage_IsDirty(This->dataCache_PersistStg); + if(object_is_running(This)) + hr = IPersistStorage_IsDirty(This->pPSDelegate); + + return hr; } /************************************************************************

1 0

Huw Davies : ole32: Partial implementation of IOleObject_Update().
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: f2cf617f006e2184fd7c3956606041221ae0dbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2cf617f006e2184fd7c39566… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 14:45:56 2008 +0100 ole32: Partial implementation of IOleObject_Update(). --- dlls/ole32/defaulthandler.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index fcff476..a744718 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -621,8 +621,15 @@ static HRESULT WINAPI DefaultHandler_EnumVerbs( static HRESULT WINAPI DefaultHandler_Update( IOleObject* iface) { - FIXME(": Stub\n"); - return E_NOTIMPL; + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p)\n", iface); + + if (!object_is_running(This)) + { + FIXME("Should run object\n"); + return E_NOTIMPL; + } + return IOleObject_Update(This->pOleDelegate); } /************************************************************************

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - NULL account name handled.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: 0e6626958f441eaee1bbfaf250a5b30988429a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6626958f441eaee1bbfaf25… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 21:40:21 2008 +0100 advapi32: LookupAccountNameW() - NULL account name handled. --- dlls/advapi32/security.c | 5 +++++ dlls/advapi32/tests/security.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index fcb048b..a33d6ec 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2532,6 +2532,11 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); + if (!lpAccountName || !strcmpW(lpAccountName, Blank)) + { + lpAccountName = BUILTIN; + } + for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4e9e7ef..b6756f5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1632,14 +1632,11 @@ static void test_LookupAccountName(void) ret = LookupAccountNameA(NULL, NULL, psid, &sid_size, domain, &domain_size, &sid_use); get_sid_info(psid, &account, &sid_dom); ok(ret, "Failed to lookup account name\n"); - todo_wine - { - /* Using a fixed string will not work on different locales */ - ok(!lstrcmp(account, domain), - "Got %s for account and %s for domain, these should be the same\n", - account, domain); - ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); - } + /* Using a fixed string will not work on different locales */ + ok(!lstrcmp(account, domain), + "Got %s for account and %s for domain, these should be the same\n", + account, domain); + ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); /* try an invalid account name */ SetLastError(0xdeadbeef);

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - only first user account and well known SIDs accepted.
by Alexandre Julliard Oct. 21, 2008

Oct. 21, 2008

Module: wine Branch: master Commit: f04804f44cbe07fe95d5fc18b431ed39209834c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04804f44cbe07fe95d5fc18b… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 22:09:14 2008 +0100 advapi32: LookupAccountNameW() - only first user account and well known SIDs accepted. --- dlls/advapi32/security.c | 32 +++++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 29ff696..2093f7e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2027,7 +2027,7 @@ LookupAccountSidW( if (!ADVAPI_IsLocalComputer(system)) { FIXME("Only local computer supported!\n"); - SetLastError(ERROR_NONE_MAPPED); + SetLastError(RPC_S_SERVER_UNAVAILABLE); return FALSE; } @@ -2535,16 +2535,25 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI static const WCHAR dm[] = {'D','O','M','A','I','N',0}; unsigned int i; DWORD nameLen; + LPWSTR userName = NULL; LPCWSTR domainName; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); + if (!ADVAPI_IsLocalComputer(lpSystemName)) + { + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; + } + if (!lpAccountName || !strcmpW(lpAccountName, Blank)) { lpAccountName = BUILTIN; } + /* Check well known SIDs first */ + for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) @@ -2597,6 +2606,27 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI } } + /* Let the current Unix user id masquerade as first Windows user account */ + + nameLen = UNLEN + 1; + + userName = HeapAlloc(GetProcessHeap(), 0, nameLen); + + ret = GetUserNameW(userName, &nameLen); + + if (ret && strcmpW(lpAccountName, userName) != 0) + { + SetLastError(ERROR_NONE_MAPPED); + ret = FALSE; + } + + HeapFree(GetProcessHeap(), 0, userName); + + if (!ret) + { + return ret; + } + ret = AllocateAndInitializeSid(&identifierAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b6756f5..d4f532d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1314,6 +1314,14 @@ static void test_LookupAccountSid(void) ret = LookupAccountSidW(NULL, pUsersSid, accountW, &real_acc_sizeW, domainW, &real_dom_sizeW, &use); ok(ret, "LookupAccountSidW() Expected TRUE, got FALSE\n"); + /* try an invalid system name */ + real_acc_sizeA = MAX_PATH; + real_dom_sizeA = MAX_PATH; + ret = LookupAccountSidA("deepthought", pUsersSid, accountA, &real_acc_sizeA, domainA, &real_dom_sizeA, &use); + ok(!ret, "LookupAccountSidA() Expected FALSE got TRUE\n"); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, + "LookupAccountSidA() Expected RPC_S_SERVER_UNAVAILABLE, got %u\n", GetLastError()); + /* native windows crashes if domainW or accountW is NULL */ /* try a small account buffer */ @@ -1644,14 +1652,22 @@ static void test_LookupAccountName(void) domain_size = 0; ret = LookupAccountNameA(NULL, "oogabooga", NULL, &sid_size, NULL, &domain_size, &sid_use); ok(!ret, "Expected 0, got %d\n", ret); - todo_wine - { - ok(GetLastError() == ERROR_NONE_MAPPED || - broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE), - "Expected ERROR_NONE_MAPPED, got %d\n", GetLastError()); - ok(sid_size == 0, "Expected 0, got %d\n", sid_size); - ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - } + ok(GetLastError() == ERROR_NONE_MAPPED || + broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE), + "Expected ERROR_NONE_MAPPED, got %d\n", GetLastError()); + ok(sid_size == 0, "Expected 0, got %d\n", sid_size); + ok(domain_size == 0, "Expected 0, got %d\n", domain_size); + + /* try an invalid system name */ + SetLastError(0xdeadbeef); + sid_size = 0; + domain_size = 0; + ret = LookupAccountNameA("deepthought", NULL, NULL, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, + "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + ok(sid_size == 0, "Expected 0, got %d\n", sid_size); + ok(domain_size == 0, "Expected 0, got %d\n", domain_size); HeapFree(GetProcessHeap(), 0, psid); HeapFree(GetProcessHeap(), 0, domain);

1 0

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

Oct. 21, 2008

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