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

Mike Kaplinskiy : server: Don' t poll for events when there are async operations queued.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: ac12c67f40fc9892e27b76b74c0425b69767b95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac12c67f40fc9892e27b76b74… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 19 01:38:29 2010 -0400 server: Don't poll for events when there are async operations queued. --- server/sock.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/server/sock.c b/server/sock.c index 34ec176..0a1bb40 100644 --- a/server/sock.c +++ b/server/sock.c @@ -466,7 +466,8 @@ static int sock_signaled( struct object *obj, struct thread *thread ) static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd ); - unsigned int mask = sock->mask & sock->state & ~sock->hmask; + unsigned int mask = sock->mask & ~sock->hmask; + unsigned int smask = sock->state & mask; int ev = 0; assert( sock->obj.ops == &sock_ops ); @@ -476,15 +477,26 @@ static int sock_get_poll_events( struct fd *fd ) return POLLOUT; if (sock->state & FD_WINE_LISTENING) /* listening, wait for readable */ - return (sock->hmask & FD_ACCEPT) ? 0 : POLLIN; + return (mask & FD_ACCEPT) ? POLLIN : 0; - if (mask & FD_READ || async_waiting( sock->read_q )) ev |= POLLIN | POLLPRI; - if (mask & FD_WRITE || async_waiting( sock->write_q )) ev |= POLLOUT; + if ( async_queued( sock->read_q ) ) + { + if ( async_waiting( sock->read_q ) ) ev |= POLLIN | POLLPRI; + } + else if (smask & FD_READ) + ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) && - !(sock->hmask & FD_READ) && sock->state & FD_READ ) + else if ( sock->type == SOCK_STREAM && sock->state & FD_READ && mask & FD_CLOSE && + !(sock->hmask & FD_READ) ) ev |= POLLIN; + if ( async_queued( sock->write_q ) ) + { + if ( async_waiting( sock->write_q ) ) ev |= POLLOUT; + } + else if (smask & FD_WRITE) + ev |= POLLOUT; + return ev; }

1 0

