wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Chris Schafer : msi/tests: Remove some barriers to running msi tests in parallel.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 350cdd2fe5c8ac415787b6032489baba0171adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=350cdd2fe5c8ac415787b6032… Author: Chris Schafer <chrisp.schafer(a)gmail.com> Date: Thu Dec 10 14:07:14 2009 -0800 msi/tests: Remove some barriers to running msi tests in parallel. --- dlls/msi/tests/automation.c | 4 ++-- dlls/msi/tests/db.c | 9 ++++----- dlls/msi/tests/format.c | 17 +++++++---------- dlls/msi/tests/package.c | 11 ++++++----- dlls/msi/tests/record.c | 2 +- dlls/msi/tests/suminfo.c | 10 +++++----- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index bb498c0..8a0eede 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -34,8 +34,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static const char *msifile = "winetest.msi"; -static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; +static const char *msifile = "winetest-automation.msi"; +static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','-','a','u','t','o','m','a','t','i','o','n','.','m','s','i',0}; static const WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 }; static const WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-','2','E','1','A','-','4','3','6','7','-','B','7','3','4','-','4','E','B','2','B','D','A','D','6','5','6','5','}',0 }; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 041e860..bafa0db 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -31,9 +31,10 @@ #include "wine/test.h" -static const char *msifile = "winetest.msi"; -static const char *msifile2 = "winetst2.msi"; -static const char *mstfile = "winetst.mst"; +static const char *msifile = "winetest-db.msi"; +static const char *msifile2 = "winetst2-db.msi"; +static const char *mstfile = "winetst-db.mst"; +static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','d','b','.','m','s','i',0}; static void test_msidatabase(void) { @@ -5569,8 +5570,6 @@ static void test_defaultdatabase(void) MSIHANDLE hdb; IStorage *stg = NULL; - static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; - DeleteFile(msifile); r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 2b2661c..3d4029c 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -27,7 +27,7 @@ #include "wine/test.h" -static const char msifile[] = "winetest.msi"; +static const char msifile[] = "winetest-format.msi"; static UINT run_query( MSIHANDLE hdb, const char *query ) { @@ -315,17 +315,16 @@ static MSIHANDLE helper_createpackage( const char *szName ) static void test_createpackage(void) { - static const CHAR filename[] = "winetest.msi"; MSIHANDLE hPackage = 0; UINT res; - hPackage = helper_createpackage( filename ); + hPackage = helper_createpackage( msifile ); ok ( hPackage != 0, " Failed to create package\n"); res = MsiCloseHandle( hPackage); ok( res == ERROR_SUCCESS , "Failed to close package\n" ); - DeleteFile( filename ); + DeleteFile( msifile ); } static void test_formatrecord(void) @@ -1620,14 +1619,13 @@ static void test_formatrecord(void) static void test_formatrecord_package(void) { - static const CHAR filename[] = "winetest.msi"; char buffer[100]; MSIHANDLE hrec; MSIHANDLE package; UINT r; DWORD sz=100; - package = helper_createpackage( filename ); + package = helper_createpackage( msifile ); ok(package!=0, "Unable to create package\n"); hrec = MsiCreateRecord(12); @@ -2117,7 +2115,7 @@ static void test_formatrecord_package(void) r = MsiCloseHandle(package); ok(r==ERROR_SUCCESS, "Unable to close package\n"); - DeleteFile( filename ); + DeleteFile( msifile ); } static void test_formatrecord_tables(void) @@ -2383,12 +2381,11 @@ static void test_formatrecord_tables(void) static void test_processmessage(void) { - static const CHAR filename[] = "winetest.msi"; MSIHANDLE hrec; MSIHANDLE package; int r; - package = helper_createpackage( filename ); + package = helper_createpackage( msifile ); ok(package!=0, "Unable to create package\n"); hrec = MsiCreateRecord(3); @@ -2403,7 +2400,7 @@ static void test_processmessage(void) MsiCloseHandle(hrec); MsiCloseHandle(package); - DeleteFile(filename); + DeleteFile(msifile); } START_TEST(format) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 903e2ac..979de1a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -30,7 +30,7 @@ #include "wine/test.h" -static const char msifile[] = "winetest.msi"; +static const char msifile[] = "winetest-package.msi"; char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); @@ -2341,9 +2341,9 @@ static void test_states(void) MSIHANDLE hdb; INSTALLSTATE state, action; - static const CHAR msifile2[] = "winetest2.msi"; - static const CHAR msifile3[] = "winetest3.msi"; - static const CHAR msifile4[] = "winetest4.msi"; + static const CHAR msifile2[] = "winetest2-package.msi"; + static const CHAR msifile3[] = "winetest3-package.msi"; + static const CHAR msifile4[] = "winetest4-package.msi"; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -11601,7 +11601,8 @@ static void test_MsiGetProductProperty(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); lstrcpyA(val, path); - lstrcatA(val, "\\winetest.msi"); + lstrcatA(val, "\\"); + lstrcatA(val, msifile); res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, (const BYTE *)val, lstrlenA(val) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 0da69c7..2c8f5bf 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -24,7 +24,7 @@ #include "wine/test.h" -static const char *msifile = "winetest.msi"; +static const char *msifile = "winetest-record.msi"; static BOOL create_temp_file(char *name) { diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index f0e7fdd..a0b225b 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -63,9 +63,12 @@ #define PID_MSISOURCE PID_WORDCOUNT #define PID_MSIRESTRICT PID_CHARCOUNT +const char *msifile = "winetest-suminfo.msi"; +static const WCHAR msifileW[] = { + 'w','i','n','e','t','e','s','t','-','s','u','m','i','n','f','o','.','m','s','i',0 }; + static void test_suminfo(void) { - const char *msifile = "winetest.msi"; MSIHANDLE hdb = 0, hsuminfo; UINT r, count, type; DWORD sz; @@ -284,8 +287,6 @@ static void test_create_database_binary(void) static const CLSID FMTID_SummaryInformation = { 0xf29f85e0, 0x4ff9, 0x1068, {0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9}}; DWORD mode = STGM_CREATE | STGM_READWRITE | STGM_DIRECT | STGM_SHARE_EXCLUSIVE; - static const WCHAR msifile[] = { - 'w','i','n','e','t','e','s','t','.','m','s','i',0 }; IPropertySetStorage *pss = NULL; IPropertyStorage *ps = NULL; IStorage *stg = NULL; @@ -295,7 +296,7 @@ static void test_create_database_binary(void) PROPVARIANT propvar[10]; USHORT data[2] = { 0, 0 }; - r = StgCreateDocfile( msifile, mode, 0, &stg ); + r = StgCreateDocfile( msifileW, mode, 0, &stg ); ok( r == S_OK, "failed to create database\n"); r = IStorage_SetClass( stg, &CLSID_MsiDatabase ); @@ -386,7 +387,6 @@ static void test_create_database_binary(void) static void test_summary_binary(void) { - const char *msifile = "winetest.msi"; MSIHANDLE hdb = 0, hsuminfo = 0; UINT r, type, count; INT ival;

