May 2006 - Wine-commits - list.winehq.org

Robert Shearman : rpcrt4: Increment the call id field of the request header .
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 5067ea70c08a6c3b8dff815085768ddd368a15fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5067ea70c08a6c3b8dff815… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:39:42 2006 +0100 rpcrt4: Increment the call id field of the request header. This is necessary for compatibility with MS/RPC servers. --- dlls/rpcrt4/rpc_binding.h | 1 + dlls/rpcrt4/rpc_message.c | 1 + dlls/rpcrt4/rpc_transport.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 99916a5..d9e1576 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -37,6 +37,7 @@ typedef struct _RpcConnection USHORT MaxTransmissionSize; /* The active interface bound to server. */ RPC_SYNTAX_IDENTIFIER ActiveInterface; + USHORT NextCallId; /* authentication */ CtxtHandle ctx; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index f279910..a4d92b6 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -666,6 +666,7 @@ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, pMsg->BufferLength, pMsg->ProcNum, &bind->ObjectUuid); + hdr->common.call_id = conn->NextCallId++; } status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0db5b6a..88a7769 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -451,6 +451,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcCo NewConnection->Endpoint = RPCRT4_strdupA(Endpoint); NewConnection->Used = Binding; NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; + NewConnection->NextCallId = 1; TRACE("connection: %p\n", NewConnection); *Connection = NewConnection;

1 0

Robert Shearman : rpcrt4: Fix the wire protocol of the user marshal functions to match MS/RPC.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 62bbaf70b35182d4a733ca2f2207eb369acabf3a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62bbaf70b35182d4a733ca2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:39:27 2006 +0100 rpcrt4: Fix the wire protocol of the user marshal functions to match MS/RPC. --- dlls/rpcrt4/ndr_marshall.c | 52 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4c7791e..231f7a5 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2518,6 +2518,10 @@ unsigned long UserMarshalFlags(PMIDL_STU pStubMsg->RpcMsg->DataRepresentation); } +#define USER_MARSHAL_PTR_PREFIX \ + ( (DWORD)'U' | ( (DWORD)'s' << 8 ) | \ + ( (DWORD)'e' << 16 ) | ( (DWORD)'r' << 24 ) ) + /*********************************************************************** * NdrUserMarshalMarshall [RPCRT4.@] */ @@ -2525,12 +2529,22 @@ unsigned char * WINAPI NdrUserMarshalMar unsigned char *pMemory, PFORMAT_STRING pFormat) { -/* unsigned flags = pFormat[1]; */ + unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; unsigned long uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); + if (flags & USER_MARSHAL_POINTER) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, USER_MARSHAL_PTR_PREFIX); + pStubMsg->Buffer += 4; + ALIGN_POINTER(pStubMsg->Buffer, 8); + } + else + ALIGN_POINTER(pStubMsg->Buffer, (flags & 0xf) + 1); + pStubMsg->Buffer = pStubMsg->StubDesc->aUserMarshalQuadruple[index].pfnMarshall( &uflag, pStubMsg->Buffer, pMemory); @@ -2548,13 +2562,23 @@ unsigned char * WINAPI NdrUserMarshalUnm PFORMAT_STRING pFormat, unsigned char fMustAlloc) { -/* unsigned flags = pFormat[1];*/ + unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; DWORD memsize = *(const WORD*)&pFormat[4]; unsigned long uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); TRACE("index=%d\n", index); + if (flags & USER_MARSHAL_POINTER) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + /* skip pointer prefix */ + pStubMsg->Buffer += 4; + ALIGN_POINTER(pStubMsg->Buffer, 8); + } + else + ALIGN_POINTER(pStubMsg->Buffer, (flags & 0xf) + 1); + if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, memsize); @@ -2572,13 +2596,23 @@ void WINAPI NdrUserMarshalBufferSize(PMI unsigned char *pMemory, PFORMAT_STRING pFormat) { -/* unsigned flags = pFormat[1];*/ + unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; DWORD bufsize = *(const WORD*)&pFormat[6]; unsigned long uflag = UserMarshalFlags(pStubMsg); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); + if (flags & USER_MARSHAL_POINTER) + { + ALIGN_LENGTH(pStubMsg->BufferLength, 4); + /* skip pointer prefix */ + pStubMsg->BufferLength += 4; + ALIGN_LENGTH(pStubMsg->BufferLength, 8); + } + else + ALIGN_LENGTH(pStubMsg->BufferLength, (flags & 0xf) + 1); + if (bufsize) { TRACE("size=%ld\n", bufsize); pStubMsg->BufferLength += bufsize; @@ -2596,6 +2630,7 @@ void WINAPI NdrUserMarshalBufferSize(PMI unsigned long WINAPI NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { + unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; DWORD memsize = *(const WORD*)&pFormat[4]; DWORD bufsize = *(const WORD*)&pFormat[6]; @@ -2604,6 +2639,17 @@ unsigned long WINAPI NdrUserMarshalMemor TRACE("index=%d\n", index); pStubMsg->MemorySize += memsize; + + if (flags & USER_MARSHAL_POINTER) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + /* skip pointer prefix */ + pStubMsg->Buffer += 4; + ALIGN_POINTER(pStubMsg->Buffer, 8); + } + else + ALIGN_POINTER(pStubMsg->Buffer, (flags & 0xf) + 1); + pStubMsg->Buffer += bufsize; return pStubMsg->MemorySize;