Matteo Bruni : d3dx9: Add ps_3_0 instructions parsing to the shader assembler.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: abb489b29d73cb13f07103b3d871cdbd84d11b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb489b29d73cb13f07103b3d… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 19 14:57:38 2010 +0200 d3dx9: Add ps_3_0 instructions parsing to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 10 ++++++ dlls/d3dx9_36/asmshader.y | 57 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 21 ++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 13 ++++++++ 4 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index e65c6f9..e1aac26 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -161,6 +161,16 @@ texldl {return INSTR_TEXLDL; } lit {return INSTR_LIT; } mova {return INSTR_MOVA; } + /* Pixel shader only instructions */ +cmp {return INSTR_CMP; } +dp2add {return INSTR_DP2ADD; } +texkill {return INSTR_TEXKILL; } +texld {return INSTR_TEXLD; } +dsx {return INSTR_DSX; } +dsy {return INSTR_DSY; } +texldp {return INSTR_TEXLDP; } +texldb {return INSTR_TEXLDB; } +texldd {return INSTR_TEXLDD; } {REG_TEMP} { asmshader_lval.regnum = atoi(yytext + 1); diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index f8dd716..657ce3c 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -147,6 +147,17 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token INSTR_LIT %token INSTR_MOVA +/* Pixel shader only instructions */ +%token INSTR_CMP +%token INSTR_DP2ADD +%token INSTR_TEXKILL +%token INSTR_TEXLD +%token INSTR_DSX +%token INSTR_DSY +%token INSTR_TEXLDP +%token INSTR_TEXLDB +%token INSTR_TEXLDD + /* Registers */ %token <regnum> REG_TEMP %token <regnum> REG_OUTPUT @@ -685,6 +696,52 @@ instruction: INSTR_ADD omods dreg ',' sregs TRACE("MOVA\n"); asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_MOVA, $2.mod, $2.shift, 0, &$3, &$5, 1); } + | INSTR_CMP omods dreg ',' sregs + { + TRACE("CMP\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_CMP, $2.mod, $2.shift, 0, &$3, &$5, 3); + } + | INSTR_DP2ADD omods dreg ',' sregs + { + TRACE("DP2ADD\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_DP2ADD, $2.mod, $2.shift, 0, &$3, &$5, 3); + } + | INSTR_TEXLD omods dreg ',' sregs + { + TRACE("TEXLD\n"); + /* There is more than one acceptable syntax for texld: + with 1 sreg (PS 1.4) or + with 2 sregs (PS 2.0+) + Moreover, texld shares the same opcode as the tex instruction, + so there are a total of 3 valid syntaxes + These variations are handled in asmparser.c */ + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEX, $2.mod, $2.shift, 0, &$3, &$5, 2); + } + | INSTR_TEXLDP omods dreg ',' sregs + { + TRACE("TEXLDP\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ), $2.mod, $2.shift, 0, &$3, &$5, 2); + } + | INSTR_TEXLDB omods dreg ',' sregs + { + TRACE("TEXLDB\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ), $2.mod, $2.shift, 0, &$3, &$5, 2); + } + | INSTR_DSX omods dreg ',' sregs + { + TRACE("DSX\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_DSX, $2.mod, $2.shift, 0, &$3, &$5, 1); + } + | INSTR_DSY omods dreg ',' sregs + { + TRACE("DSY\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_DSY, $2.mod, $2.shift, 0, &$3, &$5, 1); + } + | INSTR_TEXLDD omods dreg ',' sregs + { + TRACE("TEXLDD\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEXLDD, $2.mod, $2.shift, 0, &$3, &$5, 4); + } dreg: dreg_name rel_reg { diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index c5ef6c2..e000a5f 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -191,9 +191,17 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_MOVA: return D3DSIO_MOVA; case BWRITERSIO_DEFB: return D3DSIO_DEFB; case BWRITERSIO_DEFI: return D3DSIO_DEFI; + + case BWRITERSIO_TEXKILL: return D3DSIO_TEXKILL; + case BWRITERSIO_TEX: return D3DSIO_TEX; case BWRITERSIO_EXPP: return D3DSIO_EXPP; case BWRITERSIO_LOGP: return D3DSIO_LOGP; case BWRITERSIO_DEF: return D3DSIO_DEF; + case BWRITERSIO_CMP: return D3DSIO_CMP; + case BWRITERSIO_DP2ADD: return D3DSIO_DP2ADD; + case BWRITERSIO_DSX: return D3DSIO_DSX; + case BWRITERSIO_DSY: return D3DSIO_DSY; + case BWRITERSIO_TEXLDD: return D3DSIO_TEXLDD; case BWRITERSIO_SETP: return D3DSIO_SETP; case BWRITERSIO_TEXLDL: return D3DSIO_TEXLDL; case BWRITERSIO_BREAKP: return D3DSIO_BREAKP; @@ -201,6 +209,9 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_COMMENT: return D3DSIO_COMMENT; case BWRITERSIO_END: return D3DSIO_END; + case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return D3DSIO_TEX | D3DSI_TEXLD_PROJECT; + case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return D3DSIO_TEX | D3DSI_TEXLD_BIAS; + default: FIXME("Unhandled BWRITERSIO token %u\n", bwriter_opcode); return -1; @@ -459,13 +470,23 @@ const char *debug_print_opcode(DWORD opcode) { case BWRITERSIO_MOVA: return "mova"; case BWRITERSIO_DEFB: return "defb"; case BWRITERSIO_DEFI: return "defi"; + case BWRITERSIO_TEXKILL: return "texkill"; + case BWRITERSIO_TEX: return "tex"; case BWRITERSIO_EXPP: return "expp"; case BWRITERSIO_LOGP: return "logp"; case BWRITERSIO_DEF: return "def"; + case BWRITERSIO_CMP: return "cmp"; + case BWRITERSIO_DP2ADD: return "dp2add"; + case BWRITERSIO_DSX: return "dsx"; + case BWRITERSIO_DSY: return "dsy"; + case BWRITERSIO_TEXLDD: return "texldd"; case BWRITERSIO_SETP: return "setp"; case BWRITERSIO_TEXLDL: return "texldl"; case BWRITERSIO_BREAKP: return "breakp"; + case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return "texldp"; + case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return "texldb"; + default: return "unknown"; } } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index ffecd31..e5816b3 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -448,9 +448,16 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_DEFB, BWRITERSIO_DEFI, + BWRITERSIO_TEXKILL, + BWRITERSIO_TEX, BWRITERSIO_EXPP, BWRITERSIO_LOGP, BWRITERSIO_DEF, + BWRITERSIO_CMP, + BWRITERSIO_DP2ADD, + BWRITERSIO_DSX, + BWRITERSIO_DSY, + BWRITERSIO_TEXLDD, BWRITERSIO_SETP, BWRITERSIO_TEXLDL, BWRITERSIO_BREAKP, @@ -508,6 +515,9 @@ typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { BWRITERSTT_VOLUME = 4, } BWRITERSAMPLER_TEXTURE_TYPE; +#define BWRITERSI_TEXLD_PROJECT 1 +#define BWRITERSI_TEXLD_BIAS 2 + typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { BWRITERSPSM_NONE = 0, BWRITERSPSM_NEG, @@ -578,6 +588,9 @@ typedef enum _BWRITERDECLUSAGE { BWRITERDECLUSAGE_SAMPLE } BWRITERDECLUSAGE; +#define BWRITER_OPCODESPECIFICCONTROL_SHIFT 16 +#define BWRITER_OPCODESPECIFICCONTROL_MASK (0xff << BWRITER_OPCODESPECIFICCONTROL_SHIFT) + struct bwriter_shader *SlAssembleShader(const char *text, char **messages); DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result); void SlDeleteShader(struct bwriter_shader *shader);

1 0

Matteo Bruni : d3dx9: Shader assembler ps_3_0 support.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 5cc00e82b6f7259ab245f66e05c21ac1bc1e8d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc00e82b6f7259ab245f66e0… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 19 14:57:38 2010 +0200 d3dx9: Shader assembler ps_3_0 support. --- dlls/d3dx9_36/asmparser.c | 79 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmshader.y | 3 +- dlls/d3dx9_36/bytecodewriter.c | 78 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/tests/asm.c | 21 ++++++++++- 5 files changed, 178 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc00e82b6f7259ab245f…

1 0

Piotr Caban : wininet: Fix callbacks sent on connection error.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 4ba60d265a3543d6c4a0be8d4bcd0d306dbd96a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba60d265a3543d6c4a0be8d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 01:48:58 2010 +0200 wininet: Fix callbacks sent on connection error. --- dlls/wininet/http.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f72cf3b..9f96f8a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3668,7 +3668,7 @@ lend: HTTP_ReceiveRequestData(lpwhr, TRUE); else { - iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwResult = 0; iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -4360,6 +4360,10 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr) if(res != ERROR_SUCCESS) goto lend; + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_CONNECTED_TO_SERVER, + szaddr, strlen(szaddr)+1); + if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { /* Note: we differ from Microsoft's WinINet here. they seem to have @@ -4368,20 +4372,20 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) + if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) { + HTTPREQ_CloseConnection(&lpwhr->hdr); goto lend; + } res = NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName); if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); + HTTPREQ_CloseConnection(&lpwhr->hdr); goto lend; } } - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_CONNECTED_TO_SERVER, - szaddr, strlen(szaddr)+1); lend: lpwhr->read_pos = lpwhr->read_size = 0;

1 0

Piotr Caban : wininet: Added INTERNET_OPTION_ERROR_MASK flag handling to InternetSetOptionW.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: ee72094ca8013853c224db73731489b6c2756272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee72094ca8013853c224db737… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 12:29:09 2010 +0200 wininet: Added INTERNET_OPTION_ERROR_MASK flag handling to InternetSetOptionW. --- dlls/wininet/internet.c | 15 ++++++++- dlls/wininet/internet.h | 1 + dlls/wininet/tests/internet.c | 65 ++++++++++++++++++++++++++++++++++++----- include/wininet.h | 3 ++ 4 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index eb3c8e2..9e32046 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2484,8 +2484,19 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_OPTION_ERROR_MASK: { - ULONG flags = *(ULONG *)lpBuffer; - FIXME("Option INTERNET_OPTION_ERROR_MASK(%d): STUB\n", flags); + if(!lpwhh) { + SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + return FALSE; + } else if(*(ULONG*)lpBuffer & (~(INTERNET_ERROR_MASK_INSERT_CDROM| + INTERNET_ERROR_MASK_COMBINED_SEC_CERT| + INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY))) { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } else if(dwBufferLength != sizeof(ULONG)) { + SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH); + ret = FALSE; + } else + lpwhh->ErrorMask = *(ULONG*)lpBuffer; } break; case INTERNET_OPTION_CODEPAGE: diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6fdb5dc..64bfdaa 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -156,6 +156,7 @@ struct _object_header_t DWORD dwFlags; DWORD_PTR dwContext; DWORD dwError; + ULONG ErrorMask; DWORD dwInternalFlags; LONG refs; INTERNET_STATUS_CALLBACK lpfnStatusCB; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fa28b0c..4da9c21 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -835,27 +835,75 @@ static void test_PrivacyGetSetZonePreferenceW(void) ok(ret == 0, "expected ret == 0, got %u\n", ret); } -static void test_Option_Policy(void) +static void test_InternetSetOption(void) { - HINTERNET hinet; + HINTERNET ses, con, req; + ULONG ulArg; + DWORD size; BOOL ret; - hinet = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(hinet != 0, "InternetOpen failed: 0x%08x\n", GetLastError()); + ses = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != 0, "InternetOpen failed: 0x%08x\n", GetLastError()); + con = InternetConnect(ses, "www.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != 0, "InternetConnect failed: 0x%08x\n", GetLastError()); + req = HttpOpenRequest(con, "GET", "/", NULL, NULL, NULL, 0, 0); + ok(req != 0, "HttpOpenRequest failed: 0x%08x\n", GetLastError()); + /* INTERNET_OPTION_POLICY tests */ SetLastError(0xdeadbeef); - ret = InternetSetOptionW(hinet, INTERNET_OPTION_POLICY, NULL, 0); + ret = InternetSetOptionW(ses, INTERNET_OPTION_POLICY, NULL, 0); ok(ret == FALSE, "InternetSetOption should've failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should've " "given ERROR_INVALID_PARAMETER, gave: 0x%08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = InternetQueryOptionW(hinet, INTERNET_OPTION_POLICY, NULL, 0); + ret = InternetQueryOptionW(ses, INTERNET_OPTION_POLICY, NULL, 0); ok(ret == FALSE, "InternetQueryOption should've failed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should've " "given ERROR_INVALID_PARAMETER, gave: 0x%08x\n", GetLastError()); - ret = InternetCloseHandle(hinet); + /* INTERNET_OPTION_ERROR_MASK tests */ + SetLastError(0xdeadbeef); + size = sizeof(ulArg); + ret = InternetQueryOptionW(NULL, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, &size); + ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ulArg = 11; + ret = InternetSetOption(NULL, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); + ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "GetLastError() = %x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ulArg = 11; + ret = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, 20); + ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(GetLastError() == ERROR_INTERNET_BAD_OPTION_LENGTH, "GetLastError() = %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ulArg = 11; + ret = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); + ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ulArg = 4; + ret = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); + ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ulArg = 16; + ret = InternetSetOption(req, INTERNET_OPTION_ERROR_MASK, (void*)&ulArg, sizeof(ULONG)); + ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %x\n", GetLastError()); + + ret = InternetCloseHandle(req); + ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); + ret = InternetCloseHandle(con); + ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); + ret = InternetCloseHandle(ses); ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); } @@ -1097,7 +1145,6 @@ START_TEST(internet) test_complicated_cookie(); test_version(); test_null(); - test_Option_Policy(); test_Option_PerConnectionOption(); test_Option_PerConnectionOptionA(); @@ -1123,4 +1170,6 @@ START_TEST(internet) test_PrivacyGetSetZonePreferenceW(); else win_skip("Privacy[SG]etZonePreferenceW are not available\n"); + + test_InternetSetOption(); } diff --git a/include/wininet.h b/include/wininet.h index 1cb0508..a0ec408 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -122,6 +122,9 @@ INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP) ) #define INTERNET_ERROR_MASK_INSERT_CDROM 0x1 +#define INTERNET_ERROR_MASK_COMBINED_SEC_CERT 0x2 +#define INTERNET_ERROR_MASK_NEED_MSN_SSPI_PKG 0x4 +#define INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY 0x8 #define INTERNET_OPTIONS_MASK (~INTERNET_FLAGS_MASK) #define WININET_API_FLAG_ASYNC 0x00000001

