wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Jacek Caban : wininet: Use WSAGetLastError in sock_get_error in Windows builds.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: cafbd5445789b74079c3ec076e906c765266348e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafbd5445789b74079c3ec076… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 19:37:37 2015 +0100 wininet: Use WSAGetLastError in sock_get_error in Windows builds. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 23 +++++++++++------------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 3be5af6..a28865f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1239,7 +1239,7 @@ static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD s res = sock_send(lpwh->nDataSocket, buffer, size, 0); *written = res>0 ? res : 0; - return res >= 0 ? ERROR_SUCCESS : sock_get_error(errno); + return res >= 0 ? ERROR_SUCCESS : sock_get_error(); } static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 49f7bf5..b0a0db5 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -459,7 +459,7 @@ BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; -int sock_get_error(int) DECLSPEC_HIDDEN; +int sock_get_error(void) DECLSPEC_HIDDEN; int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index debc271..7695e14 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -328,7 +328,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { - if (sock_get_error(errno) == WSAEINPROGRESS) { + if (sock_get_error() == WSAEINPROGRESS) { struct pollfd pfd; int res; @@ -442,10 +442,12 @@ void NETCON_unload(void) } /* translate a unix error code into a winsock one */ -int sock_get_error( int err ) +int sock_get_error(void) { -#if !defined(__MINGW32__) && !defined (_MSC_VER) - switch (err) +#if defined(__MINGW32__) || defined(_MSC_VER) + return WSAGetLastError(); +#else + switch (errno) { case EINTR: return WSAEINTR; case EBADF: return WSAEBADF; @@ -502,10 +504,9 @@ int sock_get_error( int err ) #ifdef EREMOTE case EREMOTE: return WSAEREMOTE; #endif - default: errno=err; perror("sock_set_error"); return WSAEFAULT; + default: perror("sock_get_error"); return WSAEFAULT; } #endif - return err; } int sock_send(int fd, const void *msg, size_t len, int flags) @@ -771,9 +772,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, if(!connection->secure) { *sent = sock_send(connection->socket, msg, len, flags); - if (*sent == -1) - return sock_get_error(errno); - return ERROR_SUCCESS; + return *sent == -1 ? sock_get_error() : ERROR_SUCCESS; } else { @@ -948,7 +947,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t set_socket_blocking(connection->socket, mode); *recvd = sock_recv(connection->socket, buf, len, flags); - return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; + return *recvd == -1 ? sock_get_error() : ERROR_SUCCESS; } else { @@ -1103,8 +1102,8 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) sizeof(tv)); if (result == -1) { - WARN("setsockopt failed (%s)\n", strerror(errno)); - return sock_get_error(errno); + WARN("setsockopt failed\n"); + return sock_get_error(); } return ERROR_SUCCESS; }

1 0

Jacek Caban : wininet: Use proper argument type for ioctlsocket argument.
by Alexandre Julliard 12 Feb '15

12 Feb '15

Module: wine Branch: master Commit: 8efedaf045f4662e6550f4e29c16664d94ec00e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8efedaf045f4662e6550f4e29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 19:37:19 2015 +0100 wininet: Use proper argument type for ioctlsocket argument. --- dlls/wininet/ftp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 64c06c3..3be5af6 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1274,7 +1274,8 @@ static void FTPFILE_AsyncQueryDataAvailableProc(task_header_t *task) static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) { ftp_file_t *file = (ftp_file_t*) hdr; - int retval, unread = 0; + ULONG unread = 0; + int retval; TRACE("(%p %p %x %lx)\n", file, available, flags, ctx);

1 0

Henri Verbeet : wined3d: Recognize the SM4 or opcode.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: e4cb3b5081a93fc7643a86069eefb33e3057272e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cb3b5081a93fc7643a86069… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:18 2015 +0100 wined3d: Recognize the SM4 or opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e543ebf..688bdb7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5241,6 +5241,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, + /* WINED3DSIH_OR */ NULL, /* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_RCP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6e6be8d..0017e45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2319,6 +2319,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IADD: op = "+"; break; case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_MUL: op = "*"; break; + case WINED3DSIH_OR: op = "|"; break; case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_USHR: op = ">>"; break; case WINED3DSIH_XOR: op = "^"; break; @@ -6777,6 +6778,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, + /* WINED3DSIH_OR */ shader_glsl_binop, /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f98074e..28f3b17 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -111,6 +111,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NRM */ "nrm", + /* WINED3DSIH_OR */ "or", /* WINED3DSIH_PHASE */ "phase", /* WINED3DSIH_POW */ "pow", /* WINED3DSIH_RCP */ "rcp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index acf4b37..9f8fe12 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -112,6 +112,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_NE = 0x39, + WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, @@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, + {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1415990..2c1a00c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_NE, WINED3DSIH_NOP, WINED3DSIH_NRM, + WINED3DSIH_OR, WINED3DSIH_PHASE, WINED3DSIH_POW, WINED3DSIH_RCP,

1 0

Henri Verbeet : wined3d: Recognize the SM4 ne opcode.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 3225fea30ccc913b74e2e90e042efda9abdf25ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3225fea30ccc913b74e2e90e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:17 2015 +0100 wined3d: Recognize the SM4 ne opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 763a4a2..e543ebf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5238,6 +5238,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_hw_map2gl, + /* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ac1b5c..6e6be8d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2357,6 +2357,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = "greaterThanEqual"; break; case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; + case WINED3DSIH_NE: op = "notEqual"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -2375,6 +2376,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = ">="; break; case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; + case WINED3DSIH_NE: op = "!="; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -6772,6 +6774,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ shader_glsl_conditional_move, /* WINED3DSIH_MUL */ shader_glsl_binop, + /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 766e91f..f98074e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_MOVA */ "mova", /* WINED3DSIH_MOVC */ "movc", /* WINED3DSIH_MUL */ "mul", + /* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NOP */ "nop", /* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_PHASE */ "phase", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 046b252..acf4b37 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -111,6 +111,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, + WINED3D_SM4_OP_NE = 0x39, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, @@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, "F", "F"}, {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, + {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 539f18c..1415990 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_MOVA, WINED3DSIH_MOVC, WINED3DSIH_MUL, + WINED3DSIH_NE, WINED3DSIH_NOP, WINED3DSIH_NRM, WINED3DSIH_PHASE,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_SQRT in the GLSL shader backend.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 8506da62e0ac9ab882a9689d326fcac638788c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8506da62e0ac9ab882a9689d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:16 2015 +0100 wined3d: Implement WINED3DSIH_SQRT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b02cbff..6ac1b5c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2606,6 +2606,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; + case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = ""; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); break; @@ -6788,7 +6789,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SGN */ shader_glsl_sgn, /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, - /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_SQRT */ shader_glsl_map2gl, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem,

1 0

Henri Verbeet : wined3d: Do not validate format restrictions for buffers.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 1dfea3a4ba16299359476c606c5d40dbbb5545a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dfea3a4ba16299359476c606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:15 2015 +0100 wined3d: Do not validate format restrictions for buffers. Buffers don't have a format as such, and are created with either WINED3DFMT_UNKNOWN or WINED3DFMT_VERTEXDATA. --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f4134e2..205f074 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -81,7 +81,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d *d3d = device->wined3d; resource_check_usage(usage); - if (pool != WINED3D_POOL_SCRATCH) + if (pool != WINED3D_POOL_SCRATCH && type != WINED3D_RTYPE_BUFFER) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) {

1 0

Henri Verbeet : wined3d: Add some warnings when resource_init() fails due to format restrictions.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 5045ca639d3053b4722976aa5fac0cda1def5f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5045ca639d3053b4722976aa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 11 14:10:14 2015 +0100 wined3d: Add some warnings when resource_init() fails due to format restrictions. --- dlls/wined3d/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0ab55dc..f4134e2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -84,11 +84,20 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (pool != WINED3D_POOL_SCRATCH) { if ((usage & WINED3DUSAGE_RENDERTARGET) && !(format->flags & WINED3DFMT_FLAG_RENDERTARGET)) + { + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && !(format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); return WINED3DERR_INVALIDCALL; + } } resource->ref = 1;

1 0

Jacek Caban : mshtml: Call FireBeforeNavigate2 for navigation in frames and iframes.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: 9e2a446fad0b2cd78c4efacb3ee77a3fd925c0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2a446fad0b2cd78c4efacb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 13:06:04 2015 +0100 mshtml: Call FireBeforeNavigate2 for navigation in frames and iframes. --- dlls/mshtml/navigate.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 878e582..c2d4603 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2245,23 +2245,32 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->webbrowser && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->webbrowser) { DWORD post_data_len = request_data ? request_data->post_data_len : 0; void *post_data = post_data_len ? request_data->post_data : NULL; const WCHAR *headers = request_data ? request_data->headers : NULL; if(!(flags & BINDING_REFRESH)) { + BSTR frame_name = NULL; BOOL cancel = FALSE; + if(window != window->doc_obj->basedoc.window) { + hres = IHTMLWindow2_get_name(&window->base.IHTMLWindow2_iface, &frame_name); + if(FAILED(hres)) + return hres; + } + hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, - NULL, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); + frame_name, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); + SysFreeString(frame_name); if(SUCCEEDED(hres) && cancel) { TRACE("Navigation canceled\n"); return S_OK; } } - return super_navigate(window, uri, flags, headers, post_data, post_data_len); + if(window == window->doc_obj->basedoc.window) + return super_navigate(window, uri, flags, headers, post_data, post_data_len); } if(window->doc_obj && window == window->doc_obj->basedoc.window) {

1 0

Jacek Caban : ieframe: Keep reference to This in all IDocObjectService callback calls.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: f46ee92d906063c5d28bb45812553d989e924a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46ee92d906063c5d28bb4581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 11 13:05:54 2015 +0100 ieframe: Keep reference to This in all IDocObjectService callback calls. --- dlls/ieframe/shellbrowser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 216d3f4..51316b4 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -708,10 +708,15 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); TRACE("<<<\n"); + IShellBrowser_Release(&This->IShellBrowser_iface); + SysFreeString(V_BSTR(&var_url)); SysFreeString(V_BSTR(&var_headers)); SysFreeString(V_BSTR(&var_frame_name)); @@ -764,6 +769,9 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dp); TRACE("<<<\n"); @@ -771,6 +779,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( SysFreeString(url); This->doc_host->busy = VARIANT_FALSE; + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; }

