May 2006 - Wine-Commits - list.winehq.org

Robert Shearman : ole32: Copy the mode flags into the STATSTG structure in IStorage::Stat.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 5d051af6aea9d473843ca6aa2a39a02b808f7af3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d051af6aea9d473843ca6a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:49:51 2006 +0100 ole32: Copy the mode flags into the STATSTG structure in IStorage::Stat. Copy the mode flags into the STATSTG structure in IStorage::Stat. Don't store the STGM_CREATE flag in openFlags, since it is only relevant when opening the stream and the tests show that it isn't returned in the STATSTG structure. --- dlls/ole32/storage32.c | 6 ++++-- dlls/ole32/tests/storage32.c | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6369410..79362b5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -647,6 +647,8 @@ HRESULT WINAPI StorageBaseImpl_Stat( &curProperty, grfStatFlag); + pstatstg->grfMode = This->openFlags; + res = S_OK; goto end; } @@ -2298,7 +2300,7 @@ HRESULT StorageImpl_Construct( This->base.lpVtbl = &Storage32Impl_Vtbl; This->base.pssVtbl = &IPropertySetStorage_Vtbl; This->base.v_destructor = &StorageImpl_Destroy; - This->base.openFlags = openFlags; + This->base.openFlags = (openFlags & ~STGM_CREATE); /* * This is the top-level storage so initialize the ancestor pointer @@ -4163,7 +4165,7 @@ StorageInternalImpl* StorageInternalImpl */ newStorage->base.lpVtbl = &Storage32InternalImpl_Vtbl; newStorage->base.v_destructor = &StorageInternalImpl_Destroy; - newStorage->base.openFlags = openFlags; + newStorage->base.openFlags = (openFlags & ~STGM_CREATE); /* * Keep the ancestor storage pointer and nail a reference to it. diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6f081e4..37492ed 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -55,9 +55,7 @@ static void test_hglobal_storage_stat(vo ok( stat.pwcsName == NULL, "storage name not null\n"); ok( stat.type == 1, "type is wrong\n"); - todo_wine { ok( stat.grfMode == 0x12, "grf mode is incorrect\n"); - } ok( !memcmp(&stat.clsid, &test_stg_cls, sizeof test_stg_cls), "CLSID is wrong\n"); refcount = IStorage_Release( stg ); @@ -693,10 +691,8 @@ static void test_storage_refcount(void) ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %ld\n", statstg.type); ok(statstg.cbSize.LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", statstg.cbSize.LowPart); ok(statstg.cbSize.HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", statstg.cbSize.HighPart); - todo_wine { ok(statstg.grfMode == (STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE), "Statstg grfMode should have been 0x10022 instead of 0x%lx\n", statstg.grfMode); - } ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %ld\n", statstg.grfLocksSupported); ok(IsEqualCLSID(&statstg.clsid, &test_stg_cls), "Statstg clsid is not test_stg_cls\n"); ok(statstg.grfStateBits == 0, "Statstg grfStateBits should have been 0 instead of %ld\n", statstg.grfStateBits); @@ -712,10 +708,8 @@ static void test_storage_refcount(void) ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %ld\n", statstg.type); ok(statstg.cbSize.LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", statstg.cbSize.LowPart); ok(statstg.cbSize.HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", statstg.cbSize.HighPart); - todo_wine { ok(statstg.grfMode == STGM_SHARE_EXCLUSIVE, - "Statstg grfMode should have been 0x10022 instead of 0x%lx\n", statstg.grfMode); - } + "Statstg grfMode should have been STGM_SHARE_EXCLUSIVE instead of 0x%lx\n", statstg.grfMode); ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %ld\n", statstg.grfLocksSupported); ok(IsEqualCLSID(&statstg.clsid, &CLSID_NULL), "Statstg clsid is not CLSID_NULL\n"); ok(statstg.grfStateBits == 0, "Statstg grfStateBits should have been 0 instead of %ld\n", statstg.grfStateBits);

1 0

Robert Shearman : ole32: Add tests for IStorage::Stat.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: dd58e54e4384ed30ee7769960ff344b1876309e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd58e54e4384ed30ee77699… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:49:32 2006 +0100 ole32: Add tests for IStorage::Stat. --- dlls/ole32/tests/storage32.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0a70ad5..6f081e4 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -646,6 +646,12 @@ static void test_storage_refcount(void) STGM_READWRITE |STGM_TRANSACTED, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n"); + r = WriteClassStg( stg, &test_stg_cls ); + ok( r == S_OK, "WriteClassStg failed\n"); + + r = IStorage_Commit( stg, STGC_DEFAULT ); + ok( r == S_OK, "IStorage_Commit failed\n"); + /* now create a stream */ r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); @@ -680,10 +686,42 @@ static void test_storage_refcount(void) static const WCHAR stmname2[] = { 'V','a','r','2','D','a','t','a',0 }; IStorage *stg2; IStorage *stg3; + STATSTG statstg; + + r = IStorage_Stat( stg, &statstg, STATFLAG_NONAME ); + ok(r == S_OK, "Stat should have succeded instead of returning 0x%08lx\n", r); + ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %ld\n", statstg.type); + ok(statstg.cbSize.LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", statstg.cbSize.LowPart); + ok(statstg.cbSize.HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", statstg.cbSize.HighPart); + todo_wine { + ok(statstg.grfMode == (STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE), + "Statstg grfMode should have been 0x10022 instead of 0x%lx\n", statstg.grfMode); + } + ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %ld\n", statstg.grfLocksSupported); + ok(IsEqualCLSID(&statstg.clsid, &test_stg_cls), "Statstg clsid is not test_stg_cls\n"); + ok(statstg.grfStateBits == 0, "Statstg grfStateBits should have been 0 instead of %ld\n", statstg.grfStateBits); + ok(statstg.reserved == 0, "Statstg reserved should have been 0 instead of %ld\n", statstg.reserved); r = IStorage_CreateStorage( stg, stgname, STGM_SHARE_EXCLUSIVE, 0, 0, &stg2 ); ok(r == S_OK, "CreateStorage should have succeeded instead of returning 0x%08lx\n", r); + r = IStorage_Stat( stg2, &statstg, STATFLAG_DEFAULT ); + ok(r == S_OK, "Stat should have succeded instead of returning 0x%08lx\n", r); + ok(!lstrcmpW(statstg.pwcsName, stgname), + "Statstg pwcsName should have been the name the storage was created with\n"); + ok(statstg.type == STGTY_STORAGE, "Statstg type should have been STGTY_STORAGE instead of %ld\n", statstg.type); + ok(statstg.cbSize.LowPart == 0, "Statstg cbSize.LowPart should have been 0 instead of %ld\n", statstg.cbSize.LowPart); + ok(statstg.cbSize.HighPart == 0, "Statstg cbSize.HighPart should have been 0 instead of %ld\n", statstg.cbSize.HighPart); + todo_wine { + ok(statstg.grfMode == STGM_SHARE_EXCLUSIVE, + "Statstg grfMode should have been 0x10022 instead of 0x%lx\n", statstg.grfMode); + } + ok(statstg.grfLocksSupported == 0, "Statstg grfLocksSupported should have been 0 instead of %ld\n", statstg.grfLocksSupported); + ok(IsEqualCLSID(&statstg.clsid, &CLSID_NULL), "Statstg clsid is not CLSID_NULL\n"); + ok(statstg.grfStateBits == 0, "Statstg grfStateBits should have been 0 instead of %ld\n", statstg.grfStateBits); + ok(statstg.reserved == 0, "Statstg reserved should have been 0 instead of %ld\n", statstg.reserved); + CoTaskMemFree(statstg.pwcsName); + r = IStorage_CreateStorage( stg2, stgname2, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stg3 ); ok(r == STG_E_ACCESSDENIED, "CreateStorage should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r);

1 0

Robert Shearman : ole32: Fix access right check for opening and creating streams and storages.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: b2207d83ad9c42c24a7dfec66fbd5bc76f438db1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2207d83ad9c42c24a7dfec… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:48:58 2006 +0100 ole32: Fix access right check for opening and creating streams and storages. Check the access mode for opening and creating streams and storages doesn't exceed the access rights the current storage was opened with, not the parent storage. --- dlls/ole32/storage32.c | 18 +++++------------- dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a3f21d5..6369410 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -302,7 +302,6 @@ HRESULT WINAPI StorageBaseImpl_OpenStrea StgProperty currentProperty; ULONG foundPropertyIndex; HRESULT res = STG_E_UNKNOWN; - DWORD parent_grfMode; TRACE("(%p, %s, %p, %lx, %ld, %p)\n", iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm); @@ -345,9 +344,8 @@ HRESULT WINAPI StorageBaseImpl_OpenStrea * Check that we're compatible with the parent's storage mode, but * only if we are not in transacted mode */ - parent_grfMode = STGM_ACCESS_MODE( This->ancestorStorage->base.openFlags ); if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) { - if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( parent_grfMode ) ) + if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { res = STG_E_ACCESSDENIED; goto end; @@ -438,7 +436,6 @@ HRESULT WINAPI StorageBaseImpl_OpenStora StgProperty currentProperty; ULONG foundPropertyIndex; HRESULT res = STG_E_UNKNOWN; - DWORD parent_grfMode; TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n", iface, debugstr_w(pwcsName), pstgPriority, @@ -484,9 +481,8 @@ HRESULT WINAPI StorageBaseImpl_OpenStora * Check that we're compatible with the parent's storage mode, * but only if we are not transacted */ - parent_grfMode = STGM_ACCESS_MODE( This->ancestorStorage->base.openFlags ); if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) { - if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( parent_grfMode ) ) + if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { res = STG_E_ACCESSDENIED; goto end; @@ -845,7 +841,6 @@ HRESULT WINAPI StorageBaseImpl_CreateStr StgStreamImpl* newStream; StgProperty currentProperty, newStreamProperty; ULONG foundPropertyIndex, newPropertyIndex; - DWORD parent_grfMode; TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", iface, debugstr_w(pwcsName), grfMode, @@ -883,9 +878,8 @@ HRESULT WINAPI StorageBaseImpl_CreateStr * Check that we're compatible with the parent's storage mode * if not in transacted mode */ - parent_grfMode = STGM_ACCESS_MODE( This->ancestorStorage->base.openFlags ); - if(!(parent_grfMode & STGM_TRANSACTED)) { - if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( parent_grfMode ) ) + if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) { + if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) return STG_E_ACCESSDENIED; } @@ -1062,7 +1056,6 @@ HRESULT WINAPI StorageImpl_CreateStorage ULONG foundPropertyIndex; ULONG newPropertyIndex; HRESULT hr; - DWORD parent_grfMode; TRACE("(%p, %s, %lx, %ld, %ld, %p)\n", iface, debugstr_w(pwcsName), grfMode, @@ -1095,8 +1088,7 @@ HRESULT WINAPI StorageImpl_CreateStorage /* * Check that we're compatible with the parent's storage mode */ - parent_grfMode = STGM_ACCESS_MODE( This->base.ancestorStorage->base.openFlags ); - if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( parent_grfMode ) ) + if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->base.openFlags ) ) { WARN("access denied\n"); return STG_E_ACCESSDENIED; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 4236fd1..0a70ad5 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -684,18 +684,18 @@ static void test_storage_refcount(void) r = IStorage_CreateStorage( stg, stgname, STGM_SHARE_EXCLUSIVE, 0, 0, &stg2 ); ok(r == S_OK, "CreateStorage should have succeeded instead of returning 0x%08lx\n", r); - todo_wine { r = IStorage_CreateStorage( stg2, stgname2, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stg3 ); ok(r == STG_E_ACCESSDENIED, "CreateStorage should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r); + todo_wine { r = IStorage_CreateStream( stg2, stmname2, STGM_CREATE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); ok(r == STG_E_ACCESSDENIED, "CreateStream should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r); + } IStorage_Release(stg2); r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); - } } DeleteFileW(filename);

1 0

Robert Shearman : ole32: Add more tracing for reading and writing storage streams.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 8d39c809501f61f011758e7f41f351d2259b7a49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d39c809501f61f011758e7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:48:15 2006 +0100 ole32: Add more tracing for reading and writing storage streams. Add more tracing for read and write operations and warn in the case of failure. --- dlls/ole32/stg_stream.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index e208fb6..9bbb9a8 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -268,7 +268,10 @@ static HRESULT WINAPI StgStreamImpl_Read iface, pv, cb, pcbRead); if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } /* * If the caller is not interested in the number of bytes read, @@ -372,6 +375,7 @@ static HRESULT WINAPI StgStreamImpl_Writ case STGM_READWRITE: break; default: + WARN("access denied by flags: 0x%lx\n", STGM_ACCESS_MODE(This->grfMode)); return STG_E_ACCESSDENIED; } @@ -379,7 +383,10 @@ static HRESULT WINAPI StgStreamImpl_Writ return STG_E_INVALIDPOINTER; if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } /* * If the caller is not interested in the number of bytes written, @@ -395,6 +402,7 @@ static HRESULT WINAPI StgStreamImpl_Writ if (cb == 0) { + TRACE("<-- S_OK, written 0\n"); return S_OK; } else @@ -441,6 +449,7 @@ static HRESULT WINAPI StgStreamImpl_Writ */ This->currentPosition.u.LowPart += *pcbWritten; + TRACE("<-- S_OK, written %lu\n", *pcbWritten); return S_OK; }