1 0

Robert Shearman : rpcrt4: Fix NdrConformantArrayMemorySize.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 4fae04b2f5c57c1b5d3bfcf34b2f79e9d5d40b2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fae04b2f5c57c1b5d3bfcf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:39:58 2006 +0100 rpcrt4: Fix NdrConformantArrayMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3ba3194..4c7791e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2118,17 +2118,22 @@ unsigned long WINAPI NdrConformantArrayM PFORMAT_STRING pFormat) { DWORD size = 0, esize = *(const WORD*)(pFormat+2); - unsigned char *buffer; + unsigned char alignment = pFormat[1] + 1; TRACE("(%p,%p)\n", pStubMsg, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); - buffer = pStubMsg->Buffer; pFormat = ReadConformance(pStubMsg, pFormat+4); - pStubMsg->Buffer = buffer; size = pStubMsg->MaxCount; + pStubMsg->MemorySize += size*esize; - return size*esize; + ALIGN_POINTER(pStubMsg->Buffer, alignment); + pStubMsg->BufferMark = pStubMsg->Buffer; + pStubMsg->Buffer += size*esize; + + EmbeddedPointerMemorySize(pStubMsg, pFormat); + + return pStubMsg->MemorySize; } /***********************************************************************

1 0

Robert Shearman : rpcrt4: If the authorisation failed during a send then we should return ERROR_ACCESS_DENIED .
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 2aa52b07d6f974ebdb6c3f7a5334375082e8ddfb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2aa52b07d6f974ebdb6c3f7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:39:50 2006 +0100 rpcrt4: If the authorisation failed during a send then we should return ERROR_ACCESS_DENIED. --- dlls/rpcrt4/rpc_message.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index daeb668..f279910 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -393,7 +393,10 @@ static RPC_STATUS RPCRT_AuthorizeConnect ISC_REQ_DELEGATE, 0, SECURITY_NETWORK_DREP, &inp_desc, 0, &conn->ctx, &out_desc, &conn->attr, &conn->exp); if (r) - return r; + { + WARN("InitializeSecurityContext failed with error 0x%08lx\n", r); + return ERROR_ACCESS_DENIED; + } resp_hdr = RPCRT4_BuildAuthHeader(NDR_LOCAL_DATA_REPRESENTATION); if (!resp_hdr) @@ -571,8 +574,10 @@ RPC_STATUS RPCRT4_Receive(RpcConnection unsigned int offset; offset = common_hdr.frag_len - hdr_length - common_hdr.auth_len; - RPCRT_AuthorizeConnection(Connection, (LPBYTE)pMsg->Buffer + offset, - common_hdr.auth_len); + status = RPCRT_AuthorizeConnection(Connection, (LPBYTE)pMsg->Buffer + offset, + common_hdr.auth_len); + if (status) + goto fail; } /* success */

1 0

