March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Don' t try to create the owner window if it belongs to a different thread.
by Alexandre Julliard March 2, 2010

March 2, 2010

Module: wine Branch: master Commit: 9cd1ce2510536e73cb94dc99ea29a9d189288f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd1ce2510536e73cb94dc99e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 17:06:19 2010 +0100 winex11: Don't try to create the owner window if it belongs to a different thread. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1847527..47f7245 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1005,7 +1005,8 @@ static Window get_owner_whole_window( HWND owner ) if (!(data = X11DRV_get_win_data( owner ))) { - if (!(data = X11DRV_create_win_data( owner ))) + if (GetWindowThreadProcessId( owner, NULL ) != GetCurrentThreadId() || + !(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } else if (!data->managed) /* make it managed */

1 0

Alexandre Julliard : server: Add a separate function for internal registry key creation.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 22de1f43d9c2840814cfb8e7445684499e9ee749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22de1f43d9c2840814cfb8e74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:13:46 2010 +0100 server: Add a separate function for internal registry key creation. --- server/registry.c | 81 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 59 insertions(+), 22 deletions(-) diff --git a/server/registry.c b/server/registry.c index ef38c8e..52b65a7 100644 --- a/server/registry.c +++ b/server/registry.c @@ -653,8 +653,8 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un /* create a subkey */ static struct key *create_key( struct key *key, const struct unicode_str *name, - const struct unicode_str *class, int flags, unsigned int options, - unsigned int attributes, timeout_t modif, int *created ) + const struct unicode_str *class, unsigned int options, + unsigned int attributes, int *created ) { struct key *base; int index; @@ -699,26 +699,23 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, } goto done; } - if (options & REG_OPTION_VOLATILE) - { - flags = (flags & ~KEY_DIRTY) | KEY_VOLATILE; - } - else if (key->flags & KEY_VOLATILE) + if ((key->flags & KEY_VOLATILE) && !(options & REG_OPTION_VOLATILE)) { set_error( STATUS_CHILD_MUST_BE_VOLATILE ); return NULL; } *created = 1; - if (flags & KEY_DIRTY) make_dirty( key ); - if (!(key = alloc_subkey( key, &token, index, modif ))) return NULL; + make_dirty( key ); + if (!(key = alloc_subkey( key, &token, index, current_time ))) return NULL; base = key; for (;;) { - key->flags |= flags; + if (options & REG_OPTION_VOLATILE) key->flags |= KEY_VOLATILE; + else key->flags |= KEY_DIRTY; get_path_token( name, &token ); if (!token.len) break; /* we know the index is always 0 in a new key */ - if (!(key = alloc_subkey( key, &token, 0, modif ))) + if (!(key = alloc_subkey( key, &token, 0, current_time ))) { free_subkey( base, index ); return NULL; @@ -738,6 +735,49 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, return key; } +/* recursively create a subkey (for internal use only) */ +static struct key *create_key_recursive( struct key *key, const struct unicode_str *name, timeout_t modif ) +{ + struct key *base; + int index; + struct unicode_str token; + + token.str = NULL; + if (!get_path_token( name, &token )) return NULL; + while (token.len) + { + struct key *subkey; + if (!(subkey = find_subkey( key, &token, &index ))) break; + key = subkey; + if (!(key = follow_symlink( key, 0 ))) + { + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); + return NULL; + } + get_path_token( name, &token ); + } + + if (token.len) + { + if (!(key = alloc_subkey( key, &token, index, modif ))) return NULL; + base = key; + for (;;) + { + get_path_token( name, &token ); + if (!token.len) break; + /* we know the index is always 0 in a new key */ + if (!(key = alloc_subkey( key, &token, 0, modif ))) + { + free_subkey( base, index ); + return NULL; + } + } + } + + grab_object( key ); + return key; +} + /* query information about a key or a subkey */ static void enum_key( const struct key *key, int index, int info_class, struct enum_key_reply *reply ) @@ -1191,7 +1231,7 @@ static int get_data_type( const char *buffer, int *type, int *parse_type ) } /* load and create a key from the input file */ -static struct key *load_key( struct key *base, const char *buffer, int flags, +static struct key *load_key( struct key *base, const char *buffer, int prefix_len, struct file_load_info *info ) { WCHAR *p; @@ -1227,7 +1267,7 @@ static struct key *load_key( struct key *base, const char *buffer, int flags, } name.str = p; name.len = len - (p - info->tmp + 1) * sizeof(WCHAR); - return create_key( base, &name, NULL, flags, 0, 0, modif, &res ); + return create_key_recursive( base, &name, modif ); } /* load a key option from the input file */ @@ -1440,7 +1480,7 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi case '[': /* new key */ if (subkey) release_object( subkey ); if (prefix_len == -1) prefix_len = get_prefix_len( key, p + 1, &info ); - if (!(subkey = load_key( key, p + 1, key->flags, prefix_len, &info ))) + if (!(subkey = load_key( key, p + 1, prefix_len, &info ))) file_read_error( "Error creating key", &info ); break; case '@': /* default value */ @@ -1544,9 +1584,7 @@ void init_registry(void) WCHAR *current_user_path; struct unicode_str current_user_str; - struct key *key; - int dummy; /* switch to the config dir */ @@ -1559,7 +1597,7 @@ void init_registry(void) /* load system.reg into Registry\Machine */ - if (!(key = create_key( root_key, &HKLM_name, NULL, 0, 0, 0, current_time, &dummy ))) + if (!(key = create_key_recursive( root_key, &HKLM_name, current_time ))) fatal_error( "could not create Machine registry key\n" ); load_init_registry_from_file( "system.reg", key ); @@ -1567,7 +1605,7 @@ void init_registry(void) /* load userdef.reg into Registry\User\.Default */ - if (!(key = create_key( root_key, &HKU_name, NULL, 0, 0, 0, current_time, &dummy ))) + if (!(key = create_key_recursive( root_key, &HKU_name, current_time ))) fatal_error( "could not create User\\.Default registry key\n" ); load_init_registry_from_file( "userdef.reg", key ); @@ -1578,7 +1616,7 @@ void init_registry(void) /* FIXME: match default user in token.c. should get from process token instead */ current_user_path = format_user_registry_path( security_interactive_sid, &current_user_str ); if (!current_user_path || - !(key = create_key( root_key, &current_user_str, NULL, 0, 0, 0, current_time, &dummy ))) + !(key = create_key_recursive( root_key, &current_user_str, current_time ))) fatal_error( "could not create HKEY_CURRENT_USER registry key\n" ); free( current_user_path ); load_init_registry_from_file( "user.reg", key ); @@ -1771,8 +1809,7 @@ DECL_HANDLER(create_key) /* NOTE: no access rights are required from the parent handle to create a key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - if ((key = create_key( parent, &name, &class, KEY_DIRTY, req->options, - req->attributes, current_time, &reply->created ))) + if ((key = create_key( parent, &name, &class, req->options, req->attributes, &reply->created ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); @@ -1927,7 +1964,7 @@ DECL_HANDLER(load_registry) { int dummy; get_req_path( &name, !req->hkey ); - if ((key = create_key( parent, &name, NULL, KEY_DIRTY, 0, 0, current_time, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, 0, &dummy ))) { load_registry( key, req->file ); release_object( key );

1 0

Alexandre Julliard : ntdll/tests: Add tests showing that NtCreateKey is not recursive.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: ef4a9cadf58c868671d2daf9c18602ad2673d790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4a9cadf58c868671d2daf9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:24:05 2010 +0100 ntdll/tests: Add tests showing that NtCreateKey is not recursive. --- dlls/ntdll/tests/reg.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 79e5ece..d534240 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -367,9 +367,10 @@ static void test_NtCreateKey(void) { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - HANDLE key; + HANDLE key, subkey; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; + UNICODE_STRING str; /* All NULL */ status = pNtCreateKey(NULL, 0, NULL, 0, 0, 0, 0); @@ -397,14 +398,51 @@ static void test_NtCreateKey(void) status = pNtCreateKey(NULL, 0, &attr, 0, 0, 0, 0); ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); - status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); - ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08x\n", status); - /* Length > sizeof(OBJECT_ATTRIBUTES) */ attr.Length *= 2; status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + attr.Length = sizeof(attr); + status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08x\n", status); + + attr.RootDirectory = key; + attr.ObjectName = &str; + + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\sub\\key" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND), /* nt4 */ + "NtCreateKey failed: 0x%08x\n", status ); + if (status == STATUS_SUCCESS) + { + pNtDeleteKey( subkey ); + pNtClose( subkey ); + } + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pRtlFreeUnicodeString( &str ); + pNtDeleteKey( subkey ); + pNtClose( subkey ); + pNtClose(key); }