1 0

Piotr Caban : wininet: Combine certificate errors in HTTP_OpenConnection.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 8dde5c5168dcbf7f8166a73507c60aff4a667de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dde5c5168dcbf7f8166a7350… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 01:50:46 2010 +0200 wininet: Combine certificate errors in HTTP_OpenConnection. --- dlls/wininet/http.c | 11 +++++++++++ dlls/wininet/netconnection.c | 4 +++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9f96f8a..bd2e574 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4381,6 +4381,17 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr) if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); + + if((lpwhr->hdr.ErrorMask&INTERNET_ERROR_MASK_COMBINED_SEC_CERT) && ( + res == ERROR_INTERNET_SEC_CERT_DATE_INVALID + || res == ERROR_INTERNET_INVALID_CA + || res == ERROR_INTERNET_SEC_CERT_NO_REV + || res == ERROR_INTERNET_SEC_CERT_REV_FAILED + || res == ERROR_INTERNET_SEC_CERT_REVOKED + || res == ERROR_INTERNET_SEC_INVALID_CERT + || res == ERROR_INTERNET_SEC_CERT_CN_INVALID)) + res = ERROR_INTERNET_SEC_CERT_ERRORS; + HTTPREQ_CloseConnection(&lpwhr->hdr); goto lend; } diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index bb89517..5aa647a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -331,7 +331,9 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) CertFreeCertificateContext(endCert); CertCloseStore(store, 0); } - } + } else + pSSL_set_ex_data(ssl, error_idx, (void *)ERROR_INTERNET_SEC_CERT_ERRORS); + return ret; }