1 0

Alexandre Julliard : msvcp70: Fix calling convention for a non-member function.
by Alexandre Julliard 11 Feb '15

11 Feb '15

Module: wine Branch: master Commit: dc06802a42a380bd90d2f21d243cdff8d7518c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc06802a42a380bd90d2f21d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 23:02:03 2015 +0900 msvcp70: Fix calling convention for a non-member function. --- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 22669fb..2e98230 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1090,8 +1090,8 @@ @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@AEBV?$complex@N@0@@Z @ stub -arch=win32 ??6std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@ABV?$complex@O@0@@Z @ stub -arch=win64 ??6std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@AEBV?$complex@O@0@@Z -@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@G@Z(ptr long) basic_ostream_short_print_ushort -@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@G@Z(ptr long) basic_ostream_short_print_ushort +@ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@G@Z(ptr long) basic_ostream_short_print_ushort_global +@ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@G@Z(ptr long) basic_ostream_short_print_ushort_global @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@PBG@Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win64 ??6std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@PEBG@Z(ptr ptr) basic_ostream_wchar_print_str @ cdecl -arch=win32 ??6std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@0@AAV10@ABV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z(ptr ptr) basic_ostream_wchar_print_bstr diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 39c59b6..1c6111c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7129,6 +7129,14 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_ushort(basic_ostream_w basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } +/* ??6std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@G@Z */ +/* ??6std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@G@Z */ +basic_ostream_wchar* __cdecl basic_ostream_short_print_ushort_global(basic_ostream_wchar *ostr, unsigned short val) +{ + return basic_ostream_print_ushort(ostr, val, num_put_short_use_facet( + basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(ostr))->loc)); +} + static basic_ostream_wchar* basic_ostream_print_int(basic_ostream_wchar *this, int val, const num_put *numput) { basic_ios_wchar *base = basic_ostream_wchar_get_basic_ios(this);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
42
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 February 2015