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

Alexandre Julliard : ws2_32: Simplify the async shutdown handling, and remove a bunch of no longer used code.
by Alexandre Julliard June 4, 2007

June 4, 2007

Module: wine Branch: master Commit: f2febca8f6fb049ec53dc641825780a445ad2df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2febca8f6fb049ec53dc6418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 17:51:18 2007 +0200 ws2_32: Simplify the async shutdown handling, and remove a bunch of no longer used code. --- dlls/ws2_32/socket.c | 188 ++++++++++--------------------------------------- 1 files changed, 39 insertions(+), 149 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a72c6b5..6f883b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -185,7 +185,7 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) typedef struct ws2_async { HANDLE hSocket; - enum ws2_mode {ws2m_read, ws2m_write, ws2m_sd_read, ws2m_sd_write} mode; + int type; LPWSAOVERLAPPED user_overlapped; LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; IO_STATUS_BLOCK local_iosb; @@ -198,7 +198,6 @@ typedef struct ws2_async int *ptr; /* for recv operations */ } addrlen; DWORD flags; - HANDLE event; } ws2_async; /****************************************************************/ @@ -1023,115 +1022,6 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws * Functions for handling overlapped I/O **************************************************************************/ -static void ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb, NTSTATUS status, ULONG count) -{ - TRACE( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, iosb ); - - iosb->u.Status = status; - iosb->Information = count; - if (as->completion_func) - as->completion_func( NtStatusToWSAError(status), - count, as->user_overlapped, as->flags ); - - HeapFree( GetProcessHeap(), 0, as ); -} - -/*********************************************************************** - * WS2_make_async (INTERNAL) - */ - -static NTSTATUS WS2_async_recv(void*, IO_STATUS_BLOCK*, NTSTATUS); -static NTSTATUS WS2_async_send(void*, IO_STATUS_BLOCK*, NTSTATUS); -static NTSTATUS WS2_async_shutdown( void*, IO_STATUS_BLOCK*, NTSTATUS); - -static inline struct ws2_async* -WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBufferCount, - LPDWORD lpFlags, struct WS_sockaddr *addr, - LPINT addrlen, LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IO_STATUS_BLOCK **piosb) -{ - struct ws2_async *wsa = HeapAlloc( GetProcessHeap(), 0, sizeof( ws2_async ) ); - - TRACE( "wsa %p\n", wsa ); - - if (!wsa) - return NULL; - - wsa->hSocket = (HANDLE) s; - wsa->mode = mode; - switch (mode) - { - case ws2m_read: - case ws2m_sd_read: - wsa->flags = *lpFlags; - wsa->addrlen.ptr = addrlen; - break; - case ws2m_write: - case ws2m_sd_write: - wsa->flags = 0; - wsa->addrlen.val = *addrlen; - break; - default: - ERR("Invalid async mode: %d\n", mode); - } - wsa->user_overlapped = lpOverlapped; - wsa->completion_func = lpCompletionRoutine; - memcpy( wsa->iovec, iovec, dwBufferCount * sizeof(*iovec) ); - wsa->n_iovecs = dwBufferCount; - wsa->addr = addr; - wsa->event = 0; - - if ( lpOverlapped ) - { - *piosb = (IO_STATUS_BLOCK*)lpOverlapped; - if (!lpCompletionRoutine) - wsa->event = lpOverlapped->hEvent; - } - else - *piosb = &wsa->local_iosb; - - TRACE( "wsa %p, h %p, ev %p, iosb %p, uov %p, cfunc %p\n", - wsa, wsa->hSocket, wsa->event, - *piosb, wsa->user_overlapped, wsa->completion_func ); - - return wsa; -} - -static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) -{ - NTSTATUS (*apc)(void *, IO_STATUS_BLOCK *, NTSTATUS); - int type; - NTSTATUS status; - - switch (wsa->mode) - { - case ws2m_read: apc = WS2_async_recv; type = ASYNC_TYPE_READ; break; - case ws2m_write: apc = WS2_async_send; type = ASYNC_TYPE_WRITE; break; - case ws2m_sd_read: apc = WS2_async_shutdown; type = ASYNC_TYPE_READ; break; - case ws2m_sd_write: apc = WS2_async_shutdown; type = ASYNC_TYPE_WRITE; break; - default: FIXME("Unknown internal mode (%d)\n", wsa->mode); return STATUS_INVALID_PARAMETER; - } - - SERVER_START_REQ( register_async ) - { - req->handle = wsa->hSocket; - req->async.callback = apc; - req->async.iosb = iosb; - req->async.arg = wsa; - req->async.event = wsa->event; - req->type = type; - status = wine_server_call( req ); - } - SERVER_END_REQ; - - if (status != STATUS_PENDING) - ws2_async_terminate(wsa, iosb, status, 0); - else - NtCurrentTeb()->num_async_io++; - return status; -} - /* user APC called upon async completion */ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) { @@ -1381,24 +1271,23 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS ws2_async* wsa = user; int fd, err = 1; - TRACE( "async %p %d\n", wsa, wsa->mode ); + TRACE( "async %p %d\n", wsa, wsa->type ); switch (status) { case STATUS_ALERTED: if ((status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) break; - switch ( wsa->mode ) + switch ( wsa->type ) { - case ws2m_sd_read: err = shutdown( fd, 0 ); break; - case ws2m_sd_write: err = shutdown( fd, 1 ); break; - default: ERR("invalid mode: %d\n", wsa->mode ); + case ASYNC_TYPE_READ: err = shutdown( fd, 0 ); break; + case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; } wine_server_release_fd( wsa->hSocket, fd ); status = err ? wsaErrno() : STATUS_SUCCESS; break; } - ws2_async_terminate(wsa, iosb, status, 0); + iosb->u.Status = status; return status; } @@ -1407,44 +1296,45 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS * * Helper function for WS_shutdown() on overlapped sockets. */ -static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode ) +static int WS2_register_async_shutdown( SOCKET s, int type ) { struct ws2_async *wsa; - int ret, err = WSAEFAULT; - DWORD dwflags = 0; - int len = 0; - LPWSAOVERLAPPED ovl = HeapAlloc(GetProcessHeap(), 0, sizeof( WSAOVERLAPPED )); - IO_STATUS_BLOCK *iosb = NULL; + NTSTATUS status; - TRACE("s %ld mode %d\n", s, mode); - if (!ovl) - goto out; + TRACE("s %ld type %d\n", s, type); - ovl->hEvent = WSACreateEvent(); - if ( ovl->hEvent == WSA_INVALID_EVENT ) - goto out_free; - - wsa = WS2_make_async( s, mode, NULL, 0, &dwflags, NULL, &len, ovl, NULL, &iosb ); + wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); if ( !wsa ) - goto out_close; + return WSAEFAULT; + + wsa->hSocket = SOCKET2HANDLE(s); + wsa->type = type; + wsa->completion_func = NULL; - /* Hack: this will cause ws2_async_terminate() to free the overlapped structure */ - wsa->user_overlapped = NULL; - if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) + SERVER_START_REQ( register_async ) { - err = NtStatusToWSAError( ret ); - goto out; + req->handle = wsa->hSocket; + req->type = type; + req->async.callback = WS2_async_shutdown; + req->async.iosb = &wsa->local_iosb; + req->async.arg = wsa; + req->async.apc = ws2_async_apc; + req->async.apc_arg = wsa; + status = wine_server_call( req ); } + SERVER_END_REQ; + + if (status != STATUS_PENDING) + { + HeapFree( GetProcessHeap(), 0, wsa ); + return NtStatusToWSAError( status ); + } + else + NtCurrentTeb()->num_async_io++; + /* Try immediate completion */ - while ( WaitForSingleObjectEx( ovl->hEvent, 0, TRUE ) == STATUS_USER_APC ); + Sleep(0); return 0; - -out_close: - WSACloseEvent( ovl->hEvent ); -out_free: - HeapFree( GetProcessHeap(), 0, ovl ); -out: - return err; } /*********************************************************************** @@ -3162,15 +3052,15 @@ int WINAPI WS_shutdown(SOCKET s, int how) switch ( how ) { case SD_RECEIVE: - err = WS2_register_async_shutdown( s, ws2m_sd_read ); + err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); break; case SD_SEND: - err = WS2_register_async_shutdown( s, ws2m_sd_write ); + err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); break; case SD_BOTH: default: - err = WS2_register_async_shutdown( s, ws2m_sd_read ); - if (!err) err = WS2_register_async_shutdown( s, ws2m_sd_write ); + err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); + if (!err) err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); break; } if (err) goto error;

1 0

Alexandre Julliard : ws2_32: Reimplement WSASendTo along the lines of NtWriteFile.
by Alexandre Julliard June 4, 2007

June 4, 2007

Module: wine Branch: master Commit: 7bee1d358366b5845a59b822e043a8017c10e626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bee1d358366b5845a59b822e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 17:02:21 2007 +0200 ws2_32: Reimplement WSASendTo along the lines of NtWriteFile. --- dlls/ws2_32/socket.c | 144 ++++++++++++++++++++++++++----------------------- 1 files changed, 76 insertions(+), 68 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2bd4c14..a616172 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2691,9 +2691,8 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; - int n, fd, err = WSAENOTSOCK, ret; + int n, fd, err; struct iovec iovec[WS_MSG_MAXIOVLEN]; - struct ws2_async *wsa; IO_STATUS_BLOCK* iosb; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", @@ -2723,105 +2722,114 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iovec[i].iov_len = lpBuffers[i].len; } - if ( (lpOverlapped || lpCompletionRoutine) && - !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + for (;;) { - wsa = WS2_make_async( s, ws2m_write, iovec, dwBufferCount, - &dwFlags, (struct WS_sockaddr*) to, &tolen, - lpOverlapped, lpCompletionRoutine, &iosb ); - if ( !wsa ) + n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); + if (n != -1 || errno != EINTR) break; + } + if (n == -1) + { + if (errno != EAGAIN) { - err = WSAEFAULT; + err = wsaErrno(); goto error; } - if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) + if ((lpOverlapped || lpCompletionRoutine) && + !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) { - err = NtStatusToWSAError( ret ); + struct ws2_async *wsa = WS2_make_async( s, ws2m_write, iovec, dwBufferCount, + &dwFlags, (struct WS_sockaddr*) to, &tolen, + lpOverlapped, lpCompletionRoutine, &iosb ); + if ( !wsa ) + { + err = WSAEFAULT; + goto error; + } + release_sock_fd( s, fd ); - HeapFree( GetProcessHeap(), 0, wsa ); - goto error; - } - release_sock_fd( s, fd ); + iosb->u.Status = STATUS_PENDING; + iosb->Information = 0; - /* Try immediate completion */ - if ( lpOverlapped ) - { - if ( WSAGetOverlappedResult( s, lpOverlapped, - lpNumberOfBytesSent, FALSE, &dwFlags) ) - return 0; + SERVER_START_REQ( register_async ) + { + req->handle = wsa->hSocket; + req->type = ASYNC_TYPE_WRITE; + req->async.callback = WS2_async_send; + req->async.iosb = iosb; + req->async.arg = wsa; + req->async.event = lpCompletionRoutine ? 0 : lpOverlapped->hEvent; + err = wine_server_call( req ); + } + SERVER_END_REQ; - if ( (err = WSAGetLastError()) != WSA_IO_INCOMPLETE ) - return SOCKET_ERROR; - } + if (err == STATUS_PENDING) + NtCurrentTeb()->num_async_io++; + else + ws2_async_terminate(wsa, iosb, err, 0); - WSASetLastError( WSA_IO_PENDING ); - return SOCKET_ERROR; + WSASetLastError( NtStatusToWSAError( err )); + return SOCKET_ERROR; + } } - *lpNumberOfBytesSent = 0; if ( _is_blocking(s) ) { /* On a blocking non-overlapped stream socket, * sending blocks until the entire buffer is sent. */ - struct iovec *piovec = iovec; - int finish_time = GET_SNDTIMEO(fd); - if (finish_time >= 0) - finish_time += GetTickCount(); - while ( dwBufferCount > 0 ) + DWORD timeout_start = GetTickCount(); + unsigned int first_buff = 0; + + *lpNumberOfBytesSent = 0; + + while (first_buff < dwBufferCount) { - int timeout; - if ( finish_time >= 0 ) + struct pollfd pfd; + int timeout = GET_SNDTIMEO(fd); + + if (n > 0) { - timeout = finish_time - GetTickCount(); - if ( timeout < 0 ) - timeout = 0; + *lpNumberOfBytesSent += n; + if (iovec[first_buff].iov_len > n) + iovec[first_buff].iov_len -= n; + else + { + while (n > 0) n -= iovec[first_buff++].iov_len; + if (first_buff >= dwBufferCount) break; + } } - else - timeout = finish_time; - /* FIXME: exceptfds? */ - if( !do_block(fd, POLLOUT, timeout)) { + + if (timeout != -1) + { + timeout -= timeout_start - GetTickCount(); + if (timeout < 0) timeout = 0; + } + + pfd.fd = fd; + pfd.events = POLLOUT; + + if (!timeout || !poll( &pfd, 1, timeout )) + { err = WSAETIMEDOUT; goto error; /* msdn says a timeout in send is fatal */ } - n = WS2_send( fd, piovec, dwBufferCount, to, tolen, dwFlags ); - if ( n == -1 ) + n = WS2_send( fd, iovec + first_buff, dwBufferCount - first_buff, to, tolen, dwFlags ); + if (n == -1 && errno != EAGAIN && errno != EINTR) { err = wsaErrno(); goto error; } - *lpNumberOfBytesSent += n; - - while ( n > 0 ) - { - if ( piovec->iov_len > n ) - { - piovec->iov_base = (char*)piovec->iov_base + n; - piovec->iov_len -= n; - n = 0; - } - else - { - n -= piovec->iov_len; - --dwBufferCount; - ++piovec; - } - } } } - else + else /* non-blocking */ { - n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); - if ( n == -1 ) + _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); + if (n == -1) { - err = wsaErrno(); - if ( err == WSAEWOULDBLOCK ) - _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); + err = WSAEWOULDBLOCK; goto error; } - else - _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); *lpNumberOfBytesSent = n; }