1 0

Alexandre Julliard : server: Simplify computation of file modes from the security descriptor.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 80e844f713df4900b133f2ddb986b85b50034247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e844f713df4900b133f2ddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 17:32:38 2009 +0100 server: Simplify computation of file modes from the security descriptor. --- server/file.c | 62 ++++++++++++++++++-------------------------------------- 1 files changed, 20 insertions(+), 42 deletions(-) diff --git a/server/file.c b/server/file.c index 15cc34b..105c339 100644 --- a/server/file.c +++ b/server/file.c @@ -441,10 +441,22 @@ static struct security_descriptor *file_get_sd( struct object *obj ) return sd; } +static mode_t file_access_to_mode( unsigned int access ) +{ + mode_t mode = 0; + + access = generic_file_map_access( access ); + if (access & FILE_READ_DATA) mode |= 4; + if (access & FILE_WRITE_DATA) mode |= 2; + if (access & FILE_EXECUTE) mode |= 1; + return mode; +} + mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { mode_t new_mode = 0; mode_t denied_mode = 0; + mode_t mode; int present; const ACL *dacl = sd_get_dacl( sd, &present ); const SID *user = token_get_user( current->process->token ); @@ -465,71 +477,37 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) case ACCESS_DENIED_ACE_TYPE: ad_ace = (const ACCESS_DENIED_ACE *)ace; sid = (const SID *)&ad_ace->SidStart; + mode = file_access_to_mode( ad_ace->Mask ); if (security_equal_sid( sid, security_world_sid )) { - unsigned int access = generic_file_map_access( ad_ace->Mask ); - if (access & FILE_READ_DATA) - denied_mode |= S_IRUSR|S_IRGRP|S_IROTH; - if (access & FILE_WRITE_DATA) - denied_mode |= S_IWUSR|S_IWGRP|S_IWOTH; - if (access & FILE_EXECUTE) - denied_mode |= S_IXUSR|S_IXGRP|S_IXOTH; + denied_mode |= (mode << 6) | (mode << 3) | mode; /* all */ } else if (security_equal_sid( sid, owner )) { - unsigned int access = generic_file_map_access( ad_ace->Mask ); - if (access & FILE_READ_DATA) - denied_mode |= S_IRUSR; - if (access & FILE_WRITE_DATA) - denied_mode |= S_IWUSR; - if (access & FILE_EXECUTE) - denied_mode |= S_IXUSR; + denied_mode |= (mode << 6); /* user only */ } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, TRUE ))) { - unsigned int access = generic_file_map_access( ad_ace->Mask ); - if (access & FILE_READ_DATA) - denied_mode |= S_IRUSR|S_IRGRP; - if (access & FILE_WRITE_DATA) - denied_mode |= S_IWUSR|S_IWGRP; - if (access & FILE_EXECUTE) - denied_mode |= S_IXUSR|S_IXGRP; + denied_mode |= (mode << 6) | (mode << 3); /* user + group */ } break; case ACCESS_ALLOWED_ACE_TYPE: aa_ace = (const ACCESS_ALLOWED_ACE *)ace; sid = (const SID *)&aa_ace->SidStart; + mode = file_access_to_mode( aa_ace->Mask ); if (security_equal_sid( sid, security_world_sid )) { - unsigned int access = generic_file_map_access( aa_ace->Mask ); - if (access & FILE_READ_DATA) - new_mode |= S_IRUSR|S_IRGRP|S_IROTH; - if (access & FILE_WRITE_DATA) - new_mode |= S_IWUSR|S_IWGRP|S_IWOTH; - if (access & FILE_EXECUTE) - new_mode |= S_IXUSR|S_IXGRP|S_IXOTH; + new_mode |= (mode << 6) | (mode << 3) | mode; /* all */ } else if (security_equal_sid( sid, owner )) { - unsigned int access = generic_file_map_access( aa_ace->Mask ); - if (access & FILE_READ_DATA) - new_mode |= S_IRUSR; - if (access & FILE_WRITE_DATA) - new_mode |= S_IWUSR; - if (access & FILE_EXECUTE) - new_mode |= S_IXUSR; + new_mode |= (mode << 6); /* user only */ } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, FALSE ))) { - unsigned int access = generic_file_map_access( ad_ace->Mask ); - if (access & FILE_READ_DATA) - new_mode |= S_IRUSR|S_IRGRP; - if (access & FILE_WRITE_DATA) - new_mode |= S_IWUSR|S_IWGRP; - if (access & FILE_EXECUTE) - new_mode |= S_IXUSR|S_IXGRP; + new_mode |= (mode << 6) | (mode << 3); /* user + group */ } break; }