1 0

Robert Shearman : ole32: Add tests for sub-storages and creating streams.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 168e2fb98fc01c27643c0207dd601979b5fde739 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=168e2fb98fc01c27643c020… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:47:35 2006 +0100 ole32: Add tests for sub-storages and creating streams. Replace a test that fails on NT and with DCOM95 DLLs with a test that ensures access permissions are checked correctly for sub-storages and creating streams. --- dlls/ole32/tests/storage32.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e2f9d8a..4236fd1 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -671,15 +671,31 @@ static void test_storage_refcount(void) /* test for grfMode open issue */ - r = StgOpenStorage( filename, NULL, 0x00010020, NULL, 0, &stg); + r = StgOpenStorage( filename, NULL, STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE, NULL, 0, &stg); ok(r==S_OK, "StgOpenStorage failed\n"); if(stg) { - r = IStorage_OpenStream( stg, stmname, 0, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - ok(r == S_OK, "OpenStream should succeed\n"); + static const WCHAR stgname[] = { ' ',' ',' ','2','9',0 }; + static const WCHAR stgname2[] = { 'C','V','_','i','e','w',0 }; + static const WCHAR stmname2[] = { 'V','a','r','2','D','a','t','a',0 }; + IStorage *stg2; + IStorage *stg3; + + r = IStorage_CreateStorage( stg, stgname, STGM_SHARE_EXCLUSIVE, 0, 0, &stg2 ); + ok(r == S_OK, "CreateStorage should have succeeded instead of returning 0x%08lx\n", r); + + todo_wine { + r = IStorage_CreateStorage( stg2, stgname2, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stg3 ); + ok(r == STG_E_ACCESSDENIED, "CreateStorage should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r); + + r = IStorage_CreateStream( stg2, stmname2, STGM_CREATE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); + ok(r == STG_E_ACCESSDENIED, "CreateStream should have returned STG_E_ACCESSDENIED instead of 0x%08lx\n", r); + + IStorage_Release(stg2); r = IStorage_Release(stg); ok(r == 0, "wrong ref count\n"); + } } DeleteFileW(filename);

1 0

Robert Shearman : ole32: Add a storage test for reading and writing of streams that have
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 8d30c1d08ea8e8106a2a7f9856ba014376af67d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d30c1d08ea8e8106a2a7f9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:47:09 2006 +0100 ole32: Add a storage test for reading and writing of streams that have had their parent storage released. --- dlls/ole32/tests/storage32.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e1f40f2..e2f9d8a 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -634,6 +634,7 @@ static void test_storage_refcount(void) LARGE_INTEGER pos; ULARGE_INTEGER upos; STATSTG stat; + char buffer[10]; if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -659,6 +660,12 @@ static void test_storage_refcount(void) r = IStream_Stat( stm, &stat, STATFLAG_DEFAULT ); ok (r == STG_E_REVERTED, "stat should fail\n"); + r = IStream_Write( stm, "Test string", strlen("Test string"), NULL); + ok (r == STG_E_REVERTED, "IStream_Write should return STG_E_REVERTED instead of 0x%08lx\n", r); + + r = IStream_Read( stm, buffer, sizeof(buffer), NULL); + ok (r == STG_E_REVERTED, "IStream_Read should return STG_E_REVERTED instead of 0x%08lx\n", r); + r = IStream_Release(stm); ok (r == 0, "stream not released\n");

1 0

Robert Shearman : ntdll: Fix size check for NtQueryInformationToken( TokenGroups).
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: e52e4978b2ae14dcc57ca843801a5f8fb6fc9b83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e52e4978b2ae14dcc57ca84… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed May 3 14:46:17 2006 +0100 ntdll: Fix size check for NtQueryInformationToken(TokenGroups). For NtQueryInformationToken(TokenGroups), don't do a size check before the server call, as we don't know how many SIDs there are to return and hence the needed buffer size. --- dlls/ntdll/nt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6b6cccf..5ee757d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -202,9 +202,6 @@ NTSTATUS WINAPI NtQueryInformationToken( switch (tokeninfoclass) { - case TokenGroups: - len = sizeof(TOKEN_GROUPS); - break; case TokenOwner: len = sizeof(TOKEN_OWNER) + sizeof(SID); break;

1 0

Huw Davies : oleaut32: Fix tests under win2k.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 74b63d5e0dc750e4a334f4caacbc55b6b44d504e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74b63d5e0dc750e4a334f4c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 3 17:03:00 2006 +0100 oleaut32: Fix tests under win2k. --- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 9f2db8b..3f417e1 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -100,7 +100,7 @@ static void check_safearray(void *buffer if(!lpsa) { - ok(*(DWORD *)wiresa == FALSE, "wiresa + 0x0 should be FALSE instead of 0x%08lx\n", *(DWORD *)wiresa); + ok(*(void **)wiresa == NULL, "wiresa + 0x0 should be NULL instead of 0x%08lx\n", *(DWORD *)wiresa); return; } @@ -108,7 +108,7 @@ static void check_safearray(void *buffer sftype = get_union_type(lpsa); cell_count = get_cell_count(lpsa); - ok(*(DWORD *)wiresa == TRUE, "wiresa + 0x0 should be TRUE instead of 0x%08lx\n", *(DWORD *)wiresa); + ok(*(DWORD *)wiresa, "wiresa + 0x0 should be non-NULL instead of 0x%08lx\n", *(DWORD *)wiresa); /* win2k: this is lpsa. winxp: this is 0x00000001 */ wiresa += sizeof(DWORD); ok(*(DWORD *)wiresa == lpsa->cDims, "wiresa + 0x4 should be lpsa->cDims instead of 0x%08lx\n", *(DWORD *)wiresa); wiresa += sizeof(DWORD);

1 0

Huw Davies : oleaut32: Alignment fixes for safearrays.
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 17ec77f19e7acd4d8728208c16892146f58109e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17ec77f19e7acd4d8728208… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 3 17:30:35 2006 +0100 oleaut32: Alignment fixes for safearrays. --- dlls/oleaut32/tests/usrmarshal.c | 21 +++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 17 ++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 3f417e1..1659407 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -164,6 +164,8 @@ static void test_marshal_LPSAFEARRAY(voi *(DWORD *)lpsa->pvData = 0xcafebabe; lpsa->cLocks = 7; + size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); + ok(size == 68, "size should be 68 bytes, not %ld\n", size); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); ok(size == 64, "size should be 64 bytes, not %ld\n", size); buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); @@ -196,6 +198,25 @@ static void test_marshal_LPSAFEARRAY(voi LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); } HeapFree(GetProcessHeap(), 0, buffer); + + sab.lLbound = 5; + sab.cElements = 10; + + lpsa = SafeArrayCreate(VT_R8, 1, &sab); + *(double *)lpsa->pvData = 3.1415; + + lpsa->cLocks = 7; + size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); + ok(size == 128, "size should be 128 bytes, not %ld\n", size); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); + ok(size == 128, "size should be 128 bytes, not %ld\n", size); + buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); + LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + + check_safearray(buffer, lpsa); + + HeapFree(GetProcessHeap(), 0, buffer); + SafeArrayDestroy(lpsa); } static void check_bstr(void *buffer, BSTR b) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 05aef80..c4519a1 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -662,6 +662,7 @@ unsigned long WINAPI LPSAFEARRAY_UserSiz TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); + ALIGN_LENGTH(size, 3); size += sizeof(ULONG_PTR); if (*ppsa) { @@ -726,10 +727,12 @@ unsigned long WINAPI LPSAFEARRAY_UserSiz } break; } + case SF_I8: + ALIGN_LENGTH(size, 7); + /* fallthrough */ case SF_I1: case SF_I2: case SF_I4: - case SF_I8: size += ulCellCount * psa->cbElements; break; default: @@ -747,6 +750,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserM TRACE("("); dump_user_flags(pFlags); TRACE(", %p, &%p\n", Buffer, *ppsa); + ALIGN_POINTER(Buffer, 3); *(ULONG_PTR *)Buffer = *ppsa ? TRUE : FALSE; Buffer += sizeof(ULONG_PTR); if (*ppsa) @@ -836,10 +840,13 @@ unsigned char * WINAPI LPSAFEARRAY_UserM } break; } + + case SF_I8: + ALIGN_POINTER(Buffer, 7); + /* fallthrough */ case SF_I1: case SF_I2: case SF_I4: - case SF_I8: /* Just copy the data over */ memcpy(Buffer, psa->pvData, ulCellCount * psa->cbElements); Buffer += ulCellCount * psa->cbElements; @@ -871,6 +878,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserU TRACE("("); dump_user_flags(pFlags); TRACE(", %p, %p\n", Buffer, ppsa); + ALIGN_POINTER(Buffer, 3); ptr = *(ULONG_PTR *)Buffer; Buffer += sizeof(ULONG_PTR); @@ -964,10 +972,13 @@ unsigned char * WINAPI LPSAFEARRAY_UserU break; } + + case SF_I8: + ALIGN_POINTER(Buffer, 7); + /* fallthrough */ case SF_I1: case SF_I2: case SF_I4: - case SF_I8: /* Just copy the data over */ memcpy((*ppsa)->pvData, Buffer, cell_count * (*ppsa)->cbElements); Buffer += cell_count * (*ppsa)->cbElements;

