June 2007 - Wine-commits - list.winehq.org

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

01 Jun '07

Module: wine Branch: master Commit: 0067279cd54a364093c579c728178e0c3e9a655d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0067279cd54a364093c579c72… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:01:16 2007 +0900 mciseq: Fix compilation warnings in 64-bit mode. --- dlls/mciseq/mcimidi.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 2da1fda..7fc8c6a 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -93,8 +93,8 @@ typedef struct tagWINE_MCIMIDI { struct SCA { UINT wDevID; UINT wMsg; - DWORD dwParam1; - DWORD dwParam2; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; }; /* EPP DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2); */ @@ -107,10 +107,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) struct SCA* sca = (struct SCA*)arg; DWORD ret; - TRACE("In thread before async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); @@ -122,8 +122,8 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) /************************************************************************** * MCI_SendCommandAsync [internal] */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD dwParam2, UINT size) +static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2, UINT size) { HANDLE handle; struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); @@ -136,7 +136,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, sca->dwParam1 = dwParam1; if (size && dwParam2) { - sca->dwParam2 = (DWORD)sca + sizeof(struct SCA); + sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); /* copy structure passed by program in dwParam2 to be sure * we can still use it whatever the program does */ @@ -175,7 +175,7 @@ static DWORD MIDI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) return 0; wmm->wDevID = modp->wDeviceID; - mciSetDriverData(wmm->wDevID, (DWORD)wmm); + mciSetDriverData(wmm->wDevID, (DWORD_PTR)wmm); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_SEQUENCER; return modp->wDeviceID; @@ -935,7 +935,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) if (!(dwFlags & MCI_WAIT)) { /** FIXME: I'm not 100% sure that wNotifyDeviceID is the right value in all cases ??? */ - return MCI_SendCommandAsync(wmm->wNotifyDeviceID, MCI_PLAY, dwFlags, (DWORD)lpParms, sizeof(LPMCI_PLAY_PARMS)); + return MCI_SendCommandAsync(wmm->wNotifyDeviceID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(LPMCI_PLAY_PARMS)); } if (lpParms && (dwFlags & MCI_FROM)) {

1 0

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

01 Jun '07

Module: wine Branch: master Commit: 0028eb555699ce09593320adc51047e68357c6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0028eb555699ce09593320adc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:01:28 2007 +0900 mciwave: Fix compilation warnings in 64-bit mode. --- dlls/mciwave/mciwave.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index d58ca0e..dbbd809 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -65,8 +65,8 @@ typedef struct { struct SCA { UINT wDevID; UINT wMsg; - DWORD dwParam1; - DWORD dwParam2; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; }; /************************************************************************** @@ -77,10 +77,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) struct SCA* sca = (struct SCA*)arg; DWORD ret; - TRACE("In thread before async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); @@ -92,8 +92,8 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) /************************************************************************** * MCI_SendCommandAsync [internal] */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD dwParam2, UINT size) +static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2, UINT size) { HANDLE handle; struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); @@ -106,7 +106,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, sca->dwParam1 = dwParam1; if (size && dwParam2) { - sca->dwParam2 = (DWORD)sca + sizeof(struct SCA); + sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); /* copy structure passed by program in dwParam2 to be sure * we can still use it whatever the program does */ @@ -145,7 +145,7 @@ static LRESULT WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) return 0; wmw->wDevID = modp->wDeviceID; - mciSetDriverData(wmw->wDevID, (DWORD)wmw); + mciSetDriverData(wmw->wDevID, (DWORD_PTR)wmw); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_WAVEFORM_AUDIO; @@ -736,7 +736,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp if (!(dwFlags & MCI_WAIT)) { return MCI_SendCommandAsync(wmw->openParms.wDeviceID, MCI_PLAY, dwFlags, - (DWORD)lpParms, sizeof(MCI_PLAY_PARMS)); + (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } end = 0xFFFFFFFF; @@ -795,7 +795,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp */ /* FIXME: how to choose between several output channels ? here mapper is forced */ dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, - (DWORD)WAVE_mciPlayCallback, (DWORD)wmw, CALLBACK_FUNCTION); + (DWORD_PTR)WAVE_mciPlayCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != 0) { TRACE("Can't open low level audio device %d\n", dwRet); @@ -978,7 +978,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM if (!(dwFlags & MCI_WAIT)) { return MCI_SendCommandAsync(wmw->openParms.wDeviceID, MCI_RECORD, dwFlags, - (DWORD)lpParms, sizeof(MCI_RECORD_PARMS)); + (DWORD_PTR)lpParms, sizeof(MCI_RECORD_PARMS)); } /* FIXME: we only re-create the RIFF structure from an existing file (if any) @@ -1028,7 +1028,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM */ /* FIXME: how to choose between several output channels ? here mapper is forced */ dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, - (DWORD)WAVE_mciRecordCallback, (DWORD)wmw, CALLBACK_FUNCTION); + (DWORD_PTR)WAVE_mciRecordCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != MMSYSERR_NOERROR) { TRACE("Can't open low level audio device %d\n", dwRet);

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

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 : 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

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