1 0

Ben Peddell : server: Include user groups in file mode calculation when user is file owner.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: b419df1de48609086c7460fdb5d8a20d119e47ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b419df1de48609086c7460fdb… Author: Ben Peddell <klightspeed(a)netspace.net.au> Date: Thu Dec 10 01:31:53 2009 +1000 server: Include user groups in file mode calculation when user is file owner. --- server/change.c | 2 +- server/file.c | 27 +++++++++++++++++++++++++-- server/security.h | 1 + server/token.c | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/server/change.c b/server/change.c index 11b4729..9a1a02d 100644 --- a/server/change.c +++ b/server/change.c @@ -373,7 +373,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, if (set_info & DACL_SECURITY_INFORMATION) { /* keep the bits that we don't map to access rights in the ACL */ - mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); mode |= sd_to_mode( sd, owner ); if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) diff --git a/server/file.c b/server/file.c index 5db64cd..15cc34b 100644 --- a/server/file.c +++ b/server/file.c @@ -447,6 +447,7 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) mode_t denied_mode = 0; int present; const ACL *dacl = sd_get_dacl( sd, &present ); + const SID *user = token_get_user( current->process->token ); if (present && dacl) { const ACE_HEADER *ace = (const ACE_HEADER *)(dacl + 1); @@ -484,6 +485,17 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) if (access & FILE_EXECUTE) denied_mode |= S_IXUSR; } + else if ((security_equal_sid( user, owner ) && + token_sid_present( current->process->token, sid, TRUE ))) + { + unsigned int access = generic_file_map_access( ad_ace->Mask ); + if (access & FILE_READ_DATA) + denied_mode |= S_IRUSR|S_IRGRP; + if (access & FILE_WRITE_DATA) + denied_mode |= S_IWUSR|S_IWGRP; + if (access & FILE_EXECUTE) + denied_mode |= S_IXUSR|S_IXGRP; + } break; case ACCESS_ALLOWED_ACE_TYPE: aa_ace = (const ACCESS_ALLOWED_ACE *)ace; @@ -508,13 +520,24 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) if (access & FILE_EXECUTE) new_mode |= S_IXUSR; } + else if ((security_equal_sid( user, owner ) && + token_sid_present( current->process->token, sid, FALSE ))) + { + unsigned int access = generic_file_map_access( ad_ace->Mask ); + if (access & FILE_READ_DATA) + new_mode |= S_IRUSR|S_IRGRP; + if (access & FILE_WRITE_DATA) + new_mode |= S_IWUSR|S_IWGRP; + if (access & FILE_EXECUTE) + new_mode |= S_IXUSR|S_IXGRP; + } break; } } } else /* no ACL means full access rights to anyone */ - new_mode = S_IRWXU | S_IRWXO; + new_mode = S_IRWXU | S_IRWXG | S_IRWXO; return new_mode & ~denied_mode; } @@ -557,7 +580,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd if (set_info & DACL_SECURITY_INFORMATION) { /* keep the bits that we don't map to access rights in the ACL */ - mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); mode |= sd_to_mode( sd, owner ); if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) diff --git a/server/security.h b/server/security.h index 39b1d2f..33cf5da 100644 --- a/server/security.h +++ b/server/security.h @@ -55,6 +55,7 @@ extern int token_check_privileges( struct token *token, int all_required, extern const ACL *token_get_default_dacl( struct token *token ); extern const SID *token_get_user( struct token *token ); extern const SID *token_get_primary_group( struct token *token ); +extern int token_sid_present( struct token *token, const SID *sid, int deny); static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace ) { diff --git a/server/token.c b/server/token.c index 4c45d50..69ffab7 100644 --- a/server/token.c +++ b/server/token.c @@ -776,7 +776,7 @@ int token_check_privileges( struct token *token, int all_required, return (enabled_count > 0); } -static int token_sid_present( struct token *token, const SID *sid, int deny ) +int token_sid_present( struct token *token, const SID *sid, int deny ) { struct group *group;

1 0

Juan Lang : advapi32/tests: Fix memory leaks in tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: dec7dda411e4334efe6d07a99cc0197e1c305bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec7dda411e4334efe6d07a99… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 07:59:17 2009 -0800 advapi32/tests: Fix memory leaks in tests. --- dlls/advapi32/tests/crypt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 9eacbd4..f317237 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -234,6 +234,7 @@ static void test_incorrect_api_usage(void) result = pCryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok (result, "%d\n", GetLastError()); if (!result) return; + pCryptDestroyHash(hHash); result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey); ok (result, "%d\n", GetLastError()); @@ -557,6 +558,7 @@ static void test_enum_providers(void) ok(!strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); ok(cbName==providerLen, "expected %d, got %d\n", cbName, providerLen); + LocalFree(pszProvName); LocalFree(provider); } @@ -844,6 +846,7 @@ static void test_get_default_provider(void) ok(!strcmp(pszProvName, provName), "expected %s, got %s\n", pszProvName, provName); ok(provNameSize==cbProvName, "expected %d, got %d\n", cbProvName, provNameSize); + LocalFree(pszProvName); LocalFree(provName); }

