February 2016 - Wine-commits

Alexandre Julliard : server: Remove some no longer used directory functions.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: b548f8c4a7b5bb82d6e1206939f638153aedce36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b548f8c4a7b5bb82d6e120693… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:23:40 2016 +0900 server: Remove some no longer used directory functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 29 ----------------------------- server/object.h | 4 ---- 2 files changed, 33 deletions(-) diff --git a/server/directory.c b/server/directory.c index 67d8089..6a5af9a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -228,28 +228,6 @@ struct directory *get_directory_obj( struct process *process, obj_handle_t handl return (struct directory *)get_handle_obj( process, handle, access, &directory_ops ); } -/****************************************************************************** - * Find an object by its name in a given root object - * - * PARAMS - * root [I] directory to start search from or NULL to start from \\ - * name [I] object name to search for - * attr [I] OBJECT_ATTRIBUTES.Attributes - * name_left [O] [optional] leftover name if object is not found - * - * RETURNS - * NULL: If params are invalid - * Found: If object with exact name is found returns that object - * (name_left->len == 0). Object's refcount is incremented - * Not found: The last matched parent. (name_left->len > 0) - * Parent's refcount is incremented. - */ -struct object *find_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, struct unicode_str *name_left ) -{ - return lookup_named_object( &root->obj, name, attr, name_left ); -} - /* create a named (if name is present) or unnamed object. */ void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attributes, const struct object_ops *ops ) @@ -257,13 +235,6 @@ void *create_named_object_dir( struct directory *root, const struct unicode_str return create_named_object( &root->obj, ops, name, attributes ); } -/* open a new handle to an existing object */ -void *open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops ) -{ - return open_named_object( &root->obj, ops, name, attr ); -} - /* retrieve an object type, creating it if needed */ struct object_type *get_object_type( const struct unicode_str *name ) { diff --git a/server/object.h b/server/object.h index f51fc71..566b6da 100644 --- a/server/object.h +++ b/server/object.h @@ -231,12 +231,8 @@ extern void release_global_atom( struct winstation *winstation, atom_t atom ); extern struct object *get_root_directory(void); extern struct directory *get_directory_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern struct object *find_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, struct unicode_str *name_left ); extern void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct object_ops *ops ); -extern void *open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops ); extern struct object_type *get_object_type( const struct unicode_str *name ); extern int directory_link_name( struct object *obj, struct object_name *name, struct object *parent ); extern void init_directories(void);

1 0

Jacek Caban : ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 443c2a4719cd366a254eaa387417c357935b5634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443c2a4719cd366a254eaa387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:11:07 2016 +0100 ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls. This is needed by Office 2013, which hooks those functions and expects flag to be set. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/directory.c | 2 +- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/path.c | 2 +- dlls/ntdll/reg.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 715a760..4aa1a72 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2449,7 +2449,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) attr.ObjectName = name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - return NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + return NtOpenFile( handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); } static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) @@ -2790,7 +2790,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { sxs_ai = *ai; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 04c8e26..93fe594 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3345,7 +3345,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, 0, &attr, &io, 0, + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &dirW ); if (status != STATUS_SUCCESS) goto done; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5bcc03e..bf1d365 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2149,7 +2149,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -2184,7 +2184,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index feaac9e..ae0646a 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -984,7 +984,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - nts = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + nts = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (nts != STATUS_SUCCESS) goto out; /* don't keep the directory handle open on removable media */ diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 77126de..6156409 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -659,7 +659,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil TRACE("(%p,%p)\n", attr, file); - ret = NtCreateFile(&hive, GENERIC_READ, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, + ret = NtCreateFile(&hive, GENERIC_READ | SYNCHRONIZE, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, 0, NULL, 0); if (ret) return ret;

1 0

Jacek Caban : ntdll: Don't call NtOpenKeyEx directly from NtOpenKey.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 7f005dc43cf76d09c9646969db1fa16639a1d960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f005dc43cf76d09c9646969d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 9 12:12:43 2016 +0100 ntdll: Don't call NtOpenKeyEx directly from NtOpenKey. Needed by Office 2013. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 6156409..8af2181 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -120,11 +120,7 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC return NtCreateKey(retkey, access, attr, 0, NULL, 0, dispos); } -/****************************************************************************** - * NtOpenKeyEx [NTDLL.@] - * ZwOpenKeyEx [NTDLL.@] - */ -NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +static NTSTATUS open_key( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; @@ -151,6 +147,15 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT } /****************************************************************************** + * NtOpenKeyEx [NTDLL.@] + * ZwOpenKeyEx [NTDLL.@] + */ +NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +{ + return open_key( retkey, access, attr, options ); +} + +/****************************************************************************** * NtOpenKey [NTDLL.@] * ZwOpenKey [NTDLL.@] * @@ -160,7 +165,7 @@ NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT */ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { - return NtOpenKeyEx( retkey, access, attr, 0 ); + return open_key( retkey, access, attr, 0 ); } NTSTATUS WINAPI NtOpenKeyTransactedEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr,

