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

Henri Verbeet : wined3d: Don' t use the opcode_token field in the GLSL backend.
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: ec43489e10bde40af70a9bd7ad474b2d6dd26ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec43489e10bde40af70a9bd7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 wined3d: Don't use the opcode_token field in the GLSL backend. The idea is that we want to prevent backends from parsing the tokens themselves, which is pretty much a requirement for adding SM4 support. --- dlls/wined3d/baseshader.c | 3 +++ dlls/wined3d/glsl_shader.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 2 ++ dlls/wined3d/wined3d_private_types.h | 3 +++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 34ab181..a547949 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -838,6 +838,9 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, hw_arg.opcode = curOpcode; + hw_arg.flags = hw_arg.opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; + hw_arg.coissue = hw_arg.opcode_token & WINED3DSI_COISSUE; + /* Destination token */ if (curOpcode->dst_token) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c92f99b..9cdab01 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1314,10 +1314,9 @@ void shader_glsl_add_instruction_modifiers(const SHADER_OPCODE_ARG* arg) } } -static inline const char* shader_get_comp_op( - const DWORD opcode) { - - DWORD op = (opcode & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; +static inline const char *shader_get_comp_op(DWORD flags) +{ + DWORD op = (flags & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; switch (op) { case COMPARISON_GT: return ">"; case COMPARISON_EQ: return "=="; @@ -1972,7 +1971,8 @@ static void shader_glsl_cnd(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); /* Fun: The D3DSI_COISSUE flag changes the semantic of the cnd instruction for < 1.4 shaders */ - if(arg->opcode_token & WINED3DSI_COISSUE) { + if (arg->coissue) + { shader_addline(arg->buffer, "%s /* COISSUE! */);\n", src1_param.param_str); } else { shader_addline(arg->buffer, "%s > 0.5 ? %s : %s);\n", @@ -2304,7 +2304,7 @@ static void shader_glsl_ifc(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(arg->buffer, "if (%s %s %s) {\n", - src0_param.param_str, shader_get_comp_op(arg->opcode_token), src1_param.param_str); + src0_param.param_str, shader_get_comp_op(arg->flags), src1_param.param_str); } static void shader_glsl_else(const SHADER_OPCODE_ARG *arg) @@ -2327,7 +2327,7 @@ static void shader_glsl_breakc(const SHADER_OPCODE_ARG *arg) shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(arg->buffer, "if (%s %s %s) break;\n", - src0_param.param_str, shader_get_comp_op(arg->opcode_token), src1_param.param_str); + src0_param.param_str, shader_get_comp_op(arg->flags), src1_param.param_str); } static void shader_glsl_label(const SHADER_OPCODE_ARG *arg) @@ -2401,7 +2401,8 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) mask = WINED3DSP_WRITEMASK_3; } } else { - if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { + if (arg->flags & WINED3DSI_TEXLD_PROJECT) + { /* ps 2.0 texldp instruction always divides by the fourth component. */ sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; mask = WINED3DSP_WRITEMASK_3; @@ -2430,7 +2431,8 @@ static void pshader_glsl_tex(const SHADER_OPCODE_ARG *arg) } else { glsl_src_param_t coord_param; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], mask, &coord_param); - if(arg->opcode_token & WINED3DSI_TEXLD_BIAS) { + if (arg->flags & WINED3DSI_TEXLD_BIAS) + { glsl_src_param_t bias; shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, &bias); shader_glsl_gen_sample_code(arg, sampler_idx, &sample_function, swizzle, bias.param_str, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8907b0f..6323250 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2244,6 +2244,8 @@ typedef struct SHADER_OPCODE_ARG { const shader_reg_maps *reg_maps; CONST SHADER_OPCODE* opcode; DWORD opcode_token; + DWORD flags; + BOOL coissue; DWORD dst; DWORD dst_addr; DWORD predicate; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index e5b4c3d..2d9ae03 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -279,6 +279,9 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { /** opcode-related masks **/ +#define WINED3D_OPCODESPECIFICCONTROL_MASK 0x00ff0000 +#define WINED3D_OPCODESPECIFICCONTROL_SHIFT 16 + #define WINED3DSI_OPCODE_MASK 0x0000FFFF #define WINED3DSI_INSTLENGTH_MASK 0x0F000000 #define WINED3DSI_INSTLENGTH_SHIFT 24

1 0