1 0

Jeremy White : oleaut32: Use wire sizes for marshaled safe arrays of bstrs and variants; fixes a test failure on win64.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 04a2102428590c1679fe56d6432527b170c2c453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a2102428590c1679fe56d64… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Dec 11 09:26:10 2009 -0600 oleaut32: Use wire sizes for marshaled safe arrays of bstrs and variants; fixes a test failure on win64. --- dlls/oleaut32/usrmarshal.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 7409fce..202cf84 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -763,6 +763,26 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) } } +static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) +{ + if (sftype == SF_BSTR) + return sizeof(DWORD); + else if (sftype == SF_VARIANT) + return sizeof(variant_wire_t) - sizeof(DWORD); + else + return lpsa->cbElements; +} + +static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) +{ + if (sftype == SF_BSTR) + return sizeof(BSTR); + else if (sftype == SF_VARIANT) + return sizeof(VARIANT); + else + return wiresa->cbElements; +} + ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) { ULONG size = StartingSize; @@ -868,13 +888,15 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf SF_TYPE sftype; GUID guid; + sftype = SAFEARRAY_GetUnionType(psa); + *(ULONG *)Buffer = psa->cDims; Buffer += sizeof(ULONG); *(USHORT *)Buffer = psa->cDims; Buffer += sizeof(USHORT); *(USHORT *)Buffer = psa->fFeatures; Buffer += sizeof(USHORT); - *(ULONG *)Buffer = psa->cbElements; + *(ULONG *)Buffer = elem_wire_size(psa, sftype); Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); @@ -883,7 +905,6 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); - sftype = SAFEARRAY_GetUnionType(psa); *(ULONG *)Buffer = sftype; Buffer += sizeof(ULONG); @@ -1043,7 +1064,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B (*ppsa)->fFeatures &= FADF_AUTOSETFLAGS; (*ppsa)->fFeatures |= (wiresa->fFeatures & ~(FADF_AUTOSETFLAGS)); /* FIXME: there should be a limit on how large wiresa->cbElements can be */ - (*ppsa)->cbElements = wiresa->cbElements; + (*ppsa)->cbElements = elem_mem_size(wiresa, sftype); (*ppsa)->cLocks = LOWORD(wiresa->cLocks); /* SafeArrayCreateEx allocates the data for us, but

1 0

Jeremy White : oleaut32/tests: Check the actual size of safe arrays marshaled, not just projected size.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 5284baa82b5502b256a2bdb73019f338764bca17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5284baa82b5502b256a2bdb73… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Dec 11 09:25:50 2009 -0600 oleaut32/tests: Check the actual size of safe arrays marshaled, not just projected size. --- dlls/oleaut32/tests/usrmarshal.c | 41 +++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 9756eb4..e9c53e9 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -205,7 +205,7 @@ static void init_user_marshal_cb(USER_MARSHAL_CB *umcb, static void test_marshal_LPSAFEARRAY(void) { - unsigned char *buffer, *p; + unsigned char *buffer, *next; ULONG size, expected; LPSAFEARRAY lpsa; LPSAFEARRAY lpsa2 = NULL; @@ -240,7 +240,8 @@ static void test_marshal_LPSAFEARRAY(void) "size should be %u bytes, not %u\n", expected, size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); @@ -265,10 +266,12 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); - ok(size == 4, "size should be 4 bytes, not %d\n", size); + expected = 4; + ok(size == expected, "size should be 4 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); if (LPSAFEARRAY_UNMARSHAL_WORKS) @@ -302,7 +305,8 @@ static void test_marshal_LPSAFEARRAY(void) "size should be %u bytes, not %u\n", expected, size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); @@ -330,7 +334,8 @@ static void test_marshal_LPSAFEARRAY(void) "size should be %u bytes, not %u\n", expected, size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); HeapFree(GetProcessHeap(), 0, buffer); SafeArrayDestroyData(lpsa); @@ -361,19 +366,20 @@ static void test_marshal_LPSAFEARRAY(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); expected = 44 + (sab.cElements * sizeof(DWORD)) + expected_bstr_size; - if (sizeof(void *) == 8) /* win64 */ - expected += 12; todo_wine - ok(size == (expected + sizeof(DWORD)), "size should be %u bytes, not %u\n", expected + (ULONG) sizeof(DWORD), size); + ok(size == expected + sizeof(DWORD) || size == (expected + sizeof(DWORD) + 12 /* win64 */), + "size should be %u bytes, not %u\n", expected + (ULONG) sizeof(DWORD), size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); todo_wine - ok(size == expected, "size should be %u bytes, not %u\n", expected, size); + ok(size == expected || size == (expected + 12 /* win64 */), + "size should be %u bytes, not %u\n", expected, size); buffer = HeapAlloc(GetProcessHeap(), 0, size); memset(buffer, 0xcc, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - p = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); - trace("LPSAFEARRAY_UserMarshal processed %ld bytes\n", p ? (long) (p - buffer) : 0); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + todo_wine + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); check_safearray(buffer, lpsa); @@ -381,9 +387,10 @@ static void test_marshal_LPSAFEARRAY(void) if (LPSAFEARRAY_UNMARSHAL_WORKS) { init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - p = LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); - trace("LPSAFEARRAY_UserUnmarshal processed %ld bytes\n", p ? (long) (p - buffer) : 0); - ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal, result %p\n", p); + next = LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); + todo_wine + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); + ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal, result %p\n", next); } for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) @@ -436,7 +443,9 @@ static void test_marshal_LPSAFEARRAY(void) "size should be %u bytes, not %u\n", expected, size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + todo_wine + ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected); lpsa->cbElements = 16; /* VARIANT wire size */ check_safearray(buffer, lpsa); HeapFree(GetProcessHeap(), 0, buffer);

