April 2009 - Wine-commits - list.winehq.org

Hans Leidekker : server: Add requests to set and retrieve default dacl.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 24af6f3e0185e0d61327093bfa6c25de124bfbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24af6f3e0185e0d61327093bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 09:53:16 2009 +0200 server: Add requests to set and retrieve default dacl. --- include/wine/server_protocol.h | 32 +++++++++++++++++++++++++++- server/protocol.def | 12 ++++++++++ server/request.h | 9 +++++++ server/token.c | 46 ++++++++++++++++++++++++++++++++++++++++ server/trace.c | 30 ++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 31ef863..f819686 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4100,6 +4100,30 @@ struct get_token_groups_reply char __pad_12[4]; }; +struct get_token_default_dacl_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_token_default_dacl_reply +{ + struct reply_header __header; + data_size_t acl_len; + /* VARARG(acl,ACL); */ + char __pad_12[4]; +}; + +struct set_token_default_dacl_request +{ + struct request_header __header; + obj_handle_t handle; + /* VARARG(acl,ACL); */ +}; +struct set_token_default_dacl_reply +{ + struct reply_header __header; +}; + struct set_security_object_request { struct request_header __header; @@ -4765,6 +4789,8 @@ enum request REQ_access_check, REQ_get_token_user, REQ_get_token_groups, + REQ_get_token_default_dacl, + REQ_set_token_default_dacl, REQ_set_security_object, REQ_get_security_object, REQ_create_mailslot, @@ -5008,6 +5034,8 @@ union generic_request struct access_check_request access_check_request; struct get_token_user_request get_token_user_request; struct get_token_groups_request get_token_groups_request; + struct get_token_default_dacl_request get_token_default_dacl_request; + struct set_token_default_dacl_request set_token_default_dacl_request; struct set_security_object_request set_security_object_request; struct get_security_object_request get_security_object_request; struct create_mailslot_request create_mailslot_request; @@ -5249,6 +5277,8 @@ union generic_reply struct access_check_reply access_check_reply; struct get_token_user_reply get_token_user_reply; struct get_token_groups_reply get_token_groups_reply; + struct get_token_default_dacl_reply get_token_default_dacl_reply; + struct set_token_default_dacl_reply set_token_default_dacl_reply; struct set_security_object_reply set_security_object_reply; struct get_security_object_reply get_security_object_reply; struct create_mailslot_reply create_mailslot_reply; @@ -5280,6 +5310,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 385 +#define SERVER_PROTOCOL_VERSION 386 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 004f4c9..8ae653b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2896,6 +2896,18 @@ enum message_type VARARG(user,token_groups); /* groups the token's user belongs to */ @END +(a)REQ(get_token_default_dacl) + obj_handle_t handle; /* handle to the token */ +(a)REPLY + data_size_t acl_len; /* length needed to store access control list */ + VARARG(acl,ACL); /* access control list */ +(a)END + +(a)REQ(set_token_default_dacl) + obj_handle_t handle; /* handle to the token */ + VARARG(acl,ACL); /* default dacl to set */ +(a)END + @REQ(set_security_object) obj_handle_t handle; /* handle to the object */ unsigned int security_info; /* which parts of security descriptor to set */ diff --git a/server/request.h b/server/request.h index f0ebcba..f85756c 100644 --- a/server/request.h +++ b/server/request.h @@ -318,6 +318,8 @@ DECL_HANDLER(duplicate_token); DECL_HANDLER(access_check); DECL_HANDLER(get_token_user); DECL_HANDLER(get_token_groups); +DECL_HANDLER(get_token_default_dacl); +DECL_HANDLER(set_token_default_dacl); DECL_HANDLER(set_security_object); DECL_HANDLER(get_security_object); DECL_HANDLER(create_mailslot); @@ -560,6 +562,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_access_check, (req_handler)req_get_token_user, (req_handler)req_get_token_groups, + (req_handler)req_get_token_default_dacl, + (req_handler)req_set_token_default_dacl, (req_handler)req_set_security_object, (req_handler)req_get_security_object, (req_handler)req_create_mailslot, @@ -1750,6 +1754,11 @@ C_ASSERT( sizeof(struct get_token_user_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_token_groups_reply, user_len) == 8 ); C_ASSERT( sizeof(struct get_token_groups_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_token_default_dacl_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_token_default_dacl_reply, acl_len) == 8 ); +C_ASSERT( sizeof(struct get_token_default_dacl_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_token_default_dacl_request, handle) == 12 ); +C_ASSERT( sizeof(struct set_token_default_dacl_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_security_object_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_security_object_request, security_info) == 16 ); C_ASSERT( sizeof(struct set_security_object_request) == 24 ); diff --git a/server/token.c b/server/token.c index 7352ec2..ce896ac 100644 --- a/server/token.c +++ b/server/token.c @@ -1344,3 +1344,49 @@ DECL_HANDLER(get_token_statistics) release_object( token ); } } + +DECL_HANDLER(get_token_default_dacl) +{ + struct token *token; + + reply->acl_len = 0; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, + &token_ops ))) + { + if (token->default_dacl) + reply->acl_len = token->default_dacl->AclSize; + + if (reply->acl_len <= get_reply_max_size()) + { + ACL *acl_reply = set_reply_data_size( reply->acl_len ); + if (acl_reply) + memcpy( acl_reply, token->default_dacl, reply->acl_len ); + } + else set_error( STATUS_BUFFER_TOO_SMALL ); + + release_object( token ); + } +} + +DECL_HANDLER(set_token_default_dacl) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_ADJUST_DEFAULT, + &token_ops ))) + { + const ACL *acl = get_req_data(); + unsigned int acl_size = get_req_data_size(); + + free( token->default_dacl ); + token->default_dacl = NULL; + + if (acl_size) + token->default_dacl = memdup( acl, acl_size ); + + release_object( token ); + } +} diff --git a/server/trace.c b/server/trace.c index 4a7bfa5..6781ef7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -907,6 +907,13 @@ static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t siz fputc( '}', stderr ); } +static void dump_varargs_ACL( const char *prefix, data_size_t size ) +{ + const ACL *acl = cur_data; + dump_inline_acl( prefix, acl, size ); + remove_data( size ); +} + static void dump_inline_security_descriptor( const char *prefix, const struct security_descriptor *sd, data_size_t size ) { fprintf( stderr,"%s{", prefix ); @@ -3461,6 +3468,23 @@ static void dump_get_token_groups_reply( const struct get_token_groups_reply *re dump_varargs_token_groups( ", user=", cur_size ); } +static void dump_get_token_default_dacl_request( const struct get_token_default_dacl_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_token_default_dacl_reply( const struct get_token_default_dacl_reply *req ) +{ + fprintf( stderr, " acl_len=%u", req->acl_len ); + dump_varargs_ACL( ", acl=", cur_size ); +} + +static void dump_set_token_default_dacl_request( const struct set_token_default_dacl_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + dump_varargs_ACL( ", acl=", cur_size ); +} + static void dump_set_security_object_request( const struct set_security_object_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -3995,6 +4019,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_access_check_request, (dump_func)dump_get_token_user_request, (dump_func)dump_get_token_groups_request, + (dump_func)dump_get_token_default_dacl_request, + (dump_func)dump_set_token_default_dacl_request, (dump_func)dump_set_security_object_request, (dump_func)dump_get_security_object_request, (dump_func)dump_create_mailslot_request, @@ -4234,6 +4260,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_access_check_reply, (dump_func)dump_get_token_user_reply, (dump_func)dump_get_token_groups_reply, + (dump_func)dump_get_token_default_dacl_reply, + NULL, NULL, (dump_func)dump_get_security_object_reply, (dump_func)dump_create_mailslot_reply, @@ -4473,6 +4501,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "access_check", "get_token_user", "get_token_groups", + "get_token_default_dacl", + "set_token_default_dacl", "set_security_object", "get_security_object", "create_mailslot",

1 0

Hans Leidekker : ntdll: Implement NtQuery/SetInformationToken( TokenDefaultDacl).
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: f483f71ad2bac670c2f2c297c3e096d623164aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f483f71ad2bac670c2f2c297c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 09:53:49 2009 +0200 ntdll: Implement NtQuery/SetInformationToken(TokenDefaultDacl). --- dlls/advapi32/tests/security.c | 49 +++++++++++++++++++++++++++- dlls/ntdll/nt.c | 69 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 110 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f775d10..b68629d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1176,14 +1176,16 @@ static void test_AccessCheck(void) static void test_token_attr(void) { HANDLE Token, ImpersonationToken; - DWORD Size; + DWORD Size, Size2; TOKEN_PRIVILEGES *Privileges; TOKEN_GROUPS *Groups; TOKEN_USER *User; + TOKEN_DEFAULT_DACL *Dacl; BOOL ret; DWORD i, GLE; LPSTR SidString; SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + ACL *acl; /* cygwin-like use case */ SetLastError(0xdeadbeef); @@ -1214,7 +1216,7 @@ static void test_token_attr(void) } SetLastError(0xdeadbeef); - ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &Token); + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &Token); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ @@ -1283,6 +1285,49 @@ static void test_token_attr(void) ok(ImpersonationLevel == SecurityAnonymous, "ImpersonationLevel should have been SecurityAnonymous instead of %d\n", ImpersonationLevel); CloseHandle(ImpersonationToken); + + /* default dacl */ + ret = GetTokenInformation(Token, TokenDefaultDacl, NULL, 0, &Size); + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + Dacl = HeapAlloc(GetProcessHeap(), 0, Size); + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetTokenInformation(Token, TokenDefaultDacl, NULL, 0); + GLE = GetLastError(); + ok(!ret, "SetTokenInformation(TokenDefaultDacl) succeeded\n"); + ok(GLE == ERROR_BAD_LENGTH, "expected ERROR_BAD_LENGTH got %u\n", GLE); + + SetLastError(0xdeadbeef); + ret = SetTokenInformation(Token, TokenDefaultDacl, NULL, Size); + GLE = GetLastError(); + ok(!ret, "SetTokenInformation(TokenDefaultDacl) succeeded\n"); + ok(GLE == ERROR_NOACCESS, "expected ERROR_NOACCESS got %u\n", GLE); + + acl = Dacl->DefaultDacl; + Dacl->DefaultDacl = NULL; + + ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size); + ok(ret, "SetTokenInformation(TokenDefaultDacl) succeeded\n"); + + Size2 = 0; + Dacl->DefaultDacl = (ACL *)0xdeadbeef; + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + ok(Dacl->DefaultDacl == NULL, "expected NULL, got %p\n", Dacl->DefaultDacl); + ok(Size2 == sizeof(TOKEN_DEFAULT_DACL), "got %u expected sizeof(TOKEN_DEFAULT_DACL)\n", Size2); + + Dacl->DefaultDacl = acl; + ret = SetTokenInformation(Token, TokenDefaultDacl, Dacl, Size); + ok(ret, "SetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + ret = GetTokenInformation(Token, TokenDefaultDacl, Dacl, Size, &Size2); + ok(ret, "GetTokenInformation(TokenDefaultDacl) failed with error %u\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, Dacl); CloseHandle(Token); } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d2e133c..8ffa9e0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -242,9 +242,6 @@ NTSTATUS WINAPI NtQueryInformationToken( case TokenPrimaryGroup: len = sizeof(TOKEN_PRIMARY_GROUP); break; - case TokenDefaultDacl: - len = sizeof(TOKEN_DEFAULT_DACL); - break; case TokenSource: len = sizeof(TOKEN_SOURCE); break; @@ -441,6 +438,31 @@ NTSTATUS WINAPI NtQueryInformationToken( } SERVER_END_REQ; break; + case TokenDefaultDacl: + SERVER_START_REQ( get_token_default_dacl ) + { + TOKEN_DEFAULT_DACL *default_dacl = tokeninfo; + ACL *acl = (ACL *)(default_dacl + 1); + DWORD acl_len; + + if (tokeninfolength < sizeof(TOKEN_DEFAULT_DACL)) acl_len = 0; + else acl_len = tokeninfolength - sizeof(TOKEN_DEFAULT_DACL); + + req->handle = wine_server_obj_handle( token ); + wine_server_set_reply( req, acl, acl_len ); + status = wine_server_call( req ); + + if (retlen) *retlen = reply->acl_len + sizeof(TOKEN_DEFAULT_DACL); + if (status == STATUS_SUCCESS) + { + if (reply->acl_len) + default_dacl->DefaultDacl = acl; + else + default_dacl->DefaultDacl = NULL; + } + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); @@ -460,9 +482,44 @@ NTSTATUS WINAPI NtSetInformationToken( PVOID TokenInformation, ULONG TokenInformationLength) { - FIXME("%p %d %p %u\n", TokenHandle, TokenInformationClass, - TokenInformation, TokenInformationLength); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret = STATUS_NOT_IMPLEMENTED; + + TRACE("%p %d %p %u\n", TokenHandle, TokenInformationClass, + TokenInformation, TokenInformationLength); + + switch (TokenInformationClass) + { + case TokenDefaultDacl: + if (TokenInformationLength < sizeof(TOKEN_DEFAULT_DACL)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + if (!TokenInformation) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + SERVER_START_REQ( set_token_default_dacl ) + { + ACL *acl = ((TOKEN_DEFAULT_DACL *)TokenInformation)->DefaultDacl; + WORD size; + + if (acl) size = acl->AclSize; + else size = 0; + + req->handle = wine_server_obj_handle( TokenHandle ); + wine_server_add_data( req, acl, size ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + break; + default: + FIXME("unimplemented class %u\n", TokenInformationClass); + break; + } + + return ret; } /******************************************************************************

1 0

Peter Schauer : comctl32/listview: Fix warning from DPA_GetPtr.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 56720276e898bb0c0b350378f26047358bd6cf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56720276e898bb0c0b350378f… Author: Peter Schauer <peterschauer(a)gmx.net> Date: Sun Apr 19 13:14:55 2009 +0200 comctl32/listview: Fix warning from DPA_GetPtr. --- dlls/comctl32/listview.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a4899c6..e6fa8ec 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2654,15 +2654,17 @@ static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line assert (ranges); assert (DPA_GetPtrCount(ranges->hdpa) >= 0); ranges_dump(ranges); - prev = DPA_GetPtr(ranges->hdpa, 0); if (DPA_GetPtrCount(ranges->hdpa) > 0) - assert (prev->lower >= 0 && prev->lower < prev->upper); - for (i = 1; i < DPA_GetPtrCount(ranges->hdpa); i++) { - curr = DPA_GetPtr(ranges->hdpa, i); - assert (prev->upper <= curr->lower); - assert (curr->lower < curr->upper); - prev = curr; + prev = DPA_GetPtr(ranges->hdpa, 0); + assert (prev->lower >= 0 && prev->lower < prev->upper); + for (i = 1; i < DPA_GetPtrCount(ranges->hdpa); i++) + { + curr = DPA_GetPtr(ranges->hdpa, i); + assert (prev->upper <= curr->lower); + assert (curr->lower < curr->upper); + prev = curr; + } } TRACE("--- Done checking---\n"); }

1 0

David Adam : ddraw: Remove useless comments.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 8681d49030a8b6e8e93540e87dae37ff685d6302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681d49030a8b6e8e93540e87… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sat Apr 11 13:46:47 2009 +0200 ddraw: Remove useless comments. --- dlls/ddraw/device.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4fe6532..bb3f479 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4356,8 +4356,6 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface, * The return value consist of a combination of D3DCLIP_* flags, or it's * 0 if the sphere is completely visible(according to the SDK, not checked) * - * Sounds like an overdose of math ;) - * * Version 3 and 7 * * Params: @@ -4368,7 +4366,7 @@ Thunk_IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface, * ReturnValues: Array to write the results to * * Returns: - * D3D_OK because it's a stub + * D3D_OK * (DDERR_INVALIDPARAMS if Centers, Radii or ReturnValues are NULL) * (D3DERR_INVALIDMATRIX if the combined world, view and proj matrix * is singular)

1 0

Huw Davies : user32/tests: Fix tests on win9x.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 2ec629afd9ac30b9bf1652ef99ab392b9ec2cded URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ec629afd9ac30b9bf1652ef9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 21 10:38:52 2009 +0100 user32/tests: Fix tests on win9x. --- dlls/user32/tests/clipboard.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 51aa852..e2ba2f9 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -244,9 +244,12 @@ static void test_synthesized(void) ok(cf == CF_OEMTEXT, "cf %08x\n", cf); cf = EnumClipboardFormats(cf); - ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); + ok(cf == CF_UNICODETEXT || + broken(cf == CF_METAFILEPICT), /* win9x and winME has no CF_UNICODETEXT */ + "cf %08x\n", cf); - cf = EnumClipboardFormats(cf); + if(cf == CF_UNICODETEXT) + cf = EnumClipboardFormats(cf); ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); cf = EnumClipboardFormats(cf);

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to pshader_gen_input_modifier_line( ).
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 644439ff0df0c2cb960a7911a1c5dc03490fc22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=644439ff0df0c2cb960a7911a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:04 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to pshader_gen_input_modifier_line(). --- dlls/wined3d/arb_program_shader.c | 77 ++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=644439ff0df0c2cb960a7…

1 0

Henri Verbeet : wined3d: Explicitly pass the source modifier to shader_glsl_gen_modifier().
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 7f58b906dd3d22a9fff04cfb1c44526cff638e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f58b906dd3d22a9fff04cfb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:04 2009 +0200 wined3d: Explicitly pass the source modifier to shader_glsl_gen_modifier(). --- dlls/wined3d/glsl_shader.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 636cc4f..f9d63cf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -967,15 +967,12 @@ static const char * const shift_glsl_tab[] = { }; /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */ -static void shader_glsl_gen_modifier ( - const DWORD instr, - const char *in_reg, - const char *in_regswizzle, - char *out_str) { - +static void shader_glsl_gen_modifier(DWORD src_modifier, const char *in_reg, const char *in_regswizzle, char *out_str) +{ out_str[0] = 0; - switch (instr & WINED3DSP_SRCMOD_MASK) { + switch (src_modifier) + { case WINED3DSPSM_DZ: /* Need to handle this in the instructions itself (texld & texcrd). */ case WINED3DSPSM_DW: case WINED3DSPSM_NONE: @@ -1015,7 +1012,7 @@ static void shader_glsl_gen_modifier ( sprintf(out_str, "-abs(%s%s)", in_reg, in_regswizzle); break; default: - FIXME("Unhandled modifier %u\n", (instr & WINED3DSP_SRCMOD_MASK)); + FIXME("Unhandled modifier %u\n", src_modifier); sprintf(out_str, "%s%s", in_reg, in_regswizzle); } } @@ -1281,7 +1278,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i wined3d_src->rel_addr, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src->token, is_color, mask, swizzle_str); - shader_glsl_gen_modifier(wined3d_src->token, glsl_src->reg_name, swizzle_str, glsl_src->param_str); + shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); } /* From a given parameter token, generate the corresponding GLSL string.

1 0

Henri Verbeet : wined3d: Store the source swizzle in struct wined3d_shader_src_param.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: db5ab97125396de5723ef2941b811f76913aa4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5ab97125396de5723ef2941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:05 2009 +0200 wined3d: Store the source swizzle in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9cd8d64..6648c61 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1075,9 +1075,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * with more than one component. Thus replicate the first source argument over all * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ struct wined3d_shader_src_param tmp_src = ins->src[0]; - tmp_src.token &= ~WINED3DSP_SWIZZLE_MASK; - tmp_src.token |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) + tmp_src.swizzle = ((ins->src[0].swizzle >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); + tmp_src.token = (tmp_src.token & ~WINED3DSP_SWIZZLE_MASK) | tmp_src.swizzle; shader_arb_add_src_param(ins, &tmp_src, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } @@ -1633,7 +1633,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - DWORD swizzle = (ins->src[0].token & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; const char *instruction; char tmpLine[256]; @@ -1651,7 +1650,8 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) shader_arb_add_dst_param(ins, &ins->dst[0], tmpLine); /* Destination */ strcat(tmpLine, ","); shader_arb_add_src_param(ins, &ins->src[0], tmpLine); - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) == swizzle) { + if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) + { /* Dx sdk says .x is used if no swizzle is given, but our test shows that * .w is used */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0d41fdc..05cbe9e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -245,6 +245,7 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->register_idx = param & WINED3DSP_REGNUM_MASK; + src->swizzle = param & WINED3DSP_SWIZZLE_MASK; src->modifiers = param & WINED3DSP_SRCMOD_MASK; src->rel_addr = rel_addr; src->token = param; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f9d63cf..a0b8c60 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1946,7 +1946,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { - if (((ins->src[0].token >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) + if (((ins->src[0].swizzle >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; @@ -2028,7 +2028,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { - if (((ins->src[0].token >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) + if (((ins->src[0].swizzle >> (WINED3DSP_SWIZZLE_SHIFT + 2 * j)) & 0x3) == i) { write_mask |= WINED3DSP_WRITEMASK_0 << j; cmp_channel = WINED3DSP_WRITEMASK_0 << j; @@ -2469,7 +2469,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) mask |= sample_function.coord_mask; if (shader_version < WINED3DPS_VERSION(2,0)) swizzle = WINED3DVS_NOSWIZZLE; - else swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; + else swizzle = ins->src[1].swizzle; /* 1.0-1.3: Use destination register as coordinate source. 1.4+: Use provided coordinate source register. */ @@ -2504,7 +2504,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; DWORD sampler_type; DWORD sampler_idx; - DWORD swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; + DWORD swizzle = ins->src[1].swizzle; sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09f7821..b7bf220 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -465,6 +465,7 @@ struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; UINT register_idx; + DWORD swizzle; DWORD modifiers; const struct wined3d_shader_src_param *rel_addr; DWORD token;

1 0

Henri Verbeet : wined3d: Add a separate function for converting swizzles to strings.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 612c32ea089d94a560f4b1c03a98c966617b9957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612c32ea089d94a560f4b1c03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:05 2009 +0200 wined3d: Add a separate function for converting swizzles to strings. --- dlls/wined3d/glsl_shader.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a0b8c60..ebf3c57 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1240,25 +1240,29 @@ static unsigned int shader_glsl_get_write_mask_size(DWORD write_mask) { return size; } -static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) { +static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD mask, char *str) +{ /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", * but addressed as "rgba". To fix this we need to swap the register's x * and z components. */ - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; - char *ptr = swizzle_str; + DWORD s = swizzle >> WINED3DSP_SWIZZLE_SHIFT; - if (!shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) - { - *ptr++ = '.'; - /* swizzle bits fields: wwzzyyxx */ - if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle & 0x03]; - if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = swizzle_chars[(swizzle >> 2) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = swizzle_chars[(swizzle >> 4) & 0x03]; - if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = swizzle_chars[(swizzle >> 6) & 0x03]; - } + *str++ = '.'; + /* swizzle bits fields: wwzzyyxx */ + if (mask & WINED3DSP_WRITEMASK_0) *str++ = swizzle_chars[s & 0x03]; + if (mask & WINED3DSP_WRITEMASK_1) *str++ = swizzle_chars[(s >> 2) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_2) *str++ = swizzle_chars[(s >> 4) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_3) *str++ = swizzle_chars[(s >> 6) & 0x03]; + *str = '\0'; +} - *ptr = '\0'; +static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) +{ + if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + *swizzle_str = '\0'; + else + shader_glsl_swizzle_to_str(param & WINED3DSP_SWIZZLE_MASK, fixup, mask, swizzle_str); } /* From a given parameter token, generate the corresponding GLSL string. @@ -1535,7 +1539,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s BOOL np2_fixup = FALSE; va_list args; - shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version)) {

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_swizzle().
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 88c80635c2baf017637df29f1ba7fdb9458db1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c80635c2baf017637df29f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 09:35:05 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_swizzle(). --- dlls/wined3d/glsl_shader.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ebf3c57..823097d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1257,12 +1257,13 @@ static void shader_glsl_swizzle_to_str(const DWORD swizzle, BOOL fixup, DWORD ma *str = '\0'; } -static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) +static void shader_glsl_get_swizzle(const struct wined3d_shader_src_param *param, + BOOL fixup, DWORD mask, char *swizzle_str) { - if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(param->register_type, param->register_idx)) *swizzle_str = '\0'; else - shader_glsl_swizzle_to_str(param & WINED3DSP_SWIZZLE_MASK, fixup, mask, swizzle_str); + shader_glsl_swizzle_to_str(param->swizzle, fixup, mask, swizzle_str); } /* From a given parameter token, generate the corresponding GLSL string. @@ -1281,7 +1282,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i shader_glsl_get_register_name(wined3d_src->register_type, wined3d_src->register_idx, wined3d_src->rel_addr, glsl_src->reg_name, &is_color, ins); - shader_glsl_get_swizzle(wined3d_src->token, is_color, mask, swizzle_str); + shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); } @@ -2549,7 +2550,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) DWORD src_mod = ins->src[0].modifiers; char dst_swizzle[6]; - shader_glsl_get_swizzle(ins->src[0].token, FALSE, write_mask, dst_swizzle); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); if (src_mod == WINED3DSPSM_DZ) { glsl_src_param_t div_param;

1 0