1 0

Alexandre Julliard : advapi32: Create keys recursively if necessary.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 972f96d6c4c743659f3d6337241cacb4ce7e1d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972f96d6c4c743659f3d63372… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:12:12 2010 +0100 advapi32: Create keys recursively if necessary. --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index faae2b1..dd3f516 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -91,15 +91,47 @@ static inline int is_version_nt(void) return !(GetVersion() & 0x80000000); } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + const UNICODE_STRING *class, ULONG options, PULONG dispos ) +{ + NTSTATUS status = NtCreateKey( (HANDLE *)retkey, access, attr, 0, class, options, dispos ); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DWORD attrs, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + + while (i < len && attr->ObjectName->Buffer[i] != '\\') i++; + if (i == len) return status; + attrs = attr->Attributes; + attr->Attributes &= ~OBJ_OPENLINK; + + while (i < len) + { + attr->ObjectName->Length = i * sizeof(WCHAR); + status = NtCreateKey( (HANDLE *)retkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + if (status) return status; + NtClose( *retkey ); + while (i < len && attr->ObjectName->Buffer[i] == '\\') i++; + while (i < len && attr->ObjectName->Buffer[i] != '\\') i++; + } + attr->Attributes = attrs; + attr->ObjectName->Length = len * sizeof(WCHAR); + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + return status; +} + /* create one of the HKEY_* special root keys */ -static HKEY create_special_root_hkey( HANDLE hkey, DWORD access ) +static HKEY create_special_root_hkey( HKEY hkey, DWORD access ) { HKEY ret = 0; int idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; if (hkey == HKEY_CURRENT_USER) { - if (RtlOpenCurrentUser( access, &hkey )) return 0; + if (RtlOpenCurrentUser( access, (HANDLE *)&hkey )) return 0; TRACE( "HKEY_CURRENT_USER -> %p\n", hkey ); /* don't cache the key in the table if caching is disabled */ @@ -118,7 +150,7 @@ static HKEY create_special_root_hkey( HANDLE hkey, DWORD access ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &name, root_key_names[idx] ); - if (NtCreateKey( &hkey, access, &attr, 0, NULL, 0, NULL )) return 0; + if (create_key( &hkey, access, &attr, NULL, 0, NULL )) return 0; TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); } @@ -194,8 +226,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR RtlInitUnicodeString( &nameW, name ); RtlInitUnicodeString( &classW, class ); - return RtlNtStatusToDosError( NtCreateKey( (PHANDLE)retkey, access, &attr, 0, - &classW, options, dispos ) ); + return RtlNtStatusToDosError( create_key( retkey, access, &attr, &classW, options, dispos ) ); } @@ -254,7 +285,7 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl { if (!(status = RtlAnsiStringToUnicodeString( &classW, &classA, TRUE ))) { - status = NtCreateKey( (PHANDLE)retkey, access, &attr, 0, &classW, options, dispos ); + status = create_key( retkey, access, &attr, &classW, options, dispos ); RtlFreeUnicodeString( &classW ); } }