1 0

Jeremy White : oleaut32/tests: Avoid a memory leak; spotted by Valgrind.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 6401720dafdec4eba7aa52e4fbe9da8479b31a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6401720dafdec4eba7aa52e4f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Fri Dec 11 09:25:25 2009 -0600 oleaut32/tests: Avoid a memory leak; spotted by Valgrind. --- dlls/oleaut32/tests/usrmarshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d57802c..9756eb4 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -396,7 +396,10 @@ static void test_marshal_LPSAFEARRAY(void) hr = SafeArrayGetElement(lpsa2, indices, &gotvalue); ok(hr == S_OK, "Failed to get bstr element at hres 0x%x\n", hr); if (hr == S_OK) + { ok(VarBstrCmp(values[i], gotvalue, 0, 0) == VARCMP_EQ, "String %d does not match\n", i); + SysFreeString(gotvalue); + } } SysFreeString(values[i]);

1 0

Huw Davies : oleaut32: Fix double-free in tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 026576995ead1df76e56546b981a7dce398fd808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026576995ead1df76e56546b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 11 13:28:19 2009 +0000 oleaut32: Fix double-free in tests. Found by Valgrind. --- dlls/oleaut32/tests/vartype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7e7fe35..3ea6ac2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4889,7 +4889,8 @@ static void test_VarBstrFromR4(void) } } -#define BSTR_DATE(dt,str) SysFreeString(bstr); bstr = NULL; \ +#define BSTR_DATE(dt,str) \ + bstr = NULL; \ hres = pVarBstrFromDate(dt,lcid,LOCALE_NOUSEROVERRIDE,&bstr); \ if (bstr) {WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); SysFreeString(bstr);} \ else buff[0] = 0; \ @@ -4901,7 +4902,7 @@ static void test_VarBstrFromDate(void) char buff[256]; LCID lcid; HRESULT hres; - BSTR bstr = NULL; + BSTR bstr; CHECKPTR(VarBstrFromDate); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);

