January 2014 - Wine-Commits

Nikolay Sivov : scrrun: Implement Name() property for Folder.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 42d2b51992fe3644c1705fc0e054928e8da9a17b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d2b51992fe3644c1705fc0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:22:32 2014 +0400 scrrun: Implement Name() property for Folder. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 81d6a07..91a2795 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,8 +892,26 @@ static HRESULT WINAPI folder_get_Path(IFolder *iface, BSTR *path) static HRESULT WINAPI folder_get_Name(IFolder *iface, BSTR *name) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR *ptr; + + TRACE("(%p)->(%p)\n", This, name); + + if(!name) + return E_POINTER; + + *name = NULL; + + ptr = strrchrW(This->path, '\\'); + if (ptr) + { + *name = SysAllocString(ptr+1); + TRACE("%s\n", debugstr_w(*name)); + if (!*name) return E_OUTOFMEMORY; + } + else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI folder_put_Name(IFolder *iface, BSTR name) @@ -1072,6 +1090,8 @@ HRESULT create_folder(const WCHAR *path, IFolder **folder) *folder = NULL; + TRACE("%s\n", debugstr_w(path)); + This = heap_alloc(sizeof(struct folder)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6d1b913..9df619f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -882,6 +882,12 @@ if (hr == S_OK) { hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IFolder_get_Name(folder, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + IFolder_Release(folder); VariantClear(&var);

1 0

Michael Stefaniuc : dmusic: Always AddRef the returned iface in QueryInterface.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: d3c550d0ba36e8ed7c2c9c8741d59b7df01b96c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c550d0ba36e8ed7c2c9c874… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:38:33 2014 +0100 dmusic: Always AddRef the returned iface in QueryInterface. --- dlls/dmusic/collection.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index f98bc19..a673390 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -48,31 +48,22 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDirectMusicCollection)) - { + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicCollection)) *ret_iface = iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectMusicObject)) - { *ret_iface = &This->IDirectMusicObject_iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IPersistStream)) - { *ret_iface = &This->IPersistStream_iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; + else + { + WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; } - *ret_iface = NULL; - - WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); - - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface)

1 0

Michael Stefaniuc : dmusic: Don' t leak mem if DirectMusicCollection creation fails.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 5771ff8912506d5f998d181a23ee4d382f00cfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5771ff8912506d5f998d181a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:43:00 2014 +0100 dmusic: Don't leak mem if DirectMusicCollection creation fails. --- dlls/dmusic/collection.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index a673390..cbcc082 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -805,6 +805,7 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; + HRESULT hr; *ppobj = NULL; if (pUnkOuter) @@ -821,8 +822,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicCollection; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Instruments); - return IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); + hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); + IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); + + return hr; }

1 0

Michael Stefaniuc : dmusic: The object class is immutable in a DirectMusicObject.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: fda99c0fcc96729b096a1434820f90ec7ab6886a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda99c0fcc96729b096a14348… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:48:46 2014 +0100 dmusic: The object class is immutable in a DirectMusicObject. --- dlls/dmusic/collection.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index cbcc082..a519b2a 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -189,7 +189,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); + HRESULT ret = S_OK; + TRACE("(%p, %p)\n", iface, pDesc); @@ -206,7 +208,10 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto if (pDesc->dwValidData & DMUS_OBJ_OBJECT) This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - This->pDesc->guidClass = pDesc->guidClass; + { + pDesc->dwValidData &= ~DMUS_OBJ_CLASS; + ret = S_FALSE; + } if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW(This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -229,7 +234,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto /* add new flags */ This->pDesc->dwValidData |= pDesc->dwValidData; - return S_OK; + return ret; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)

1 0

Bruno Jesus : ws2_32: Fix FreeBSD compiling issue on ipx address structure.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 281f69bccfaa1c8c0678f50c8db7ee149f51a117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281f69bccfaa1c8c0678f50c8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 5 16:40:32 2014 -0200 ws2_32: Fix FreeBSD compiling issue on ipx address structure. --- dlls/ws2_32/socket.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0391554..12838da 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1473,7 +1473,9 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { static const struct sockaddr_ipx emptyAddr; struct sockaddr_ipx *ipx = (struct sockaddr_ipx*) uaddr; - return ipx->sipx_port || ipx->sipx_network || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); + return ipx->sipx_port + || memcmp(&ipx->sipx_network, &emptyAddr.sipx_network, sizeof(emptyAddr.sipx_network)) + || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); } #endif case AF_INET6:

1 0

Bruno Jesus : include: Add NLA_BLOB structure and its dependencies in mswsock.h.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 4712f361a95d7e0fa66dc2445d73678d039a6646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4712f361a95d7e0fa66dc2445… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:28 2014 -0200 include: Add NLA_BLOB structure and its dependencies in mswsock.h. --- include/mswsock.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 3e41345..3f0180c 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -164,6 +164,75 @@ typedef struct _WSACMSGHDR { /* followed by UCHAR cmsg_data[] */ } WSACMSGHDR, *PWSACMSGHDR, *LPWSACMSGHDR; +typedef enum _NLA_BLOB_DATA_TYPE { + NLA_RAW_DATA, + NLA_INTERFACE, /* interface name, type and speed */ + NLA_802_1X_LOCATION, /* wireless network info */ + NLA_CONNECTIVITY, /* status on network connectivity */ + NLA_ICS /* internet connection sharing */ +} NLA_BLOB_DATA_TYPE; + +typedef enum _NLA_CONNECTIVITY_TYPE { + NLA_NETWORK_AD_HOC, /* private network */ + NLA_NETWORK_MANAGED, /* network managed by domain */ + NLA_NETWORK_UNMANAGED, + NLA_NETWORK_UNKNOWN +} NLA_CONNECTIVITY_TYPE; + +typedef enum _NLA_INTERNET { + NLA_INTERNET_UNKNOWN, /* can't determine if connected or not */ + NLA_INTERNET_NO, /* not connected to internet */ + NLA_INTERNET_YES /* connected to internet */ +} NLA_INTERNET; + +/* this structure is returned in the lpBlob field during calls to WSALookupServiceNext */ +typedef struct _NLA_BLOB { + /* the header defines the size of the current record and if there is a next record */ + struct { + NLA_BLOB_DATA_TYPE type; + DWORD dwSize; + DWORD nextOffset; /* if it's zero there are no more blobs */ + } header; + + /* the following union interpretation depends on the header.type value + * from the struct above. + * the header.dwSize will be the size of all data, specially useful when + * the last struct field is size [1] */ + union { + /* NLA_RAW_DATA */ + CHAR rawData[1]; + + /* NLA_INTERFACE */ + struct { + DWORD dwType; + DWORD dwSpeed; + CHAR adapterName[1]; + } interfaceData; + + /* NLA_802_1X_LOCATION */ + struct { + CHAR information[1]; + } locationData; + + /* NLA_CONNECTIVITY */ + struct { + NLA_CONNECTIVITY_TYPE type; + NLA_INTERNET internet; + } connectivity; + + /* NLA_ICS */ + struct { + struct { + DWORD speed; + DWORD type; + DWORD state; + WCHAR machineName[256]; + WCHAR sharedAdapterName[256]; + } remote; + } ICS; + } data; +} NLA_BLOB, *PNLA_BLOB; + typedef BOOL (WINAPI * LPFN_ACCEPTEX)(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_CONNECTEX)(SOCKET, const struct WS(sockaddr) *, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_DISCONNECTEX)(SOCKET, LPOVERLAPPED, DWORD, DWORD);

1 0

