wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Michael Stefaniuc : shell32: Use an iface instead of a vtbl pointer in IDefClFImpl.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 151b3516792764c3a11b14b706d9817dcadc35af URL: http://source.winehq.org/git/wine.git/?a=commit;h=151b3516792764c3a11b14b70… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 7 11:09:48 2010 +0100 shell32: Use an iface instead of a vtbl pointer in IDefClFImpl. --- dlls/shell32/shellole.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d678276..41b9711 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -358,7 +358,7 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; LONG ref; CLSID *rclsid; LPFNCREATEINSTANCE lpfnCI; @@ -366,6 +366,11 @@ typedef struct LONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ } IDefClFImpl; +static inline IDefClFImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IDefClFImpl, IClassFactory_iface); +} + static const IClassFactoryVtbl dclfvt; /************************************************************************** @@ -378,7 +383,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc lpclf = HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl)); lpclf->ref = 1; - lpclf->lpVtbl = &dclfvt; + lpclf->IClassFactory_iface.lpVtbl = &dclfvt; lpclf->lpfnCI = lpfnCI; lpclf->pcRefDll = pcRefDll; @@ -394,7 +399,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc static HRESULT WINAPI IDefClF_fnQueryInterface( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%s)\n",This,shdebugstr_guid(riid)); @@ -414,7 +419,7 @@ static HRESULT WINAPI IDefClF_fnQueryInterface( */ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -426,9 +431,9 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) */ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); ULONG refCount = InterlockedDecrement(&This->ref); - + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) @@ -447,7 +452,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) static HRESULT WINAPI IDefClF_fnCreateInstance( LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(%p,%s,%p)\n",This,pUnkOuter,shdebugstr_guid(riid),ppvObject); @@ -468,7 +473,7 @@ static HRESULT WINAPI IDefClF_fnCreateInstance( */ static HRESULT WINAPI IDefClF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock) { - IDefClFImpl *This = (IDefClFImpl *)iface; + IDefClFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(0x%x), not implemented\n",This, fLock); return E_NOTIMPL; }

1 0