1 0

Hugh McMaster : reg: Split reg_printfW into separate functions.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: bfcee1f149f566452790049ce6591cf024608642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcee1f149f566452790049ce… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 9 22:54:02 2016 +1100 reg: Split reg_printfW into separate functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e7729a3..7fddf62 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -74,19 +74,11 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -static int reg_printfW(const WCHAR *msg, ...) +static void output_writeconsole(const WCHAR *str, int wlen) { - va_list va_args; - int wlen; DWORD count, ret; - WCHAR msg_buffer[8192]; - - va_start(va_args, msg); - vsnprintfW(msg_buffer, 8192, msg, va_args); - va_end(va_args); - wlen = lstrlenW(msg_buffer); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); if (!ret) { DWORD len; @@ -96,29 +88,41 @@ static int reg_printfW(const WCHAR *msg, ...) * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); - if (!msgA) - return 0; + if (!msgA) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); } +} - return count; +static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) +{ + WCHAR msg_buffer[8192]; + int len; + + len = vsnprintfW(msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR), fmt, va_args); + output_writeconsole(msg_buffer, len); } -static int reg_message(int msg) +static void reg_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR)); - return reg_printfW(formatW, msg_buffer); + output_writeconsole(msg_buffer, strlenW(msg_buffer)); +} + +static void __cdecl output_string(const WCHAR *fmt, ...) +{ + __ms_va_list va_args; + + __ms_va_start(va_args, fmt); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); } static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name) @@ -193,7 +197,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r val = strtolW(data, &rest, 0); if (rest == data) { static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0}; - reg_printfW(nonnumber); + output_string(nonnumber); break; } *reg_count = sizeof(DWORD); @@ -227,14 +231,14 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r no_hex_data: /* cleanup, print error */ HeapFree(GetProcessHeap(), 0, out_data); - reg_printfW(nohex); + output_string(nohex); out_data = NULL; break; } default: { static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; - reg_printfW(unhandled, reg_type,data); + output_string(unhandled, reg_type, data); } } @@ -443,7 +447,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, { static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; - reg_printfW(stubW, key_name, value_name, value_empty, subkey); + output_string(stubW, key_name, value_name, value_empty, subkey); return 1; }

1 0