Alexandre Julliard : configure: Don't allow overriding INSTALL.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 205003f9c09b49e56f4f9df15fe53492d0d8bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=205003f9c09b49e56f4f9df15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 19:35:00 2014 +0100 configure: Don't allow overriding INSTALL. --- Make.vars.in | 7 +++---- configure | 14 -------------- configure.ac | 7 ------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 15ef9c0..6bec6979 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -70,10 +70,9 @@ CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuil SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ -INSTALL = @INSTALL@ $(INSTALL_FLAGS) -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = @INSTALL_SCRIPT@ $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ $(INSTALL_DATA_FLAGS) +INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) +INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS) +INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c prog_manext = 1 api_manext = 3w diff --git a/configure b/configure index b4dfb47..4603d95 100755 --- a/configure +++ b/configure @@ -719,10 +719,6 @@ RSVG FONTFORGE PKG_CONFIG MSGFMT -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -INSTALL LDCONFIG MKDIR_P EGREP @@ -5443,16 +5439,6 @@ $as_echo "no" >&6; } fi - -test -z "$INSTALL" && INSTALL="\$(top_srcdir)/tools/install-sh" - -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(INSTALL)" - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT="\$(INSTALL)" - -test -z "$INSTALL_DATA" && INSTALL_DATA="\$(INSTALL) -m 644" - - for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 3c1101c..eb780fa 100644 --- a/configure.ac +++ b/configure.ac @@ -266,13 +266,6 @@ AC_PROG_LN_S AC_PROG_EGREP AC_PROG_MKDIR_P AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) - -dnl Use the correct strip to install programs -test -z "$INSTALL" && AC_SUBST([INSTALL],"\$(top_srcdir)/tools/install-sh") -test -z "$INSTALL_PROGRAM" && AC_SUBST([INSTALL_PROGRAM],"STRIPPROG=\"\$(STRIP)\" \$(INSTALL)") -test -z "$INSTALL_SCRIPT" && AC_SUBST([INSTALL_SCRIPT],"\$(INSTALL)") -test -z "$INSTALL_DATA" && AC_SUBST([INSTALL_DATA],"\$(INSTALL) -m 644") - AC_CHECK_PROGS(MSGFMT, msgfmt, false) WINE_PATH_PKG_CONFIG

1 0

Michael Stefaniuc : dmusic: Don't crash on NULL in IDirectMusicObject:: GetDescriptor.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: fe0d2a2ba796dc0551cef08098a42a405738b421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0d2a2ba796dc0551cef0809… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:51:17 2014 +0100 dmusic: Don't crash on NULL in IDirectMusicObject::GetDescriptor. --- dlls/dmusic/collection.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index a519b2a..4c6a034 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -181,7 +181,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto TRACE("(%p/%p)->(%p)\n", iface, This, pDesc); - /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ + if (!pDesc) + return E_POINTER; + memcpy (pDesc, This->pDesc, This->pDesc->dwSize); return S_OK;

1 0