Michael Stefaniuc : shell32: Standardize the COM usage in dataobject.c.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: b6f869c743b6806cabd3c016962ef7c3eae1fbd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f869c743b6806cabd3c0169… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 7 11:09:41 2010 +0100 shell32: Standardize the COM usage in dataobject.c. --- dlls/shell32/dataobject.c | 60 ++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index f949fe0..1ad010c 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -42,18 +42,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { /* IUnknown fields */ - const IEnumFORMATETCVtbl *lpVtbl; - LONG ref; + IEnumFORMATETC IEnumFORMATETC_iface; + LONG ref; /* IEnumFORMATETC fields */ UINT posFmt; UINT countFmt; LPFORMATETC pFmt; } IEnumFORMATETCImpl; +static inline IEnumFORMATETCImpl *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return CONTAINING_RECORD(iface, IEnumFORMATETCImpl, IEnumFORMATETC_iface); +} + static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface( LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); *ppvObj = NULL; @@ -79,7 +84,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnQueryInterface( static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -89,7 +94,7 @@ static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -106,7 +111,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); UINT i; TRACE("(%p)->(%u,%p)\n", This, celt, rgelt); @@ -127,7 +132,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(num=%u)\n", This, celt); if((This->posFmt + celt) >= This->countFmt) return S_FALSE; @@ -137,7 +142,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt) static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->()\n", This); This->posFmt = 0; @@ -146,7 +151,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface) static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum) { - IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; + IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(ppenum=%p)\n", This, ppenum); if (!ppenum) return E_INVALIDARG; @@ -177,7 +182,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) if(ef) { ef->ref=1; - ef->lpVtbl=&efvt; + ef->IEnumFORMATETC_iface.lpVtbl = &efvt; ef->countFmt = cfmt; ef->pFmt = SHAlloc (size); @@ -201,8 +206,8 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) typedef struct { /* IUnknown fields */ - const IDataObjectVtbl *lpVtbl; - LONG ref; + IDataObject IDataObject_iface; + LONG ref; /* IDataObject fields */ LPITEMIDLIST pidl; @@ -216,12 +221,17 @@ typedef struct } IDataObjectImpl; +static inline IDataObjectImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, IDataObjectImpl, IDataObject_iface); +} + /*************************************************************************** * IDataObject_QueryInterface */ static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID riid, LPVOID * ppvObj) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); *ppvObj = NULL; @@ -250,7 +260,7 @@ static HRESULT WINAPI IDataObject_fnQueryInterface(LPDATAOBJECT iface, REFIID ri */ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -263,7 +273,7 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface) */ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -283,7 +293,7 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface) */ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); char szTemp[256]; @@ -327,14 +337,14 @@ static HRESULT WINAPI IDataObject_fnGetData(LPDATAOBJECT iface, LPFORMATETC pfor static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); UINT i; TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\n", This, pformatetc->cfFormat, pformatetc->tymed); @@ -357,21 +367,21 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); TRACE("(%p)->()\n", This); *ppenumFormatEtc=NULL; @@ -388,19 +398,19 @@ static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDi static HRESULT WINAPI IDataObject_fnDAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise) { - IDataObjectImpl *This = (IDataObjectImpl *)iface; + IDataObjectImpl *This = impl_from_IDataObject(iface); FIXME("(%p)->()\n", This); return E_NOTIMPL; } @@ -434,7 +444,7 @@ LPDATAOBJECT IDataObject_Constructor(HWND hwndOwner, if (dto) { dto->ref = 1; - dto->lpVtbl = &dtovt; + dto->IDataObject_iface.lpVtbl = &dtovt; dto->pidl = ILClone(pMyPidl); dto->apidl = _ILCopyaPidl(apidl, cidl); dto->cidl = cidl;

1 0

Erich Hoover : ws2_32/tests: Add regression tests for WSARecvMsg and IP_PKTINFO.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: c134680321ca9344779f8d554c12f415fb65a432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c134680321ca9344779f8d554… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Dec 5 17:09:15 2010 -0700 ws2_32/tests: Add regression tests for WSARecvMsg and IP_PKTINFO. --- dlls/ws2_32/tests/sock.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e0b4cb..528c657 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1085,6 +1085,182 @@ static void test_so_reuseaddr(void) closesocket(s2); } +#define IP_PKTINFO_LEN (sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(sizeof(struct in_pktinfo))) + +static void test_ip_pktinfo(void) +{ + ULONG addresses[2] = {inet_addr("127.0.0.1"), htonl(INADDR_ANY)}; + char recvbuf[10], pktbuf[512], msg[] = "HELLO"; + struct sockaddr_in s1addr, s2addr, s3addr; + GUID WSARecvMsg_GUID = WSAID_WSARECVMSG; + LPFN_WSARECVMSG pWSARecvMsg = NULL; + unsigned int rc, foundhdr, yes = 1; + DWORD dwBytes, dwSize, dwFlags; + socklen_t addrlen; + WSACMSGHDR *cmsg; + WSAOVERLAPPED ov; + WSABUF iovec[1]; + SOCKET s1, s2; + WSAMSG hdr; + int i, err; + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + if (ov.hEvent == INVALID_HANDLE_VALUE) + { + skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); + return; + } + + memset(&hdr, 0x00, sizeof(hdr)); + s1addr.sin_family = AF_INET; + s1addr.sin_port = htons(0); + /* Note: s1addr.sin_addr is set below */ + iovec[0].buf = recvbuf; + iovec[0].len = sizeof(recvbuf); + hdr.name = (struct sockaddr*)&s3addr; + hdr.namelen = sizeof(s3addr); + hdr.lpBuffers = &iovec[0]; + hdr.dwBufferCount = 1; + hdr.Control.buf = pktbuf; + /* Note: hdr.Control.len is set below */ + hdr.dwFlags = 0; + + for (i=0;i<sizeof(addresses)/sizeof(UINT32);i++) + { + s1addr.sin_addr.s_addr = addresses[i]; + + /* Build "server" side socket */ + s1=socket(AF_INET, SOCK_DGRAM, 0); + if (s1 == INVALID_SOCKET) + { + skip("socket() failed error, some tests skipped: %d\n", WSAGetLastError()); + goto cleanup; + } + + /* Obtain the WSARecvMsg function */ + WSAIoctl(s1, SIO_GET_EXTENSION_FUNCTION_POINTER, &WSARecvMsg_GUID, sizeof(WSARecvMsg_GUID), + &pWSARecvMsg, sizeof(pWSARecvMsg), &dwBytes, NULL, NULL); + if (!pWSARecvMsg) + { + win_skip("WSARecvMsg is unsupported, some tests will be skipped.\n"); + closesocket(s1); + goto cleanup; + } + + /* Setup the server side socket */ + rc=bind(s1, (struct sockaddr*)&s1addr, sizeof(s1addr)); + ok(rc != SOCKET_ERROR, "bind() failed error: %d\n", WSAGetLastError()); + rc=setsockopt(s1, IPPROTO_IP, IP_PKTINFO, (const char*)&yes, sizeof(yes)); + ok(rc == 0, "failed to set IPPROTO_IP flag IP_PKTINFO!\n"); + + /* Build "client" side socket */ + addrlen = sizeof(s2addr); + if (getsockname(s1, (struct sockaddr *) &s2addr, &addrlen) != 0) + { + skip("Failed to call getsockname, some tests skipped: %d\n", WSAGetLastError()); + closesocket(s1); + goto cleanup; + } + s2addr.sin_addr.s_addr = addresses[0]; /* Always target the local adapter address */ + s2=socket(AF_INET, SOCK_DGRAM, 0); + if (s2 == INVALID_SOCKET) + { + skip("socket() failed error, some tests skipped: %d\n", WSAGetLastError()); + closesocket(s1); + goto cleanup; + } + + /* Test an empty message header */ + rc=pWSARecvMsg(s1, NULL, NULL, NULL, NULL); + err=WSAGetLastError(); + ok(rc == SOCKET_ERROR && err == WSAEFAULT, "WSARecvMsg() failed error: %d (ret = %d)\n", err, rc); + + /* + * Send a packet from the client to the server and test for specifying + * a short control header. + */ + rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + hdr.Control.len = 1; + rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); + err=WSAGetLastError(); + ok(rc == SOCKET_ERROR && err == WSAEMSGSIZE && (hdr.dwFlags & MSG_CTRUNC), + "WSARecvMsg() failed error: %d (ret: %d, flags: %d)\n", err, rc, hdr.dwFlags); + hdr.dwFlags = 0; /* Reset flags */ + + /* Perform another short control header test, this time with an overlapped receive */ + hdr.Control.len = 1; + rc=pWSARecvMsg(s1, &hdr, NULL, &ov, NULL); + err=WSAGetLastError(); + ok(rc != 0 && err == WSA_IO_PENDING, "WSARecvMsg() failed error: %d\n", err); + rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) + { + skip("Server side did not receive packet, some tests skipped.\n"); + closesocket(s2); + closesocket(s1); + continue; + } + dwFlags = 0; + WSAGetOverlappedResult(s1, &ov, NULL, FALSE, &dwFlags); + ok(dwFlags == 0, + "WSAGetOverlappedResult() returned unexpected flags %d!\n", dwFlags); + ok(hdr.dwFlags == MSG_CTRUNC, + "WSARecvMsg() overlapped operation set unexpected flags %d.\n", hdr.dwFlags); + hdr.dwFlags = 0; /* Reset flags */ + + /* + * Setup an overlapped receive, send a packet, then wait for the packet to be retrieved + * on the server end and check that the returned packet matches what was sent. + */ + hdr.Control.len = sizeof(pktbuf); + rc=pWSARecvMsg(s1, &hdr, NULL, &ov, NULL); + err=WSAGetLastError(); + ok(rc != 0 && err == WSA_IO_PENDING, "WSARecvMsg() failed error: %d\n", err); + ok(hdr.Control.len == sizeof(pktbuf), + "WSARecvMsg() control length mismatch (%d != sizeof pktbuf).\n", hdr.Control.len); + rc=sendto(s2, msg, sizeof(msg), 0, (struct sockaddr*)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + if (WaitForSingleObject(ov.hEvent, 100) != WAIT_OBJECT_0) + { + skip("Server side did not receive packet, some tests skipped.\n"); + closesocket(s2); + closesocket(s1); + continue; + } + dwSize = 0; + WSAGetOverlappedResult(s1, &ov, &dwSize, FALSE, NULL); + ok(dwSize == sizeof(msg), + "WSARecvMsg() buffer length does not match transmitted data!\n"); + ok(strncmp(iovec[0].buf, msg, sizeof(msg)) == 0, + "WSARecvMsg() buffer does not match transmitted data!\n"); + ok(hdr.Control.len == IP_PKTINFO_LEN, + "WSARecvMsg() control length mismatch (%d != %d).\n", hdr.Control.len, IP_PKTINFO_LEN); + + /* Test for the expected IP_PKTINFO return information. */ + foundhdr = FALSE; + for (cmsg = WSA_CMSG_FIRSTHDR(&hdr); cmsg != NULL; cmsg = WSA_CMSG_NXTHDR(&hdr, cmsg)) + { + if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO) + { + struct in_pktinfo *pi = (struct in_pktinfo *)WSA_CMSG_DATA(cmsg); + + ok(pi->ipi_addr.s_addr == s2addr.sin_addr.s_addr, "destination ip mismatch!\n"); + foundhdr = TRUE; + } + } + ok(foundhdr, "IP_PKTINFO header information was not returned!\n"); + + closesocket(s2); + closesocket(s1); + } + +cleanup: + CloseHandle(ov.hEvent); +} + /************* Array containing the tests to run **********/ #define STD_STREAM_SOCKET \ @@ -4422,6 +4598,7 @@ START_TEST( sock ) test_set_getsockopt(); test_so_reuseaddr(); + test_ip_pktinfo(); test_extendedSocketOptions(); for (i = 0; i < NUM_TESTS; i++)

1 0

Erich Hoover : ws2_32: Add support for WSARecvMsg and IP_PKTINFO.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 54b4f836fd9df485d4b0c83a749da22f8c1de25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b4f836fd9df485d4b0c83a7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Dec 5 17:08:54 2010 -0700 ws2_32: Add support for WSARecvMsg and IP_PKTINFO. --- dlls/ws2_32/socket.c | 181 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 159 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54b4f836fd9df485d4b0c…

1 0

André Hentschel : sane.ds: Convert Swedish translation to UTF-8.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 39b260e8becee7e0ba3804f8821c0863528a40b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b260e8becee7e0ba3804f88… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 6 21:39:48 2010 +0100 sane.ds: Convert Swedish translation to UTF-8. --- dlls/sane.ds/sane_Sv.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_Sv.rc b/dlls/sane.ds/sane_Sv.rc index d4c089e..a0ee5e7 100644 --- a/dlls/sane.ds/sane_Sv.rc +++ b/dlls/sane.ds/sane_Sv.rc @@ -20,14 +20,16 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Bildinl�sning" +CAPTION "Bildinläsning" FONT 8, "MS Sans Serif" BEGIN - LTEXT "L�ser in bild... var god v�nta",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Läser in bild... var god vänta",IDC_STATIC,5,19,176,8, SS_CENTER END STRINGTABLE

1 0

André Hentschel : sane.ds: Convert Norwegian translation to UTF-8.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 828fa067ec7937f8e498732003c7fd6e16894c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828fa067ec7937f8e49873200… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 6 21:36:14 2010 +0100 sane.ds: Convert Norwegian translation to UTF-8. --- dlls/sane.ds/sane_No.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index cb48513..0baf618 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_No.rc @@ -1,7 +1,7 @@ /* - * Norwegian Bokm�l resources for Twain + * Norwegian Bokmål resources for Twain * - * Copyright 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2006 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_DIALOG1 DIALOG 0, 0, 186, 46

1 0

Huw Davies : winspool.drv: Rewrite the lpr scheduler to use the pipe scheduler.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 052cfad067341145a95e0a13d1b1b31d1ca2c733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052cfad067341145a95e0a13d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 7 13:14:02 2010 +0000 winspool.drv: Rewrite the lpr scheduler to use the pipe scheduler. --- dlls/winspool.drv/info.c | 143 +++++++++++++++++++++------------------------- 1 files changed, 66 insertions(+), 77 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3076572..e4a464a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7361,32 +7361,83 @@ BOOL WINAPI GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, } /***************************************************************************** - * schedule_lpr + * schedule_pipe */ -static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) +static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) { - char *unixname, *queue, *cmd; - char fmt[] = "lpr -P'%s' '%s'"; +#ifdef HAVE_FORK + char *unixname, *cmdA; DWORD len; - int r; + int fds[2] = {-1, -1}, file_fd = -1, no_read; + BOOL ret = FALSE; + char buf[1024]; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, printer_name, -1, NULL, 0, NULL, NULL); - queue = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, printer_name, -1, queue, len, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, NULL, 0, NULL, NULL); + cmdA = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, cmdA, len, NULL, NULL); - cmd = HeapAlloc(GetProcessHeap(), 0, strlen(unixname) + len + sizeof(fmt) - 5); - sprintf(cmd, fmt, queue, unixname); + TRACE("printing with: %s\n", cmdA); - TRACE("printing with: %s\n", cmd); - r = system(cmd); + if((file_fd = open(unixname, O_RDONLY)) == -1) + goto end; - HeapFree(GetProcessHeap(), 0, cmd); - HeapFree(GetProcessHeap(), 0, queue); + if (pipe(fds)) + { + ERR("pipe() failed!\n"); + goto end; + } + + if (fork() == 0) + { + close(0); + dup2(fds[0], 0); + close(fds[1]); + + /* reset signals that we previously set to SIG_IGN */ + signal(SIGPIPE, SIG_DFL); + signal(SIGCHLD, SIG_DFL); + + execl("/bin/sh", "/bin/sh", "-c", cmdA, NULL); + _exit(1); + } + + while((no_read = read(file_fd, buf, sizeof(buf))) > 0) + write(fds[1], buf, no_read); + + ret = TRUE; + +end: + if(file_fd != -1) close(file_fd); + if(fds[0] != -1) close(fds[0]); + if(fds[1] != -1) close(fds[1]); + + HeapFree(GetProcessHeap(), 0, cmdA); HeapFree(GetProcessHeap(), 0, unixname); - return (r == 0); + return ret; +#else + return FALSE; +#endif +} + +/***************************************************************************** + * schedule_lpr + */ +static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) +{ + WCHAR *cmd; + const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; + BOOL r; + + cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW)); + sprintfW(cmd, fmtW, printer_name); + + r = schedule_pipe(cmd, filename); + + HeapFree(GetProcessHeap(), 0, cmd); + return r; } /***************************************************************************** @@ -7519,68 +7570,6 @@ static BOOL schedule_file(LPCWSTR filename) } /***************************************************************************** - * schedule_pipe - */ -static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) -{ -#ifdef HAVE_FORK - char *unixname, *cmdA; - DWORD len; - int fds[2] = {-1, -1}, file_fd = -1, no_read; - BOOL ret = FALSE; - char buf[1024]; - - if(!(unixname = wine_get_unix_file_name(filename))) - return FALSE; - - len = WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, NULL, 0, NULL, NULL); - cmdA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, cmdA, len, NULL, NULL); - - TRACE("printing with: %s\n", cmdA); - - if((file_fd = open(unixname, O_RDONLY)) == -1) - goto end; - - if (pipe(fds)) - { - ERR("pipe() failed!\n"); - goto end; - } - - if (fork() == 0) - { - close(0); - dup2(fds[0], 0); - close(fds[1]); - - /* reset signals that we previously set to SIG_IGN */ - signal(SIGPIPE, SIG_DFL); - signal(SIGCHLD, SIG_DFL); - - execl("/bin/sh", "/bin/sh", "-c", cmdA, NULL); - _exit(1); - } - - while((no_read = read(file_fd, buf, sizeof(buf))) > 0) - write(fds[1], buf, no_read); - - ret = TRUE; - -end: - if(file_fd != -1) close(file_fd); - if(fds[0] != -1) close(fds[0]); - if(fds[1] != -1) close(fds[1]); - - HeapFree(GetProcessHeap(), 0, cmdA); - HeapFree(GetProcessHeap(), 0, unixname); - return ret; -#else - return FALSE; -#endif -} - -/***************************************************************************** * schedule_unixfile */ static BOOL schedule_unixfile(LPCWSTR output, LPCWSTR filename)

1 0

Andrew Nguyen : shdocvw: Correct misuse of output pointer in get_profile_string helper.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 5bdcd79c2e6ff00e0aeb0e9fd7d72919e60a7be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdcd79c2e6ff00e0aeb0e9fd… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Dec 7 03:13:02 2010 -0600 shdocvw: Correct misuse of output pointer in get_profile_string helper. --- dlls/shdocvw/intshcut.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index e209e04..c82d1c2 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -416,23 +416,32 @@ static DWORD get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpFileName, WCHAR **rString ) { DWORD r = 0; - DWORD len=128; + DWORD len = 128; + WCHAR *buffer; - *rString = CoTaskMemAlloc(len*sizeof(WCHAR)); - if (rString != NULL) + buffer = CoTaskMemAlloc(len * sizeof(*buffer)); + if (buffer != NULL) { - r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, *rString, len, lpFileName); + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, buffer, len, lpFileName); while (r == len-1) { - CoTaskMemFree(rString); + WCHAR *realloc_buf; + len *= 2; - rString = CoTaskMemAlloc(len*sizeof(WCHAR)); - if (rString == NULL) - break; - r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, *rString, len, lpFileName); + realloc_buf = CoTaskMemRealloc(buffer, len * sizeof(*buffer)); + if (realloc_buf == NULL) + { + CoTaskMemFree(buffer); + *rString = NULL; + return 0; + } + buffer = realloc_buf; + + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, buffer, len, lpFileName); } } + *rString = buffer; return r; } @@ -456,12 +465,17 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam r = get_profile_string(str_header, str_URL, pszFileName, &url); - if (r == 0) + if (url == NULL) + { + hr = E_OUTOFMEMORY; + CoTaskMemFree(filename); + } + else if (r == 0) { hr = E_FAIL; CoTaskMemFree(filename); } - else if (url != NULL) + else { hr = S_OK; CoTaskMemFree(This->currentFile); @@ -470,11 +484,6 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam This->url = url; This->isDirty = FALSE; } - else - { - hr = E_OUTOFMEMORY; - CoTaskMemFree(filename); - } /* Now we're going to read in the iconfile and iconindex. If we don't find them, that's not a failure case -- it's possible

1 0

Andrew Nguyen : shdocvw: Avoid a double free in PersistFile_Load.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 1c5101506821591488755c72be89c37a176a5f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5101506821591488755c72b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Dec 7 03:12:29 2010 -0600 shdocvw: Avoid a double free in PersistFile_Load. Spotted with Valgrind. --- dlls/shdocvw/intshcut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index e400f0d..e209e04 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -526,7 +526,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); } - CoTaskMemFree(iconfile); + CoTaskMemFree(iconindexstring); } IPropertyStorage_Release(pPropStg);

1 0

Andrew Nguyen : shdocvw/tests: Avoid using a freed IUniformResourceLocatorA variable.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 2f302cfe0be98d5d542d9b17fbd1de3763f32a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f302cfe0be98d5d542d9b17f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Dec 7 03:12:01 2010 -0600 shdocvw/tests: Avoid using a freed IUniformResourceLocatorA variable. Spotted with Valgrind. --- dlls/shdocvw/tests/intshcut.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 56efdba..dbfb4d6 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -241,7 +241,7 @@ static void test_ReadAndWriteProperties(void) LPSTR url = NULL; /* Now read that .url file back in. */ - hr = urlAFromFile->lpVtbl->QueryInterface(urlA, &IID_IPersistFile, (void **) &pf); + hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPersistFile, (void **) &pf); ok(hr == S_OK, "Failed to get the IPersistFile for reading. hr=0x%x\n", hr); hr = IPersistFile_Load(pf, fileNameW, 0); @@ -249,11 +249,11 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); - hr = urlA->lpVtbl->GetURL(urlAFromFile, &url); + hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url); - hr = urlA->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); + hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); @@ -270,7 +270,7 @@ static void test_ReadAndWriteProperties(void) PropVariantClear(&pvread[1]); IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); - urlA->lpVtbl->Release(urlA); + urlAFromFile->lpVtbl->Release(urlAFromFile); DeleteFileW(fileNameW); } else

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010