January 2016 - Wine-Commits

Jactry Zeng : user32/tests: Fix a leak.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: e632187b1923f5ae9b406883c9b656d002edae4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e632187b1923f5ae9b406883c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 18 16:42:55 2016 +0800 user32/tests: Fix a leak. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 984076b..f2e3cea 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2457,7 +2457,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); - ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n"); + ok((buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size)) != NULL, "should not be null\n"); rsize = DdeGetData(hdata, buffer, size, 0); ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); @@ -2550,6 +2550,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok( 0, "Invalid message %u\n", msg_index ); break; } + HeapFree(GetProcessHeap(), 0, buffer); return (HDDEDATA) DDE_FACK; } case XTYP_DISCONNECT:

1 0

Alexandre Julliard : server: Fix constraints on the length of NT object names.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: cd6e9c38e441edd4a16f77c8e85a7b3bde1bb327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6e9c38e441edd4a16f77c8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:52:35 2016 +0900 server: Fix constraints on the length of NT object names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 9 +-- dlls/ntdll/sync.c | 6 +- dlls/ntdll/tests/om.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++ server/registry.c | 4 +- server/request.c | 8 +- 5 files changed, 215 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd6e9c38e441edd4a16f7…

1 0

Alexandre Julliard : server: Pass full object attributes in the create_key request.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: d01deff9cf6ad791b3335c4925a3ba3db8b916f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01deff9cf6ad791b3335c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:03:37 2016 +0900 server: Pass full object attributes in the create_key request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 11 +++++++---- include/wine/server_protocol.h | 8 +++----- server/protocol.def | 5 +---- server/registry.c | 37 +++++++++++++++++++------------------ server/request.h | 9 +++------ server/trace.c | 7 ++----- 6 files changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index be95a2a..ed9d155 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -56,6 +56,8 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT PULONG dispos ) { NTSTATUS ret; + data_size_t len; + struct object_attributes *objattr; if (!retkey || !attr) return STATUS_ACCESS_VIOLATION; if (attr->Length > sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; @@ -64,14 +66,13 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT TRACE( "(%p,%s,%s,%x,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), debugstr_us(class), options, access, retkey ); + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + SERVER_START_REQ( create_key ) { - req->parent = wine_server_obj_handle( attr->RootDirectory ); req->access = access; - req->attributes = attr->Attributes; req->options = options; - req->namelen = attr->ObjectName->Length; - wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + wine_server_add_data( req, objattr, len ); if (class) wine_server_add_data( req, class->Buffer, class->Length ); if (!(ret = wine_server_call( req ))) { @@ -80,7 +81,9 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT } } SERVER_END_REQ; + TRACE("<- %p\n", *retkey); + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 19ea2fc..caa2dc9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2393,13 +2393,11 @@ struct write_process_memory_reply struct create_key_request { struct request_header __header; - obj_handle_t parent; unsigned int access; - unsigned int attributes; unsigned int options; - data_size_t namelen; - /* VARARG(name,unicode_str,namelen); */ + /* VARARG(objattr,object_attributes); */ /* VARARG(class,unicode_str); */ + char __pad_20[4]; }; struct create_key_reply { @@ -6159,6 +6157,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 497 +#define SERVER_PROTOCOL_VERSION 498 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 390651d..a391c88 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1820,12 +1820,9 @@ enum char_info_mode /* Create a registry key */ @REQ(create_key) - obj_handle_t parent; /* handle to the parent key */ unsigned int access; /* desired access rights */ - unsigned int attributes; /* object attributes */ unsigned int options; /* creation options */ - data_size_t namelen; /* length of key name in bytes */ - VARARG(name,unicode_str,namelen); /* key name */ + VARARG(objattr,object_attributes); /* object attributes */ VARARG(class,unicode_str); /* class name */ @REPLY obj_handle_t hkey; /* handle to the created key */ diff --git a/server/registry.c b/server/registry.c index a3c1390..adf2892 100644 --- a/server/registry.c +++ b/server/registry.c @@ -759,7 +759,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, unsigned int options, - unsigned int access, unsigned int attributes, int *created ) + unsigned int access, unsigned int attributes, + const struct security_descriptor *sd, int *created ) { int index; struct unicode_str token, next; @@ -807,6 +808,9 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, if (options & REG_OPTION_VOLATILE) key->flags |= KEY_VOLATILE; else key->flags |= KEY_DIRTY; + if (sd) default_set_sd( &key->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); + if (debug_level > 1) dump_operation( key, NULL, "Create" ); if (class && class->len) { @@ -2021,33 +2025,30 @@ DECL_HANDLER(create_key) struct key *key = NULL, *parent; struct unicode_str name, class; unsigned int access = req->access; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); + + if (!objattr) return; if (!is_wow64_thread( current )) access = (access & ~KEY_WOW64_32KEY) | KEY_WOW64_64KEY; - reply->hkey = 0; + class.str = get_req_data_after_objattr( objattr, &class.len ); + class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); - if (req->namelen > get_req_data_size()) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - class.str = (const WCHAR *)get_req_data() + req->namelen / sizeof(WCHAR); - class.len = ((get_req_data_size() - req->namelen) / sizeof(WCHAR)) * sizeof(WCHAR); - get_req_path( &name, !req->parent ); - if (name.str > class.str) + if (!objattr->rootdir && name.len >= sizeof(root_name) && + !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) { - set_error( STATUS_INVALID_PARAMETER ); - return; + name.str += sizeof(root_name)/sizeof(WCHAR); + name.len -= sizeof(root_name); } - name.len = (class.str - name.str) * sizeof(WCHAR); /* NOTE: no access rights are required from the parent handle to create a key */ - if ((parent = get_parent_hkey_obj( req->parent ))) + if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { if ((key = create_key( parent, &name, &class, req->options, access, - req->attributes, &reply->created ))) + objattr->attributes, sd, &reply->created ))) { - reply->hkey = alloc_handle( current->process, key, access, req->attributes ); + reply->hkey = alloc_handle( current->process, key, access, objattr->attributes ); release_object( key ); } release_object( parent ); @@ -2194,7 +2195,7 @@ DECL_HANDLER(load_registry) { int dummy; get_req_path( &name, !req->hkey ); - if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, NULL, &dummy ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/request.h b/server/request.h index caaa30e..87cae73 100644 --- a/server/request.h +++ b/server/request.h @@ -1287,12 +1287,9 @@ C_ASSERT( sizeof(struct read_process_memory_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct write_process_memory_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct write_process_memory_request, addr) == 16 ); C_ASSERT( sizeof(struct write_process_memory_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, parent) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, options) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_key_request, namelen) == 28 ); -C_ASSERT( sizeof(struct create_key_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_key_request, access) == 12 ); +C_ASSERT( FIELD_OFFSET(struct create_key_request, options) == 16 ); +C_ASSERT( sizeof(struct create_key_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_key_reply, hkey) == 8 ); C_ASSERT( FIELD_OFFSET(struct create_key_reply, created) == 12 ); C_ASSERT( sizeof(struct create_key_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index edbc8c9..89ecdfb 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2308,12 +2308,9 @@ static void dump_write_process_memory_request( const struct write_process_memory static void dump_create_key_request( const struct create_key_request *req ) { - fprintf( stderr, " parent=%04x", req->parent ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); + fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", options=%08x", req->options ); - fprintf( stderr, ", namelen=%u", req->namelen ); - dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) ); + dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_unicode_str( ", class=", cur_size ); }

1 0

Piotr Caban : msvcr: Sync spec files.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: aae728eae99d706ab7f046bb07dbecf0a3428398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae728eae99d706ab7f046bb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 19 11:45:24 2016 +0100 msvcr: Sync spec files. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 14 +++++++------- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-time-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 12c9ac8..2a2ed6e 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -55,7 +55,7 @@ @ stub _dexp @ stub _dlog @ stub _dnorm -@ stub _dpcomp +@ cdecl _dpcomp(double double) ucrtbase._dpcomp @ stub _dpoly @ stub _dscale @ cdecl _dsign(double) ucrtbase._dsign @@ -69,7 +69,7 @@ @ stub _fdlog @ stub _fdnorm @ cdecl _fdopen(long str) ucrtbase._fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) ucrtbase._fdpcomp @ stub _fdpoly @ stub _fdscale @ cdecl _fdsign(float) ucrtbase._fdsign @@ -93,7 +93,7 @@ @ cdecl _ldclass(double) ucrtbase._ldclass @ stub _ldexp @ stub _ldlog -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) ucrtbase._ldpcomp @ stub _ldpoly @ stub _ldscale @ cdecl _ldsign(double) ucrtbase._ldsign @@ -117,7 +117,7 @@ @ cdecl -arch=arm,x86_64 _nextafterf(float float) ucrtbase._nextafterf @ cdecl _scalb(double long) ucrtbase._scalb @ cdecl -arch=arm,x86_64 _scalbf(float long) ucrtbase._scalbf -@ stub _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) ucrtbase._set_FMA3_enable @ cdecl -arch=i386 _set_SSE2_enable(long) ucrtbase._set_SSE2_enable @ cdecl _y0(double) ucrtbase._y0 @ cdecl _y1(double) ucrtbase._y1 @@ -246,9 +246,9 @@ @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf @ cdecl fmaxl(double double) ucrtbase.fmaxl -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) ucrtbase.fmin +@ cdecl fminf(float float) ucrtbase.fminf +@ cdecl fminl(double double) ucrtbase.fminl @ cdecl fmod(double double) ucrtbase.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 568b4ef..d0adc14 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -104,7 +104,7 @@ @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) ucrtbase._mbsdec @ stub _mbsdec_l -@ stub _mbsdup +@ cdecl _mbsdup(str) ucrtbase._mbsdup @ cdecl _mbsicmp(str str) ucrtbase._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) ucrtbase._mbsicoll diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index b619703..80b79cb 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -56,9 +56,9 @@ @ cdecl _wasctime_s(ptr long ptr) ucrtbase._wasctime_s @ stub _wcsftime_l @ cdecl _wctime32(ptr) ucrtbase._wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) ucrtbase._wctime32_s @ cdecl _wctime64(ptr) ucrtbase._wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) ucrtbase._wctime64_s @ cdecl _wstrdate(ptr) ucrtbase._wstrdate @ cdecl _wstrdate_s(ptr long) ucrtbase._wstrdate_s @ cdecl _wstrtime(ptr) ucrtbase._wstrtime diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3478342..e65a1c0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -255,7 +255,7 @@ @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm -@ stub _dpcomp +@ cdecl _dpcomp(double double) MSVCR120__dpcomp @ stub _dpoly @ stub _dscale @ cdecl _dsign(double) MSVCR120__dsign @@ -296,7 +296,7 @@ @ stub _fdlog @ stub _fdnorm @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) MSVCR120__fdpcomp @ stub _fdpoly @ stub _fdscale @ cdecl _fdsign(float) MSVCR120__fdsign @@ -534,7 +534,7 @@ @ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldexp @ stub _ldlog -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) MSVCR120__dpcomp @ stub _ldpoly @ stub _ldscale @ cdecl _ldsign(double) MSVCR120__dsign @@ -623,7 +623,7 @@ @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l -@ stub _mbsdup +@ stub _mbsdup(str) @ cdecl _mbsicmp(str str) @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) @@ -1876,7 +1876,7 @@ @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s @ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter @ cdecl _seh_filter_exe(long ptr) _XcptFilter -@ stub _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @@ -2057,9 +2057,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l @ stub _wctype @@ -2310,9 +2310,9 @@ @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) MSVCR120_fmin +@ cdecl fminf(float float) MSVCR120_fminf +@ cdecl fminl(double double) MSVCR120_fmin @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen

