wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Dmitry Timoshkov : mcicda: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 2f0bf36d6dfc1f1fa6b6d461342564c1d187c8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0bf36d6dfc1f1fa6b6d4613… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:01:05 2007 +0900 mcicda: Fix compilation warnings in 64-bit mode. --- dlls/mcicda/mcicda.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 66acc5b..3273ecd 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -72,7 +72,7 @@ static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) return 0; wmcda->wDevID = modp->wDeviceID; - mciSetDriverData(wmcda->wDevID, (DWORD)wmcda); + mciSetDriverData(wmcda->wDevID, (DWORD_PTR)wmcda); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_CD_AUDIO; return modp->wDeviceID; @@ -293,7 +293,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar } if (dwFlags & MCI_OPEN_ELEMENT) { if (dwFlags & MCI_OPEN_ELEMENT_ID) { - WARN("MCI_OPEN_ELEMENT_ID %8x ! Abort\n", (DWORD)lpOpenParms->lpstrElementName); + WARN("MCI_OPEN_ELEMENT_ID %p! Abort\n", lpOpenParms->lpstrElementName); return MCIERR_NO_ELEMENT_ALLOWED; } TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName));

1 0

Dmitry Timoshkov : atl: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 2e944d8e13dcfdf044b710cc291ad116ea6adcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e944d8e13dcfdf044b710cc2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 22:57:21 2007 +0900 atl: Fix compilation warnings in 64-bit mode. --- dlls/atl/atl_ax.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 7e6a348..4f0b7cb 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1146,8 +1146,8 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) while(rescount--) { - src = (const WORD *)( ( ((ULONG)src) + 3) & ~3); /* align on DWORD boundary */ - filled = (filled + 1) & ~1; /* depends on DWORD-aligned allocation unit */ + src = (const WORD *)( ( ((ULONG_PTR)src) + 3) & ~3); /* align on DWORD boundary */ + filled = (filled + 1) & ~1; /* depends on DWORD-aligned allocation unit */ tmp = src; if (ext) @@ -1167,8 +1167,8 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) src += strlenW(src) + 1; /* title */ if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { - const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0}; - PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WORD)); + static const WCHAR AtlAxWin[9]={'A','t','l','A','x','W','i','n',0}; + PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR)); PUT_BLOCK(tmp, strlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp);

1 0

Francois Gouget : shell32/tests: Remove unneeded cast.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: c6b64b0b47d8157dd66d1b7272371d0aa93d43ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b64b0b47d8157dd66d1b727… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 13:59:23 2007 +0200 shell32/tests: Remove unneeded cast. --- dlls/shell32/tests/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8894364..86349a4 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1112,7 +1112,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, return (HDDEDATA)DDE_FACK; default: - return (HDDEDATA)NULL; + return NULL; } }

1 0

Alexandre Julliard : ntdll: Preserve errno across system calls done in the suspend handler.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 970b34291e85c47a11a0bfe107125f32ef2f75d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=970b34291e85c47a11a0bfe10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 11:16:09 2007 +0200 ntdll: Preserve errno across system calls done in the suspend handler. --- dlls/ntdll/exception.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 8974ced..c039dd4 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -23,6 +23,7 @@ #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <signal.h> #include <stdarg.h> @@ -147,6 +148,7 @@ extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_R void wait_suspend( CONTEXT *context ) { LARGE_INTEGER timeout; + int saved_errno = errno; /* store the context we got at suspend time */ SERVER_START_REQ( set_thread_context ) @@ -173,6 +175,8 @@ void wait_suspend( CONTEXT *context ) wine_server_call( req ); } SERVER_END_REQ; + + errno = saved_errno; }

1 0

Alexandre Julliard : ws2_32: Don't modify last error in async I/O callback.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: b281d3f8d81ce2b54498a65a4d2d5be2ec4b2e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b281d3f8d81ce2b54498a65a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 11:15:33 2007 +0200 ws2_32: Don't modify last error in async I/O callback. --- dlls/ws2_32/socket.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 89fac2c..a39da4a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1171,7 +1171,7 @@ static int WS2_recv( int fd, struct iovec* iov, int count, if ( (n = recvmsg(fd, &hdr, *lpFlags)) == -1 ) { TRACE( "recvmsg error %d\n", errno); - goto out; + return -1; } if ( lpFrom && @@ -1180,11 +1180,9 @@ static int WS2_recv( int fd, struct iovec* iov, int count, /* The from buffer was too small, but we read the data * anyway. Is that really bad? */ - WSASetLastError( WSAEFAULT ); WARN( "Address buffer too small\n" ); } -out: TRACE("-> %d\n", n); return n; } @@ -1197,7 +1195,7 @@ out: static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status) { ws2_async* wsa = user; - int result = 0, fd, err; + int result = 0, fd; TRACE( "(%p %p %x)\n", wsa, iosb, status ); @@ -1218,8 +1216,7 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat } else { - err = wsaErrno(); - if ( err == WSAEINTR || err == WSAEWOULDBLOCK ) /* errno: EINTR / EAGAIN */ + if (errno == EINTR || errno == EAGAIN) { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_READ, 0, 0 ); @@ -1228,8 +1225,8 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat else { result = 0; - status = err; /* FIXME: is this correct ???? */ - TRACE( "Error: %x\n", err ); + status = wsaErrno(); /* FIXME: is this correct ???? */ + TRACE( "Error: %x\n", status ); } } break; @@ -1260,8 +1257,8 @@ static int WS2_send( int fd, struct iovec* iov, int count, hdr.msg_namelen = ws_sockaddr_ws2u( to, tolen, &unix_addr ); if ( !hdr.msg_namelen ) { - WSASetLastError( WSAEFAULT ); - return SOCKET_ERROR; + errno = EFAULT; + return -1; } #ifdef HAVE_IPX @@ -1334,8 +1331,7 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu } else { - int err = wsaErrno(); - if ( err == WSAEINTR ) + if (errno == EINTR || errno == EAGAIN) { status = STATUS_PENDING; _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); @@ -1345,9 +1341,9 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu { /* We set the status to a winsock error code and check for that later in NtStatusToWSAError () */ - status = err; + status = wsaErrno(); result = 0; - TRACE( "Error: %x\n", err ); + TRACE( "Error: %x\n", status ); } } break;

1 0

Alexandre Julliard : ws2_32: Re-enable FD_READ also when returning EWOULDBLOCK from WSARecvFrom().
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: a1192b03d1ba25de4829a9be551f0c8354ae2b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1192b03d1ba25de4829a9be5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 11:14:44 2007 +0200 ws2_32: Re-enable FD_READ also when returning EWOULDBLOCK from WSARecvFrom(). --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index decbf22..89fac2c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4290,6 +4290,7 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else { + _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); err = WSAEWOULDBLOCK; goto error; }

1 0

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 June 2007