1 0

Henri Verbeet : wined3d: Make context_attach_surface_fbo() static.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 0fe7b45b6c730cd33781efdef56ab56a525e8863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe7b45b6c730cd33781efdef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 19 11:13:34 2010 +0200 wined3d: Make context_attach_surface_fbo() static. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 065fceb..dc86ba4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -253,7 +253,7 @@ void context_attach_depth_stencil_fbo(struct wined3d_context *context, } /* GL locking is done by the caller */ -void context_attach_surface_fbo(const struct wined3d_context *context, +static void context_attach_surface_fbo(const struct wined3d_context *context, GLenum fbo_target, DWORD idx, IWineD3DSurfaceImpl *surface) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0b22a56..0147c2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1200,8 +1200,6 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN; -void context_attach_surface_fbo(const struct wined3d_context *context, - GLenum fbo_target, DWORD idx, IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) DECLSPEC_HIDDEN; struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target, const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Explicitly pass the FBO target to context_clean_fbo_attachments().
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 465e8f66cb9afdd82cb0ff0141378771625976ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=465e8f66cb9afdd82cb0ff014… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 19 11:13:35 2010 +0200 wined3d: Explicitly pass the FBO target to context_clean_fbo_attachments(). This should have been part of e01d56f33169aa314d5488e03f8c0d651cd58c2a. --- dlls/wined3d/context.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index dc86ba4..e6eb50f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -84,19 +84,19 @@ void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fb } /* GL locking is done by the caller */ -static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info) +static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, GLenum target) { unsigned int i; for (i = 0; i < gl_info->limits.buffers; ++i) { - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, 0, 0); + gl_info->fbo_ops.glFramebufferTexture2D(target, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); } - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); + gl_info->fbo_ops.glFramebufferTexture2D(target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); + gl_info->fbo_ops.glFramebufferTexture2D(target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); } @@ -106,7 +106,7 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) const struct wined3d_gl_info *gl_info = context->gl_info; context_bind_fbo(context, GL_FRAMEBUFFER, fbo); - context_clean_fbo_attachments(gl_info); + context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); gl_info->fbo_ops.glDeleteFramebuffers(1, fbo); @@ -342,7 +342,7 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ const struct wined3d_gl_info *gl_info = context->gl_info; context_bind_fbo(context, target, &entry->id); - context_clean_fbo_attachments(gl_info); + context_clean_fbo_attachments(gl_info, target); memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); entry->depth_stencil = depth_stencil;

