October 2010 - Wine-commits

Alexandre Julliard : ws2_32: Fail when select is called with an invalid fd.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 16f8f424d9626fda167fc4260365ebfe887e2ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f8f424d9626fda167fc4260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 30 20:32:43 2010 +0200 ws2_32: Fail when select is called with an invalid fd. Based on a patch by Vincent Povirk. (cherry picked from commit 4cbfe4e1efb8c372cc95d91b3572f56e20e2e64c) --- dlls/ws2_32/socket.c | 27 +++++++++++++++++++++++---- dlls/ws2_32/tests/sock.c | 26 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4191f80..0233af1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2958,11 +2958,16 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set if (exceptfds) count += exceptfds->fd_count; *count_ptr = count; if (!count) return NULL; - if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) return NULL; + if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } if (readfds) for (i = 0; i < readfds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( readfds->fd_array[i], FILE_READ_DATA, NULL ); + if (fds[j].fd == -1) goto failed; fds[j].events = POLLIN; fds[j].revents = 0; } @@ -2970,6 +2975,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set for (i = 0; i < writefds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( writefds->fd_array[i], FILE_WRITE_DATA, NULL ); + if (fds[j].fd == -1) goto failed; fds[j].events = POLLOUT; fds[j].revents = 0; } @@ -2977,10 +2983,26 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set for (i = 0; i < exceptfds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( exceptfds->fd_array[i], 0, NULL ); + if (fds[j].fd == -1) goto failed; fds[j].events = POLLHUP; fds[j].revents = 0; } return fds; + +failed: + count = j; + j = 0; + if (readfds) + for (i = 0; i < readfds->fd_count && j < count; i++, j++) + release_sock_fd( readfds->fd_array[i], fds[j].fd ); + if (writefds) + for (i = 0; i < writefds->fd_count && j < count; i++, j++) + release_sock_fd( writefds->fd_array[i], fds[j].fd ); + if (exceptfds) + for (i = 0; i < exceptfds->fd_count && j < count; i++, j++) + release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + HeapFree( GetProcessHeap(), 0, fds ); + return NULL; } /* release the file descriptor obtained in fd_sets_to_poll */ @@ -3059,10 +3081,7 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, ws_readfds, ws_writefds, ws_exceptfds, ws_timeout); if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count )) && count) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return SOCKET_ERROR; - } if (ws_timeout) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9217913..8d7c7a6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1937,6 +1937,32 @@ static void test_select(void) broken(thread_params.ReadKilled == 0), /*Win98*/ "closesocket did not wakeup select\n"); + /* Test selecting invalid handles */ + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + FD_SET(INVALID_SOCKET, &readfds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + + FD_ZERO(&readfds); + FD_SET(INVALID_SOCKET, &writefds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &writefds), "FD should not be set\n"); + + FD_ZERO(&writefds); + FD_SET(INVALID_SOCKET, &exceptfds); + SetLastError(0); + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); + ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); } static DWORD WINAPI AcceptKillThread(select_thread_params *par)

1 0

Wolfram Sang : hhctrl: Add check for no filename.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: d40f6132d574e076bedcdb2b665d829806a6c68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40f6132d574e076bedcdb2b6… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Sep 8 16:23:47 2010 +0200 hhctrl: Add check for no filename. (cherry picked from commit 9e1d9ef972f65e292e7b00e1da9293271bc60486) --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 9ab66de..2101e05 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) ptr += strlen("mapid")+1; space = strchr(ptr, ' '); + /* command line ends without number */ + if (!space) + return 0; memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; mapid = atoi(idtxt); @@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) len = endq - szCmdLine; else len = strlen(szCmdLine); + + /* no filename given */ + if (!len) + return 0; + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; filename = heap_alloc(buflen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);

1 0

Austin English : kernel32: Add stub for SetFileValidData.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 003bc82b3904d0f5274b6bed6d6ec324c3e6680e URL: http://source.winehq.org/git/wine.git/?a=commit;h=003bc82b3904d0f5274b6bed6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 18 00:17:39 2010 -0700 kernel32: Add stub for SetFileValidData. (cherry picked from commit 7cd7851ca149101183ee90ea3b69e1ad7d55591a) --- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index edec6b0..dadaea6 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1001,6 +1001,16 @@ error: } /*********************************************************************** + * SetFileValidData (KERNEL32.@) + */ +BOOL WINAPI SetFileValidData( HANDLE hFile, LONGLONG ValidDataLength ) +{ + FIXME("stub: %p, %s\n", hFile, wine_dbgstr_longlong(ValidDataLength)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetFileTime (KERNEL32.@) */ BOOL WINAPI GetFileTime( HANDLE hFile, FILETIME *lpCreationTime, diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 843e97c..a0b729d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1028,7 +1028,7 @@ # @ stub SetFileShortNameA # @ stub SetFileShortNameW @ stdcall SetFileTime(long ptr ptr ptr) -# @ stub SetFileValidData +@ stdcall SetFileValidData(ptr double) # @ stub SetFirmwareEnvironmentVariableA # @ stub SetFirmwareEnvironmentVariableW @ stdcall SetHandleContext(long long)

1 0

