September 2013 - Wine-commits

Jactry Zeng : riched20/tests: Add tests of ITextDocument_Open.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: a8d87afe1ca9754190326503ce94ef2cdd41a2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d87afe1ca9754190326503c… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Sep 4 19:04:19 2013 +0800 riched20/tests: Add tests of ITextDocument_Open. --- dlls/riched20/tests/richole.c | 247 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 237 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8d87afe1ca9754190326…

1 0

Hans Leidekker : rpcrt4: Add support for NTLM and Negotiate.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 9ea95f4105cb2c68ff823c822130000e22807675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea95f4105cb2c68ff823c822… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 4 15:01:10 2013 +0200 rpcrt4: Add support for NTLM and Negotiate. --- dlls/rpcrt4/rpc_transport.c | 550 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 472 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ea95f4105cb2c68ff823…

1 0

Jacek Caban : cryptnet: Removed unused typedefs.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 533730de7f0f09eee7179b78166857367cf2fb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533730de7f0f09eee7179b781… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 5 12:19:13 2013 +0200 cryptnet: Removed unused typedefs. --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index da66e66..35d6609 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1812,14 +1812,14 @@ typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS { HCERTSTORE *rgCertStore; HCERTSTORE hCrlStore; LPFILETIME pftTimeToUse; -} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS; +} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS; typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD cbSize; DWORD dwIndex; DWORD dwError; DWORD dwReason; -} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; +} OLD_CERT_REVOCATION_STATUS; /*********************************************************************** * CertDllVerifyRevocation (CRYPTNET.@)

1 0

Bruno Jesus : ws2_32: Cope with invalid protocols in WSAEnumProtocols.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 1d1faa0283727ddec8855ee877bf7033b9869d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1faa0283727ddec8855ee87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 5 09:56:19 2013 -0300 ws2_32: Cope with invalid protocols in WSAEnumProtocols. --- dlls/ws2_32/socket.c | 45 +++++++++++++++++++++-------- dlls/ws2_32/tests/protocol.c | 64 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1c72ce5..a916772 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -191,6 +191,16 @@ static const GUID ProviderIdIPX = { 0x11058240, 0xbe47, 0x11cf, static const GUID ProviderIdSPX = { 0x11058241, 0xbe47, 0x11cf, { 0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; +static const INT valid_protocols[] = +{ + WS_IPPROTO_TCP, + WS_IPPROTO_UDP, + NSPROTO_IPX, + NSPROTO_SPX, + NSPROTO_SPXII, + 0 +}; + #if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) # define LINUX_BOUND_IF struct interface_filter { @@ -1259,6 +1269,14 @@ static inline BOOL supported_pf(int pf) } } +static inline BOOL supported_protocol(int protocol) +{ + int i; + for (i = 0; i < sizeof(valid_protocols) / sizeof(valid_protocols[0]); i++) + if (protocol == valid_protocols[i]) + return TRUE; + return FALSE; +} /**********************************************************************/ @@ -1665,11 +1683,10 @@ static INT WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) return ret; } -static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) { - INT i = 0; + INT i = 0, items = 0; DWORD size = 0; - INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; union _info { LPWSAPROTOCOL_INFOA a; @@ -1677,11 +1694,15 @@ static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW } info; info.w = buffer; - if (!protocols) protocols = local; + if (!protocols) protocols = valid_protocols; - while (protocols[i]) i++; + while (protocols[i]) + { + if(supported_protocol(protocols[i++])) + items++; + } - size = i * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); + size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); if (*len < size || !buffer) { @@ -1690,20 +1711,20 @@ static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW return SOCKET_ERROR; } - for (i = 0; protocols[i]; i++) + for (i = items = 0; protocols[i]; i++) { if (unicode) { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[i] ) == SOCKET_ERROR) - break; + if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ) != SOCKET_ERROR) + items++; } else { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[i] ) == SOCKET_ERROR) - break; + if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ) != SOCKET_ERROR) + items++; } } - return i; + return items; } /************************************************************************** diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 2b95381..1b9a429 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -60,9 +60,10 @@ static void test_service_flags(int family, int version, int socktype, int protoc static void test_WSAEnumProtocolsA(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsA( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); @@ -80,8 +81,6 @@ static void test_WSAEnumProtocolsA(void) if (buffer) { - INT i; - ret = WSAEnumProtocolsA( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -96,13 +95,41 @@ static void test_WSAEnumProtocolsA(void) HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsA( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsA( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } static void test_WSAEnumProtocolsW(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsW( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); @@ -120,8 +147,6 @@ static void test_WSAEnumProtocolsW(void) if (buffer) { - INT i; - ret = WSAEnumProtocolsW( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -136,6 +161,33 @@ static void test_WSAEnumProtocolsW(void) HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsW( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsW( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } START_TEST( protocol )

1 0

Alexandre Julliard : ntdll: Add a configure check for the tcdrain function.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: f21961cc1427faad65abf36df217a8c888cae7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21961cc1427faad65abf36df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 5 00:10:19 2013 +0200 ntdll: Add a configure check for the tcdrain function. Also remove the tcgetattr check that is no longer used. --- configure | 2 +- configure.ac | 2 +- dlls/ntdll/file.c | 9 +-------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/serial.c | 26 ++++++++++++++++++++++++++ include/config.h.in | 4 ++-- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 56c983f..6b2c2c8 100755 --- a/configure +++ b/configure @@ -13436,7 +13436,7 @@ for ac_func in \ strtoll \ strtoull \ symlink \ - tcgetattr \ + tcdrain \ thr_kill2 \ timegm \ usleep \ diff --git a/configure.ac b/configure.ac index 3a0007c..7c1cb1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2063,7 +2063,7 @@ AC_CHECK_FUNCS(\ strtoll \ strtoull \ symlink \ - tcgetattr \ + tcdrain \ thr_kill2 \ timegm \ usleep \ diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 83e286e..9420df5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2777,14 +2777,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock if (!ret && type == FD_TYPE_SERIAL) { - while (tcdrain( fd ) == -1) - { - if (errno != EINTR) - { - ret = FILE_GetNtStatus(); - break; - } - } + ret = COMM_FlushBuffersFile( fd ); } else { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3d9264d..a13c55b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -142,6 +142,7 @@ extern NTSTATUS TAPE_DeviceIoControl(HANDLE hDevice, ULONG IoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize) DECLSPEC_HIDDEN; +extern NTSTATUS COMM_FlushBuffersFile( int fd ) DECLSPEC_HIDDEN; /* file I/O */ struct stat; diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b4f9aa9..07ba633 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1342,3 +1342,29 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, lpOutBuffer, nOutBufferSize); return status; } + +NTSTATUS COMM_FlushBuffersFile( int fd ) +{ +#ifdef HAVE_TCDRAIN + while (tcdrain( fd ) == -1) + { + if (errno != EINTR) return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +#elif defined(TIOCDRAIN) + while (ioctl( fd, TIOCDRAIN ) == -1) + { + if (errno != EINTR) return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +#elif defined(TCSBRK) + while (ioctl( fd, TCSBRK, 1 ) == -1) + { + if (errno != EINTR) return FILE_GetNtStatus(); + } + return STATUS_SUCCESS; +#else + ERR( "not supported\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} diff --git a/include/config.h.in b/include/config.h.in index aac10a5..44b34ce 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1068,8 +1068,8 @@ /* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the `tcgetattr' function. */ -#undef HAVE_TCGETATTR +/* Define to 1 if you have the `tcdrain' function. */ +#undef HAVE_TCDRAIN /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H

1 0

Piotr Caban : oleaut32: Add ICreateTypeInfo2::SetVarName implementation.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: a2ea406eee40c74251d98d6f6a81b8fc349e02b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ea406eee40c74251d98d6f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 4 22:28:50 2013 +0200 oleaut32: Add ICreateTypeInfo2::SetVarName implementation. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++-- dlls/oleaut32/typelib.c | 13 +++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 8b91212..b873ac2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4287,13 +4287,14 @@ static void test_SetVarDocString(void) static OLECHAR nameW[] = {'n','a','m','e',0}; static OLECHAR doc1W[] = {'d','o','c','1',0}; static OLECHAR doc2W[] = {'d','o','c','2',0}; + static OLECHAR var_nameW[] = {'v','a','r','n','a','m','e',0}; CHAR filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; ICreateTypeInfo *cti; ITypeLib *tl; ITypeInfo *ti; - BSTR docstr; + BSTR namestr, docstr; VARDESC desc, *pdesc; HRESULT hr; VARIANT v; @@ -4324,6 +4325,15 @@ static void test_SetVarDocString(void) hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeInfo_SetVarName(cti, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVarName(cti, 1, var_nameW); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetVarName(cti, 0, var_nameW); + ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeInfo_SetVarDocString(cti, 0, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); @@ -4359,10 +4369,12 @@ static void test_SetVarDocString(void) ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); ok(V_INT(U(pdesc)->lpvarValue) == 1, "got wrong value: 0x%x\n", V_INT(U(pdesc)->lpvarValue)); - hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, NULL, &docstr, NULL, NULL); + hr = ITypeInfo_GetDocumentation(ti, pdesc->memid, &namestr, &docstr, NULL, NULL); ok(hr == S_OK, "got %08x\n", hr); + ok(memcmp(namestr, var_nameW, sizeof(var_nameW)) == 0, "got wrong name: %s\n", wine_dbgstr_w(namestr)); ok(memcmp(docstr, doc2W, sizeof(doc2W)) == 0, "got wrong docstring: %s\n", wine_dbgstr_w(docstr)); + SysFreeString(namestr); SysFreeString(docstr); ITypeInfo_ReleaseVarDesc(ti, pdesc); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4f55755..a27f5f4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10688,8 +10688,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(ICreateTypeInfo2 *iface, UINT index, LPOLESTR name) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(name)); + + if(!name) + return E_INVALIDARG; + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + This->vardescs[index].Name = TLB_append_str(&This->pTypeLib->name_list, name); + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(ICreateTypeInfo2 *iface,

1 0

Michael Stefaniuc : dplayx: Fix the initial refcount of the IDPLobbySPImpl object.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: b9a2efdf2419c359cf3f60e31615deb87b5849cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a2efdf2419c359cf3f60e31… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:45:28 2013 +0200 dplayx: Fix the initial refcount of the IDPLobbySPImpl object. --- dlls/dplayx/lobbysp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 72198da..3528f94 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -240,7 +240,7 @@ HRESULT dplobbysp_create( REFIID riid, void **ppv, IDirectPlayImpl *dp ) return DPERR_OUTOFMEMORY; obj->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; - obj->ref = 0; + obj->ref = 1; obj->dplay = dp; hr = IDPLobbySP_QueryInterface( &obj->IDPLobbySP_iface, riid, ppv );

1 0

Michael Stefaniuc : dplayx: Use consistent naming for the IDirectPlaySP methods.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 12245de80168e7f08c33df49ff34237ce8e7730f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12245de80168e7f08c33df49f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:47:25 2013 +0200 dplayx: Use consistent naming for the IDirectPlaySP methods. --- dlls/dplayx/dplaysp.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 899348e..3a2f36d 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -188,12 +188,8 @@ static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) return TRUE; } -/* Interface implementation */ - -static HRESULT WINAPI DPSP_QueryInterface -( LPDIRECTPLAYSP iface, - REFIID riid, - LPVOID* ppvObj ) +static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid, + void **ppvObj ) { IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); @@ -228,8 +224,7 @@ static HRESULT WINAPI DPSP_QueryInterface return S_OK; } -static ULONG WINAPI DPSP_AddRef -( LPDIRECTPLAYSP iface ) +static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; @@ -243,8 +238,7 @@ static ULONG WINAPI DPSP_AddRef return ulObjRefCount; } -static ULONG WINAPI DPSP_Release -( LPDIRECTPLAYSP iface ) +static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; @@ -899,11 +893,9 @@ static VOID WINAPI IDirectPlaySPImpl_SendComplete static const IDirectPlaySPVtbl directPlaySPVT = { - - DPSP_QueryInterface, - DPSP_AddRef, - DPSP_Release, - + IDirectPlaySPImpl_QueryInterface, + IDirectPlaySPImpl_AddRef, + IDirectPlaySPImpl_Release, IDirectPlaySPImpl_AddMRUEntry, IDirectPlaySPImpl_CreateAddress, IDirectPlaySPImpl_EnumAddress,

1 0

Michael Stefaniuc : dplayx: Introduce impl_from_IDirectPlaySP().
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 008cc60821f029ce7212a103ca34f9c2df761415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008cc60821f029ce7212a103c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:49:25 2013 +0200 dplayx: Introduce impl_from_IDirectPlaySP(). --- dlls/dplayx/dplaysp.c | 143 ++++++++++++++++--------------------------------- 1 files changed, 46 insertions(+), 97 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 3a2f36d..aac2811 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -188,6 +188,11 @@ static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) return TRUE; } +static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) +{ + return CONTAINING_RECORD( iface, IDirectPlaySPImpl, lpVtbl ); +} + static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid, void **ppvObj ) { @@ -226,8 +231,8 @@ static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, RE static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); @@ -240,8 +245,8 @@ static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); @@ -264,16 +269,10 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) return ulInterfaceRefCount; } -static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry -( LPDIRECTPLAYSP iface, - LPCWSTR lpSection, - LPCWSTR lpKey, - LPCVOID lpData, - DWORD dwDataSize, - DWORD dwMaxEntries -) +static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry( IDirectPlaySP *iface, LPCWSTR lpSection, + LPCWSTR lpKey, const void *lpData, DWORD dwDataSize, DWORD dwMaxEntries ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); /* Should be able to call the comctl32 undocumented MRU routines. I suspect that the interface works appropriately */ @@ -283,17 +282,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress -( LPDIRECTPLAYSP iface, - REFGUID guidSP, - REFGUID guidDataType, - LPCVOID lpData, - DWORD dwDataSize, - LPVOID lpAddress, - LPDWORD lpdwAddressSize -) +static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress( IDirectPlaySP *iface, REFGUID guidSP, + REFGUID guidDataType, const void *lpData, DWORD dwDataSize, void *lpAddress, + DWORD *lpdwAddressSize ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(%s,%s,%p,0x%08x,%p,%p): stub\n", This, debugstr_guid(guidSP), debugstr_guid(guidDataType), @@ -302,15 +295,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateAddress return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress -( LPDIRECTPLAYSP iface, - LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, - LPCVOID lpAddress, - DWORD dwAddressSize, - LPVOID lpContext -) +static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress( IDirectPlaySP *iface, + LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, const void *lpAddress, DWORD dwAddressSize, + void *lpContext ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); TRACE( "(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); @@ -320,15 +309,10 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumAddress return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries -( LPDIRECTPLAYSP iface, - LPCWSTR lpSection, - LPCWSTR lpKey, - LPENUMMRUCALLBACK lpEnumMRUCallback, - LPVOID lpContext -) +static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries( IDirectPlaySP *iface, LPCWSTR lpSection, + LPCWSTR lpKey, LPENUMMRUCALLBACK lpEnumMRUCallback, void *lpContext ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); /* Should be able to call the comctl32 undocumented MRU routines. I suspect that the interface works appropriately */ @@ -338,13 +322,10 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags -( LPDIRECTPLAYSP iface, - DPID idPlayer, - LPDWORD lpdwPlayerFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags( IDirectPlaySP *iface, DPID idPlayer, + DWORD *lpdwPlayerFlags ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwPlayerFlags ); @@ -352,17 +333,12 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetPlayerFlags return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData -( LPDIRECTPLAYSP iface, - DPID idPlayer, - LPVOID* lplpData, - LPDWORD lpdwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData( IDirectPlaySP *iface, DPID idPlayer, + void **lplpData, DWORD *lpdwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr; LPDP_SPPLAYERDATA lpPlayerData; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, idPlayer, lplpData, lpdwDataSize, dwFlags ); @@ -395,21 +371,16 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData return hr; } -static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage -( LPDIRECTPLAYSP iface, - LPVOID lpMessageBody, - DWORD dwMessageBodySize, - LPVOID lpMessageHeader -) +static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, void *lpMessageBody, + DWORD dwMessageBodySize, void *lpMessageHeader ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); LPDPMSG_SENDENVELOPE lpMsg = lpMessageBody; HRESULT hr = DPERR_GENERIC; WORD wCommandId; WORD wVersion; DPSP_REPLYDATA data; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - FIXME( "(%p)->(%p,0x%08x,%p): mostly stub\n", This, lpMessageBody, dwMessageBodySize, lpMessageHeader ); @@ -709,20 +680,14 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage #endif } -static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData -( LPDIRECTPLAYSP iface, - DPID idPlayer, - LPVOID lpData, - DWORD dwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, DPID idPlayer, + void *lpData, DWORD dwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr; LPDP_SPPLAYERDATA lpPlayerEntry; LPVOID lpPlayerData; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags ); @@ -753,15 +718,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData return hr; } -static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress -( LPDIRECTPLAYSP iface, - LPCDPCOMPOUNDADDRESSELEMENT lpElements, - DWORD dwElementCount, - LPVOID lpAddress, - LPDWORD lpdwAddressSize -) +static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress( IDirectPlaySP *iface, + const DPCOMPOUNDADDRESSELEMENT *lpElements, DWORD dwElementCount, void *lpAddress, + DWORD *lpdwAddressSize ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(%p,0x%08x,%p,%p): stub\n", This, lpElements, dwElementCount, lpAddress, lpdwAddressSize ); @@ -769,15 +730,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_CreateCompoundAddress return DP_OK; } -static HRESULT WINAPI IDirectPlaySPImpl_GetSPData -( LPDIRECTPLAYSP iface, - LPVOID* lplpData, - LPDWORD lpdwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void **lplpData, + DWORD *lpdwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr = DP_OK; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ TRACE( "(%p)->(%p,%p,0x%08x)\n", @@ -827,17 +784,12 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData return hr; } -static HRESULT WINAPI IDirectPlaySPImpl_SetSPData -( LPDIRECTPLAYSP iface, - LPVOID lpData, - DWORD dwDataSize, - DWORD dwFlags -) +static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *lpData, + DWORD dwDataSize, DWORD dwFlags ) { + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); LPVOID lpSpData; - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - /* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", This, lpData, dwDataSize, dwFlags ); @@ -879,13 +831,10 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData return DP_OK; } -static VOID WINAPI IDirectPlaySPImpl_SendComplete -( LPDIRECTPLAYSP iface, - LPVOID unknownA, - DWORD unknownB -) +static void WINAPI IDirectPlaySPImpl_SendComplete( IDirectPlaySP *iface, void *unknownA, + DWORD unknownB ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; + IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); FIXME( "(%p)->(%p,0x%08x): stub\n", This, unknownA, unknownB );

1 0

Alexandre Julliard : winetest: Expire old queue files after a month.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: tools Branch: master Commit: d104f7a7905d5bfeccab790ad38377bc17fdadad URL: http://source.winehq.org/git/tools.git/?a=commit;h=d104f7a7905d5bfeccab790a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 5 19:33:39 2013 +0200 winetest: Expire old queue files after a month. --- winetest/winetest.cron | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 0ff60be..eaacf4f 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -23,5 +23,10 @@ if [ ! -f $lock ]; then # remove old test builds (cd builds && find . -mtime +$expire -name winetest\*.exe -print0 | xargs -0 rm -f) + + # remove old queue files + find queue -maxdepth 1 -mtime +30 -name err\* -print0 | xargs -0 rm -rf + find queue -maxdepth 1 -mtime +30 -name CGI\* -print0 | xargs -0 rm -f + rm $lock fi

1 0