1 0

Huw Davies : oleaut32: Split out the SAFEARRAY and BSTR tests so that they can be used in the upcoming VARIANT tests .
by Alexandre Julliard May 5, 2006

May 5, 2006

Module: wine Branch: refs/heads/master Commit: 747f08c8aebf841001bde3de3a69b0e292ed4be1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=747f08c8aebf841001bde3d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 12:00:30 2006 +0100 oleaut32: Split out the SAFEARRAY and BSTR tests so that they can be used in the upcoming VARIANT tests. --- dlls/oleaut32/tests/usrmarshal.c | 186 ++++++++++++++++++++++++++++---------- 1 files changed, 138 insertions(+), 48 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 5d79315..9f2db8b 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -32,13 +32,123 @@ #include "wine/test.h" #define LPSAFEARRAY_UNMARSHAL_WORKS 0 #define BSTR_UNMARSHAL_WORKS 0 +static inline SF_TYPE get_union_type(SAFEARRAY *psa) +{ + VARTYPE vt; + HRESULT hr; + + hr = SafeArrayGetVartype(psa, &vt); + if (FAILED(hr)) + return 0; + + if (psa->fFeatures & FADF_HAVEIID) + return SF_HAVEIID; + + switch (vt) + { + case VT_I1: + case VT_UI1: return SF_I1; + case VT_BOOL: + case VT_I2: + case VT_UI2: return SF_I2; + case VT_INT: + case VT_UINT: + case VT_I4: + case VT_UI4: + case VT_R4: return SF_I4; + case VT_DATE: + case VT_CY: + case VT_R8: + case VT_I8: + case VT_UI8: return SF_I8; + case VT_INT_PTR: + case VT_UINT_PTR: return (sizeof(UINT_PTR) == 4 ? SF_I4 : SF_I8); + case VT_BSTR: return SF_BSTR; + case VT_DISPATCH: return SF_DISPATCH; + case VT_VARIANT: return SF_VARIANT; + case VT_UNKNOWN: return SF_UNKNOWN; + /* Note: Return a non-zero size to indicate vt is valid. The actual size + * of a UDT is taken from the result of IRecordInfo_GetSize(). + */ + case VT_RECORD: return SF_RECORD; + default: return SF_ERROR; + } +} + +static ULONG get_cell_count(const SAFEARRAY *psa) +{ + const SAFEARRAYBOUND* psab = psa->rgsabound; + USHORT cCount = psa->cDims; + ULONG ulNumCells = 1; + + while (cCount--) + { + if (!psab->cElements) + return 0; + ulNumCells *= psab->cElements; + psab++; + } + return ulNumCells; +} + +static void check_safearray(void *buffer, LPSAFEARRAY lpsa) +{ + unsigned char *wiresa = buffer; + VARTYPE vt; + SF_TYPE sftype; + ULONG cell_count; + + if(!lpsa) + { + ok(*(DWORD *)wiresa == FALSE, "wiresa + 0x0 should be FALSE instead of 0x%08lx\n", *(DWORD *)wiresa); + return; + } + + SafeArrayGetVartype(lpsa, &vt); + sftype = get_union_type(lpsa); + cell_count = get_cell_count(lpsa); + + ok(*(DWORD *)wiresa == TRUE, "wiresa + 0x0 should be TRUE instead of 0x%08lx\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(DWORD *)wiresa == lpsa->cDims, "wiresa + 0x4 should be lpsa->cDims instead of 0x%08lx\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(WORD *)wiresa == lpsa->cDims, "wiresa + 0x8 should be lpsa->cDims instead of 0x%04x\n", *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(WORD *)wiresa == lpsa->fFeatures, "wiresa + 0xc should be lpsa->fFeatures instead of 0x%08x\n", *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(DWORD *)wiresa == lpsa->cbElements, "wiresa + 0x10 should be lpsa->cbElements instead of 0x%08lx\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(WORD *)wiresa == lpsa->cLocks, "wiresa + 0x16 should be lpsa->cLocks instead of 0x%04x\n", *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(WORD *)wiresa == vt, "wiresa + 0x14 should be %04x instead of 0x%04x\n", vt, *(WORD *)wiresa); + wiresa += sizeof(WORD); + ok(*(DWORD *)wiresa == sftype, "wiresa + 0x18 should be %08lx instead of 0x%08lx\n", (DWORD)sftype, *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(DWORD *)wiresa == cell_count, "wiresa + 0x1c should be %lu instead of %lu\n", cell_count, *(DWORD *)wiresa); + wiresa += sizeof(DWORD); + ok(*(DWORD_PTR *)wiresa == (DWORD_PTR)lpsa->pvData, "wirestgm + 0x20 should be lpsa->pvData instead of 0x%08lx\n", *(DWORD_PTR *)wiresa); + wiresa += sizeof(DWORD_PTR); + if(sftype == SF_HAVEIID) + { + GUID guid; + SafeArrayGetIID(lpsa, &guid); + ok(IsEqualGUID(&guid, (GUID*)wiresa), "guid mismatch\n"); + wiresa += sizeof(GUID); + } + ok(!memcmp(wiresa, lpsa->rgsabound, sizeof(lpsa->rgsabound[0]) * lpsa->cDims), "bounds mismatch\n"); + wiresa += sizeof(lpsa->rgsabound[0]) * lpsa->cDims; + + ok(*(DWORD *)wiresa == cell_count, "wiresa + 0x2c should be %lu instead of %lu\n", cell_count, *(DWORD*)wiresa); + wiresa += sizeof(DWORD); + /* elements are now pointed to by wiresa */ +} + static void test_marshal_LPSAFEARRAY(void) { unsigned char *buffer; unsigned long size; LPSAFEARRAY lpsa; LPSAFEARRAY lpsa2 = NULL; - unsigned char *wiresa; SAFEARRAYBOUND sab; MIDL_STUB_MESSAGE stubMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; @@ -58,34 +168,8 @@ static void test_marshal_LPSAFEARRAY(voi ok(size == 64, "size should be 64 bytes, not %ld\n", size); buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - wiresa = buffer; - ok(*(DWORD *)wiresa == TRUE, "wiresa + 0x0 should be TRUE instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(DWORD *)wiresa == lpsa->cDims, "wiresa + 0x4 should be lpsa->cDims instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(WORD *)wiresa == lpsa->cDims, "wiresa + 0x8 should be lpsa->cDims instead of 0x%04x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(WORD *)wiresa == lpsa->fFeatures, "wiresa + 0xc should be lpsa->fFeatures instead of 0x%08x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(DWORD *)wiresa == lpsa->cbElements, "wiresa + 0x10 should be lpsa->cbElements instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(WORD *)wiresa == lpsa->cLocks, "wiresa + 0x16 should be lpsa->cLocks instead of 0x%04x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(WORD *)wiresa == VT_I2, "wiresa + 0x14 should be VT_I2 instead of 0x%04x\n", *(WORD *)wiresa); - wiresa += sizeof(WORD); - ok(*(DWORD *)wiresa == VT_I2, "wiresa + 0x18 should be VT_I2 instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(DWORD *)wiresa == sab.cElements, "wiresa + 0x1c should be sab.cElements instead of %lu\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(DWORD_PTR *)wiresa == (DWORD_PTR)lpsa->pvData, "wirestgm + 0x20 should be lpsa->pvData instead of 0x%08lx\n", *(DWORD_PTR *)wiresa); - wiresa += sizeof(DWORD_PTR); - ok(*(DWORD *)wiresa == sab.cElements, "wiresa + 0x24 should be sab.cElements instead of %lu\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - ok(*(LONG *)wiresa == sab.lLbound, "wiresa + 0x28 should be sab.clLbound instead of %ld\n", *(LONG *)wiresa); - wiresa += sizeof(LONG); - ok(*(DWORD *)wiresa == sab.cElements, "wiresa + 0x2c should be sab.cElements instead of %lu\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); - /* elements are now pointed to by wiresa */ + + check_safearray(buffer, lpsa); if (LPSAFEARRAY_UNMARSHAL_WORKS) { @@ -103,9 +187,7 @@ static void test_marshal_LPSAFEARRAY(voi ok(size == 4, "size should be 4 bytes, not %ld\n", size); buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - wiresa = buffer; - ok(*(DWORD *)wiresa == FALSE, "wiresa + 0x0 should be FALSE instead of 0x%08lx\n", *(DWORD *)wiresa); - wiresa += sizeof(DWORD); + check_safearray(buffer, lpsa); if (LPSAFEARRAY_UNMARSHAL_WORKS) { @@ -116,6 +198,27 @@ static void test_marshal_LPSAFEARRAY(voi HeapFree(GetProcessHeap(), 0, buffer); } +static void check_bstr(void *buffer, BSTR b) +{ + DWORD *wireb = buffer; + DWORD len = SysStringLen(b); + + ok(*wireb == len, "wv[0] %08lx\n", *wireb); + wireb++; + if(len) + ok(*wireb == len * 2, "wv[1] %08lx\n", *wireb); + else + ok(*wireb == 0xffffffff, "wv[1] %08lx\n", *wireb); + wireb++; + ok(*wireb == len, "wv[2] %08lx\n", *wireb); + if(len) + { + wireb++; + ok(!memcmp(wireb, b, len * 2), "strings differ\n"); + } + return; +} + static void test_marshal_BSTR(void) { unsigned long size; @@ -124,7 +227,7 @@ static void test_marshal_BSTR(void) unsigned char *buffer; BSTR b, b2; WCHAR str[] = {'m','a','r','s','h','a','l',' ','t','e','s','t','1',0}; - DWORD *wireb, len; + DWORD len; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); umcb.pReserve = NULL; @@ -143,15 +246,7 @@ static void test_marshal_BSTR(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); BSTR_UserMarshal(&umcb.Flags, buffer, &b); - wireb = (DWORD*)buffer; - - ok(*wireb == len, "wv[0] %08lx\n", *wireb); - wireb++; - ok(*wireb == len * 2, "wv[1] %08lx\n", *wireb); - wireb++; - ok(*wireb == len, "wv[2] %08lx\n", *wireb); - wireb++; - ok(!memcmp(wireb, str, len * 2), "strings differ\n"); + check_bstr(buffer, b); if (BSTR_UNMARSHAL_WORKS) { @@ -171,13 +266,8 @@ static void test_marshal_BSTR(void) buffer = HeapAlloc(GetProcessHeap(), 0, size); BSTR_UserMarshal(&umcb.Flags, buffer, &b); - wireb = (DWORD*)buffer; - ok(*wireb == 0, "wv[0] %08lx\n", *wireb); - wireb++; - ok(*wireb == 0xffffffff, "wv[1] %08lx\n", *wireb); - wireb++; - ok(*wireb == 0, "wv[2] %08lx\n", *wireb); + check_bstr(buffer, b); HeapFree(GetProcessHeap(), 0, buffer); }

1 0