Bruno Jesus : ws2_32/tests: Add some WSALookupService[Begin|Next|End] tests .
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: b461fa4468168b973fc446ccd014e62aef67459a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b461fa4468168b973fc446ccd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:43 2014 -0200 ws2_32/tests: Add some WSALookupService[Begin|Next|End] tests. --- dlls/ws2_32/tests/sock.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c09974..54b0840 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -67,6 +67,9 @@ static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); +static int (WINAPI *pWSALookupServiceEnd)(HANDLE); +static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); /**************** Structs and typedefs ***************/ @@ -1047,6 +1050,9 @@ static void Init (void) pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); + pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); + pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -7286,6 +7292,166 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_WSALookupService(void) +{ + char buffer[4096], strbuff[128]; + WSAQUERYSETW *qs = NULL; + HANDLE hnd; + PNLA_BLOB netdata; + int ret; + DWORD error, offset, bsize; + + if (!pWSALookupServiceBeginW || !pWSALookupServiceEnd || !pWSALookupServiceNextW) + { + win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found"); + return; + } + + qs = (WSAQUERYSETW *)buffer; + memset(qs, 0, sizeof(*qs)); + + /* invalid parameter tests */ + ret = pWSALookupServiceBeginW(NULL, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, NULL); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEINVAL + || broken(error == ERROR_INVALID_PARAMETER) /* <= XP */ + || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, + "expected 10022, got %d\n", error); + + ret = pWSALookupServiceEnd(NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); +todo_wine + ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); + + /* standard network list query */ + qs->dwSize = sizeof(*qs); + hnd = (HANDLE)0xdeadbeef; + ret = pWSALookupServiceBeginW(qs, LUP_RETURN_ALL | LUP_DEEP, &hnd); + error = WSAGetLastError(); + if(ret && error == ERROR_INVALID_PARAMETER) + { + win_skip("the current WSALookupServiceBeginW test is not supported in win 2000\n"); + return; + } + +todo_wine + ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); +todo_wine + ok(hnd != (HANDLE)0xdeadbeef, "Handle was not filled\n"); + + offset = 0; + do + { + memset(qs, 0, sizeof(*qs)); + bsize = sizeof(buffer); + + if (pWSALookupServiceNextW(hnd, 0, &bsize, qs) == SOCKET_ERROR) + { + error = WSAGetLastError(); + if (error == WSA_E_NO_MORE) break; + ok(0, "Error %d happened while listing services\n", error); + break; + } + + WideCharToMultiByte(CP_ACP, 0, qs->lpszServiceInstanceName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("Network Name: %s\n", strbuff); + + /* network data is written in the blob field */ + if (qs->lpBlob) + { + /* each network may have multiple NLA_BLOB information structures */ + do + { + netdata = (PNLA_BLOB) &qs->lpBlob->pBlobData[offset]; + switch (netdata->header.type) + { + case NLA_RAW_DATA: + trace("\tNLA Data Type: NLA_RAW_DATA\n"); + break; + case NLA_INTERFACE: + trace("\tNLA Data Type: NLA_INTERFACE\n"); + trace("\t\tType: %d\n", netdata->data.interfaceData.dwType); + trace("\t\tSpeed: %d\n", netdata->data.interfaceData.dwSpeed); + trace("\t\tAdapter Name: %s\n", netdata->data.interfaceData.adapterName); + break; + case NLA_802_1X_LOCATION: + trace("\tNLA Data Type: NLA_802_1X_LOCATION\n"); + trace("\t\tInformation: %s\n", netdata->data.locationData.information); + break; + case NLA_CONNECTIVITY: + switch (netdata->data.connectivity.type) + { + case NLA_NETWORK_AD_HOC: + trace("\t\tNetwork Type: AD HOC\n"); + break; + case NLA_NETWORK_MANAGED: + trace("\t\tNetwork Type: Managed\n"); + break; + case NLA_NETWORK_UNMANAGED: + trace("\t\tNetwork Type: Unmanaged\n"); + break; + case NLA_NETWORK_UNKNOWN: + trace("\t\tNetwork Type: Unknown\n"); + } + switch (netdata->data.connectivity.internet) + { + case NLA_INTERNET_NO: + trace("\t\tInternet connectivity: No\n"); + break; + case NLA_INTERNET_YES: + trace("\t\tInternet connectivity: Yes\n"); + break; + case NLA_INTERNET_UNKNOWN: + trace("\t\tInternet connectivity: Unknown\n"); + break; + } + break; + case NLA_ICS: + trace("\tNLA Data Type: NLA_ICS\n"); + trace("\t\tSpeed: %d\n", + netdata->data.ICS.remote.speed); + trace("\t\tType: %d\n", + netdata->data.ICS.remote.type); + trace("\t\tState: %d\n", + netdata->data.ICS.remote.state); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.machineName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tMachine Name: %s\n", strbuff); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.sharedAdapterName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tShared Adapter Name: %s\n", strbuff); + break; + default: + trace("\tNLA Data Type: Unknown\n"); + break; + } + } + while (offset); + } + } + while (1); + + ret = pWSALookupServiceEnd(hnd); + ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -7351,6 +7517,8 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); + test_WSALookupService(); + test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName();

1 0

Vincent Povirk : gdiplus: Mark the Graphics object as busy before freeing it.
by Alexandre Julliard Jan. 6, 2014

Jan. 6, 2014

Module: wine Branch: master Commit: 51b873b3ca03074698ab027f503acd7c1940ad80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b873b3ca03074698ab027f5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jan 3 14:00:10 2014 -0600 gdiplus: Mark the Graphics object as busy before freeing it. --- dlls/gdiplus/graphics.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 122581d..7f892f6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2409,6 +2409,12 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) } GdipDeleteRegion(graphics->clip); + + /* Native returns ObjectBusy on the second free, instead of crashing as we'd + * do otherwise, but we can't have that in the test suite because it means + * accessing freed memory. */ + graphics->busy = TRUE; + GdipFree(graphics); return Ok;

1 0