March 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Grab the pointer in menu tracking mode too.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 78de7e363b8b9aeb0b7adb1083186da4ae58899a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78de7e363b8b9aeb0b7adb108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 24 17:59:40 2008 +0100 winex11: Grab the pointer in menu tracking mode too. --- dlls/winex11.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4a393d9..ca76230 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1563,7 +1563,7 @@ void X11DRV_SetCapture( HWND hwnd, UINT flags ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (!(flags & GUI_INMOVESIZE)) return; + if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; if (hwnd) { @@ -1574,7 +1574,7 @@ void X11DRV_SetCapture( HWND hwnd, UINT flags ) XFlush( gdi_display ); XGrabPointer( thread_data->display, grab_win, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, root_window, None, CurrentTime ); + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); wine_tsx11_unlock(); thread_data->grab_window = grab_win; }

1 0

Austin English : Download.template: Update PC-BSD download link and icon [ Resend-2]
by Jeremy Newman March 24, 2008

March 24, 2008

Module: website Branch: master Commit: 829ef4b6955a6c7d85b1ca54a7f06aa3fa7764e7 URL: http://source.winehq.org/git/website.git/?a=commit;h=829ef4b6955a6c7d85b1ca… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 24 12:36:01 2008 -0500 Download.template: Update PC-BSD download link and icon [Resend-2] Not sure why it wasn't applied the first time. Didn't receive any comments on it. Anywho, in case it was accidently sent to /dev/null, here it is again. Fixes bug 12095. http://bugs.winehq.org/show_bug.cgi?id=12095 This time, the patch is attached :-). >From aed5e33d3b3e14d1046a188ce1e4fb13b241d13d Mon Sep 17 00:00:00 2001 From: Austin English <austinenglish(a)gmail.com> Date: Tue, 18 Mar 2008 11:59:45 -0500 Subject: [PATCH] Download.template: Update PC-BSD download link and icon --- images/distro/pcbsd.png | Bin 1380 -> 4400 bytes templates/en/download.template | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/distro/pcbsd.png b/images/distro/pcbsd.png index 3d3e0b0..b156d2c 100644 Binary files a/images/distro/pcbsd.png and b/images/distro/pcbsd.png differ diff --git a/templates/en/download.template b/templates/en/download.template index 2ae6ab5..8f7dd71 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -92,10 +92,10 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://www.pbidir.com/search.php?str=wine"> + <td align=center><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.pbidir.com/search.php?str=wine">PC-BSD</a> + <td> <a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">PC-BSD</a> binary packages .pbi for PC-BSD (FreeBSD based OS)</td> <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr>

1 0

Kai Blin : janitorial: Use poll() instead of select().
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 63504e9e80acb35666f8689526c67dd99c4fb3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=63504e9e80acb35666f868952… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 24 13:12:49 2008 +0100 janitorial: Use poll() instead of select(). --- dlls/netapi32/nbt.c | 18 +++++++++++++----- dlls/wininet/internet.c | 17 ++++++++++------- dlls/wininet/netconnection.c | 17 ++++++++++------- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 1186572..96309e4 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -67,6 +67,15 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include "winsock2.h" #include "windef.h" @@ -302,13 +311,12 @@ static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd, while (!found && ret == NRC_GOODRET && (now = GetTickCount()) < waitUntil) { DWORD msToWait = waitUntil - now; - struct fd_set fds; - struct timeval timeout = { msToWait / 1000, msToWait % 1000 }; + struct pollfd pfd; int r; - FD_ZERO(&fds); - FD_SET(fd, &fds); - r = select(fd + 1, &fds, NULL, NULL, &timeout); + pfd.fd = fd; + pfd.events = POLLIN; + r = poll(&pfd, 1, msToWait); if (r < 0) ret = NRC_SYSTEM; else if (r == 1) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a8ae808..be2fa9c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -38,6 +38,12 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif @@ -3049,22 +3055,19 @@ LPSTR INTERNET_GetResponseBuffer(void) LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { - struct timeval tv; - fd_set infd; + struct pollfd pfd; BOOL bSuccess = FALSE; INT nRecv = 0; LPSTR lpszBuffer = INTERNET_GetResponseBuffer(); TRACE("\n"); - FD_ZERO(&infd); - FD_SET(nSocket, &infd); - tv.tv_sec=RESPONSE_TIMEOUT; - tv.tv_usec=0; + pfd.fd = nSocket; + pfd.events = POLLIN; while (nRecv < MAX_REPLY_LEN) { - if (select(nSocket+1,&infd,NULL,NULL,&tv) > 0) + if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) { if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) { diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 07fb3de..63f3f8e 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -23,6 +23,12 @@ #include "config.h" #include "wine/port.h" +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif @@ -610,19 +616,16 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD if (!connection->useSSL) { - struct timeval tv; - fd_set infd; + struct pollfd pfd; BOOL bSuccess = FALSE; DWORD nRecv = 0; - FD_ZERO(&infd); - FD_SET(connection->socketFD, &infd); - tv.tv_sec=RESPONSE_TIMEOUT; - tv.tv_usec=0; + pfd.fd = connection->socketFD; + pfd.events = POLLIN; while (nRecv < *dwBuffer) { - if (select(connection->socketFD+1,&infd,NULL,NULL,&tv) > 0) + if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) { if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) {

1 0

