August 2010 - Wine-Commits - list.winehq.org

David Hedberg : explorerframe: Implement TreeAdvise/TreeUnadvise.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 1186e3cacaf7797e5f3e1435cf2da053c08a9028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1186e3cacaf7797e5f3e1435c… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:10 2010 +0200 explorerframe: Implement TreeAdvise/TreeUnadvise. --- dlls/explorerframe/nstc.c | 34 +++- dlls/explorerframe/tests/Makefile.in | 2 +- dlls/explorerframe/tests/nstc.c | 426 ++++++++++++++++++++++++++++++++++ 3 files changed, 457 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1186e3cacaf7797e5f3e1…

1 0

André Hentschel : comdlg32: Fix German font dialog.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: bd38bb122dd816e830d995b128c4f31ff8ef65d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd38bb122dd816e830d995b12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 3 16:24:33 2010 +0200 comdlg32: Fix German font dialog. --- dlls/comdlg32/cdlg_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_De.rc b/dlls/comdlg32/cdlg_De.rc index a471584..5bc8f59 100644 --- a/dlls/comdlg32/cdlg_De.rc +++ b/dlls/comdlg32/cdlg_De.rc @@ -162,7 +162,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Schrift&stil:",1089 ,108,3,44,9 COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Schrift&größe:",1090,179,3,30,9 + LTEXT "&Größe:",1090,179,3,30,9 COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP

1 0

Andrew Eikum : shell32/tests: Fix some Win9x failures.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 61b670a3924419e270b76c05400fc56a45681e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b670a3924419e270b76c054… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 3 08:50:47 2010 -0500 shell32/tests: Fix some Win9x failures. --- dlls/shell32/tests/shlfolder.c | 58 +++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c2305c8..482a31d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -69,6 +69,13 @@ static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_ static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + static void init_function_pointers(void) { HMODULE hmod; @@ -2233,13 +2240,16 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); - res = SHGetPathFromIDListW(pidl, buf); - ok(res == TRUE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + if(pSHGetPathFromIDListW){ + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == S_OK, "Got 0x%08x\n", hrSI); + res = pSHGetPathFromIDListW(pidl, buf); + ok(res == TRUE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + }else + win_skip("pSHGetPathFromIDListW not available\n"); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == S_OK, "Got 0x%08x\n", hres); @@ -2289,13 +2299,16 @@ static void test_SHGetNameFromIDList(void) } IShellFolder_Release(psf); - hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); - ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); - res = SHGetPathFromIDListW(pidl, buf); - ok(res == FALSE, "Got %d\n", res); - if(SUCCEEDED(hrSI) && res) - ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); - if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + if(pSHGetPathFromIDListW){ + hrSI = pSHGetNameFromIDList(pidl, SIGDN_FILESYSPATH, &nameSI); + ok(hrSI == E_INVALIDARG, "Got 0x%08x\n", hrSI); + res = pSHGetPathFromIDListW(pidl, buf); + ok(res == FALSE, "Got %d\n", res); + if(SUCCEEDED(hrSI) && res) + ok(!lstrcmpW(nameSI, buf), "Strings differ.\n"); + if(SUCCEEDED(hrSI)) CoTaskMemFree(nameSI); + }else + win_skip("pSHGetPathFromIDListW not available\n"); hres = pSHGetNameFromIDList(pidl, SIGDN_URL, &name_string); todo_wine ok(hres == E_NOTIMPL /* Win7 */ || hres == S_OK /* Vista */, @@ -3347,7 +3360,7 @@ static void test_GetUIObject(void) CreateFilesFolders(); hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); - ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* WinME */, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { IShellFolder *psf; @@ -3462,10 +3475,17 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) return; } - ok_(__FILE__,l)(filename.uType == STRRET_WSTR, "Got unexpected string type: %d\n", filename.uType); - ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, - "didn't get expected path (%s), instead: %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); + ok_(__FILE__,l)(filename.uType == STRRET_WSTR || filename.uType == STRRET_CSTR, + "Got unexpected string type: %d\n", filename.uType); + if(filename.uType == STRRET_WSTR){ + ok_(__FILE__,l)(lstrcmpW(path, filename.pOleStr) == 0, + "didn't get expected path (%s), instead: %s\n", + wine_dbgstr_w(path), wine_dbgstr_w(filename.pOleStr)); + }else if(filename.uType == STRRET_CSTR){ + ok_(__FILE__,l)(strcmp_wa(path, filename.cStr) == 0, + "didn't get expected path (%s), instead: %s\n", + wine_dbgstr_w(path), filename.cStr); + } IShellFolder_Release(parent); }else

