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

Henri Verbeet : wined3d: Simplify shader_glsl_color_correction().
by Alexandre Julliard April 7, 2009

April 7, 2009

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

Rob Shearman : include: Add declaration of sockaddr_storage to ws2def.h.
by Alexandre Julliard April 7, 2009

April 7, 2009

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 April 7, 2009

April 7, 2009

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 : include: Remove mismatched closing bracket from ws2ipdef. h when compiling as C++.
by Alexandre Julliard April 7, 2009

April 7, 2009

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

Henri Verbeet : wined3d: Simplify shader_glsl_cmp() and shader_glsl_cnd().
by Alexandre Julliard April 7, 2009

April 7, 2009

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

Rob Shearman : rpcrt4: Fix context handle test on Vista upwards.
by Alexandre Julliard April 7, 2009

April 7, 2009

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

Rob Shearman : rpcrt4: Compile in RPC over HTTP support even if HAVE_SOCKETPAIR is not defined.
by Alexandre Julliard April 7, 2009

April 7, 2009

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

Alexandre Julliard : gdi32/tests: Add some metafile tests. Fix typos.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: 1f1d15723743cbbe9057b610c22743a9cd63db45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1d15723743cbbe9057b610c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 15:20:13 2009 +0200 gdi32/tests: Add some metafile tests. Fix typos. --- dlls/gdi32/tests/metafile.c | 83 ++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f1d15723743cbbe9057b…

1 0

