wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Rob Shearman : include: Remove mismatched closing bracket from ws2ipdef. h when compiling as C++.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 0fac0f086161e8d9c1350114eda740d7aa57e087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fac0f086161e8d9c1350114e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Apr 7 12:30:05 2009 +0100 include: Remove mismatched closing bracket from ws2ipdef.h when compiling as C++. --- include/ws2ipdef.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 1fcfd27..c9c0970 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -261,8 +261,4 @@ struct WS(ip_msfilter) { #define WS_INET6_ADDRSTRLEN 65 #endif /* USE_WS_PREFIX */ -#ifdef __cplusplus -} -#endif - #endif /* __WS2IPDEF__ */

1 0

Rob Shearman : include: Add declaration of sockaddr_storage to ws2def.h.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: cb4265074f3dbe2c24813e0aef10b2bb7e88587c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4265074f3dbe2c24813e0ae… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Apr 7 12:29:35 2009 +0100 include: Add declaration of sockaddr_storage to ws2def.h. Move other declarations that belong in ws2def.h from winsock2.h. --- include/Makefile.in | 1 + include/winsock2.h | 23 +---------------- include/ws2def.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 22 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 6c1878a..795e55c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -473,6 +473,7 @@ SRCDIR_INCLUDES = \ wmistr.h \ wnaspi32.h \ wownt32.h \ + ws2def.h \ ws2ipdef.h \ ws2spi.h \ ws2tcpip.h \ diff --git a/include/winsock2.h b/include/winsock2.h index b73fde3..d54e8a8 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -47,6 +47,7 @@ #include <winsock.h> #undef __WINE_WINSOCK2__ +#include <ws2def.h> #ifdef __cplusplus extern "C" { @@ -421,28 +422,6 @@ typedef struct _BLOB { } BLOB, *LPBLOB; #endif -#ifndef __CSADDR_DEFINED__ -#define __CSADDR_DEFINED__ - -typedef struct _SOCKET_ADDRESS { - LPSOCKADDR lpSockaddr; - INT iSockaddrLength; -} SOCKET_ADDRESS, *PSOCKET_ADDRESS, *LPSOCKET_ADDRESS; - -typedef struct _CSADDR_INFO { - SOCKET_ADDRESS LocalAddr; - SOCKET_ADDRESS RemoteAddr; - INT iSocketType; - INT iProtocol; -} CSADDR_INFO, *PCSADDR_INFO, *LPCSADDR_INFO; -#endif - -/*socket address list */ -typedef struct _SOCKET_ADDRESS_LIST { - INT iAddressCount; - SOCKET_ADDRESS Address[1]; -} SOCKET_ADDRESS_LIST, *LPSOCKET_ADDRESS_LIST; - /* addressfamily protocol pairs */ typedef struct _AFPROTOCOLS { INT iAddressFamily; diff --git a/include/ws2def.h b/include/ws2def.h new file mode 100644 index 0000000..f2f7223 --- /dev/null +++ b/include/ws2def.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2009 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WS2DEF_ +#define _WS2DEF_ + +/* FIXME: #include <inaddr.h> */ + +#ifdef USE_WS_PREFIX +#define WS(x) WS_##x +#else +#define WS(x) x +#endif + +#ifndef __CSADDR_DEFINED__ +#define __CSADDR_DEFINED__ + +typedef struct _SOCKET_ADDRESS { + LPSOCKADDR lpSockaddr; + INT iSockaddrLength; +} SOCKET_ADDRESS, *PSOCKET_ADDRESS, *LPSOCKET_ADDRESS; + +typedef struct _CSADDR_INFO { + SOCKET_ADDRESS LocalAddr; + SOCKET_ADDRESS RemoteAddr; + INT iSocketType; + INT iProtocol; +} CSADDR_INFO, *PCSADDR_INFO, *LPCSADDR_INFO; +#endif + +#ifdef USE_WS_PREFIX +#define WS__SS_MAXSIZE 128 +#define WS__SS_ALIGNSIZE (sizeof(__int64)) +#define WS__SS_PAD1SIZE (WS__SS_ALIGNSIZE - sizeof(short)) +#define WS__SS_PAD2SIZE (WS__SS_MAXSIZE - 2 * WS__SS_ALIGNSIZE) +#else +#define _SS_MAXSIZE 128 +#define _SS_ALIGNSIZE (sizeof(__int64)) +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(short)) +#define _SS_PAD2SIZE (_SS_MAXSIZE - 2 * _SS_ALIGNSIZE) +#endif + +typedef struct WS(sockaddr_storage) { + short ss_family; + char __ss_pad1[WS(_SS_PAD1SIZE)]; + __int64 __ss_align; + char __ss_pad2[WS(_SS_PAD2SIZE)]; +} SOCKADDR_STORAGE, *PSOCKADDR_STORAGE, *LPSOCKADDR_STORAGE; + +/*socket address list */ +typedef struct _SOCKET_ADDRESS_LIST { + INT iAddressCount; + SOCKET_ADDRESS Address[1]; +} SOCKET_ADDRESS_LIST, *LPSOCKET_ADDRESS_LIST; + +#endif /* _WS2DEF_ */

1 0

Rob Shearman : oleaut32: Fix the SAFEARRAY marshalling on 64-bit platforms.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 47ae95ccce211ba48c1ea165c2c1f3c5ba6e8754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ae95ccce211ba48c1ea165c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Apr 7 12:27:49 2009 +0100 oleaut32: Fix the SAFEARRAY marshalling on 64-bit platforms. The pointers should be written as NDR 4-byte fields instead of a platform-dependent size. --- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- dlls/oleaut32/usrmarshal.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index cb6f45d..38827b1 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -146,8 +146,8 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) wiresa += sizeof(DWORD); ok(*(DWORD *)wiresa == cell_count, "wiresa + 0x1c should be %u instead of %u\n", cell_count, *(DWORD *)wiresa); wiresa += sizeof(DWORD); - ok(*(DWORD_PTR *)wiresa == (DWORD_PTR)lpsa->pvData, "wiresa + 0x20 should be lpsa->pvData instead of 0x%08lx\n", *(DWORD_PTR *)wiresa); - wiresa += sizeof(DWORD_PTR); + ok(*(DWORD *)wiresa, "wiresa + 0x20 should be non-zero instead of 0x%08x\n", *(DWORD *)wiresa); + wiresa += sizeof(DWORD); if(sftype == SF_HAVEIID) { GUID guid; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 14c655c..1e20c3c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -755,7 +755,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *ppsa); ALIGN_LENGTH(size, 3); - size += sizeof(ULONG_PTR); + size += sizeof(ULONG); if (*ppsa) { SAFEARRAY *psa = *ppsa; @@ -770,7 +770,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY size += sizeof(ULONG); size += sizeof(ULONG); - size += sizeof(ULONG_PTR); + size += sizeof(ULONG); if (sftype == SF_HAVEIID) size += sizeof(IID); @@ -843,8 +843,8 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf TRACE("("); dump_user_flags(pFlags); TRACE(", %p, &%p\n", Buffer, *ppsa); ALIGN_POINTER(Buffer, 3); - *(ULONG_PTR *)Buffer = *ppsa ? TRUE : FALSE; - Buffer += sizeof(ULONG_PTR); + *(ULONG *)Buffer = *ppsa ? 0x1 : 0x0; + Buffer += sizeof(ULONG); if (*ppsa) { VARTYPE vt; @@ -874,8 +874,8 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf *(ULONG *)Buffer = ulCellCount; Buffer += sizeof(ULONG); - *(ULONG_PTR *)Buffer = (ULONG_PTR)psa->pvData; - Buffer += sizeof(ULONG_PTR); + *(ULONG *)Buffer = psa->pvData ? 0x2 : 0x0; + Buffer += sizeof(ULONG); if (sftype == SF_HAVEIID) { SafeArrayGetIID(psa, &guid); @@ -958,7 +958,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa) { - ULONG_PTR ptr; + ULONG ptr; wireSAFEARRAY wiresa; ULONG cDims; HRESULT hr; @@ -971,8 +971,8 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B TRACE("("); dump_user_flags(pFlags); TRACE(", %p, %p\n", Buffer, ppsa); ALIGN_POINTER(Buffer, 3); - ptr = *(ULONG_PTR *)Buffer; - Buffer += sizeof(ULONG_PTR); + ptr = *(ULONG *)Buffer; + Buffer += sizeof(ULONG); if (!ptr) { @@ -1001,8 +1001,8 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B cell_count = *(ULONG *)Buffer; Buffer += sizeof(ULONG); - ptr = *(ULONG_PTR *)Buffer; - Buffer += sizeof(ULONG_PTR); + ptr = *(ULONG *)Buffer; + Buffer += sizeof(ULONG); if (sftype == SF_HAVEIID) { memcpy(&guid, Buffer, sizeof(guid));

1 0

Rob Shearman : rpcrt4: Compile in RPC over HTTP support even if HAVE_SOCKETPAIR is not defined.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: ce747f3facf0938f07e6c00ee233e08b1df687d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce747f3facf0938f07e6c00ee… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Apr 7 12:28:42 2009 +0100 rpcrt4: Compile in RPC over HTTP support even if HAVE_SOCKETPAIR is not defined. --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/rpc_transport.c | 279 ++++++++++++++++++++++--------------------- 2 files changed, 141 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce747f3facf0938f07e6c…

1 0

Rob Shearman : rpcrt4: Fix context handle test on Vista upwards.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: b2a5bfdfc91b2ddf58195af0a65673f02953cb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a5bfdfc91b2ddf58195af0a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Apr 7 12:27:13 2009 +0100 rpcrt4: Fix context handle test on Vista upwards. Don't run tests that results in an ERROR_INVALID_HANDLE exception being raised. Check for the context handle function pointers being non-NULL to prevent exceptions being raised on platforms without these functions. --- dlls/rpcrt4/tests/server.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index efa64eb..18cfa59 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -591,6 +591,12 @@ s_context_handle_test(void) binding = I_RpcGetCurrentCallHandle(); ok(binding != NULL, "I_RpcGetCurrentCallHandle returned NULL\n"); + if (!pNDRSContextMarshall2 || !pNDRSContextUnmarshall2) + { + win_skip("NDRSContextMarshall2 or NDRSContextUnmarshall2 not exported from rpcrt4.dll\n"); + return; + } + h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); @@ -614,6 +620,9 @@ s_context_handle_test(void) ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); ok(h->userContext == (void *)0xdeadbeef, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); + /* raises ERROR_INVALID_HANDLE exception on Vista upwards */ + if (0) + { /* marshal a context handle with an interface specified */ h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); @@ -627,6 +636,7 @@ s_context_handle_test(void) h = pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); ok(h->userContext == (void *)0xcafebabe, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); + } /* test same interface data, but different pointer */ /* raises ERROR_INVALID_HANDLE exception */

1 0

Henri Verbeet : wined3d: Simplify shader_glsl_cmp() and shader_glsl_cnd().
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: a4c942f6067fe906fef9e813bd7bbcd61cea8707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c942f6067fe906fef9e813b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:12 2009 +0200 wined3d: Simplify shader_glsl_cmp() and shader_glsl_cnd(). --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2080121..94ce5f2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1920,6 +1920,8 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) DWORD src2regtype = shader_get_regtype(ins->src[2]); DWORD dstreg = ins->dst[0].register_idx; DWORD dstregtype = ins->dst[0].register_type; + DWORD dst_mask = ins->dst[0].write_mask; + struct wined3d_shader_dst_param dst = ins->dst[0]; /* Cycle through all source0 channels */ for (i=0; i<4; i++) { @@ -1933,23 +1935,22 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) } } + dst.write_mask = dst_mask & write_mask; + dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; + /* Splitting the cmp instruction up in multiple lines imposes a problem: * The first lines may overwrite source parameters of the following lines. * Deal with that by using a temporary destination register if needed */ - if((src0reg == dstreg && src0regtype == dstregtype) || - (src1reg == dstreg && src1regtype == dstregtype) || - (src2reg == dstreg && src2regtype == dstregtype)) { - - write_mask = shader_glsl_get_write_mask(ins->dst[0].token & (~WINED3DSP_WRITEMASK_ALL | write_mask), - mask_char); + if ((src0reg == dstreg && src0regtype == dstregtype) + || (src1reg == dstreg && src1regtype == dstregtype) + || (src2reg == dstreg && src2regtype == dstregtype)) + { + write_mask = shader_glsl_get_write_mask(dst.token, mask_char); if (!write_mask) continue; shader_addline(ins->buffer, "tmp0%s = (", mask_char); temp_destination = TRUE; } else { - struct wined3d_shader_dst_param dst = ins->dst[0]; - dst.write_mask &= write_mask; - dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; } @@ -1976,11 +1977,13 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) * the compare is done per component of src0. */ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_dst_param dst; glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; DWORD write_mask, cmp_channel = 0; unsigned int i, j; + DWORD dst_mask; if (ins->reg_maps->shader_version < WINED3DPS_VERSION(1, 4)) { @@ -2000,8 +2003,9 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) return; } /* Cycle through all source0 channels */ + dst_mask = ins->dst[0].write_mask; + dst = ins->dst[0]; for (i=0; i<4; i++) { - struct wined3d_shader_dst_param dst; write_mask = 0; /* Find the destination channels which use the current source0 channel */ for (j=0; j<4; j++) { @@ -2011,9 +2015,9 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) cmp_channel = WINED3DSP_WRITEMASK_0 << j; } } - dst = ins->dst[0]; - dst.write_mask &= write_mask; - dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; + + dst.write_mask = dst_mask & write_mask; + dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue;

