April 2011 - Wine-commits - list.winehq.org

André Hentschel : hhcrtl.ocx: Resize search tab too.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 35103290ca96ce091b9982c43fc76e0fc2678f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35103290ca96ce091b9982c43… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 16 17:31:15 2011 +0200 hhcrtl.ocx: Resize search tab too. --- dlls/hhctrl.ocx/help.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 61d90f6..e151ab2 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -441,6 +441,7 @@ static LRESULT Child_OnSize(HWND hwnd) ResizeTabChild(info, TAB_CONTENTS); ResizeTabChild(info, TAB_INDEX); + ResizeTabChild(info, TAB_SEARCH); return 0; }

1 0

Alexandre Julliard : server: Fix sharing parameters for debug event files, and don't fail if the file can't be opened.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 1b868f4967f2dadd1d12b2b0fc5a14f9c5766ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b868f4967f2dadd1d12b2b0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 10:29:44 2011 +0200 server: Fix sharing parameters for debug event files, and don't fail if the file can't be opened. --- server/debugger.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index c693c7d..2ee6f6d 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -155,18 +155,8 @@ static int fill_create_process_event( struct debug_event *event, const void *arg close_handle( debugger, event->data.create_process.process ); return 0; } - event->data.create_process.thread = handle; - - handle = 0; - if (exe_module->mapping && - /* the doc says write access too, but this doesn't seem a good idea */ - !(handle = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, 0 ))) - { - close_handle( debugger, event->data.create_process.process ); - close_handle( debugger, event->data.create_process.thread ); - return 0; - } - event->data.create_process.file = handle; + event->data.create_process.thread = handle; + event->data.create_process.file = 0; event->data.create_process.teb = thread->teb; event->data.create_process.base = exe_module->base; event->data.create_process.start = *entry; @@ -174,6 +164,10 @@ static int fill_create_process_event( struct debug_event *event, const void *arg event->data.create_process.dbg_size = exe_module->dbg_size; event->data.create_process.name = exe_module->name; event->data.create_process.unicode = 1; + + if (exe_module->mapping) /* the doc says write access too, but this doesn't seem a good idea */ + event->data.create_process.file = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } @@ -195,16 +189,16 @@ static int fill_load_dll_event( struct debug_event *event, const void *arg ) { struct process *debugger = event->debugger->process; const struct process_dll *dll = arg; - obj_handle_t handle = 0; - if (dll->mapping && !(handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, 0 ))) - return 0; - event->data.load_dll.handle = handle; + event->data.load_dll.handle = 0; event->data.load_dll.base = dll->base; event->data.load_dll.dbg_offset = dll->dbg_offset; event->data.load_dll.dbg_size = dll->dbg_size; event->data.load_dll.name = dll->name; event->data.load_dll.unicode = 1; + if (dll->mapping) + event->data.load_dll.handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; }

1 0

Alexandre Julliard : ws2_32: Use saner parameter names in WSAIoctl.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: c4b67221d4f342453f4ed24f5c12e7049b296cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b67221d4f342453f4ed24f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 11:34:42 2011 +0200 ws2_32: Use saner parameter names in WSAIoctl. --- dlls/ws2_32/socket.c | 106 +++++++++++++++++++++++--------------------------- 1 files changed, 49 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b67221d4f342453f4ed…

1 0