1 0

Nikolay Sivov : oleaut32/tests: Fix a couple of leaks in tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 7f9d5aad7ca1b6468df4aa9259f4b4fcaa588555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9d5aad7ca1b6468df4aa925… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 11 15:14:32 2009 +0300 oleaut32/tests: Fix a couple of leaks in tests. --- dlls/oleaut32/tests/olepicture.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 55d883b..c8ddc8a 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -357,6 +357,7 @@ static void test_empty_image(void) { ok (hres == S_OK,"empty picture get handle failed with hres 0x%08x\n", hres); ok (handle == 0, "empty picture get handle did not return 0, but 0x%08x\n", handle); IPicture_Release (pic); + IStream_Release (stream); } static void test_empty_image_2(void) { @@ -395,6 +396,7 @@ static void test_empty_image_2(void) { ok (type == PICTYPE_NONE,"type is %d, but should be PICTYPE_NONE(0)\n", type); IPicture_Release (pic); + IStream_Release (stream); } static void test_Invoke(void) @@ -408,16 +410,17 @@ static void test_Invoke(void) HGLOBAL hglob; void *data; - hglob = GlobalAlloc (0, sizeof(gifimage)); - data = GlobalLock(hglob); - memcpy(data, gifimage, sizeof(gifimage)); + hglob = GlobalAlloc (0, sizeof(gifimage)); + data = GlobalLock(hglob); + memcpy(data, gifimage, sizeof(gifimage)); GlobalUnlock(hglob); - hr = CreateStreamOnHGlobal (hglob, FALSE, &stream); + hr = CreateStreamOnHGlobal (hglob, FALSE, &stream); ok_ole_success(hr, "CreateStreamOnHGlobal"); - hr = pOleLoadPicture(stream, sizeof(gifimage), TRUE, &IID_IPictureDisp, (void **)&picdisp); + hr = pOleLoadPicture(stream, sizeof(gifimage), TRUE, &IID_IPictureDisp, (void **)&picdisp); IStream_Release(stream); + GlobalFree(hglob); ok_ole_success(hr, "OleLoadPicture"); V_VT(&vararg) = VT_BOOL;

1 0

Aric Stewart : shlwapi: Ordinal 196 is SHVerbExistsNA not DnsRecordSetCompare.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 3635bbb928d75a6660b8138722e7fd1b4dc01bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3635bbb928d75a6660b813872… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 11 08:43:22 2009 -0600 shlwapi: Ordinal 196 is SHVerbExistsNA not DnsRecordSetCompare. --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/ordinal.c | 19 +++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 20329f6..2594a19 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid user32 gdi32 advapi32 kernel32 ntdll -DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version dnsapi +DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 73d0f7e..f127ca1 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4709,3 +4709,22 @@ INT WINAPI ZoneCheckUrlExW(LPWSTR szURL, PVOID pUnknown, DWORD dwUnknown2, return 0; } + +/*********************************************************************** + * SHVerbExistsNA [SHLWAPI.196] + * + * + * PARAMS + * + * verb [I] a string, often appears to be an extension. + * + * Other parameters currently unknown. + * + * RETURNS + * unknown + */ +INT WINAPI SHVerbExistsNA(LPSTR verb, PVOID pUnknown, PVOID pUnknown2, DWORD dwUnknown3) +{ + FIXME("(%s, %p, %p, %i) STUB\n",verb, pUnknown, pUnknown2, dwUnknown3); + return 0; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a8e7428..c877dd1 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -193,7 +193,7 @@ 193 stdcall -noname SHGetCurColorRes() 194 stdcall -noname SHWaitForSendMessageThread(ptr long) 195 stdcall -noname SHIsExpandableFolder(ptr ptr) -196 stdcall -noname DnsRecordSetCompare(ptr ptr ptr ptr) dnsapi.DnsRecordSetCompare +196 stdcall -noname SHVerbExistsNA(str ptr ptr long) 197 stdcall -noname SHFillRectClr(long ptr long) 198 stdcall -noname SHSearchMapInt(ptr ptr long long) 199 stdcall -noname IUnknown_Set(ptr ptr)

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