Alexandre Julliard : ntdll: Define dvd_struct ourselves since it' s not consistent across platforms.
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: c5dadf4739ed92d4839029078e0ef2c12d7e81b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dadf4739ed92d4839029078… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 12:37:32 2009 +0200 ntdll: Define dvd_struct ourselves since it's not consistent across platforms. --- dlls/ntdll/cdrom.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a967f9c..574f737 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1939,7 +1939,15 @@ static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, PDVD_LAYER_DESCRIPTOR layer) { #ifdef DVD_READ_STRUCT - dvd_struct s; + /* dvd_struct is not defined consistently across platforms */ + union + { + struct dvd_physical physical; + struct dvd_copyright copyright; + struct dvd_disckey disckey; + struct dvd_bca bca; + struct dvd_manufact manufact; + } s; if (structure->BlockByteOffset.u.HighPart || structure->BlockByteOffset.u.LowPart) FIXME(": BlockByteOffset is not handled\n"); @@ -1947,26 +1955,26 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, switch (structure->Format) { case DvdPhysicalDescriptor: - s.type = DVD_STRUCT_PHYSICAL; + s.physical.type = DVD_STRUCT_PHYSICAL; s.physical.layer_num = structure->LayerNumber; break; case DvdCopyrightDescriptor: - s.type = DVD_STRUCT_COPYRIGHT; + s.copyright.type = DVD_STRUCT_COPYRIGHT; s.copyright.layer_num = structure->LayerNumber; break; case DvdDiskKeyDescriptor: - s.type = DVD_STRUCT_DISCKEY; + s.disckey.type = DVD_STRUCT_DISCKEY; s.disckey.agid = structure->SessionId; break; case DvdBCADescriptor: - s.type = DVD_STRUCT_BCA; + s.bca.type = DVD_STRUCT_BCA; break; case DvdManufacturerDescriptor: - s.type = DVD_STRUCT_MANUFACT; + s.manufact.type = DVD_STRUCT_MANUFACT; s.manufact.layer_num = structure->LayerNumber; break;

1 0

Aric Stewart : advapi32: Handle fully qualified account names for well known sids in LookupAccountName .
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: 9d9a684ef6cb9bf70235594e81de1e3b0387beeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9a684ef6cb9bf70235594e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 31 09:00:11 2009 -0500 advapi32: Handle fully qualified account names for well known sids in LookupAccountName. --- dlls/advapi32/security.c | 17 +++++++++++++++-- dlls/advapi32/tests/security.c | 7 +++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a26e81a..f8715e0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2651,6 +2651,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI DWORD nameLen; LPWSTR userName = NULL; LPCWSTR domainName; + LPCWSTR lpAccountNamePtr; + LPCWSTR lpDomainNamePtr = NULL; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); @@ -2667,11 +2669,22 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI } /* Check well known SIDs first */ + if ((lpAccountNamePtr = strrchrW(lpAccountName,'\\'))) + { + lpAccountNamePtr++; + lpDomainNamePtr = lpAccountName; + } + else + lpAccountNamePtr = lpAccountName; for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { - if (!strcmpiW(lpAccountName, ACCOUNT_SIDS[i].account) || - (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountName, ACCOUNT_SIDS[i].alias))) + /* check domain first */ + if (lpDomainNamePtr && (strncmpiW(lpDomainNamePtr, ACCOUNT_SIDS[i].domain, strlenW(ACCOUNT_SIDS[i].domain)) || lpDomainNamePtr[strlenW(ACCOUNT_SIDS[i].domain)]!='\\')) + continue; + + if (!strcmpiW(lpAccountNamePtr, ACCOUNT_SIDS[i].account) || + (ACCOUNT_SIDS[i].alias && !strcmpiW(lpAccountNamePtr, ACCOUNT_SIDS[i].alias))) { DWORD sidLen = SECURITY_MAX_SID_SIZE; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e557c1f..f264fd8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1982,6 +1982,13 @@ static void test_LookupAccountName(void) /* case insensitivity */ check_wellknown_name("lOCAlServICE", WinLocalServiceSid); + + /* fully qualified account names */ + check_wellknown_name("NT AUTHORITY\\LocalService", WinLocalServiceSid); + check_wellknown_name("nt authority\\Network Service", WinNetworkServiceSid); + check_wellknown_name("nt authority test\\Network Service", 0); + check_wellknown_name("Dummy\\Network Service", 0); + check_wellknown_name("ntauthority\\Network Service", 0); } static void test_security_descriptor(void)

1 0

Henri Verbeet : ddraw: Filter invalid texture stage states passed by the application.
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: 4194d8040f458116ec1b0e91766646471acc5523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4194d8040f458116ec1b0e917… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:00 2009 +0200 ddraw: Filter invalid texture stage states passed by the application. --- dlls/ddraw/device.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 35f3d36..517e7bf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4776,6 +4776,13 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, if(!State) return DDERR_INVALIDPARAMS; + if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) + { + WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); + *State = 0; + return DD_OK; + } + EnterCriticalSection(&ddraw_cs); if (l->sampler_state) @@ -4896,6 +4903,12 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, HRESULT hr; TRACE("(%p)->(%08x,%08x,%08x): Relay!\n", This, Stage, TexStageStateType, State); + if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS) + { + WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType); + return DD_OK; + } + EnterCriticalSection(&ddraw_cs); if (l->sampler_state)

1 0