Ivan Gyurdiev : wined3d: SETP takes 3 parameters.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 3d905baf507e22974fefce7826098eaafba6ce6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d905baf507e22974fefce7… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 21:07:02 2006 -0400 wined3d: SETP takes 3 parameters. --- dlls/wined3d/pixelshader.c | 4 ++-- dlls/wined3d/vertexshader.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index d391a8c..918de80 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -606,7 +606,7 @@ void pshader_texldd(WINED3DSHADERVECTOR* FIXME(" : Stub\n"); } -void pshader_setp(WINED3DSHADERVECTOR* d) { +void pshader_setp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1) { FIXME(" : Stub\n"); } @@ -738,7 +738,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {D3DSIO_DSX, "dsx", GLNAME_REQUIRE_GLSL, 2, pshader_dsx, NULL, NULL, 0, 0}, {D3DSIO_DSY, "dsy", GLNAME_REQUIRE_GLSL, 2, pshader_dsy, NULL, NULL, 0, 0}, {D3DSIO_TEXLDD, "texldd", GLNAME_REQUIRE_GLSL, 2, pshader_texldd, NULL, NULL, 0, 0}, - {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 2, pshader_setp, NULL, NULL, 0, 0}, + {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 3, pshader_setp, NULL, NULL, 0, 0}, {D3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 2, pshader_texldl, NULL, NULL, 0, 0}, {D3DSIO_PHASE, "phase", GLNAME_REQUIRE_GLSL, 0, pshader_nop, NULL, NULL, 0, 0}, {0, NULL, NULL, 0, NULL, NULL, 0, 0} diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 4321693..6dfbd11 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -469,7 +469,7 @@ void vshader_texldd(WINED3DSHADERVECTOR* FIXME(" : Stub\n"); } -void vshader_setp(WINED3DSHADERVECTOR* d) { +void vshader_setp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1) { FIXME(" : Stub\n"); } @@ -565,7 +565,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader {D3DSIO_LABEL, "label", GLNAME_REQUIRE_GLSL, 1, vshader_label, NULL, NULL, 0, 0}, {D3DSIO_MOVA, "mova", GLNAME_REQUIRE_GLSL, 2, vshader_mova, NULL, NULL, 0, 0}, - {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 2, vshader_setp, NULL, NULL, 0, 0}, + {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 3, vshader_setp, NULL, NULL, 0, 0}, {D3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 2, vshader_texldl, NULL, NULL, 0, 0}, {0, NULL, NULL, 0, NULL, NULL, 0, 0} };

1 0