Marcus Meissner : version: LZCopy return value is LONG.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 0aecedf281a850b9886e7a7836dddde2e2206e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aecedf281a850b9886e7a783… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Mar 24 12:37:33 2008 +0100 version: LZCopy return value is LONG. --- dlls/version/install.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/version/install.c b/dlls/version/install.c index 5ff25e7..d3170e3 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -367,7 +367,8 @@ DWORD WINAPI VerInstallFileA( LPCSTR pdest; char destfn[260],tmpfn[260],srcfn[260]; HFILE hfsrc,hfdst; - DWORD attr,ret,xret,tmplast; + DWORD attr,xret,tmplast; + LONG ret; LPBYTE buf1,buf2; OFSTRUCT ofs; @@ -419,30 +420,31 @@ DWORD WINAPI VerInstallFileA( } ret = LZCopy(hfsrc,hfdst); _lclose(hfdst); - if (((LONG)ret) < 0) { + if (ret < 0) { /* translate LZ errors into VIF_xxx */ switch (ret) { case LZERROR_BADINHANDLE: case LZERROR_READ: case LZERROR_BADVALUE: case LZERROR_UNKNOWNALG: - ret = VIF_CANNOTREADSRC; + xret = VIF_CANNOTREADSRC; break; case LZERROR_BADOUTHANDLE: case LZERROR_WRITE: - ret = VIF_OUTOFSPACE; + xret = VIF_OUTOFSPACE; break; case LZERROR_GLOBALLOC: case LZERROR_GLOBLOCK: - ret = VIF_OUTOFMEMORY; + xret = VIF_OUTOFMEMORY; break; default: /* unknown error, should not happen */ - ret = 0; + FIXME("Unknown LZCopy error %d, ignoring.\n", ret); + xret = 0; break; } - if (ret) { + if (xret) { LZClose(hfsrc); - return ret; + return xret; } } }

1 0

Roderick Colenbrander : wined3d: We want to compare the old and the new format and not the old with the old .
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 690f496bd404438318b725100e2d65ffdfd0aa96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690f496bd404438318b725100… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Mar 22 21:23:58 2008 +0000 wined3d: We want to compare the old and the new format and not the old with the old. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 52b1099..9a5ed78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -715,7 +715,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf */ if(oldFmt != newFmt) { const StaticPixelFormatDesc *old = getFormatDescEntry(oldFmt, NULL, NULL); - const StaticPixelFormatDesc *new = getFormatDescEntry(oldFmt, NULL, NULL); + const StaticPixelFormatDesc *new = getFormatDescEntry(newFmt, NULL, NULL); if((old->alphaMask && !new->alphaMask) || (!old->alphaMask && new->alphaMask)) { Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE));

1 0

Vitaliy Margolen : wineshelllink: Don't hard-code icon extension to xpm.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: e664379a06e3b8dcd4835c4b0d43bdbf9587f91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e664379a06e3b8dcd4835c4b0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Mar 23 14:16:30 2008 -0600 wineshelllink: Don't hard-code icon extension to xpm. --- tools/wineshelllink | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index a58fb18..0c02bda 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -116,10 +116,11 @@ copy_icon() { if [ -f "$icon" ] then - xpmicon=`basename "$icon" .xpm` + xpmicon=`basename "$icon"` + xpmicon=${xpmicon%.*} mkdir -p "$1" - cp "$icon" "$1/$xpmicon.xpm" + cp "$icon" "$1" else xpmicon="" fi

1 0

Vitaliy Margolen : winemenubuilder: Add support for 24 and 32 bit icons using png format.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: fbdf05aad1b6b4497af53791b15f5d612f71ff6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf05aad1b6b4497af53791b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Mar 23 14:16:38 2008 -0600 winemenubuilder: Add support for 24 and 32 bit icons using png format. --- programs/winemenubuilder/winemenubuilder.c | 246 +++++++++++++++++++++++++--- 1 files changed, 220 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbdf05aad1b6b4497af53…

1 0

Marcus Meissner : user32/tests: Skip checks if pre-condition does not match .
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 57384b7a1c3c8e8f625c48b7cda01409004b24ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=57384b7a1c3c8e8f625c48b7c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 22 19:11:33 2008 +0100 user32/tests: Skip checks if pre-condition does not match. --- dlls/user32/tests/resource.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 99fc24f..24ec995 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -91,6 +91,7 @@ static void test_LoadStringA (void) ok (len == expected, "bufsiz=%d: got %d, expected %d\n", bufsiz, len, expected); + if (len != expected) continue; ok (!memcmp (buf, str, len), "bufsiz=%d: got '%s', expected '%.*s'\n", bufsiz, buf, len, str);

1 0

Philip Nilsson : wined3d: Initialize maxAttribs in case it isn' t changed by glGetIntegerv.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 1110f17581e6ef6215c15545dbf9b2fc9c3ca269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1110f17581e6ef6215c15545d… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Sat Mar 22 18:28:52 2008 +0100 wined3d: Initialize maxAttribs in case it isn't changed by glGetIntegerv. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 616b28f..355a5b6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3003,7 +3003,7 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { */ static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock) { /* disable any attribs (this is the same for both GLSL and ARB modes) */ - GLint maxAttribs; + GLint maxAttribs = 16; int i; /* Leave all the attribs disabled */

1 0

James Hawkins : fusion: Add a stub implementation of IAssemblyName.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: b83fbb4f03176c651c7beaef8ebf75f2641ff9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83fbb4f03176c651c7beaef8… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 24 01:28:56 2008 -0500 fusion: Add a stub implementation of IAssemblyName. --- dlls/fusion/Makefile.in | 1 + dlls/fusion/asmname.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++ include/fusion.idl | 132 ++++++++++++++++++++++++++++++++++ 3 files changed, 316 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b83fbb4f03176c651c7be…

1 0