1 0

Piotr Caban : msvcr120: Add _set_FMA3_enable stub.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: 68fedc12681ecacc714c01e9a34266ef70e8d6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fedc12681ecacc714c01e9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 21:08:29 2016 +0100 msvcr120: Add _set_FMA3_enable stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/math.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 361e3d2..69cb2c1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,7 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -@ stub -arch=win64 _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fc88f03..0a3f2da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,6 +73,17 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + #if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /*********************************************************************

1 0

Józef Kucia : wined3d: Handle swizzle type equal to 0 as NOSWIZZLE.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: 4235d59d29fa41677079d9012286a7ff18a48705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4235d59d29fa41677079d9012… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:42 2016 +0100 wined3d: Handle swizzle type equal to 0 as NOSWIZZLE. Just to silent unnecessary FIXME messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 710434b..ae148da 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -175,6 +175,7 @@ enum wined3d_sm4_input_primitive_type enum wined3d_sm4_swizzle_type { + WINED3D_SM4_SWIZZLE_NONE = 0x0, WINED3D_SM4_SWIZZLE_VEC4 = 0x1, WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; @@ -725,6 +726,10 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD switch (swizzle_type) { + case WINED3D_SM4_SWIZZLE_NONE: + src_param->swizzle = WINED3DSP_NOSWIZZLE; + break; + case WINED3D_SM4_SWIZZLE_SCALAR: src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; src_param->swizzle = (src_param->swizzle & 0x3) * 0x55;

1 0

Józef Kucia : wined3d: Recognize SM4 _sat instruction modifier.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: ee85c032652adeb2c0c8f87f5ecc9aa73c4d0c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee85c032652adeb2c0c8f87f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:47 2016 +0100 wined3d: Recognize SM4 _sat instruction modifier. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fb104fc..d275923 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -30,7 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) #define WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT 11 -#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x3u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) +#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x7u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) #define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 #define WINED3D_SM4_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT) @@ -75,6 +75,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_ADDRESSING_RELATIVE 0x2 #define WINED3D_SM4_ADDRESSING_OFFSET 0x1 +#define WINED3D_SM4_INSTRUCTION_FLAG_SATURATE 0x4 + enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, @@ -900,8 +902,16 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } else { + enum wined3d_shader_dst_modifier instruction_dst_modifier = WINED3DSPDM_NONE; + ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; + if (ins->flags & WINED3D_SM4_INSTRUCTION_FLAG_SATURATE) + { + ins->flags &= ~WINED3D_SM4_INSTRUCTION_FLAG_SATURATE; + instruction_dst_modifier = WINED3DSPDM_SATURATE; + } + for (i = 0; i < ins->dst_count; ++i) { if (!(shader_sm4_read_dst_param(priv, &p, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) @@ -909,6 +919,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->handler_idx = WINED3DSIH_TABLE_SIZE; return; } + priv->dst_param[i].modifiers |= instruction_dst_modifier; } for (i = 0; i < ins->src_count; ++i)

1 0

Józef Kucia : wined3d: Fix SM4 udiv instruction.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: f92d7726881029f159cb9d2f92acf7cf0cab600f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92d7726881029f159cb9d2f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:48 2016 +0100 wined3d: Fix SM4 udiv instruction. Previously, it generated syntactically incorrect GLSL when both dst params were not equal to NULL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07a8fc4..8dc97b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3019,7 +3019,6 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) if (ins->dst[0].reg.type != WINED3DSPR_NULL) { - if (ins->dst[1].reg.type != WINED3DSPR_NULL) { char dst_mask[6]; @@ -3027,15 +3026,15 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "tmp0%s = %s / %s;\n", + shader_addline(buffer, "tmp0%s = uintBitsToFloat(%s / %s);\n", dst_mask, src0_param.param_str, src1_param.param_str); write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], WINED3D_DATA_FLOAT); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else