1 0

Henri Verbeet : wined3d: Simplify shader_glsl_color_correction().
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: a374ba54e56a580946834e7d376aa4273f2859ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a374ba54e56a580946834e7d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:12 2009 +0200 wined3d: Simplify shader_glsl_color_correction(). --- dlls/wined3d/glsl_shader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 16f1f57..2080121 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1437,11 +1437,11 @@ static void shader_glsl_append_fixup_arg(char *arguments, const char *reg_name, static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { + struct wined3d_shader_dst_param dst; unsigned int mask_size, remaining; glsl_dst_param_t dst_param; char arguments[256]; DWORD mask; - BOOL dummy; mask = 0; if (fixup.x_sign_fixup || fixup.x_source != CHANNEL_SOURCE_X) mask |= WINED3DSP_WRITEMASK_0; @@ -1461,11 +1461,10 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction mask_size = shader_glsl_get_write_mask_size(mask); - dst_param.mask_str[0] = '\0'; - shader_glsl_get_write_mask(mask, dst_param.mask_str); - - dst_param.reg_name[0] = '\0'; - shader_glsl_get_register_name(ins->dst[0].token, ins->dst[0].addr_token, dst_param.reg_name, &dummy, ins); + dst = ins->dst[0]; + dst.write_mask = mask; + dst.token = (dst.token & ~WINED3DSP_WRITEMASK_ALL) | dst.write_mask; + shader_glsl_add_dst_param(ins, &dst, &dst_param); arguments[0] = '\0'; remaining = mask_size;

1 0

Henri Verbeet : wined3d: Store the register type in struct wined3d_shader_dst_param.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 0f92bbc6bcda944681397610feaaac37c1b01620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f92bbc6bcda944681397610f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:11 2009 +0200 wined3d: Store the register type in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 2 ++ dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 42af755..5d3bd76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1019,7 +1019,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if ((WINED3DSHADER_VERSION_MAJOR(ins->reg_maps->shader_version) == 1 && !shader_is_pshader_version(ins->reg_maps->shader_version) - && shader_get_regtype(ins->dst[0].token) == WINED3DSPR_ADDR) + && ins->dst[0].register_type == WINED3DSPR_ADDR) || ins->handler_idx == WINED3DSIH_MOVA) { SHADER_BUFFER *buffer = ins->buffer; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index db3ab1e..57f65a4 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -850,6 +850,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, { dst_param.addr_token = 0; pToken += shader_get_param(pToken, shader_version, &dst_param.token, &dst_param.addr_token); + dst_param.register_type = ((dst_param.token & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((dst_param.token & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst_param.register_idx = dst_param.token & WINED3DSP_REGNUM_MASK; dst_param.write_mask = dst_param.token & WINED3DSP_WRITEMASK_ALL; dst_param.modifiers = dst_param.token & WINED3DSP_DSTMOD_MASK; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e24b951..16f1f57 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1601,7 +1601,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) * shader versions WINED3DSIO_MOVA is used for this. */ if ((WINED3DSHADER_VERSION_MAJOR(ins->reg_maps->shader_version) == 1 && !shader_is_pshader_version(ins->reg_maps->shader_version) - && shader_get_regtype(ins->dst[0].token) == WINED3DSPR_ADDR)) + && ins->dst[0].register_type == WINED3DSPR_ADDR)) { /* This is a simple floor() */ unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); @@ -1920,7 +1920,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) DWORD src1regtype = shader_get_regtype(ins->src[1]); DWORD src2regtype = shader_get_regtype(ins->src[2]); DWORD dstreg = ins->dst[0].register_idx; - DWORD dstregtype = shader_get_regtype(ins->dst[0].token); + DWORD dstregtype = ins->dst[0].register_type; /* Cycle through all source0 channels */ for (i=0; i<4; i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 070a590..6593908 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -452,6 +452,7 @@ typedef struct SHADER_OPCODE struct wined3d_shader_dst_param { + WINED3DSHADER_PARAM_REGISTER_TYPE register_type; UINT register_idx; DWORD write_mask; DWORD modifiers;

1 0

Henri Verbeet : wined3d: Explicitly pass register type and index to shader_is_scalar().
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: f7f61a58f45e362a63f5a08fc65f9cad093d4584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f61a58f45e362a63f5a08fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:11 2009 +0200 wined3d: Explicitly pass register type and index to shader_is_scalar(). --- dlls/wined3d/glsl_shader.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 19 ++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c0ea51..e24b951 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1184,7 +1184,8 @@ static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; - if (shader_is_scalar(param)) { + if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + { mask = WINED3DSP_WRITEMASK_0; } else { *ptr++ = '.'; @@ -1218,7 +1219,8 @@ static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, c const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; - if (!shader_is_scalar(param)) { + 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]; @@ -1900,7 +1902,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0])) + if (shader_is_scalar(shader_get_regtype(ins->src[0]), ins->src[0] & WINED3DSP_REGNUM_MASK)) { write_mask = shader_glsl_append_dst(ins->buffer, ins); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ccc681f..070a590 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,16 +2386,13 @@ static inline BOOL shader_is_comment(DWORD token) { return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); } -static inline BOOL shader_is_scalar(DWORD param) { - DWORD reg_type = shader_get_regtype(param); - DWORD reg_num; - - switch (reg_type) { +static inline BOOL shader_is_scalar(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) +{ + switch (register_type) + { case WINED3DSPR_RASTOUT: - if ((param & WINED3DSP_REGNUM_MASK) != 0) { - /* oFog & oPts */ - return TRUE; - } + /* oFog & oPts */ + if (register_idx != 0) return TRUE; /* oPos */ return FALSE; @@ -2406,8 +2403,8 @@ static inline BOOL shader_is_scalar(DWORD param) { return TRUE; case WINED3DSPR_MISCTYPE: - reg_num = param & WINED3DSP_REGNUM_MASK; - switch(reg_num) { + switch(register_idx) + { case 0: /* vPos */ return FALSE; case 1: /* vFace */

1 0

Henri Verbeet : wined3d: Store the write mask in struct wined3d_shader_dst_param.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 6f66c1ddbd1d53589b0bf587bc23d57838652b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f66c1ddbd1d53589b0bf587b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 7 11:09:11 2009 +0200 wined3d: Store the write mask in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 794f1e3..42af755 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -688,7 +688,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (shader_is_pshader_version(ins->reg_maps->shader_version)) { IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)ins->shader; - gen_color_correction(buffer, dst_str, ins->dst[0].token & WINED3DSP_WRITEMASK_ALL, + gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, "one", "coefmul.x", ps->cur_args->color_fixup[sampler_idx]); } } @@ -1584,10 +1584,10 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) break; } + tmp_dst = ins->dst[0]; for (i = 0; i < nComponents; i++) { - tmp_dst.register_idx = ins->dst[0].register_idx; - tmp_dst.modifiers = ins->dst[0].modifiers; - tmp_dst.token = ((ins->dst[0].token) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); + tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; + tmp_dst.token = (tmp_dst.token & ~WINED3DSP_WRITEMASK_ALL) | tmp_dst.write_mask; tmp_ins.src[1] = ins->src[1]+i; shader_hw_map2gl(&tmp_ins); } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ed6c069..db3ab1e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -851,6 +851,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, dst_param.addr_token = 0; pToken += shader_get_param(pToken, shader_version, &dst_param.token, &dst_param.addr_token); dst_param.register_idx = dst_param.token & WINED3DSP_REGNUM_MASK; + dst_param.write_mask = dst_param.token & WINED3DSP_WRITEMASK_ALL; dst_param.modifiers = dst_param.token & WINED3DSP_DSTMOD_MASK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e18224d..7c0ea51 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1446,7 +1446,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction if (fixup.y_sign_fixup || fixup.y_source != CHANNEL_SOURCE_Y) mask |= WINED3DSP_WRITEMASK_1; if (fixup.z_sign_fixup || fixup.z_source != CHANNEL_SOURCE_Z) mask |= WINED3DSP_WRITEMASK_2; if (fixup.w_sign_fixup || fixup.w_source != CHANNEL_SOURCE_W) mask |= WINED3DSP_WRITEMASK_3; - mask &= ins->dst[0].token; + mask &= ins->dst[0].write_mask; if (!mask) return; /* Nothing to do */ @@ -1509,7 +1509,7 @@ static void PRINTF_ATTR(6, 7) shader_glsl_gen_sample_code(const struct wined3d_s BOOL rect_fixup = FALSE; va_list args; - shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].token, dst_swizzle); + shader_glsl_get_swizzle(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); if (shader_is_pshader_version(ins->reg_maps->shader_version)) { @@ -1947,6 +1947,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) temp_destination = TRUE; } else { struct wined3d_shader_dst_param dst = ins->dst[0]; + dst.write_mask &= write_mask; dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; @@ -2010,6 +2011,7 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) } } dst = ins->dst[0]; + dst.write_mask &= write_mask; dst.token &= ~WINED3DSP_WRITEMASK_ALL | write_mask; write_mask = shader_glsl_append_dst_ext(ins->buffer, ins, &dst); if (!write_mask) continue; @@ -2087,11 +2089,11 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) break; } + tmp_dst = ins->dst[0]; for (i = 0; i < nComponents; ++i) { - tmp_dst.register_idx = ins->dst[0].register_idx; - tmp_dst.modifiers = ins->dst[0].modifiers; - tmp_dst.token = ((ins->dst[0].token) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); + tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; + tmp_dst.token = (tmp_dst.token & ~WINED3DSP_WRITEMASK_ALL) | tmp_dst.write_mask; tmp_ins.src[1] = ins->src[1] + i; shader_glsl_dot(&tmp_ins); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff03d3d..ccc681f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -453,6 +453,7 @@ typedef struct SHADER_OPCODE struct wined3d_shader_dst_param { UINT register_idx; + DWORD write_mask; DWORD modifiers; DWORD token; DWORD addr_token;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009