1 0

wiki/winehq/css common.css
by Dimi Paun June 4, 2007

June 4, 2007

ChangeSet ID: 1180923848893135093226196 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/06/03 19:24:08 Modified files: winehq/css : common.css Log message: Vitaliy Margolen <wine-patches(a)kievinfo.com> Fix table cell alignment and different size of text in bullet lists. Old revision New revision Changes Path 1.2 1.3 +1 -1 wiki/winehq/css/common.css Index: wiki/winehq/css/common.css diff -u -p wiki/winehq/css/common.css:1.2 wiki/winehq/css/common.css:1.3 --- wiki/winehq/css/common.css 4 Jun 2007 2:24: 8 -0000 +++ /dev/null 4 Jun 2007 2:24: 8 -0000 @@ -102,7 +102,7 @@ td border: 1px solid tan; } -td { +td p { margin: 0; padding: 0; }

1 0

lostwages/ include/winehq.conf news/2007060101.xml
by Alexandre Julliard June 1, 2007

June 1, 2007

ChangeSet ID: 31156 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/06/01 13:11:11 Modified files: include : winehq.conf Added files: news : 2007060101.xml Log message: Release 0.9.38 Patch: http://cvs.winehq.org/patch.py?id=31156 Old revision New revision Changes Path 1.60 1.61 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007060101.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.60 lostwages/include/winehq.conf:1.61 --- lostwages/include/winehq.conf:1.60 1 Jun 2007 18:11:11 -0000 +++ lostwages/include/winehq.conf 1 Jun 2007 18:11:11 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.37 +snapshot_date: 0.9.38 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007060101.xml diff -u -p /dev/null lostwages/news/2007060101.xml:1.1 --- /dev/null 1 Jun 2007 18:11:11 -0000 +++ lostwages/news/2007060101.xml 1 Jun 2007 18:11:11 -0000 @@ -0,0 +1,25 @@ +<news> +<date>June 1, 2007</date> +<title>Wine 0.9.38 Released</title> +<body> +<p>Wine 0.9.38 was released today, with the following main changes:</p> + +<ul> +<li>Beginnings of support for copy protection kernel drivers.</li> +<li>More MSI automation support.</li> +<li>Many 64-bit compilation fixes.</li> +<li>A number of OLE fixes.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.38.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.38">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Alexandre Julliard : Release 0.9.38.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: c0bf8e7db5f3817c2cc8a4c48fa28f6414b03942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bf8e7db5f3817c2cc8a4c48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 19:49:52 2007 +0200 Release 0.9.38. --- ANNOUNCE | 910 ++++++++++++++++------------ ChangeLog | 2057 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2593 insertions(+), 394 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0bf8e7db5f3817c2cc8a…

1 0

Tag wine-0.9.38 : Alexandre Julliard : Release 0.9.38
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: refs/tags/wine-0.9.38 Tag: d3ce69c08f0bed7db571c49048d4a34ddf05ed83 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d3ce69c08f0bed7db571c49048d4… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 19:49:53 2007 +0200 Release 0.9.38

1 0

lostwages/. winehq_styles.css
by Jeremy Newman June 1, 2007

June 1, 2007

ChangeSet ID: 31155 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/01 09:19:04 Modified files: . : winehq_styles.css Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Fix CSS and implement more rules Patch: http://cvs.winehq.org/patch.py?id=31155 Old revision New revision Changes Path 1.17 1.18 +9 -1 lostwages/winehq_styles.css Index: lostwages/winehq_styles.css diff -u -p lostwages/winehq_styles.css:1.17 lostwages/winehq_styles.css:1.18 --- lostwages/winehq_styles.css:1.17 1 Jun 2007 14:19: 4 -0000 +++ lostwages/winehq_styles.css 1 Jun 2007 14:19: 4 -0000 @@ -8,6 +8,7 @@ BODY { } img { border: 0; } +dt { margin: 10px 0; } /* Link Colors */ A { color: #A50D0D; } @@ -55,6 +56,7 @@ p.indent { padding-left: 1em; .strike { text-decoration: line-through; } .bold { font-weight: bold; } .newstitle { font-size: 14px; font-weight: bold; color: #000000; } +.underline { text-decoration: underline; } /* Menu Config */ .menuTitle { font-size: 12px; color: #ffffff; font-weight: bold; text-decoration: none; } @@ -74,7 +76,7 @@ p.indent { padding-left: 1em; .small { font-size: 10px; } .big { font-size: 14px; } .rowtitle { background-color: black; color: white; font-weight: bold; } -.commandWidth { width: 500px; } +.commandWidth { width: 500px; padding: 5px; } /* Generic Buttons */ .button { background-color: #A50D0D; color: #ffffff; font-family: Sans-Serif; font-size: 12px; padding: 0; } @@ -83,6 +85,12 @@ p.indent { padding-left: 1em; /* Note Blip */ .blip { color: #ff0000; font-size: 10px; } +/* template navigation links */ +.link-container { position: relative; height: 1.2em; } +.link-container p { position: absolute; width: 50%; margin: 0; } +.left-link { left: 0; } +.right-link { right: 0; text-align: right; } + /* Footer */ .footer { font-size: 8pt; color: #777777; }

1 0

Andrew Talbot : msi: Constify some variables.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 1486d851da87927a8f6bc13235eb36e928933fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1486d851da87927a8f6bc1323… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu May 31 22:19:28 2007 +0100 msi: Constify some variables. --- dlls/msi/appsearch.c | 6 +++--- dlls/msi/classes.c | 8 ++++---- dlls/msi/cond.y | 8 ++++---- dlls/msi/custom.c | 6 +++--- dlls/msi/msipriv.h | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index ea2f7cf..8db9cb9 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -474,7 +474,7 @@ static void ACTION_ExpandAnyPath(MSIPACKAGE *package, WCHAR *src, WCHAR *dst, * Return ERROR_SUCCESS in case of success (whether or not the file matches), * something else if an install-halting error occurs. */ -static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath, +static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath, BOOL *matches) { UINT rc = ERROR_SUCCESS; @@ -549,8 +549,8 @@ static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath, * Return ERROR_SUCCESS in case of success (whether or not the file matches), * something else if an install-halting error occurs. */ -static UINT ACTION_FileMatchesSig(MSISIGNATURE *sig, - LPWIN32_FIND_DATAW findData, LPCWSTR fullFilePath, BOOL *matches) +static UINT ACTION_FileMatchesSig(const MSISIGNATURE *sig, + const WIN32_FIND_DATAW *findData, LPCWSTR fullFilePath, BOOL *matches) { UINT rc = ERROR_SUCCESS; diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index e2bb34c..92c333d 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -735,7 +735,7 @@ static void mark_mime_for_install( MSIMIME *mime ) mime->InstallMe = TRUE; } -static UINT register_appid(MSIAPPID *appid, LPCWSTR app ) +static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) { static const WCHAR szAppID[] = { 'A','p','p','I','D',0 }; static const WCHAR szRemoteServerName[] = @@ -965,7 +965,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) return rc; } -static LPCWSTR get_clsid_of_progid( MSIPROGID *progid ) +static LPCWSTR get_clsid_of_progid( const MSIPROGID *progid ) { while (progid) { @@ -976,7 +976,7 @@ static LPCWSTR get_clsid_of_progid( MSIPROGID *progid ) return NULL; } -static UINT register_progid( MSIPROGID* progid ) +static UINT register_progid( const MSIPROGID* progid ) { static const WCHAR szCLSID[] = { 'C','L','S','I','D',0 }; static const WCHAR szDefaultIcon[] = @@ -1048,7 +1048,7 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) } static UINT register_verb(MSIPACKAGE *package, LPCWSTR progid, - MSICOMPONENT* component, MSIEXTENSION* extension, + MSICOMPONENT* component, const MSIEXTENSION* extension, MSIVERB* verb, INT* Sequence ) { LPWSTR keyname; diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 9cfb001..ee42ede 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -56,8 +56,8 @@ struct cond_str { INT len; }; -static LPWSTR COND_GetString( struct cond_str *str ); -static LPWSTR COND_GetLiteral( struct cond_str *str ); +static LPWSTR COND_GetString( const struct cond_str *str ); +static LPWSTR COND_GetLiteral( const struct cond_str *str ); static int cond_lex( void *COND_lval, COND_input *info); static const WCHAR szEmpty[] = { 0 }; @@ -678,7 +678,7 @@ static int cond_lex( void *COND_lval, COND_input *cond ) return rc; } -static LPWSTR COND_GetString( struct cond_str *str ) +static LPWSTR COND_GetString( const struct cond_str *str ) { LPWSTR ret; @@ -692,7 +692,7 @@ static LPWSTR COND_GetString( struct cond_str *str ) return ret; } -static LPWSTR COND_GetLiteral( struct cond_str *str ) +static LPWSTR COND_GetLiteral( const struct cond_str *str ) { LPWSTR ret; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 0216f03..e516256 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -124,7 +124,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti /* stores the CustomActionData before the action: * [CustomActionData]Action */ -static LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata) +static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata) { LPWSTR deferred; DWORD len; @@ -1016,7 +1016,7 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle(package, type, info.hProcess, action); } -static DWORD WINAPI ACTION_CallScript( const LPGUID guid ) +static DWORD WINAPI ACTION_CallScript( const GUID *guid ) { msi_custom_action_info *info; MSIHANDLE hPackage; @@ -1235,7 +1235,7 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, return wait_thread_handle( info ); } -void ACTION_FinishCustomActions(MSIPACKAGE* package) +void ACTION_FinishCustomActions(const MSIPACKAGE* package) { struct list *item; HANDLE *wait_handles; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f8f1d3d..2d05d76 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -726,7 +726,7 @@ extern HINSTANCE msi_hInstance; /* action related functions */ extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, BOOL force); extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action); -extern void ACTION_FinishCustomActions( MSIPACKAGE* package); +extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, BOOL execute); static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state )