Ivan Gyurdiev : wined3d: Parameter trace corrections.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: fa62d9d3b4866e52cbe00db36d55ed656be4852b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa62d9d3b4866e52cbe00db… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 21:08:29 2006 -0400 wined3d: Parameter trace corrections. --- dlls/wined3d/baseshader.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1af6a71..a9e847a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -387,8 +387,17 @@ void shader_dump_param( case D3DSPR_ATTROUT: TRACE("oD%lu", reg); break; - case D3DSPR_TEXCRDOUT: - TRACE("oT%lu", reg); + case D3DSPR_TEXCRDOUT: + + /* Vertex shaders >= 3.0 use general purpose output registers + * (D3DSPR_OUTPUT), which can include an address token */ + + if (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 3) { + TRACE("o"); + shader_dump_arr_entry(iface, param, addr_token, input); + } + else + TRACE("oT%lu", reg); break; case D3DSPR_CONSTINT: TRACE("i"); @@ -403,13 +412,15 @@ void shader_dump_param( break; case D3DSPR_LOOP: TRACE("aL"); - shader_dump_arr_entry(iface, param, addr_token, input); break; case D3DSPR_SAMPLER: TRACE("s%lu", reg); break; + case D3DSPR_PREDICATE: + TRACE("p%lu", reg); + break; default: - TRACE("unhandled_rtype(%lx)", regtype); + TRACE("unhandled_rtype(%#lx)", regtype); break; }

1 0

Ivan Gyurdiev : wined3d: Take predication tokens into account.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 42b89791ff4328ec8a92916ff8b0435748b16ee1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42b89791ff4328ec8a92916… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 21:09:56 2006 -0400 wined3d: Take predication tokens into account. Each instruction can have a predication token. Account for it in the trace pass, register count pass, and store it in the SHADER_OPCODE_ARG structure for generation. MSDN claims the token is at the end of the instruction, but that's not true - testing a demo, which lets me manipulate the shader shows the predication token is the first source token immediately following the destination token. --- dlls/wined3d/baseshader.c | 28 ++++++++++++++++++++++------ dlls/wined3d/pixelshader.c | 18 +++++++++++++++++- dlls/wined3d/vertexshader.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a9e847a..f9f939f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -176,6 +176,7 @@ void shader_get_registers_used( while (D3DVS_END() != *pToken) { CONST SHADER_OPCODE* curOpcode; + DWORD opcode_token; /* Skip version */ if (shader_is_version_token(*pToken)) { @@ -191,8 +192,8 @@ void shader_get_registers_used( } /* Fetch opcode */ - curOpcode = shader_get_opcode(iface, *pToken); - ++pToken; + opcode_token = *pToken++; + curOpcode = shader_get_opcode(iface, opcode_token); /* Unhandled opcode, and its parameters */ if (NULL == curOpcode) { @@ -212,9 +213,19 @@ void shader_get_registers_used( /* Set texture registers, and temporary registers */ } else { - int i; + int i, limit; - for (i = 0; i < curOpcode->num_params; ++i) { + /* This will loop over all the registers and try to + * make a bitmask of the ones we're interested in. + * + * Relative addressing tokens are ignored, but that's + * okay, since we'll catch any address registers when + * they are initialized (required by spec) */ + + limit = (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED)? + curOpcode->num_params + 1: curOpcode->num_params; + + for (i = 0; i < limit; ++i) { DWORD param, addr_token, reg, regtype; pToken += shader_get_param(iface, pToken, &param, &addr_token); @@ -359,6 +370,8 @@ void shader_dump_param( TRACE("-"); else if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_COMP) TRACE("1-"); + else if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NOT) + TRACE("!"); } switch (regtype) { @@ -445,10 +458,10 @@ void shader_dump_param( if (0 != (param & D3DSP_SRCMOD_MASK)) { DWORD mask = param & D3DSP_SRCMOD_MASK; - /*TRACE("_modifier(0x%08lx) ", mask);*/ switch (mask) { case D3DSPSM_NONE: break; case D3DSPSM_NEG: break; + case D3DSPSM_NOT: break; case D3DSPSM_BIAS: TRACE("_bias"); break; case D3DSPSM_BIASNEG: TRACE("_bias"); break; case D3DSPSM_SIGN: TRACE("_bx2"); break; @@ -459,7 +472,7 @@ void shader_dump_param( case D3DSPSM_DZ: TRACE("_dz"); break; case D3DSPSM_DW: TRACE("_dw"); break; default: - TRACE("_unknown(0x%08lx)", mask); + TRACE("_unknown_modifier(%#lx)", mask >> D3DSP_SRCMOD_SHIFT); } } @@ -619,6 +632,9 @@ void generate_base_shader( hw_arg.dst = param; hw_arg.dst_addr = addr_token; + if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) + hw_arg.predicate = *pToken++; + for (i = 1; i < curOpcode->num_params; i++) { /* DEF* instructions have constant src parameters, not registers */ if (curOpcode->opcode == D3DSIO_DEF || diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 918de80..bafcd28 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1458,9 +1458,18 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S DWORD param, addr_token; int tokens_read; + /* Print out predication source token first - it follows + * the destination token. */ + if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) { + TRACE("("); + shader_dump_param((IWineD3DBaseShader*) This, *(pToken + 2), 0, 1); + TRACE(") "); + } + TRACE("%s", curOpcode->name); if (curOpcode->num_params > 0) { + /* Destination token */ tokens_read = shader_get_param((IWineD3DBaseShader*) This, pToken, &param, &addr_token); pToken += tokens_read; @@ -1469,7 +1478,14 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S shader_dump_ins_modifiers(param); TRACE(" "); shader_dump_param((IWineD3DBaseShader*) This, param, addr_token, 0); - + + /* Predication token - already printed out, just skip it */ + if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) { + pToken++; + len++; + } + + /* Other source tokens */ for (i = 1; i < curOpcode->num_params; ++i) { tokens_read = shader_get_param((IWineD3DBaseShader*) This, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6dfbd11..58a1963 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1576,9 +1576,18 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ DWORD param, addr_token; int tokens_read; + /* Print out predication source token first - it follows + * the destination token. */ + if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) { + TRACE("("); + shader_dump_param((IWineD3DBaseShader*) This, *(pToken + 2), 0, 1); + TRACE(") "); + } + TRACE("%s", curOpcode->name); if (curOpcode->num_params > 0) { + /* Destination token */ tokens_read = shader_get_param((IWineD3DBaseShader*) This, pToken, &param, &addr_token); pToken += tokens_read; @@ -1588,6 +1597,13 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ TRACE(" "); shader_dump_param((IWineD3DBaseShader*) This, param, addr_token, 0); + /* Predication token - already printed out, just skip it */ + if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) { + pToken++; + len++; + } + + /* Other source tokens */ for (i = 1; i < curOpcode->num_params; ++i) { tokens_read = shader_get_param((IWineD3DBaseShader*) This, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a61921..6b90544 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1296,6 +1296,7 @@ typedef struct SHADER_OPCODE_ARG { CONST SHADER_OPCODE* opcode; DWORD dst; DWORD dst_addr; + DWORD predicate; DWORD src[4]; DWORD src_addr[4]; SHADER_BUFFER* buffer;

1 0

Robert Shearman : rpcrt4: Implement NdrUserMarshalMemorySize.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: c4fbad1d113811a65b867ce519e1c1ca029130a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4fbad1d113811a65b867ce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 03:39:19 2006 +0100 rpcrt4: Implement NdrUserMarshalMemorySize. --- dlls/rpcrt4/ndr_marshall.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dbbc8e4..3ba3194 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2592,11 +2592,16 @@ unsigned long WINAPI NdrUserMarshalMemor PFORMAT_STRING pFormat) { unsigned index = *(const WORD*)&pFormat[2]; -/* DWORD memsize = *(const WORD*)&pFormat[4]; */ - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); + DWORD memsize = *(const WORD*)&pFormat[4]; + DWORD bufsize = *(const WORD*)&pFormat[6]; + + TRACE("(%p,%p)\n", pStubMsg, pFormat); TRACE("index=%d\n", index); - return 0; + pStubMsg->MemorySize += memsize; + pStubMsg->Buffer += bufsize; + + return pStubMsg->MemorySize; } /***********************************************************************

1 0

Huw Davies : rpcrt4: Don't update StubMsg->MemorySize while unmarshaling.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: effac656bb189d08bd101d9095bd9467a9be7b6d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=effac656bb189d08bd101d9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 17 15:28:38 2006 +0100 rpcrt4: Don't update StubMsg->MemorySize while unmarshaling. Add a bunch of marshaling tests (based on a program by Rob Shearman). --- dlls/rpcrt4/ndr_marshall.c | 2 dlls/rpcrt4/tests/.gitignore | 1 dlls/rpcrt4/tests/Makefile.in | 1 dlls/rpcrt4/tests/ndr_marshall.c | 419 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 423 insertions(+), 0 deletions(-) create mode 100644 dlls/rpcrt4/tests/ndr_marshall.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=effac656bb189d08bd1…

1 0

Andrew Ziem : kernel: Fix path test to pass on 95 and 98.
by Alexandre Julliard 17 May '06

17 May '06

Module: wine Branch: refs/heads/master Commit: 8bed7bb61a130e824a2ee5cbb2c2e3be199c1fb8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8bed7bb61a130e824a2ee5c… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Tue May 16 21:40:46 2006 -0600 kernel: Fix path test to pass on 95 and 98. --- dlls/kernel/tests/path.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/tests/path.c b/dlls/kernel/tests/path.c index 1ff36bd..8b10a62 100644 --- a/dlls/kernel/tests/path.c +++ b/dlls/kernel/tests/path.c @@ -339,14 +339,18 @@ static void test_InitPathA(CHAR *newdir, newdir,tmpstr,tmpstr1,id); ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); - ok((id=GetTempFileNameA(tmppath,NULL,0,newdir)),"GetTempFileNameA failed\n"); - sprintf(tmpstr,"%.4x.tmp",id & 0xffff); - sprintf(tmpstr1,"%x.tmp",id & 0xffff); - ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || - lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, - "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", - newdir,tmpstr,tmpstr1,id); - ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); + id=GetTempFileNameA(tmppath,NULL,0,newdir); +/* Windows 95, 98 return 0==id, while Windows 2000, XP return 0!=id */ + if (id) + { + sprintf(tmpstr,"%.4x.tmp",id & 0xffff); + sprintf(tmpstr1,"%x.tmp",id & 0xffff); + ok(lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr)==0 || + lstrcmpiA(newdir+lstrlenA(tmppath),tmpstr1)==0, + "GetTempFileNameA returned '%s' which doesn't match '%s' or '%s'. id=%x\n", + newdir,tmpstr,tmpstr1,id); + ok(DeleteFileA(newdir),"Couldn't delete the temporary file we just created\n"); + } /* Find first valid drive letter that is neither newdir[0] nor curDrive */ drives = GetLogicalDrives() & ~(1<<(newdir[0]-'A'));

1 0