1 0

David Hedberg : explorerframe: Create the treeview on initialization.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 0ea424e7ebc895d95bfec7d8150cbd01bfb5db52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea424e7ebc895d95bfec7d81… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 12:59:05 2010 +0200 explorerframe: Create the treeview on initialization. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/explorerframe_main.h | 3 + dlls/explorerframe/nstc.c | 112 +++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 68cca8d..8dd4542 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorerframe.dll -IMPORTS = uuid user32 +IMPORTS = uuid shell32 user32 C_SRCS = \ explorerframe_main.c \ diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index 26d0f7f..09a50de 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -23,6 +23,9 @@ #include "shlobj.h" +/* Not declared in commctrl.h ("for internal use (msdn)") */ +#define TVS_EX_NOSINGLECOLLAPSE 0x0001 + extern HINSTANCE explorerframe_hinstance; extern LONG EFRAME_refCount; diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index c3a1563..2f2c3dc 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -39,26 +39,133 @@ typedef struct { LONG ref; HWND hwnd_main; + HWND hwnd_tv; NSTCSTYLE style; } NSTC2Impl; +static const DWORD unsupported_styles = + NSTCS_SINGLECLICKEXPAND | NSTCS_NOREPLACEOPEN | NSTCS_NOORDERSTREAM | NSTCS_FAVORITESMODE | + NSTCS_EMPTYTEXT | NSTCS_ALLOWJUNCTIONS | NSTCS_SHOWTABSBUTTON | NSTCS_SHOWDELETEBUTTON | + NSTCS_SHOWREFRESHBUTTON | NSTCS_SPRINGEXPAND | NSTCS_RICHTOOLTIP | NSTCS_NOINDENTCHECKS; + +/************************************************************************* + * NamespaceTree helper functions + */ +static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs, + NSTCSTYLE nstcs_mask, DWORD *new_style) +{ + DWORD old_style, tv_mask = 0; + TRACE("%p, %x, %x, %p\n", This, nstcs, nstcs_mask, new_style); + + if(This->hwnd_tv) + old_style = GetWindowLongPtrW(This->hwnd_tv, GWL_STYLE); + else + old_style = /* The default */ + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | + WS_TABSTOP | TVS_NOHSCROLL | TVS_NONEVENHEIGHT | TVS_INFOTIP | + TVS_EDITLABELS | TVS_TRACKSELECT; + + if(nstcs_mask & NSTCS_HASEXPANDOS) tv_mask |= TVS_HASBUTTONS; + if(nstcs_mask & NSTCS_HASLINES) tv_mask |= TVS_HASLINES; + if(nstcs_mask & NSTCS_FULLROWSELECT) tv_mask |= TVS_FULLROWSELECT; + if(nstcs_mask & NSTCS_HORIZONTALSCROLL) tv_mask |= TVS_NOHSCROLL; + if(nstcs_mask & NSTCS_ROOTHASEXPANDO) tv_mask |= TVS_LINESATROOT; + if(nstcs_mask & NSTCS_SHOWSELECTIONALWAYS) tv_mask |= TVS_SHOWSELALWAYS; + if(nstcs_mask & NSTCS_NOINFOTIP) tv_mask |= TVS_INFOTIP; + if(nstcs_mask & NSTCS_EVENHEIGHT) tv_mask |= TVS_NONEVENHEIGHT; + if(nstcs_mask & NSTCS_DISABLEDRAGDROP) tv_mask |= TVS_DISABLEDRAGDROP; + if(nstcs_mask & NSTCS_NOEDITLABELS) tv_mask |= TVS_EDITLABELS; + if(nstcs_mask & NSTCS_CHECKBOXES) tv_mask |= TVS_CHECKBOXES; + + *new_style = 0; + + if(nstcs & NSTCS_HASEXPANDOS) *new_style |= TVS_HASBUTTONS; + if(nstcs & NSTCS_HASLINES) *new_style |= TVS_HASLINES; + if(nstcs & NSTCS_FULLROWSELECT) *new_style |= TVS_FULLROWSELECT; + if(!(nstcs & NSTCS_HORIZONTALSCROLL)) *new_style |= TVS_NOHSCROLL; + if(nstcs & NSTCS_ROOTHASEXPANDO) *new_style |= TVS_LINESATROOT; + if(nstcs & NSTCS_SHOWSELECTIONALWAYS) *new_style |= TVS_SHOWSELALWAYS; + if(!(nstcs & NSTCS_NOINFOTIP)) *new_style |= TVS_INFOTIP; + if(!(nstcs & NSTCS_EVENHEIGHT)) *new_style |= TVS_NONEVENHEIGHT; + if(nstcs & NSTCS_DISABLEDRAGDROP) *new_style |= TVS_DISABLEDRAGDROP; + if(!(nstcs & NSTCS_NOEDITLABELS)) *new_style |= TVS_EDITLABELS; + if(nstcs & NSTCS_CHECKBOXES) *new_style |= TVS_CHECKBOXES; + + *new_style = (old_style & ~tv_mask) | (*new_style & tv_mask); + + TRACE("old: %08x, new: %08x\n", old_style, *new_style); + + return old_style^*new_style; +} + /************************************************************************* * NamespaceTree window functions */ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) { NSTC2Impl *This = crs->lpCreateParams; + HIMAGELIST ShellSmallIconList; + DWORD treeview_style, treeview_ex_style; TRACE("%p (%p)\n", This, crs); SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LPARAM)This); This->hwnd_main = hWnd; + treeview_style_from_nstcs(This, This->style, 0xFFFFFFFF, &treeview_style); + + This->hwnd_tv = CreateWindowExW(0, WC_TREEVIEWW, NULL, treeview_style, + 0, 0, crs->cx, crs->cy, + hWnd, NULL, explorerframe_hinstance, NULL); + + if(!This->hwnd_tv) + { + ERR("Failed to create treeview!\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + + treeview_ex_style = TVS_EX_DRAWIMAGEASYNC | TVS_EX_RICHTOOLTIP | + TVS_EX_DOUBLEBUFFER | TVS_EX_NOSINGLECOLLAPSE; + + if(This->style & NSTCS_AUTOHSCROLL) + treeview_ex_style |= TVS_EX_AUTOHSCROLL; + if(This->style & NSTCS_FADEINOUTEXPANDOS) + treeview_ex_style |= TVS_EX_FADEINOUTEXPANDOS; + if(This->style & NSTCS_PARTIALCHECKBOXES) + treeview_ex_style |= TVS_EX_PARTIALCHECKBOXES; + if(This->style & NSTCS_EXCLUSIONCHECKBOXES) + treeview_ex_style |= TVS_EX_EXCLUSIONCHECKBOXES; + if(This->style & NSTCS_DIMMEDCHECKBOXES) + treeview_ex_style |= TVS_EX_DIMMEDCHECKBOXES; + + SendMessageW(This->hwnd_tv, TVM_SETEXTENDEDSTYLE, treeview_ex_style, 0xffff); + + if(Shell_GetImageLists(NULL, &ShellSmallIconList)) + { + SendMessageW(This->hwnd_tv, TVM_SETIMAGELIST, + (WPARAM)TVSIL_NORMAL, (LPARAM)ShellSmallIconList); + } + else + { + ERR("Failed to get the System Image List.\n"); + } + INameSpaceTreeControl_AddRef((INameSpaceTreeControl*)This); return TRUE; } +static LRESULT resize_namespacetree(NSTC2Impl *This) +{ + RECT rc; + TRACE("%p\n", This); + + GetClientRect(This->hwnd_main, &rc); + MoveWindow(This->hwnd_tv, 0, 0, rc.right-rc.left, rc.bottom-rc.top, TRUE); + + return TRUE; +} + static LRESULT destroy_namespacetree(NSTC2Impl *This) { TRACE("%p\n", This); @@ -76,6 +183,7 @@ static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, switch(uMessage) { case WM_NCCREATE: return create_namespacetree(hWnd, (CREATESTRUCTW*)lParam); + case WM_SIZE: return resize_namespacetree(This); case WM_DESTROY: return destroy_namespacetree(This); default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); } @@ -152,6 +260,10 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); + if(nstcsFlags & unsupported_styles) + FIXME("0x%08x contains the unsupported style(s) 0x%08x\n", + nstcsFlags, nstcsFlags & unsupported_styles); + This->style = nstcsFlags; if(!GetClassInfoW(explorerframe_hinstance, NSTC2_CLASS_NAME, &wc))