Hugh McMaster : reg: Use FormatMessage for easier internationalization support.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: dfe1c2b57cbf5b99131136981b38e843ab832dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe1c2b57cbf5b99131136981… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 9 22:54:03 2016 +1100 reg: Use FormatMessage for easier internationalization support. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7fddf62..33ae0cd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -18,10 +18,13 @@ #include <windows.h> #include <wine/unicode.h> +#include <wine/debug.h> #include "reg.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +WINE_DEFAULT_DEBUG_CHANNEL(reg); + static const WCHAR short_hklm[] = {'H','K','L','M',0}; static const WCHAR short_hkcu[] = {'H','K','C','U',0}; static const WCHAR short_hkcr[] = {'H','K','C','R',0}; @@ -74,7 +77,7 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -static void output_writeconsole(const WCHAR *str, int wlen) +static void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; @@ -100,11 +103,19 @@ static void output_writeconsole(const WCHAR *str, int wlen) static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) { - WCHAR msg_buffer[8192]; - int len; + WCHAR *str; + DWORD len; - len = vsnprintfW(msg_buffer, sizeof(msg_buffer)/sizeof(WCHAR), fmt, va_args); - output_writeconsole(msg_buffer, len); + SetLastError(NO_ERROR); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, + fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + if (len == 0 && GetLastError() != NO_ERROR) + { + WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + return; + } + output_writeconsole(str, len); + LocalFree(str); } static void reg_message(int msg) @@ -237,7 +248,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r } default: { - static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; + static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','1','!','x','!',' ',' ','d','a','t','a',' ','%','2','\n',0}; output_string(unhandled, reg_type, data); } } @@ -446,7 +457,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL subkey) { static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', - '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; + '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; output_string(stubW, key_name, value_name, value_empty, subkey); return 1;

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of test failures on limited user accounts.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: b35642f5161f5c2016d3d25846ef23ec92bd87ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b35642f5161f5c2016d3d2584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 12:01:30 2016 +0900 ntdll/tests: Fix a couple of test failures on limited user accounts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 6957ef3..d00a496 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -591,8 +591,9 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - pNtClose( subkey ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); /* the REGISTRY part is case-sensitive unless OBJ_CASE_INSENSITIVE is specified */ @@ -605,14 +606,16 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - pNtClose( subkey ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - pNtClose( subkey ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pNtClose(key);

1 0

Jacek Caban : mshtml/tests: Fixed style tests on IE6.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 433f82c74e5b203d35b00f015841ec2b448542eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=433f82c74e5b203d35b00f015… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 17:52:17 2016 +0100 mshtml/tests: Fixed style tests on IE6. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/style.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94ccc76..3da1a70 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2935,14 +2935,17 @@ static void test_current_style(IHTMLCurrentStyle *current_style) IHTMLCurrentStyle3_Release(current_style3); hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)&current_style4); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); - - hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); - ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); - VariantClear(&v); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); + ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); + VariantClear(&v); - IHTMLCurrentStyle4_Release(current_style4); + IHTMLCurrentStyle4_Release(current_style4); + }else { + win_skip("IHTMLCurrentStyle4 not supported.\n"); + } } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>";

1 0