Alexandre Julliard : ws2_32: Merge ioctlsocket implementation into WSAIoctl .
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 7e208f4896806e74e0ea04eb0928d2cac83630f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e208f4896806e74e0ea04eb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 11:57:37 2011 +0200 ws2_32: Merge ioctlsocket implementation into WSAIoctl. --- dlls/ws2_32/socket.c | 130 +++++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 81 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca6f27e..303462d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3068,30 +3068,62 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID DWORD out_size, LPDWORD ret_size, LPWSAOVERLAPPED overlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE completion ) { + int fd; + TRACE("%ld, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n", s, code, in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code) { case WS_FIONBIO: - if (in_size != sizeof(WS_u_long)) { + if (in_size != sizeof(WS_u_long) || IS_INTRESOURCE(in_buff)) + { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - return WS_ioctlsocket( s, WS_FIONBIO, in_buff); + if (_get_sock_mask(s)) + { + /* AsyncSelect()'ed sockets are always nonblocking */ + if (*(WS_u_long *)in_buff) return 0; + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (*(WS_u_long *)in_buff) + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); + else + _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); + return 0; - case WS_FIONREAD: - if (out_size != sizeof(WS_u_long)) { + case WS_FIONREAD: + case WS_SIOCATMARK: + { + int cmd = code == WS_FIONREAD ? FIONREAD : SIOCATMARK; + if (out_size != sizeof(WS_u_long) || IS_INTRESOURCE(out_buff)) + { WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } - return WS_ioctlsocket( s, WS_FIONREAD, out_buff); + if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; + if (ioctl(fd, cmd, out_buff ) == -1) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + release_sock_fd( s, fd ); + return SOCKET_ERROR; + } + release_sock_fd( s, fd ); + if (ret_size) *ret_size = sizeof(WS_u_long); + return 0; + } + + case WS_FIOASYNC: + WARN("Warning: WS1.1 shouldn't be using async I/O\n"); + SetLastError(WSAEINVAL); + return SOCKET_ERROR; case WS_SIO_GET_INTERFACE_LIST: { INTERFACE_INFO* intArray = out_buff; DWORD size, numInt, apiReturn; - int fd; TRACE("-> SIO_GET_INTERFACE_LIST request\n"); @@ -3355,7 +3387,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_KEEPALIVE_VALS: { - int fd; struct tcp_keepalive *k = in_buff; int keepalive = k->onoff ? 1 : 0; int keepidle = k->keepalivetime / 1000; @@ -3483,13 +3514,16 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break; - default: - FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); - WSASetLastError(WSAEOPNOTSUPP); - return SOCKET_ERROR; - } + case 0x667e: /* Netscape tries hard to use bogus ioctl 0x667e */ + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + default: + FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + } - return 0; + return 0; } @@ -3498,74 +3532,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID */ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) { - int fd; - LONG newcmd = cmd; - - TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); - /* broken apps like defcon pass the argp value directly instead of a pointer to it */ - if(IS_INTRESOURCE(argp)) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - switch( cmd ) - { - case WS_FIONREAD: - newcmd=FIONREAD; - break; - - case WS_FIONBIO: - if( _get_sock_mask(s) ) - { - /* AsyncSelect()'ed sockets are always nonblocking */ - if (*argp) return 0; - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - } - if (*argp) - _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); - else - _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); - return 0; - - case WS_SIOCATMARK: - newcmd=SIOCATMARK; - break; - - case WS_FIOASYNC: - WARN("Warning: WS1.1 shouldn't be using async I/O\n"); - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - - case SIOCGIFBRDADDR: - case SIOCGIFNETMASK: - case SIOCGIFADDR: - /* These don't need any special handling. They are used by - WsControl, and are here to suppress an unnecessary warning. */ - break; - - default: - /* Netscape tries hard to use bogus ioctl 0x667e */ - /* FIXME: 0x667e above is ('f' << 8) | 126, and is a low word of - * FIONBIO (_IOW('f', 126, u_long)), how that should be handled? - */ - WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd); - break; - } - - fd = get_sock_fd( s, 0, NULL ); - if (fd != -1) - { - if( ioctl(fd, newcmd, (char*)argp ) == 0 ) - { - release_sock_fd( s, fd ); - return 0; - } - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); - release_sock_fd( s, fd ); - } - return SOCKET_ERROR; + DWORD ret_size; + return WSAIoctl( s, cmd, argp, sizeof(WS_u_long), argp, sizeof(WS_u_long), &ret_size, NULL, NULL ); } /***********************************************************************

1 0

Alexandre Julliard : ws2_32: Signal overlapped completion in WSAIoctl.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: de0b4a67d81b6753d70e37ef6fa39b984296c607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0b4a67d81b6753d70e37ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 12:26:50 2011 +0200 ws2_32: Signal overlapped completion in WSAIoctl. --- dlls/ws2_32/socket.c | 202 ++++++++++++++++++++------------------------------ 1 files changed, 80 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de0b4a67d81b6753d70e3…

1 0

Wolfgang Walter : kernel32: Fix TRACE output: IXON and IXOFF are swapped.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: ce1952446a551547e439838d5c316df9aa3eebcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1952446a551547e439838d5… Author: Wolfgang Walter <wine(a)stwm.de> Date: Fri Dec 12 11:52:13 2008 +0100 kernel32: Fix TRACE output: IXON and IXOFF are swapped. --- dlls/kernel32/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 9653d6e..096bc42 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -774,7 +774,7 @@ static void dump_dcb(const DCB* lpdcb) lpdcb->ByteSize, lpdcb->BaudRate, lpdcb->fParity, lpdcb->Parity, (lpdcb->StopBits == ONESTOPBIT) ? 1 : (lpdcb->StopBits == TWOSTOPBITS) ? 2 : 0); - TRACE("%sIXON %sIXOFF\n", (lpdcb->fInX) ? "" : "~", (lpdcb->fOutX) ? "" : "~"); + TRACE("%sIXON %sIXOFF\n", (lpdcb->fOutX) ? "" : "~", (lpdcb->fInX) ? "" : "~"); TRACE("fOutxCtsFlow=%d fRtsControl=%d\n", lpdcb->fOutxCtsFlow, lpdcb->fRtsControl); TRACE("fOutxDsrFlow=%d fDtrControl=%d\n", lpdcb->fOutxDsrFlow, lpdcb->fDtrControl); if (lpdcb->fOutxCtsFlow || lpdcb->fRtsControl == RTS_CONTROL_HANDSHAKE)

1 0

André Hentschel : dbghelp: Set the right ARM frame pointer.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: e0d14005ce63f07b9181044b4ebea48a2eb08280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d14005ce63f07b9181044b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 18 19:58:45 2011 +0200 dbghelp: Set the right ARM frame pointer. --- dlls/dbghelp/cpu_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 365caa3..4f54ef4 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -120,7 +120,7 @@ static const char* arm_fetch_regname(unsigned regno) struct cpu cpu_arm = { IMAGE_FILE_MACHINE_ARM, 4, - CV_ARM_NOREG, /* FIXME */ + CV_ARM_R0 + 11, arm_get_addr, arm_stack_walk, NULL,