Ge van Geldorp : urlmon/tests: Handle certificate verification error.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: f4795d5997d78f7b1f85340ca0a09168a2716aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4795d5997d78f7b1f85340ca… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Apr 7 12:22:14 2009 +0200 urlmon/tests: Handle certificate verification error. --- dlls/urlmon/tests/protocol.c | 100 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index cc9d41a..ea19c77 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -84,6 +84,7 @@ DEFINE_EXPECT(GetBindString_USER_AGENT); DEFINE_EXPECT(GetBindString_POST_COOKIE); DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); +DEFINE_EXPECT(QueryService_HttpSecurity); DEFINE_EXPECT(BeginningTransaction); DEFINE_EXPECT(GetRootSecurityId); DEFINE_EXPECT(OnResponse); @@ -123,6 +124,7 @@ static HANDLE event_complete, event_complete2; static BOOL binding_test; static PROTOCOLDATA protocoldata, *pdata; static DWORD prot_read; +static BOOL security_problem = FALSE; static enum { FILE_TEST, @@ -182,6 +184,60 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpW(strw, buf); } +static HRESULT WINAPI HttpSecurity_QueryInterface(IHttpSecurity *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IHttpSecurity, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI HttpSecurity_AddRef(IHttpSecurity *iface) +{ + return 2; +} + +static ULONG WINAPI HttpSecurity_Release(IHttpSecurity *iface) +{ + return 1; +} + +static HRESULT WINAPI HttpSecurity_GetWindow(IHttpSecurity* iface, REFGUID rguidReason, HWND *phwnd) +{ + trace("HttpSecurity_GetWindow\n"); + + return S_FALSE; +} + +static HRESULT WINAPI HttpSecurity_OnSecurityProblem(IHttpSecurity *iface, DWORD dwProblem) +{ + trace("Security problem: %u\n", dwProblem); + ok(dwProblem == ERROR_INTERNET_SEC_CERT_REV_FAILED, "Expected ERROR_INTERNET_SEC_CERT_REV_FAILED got %u\n", dwProblem); + + /* Only retry once */ + if (security_problem) + return E_ABORT; + + security_problem = TRUE; + SET_EXPECT(BeginningTransaction); + + return RPC_E_RETRY; +} + +static IHttpSecurityVtbl HttpSecurityVtbl = { + HttpSecurity_QueryInterface, + HttpSecurity_AddRef, + HttpSecurity_Release, + HttpSecurity_GetWindow, + HttpSecurity_OnSecurityProblem +}; + +static IHttpSecurity http_security = { &HttpSecurityVtbl }; + static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) @@ -320,6 +376,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return E_NOINTERFACE; } + if(IsEqualGUID(&IID_IHttpSecurity, guidService)) { + ok(IsEqualGUID(&IID_IHttpSecurity, riid), "unexpected riid\n"); + CHECK_EXPECT(QueryService_HttpSecurity); + return IHttpSecurity_QueryInterface(&http_security, riid, ppv); + } + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); return E_FAIL; } @@ -380,7 +442,7 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL } if(tested_protocol == FTP_TEST) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); - else + else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { SET_EXPECT(OnResponse); @@ -397,18 +459,26 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL ok(hres == S_OK, "Continue failed: %08x\n", hres); if(tested_protocol == FTP_TEST) CLEAR_CALLED(ReportData); - else + else if (! security_problem) CHECK_CALLED(ReportData); if (!state) { - state = 1; - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { - CHECK_CALLED(OnResponse); - if(tested_protocol == HTTPS_TEST) - CHECK_CALLED(ReportProgress_ACCEPTRANGES); - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - if(bindf & BINDF_NEEDFILE) - CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + if (! security_problem) + { + state = 1; + if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + CHECK_CALLED(OnResponse); + if(tested_protocol == HTTPS_TEST) + CHECK_CALLED(ReportProgress_ACCEPTRANGES); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(bindf & BINDF_NEEDFILE) + CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + } + } + else + { + security_problem = FALSE; + SET_EXPECT(ReportProgress_CONNECTING); } } @@ -466,11 +536,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, } break; case BINDSTATUS_FINDINGRESOURCE: - CHECK_EXPECT(ReportProgress_FINDINGRESOURCE); + CHECK_EXPECT2(ReportProgress_FINDINGRESOURCE); ok(szStatusText != NULL, "szStatusText == NULL\n"); break; case BINDSTATUS_CONNECTING: - CHECK_EXPECT(ReportProgress_CONNECTING); + CHECK_EXPECT2(ReportProgress_CONNECTING); ok(szStatusText != NULL, "szStatusText == NULL\n"); break; case BINDSTATUS_SENDINGREQUEST: @@ -1672,6 +1742,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(ReportProgress_PROXYDETECTING); if(! is_https) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + else + SET_EXPECT(QueryService_HttpSecurity); if(!(bindf & BINDF_FROMURLMON)) { SET_EXPECT(OnResponse); SET_EXPECT(ReportProgress_RAWMIMETYPE); @@ -1695,6 +1767,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) CHECK_CALLED(Switch); else CHECK_CALLED(ReportData); + if (is_https) + CLEAR_CALLED(QueryService_HttpSecurity); while(1) { if(bindf & BINDF_FROMURLMON) @@ -1721,6 +1795,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); + if (is_https) + CLEAR_CALLED(ReportProgress_SENDINGREQUEST); test_protocol_terminate(async_protocol); ref = IInternetProtocol_Release(async_protocol);

1 0

Warren Dumortier : winecfg: Update French translation.
by Alexandre Julliard April 7, 2009

April 7, 2009

Module: wine Branch: master Commit: 33a0062e0f54ab876ed088510e6b90f128daf90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a0062e0f54ab876ed088510… Author: Warren Dumortier <nwarrenfl(a)gmail.com> Date: Mon Apr 6 15:09:25 2009 +0200 winecfg: Update French translation. --- programs/winecfg/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 818c50f..d72bafc 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Param�tres des fen�tres ",IDC_STATIC,8,4,244,92 CONTROL "Permettre aux applications DirectX d'emp�cher la souris de quitter leur fen�tre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,20,230,16 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + CONTROL "Permettre au gestionnaire de &fen�tres de &d�corer les fen�tres",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 CONTROL "Permettre au gestionnaire de &fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,230,8 CONTROL "�muler un bureau virtuel",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,64,230,8 @@ -188,7 +188,7 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Taille :",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item :",IDC_STATIC,15,64,112,8 + LTEXT "El�ment :",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Couleur :",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW

1 0