December 2009 - Wine-commits

Juan Lang : winhttp: Free OpenSSL error strings at unload.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 9352509eb27625fa3d02f30de409cf4e8e71402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9352509eb27625fa3d02f30de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 08:16:25 2009 -0800 winhttp: Free OpenSSL error strings at unload. --- dlls/winhttp/net.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6512db5..034b229 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -122,6 +122,7 @@ MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); +MAKE_FUNCPTR( ERR_free_strings ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); @@ -442,6 +443,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( CRYPTO_num_locks ); LOAD_FUNCPTR( CRYPTO_set_id_callback ); LOAD_FUNCPTR( CRYPTO_set_locking_callback ); + LOAD_FUNCPTR( ERR_free_strings ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); @@ -499,6 +501,7 @@ void netconn_unload( void ) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (libcrypto_handle) { + pERR_free_strings(); wine_dlclose( libcrypto_handle, NULL, 0 ); } if (libssl_handle)

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

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

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

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

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

Alistair Leslie-Hughes : shdocvw: Fix test for non-english IE MUI.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: d3f20ec1367055a59d3c13de8665fed8eb9bb112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f20ec1367055a59d3c13de8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 8 21:49:40 2009 +1100 shdocvw: Fix test for non-english IE MUI. --- dlls/shdocvw/tests/webbrowser.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index fba30be..cd82924 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1818,7 +1818,10 @@ static void test_ie_funcs(IUnknown *unk) /* Name */ hres = IWebBrowser2_get_Name(wb, &sName); ok(hres == S_OK, "getName failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(sName, "Microsoft Web Browser Control"), "got '%s', expected 'Microsoft Web Browser Control'\n", wine_dbgstr_w(sName)); + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) == LANG_ENGLISH) + ok(!strcmp_wa(sName, "Microsoft Web Browser Control"), "got '%s', expected 'Microsoft Web Browser Control'\n", wine_dbgstr_w(sName)); + else /* Non-English cannot be blank. */ + ok(sName!=NULL, "get_Name return a NULL string.\n"); SysFreeString(sName); /* Quit */

1 0

Alexandre Julliard : include: Remove useless definitions for nonexistent Win16 messages.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 49675df92eb9af894fc77ceb555b65e2e18a9421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49675df92eb9af894fc77ceb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 12:24:44 2009 +0100 include: Remove useless definitions for nonexistent Win16 messages. --- include/wine/winuser16.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index a1898d5..3dc9842 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -401,9 +401,6 @@ typedef struct #define SBM_SETRANGE16 (WM_USER+2) #define SBM_GETRANGE16 (WM_USER+3) #define SBM_ENABLE_ARROWS16 (WM_USER+4) -#define SBM_SETRANGEREDRAW16 WM_NULL /* Not in Win16 */ -#define SBM_SETSCROLLINFO16 WM_NULL /* Not in Win16 */ -#define SBM_GETSCROLLINFO16 WM_NULL /* Not in Win16 */ /* CBT hook structures */ @@ -449,9 +446,6 @@ typedef struct #define BM_GETSTATE16 (WM_USER+2) #define BM_SETSTATE16 (WM_USER+3) #define BM_SETSTYLE16 (WM_USER+4) -#define BM_CLICK16 WM_NULL /* Does not exist in Win16 */ -#define BM_GETIMAGE16 WM_NULL /* Does not exist in Win16 */ -#define BM_SETIMAGE16 WM_NULL /* Does not exist in Win16 */ /* Static Control Messages */ #define STM_SETICON16 (WM_USER+0) @@ -489,15 +483,6 @@ typedef struct #define EM_SETWORDBREAKPROC16 (WM_USER+32) #define EM_GETWORDBREAKPROC16 (WM_USER+33) #define EM_GETPASSWORDCHAR16 (WM_USER+34) -/* - not in win16: - EM_SETMARGINS16 WM_NULL - EM_GETMARGINS16 WM_NULL - EM_GETLIMITTEXT16 WM_NULL - EM_POSFROMCHAR16 WM_NULL - EM_CHARFROMPOS16 WM_NULL - EM_SETLIMITTEXT16 WM_NULL - no name change in win16 -*/ typedef struct {

1 0

Hans Leidekker : gdi32: Implement WineEngGetCharABCWidthsFloat and forward GetCharABCWidthsFloat to it .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 1d4fcc027035d11379cd462285b9ceb6b24eb803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4fcc027035d11379cd46228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 11 11:38:24 2009 +0100 gdi32: Implement WineEngGetCharABCWidthsFloat and forward GetCharABCWidthsFloat to it. --- dlls/gdi32/font.c | 40 +++++++++++++++++++++++----------------- dlls/gdi32/freetype.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ 3 files changed, 63 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f8f6f6..eea53fd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2908,34 +2908,40 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT a * RETURNS * Success: TRUE * Failure: FALSE - * - * BUGS - * Only works with TrueType fonts. It also doesn't return real - * floats but converted integers because it's implemented on - * top of GetCharABCWidthsW. */ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) { - ABC *abc, *abc_base; - unsigned int i, size = sizeof(ABC) * (last - first + 1); - BOOL ret; + UINT i; + BOOL ret = FALSE; + DC *dc = get_dc_ptr( hdc ); + + TRACE("%p, %d, %d, %p\n", hdc, first, last, abcf); + + if (!dc) return FALSE; - TRACE("%p, %d, %d, %p - partial stub\n", hdc, first, last, abcf); + if (!abcf) + { + release_dc_ptr( dc ); + return FALSE; + } - abc = abc_base = HeapAlloc( GetProcessHeap(), 0, size ); - if (!abc) return FALSE; + if (dc->gdiFont) + ret = WineEngGetCharABCWidthsFloat( dc->gdiFont, first, last, abcf ); + else + FIXME("stub\n"); - ret = GetCharABCWidthsW( hdc, first, last, abc ); if (ret) { - for (i = first; i <= last; i++, abc++, abcf++) + /* convert device units to logical */ + for (i = first; i <= last; i++, abcf++) { - abcf->abcfA = abc->abcA; - abcf->abcfB = abc->abcB; - abcf->abcfC = abc->abcC; + abcf->abcfA = abcf->abcfA * dc->xformVport2World.eM11; + abcf->abcfB = abcf->abcfB * dc->xformVport2World.eM11; + abcf->abcfC = abcf->abcfC * dc->xformVport2World.eM11; } } - HeapFree( GetProcessHeap(), 0, abc_base ); + + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ed37a25..a93cb60 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5913,6 +5913,38 @@ BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, } /************************************************************* + * WineEngGetCharABCWidthsFloat + * + */ +BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLOAT buffer) +{ + static const MAT2 identity = {{0,1}, {0,0}, {0,0}, {0,1}}; + UINT c; + GLYPHMETRICS gm; + FT_UInt glyph_index; + GdiFont *linked_font; + + TRACE("%p, %d, %d, %p\n", font, first, last, buffer); + + GDI_CheckNotLock(); + EnterCriticalSection( &freetype_cs ); + + for (c = first; c <= last; c++) + { + get_glyph_index_linked(font, c, &linked_font, &glyph_index); + WineEngGetGlyphOutline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, + &gm, 0, NULL, &identity); + buffer[c - first].abcfA = FONT_GM(linked_font, glyph_index)->lsb; + buffer[c - first].abcfB = FONT_GM(linked_font, glyph_index)->bbx; + buffer[c - first].abcfC = FONT_GM(linked_font, glyph_index)->adv - + FONT_GM(linked_font, glyph_index)->lsb - + FONT_GM(linked_font, glyph_index)->bbx; + } + LeaveCriticalSection( &freetype_cs ); + return TRUE; +} + +/************************************************************* * WineEngGetCharABCWidthsI * */ @@ -6605,6 +6637,12 @@ BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, return FALSE; } +BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLOAT buffer) +{ + ERR("called but we don't have FreeType\n"); + return FALSE; +} + BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 670ef41..d5f9112 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -412,6 +412,8 @@ extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngEnumFonts(LPLOGFONTW, FONTENUMPROCW, LPARAM) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, LPABC buffer) DECLSPEC_HIDDEN; +extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, + UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharWidth(GdiFont*, UINT, UINT, LPINT) DECLSPEC_HIDDEN;

1 0