1 0

Jacek Caban : mshtml: Improved tracing of nsACString arguments.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 5a30f4143b801a32dbc347b6c9ce7018ba63c9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a30f4143b801a32dbc347b6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 3 15:44:56 2010 +0200 mshtml: Improved tracing of nsACString arguments. --- dlls/mshtml/nsio.c | 64 +++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a30f4143b801a32dbc34…

1 0

Jeff Cook : winealsa.drv: If we can't open a device as stereo, try mono. This is necessary for snd-usb-audio mics.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 343f85ea66c48285aba21ed48c7db51d942029f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=343f85ea66c48285aba21ed48… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Mon Aug 2 17:49:16 2010 -0600 winealsa.drv: If we can't open a device as stereo, try mono. This is necessary for snd-usb-audio mics. --- dlls/winealsa.drv/waveinit.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 4da53c9..4ae93bb 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -106,6 +106,10 @@ static int ALSA_TestDeviceForWine(int card, int device, snd_pcm_stream_t stream retcode = snd_pcm_hw_params_set_channels(pcm, hwparams, 2); if (retcode < 0) { + retcode = snd_pcm_hw_params_set_channels(pcm, hwparams, 1); /* If we can't open stereo, try mono; this is vital for snd_usb_audio microphones */ + } + if (retcode < 0) + { reason = "Could not set channels"; goto exit; }

1 0

Mike Kaplinskiy : ws2_32: Don't set FD_READ/ FD_WRITE before the connection is complete.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: fae0b6fa63358c9b2881314bc0f30333c4637517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae0b6fa63358c9b2881314bc… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 31 23:21:28 2010 -0400 ws2_32: Don't set FD_READ/FD_WRITE before the connection is complete. --- dlls/ws2_32/socket.c | 2 +- server/sock.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2597c8d..4b742e1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1844,7 +1844,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) { /* tell wineserver that a connection is in progress */ _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, - FD_CONNECT|FD_READ|FD_WRITE, + FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); if (_is_blocking(s)) { diff --git a/server/sock.c b/server/sock.c index 4922d64..24ad50c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -524,6 +524,7 @@ static enum server_fd_type sock_get_fd_type( struct fd *fd ) static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) { struct sock *sock = get_fd_user( fd ); + struct async *async; struct async_queue *queue; assert( sock->obj.ops == &sock_ops ); @@ -543,20 +544,19 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if ( ( !( sock->state & FD_READ ) && type == ASYNC_TYPE_READ ) || - ( !( sock->state & FD_WRITE ) && type == ASYNC_TYPE_WRITE ) ) + if ( ( !( sock->state & (FD_READ|FD_CONNECT) ) && type == ASYNC_TYPE_READ ) || + ( !( sock->state & (FD_WRITE|FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) ) { set_error( STATUS_PIPE_DISCONNECTED ); + return; } - else - { - struct async *async; - if (!(async = create_async( current, queue, data ))) return; - release_object( async ); - set_error( STATUS_PENDING ); - } + + if (!(async = create_async( current, queue, data ))) return; + release_object( async ); sock_reselect( sock ); + + set_error( STATUS_PENDING ); } static void sock_reselect_async( struct fd *fd, struct async_queue *queue )

1 0

Mike Kaplinskiy : ws2_32: Implement ConnectEx.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 4d6982e6845d69070ed05baf157a59ebb5ba0347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6982e6845d69070ed05baf1… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 31 23:21:34 2010 -0400 ws2_32: Implement ConnectEx. --- dlls/ws2_32/socket.c | 106 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 4 +- 2 files changed, 107 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db34a5..22c72f3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1899,6 +1899,109 @@ int WINAPI WSAConnect( SOCKET s, const struct WS_sockaddr* name, int namelen, return WS_connect( s, name, namelen ); } +/*********************************************************************** + * ConnectEx + */ +BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int namelen, + PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) +{ + int fd = get_sock_fd( s, FILE_READ_DATA, NULL ); + int ret, status; + if (fd == -1) + { + SetLastError( WSAENOTSOCK ); + return FALSE; + } + if (!ov) + { + release_sock_fd(s, fd); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", + s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); + + /* FIXME: technically the socket has to be bound */ + ret = do_connect(fd, name, namelen); + if (ret == 0) + { + WSABUF wsabuf; + + _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, + FD_WINE_CONNECTED|FD_READ|FD_WRITE, + FD_CONNECT|FD_WINE_LISTENING); + + wsabuf.len = sendBufLen; + wsabuf.buf = (char*) sendBuf; + + /* WSASend takes care of completion if need be */ + if (WSASend(s, &wsabuf, sendBuf ? 1 : 0, sent, 0, ov, NULL) != SOCKET_ERROR) + goto connection_success; + } + else if (ret == WSAEINPROGRESS) + { + struct ws2_async *wsa; + ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; + + _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, + FD_CONNECT, + FD_WINE_CONNECTED|FD_WINE_LISTENING); + + /* Indirectly call WSASend */ + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ))) + { + SetLastError(WSAEFAULT); + } + else + { + IO_STATUS_BLOCK *iosb = (IO_STATUS_BLOCK *)ov; + iosb->u.Status = STATUS_PENDING; + iosb->Information = 0; + + wsa->hSocket = SOCKET2HANDLE(s); + wsa->addr = NULL; + wsa->addrlen.val = 0; + wsa->flags = 0; + wsa->n_iovecs = sendBuf ? 1 : 0; + wsa->first_iovec = 0; + wsa->iovec[0].iov_base = sendBuf; + wsa->iovec[0].iov_len = sendBufLen; + + SERVER_START_REQ( register_async ) + { + req->type = ASYNC_TYPE_WRITE; + req->async.handle = wine_server_obj_handle( wsa->hSocket ); + req->async.callback = wine_server_client_ptr( WS2_async_send ); + req->async.iosb = wine_server_client_ptr( iosb ); + req->async.arg = wine_server_client_ptr( wsa ); + req->async.event = wine_server_obj_handle( ov->hEvent ); + req->async.cvalue = cvalue; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); + + /* If the connect already failed */ + if (status == STATUS_PIPE_DISCONNECTED) + status = _get_sock_error(s, FD_CONNECT_BIT); + SetLastError( NtStatusToWSAError(status) ); + } + } + else + { + SetLastError(ret); + } + + release_sock_fd( s, fd ); + return FALSE; + +connection_success: + release_sock_fd( s, fd ); + return TRUE; +} + /*********************************************************************** * getpeername (WS2_32.5) @@ -2742,7 +2845,8 @@ INT WINAPI WSAIoctl(SOCKET s, if ( IsEqualGUID(&connectex_guid, lpvInBuffer) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented ConnectEx\n"); + *(LPFN_CONNECTEX *)lpbOutBuffer = WS2_ConnectEx; + return 0; } else if ( IsEqualGUID(&disconnectex_guid, lpvInBuffer) ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 58b02b9..b2a3153 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3558,7 +3558,7 @@ static void test_ConnectEx(void) iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { - skip("WSAIoctl failed to get ConnectEx with ret %d + errno %d\n", iret, WSAGetLastError()); + win_skip("WSAIoctl failed to get ConnectEx with ret %d + errno %d\n", iret, WSAGetLastError()); goto end; } @@ -3567,7 +3567,7 @@ static void test_ConnectEx(void) "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " + todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " "returned %d + errno %d\n", bret, WSAGetLastError()); if (bret == TRUE || WSAGetLastError() != WSAEINVAL) {

1 0

Mike Kaplinskiy : ws2_32: Create a wrapper for connect.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 15cc3017285389aee563afa16b6938872cfe1000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cc3017285389aee563afa16… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 31 23:21:31 2010 -0400 ws2_32: Create a wrapper for connect. --- dlls/ws2_32/socket.c | 59 +++++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4b742e1..2db34a5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1803,6 +1803,33 @@ int WINAPI WS_closesocket(SOCKET s) return SOCKET_ERROR; } +static int do_connect(int fd, const struct WS_sockaddr* name, int namelen) +{ + union generic_unix_sockaddr uaddr; + unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); + + if (!uaddrlen) + return WSAEFAULT; + + if (name->sa_family == WS_AF_INET) + { + struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; + if (memcmp(&in4->sin_addr, magic_loopback_addr, 4) == 0) + { + /* Trying to connect to magic replace-loopback address, + * assuming we really want to connect to localhost */ + TRACE("Trying to connect to magic IP address, using " + "INADDR_LOOPBACK instead.\n"); + in4->sin_addr.s_addr = htonl(WS_INADDR_LOOPBACK); + } + } + + if (connect(fd, &uaddr.addr, uaddrlen) == 0) + return 0; + + return wsaErrno(); +} + /*********************************************************************** * connect (WS2_32.4) */ @@ -1814,33 +1841,11 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) if (fd != -1) { - union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); + int ret = do_connect(fd, name, namelen); + if (ret == 0) + goto connect_success; - if (!uaddrlen) - { - SetLastError(WSAEFAULT); - } - else - { - if (name->sa_family == WS_AF_INET) - { - struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; - if (memcmp(&in4->sin_addr, magic_loopback_addr, 4) == 0) - { - /* Trying to connect to magic replace-loopback address, - * assuming we really want to connect to localhost */ - TRACE("Trying to connect to magic IP address, using " - "INADDR_LOOPBACK instead.\n"); - in4->sin_addr.s_addr = htonl(WS_INADDR_LOOPBACK); - } - } - - if (connect(fd, &uaddr.addr, uaddrlen) == 0) - goto connect_success; - } - - if (errno == EINPROGRESS) + if (ret == WSAEINPROGRESS) { /* tell wineserver that a connection is in progress */ _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, @@ -1868,7 +1873,7 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) } else { - SetLastError(wsaErrno()); + SetLastError(ret); } release_sock_fd( s, fd ); }