Jacek Caban : mshtml/tests: Fixed xmlhttprequest tests on IE7.
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: f614d7fa5283b30a058f2537dde77bd27ddb3b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f614d7fa5283b30a058f2537d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 8 18:12:54 2016 +0100 mshtml/tests: Fixed xmlhttprequest tests on IE7. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index b402aeb..dd8e797 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -83,7 +83,7 @@ DEFINE_EXPECT(xmlhttprequest_onreadystatechange_loading); DEFINE_EXPECT(xmlhttprequest_onreadystatechange_done); #define test_disp(u,id) _test_disp(__LINE__,u,id) -static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) +static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const IID *broken_diid) { IDispatchEx *dispex; ITypeInfo *typeinfo; @@ -108,8 +108,9 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres); - ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid), "unexpected guid %s\n", - wine_dbgstr_guid(&type_attr->guid)); + ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid) + || broken(broken_diid && IsEqualGUID(&type_attr->guid, broken_diid)), + "unexpected guid %s\n", wine_dbgstr_guid(&type_attr->guid)); ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); ITypeInfo_Release(typeinfo); @@ -118,9 +119,9 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) IDispatchEx_Release(dispex); } -#define test_event_args(a,b,c,d,e,f,g) _test_event_args(__LINE__,a,b,c,d,e,f,g) -static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD wFlags, DISPPARAMS *pdp, - VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +#define test_event_args(a,b,c,d,e,f,g,h) _test_event_args(__LINE__,a,b,c,d,e,f,g,h) +static void _test_event_args(unsigned line, const IID *dispiid, const IID *broken_dispiid, DISPID id, WORD wFlags, + DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { ok_(__FILE__,line) (id == DISPID_VALUE, "id = %d\n", id); ok_(__FILE__,line) (wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); @@ -135,7 +136,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) - _test_disp(line, (IUnknown*)V_DISPATCH(pdp->rgvarg), dispiid); + _test_disp(line, (IUnknown*)V_DISPATCH(pdp->rgvarg), dispiid, broken_dispiid); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -241,7 +242,7 @@ static HRESULT WINAPI xmlhttprequest_onreadystatechange(IDispatchEx *iface, DISP LONG val; HRESULT hres; - test_event_args(&DIID_DispHTMLXMLHttpRequest, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_args(&DIID_DispHTMLXMLHttpRequest, &IID_IHTMLXMLHttpRequest, id, wFlags, pdp, pvarRes, pei, pspCaller); hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); ok(hres == S_OK, "get_readyState failed: %08x\n", hres);

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_update_overlay().
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: 02008a6f2e373ba4ff06deb8ca124ecd65b57227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02008a6f2e373ba4ff06deb8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:01 2016 +0100 wined3d: Introduce wined3d_texture_update_overlay(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 22 +++++++++++----- dlls/wined3d/surface.c | 47 ---------------------------------- dlls/wined3d/texture.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 ++-- 5 files changed, 84 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02008a6f2e373ba4ff06d…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_surface_update_overlay_z_order ().
by Alexandre Julliard 09 Feb '16

09 Feb '16

Module: wine Branch: master Commit: f0053d06c4fc168360da638fa26f1927fe975262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0053d06c4fc168360da638fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:02 2016 +0100 wined3d: Get rid of wined3d_surface_update_overlay_z_order(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 22 +++++++++------------- dlls/wined3d/surface.c | 14 -------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 5 files changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f2399e4..d73d87b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -162,7 +162,6 @@ struct ddraw_surface /* Connections to other Objects */ struct ddraw *ddraw; - struct wined3d_surface *wined3d_surface; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; struct wined3d_rendertarget_view *wined3d_rtv; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9b7d76e..d5ebe31 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1216,7 +1216,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; struct wined3d_texture *texture; IDirectDrawSurface7 *current; - struct wined3d_surface *tmp; HRESULT hr; TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); @@ -1237,7 +1236,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); - tmp = dst_impl->wined3d_surface; if (dst_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; @@ -1269,7 +1267,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); - dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); if (src_impl->sub_resource_idx) @@ -1301,7 +1298,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(src_impl->wined3d_texture, 0), dst_impl); - dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; @@ -1319,7 +1315,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; wined3d_resource_set_parent(wined3d_texture_get_sub_resource(texture, 0), src_impl); - src_impl->wined3d_surface = tmp; wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; @@ -3843,20 +3838,22 @@ static HRESULT WINAPI ddraw_surface1_UpdateOverlayDisplay(IDirectDrawSurface *if * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_UpdateOverlayZOrder(IDirectDrawSurface7 *iface, - DWORD Flags, IDirectDrawSurface7 *DDSRef) + DWORD flags, IDirectDrawSurface7 *reference) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface7(DDSRef); - HRESULT hr; - TRACE("iface %p, flags %#x, reference %p.\n", iface, Flags, DDSRef); + FIXME("iface %p, flags %#x, reference %p stub!\n", iface, flags, reference); wined3d_mutex_lock(); - hr = wined3d_surface_update_overlay_z_order(surface->wined3d_surface, - Flags, reference_impl ? reference_impl->wined3d_surface : NULL); + if (!(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_OVERLAY)) + { + WARN("Not an overlay surface.\n"); + wined3d_mutex_unlock(); + return DDERR_NOTAOVERLAYSURFACE; + } wined3d_mutex_unlock(); - return hr; + return DD_OK; } static HRESULT WINAPI ddraw_surface4_UpdateOverlayZOrder(IDirectDrawSurface4 *iface, @@ -6302,7 +6299,6 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, } desc->lpSurface = NULL; - surface->wined3d_surface = wined3d_surface; wined3d_texture_incref(surface->wined3d_texture = wined3d_texture); surface->sub_resource_idx = sub_resource_idx; *parent_ops = &ddraw_surface_wined3d_parent_ops; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 53f4d09..11db96e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1909,20 +1909,6 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT CDECL wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, - DWORD flags, struct wined3d_surface *ref) -{ - FIXME("surface %p, flags %#x, ref %p stub!\n", surface, flags, ref); - - if (!(surface->resource.usage & WINED3DUSAGE_OVERLAY)) - { - TRACE("Not an overlay surface.\n"); - return WINEDDERR_NOTAOVERLAYSURFACE; - } - - return WINED3D_OK; -} - HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 53eb97a..d31cf9a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -224,7 +224,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) -@ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40f3d49..0b8bf7b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2477,8 +2477,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_update_overlay_z_order(struct wined3d_surface *surface, - DWORD flags, struct wined3d_surface *ref); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain);

1 0