February 2016 - Wine-Commits

Hugh McMaster : reg: Split reg_printfW into separate functions.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

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

Jacek Caban : ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

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

Alexandre Julliard : server: Implement object type for registry keys.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 3cde722e3adde4912c2c5bf1aa30e2a94dc246cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cde722e3adde4912c2c5bf1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:28:49 2016 +0900 server: Implement object type for registry keys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 5ca2a52..97b16ed 100644 --- a/server/registry.c +++ b/server/registry.c @@ -146,6 +146,7 @@ struct file_load_info static void key_dump( struct object *obj, int verbose ); +static struct object_type *key_get_type( struct object *obj ); static unsigned int key_map_access( struct object *obj, unsigned int access ); static struct security_descriptor *key_get_sd( struct object *obj ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); @@ -155,7 +156,7 @@ static const struct object_ops key_ops = { sizeof(struct key), /* size */ key_dump, /* dump */ - no_get_type, /* get_type */ + key_get_type, /* get_type */ no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -302,6 +303,13 @@ static void key_dump( struct object *obj, int verbose ) fprintf( stderr, "\n" ); } +static struct object_type *key_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'K','e','y'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + /* notify waiter and maybe delete the notification */ static void do_notification( struct key *key, struct notify *notify, int del ) {

1 0

Alexandre Julliard : server: Allow lookup_name to distinguish the case of an empty path.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 7ad32cf56a2ecb23ee81b9f61cb8a240f6cb79bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad32cf56a2ecb23ee81b9f61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 20:16:27 2016 +0900 server: Allow lookup_name to distinguish the case of an empty path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 1 - server/directory.c | 6 +++--- server/mailslot.c | 2 ++ server/named_pipe.c | 2 ++ server/object.c | 10 ++++++---- server/symlink.c | 4 +++- server/winstation.c | 8 ++------ 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 20d68b2..35c9d0d 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -225,7 +225,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); diff --git a/server/directory.c b/server/directory.c index 15ace1e..312a845 100644 --- a/server/directory.c +++ b/server/directory.c @@ -144,6 +144,8 @@ static struct object *directory_lookup_name( struct object *obj, struct unicode_ assert( obj->ops == &directory_ops ); + if (!name) return NULL; /* open the directory itself */ + if (!(p = memchrW( name->str, '\\', name->len / sizeof(WCHAR) ))) /* Last element in the path name */ tmp.len = name->len; @@ -165,14 +167,12 @@ static struct object *directory_lookup_name( struct object *obj, struct unicode_ return found; } - if (name->str) + if (name->str) /* not the last element */ { if (tmp.len == 0) /* Double backslash */ set_error( STATUS_OBJECT_NAME_INVALID ); else if (p) /* Path still has backslashes */ set_error( STATUS_OBJECT_PATH_NOT_FOUND ); - else - clear_error(); } return NULL; } diff --git a/server/mailslot.c b/server/mailslot.c index eb3c0a6..262c4f6 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -370,6 +370,8 @@ static struct object *mailslot_device_lookup_name( struct object *obj, struct un assert( obj->ops == &mailslot_device_ops ); + if (!name) return NULL; /* open the device itself */ + if ((found = find_object( device->mailslots, name, attr | OBJ_CASE_INSENSITIVE ))) name->len = 0; diff --git a/server/named_pipe.c b/server/named_pipe.c index 934b6a3..4dbc0f3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -473,6 +473,8 @@ static struct object *named_pipe_device_lookup_name( struct object *obj, struct assert( obj->ops == &named_pipe_device_ops ); assert( device->pipes ); + if (!name) return NULL; /* open the device itself */ + if ((found = find_object( device->pipes, name, attr | OBJ_CASE_INSENSITIVE ))) name->len = 0; diff --git a/server/object.c b/server/object.c index 2b8b245..2229070 100644 --- a/server/object.c +++ b/server/object.c @@ -217,7 +217,7 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st unsigned int attr, struct unicode_str *name_left ) { struct object *obj, *parent; - struct unicode_str name_tmp = *name; + struct unicode_str name_tmp = *name, *ptr = &name_tmp; if (root) { @@ -242,9 +242,11 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st parent = get_root_directory(); } - if (!name_tmp.len) goto done; + if (!name_tmp.len) ptr = NULL; /* special case for empty path */ - while ((obj = parent->ops->lookup_name( parent, &name_tmp, attr ))) + clear_error(); + + while ((obj = parent->ops->lookup_name( parent, ptr, attr ))) { /* move to the next element */ release_object ( parent ); @@ -256,7 +258,6 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st return NULL; } - done: if (name_left) *name_left = name_tmp; return parent; } @@ -617,6 +618,7 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { + if (!name) set_error( STATUS_OBJECT_TYPE_MISMATCH ); return NULL; } diff --git a/server/symlink.c b/server/symlink.c index bd09d34..048cd5d 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -99,11 +99,13 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st struct object *target; assert( obj->ops == &symlink_ops ); + + if (!name) return NULL; if (!name->len && (attr & OBJ_OPENLINK)) return NULL; target_str.str = symlink->target; target_str.len = symlink->len; - if ((target = find_object_dir( NULL, &target_str, attr, &name_left ))) + if ((target = lookup_named_object( NULL, &target_str, attr, &name_left ))) { if (name_left.len) { diff --git a/server/winstation.c b/server/winstation.c index 6cfbf1d..5d20cdc 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -110,12 +110,6 @@ static struct winstation *create_winstation( struct directory *root, const struc { struct winstation *winstation; - if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ - { - set_error( STATUS_INVALID_PARAMETER ); - return NULL; - } - if ((winstation = create_named_object_dir( root, name, attr, &winstation_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) @@ -165,6 +159,8 @@ static struct object *winstation_lookup_name( struct object *obj, struct unicode assert( obj->ops == &winstation_ops ); + if (!name) return NULL; /* open the winstation itself */ + if (memchrW( name->str, '\\', name->len / sizeof(WCHAR) )) /* no backslash allowed in name */ { set_error( STATUS_OBJECT_PATH_SYNTAX_BAD );

1 0

Bernhard Übelacker : include: Implement todo_wine_if for usage in wine tests.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 9a08714c02ba9c5ba2fb18d1060cc27511e04d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a08714c02ba9c5ba2fb18d10… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Feb 9 10:40:01 2016 +0100 include: Implement todo_wine_if for usage in wine tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 29 ++++++++++++-------------- programs/cmd/tests/batch.c | 52 +++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bed44f9..0d81a24 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -56,9 +56,9 @@ extern int winetest_interactive; extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); -extern void winetest_start_todo( const char* platform ); +extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); -extern void winetest_end_todo( const char* platform ); +extern void winetest_end_todo(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern void winetest_add_failures( LONG new_failures ); @@ -118,10 +118,11 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #define win_skip win_skip_(__FILE__, __LINE__) #define trace trace_(__FILE__, __LINE__) -#define todo(platform) for (winetest_start_todo(platform); \ - winetest_loop_todo(); \ - winetest_end_todo(platform)) -#define todo_wine todo("wine") +#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_if(!strcmp(winetest_platform, "wine")) +#define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) #ifdef NONAMELESSUNION @@ -220,7 +221,7 @@ typedef struct { const char* current_file; /* file of current check */ int current_line; /* line of current check */ - int todo_level; /* current todo nesting level */ + unsigned int todo_level; /* current todo nesting level */ int todo_do_loop; char *str_pos; /* position in debug buffer */ char strings[2000]; /* buffer for debug strings */ @@ -395,11 +396,10 @@ void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __winetest_va_end(valist); } -void winetest_start_todo( const char* platform ) +void winetest_start_todo( int is_todo ) { tls_data* data=get_tls_data(); - if (strcmp(winetest_platform,platform)==0) - data->todo_level++; + data->todo_level = (data->todo_level << 1) | (is_todo != 0); data->todo_do_loop=1; } @@ -411,13 +411,10 @@ int winetest_loop_todo(void) return do_loop; } -void winetest_end_todo( const char* platform ) +void winetest_end_todo(void) { - if (strcmp(winetest_platform,platform)==0) - { - tls_data* data=get_tls_data(); - data->todo_level--; - } + tls_data* data=get_tls_data(); + data->todo_level >>= 1; } int winetest_get_mainargs( char*** pargv ) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 9b54089..7196609 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -273,11 +273,11 @@ static const char *compare_line(const char *out_line, const char *out_end, const static void test_output(const char *out_data, DWORD out_size, const char *exp_data, DWORD exp_size) { - const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; + const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err = NULL; DWORD line = 0; static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; static const char resync_cmd[] = {'-','-','-'}; - BOOL is_todo_wine, is_out_resync, is_exp_resync; + BOOL is_todo_wine, is_out_resync = FALSE, is_exp_resync = FALSE; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -287,32 +287,32 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); - if (is_todo_wine) { + if (is_todo_wine) exp_ptr += sizeof(todo_wine_cmd); - winetest_start_todo("wine"); - } - is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && - !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); - is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && - !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); - - err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); - if(err == out_nl) - ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", - line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if(err == exp_nl) - ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", - line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if (!err && is_todo_wine && is_out_resync && is_exp_resync) - /* Consider that the todo_wine was to deal with extra lines, - * not for the resync line itself - */ - err = NULL; - else - ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - if(is_todo_wine) winetest_end_todo("wine"); + todo_wine_if(is_todo_wine) + { + is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && + !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); + is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && + !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); + + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); + if(err == out_nl) + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if(err == exp_nl) + ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if (!err && is_todo_wine && is_out_resync && is_exp_resync) + /* Consider that the todo_wine was to deal with extra lines, + * not for the resync line itself + */ + err = NULL; + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + } if (is_exp_resync && err && is_todo_wine) {

1 0

Riccardo Bortolato : wined3d: Get rid of wined3d_device_get_surface_from_dc().
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: b278bb8f5670a123b25d51fd8c927cb4f896a574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b278bb8f5670a123b25d51fd8… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Feb 8 18:32:06 2016 +0100 wined3d: Get rid of wined3d_device_get_surface_from_dc(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 37 +++++++++++++++++++------------ dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 55 +++++++++++++++++++++++++++------------------- dlls/wined3d/device.c | 26 ---------------------- dlls/wined3d/surface.c | 7 ------ dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 7 files changed, 56 insertions(+), 74 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 89ce07a..5ffc951 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2621,29 +2621,38 @@ static HRESULT WINAPI ddraw4_GetDeviceIdentifier(IDirectDraw4 *iface, * Always returns DD_OK because it's a stub * *****************************************************************************/ -static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, - IDirectDrawSurface7 **Surface) +static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, + HDC dc, IDirectDrawSurface7 **surface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); - struct wined3d_surface *wined3d_surface; struct ddraw_surface *surface_impl; - TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); + TRACE("iface %p, dc %p, surface %p.\n", iface, dc, surface); + + if (!surface) + return E_INVALIDARG; - if (!Surface) return E_INVALIDARG; + if (!dc) + goto done; - if (!(wined3d_surface = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc))) + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface_impl, &ddraw->surface_list, struct ddraw_surface, surface_list_entry) { - TRACE("No surface found for dc %p.\n", hdc); - *Surface = NULL; - return DDERR_NOTFOUND; + if (surface_impl->dc != dc) + continue; + + TRACE("Found surface %p for dc %p.\n", surface_impl, dc); + *surface = &surface_impl->IDirectDrawSurface7_iface; + IDirectDrawSurface7_AddRef(*surface); + wined3d_mutex_unlock(); + return DD_OK; } + wined3d_mutex_unlock(); - surface_impl = wined3d_surface_get_parent(wined3d_surface); - *Surface = &surface_impl->IDirectDrawSurface7_iface; - IDirectDrawSurface7_AddRef(*Surface); - TRACE("Returning surface %p.\n", Surface); - return DD_OK; +done: + TRACE("No surface found for dc %p.\n", dc); + *surface = NULL; + return DDERR_NOTFOUND; } static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d73d87b..e6d8f3a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -197,6 +197,7 @@ struct ddraw_surface struct list surface_list_entry; DWORD Handle; + HDC dc; }; struct ddraw_texture diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d5ebe31..3286b97 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2103,48 +2103,53 @@ static HRESULT WINAPI ddraw_surface1_AddOverlayDirtyRect(IDirectDrawSurface *ifa * For details, see IWineD3DSurface::GetDC * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) +static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); HRESULT hr = DD_OK; - TRACE("iface %p, dc %p.\n", iface, hdc); + TRACE("iface %p, dc %p.\n", iface, dc); - if(!hdc) + if (!dc) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc); + hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc); - if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + if (SUCCEEDED(hr)) { - const struct ddraw_palette *palette; + surface->dc = *dc; - if (surface->palette) - palette = surface->palette; - else if (surface->ddraw->primary) - palette = surface->ddraw->primary->palette; - else - palette = NULL; + if (format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + { + const struct ddraw_palette *palette; + + if (surface->palette) + palette = surface->palette; + else if (surface->ddraw->primary) + palette = surface->ddraw->primary->palette; + else + palette = NULL; - if (palette) - wined3d_palette_apply_to_dc(palette->wineD3DPalette, *hdc); + if (palette) + wined3d_palette_apply_to_dc(palette->wineD3DPalette, *dc); + } } wined3d_mutex_unlock(); - switch(hr) + switch (hr) { - /* Some, but not all errors set *hdc to NULL. E.g. DCALREADYCREATED does not - * touch *hdc - */ + /* Some, but not all errors set *dc to NULL. E.g. DCALREADYCREATED + * does not touch *dc. */ case WINED3DERR_INVALIDCALL: - if(hdc) *hdc = NULL; + *dc = NULL; return DDERR_INVALIDPARAMS; - default: return hr; + default: + return hr; } } @@ -2205,11 +2210,15 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h TRACE("iface %p, dc %p.\n", iface, hdc); wined3d_mutex_lock(); - hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc); - if (SUCCEEDED(hr) && (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + if (SUCCEEDED(hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, hdc))) + { + surface->dc = NULL; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + hr = ddraw_surface_update_frontbuffer(surface, NULL, FALSE); + } wined3d_mutex_unlock(); + return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 14e1f51..2d45135 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5040,32 +5040,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } -struct wined3d_surface * CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc) -{ - struct wined3d_resource *resource; - - TRACE("device %p, dc %p.\n", device, dc); - - if (!dc) - return NULL; - - LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) - { - if (resource->type == WINED3D_RTYPE_SURFACE) - { - struct wined3d_surface *s = surface_from_resource(resource); - - if (s->hDC == dc) - { - TRACE("Found surface %p for dc %p.\n", s, dc); - return s; - } - } - } - - return NULL; -} - static int wined3d_sampler_compare(const void *key, const struct wine_rb_entry *entry) { const struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5ba3ac..8597404 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1883,13 +1883,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - return surface->resource.parent; -} - DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) { unsigned int alignment; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 532702e..5933b48 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,7 +84,6 @@ @ cdecl wined3d_device_get_stream_output(ptr long ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) -@ cdecl wined3d_device_get_surface_from_dc(ptr ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_texture(ptr long) @@ -221,7 +220,6 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) -@ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 420a55b..df95da9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2202,7 +2202,6 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device, UINT stream_idx, UINT *divider); -struct wined3d_surface * __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc); struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); @@ -2473,7 +2472,6 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); 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_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc,

1 0

Henri Verbeet : wined3d: Store custom pitches in the texture instead of the surface.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 195d16c8267fcd5085048b3513571e2fee0eb548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195d16c8267fcd5085048b351… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:05 2016 +0100 wined3d: Store custom pitches in the texture instead of the surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 ++++++-------- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 267d2f0..d5ba3ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1897,8 +1897,8 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (surface->pitch) - return surface->pitch; + if (surface->container->row_pitch) + return surface->container->row_pitch; alignment = surface->resource.device->surface_alignment; pitch = wined3d_format_calculate_pitch(surface->resource.format, surface->resource.width); @@ -1909,8 +1909,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) return pitch; } -HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, unsigned int pitch) +HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_resource *texture_resource = &surface->container->resource; unsigned int width, height; @@ -1959,20 +1958,19 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; valid_location = WINED3D_LOCATION_USER_MEMORY; } - surface->pitch = pitch; surface->resource.format = texture_resource->format; surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; - if (surface->pitch) + if (surface->container->row_pitch) { - surface->resource.size = height * surface->pitch; + surface->resource.size = height * surface->container->row_pitch; } else { /* User memory surfaces don't have the regular surface alignment. */ surface->resource.size = wined3d_format_calculate_size(texture_resource->format, 1, width, height, 1); - surface->pitch = wined3d_format_calculate_pitch(texture_resource->format, width); + surface->container->row_pitch = wined3d_format_calculate_pitch(texture_resource->format, width); } /* The format might be changed to a format that needs conversion. diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4ded4ca..0a084de 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -645,8 +645,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.height = height; texture->user_memory = mem; + texture->row_pitch = pitch; - return wined3d_surface_update_desc(surface, gl_info, pitch); + return wined3d_surface_update_desc(surface, gl_info); } void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ced1555..142cb93 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2365,6 +2365,7 @@ struct wined3d_texture GLenum target; void *user_memory; + unsigned int row_pitch; /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async @@ -2492,7 +2493,6 @@ struct wined3d_surface DWORD flags; - UINT pitch; UINT pow2Width; UINT pow2Height; @@ -2570,7 +2570,7 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, unsigned int pitch) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Store the "user_memory" pointer in the texture instead of the surface.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 77088e3faaded7f583903102240b9a2879a42fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77088e3faaded7f5839031022… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 8 18:32:04 2016 +0100 wined3d: Store the "user_memory" pointer in the texture instead of the surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/texture.c | 4 +++- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11db96e..267d2f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -488,7 +488,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win } if (location & WINED3D_LOCATION_USER_MEMORY) { - data->addr = surface->user_memory; + data->addr = surface->container->user_memory; data->buffer_object = 0; return; } @@ -567,7 +567,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_USER_MEMORY: - if (!surface->user_memory) + if (!surface->container->user_memory) ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); break; @@ -1910,7 +1910,7 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) } HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) + const struct wined3d_gl_info *gl_info, unsigned int pitch) { struct wined3d_resource *texture_resource = &surface->container->resource; unsigned int width, height; @@ -1954,7 +1954,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->flags &= ~SFLAG_NONPOW2; - if ((surface->user_memory = mem)) + if (surface->container->user_memory) { surface->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; valid_location = WINED3D_LOCATION_USER_MEMORY; @@ -2414,7 +2414,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ break; case WINED3D_LOCATION_USER_MEMORY: - base_memory = surface->user_memory; + base_memory = surface->container->user_memory; break; case WINED3D_LOCATION_DIB: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c48c91..4ded4ca 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -644,7 +644,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.width = width; texture->resource.height = height; - return wined3d_surface_update_desc(surface, gl_info, mem, pitch); + texture->user_memory = mem; + + return wined3d_surface_update_desc(surface, gl_info, pitch); } void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea47bbf..ced1555 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2364,6 +2364,8 @@ struct wined3d_texture DWORD flags; GLenum target; + void *user_memory; + /* May only be accessed from the command stream worker thread. */ struct wined3d_texture_async { @@ -2486,7 +2488,6 @@ struct wined3d_surface struct wined3d_resource resource; const struct wined3d_surface_ops *surface_ops; struct wined3d_texture *container; - void *user_memory; DWORD locations; DWORD flags; @@ -2569,7 +2570,7 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN; + const struct wined3d_gl_info *gl_info, unsigned int pitch) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : make_unicode: Update vertical orientation table to the latest version.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 232dc29ff869f487a7dcffe8f253c458210da59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=232dc29ff869f487a7dcffe8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 17:23:03 2016 +0900 make_unicode: Update vertical orientation table to the latest version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/vertical.c | 52 ++++++++++++++++++++++++++-------------------- dlls/wineps.drv/vertical.c | 52 ++++++++++++++++++++++++++-------------------- tools/make_unicode | 6 +++--- 3 files changed, 63 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=232dc29ff869f487a7dcf…

1 0

Alexandre Julliard : make_unicode: Support sparse arrays for character tables.
by Alexandre Julliard Feb. 9, 2016

Feb. 9, 2016

Module: wine Branch: master Commit: 575a979610045a8c80b54ae688be2045b56b97ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=575a979610045a8c80b54ae68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 9 16:39:54 2016 +0900 make_unicode: Support sparse arrays for character tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1c81a7e..27d23bf 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -351,8 +351,8 @@ my @tolower_table = (); my @toupper_table = (); my @digitmap_table = (); my @compatmap_table = (); -my @category_table = (0) x 65536; -my @joining_table = (0) x 65536; +my @category_table = (); +my @joining_table = (); my @direction_table = (); my @decomp_table = (); my @compose_table = (); @@ -1176,7 +1176,7 @@ sub get_lb_ranges() sub dump_indic($) { my $filename = shift; - my @indic_table = ($indic_types{'Other'}) x 65536; + my @indic_table; my $INPUT = open_data_file( $UNIDATA, "IndicSyllabicCategory.txt" ); while (<$INPUT>) @@ -1245,7 +1245,7 @@ sub dump_indic($) print OUTPUT "/* and from $UNIDATA/IndicPositionalCategory.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "indic_syllabic_table", @indic_table); + dump_two_level_mapping( "indic_syllabic_table", $indic_types{'Other'}, @indic_table ); close OUTPUT; save_file($filename); @@ -1256,7 +1256,7 @@ sub dump_indic($) sub dump_linebreak($) { my $filename = shift; - my @break_table = ($break_types{'XX'}) x 65536; + my @break_table; my $next_group = 0; my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); @@ -1292,7 +1292,7 @@ sub dump_linebreak($) print OUTPUT "/* generated from $UNIDATA/LineBreak.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "wine_linebreak_table", @break_table); + dump_two_level_mapping( "wine_linebreak_table", $break_types{'XX'}, @break_table ); close OUTPUT; save_file($filename); @@ -1304,7 +1304,7 @@ sub dump_scripts($) { my $filename = shift; my $header = $filename; - my @scripts_table = (0) x 65536; # 0 means unknown script + my @scripts_table; my $script_index; my %scripts; my $i; @@ -1406,7 +1406,7 @@ sub dump_scripts($) print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "wine_scripts_table", @scripts_table); + dump_two_level_mapping( "wine_scripts_table", 0, @scripts_table ); close OUTPUT; save_file($filename); } @@ -1449,7 +1449,7 @@ sub dump_mirroring($) sub dump_bracket($) { my $filename = shift; - my @bracket_table = (0) x 65536; + my @bracket_table; my $INPUT = open_data_file( $UNIDATA, "BidiBrackets.txt" ); while (<$INPUT>) @@ -1476,7 +1476,7 @@ sub dump_bracket($) print OUTPUT "/* generated from $UNIDATA/BidiBrackets.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "bidi_bracket_table", @bracket_table); + dump_two_level_mapping( "bidi_bracket_table", 0, @bracket_table ); close OUTPUT; save_file($filename); @@ -1516,7 +1516,7 @@ sub dump_shaping($) print OUTPUT "/* generated from $UNIDATA/ArabicShaping.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "wine_shaping_table", @joining_table ); + dump_two_level_mapping( "wine_shaping_table", 0, @joining_table ); print OUTPUT "\nconst unsigned short wine_shaping_forms[256][4] =\n{\n"; for (my $i = 0x600; $i <= 0x6ff; $i++) @@ -1538,7 +1538,7 @@ sub dump_shaping($) sub dump_vertical($) { my $filename = shift; - my @vertical_table = ($vertical_types{'R'}) x 65536; + my @vertical_table; my $INPUT = open_data_file( $VERTICALDATA, "VerticalOrientation-11.txt" ); while (<$INPUT>) @@ -1576,7 +1576,7 @@ sub dump_vertical($) print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-11.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "vertical_orientation_table", @vertical_table); + dump_two_level_mapping( "vertical_orientation_table", $vertical_types{'R'}, @vertical_table ); close OUTPUT; save_file($filename); @@ -1672,9 +1672,10 @@ sub DUMP_CASE_TABLE($@) ################################################################ # compress a mapping table by removing identical rows -sub compress_array($@) +sub compress_array($$@) { my $rows = shift; + my $def = shift; my @table = @_; my $len = @table / $rows; my @array = (0) x $rows; @@ -1683,7 +1684,8 @@ sub compress_array($@) # try to merge table rows for (my $row = 0; $row < $rows; $row++) { - my $rowtxt = pack "S*", @table[($row * $len)..($row * $len + $len - 1)]; + my @table_row = map { defined($_) ? $_ : $def; } @table[($row * $len)..($row * $len + $len - 1)]; + my $rowtxt = pack "S*", @table_row; if (defined($sequences{$rowtxt})) { # reuse an existing row @@ -1693,7 +1695,7 @@ sub compress_array($@) { # create a new row $sequences{$rowtxt} = $array[$row] = $#array + 1; - push @array, @table[$row * $len..$row * $len + $len - 1]; + push @array, @table_row; } } return @array; @@ -1701,10 +1703,11 @@ sub compress_array($@) ################################################################ # dump a simple char -> 16-bit value mapping table -sub dump_simple_mapping($@) +sub dump_simple_mapping($$@) { my $name = shift; - my @array = compress_array( 256, @_[0..65535] ); + my $def = shift; + my @array = compress_array( 256, $def, @_[0..65535] ); printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; printf OUTPUT " /* offsets */\n%s,\n", DUMP_ARRAY( "0x%04x", 0, @array[0..255] ); @@ -1713,11 +1716,12 @@ sub dump_simple_mapping($@) ################################################################ # dump a char -> 16-bit value mapping table using two-level tables -sub dump_two_level_mapping($@) +sub dump_two_level_mapping($$@) { my $name = shift; - my @row_array = compress_array( 4096, @_[0..65535] ); - my @array = compress_array( 256, @row_array[0..4095] ); + my $def = shift; + my @row_array = compress_array( 4096, $def, @_[0..65535] ); + my @array = compress_array( 256, 0, @row_array[0..4095] ); for (my $i = 256; $i < @array; $i++) { $array[$i] += @array - 4096; } @@ -1880,7 +1884,7 @@ sub dump_nameprep($) { my $filename = shift; my @mapping_table = (); - my @flags_table = (0) x 65536; + my @flags_table; my $INPUT = open_data_file( $RFCS, $STRINGPREP ); while (<$INPUT>) @@ -1911,7 +1915,7 @@ sub dump_nameprep($) print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - dump_two_level_mapping( "nameprep_char_type", @flags_table ); + dump_two_level_mapping( "nameprep_char_type", 0, @flags_table ); ######### mapping table # first determine all the 16-char subsets that contain something @@ -2006,7 +2010,7 @@ sub DUMP_CTYPE_TABLES($) $category_table[$i] |= $direction_table[$i] << 12 if defined $direction_table[$i]; } - dump_simple_mapping( "wine_wctype_table", @category_table ); + dump_simple_mapping( "wine_wctype_table", 0, @category_table ); close OUTPUT; save_file($filename);

1 0