1 0

Mike Kaplinskiy : ws2_32/tests: Test ConnectEx.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 5288a22585ac740bc7cdfc695afa6dace9e75626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5288a22585ac740bc7cdfc695… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jul 31 23:21:24 2010 -0400 ws2_32/tests: Test ConnectEx. --- dlls/ws2_32/tests/sock.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5a8e0df..58b02b9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3504,6 +3504,223 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); } +static void test_ConnectEx(void) +{ + SOCKET listener = INVALID_SOCKET; + SOCKET acceptor = INVALID_SOCKET; + SOCKET connector = INVALID_SOCKET; + struct sockaddr_in address, conaddress; + int addrlen; + OVERLAPPED overlapped; + LPFN_CONNECTEX pConnectEx; + GUID connectExGuid = WSAID_CONNECTEX; + DWORD bytesReturned; + char buffer[1024]; + BOOL bret; + DWORD dwret; + int iret; + + memset(&overlapped, 0, sizeof(overlapped)); + + listener = socket(AF_INET, SOCK_STREAM, 0); + if (listener == INVALID_SOCKET) { + skip("could not create listener socket, error %d\n", WSAGetLastError()); + goto end; + } + + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + + memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(listener, (struct sockaddr*)&address, sizeof(address)); + if (iret != 0) { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + addrlen = sizeof(address); + iret = getsockname(listener, (struct sockaddr*)&address, &addrlen); + if (iret != 0) { + skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(listener, TRUE)) { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), + &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); + if (iret) { + skip("WSAIoctl failed to get ConnectEx with ret %d + errno %d\n", iret, WSAGetLastError()); + goto end; + } + + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " + "returned %d + errno %d\n", bret, WSAGetLastError()); + if (bret == TRUE || WSAGetLastError() != WSAEINVAL) + { + acceptor = accept(listener, NULL, NULL); + if (acceptor != INVALID_SOCKET) { + closesocket(acceptor); + acceptor = INVALID_SOCKET; + } + + closesocket(connector); + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + } + + /* ConnectEx needs a bound socket */ + memset(&conaddress, 0, sizeof(conaddress)); + conaddress.sin_family = AF_INET; + conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); + if (iret != 0) { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, NULL); + ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "ConnectEx on a NULL overlapped " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (overlapped.hEvent == NULL) { + skip("could not create event object, errno = %d\n", GetLastError()); + goto end; + } + + iret = listen(listener, 1); + if (iret != 0) { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " + "returned %d + errno %d\n", bret, WSAGetLastError()); + dwret = WaitForSingleObject(overlapped.hEvent, 15000); + ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); + ok(bret, "Connecting failed, error %d\n", GetLastError()); + ok(bytesReturned == 0, "Bytes sent is %d\n", bytesReturned); + + closesocket(connector); + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + /* ConnectEx needs a bound socket */ + memset(&conaddress, 0, sizeof(conaddress)); + conaddress.sin_family = AF_INET; + conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); + if (iret != 0) { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + acceptor = accept(listener, NULL, NULL); + if (acceptor != INVALID_SOCKET) { + closesocket(acceptor); + acceptor = INVALID_SOCKET; + } + + buffer[0] = '1'; + buffer[1] = '2'; + buffer[2] = '3'; + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " + "returned %d + errno %d\n", bret, WSAGetLastError()); + dwret = WaitForSingleObject(overlapped.hEvent, 15000); + ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); + ok(bret, "Connecting failed, error %d\n", GetLastError()); + ok(bytesReturned == 3, "Bytes sent is %d\n", bytesReturned); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket error %d\n", WSAGetLastError()); + + bytesReturned = recv(acceptor, buffer, 3, 0); + buffer[4] = 0; + ok(bytesReturned == 3, "Didn't get all sent data, got only %d\n", bytesReturned); + ok(buffer[0] == '1' && buffer[1] == '2' && buffer[2] == '3', + "Failed to get the right data, expected '123', got '%s'", buffer); + + closesocket(connector); + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + /* ConnectEx needs a bound socket */ + memset(&conaddress, 0, sizeof(conaddress)); + conaddress.sin_family = AF_INET; + conaddress.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(connector, (struct sockaddr*)&conaddress, sizeof(conaddress)); + if (iret != 0) { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + if (acceptor != INVALID_SOCKET) { + closesocket(acceptor); + acceptor = INVALID_SOCKET; + } + + /* Connect with error */ + closesocket(listener); + listener = INVALID_SOCKET; + + address.sin_port = 1; + + bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); + ok(bret == FALSE && GetLastError(), "ConnectEx to bad destination failed: " + "returned %d + errno %d\n", bret, GetLastError()); + + if (GetLastError() == ERROR_IO_PENDING) + { + dwret = WaitForSingleObject(overlapped.hEvent, 15000); + ok(dwret == WAIT_OBJECT_0, "Waiting for connect event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)connector, &overlapped, &bytesReturned, FALSE); + ok(bret == FALSE && GetLastError() == ERROR_CONNECTION_REFUSED, + "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); + } + else { + ok(GetLastError() == WSAECONNREFUSED, + "Connecting to a disconnected host returned error %d - %d\n", bret, WSAGetLastError()); + } + +end: + if (overlapped.hEvent) + WSACloseEvent(overlapped.hEvent); + if (listener != INVALID_SOCKET) + closesocket(listener); + if (acceptor != INVALID_SOCKET) + closesocket(acceptor); + if (connector != INVALID_SOCKET) + closesocket(connector); +} + static void test_AcceptEx(void) { SOCKET listener = INVALID_SOCKET; @@ -4082,6 +4299,7 @@ START_TEST( sock ) test_GetAddrInfoW(); test_AcceptEx(); + test_ConnectEx(); /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0