1 0

Henri Verbeet : wined3d: Use wine_dbgstr_rect() for tracing the rectangle in IWineD3DSurfaceImpl_LockRect().
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: f0888577c509688773ca2d443477588934f76106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0888577c509688773ca2d443… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 19 11:13:36 2010 +0200 wined3d: Use wine_dbgstr_rect() for tracing the rectangle in IWineD3DSurfaceImpl_LockRect(). --- dlls/wined3d/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2d7ff23..811ba11 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1680,7 +1680,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED IWineD3DDeviceImpl *device = This->resource.device; const RECT *pass_rect = pRect; - TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); + TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n", + iface, pLockedRect, wine_dbgstr_rect(pRect), Flags); /* This is also done in the base class, but we have to verify this before loading any data from * gl into the sysmem copy. The PBO may be mapped, a different rectangle locked, the discard flag

1 0

Henri Verbeet : wined3d: Fix a comment.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 9d865274c0b39c12b8c6613ef242dc376a74ada1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d865274c0b39c12b8c6613ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 19 11:13:37 2010 +0200 wined3d: Fix a comment. --- dlls/wined3d/surface_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 44c008a..d752827 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -942,7 +942,7 @@ static HRESULT /***************************************************************************** * IWineD3DSurface::Blt, SW emulation version * - * Performs blits to a surface, eigher from a source of source-less blts + * Performs a blit to a surface, with or without a source surface. * This is the main functionality of DirectDraw * * Params:

1 0