1 0

Austin English : dbghelp: Get rid of a couple unused variables.
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 6abf5fff9db2bfcf925b5a034ed3193f6e76af5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6abf5fff9db2bfcf925b5a034… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 18 14:57:33 2011 -0500 dbghelp: Get rid of a couple unused variables. --- dlls/dbghelp/dwarf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e0f1a90..2b3d54b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2121,7 +2121,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { dwarf2_traverse_context_t traverse; unsigned long length; - unsigned version, header_len, insn_size, default_stmt; + unsigned insn_size, default_stmt; unsigned line_range, opcode_base; int line_base; const unsigned char* opcode_len; @@ -2150,8 +2150,8 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, WARN("out of bounds header\n"); return FALSE; } - version = dwarf2_parse_u2(&traverse); - header_len = dwarf2_parse_u4(&traverse); + dwarf2_parse_u2(&traverse); /* version */ + dwarf2_parse_u4(&traverse); /* header_len */ insn_size = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse);

1 0

Henri Verbeet : wined3d: Also update ds_current_size if there' s no current DS location in surface_load_ds_location().
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 516ade9b2b790169e1eb6e6ec89133325a7aae5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=516ade9b2b790169e1eb6e6ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:56 2011 +0200 wined3d: Also update ds_current_size if there's no current DS location in surface_load_ds_location(). --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bf379ca..d302d35 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4390,6 +4390,8 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte * should do. */ FIXME("No up to date depth stencil location.\n"); surface->flags |= location; + surface->ds_current_size.cx = surface->resource.width; + surface->ds_current_size.cy = surface->resource.height; return; }

1 0

Henri Verbeet : wined3d: Set resource bindings to NULL before releasing them on stateblock destruction .
by Alexandre Julliard 19 Apr '11

19 Apr '11

Module: wine Branch: master Commit: 4651746102a91b1c78d5cba28bd693feea1ef649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4651746102a91b1c78d5cba28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 00:07:57 2011 +0200 wined3d: Set resource bindings to NULL before releasing them on stateblock destruction. To prevent ERRs from device_resource_released(). --- dlls/wined3d/stateblock.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e662e3..27b9831 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -474,6 +474,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { + struct wined3d_buffer *buffer; int counter; if (stateblock->state.vertex_declaration) @@ -481,23 +482,34 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { - if (stateblock->state.textures[counter]) - wined3d_texture_decref(stateblock->state.textures[counter]); + struct wined3d_texture *texture = stateblock->state.textures[counter]; + if (texture) + { + stateblock->state.textures[counter] = NULL; + wined3d_texture_decref(texture); + } } for (counter = 0; counter < MAX_STREAMS; ++counter) { - struct wined3d_buffer *buffer = stateblock->state.streams[counter].buffer; + buffer = stateblock->state.streams[counter].buffer; if (buffer) { + stateblock->state.streams[counter].buffer = NULL; if (wined3d_buffer_decref(buffer)) { WARN("Buffer %p still referenced by stateblock, stream %u.\n", buffer, counter); } } } - if (stateblock->state.index_buffer) - wined3d_buffer_decref(stateblock->state.index_buffer); + + buffer = stateblock->state.index_buffer; + if (buffer) + { + stateblock->state.index_buffer = NULL; + wined3d_buffer_decref(buffer); + } + if (stateblock->state.vertex_shader) wined3d_shader_decref(stateblock->state.vertex_shader); if (stateblock->state.pixel_shader)

1 0