Dmitry Timoshkov : gdi32: Make sure that all the glyph metrics are transformed before caching them.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 816124a2a5e0b7ba6b46d806cf3c2d323deda2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=816124a2a5e0b7ba6b46d806c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 28 17:07:09 2010 +0900 gdi32: Make sure that all the glyph metrics are transformed before caching them. (cherry picked from commit 213d84be157398dea1fb70782f6bf7decd4d452a) --- dlls/gdi32/freetype.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9d88211..532278c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4704,14 +4704,11 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } - left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; - right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; - - adv = (INT)((ft_face->glyph->metrics.horiAdvance) + 63) >> 6; - lsb = left >> 6; - bbx = (right - left) >> 6; - if(!needsTransform) { + left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; + right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; + adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - ft_face->glyph->metrics.height) & -64; @@ -4720,6 +4717,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } else { INT xc, yc; FT_Vector vec; + + left = right = 0; + for(xc = 0; xc < 2; xc++) { for(yc = 0; yc < 2; yc++) { vec.x = (ft_face->glyph->metrics.horiBearingX + @@ -4756,6 +4756,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMatUnrotated); adv = (vec.x+63) >> 6; } + + lsb = left >> 6; + bbx = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmptGlyphOrigin.x = left >> 6;

1 0

Nikolay Sivov : comctl32/listview: Fix infinite loop case for full item range as a first search range.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 776938852700d5eea72831c08990a3162f1f440d URL: http://source.winehq.org/git/wine.git/?a=commit;h=776938852700d5eea72831c08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 11:03:25 2010 +0400 comctl32/listview: Fix infinite loop case for full item range as a first search range. (cherry picked from commit ce5a06c1b0428347048f9b37f96a3fda0dceef47) --- dlls/comctl32/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4e13577..2ff37ba 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1855,8 +1855,9 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L } } - /* found something or second search completed with any result */ - if (nItem != -1 || endidx != infoPtr->nItemCount) + if ( nItem != -1 || /* found something */ + endidx != infoPtr->nItemCount || /* second search done */ + (startidx == 0 && endidx == infoPtr->nItemCount) /* full range for first search */ ) break; }; }

1 0

Detlef Riekenberg : wineps: Use winspool.drv for job management.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 9e1259704a42abed6b4c6a8081734df817db8e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1259704a42abed6b4c6a808… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Aug 12 14:37:36 2010 +0200 wineps: Use winspool.drv for job management. (cherry picked from commit bd1941c3c214208949cc116fab32926bae0d2047) --- dlls/wineps.drv/escape.c | 152 +++++++++++----------------------------------- dlls/wineps.drv/psdrv.h | 1 + dlls/winspool.drv/info.c | 49 +++++++++++---- 3 files changed, 71 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e1259704a42abed6b4c6…

1 0

Octavian Voicu : wined3d: Add missing ckey, fx, and pal directdraw caps.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: ba35dab7126ddfe1b2764cc749948fe73d7a1353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba35dab7126ddfe1b2764cc74… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Sep 1 16:44:11 2010 +0300 wined3d: Add missing ckey, fx, and pal directdraw caps. (cherry picked from commit f9cdd5097fc5bb2cbfcc4e0c9ce2b39496b48f44) --- dlls/wined3d/directx.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 268fee1..81e7561 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4217,7 +4217,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; - DWORD ckey_caps, blit_caps, fx_caps; + DWORD ckey_caps, blit_caps, fx_caps, pal_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4744,6 +4744,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_ALIGNBOUNDARYSRC; + pal_caps = WINEDDPCAPS_8BIT | + WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ pCaps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | @@ -4754,6 +4756,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDCAPS2_PRIMARYGAMMA | WINEDDCAPS2_WIDESURFACES | WINEDDCAPS2_CANRENDERWINDOWED; + pCaps->DirectDrawCaps.CKeyCaps = ckey_caps; + pCaps->DirectDrawCaps.FXCaps = fx_caps; + pCaps->DirectDrawCaps.PalCaps = pal_caps; pCaps->DirectDrawCaps.SVBCaps = blit_caps; pCaps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; pCaps->DirectDrawCaps.SVBFXCaps = fx_caps;

1 0

Huw Davies : winspool.drv: Allow for spaces in either the printer name or the spool file.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 981a1844ffad0b75d6aab96ee019069682e51fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981a1844ffad0b75d6aab96ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 25 11:47:53 2010 +0100 winspool.drv: Allow for spaces in either the printer name or the spool file. (cherry picked from commit 246f741eb31799fec82cfb2908e34a330059f718) --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7bf1bcb..8c6486b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7205,7 +7205,7 @@ BOOL WINAPI GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { char *unixname, *queue, *cmd; - char fmt[] = "lpr -P%s %s"; + char fmt[] = "lpr -P'%s' '%s'"; DWORD len; int r;

1 0

Jacek Caban : widl: Define _WIN32 by default.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: b22822d1f1a3c806664e9a4cb30add6848edb6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22822d1f1a3c806664e9a4cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 11:53:58 2010 +0200 widl: Define _WIN32 by default. (cherry picked from commit 06f3b94584fd064d5714e49e39ef648cc2330f85) --- tools/widl/widl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cc25201..c4aa91f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -694,6 +694,7 @@ int main(int argc,char *argv[]) if (do_server) server_token = dup_basename_token(server_name,"_s.c"); add_widl_version_define(); + wpp_add_define("_WIN32", NULL); atexit(rm_tempfile); if (!no_preprocess)

1 0

Juan Lang : iphlpapi: Don' t overwrite last IPv4 address with first IPv6 address.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 216806c456f4d178850caef0d8cf02c80a526ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216806c456f4d178850caef0d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 17 11:01:03 2010 -0700 iphlpapi: Don't overwrite last IPv4 address with first IPv6 address. (cherry picked from commit acda9f6ba94fa1da422632b12153ff682ad254f7) --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index af97390..493fe3f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -721,6 +721,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) ; ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; } else ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr;

1 0