1 0

Reece Dunn : msxml3/tests: Improve the IObjectSecurity tests to cover msxml3 SP8+ behaviour.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 47016df9b719a57477156794b97c2860ed63957d URL: http://source.winehq.org/git/wine.git/?a=commit;h=47016df9b719a57477156794b… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Sun Feb 28 21:24:47 2010 +0000 msxml3/tests: Improve the IObjectSecurity tests to cover msxml3 SP8+ behaviour. --- dlls/msxml3/domdoc.c | 5 ++- dlls/msxml3/tests/domdoc.c | 119 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 103 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 41c1f41..a29e9b2 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2214,7 +2214,7 @@ static ULONG WINAPI xmldoc_Safety_Release(IObjectSafety *iface) return IXMLDocument_Release((IXMLDocument *)This); } -#define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA) +#define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) @@ -2238,6 +2238,9 @@ static HRESULT WINAPI xmldoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *ifa domdoc *This = impl_from_IObjectSafety(iface); TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + if ((dwOptionSetMask & ~SAFETY_SUPPORTED_OPTIONS) != 0) + return E_FAIL; + This->safeopt = dwEnabledOptions & dwOptionSetMask & SAFETY_SUPPORTED_OPTIONS; return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 929a35f..5f06d93 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5292,6 +5292,41 @@ static void test_put_nodeValue(void) IXMLDOMDocument_Release(doc); } +static void test_IObjectSafety_set(IObjectSafety *safety, HRESULT result, HRESULT result2, DWORD set, DWORD mask, DWORD expected, DWORD expected2) +{ + HRESULT hr; + DWORD enabled, supported; + + trace("testing IObjectSafety: enable=%08x, mask=%08x\n", set, mask); + + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, set, mask); + if (result == result2) + ok(hr == result, "SetInterfaceSafetyOptions: expected %08x, returned %08x\n", result, hr ); + else + ok(broken(hr == result) || hr == result2, + "SetInterfaceSafetyOptions: expected %08x, got %08x\n", result2, hr ); + + supported = enabled = 0xCAFECAFE; + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hr == S_OK, "ret %08x\n", hr ); + if (expected == expected2) + ok(enabled == expected, "Expected %08x, got %08x\n", expected, enabled); + else + ok(broken(enabled == expected) || enabled == expected2, + "Expected %08x, got %08x\n", expected2, enabled); + + /* reset the safety options */ + + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, + INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER, + 0); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(enabled == 0, "Expected 0, got %08x\n", enabled); +} + static void test_document_IObjectSafety(void) { IXMLDOMDocument *doc; @@ -5314,41 +5349,85 @@ static void test_document_IObjectSafety(void) hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok(hr == S_OK, "ret %08x\n", hr ); - ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)," + ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || + supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " "got %08x\n", supported); ok(enabled == 0, "Expected 0, got %08x\n", enabled); - /* set */ + + /* set -- individual flags */ + + test_IObjectSafety_set(safety, S_OK, S_OK, + INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER); + + test_IObjectSafety_set(safety, S_OK, S_OK, + INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA); + + test_IObjectSafety_set(safety, S_OK, S_OK, + INTERFACE_USES_SECURITY_MANAGER, INTERFACE_USES_SECURITY_MANAGER, + 0, INTERFACE_USES_SECURITY_MANAGER /* msxml3 SP8+ */); + + /* set INTERFACE_USES_DISPEX */ + + test_IObjectSafety_set(safety, S_OK, E_FAIL /* msxml3 SP8+ */, + INTERFACE_USES_DISPEX, INTERFACE_USES_DISPEX, + 0, 0); + + test_IObjectSafety_set(safety, S_OK, E_FAIL /* msxml3 SP8+ */, + INTERFACE_USES_DISPEX, 0, + 0, 0); + + test_IObjectSafety_set(safety, S_OK, S_OK /* msxml3 SP8+ */, + 0, INTERFACE_USES_DISPEX, + 0, 0); + + /* set option masking */ + + test_IObjectSafety_set(safety, S_OK, S_OK, + INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_CALLER); + + test_IObjectSafety_set(safety, S_OK, S_OK, + INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACESAFE_FOR_UNTRUSTED_DATA); + + test_IObjectSafety_set(safety, S_OK, S_OK, + INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA, + INTERFACE_USES_SECURITY_MANAGER, + 0, + 0); + + /* set -- inheriting previous settings */ + hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_CALLER); ok(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok(hr == S_OK, "ret %08x\n", hr ); - ok(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, - "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER, got %08x\n", enabled); - /* set unsupported */ - hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, - INTERFACE_USES_SECURITY_MANAGER | - INTERFACESAFE_FOR_UNTRUSTED_CALLER, - INTERFACE_USES_SECURITY_MANAGER); - ok(hr == S_OK, "ret %08x\n", hr ); - hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(enabled == 0, "Expected 0, got %08x\n", enabled); + todo_wine + ok(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || + enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", enabled); hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, - INTERFACESAFE_FOR_UNTRUSTED_CALLER, - INTERFACESAFE_FOR_UNTRUSTED_CALLER); - ok(hr == S_OK, "ret %08x\n", hr ); - hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA); ok(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok(hr == S_OK, "ret %08x\n", hr ); - ok(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA, - "Expected INTERFACESAFE_FOR_UNTRUSTED_DATA, got %08x\n", enabled); + todo_wine + ok(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), " + "got %08x\n", enabled); IObjectSafety_Release(safety);