1 0

Alexandre Julliard : user32: Fix a printf format warning.
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: 6797f15a64dc0d45d90d41c54de37fce13c40bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6797f15a64dc0d45d90d41c54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 13:42:37 2007 +0200 user32: Fix a printf format warning. --- dlls/user32/tests/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index b270a25..3037099 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2036,7 +2036,7 @@ static void test_menu_resource_layout(void) count = GetMenuItemCount(hmenu); ok(count == sizeof(menu_data)/sizeof(menu_data[0]), "expected %u menu items, got %u\n", - (UINT)sizeof(menu_data)/sizeof(menu_data[0]), count); + (UINT)(sizeof(menu_data)/sizeof(menu_data[0])), count); for (i = 0; i < count; i++) {

1 0

Vitaliy Margolen : user32/test: Add few tests for messages sent from SetForegroundWindow().
by Alexandre Julliard June 1, 2007

June 1, 2007

Module: wine Branch: master Commit: d4fc05a9b79a9fba410e8626e7c0f4556bc2814a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fc05a9b79a9fba410e8626e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu May 31 23:30:54 2007 -0600 user32/test: Add few tests for messages sent from SetForegroundWindow(). --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index aaa47e3..fee6b2c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9095,6 +9095,38 @@ static void test_nullCallback(void) DestroyWindow(hwnd); } +static const struct message SetForegroundWindowSeq[] = +{ + { WM_NCACTIVATE, sent|wparam, 0 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0 }, + { WM_ACTIVATEAPP, sent|wparam, 0 }, + { WM_KILLFOCUS, sent }, + { 0 } +}; + +static void test_SetForegroundWindow(void) +{ + HWND hwnd; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test SetForegroundWindow", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + flush_sequence(); + + trace("SetForegroundWindow( 0 )\n"); + SetForegroundWindow( 0 ); + ok_sequence(WmEmptySeq, "SetForegroundWindow( 0 ) away from foreground top level window", FALSE); + trace("SetForegroundWindow( GetDesktopWindow() )\n"); + SetForegroundWindow( GetDesktopWindow() ); + ok_sequence(SetForegroundWindowSeq, "SetForegroundWindow( desktop ) away from " + "foreground top level window", TRUE); + trace("done\n"); + + DestroyWindow(hwnd); +} + START_TEST(msg) { BOOL ret; @@ -9166,6 +9198,7 @@ START_TEST(msg) test_sys_menu(); test_dialog_messages(); test_nullCallback(); + test_SetForegroundWindow(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0