1 0

Józef Kucia : wined3d: Allow both SM4 parameter modifiers simultaneously.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: 9adf1c21b6dfd0ae6163da1cb62f80e4fb02a806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adf1c21b6dfd0ae6163da1cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:44 2016 +0100 wined3d: Allow both SM4 parameter modifiers simultaneously. It seems that negate and abs are the only source parameter modifiers allowed in SM 4 and 5. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ae148da..f102ed1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -621,9 +621,6 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p { DWORD m = *(*ptr)++; - /* FIXME: This will probably break down at some point. The SM4 - * modifiers look like flags, while wined3d currently has an enum - * with possible combinations, e.g. WINED3DSPSM_ABSNEG. */ switch (m) { case 0x41: @@ -634,6 +631,10 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p *modifier = WINED3DSPSM_ABS; break; + case 0xc1: + *modifier = WINED3DSPSM_ABSNEG; + break; + default: FIXME("Skipping modifier 0x%08x.\n", m); *modifier = WINED3DSPSM_NONE;

1 0

Józef Kucia : wined3d: Fix destination swizzle in few SM4 instructions.
by Alexandre Julliard Jan. 19, 2016

Jan. 19, 2016

Module: wine Branch: master Commit: 0fb543bb719ce968065eb6c209cf8f82e76ad871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb543bb719ce968065eb6c20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:43 2016 +0100 wined3d: Fix destination swizzle in few SM4 instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index feaa9e3..51d2cce 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4324,7 +4324,7 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4339,7 +4339,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, NULL, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4356,7 +4356,7 @@ static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0