1 0

Gerald Pfeifer : widl: Avoid two warnings.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 844e22093ecdd11fa2231ab3d4ef8850d20b4798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=844e22093ecdd11fa2231ab3d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 28 13:13:59 2010 +0100 widl: Avoid two warnings. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 2af7742..71b7ed6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2348,6 +2348,7 @@ static void check_field_common(const type_t *container_type, default: /* should be no other container types */ assert(0); + return; } if (is_attr(arg->attrs, ATTR_LENGTHIS) &&

1 0

Andrew Eikum : shlwapi: Ignore the hash of HTML URLs in UrlCombine.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 386cb659df0f7e7616d62332f6a116b8a0c74a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=386cb659df0f7e7616d62332f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 26 19:20:42 2010 -0600 shlwapi: Ignore the hash of HTML URLs in UrlCombine. --- dlls/shlwapi/tests/url.c | 5 ++++ dlls/shlwapi/url.c | 48 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3d86ae7..31df64e 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -278,6 +278,11 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"http://www.winehq.org/tests/../tests/", "/tests10/..", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests10/.."}, {"http://www.winehq.org/tests/../", "tests11", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../tests11"}, {"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"}, + {"file:///C:\\dir\\file.txt#hash\\hash", "test.txt", 0, S_OK, "file:///C:/dir/file.txt#hash/test.txt"}, + {"file:///C:\\dir\\file.html#hash\\hash", "test.html", 0, S_OK, "file:///C:/dir/test.html"}, + {"file:///C:\\dir\\file.htm#hash\\hash", "test.htm", 0, S_OK, "file:///C:/dir/test.htm"}, + {"file:///C:\\dir\\file.hTmL#hash\\hash", "test.hTmL", 0, S_OK, "file:///C:/dir/test.hTmL"}, + {"file:///C:\\dir.html\\file.txt#hash\\hash", "test.txt", 0, S_OK, "file:///C:/dir.html/file.txt#hash/test.txt"}, {"C:\\winehq\\winehq.txt", "C:\\Test\\test.txt", 0, S_OK, "file:///C:/Test/test.txt"}, {"http://www.winehq.org/test/", "test%20file.txt", 0, S_OK, "http://www.winehq.org/test/test%20file.txt"}, {"http://www.winehq.org/test/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/test/test%20file.txt"}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4a93b23..2fdae3d 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -630,6 +630,8 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, process_case = 1; } else do { + BOOL manual_search = FALSE; + /* mk is a special case */ if(base.nScheme == URL_SCHEME_MK) { static const WCHAR wsz[] = {':',':',0}; @@ -659,13 +661,45 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } } - /* Change .sizep2 to not have the last leaf in it, - * Note: we need to start after the location (if it exists) - */ - work = strrchrW((base.pszSuffix+sizeloc), '/'); - if (work) { - len = (DWORD)(work - base.pszSuffix + 1); - base.cchSuffix = len; + /* If there is a '#' and the characters immediately preceeding it are + * ".htm[l]", then begin looking for the last leaf starting from + * the '#'. Otherwise the '#' is not meaningful and just start + * looking from the end. */ + if ((work = strchrW(base.pszSuffix + sizeloc, '#'))) { + const WCHAR htmlW[] = {'.','h','t','m','l',0}; + const int len_htmlW = 5; + const WCHAR htmW[] = {'.','h','t','m',0}; + const int len_htmW = 4; + + if (work - base.pszSuffix > len_htmW * sizeof(WCHAR)) { + work -= len_htmW; + if (strncmpiW(work, htmW, len_htmW) == 0) + manual_search = TRUE; + work += len_htmW; + } + + if (!manual_search && + work - base.pszSuffix > len_htmlW * sizeof(WCHAR)) { + work -= len_htmlW; + if (strncmpiW(work, htmlW, len_htmlW) == 0) + manual_search = TRUE; + work += len_htmlW; + } + } + + if (manual_search) { + /* search backwards starting from the current position */ + while (*work != '/' && work > base.pszSuffix + sizeloc) + --work; + if (work > base.pszSuffix + sizeloc) + base.cchSuffix = work - base.pszSuffix + 1; + }else { + /* search backwards starting from the end of the string */ + work = strrchrW((base.pszSuffix+sizeloc), '/'); + if (work) { + len = (DWORD)(work - base.pszSuffix + 1); + base.cchSuffix = len; + } } /*

1 0

Alexandre Julliard : server: Make the standard registry key creation non-recursive.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 8eca1da43c25d6bd3fa82d853e58933021f82d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eca1da43c25d6bd3fa82d853… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:14:50 2010 +0100 server: Make the standard registry key creation non-recursive. --- server/registry.c | 41 +++++++++++++++++++---------------------- 1 files changed, 19 insertions(+), 22 deletions(-) diff --git a/server/registry.c b/server/registry.c index 52b65a7..ea7ea20 100644 --- a/server/registry.c +++ b/server/registry.c @@ -656,9 +656,8 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, const struct unicode_str *class, unsigned int options, unsigned int attributes, int *created ) { - struct key *base; int index; - struct unicode_str token; + struct unicode_str token, next; if (key->flags & KEY_DELETED) /* we cannot create a subkey under a deleted key */ { @@ -676,16 +675,14 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, key = subkey; get_path_token( name, &token ); if (!token.len) break; - if (!(subkey = follow_symlink( subkey, 0 ))) + if (!(key = follow_symlink( key, 0 ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return NULL; } } - /* create the remaining part */ - - if (!token.len) + if (!token.len) /* the key already exists */ { if (options & REG_OPTION_CREATE_LINK) { @@ -697,8 +694,20 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return NULL; } - goto done; + if (debug_level > 1) dump_operation( key, NULL, "Open" ); + grab_object( key ); + return key; } + + /* token must be the last path component at this point */ + next = token; + get_path_token( name, &next ); + if (next.len) + { + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); + return NULL; + } + if ((key->flags & KEY_VOLATILE) && !(options & REG_OPTION_VOLATILE)) { set_error( STATUS_CHILD_MUST_BE_VOLATILE ); @@ -707,23 +716,11 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, *created = 1; make_dirty( key ); if (!(key = alloc_subkey( key, &token, index, current_time ))) return NULL; - base = key; - for (;;) - { - if (options & REG_OPTION_VOLATILE) key->flags |= KEY_VOLATILE; - else key->flags |= KEY_DIRTY; - get_path_token( name, &token ); - if (!token.len) break; - /* we know the index is always 0 in a new key */ - if (!(key = alloc_subkey( key, &token, 0, current_time ))) - { - free_subkey( base, index ); - return NULL; - } - } + if (options & REG_OPTION_CREATE_LINK) key->flags |= KEY_SYMLINK; + if (options & REG_OPTION_VOLATILE) key->flags |= KEY_VOLATILE; + else key->flags |= KEY_DIRTY; - done: if (debug_level > 1) dump_operation( key, NULL, "Create" ); if (class && class->len) {

1 0

Henri Verbeet : winex11.drv: GetObject() already returns a DIB' s absolute height.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 724026dc5fd1e143a7e3812a3e4dcdeb39404b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724026dc5fd1e143a7e3812a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:57 2010 +0100 winex11.drv: GetObject() already returns a DIB's absolute height. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 0ff434f..27e495b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1953,10 +1953,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid /* If the source is a 1x1 bitmap, tiling is equivalent to stretching, but tiling is much faster. Therefore, we do no stretching in this case. */ - repeat_src = dib.dsBmih.biWidth == 1 && abs(dib.dsBmih.biHeight) == 1; + repeat_src = dib.dsBmih.biWidth == 1 && dib.dsBmih.biHeight == 1; if (xSrc < 0 || ySrc < 0 || widthSrc < 0 || heightSrc < 0 || xSrc + widthSrc > dib.dsBmih.biWidth - || ySrc + heightSrc > abs(dib.dsBmih.biHeight)) + || ySrc + heightSrc > dib.dsBmih.biHeight) { WARN("Invalid src coords: (%d,%d), size %dx%d\n", xSrc, ySrc, widthSrc, heightSrc); SetLastError(ERROR_INVALID_PARAMETER);

1 0

Alexandre Julliard : kernel32: Create the Nls\CodePage key one element at a time.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: ea3f48ff112175ae2a9e2367098ee2d182a9eb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3f48ff112175ae2a9e23670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:06:08 2010 +0100 kernel32: Create the Nls\CodePage key one element at a time. --- dlls/kernel32/locale.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 277f55c..7a141b2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -74,12 +74,6 @@ static const WCHAR szLocaleKeyName[] = { 'C','o','n','t','r','o','l','\\','N','l','s','\\','L','o','c','a','l','e',0 }; -static const WCHAR szCodepageKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0 -}; - static const WCHAR szLangGroupsKeyName[] = { 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -774,11 +768,26 @@ void LOCALE_InitRegistry(void) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { + static const WCHAR codepageW[] = + {'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0}; + OBJECT_ATTRIBUTES attr; HANDLE nls_key; + DWORD len = 14; - RtlInitUnicodeString( &nameW, szCodepageKeyName ); + RtlInitUnicodeString( &nameW, codepageW ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + while (codepageW[len]) + { + nameW.Length = len * sizeof(WCHAR); + if (NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) break; + NtClose( nls_key ); + len++; + while (codepageW[len] && codepageW[len] != '\\') len++; + } + nameW.Length = len * sizeof(WCHAR); if (!NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) { for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++)

1 0