April 2013 - Wine-commits - list.winehq.org

Łukasz Wojniłowicz : Polish translation for release 1.5.28
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: af3c21bcb79ba057e00c400a4dac4bbe609fff3d URL: http://source.winehq.org/git/website.git/?a=commit;h=af3c21bcb79ba057e00c40… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Apr 13 13:59:49 2013 +0200 Polish translation for release 1.5.28 --- news/pl/2013041201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2013041201.xml b/news/pl/2013041201.xml new file mode 100644 index 0000000..47f6d55 --- /dev/null +++ b/news/pl/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>Kwiecień 12, 2013</date> +<title>Wydano Wine 1.5.28</title> +<body> + Wydanie rozwojowe Wine 1.5.28 jest już dostępne. + <a href="{$root}/announce/1.5.28">Co nowego</a> w tym wydaniu: +<ul> + <li>GnuTLS jest używany dla wszystkich bezpiecznych połączeń, OpenSSL już nie jest potrzebny.</li> + <li>Sterownik Mac jest domyślnie włączony.</li> + <li>Wbudowane czcionki FixedSys.</li> + <li>Nowa ikona dla joysticku w panelu sterowania.</li> + <li>Ulepszenia w sterowniku Postscript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.28
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: 78e2f091688f124c521254bcb3a499843b5ac2bb URL: http://source.winehq.org/git/website.git/?a=commit;h=78e2f091688f124c521254… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Apr 13 11:32:40 2013 +0800 Simplified Chinese translation for release 1.5.28 --- news/zh-cn/2013041201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013041201.xml b/news/zh-cn/2013041201.xml new file mode 100644 index 0000000..2264413 --- /dev/null +++ b/news/zh-cn/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>四月 12, 2013</date> +<title>Wine 1.5.28 发布</title> +<body> + Wine 开发版 1.5.28 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.28">更新</a>： +<ul> + <li>使用 GnuTLS 进行所有安全连接，不再依赖 OpenSSL。</li> + <li>默认启用 Mac 后端驱动。</li> + <li>内置 FixedSys 字体。</li> + <li>新的操纵杆控制面板图标。</li> + <li>Postscript 驱动的改进。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Jactry Zeng : Updated Simplified Chinese translation
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: dd0bb5fe062926db80f379318cb4b39569c0670b URL: http://source.winehq.org/git/website.git/?a=commit;h=dd0bb5fe062926db80f379… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Apr 13 12:33:52 2013 +0800 Updated Simplified Chinese translation --- templates/zh-cn/download.template | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index b3d8adf..8313e69 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -91,8 +91,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <a href="http://en.opensuse.org/Wine#Repositories">下载 SUSE 安装包</a> - - openSUSE 11.1、11.2、11.3、11.4 和 SUSE Linux Enterprise 10 和 11 的发行二进制和源码 .rpms 及每日快照 RPMs。 - 旧版本安装包可以从 <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> 获取 + - 所有版本的 openSUSE （11.1 至 12.3）和 SUSE Linux Enterprise 11 的发行二进制和源码 .rpms 及每日快照 RPMs。 </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

Alexandre Julliard : Wine release 1.5.28
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: website Branch: master Commit: ddda452d1a5a9c3399c610f81f77fab5a08ee359 URL: http://source.winehq.org/git/website.git/?a=commit;h=ddda452d1a5a9c3399c610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:46:20 2013 +0200 Wine release 1.5.28 --- news/en/2013041201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013041201.xml b/news/en/2013041201.xml new file mode 100644 index 0000000..fc42cb7 --- /dev/null +++ b/news/en/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>April 12, 2013</date> +<title>Wine 1.5.28 Released</title> +<body> + The Wine development release 1.5.28 is now available. + <a href="{$root}/announce/1.5.28">What's new</a> in this release: +<ul> + <li>GnuTLS used for all secure connections, OpenSSL is no longer needed.</li> + <li>Mac driver enabled by default.</li> + <li>Built-in FixedSys fonts.</li> + <li>New icon for the joystick control panel.</li> + <li>Postscript driver improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.28.
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: wine Branch: master Commit: 887473ed8708fa4b239febba6903773cf5c6ad43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887473ed8708fa4b239febba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:35:09 2013 +0200 Release 1.5.28. --- ANNOUNCE | 636 ++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 370 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887473ed8708fa4b239fe…

1 0

Tag wine-1.5.28 : Alexandre Julliard : Release 1.5.28
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: wine Branch: refs/tags/wine-1.5.28 Tag: e313f67470c003577b10fb73c81e423f2449969f URL: http://source.winehq.org/git/wine.git/?a=tag;h=e313f67470c003577b10fb73c81e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:35:10 2013 +0200 Release 1.5.28

1 0

Dmitry Timoshkov : kernel32: Add a test for threads state when a process is being terminated.
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: wine Branch: master Commit: 521cf664d3172f948ae1eacb2ffbc9c2948539f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521cf664d3172f948ae1eacb2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 12 18:00:58 2013 +0900 kernel32: Add a test for threads state when a process is being terminated. --- dlls/kernel32/tests/loader.c | 459 +++++++++++++++++++++++++++++++++++++++++- include/wine/test.h | 6 + 2 files changed, 462 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=521cf664d3172f948ae1e…

1 0

Dmitry Timoshkov : kernel32: TerminateProcess unlike NtTerminateProcess is supposed to fail with process == 0.
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: wine Branch: master Commit: 37f7e7ea0c57416e9eb39a884f9f5d9a7bdee0e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f7e7ea0c57416e9eb39a884… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 12 18:01:37 2013 +0900 kernel32: TerminateProcess unlike NtTerminateProcess is supposed to fail with process == 0. --- dlls/kernel32/process.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 93c0267..7abb732 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2593,7 +2593,15 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock ) */ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) { - NTSTATUS status = NtTerminateProcess( handle, exit_code ); + NTSTATUS status; + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + status = NtTerminateProcess( handle, exit_code ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; }

1 0

Michael Stefaniuc : dplayx: Assimilate the inherited methods into IDirectPlayLobby3A.
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: wine Branch: master Commit: 2c21bac66400adc11fff3dd0cd1ae1df4f461c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c21bac66400adc11fff3dd0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:48:28 2013 +0200 dplayx: Assimilate the inherited methods into IDirectPlayLobby3A. --- dlls/dplayx/dplobby.c | 124 +++++++++++++++++-------------------------------- 1 files changed, 42 insertions(+), 82 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index e09d6c8..7ea3e05 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -435,14 +435,9 @@ static HRESULT WINAPI IDirectPlayLobby3Impl_Connect( IDirectPlayLobby3 *iface, D * NOTE: It appears that this method is supposed to be really really stupid * with no error checking on the contents. */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_CreateAddress -( LPDIRECTPLAYLOBBYA iface, - REFGUID guidSP, - REFGUID guidDataType, - LPCVOID lpData, - DWORD dwDataSize, - LPVOID lpAddress, - LPDWORD lpdwAddressSize ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_CreateAddress( IDirectPlayLobby3A *iface, + REFGUID guidSP, REFGUID guidDataType, const void *lpData, DWORD dwDataSize, void *lpAddress, + DWORD *lpdwAddressSize ) { return DPL_CreateAddress( guidSP, guidDataType, lpData, dwDataSize, lpAddress, lpdwAddressSize, TRUE ); @@ -498,12 +493,9 @@ static HRESULT DPL_CreateAddress( * given callback function, with lpContext, for each of the chunks. * */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumAddress -( LPDIRECTPLAYLOBBYA iface, - LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, - LPCVOID lpAddress, - DWORD dwAddressSize, - LPVOID lpContext ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddress( IDirectPlayLobby3A *iface, + LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, const void *lpAddress, DWORD dwAddressSize, + void *lpContext ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; @@ -563,12 +555,9 @@ HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID * build the DirectPlay Address. * */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumAddressTypes -( LPDIRECTPLAYLOBBYA iface, - LPDPLENUMADDRESSTYPESCALLBACK lpEnumAddressTypeCallback, - REFGUID guidSP, - LPVOID lpContext, - DWORD dwFlags ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3A *iface, + LPDPLENUMADDRESSTYPESCALLBACK lpEnumAddressTypeCallback, REFGUID guidSP, void *lpContext, + DWORD dwFlags ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; @@ -719,11 +708,8 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_EnumLocalApplications return DPERR_OUTOFMEMORY; } -static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumLocalApplications -( LPDIRECTPLAYLOBBYA iface, - LPDPLENUMLOCALAPPLICATIONSCALLBACK lpEnumLocalAppCallback, - LPVOID lpContext, - DWORD dwFlags ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayLobby3A *iface, + LPDPLENUMLOCALAPPLICATIONSCALLBACK lpEnumLocalAppCallback, void *lpContext, DWORD dwFlags ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; @@ -821,11 +807,8 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumLocalApplications * the data structure to be allocated by our caller which can then * call this procedure/method again with a valid data pointer. */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_GetConnectionSettings -( LPDIRECTPLAYLOBBYA iface, - DWORD dwAppID, - LPVOID lpData, - LPDWORD lpdwDataSize ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_GetConnectionSettings( IDirectPlayLobby3A *iface, + DWORD dwAppID, void *lpData, DWORD *lpdwDataSize ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; HRESULT hr; @@ -873,13 +856,9 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_GetConnectionSettings * application. All messages are queued until received. * */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_ReceiveLobbyMessage -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - DWORD dwAppID, - LPDWORD lpdwMessageFlags, - LPVOID lpData, - LPDWORD lpdwDataSize ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_ReceiveLobbyMessage( IDirectPlayLobby3A *iface, + DWORD dwFlags, DWORD dwAppID, DWORD *lpdwMessageFlags, void *lpData, + DWORD *lpdwDataSize ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData, @@ -1046,12 +1025,8 @@ static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestPro * connect to a session. * */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_RunApplication -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - LPDWORD lpdwAppID, - LPDPLCONNECTION lpConn, - HANDLE hReceiveEvent ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A *iface, + DWORD dwFlags, DWORD *lpdwAppID, DPLCONNECTION *lpConn, HANDLE hReceiveEvent ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; HRESULT hr; @@ -1194,12 +1169,8 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_RunApplication * All messages are queued until received. * */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_SendLobbyMessage -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - DWORD dwAppID, - LPVOID lpData, - DWORD dwDataSize ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_SendLobbyMessage( IDirectPlayLobby3A *iface, + DWORD flags, DWORD appid, void *data, DWORD size ) { FIXME(":stub\n"); return DPERR_OUTOFMEMORY; @@ -1256,11 +1227,8 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings return hr; } -static HRESULT WINAPI IDirectPlayLobbyAImpl_SetConnectionSettings -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - DWORD dwAppID, - LPDPLCONNECTION lpConn ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayLobby3A *iface, + DWORD dwFlags, DWORD dwAppID, DPLCONNECTION *lpConn ) { IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; HRESULT hr; @@ -1292,11 +1260,8 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_SetConnectionSettings * Registers an event that will be set when a lobby message is received. * */ -static HRESULT WINAPI IDirectPlayLobbyAImpl_SetLobbyMessageEvent -( LPDIRECTPLAYLOBBYA iface, - DWORD dwFlags, - DWORD dwAppID, - HANDLE hReceiveEvent ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_SetLobbyMessageEvent( IDirectPlayLobby3A *iface, + DWORD flags, DWORD appid, HANDLE event ) { FIXME(":stub\n"); return DPERR_OUTOFMEMORY; @@ -1324,12 +1289,9 @@ static HRESULT WINAPI IDirectPlayLobby2WImpl_CreateCompoundAddress return DPL_CreateCompoundAddress( lpElements, dwElementCount, lpAddress, lpdwAddressSize, FALSE ); } -static HRESULT WINAPI IDirectPlayLobby2AImpl_CreateCompoundAddress -( LPDIRECTPLAYLOBBY2A iface, - LPCDPCOMPOUNDADDRESSELEMENT lpElements, - DWORD dwElementCount, - LPVOID lpAddress, - LPDWORD lpdwAddressSize ) +static HRESULT WINAPI IDirectPlayLobby3AImpl_CreateCompoundAddress( IDirectPlayLobby3A *iface, + const DPCOMPOUNDADDRESSELEMENT *lpElements, DWORD dwElementCount, void *lpAddress, + DWORD *lpdwAddressSize ) { return DPL_CreateCompoundAddress( lpElements, dwElementCount, lpAddress, lpdwAddressSize, TRUE ); } @@ -1601,23 +1563,21 @@ static const IDirectPlayLobby3Vtbl directPlayLobby3AVT = XCAST(Release)DPL_Release, IDirectPlayLobby3AImpl_Connect, - XCAST(CreateAddress)IDirectPlayLobbyAImpl_CreateAddress, - XCAST(EnumAddress)IDirectPlayLobbyAImpl_EnumAddress, - XCAST(EnumAddressTypes)IDirectPlayLobbyAImpl_EnumAddressTypes, - XCAST(EnumLocalApplications)IDirectPlayLobbyAImpl_EnumLocalApplications, - XCAST(GetConnectionSettings)IDirectPlayLobbyAImpl_GetConnectionSettings, - XCAST(ReceiveLobbyMessage)IDirectPlayLobbyAImpl_ReceiveLobbyMessage, - XCAST(RunApplication)IDirectPlayLobbyAImpl_RunApplication, - XCAST(SendLobbyMessage)IDirectPlayLobbyAImpl_SendLobbyMessage, - XCAST(SetConnectionSettings)IDirectPlayLobbyAImpl_SetConnectionSettings, - XCAST(SetLobbyMessageEvent)IDirectPlayLobbyAImpl_SetLobbyMessageEvent, - - XCAST(CreateCompoundAddress)IDirectPlayLobby2AImpl_CreateCompoundAddress, - - IDirectPlayLobby3AImpl_ConnectEx, - IDirectPlayLobby3AImpl_RegisterApplication, - IDirectPlayLobby3AImpl_UnregisterApplication, - IDirectPlayLobby3AImpl_WaitForConnectionSettings + IDirectPlayLobby3AImpl_CreateAddress, + IDirectPlayLobby3AImpl_EnumAddress, + IDirectPlayLobby3AImpl_EnumAddressTypes, + IDirectPlayLobby3AImpl_EnumLocalApplications, + IDirectPlayLobby3AImpl_GetConnectionSettings, + IDirectPlayLobby3AImpl_ReceiveLobbyMessage, + IDirectPlayLobby3AImpl_RunApplication, + IDirectPlayLobby3AImpl_SendLobbyMessage, + IDirectPlayLobby3AImpl_SetConnectionSettings, + IDirectPlayLobby3AImpl_SetLobbyMessageEvent, + IDirectPlayLobby3AImpl_CreateCompoundAddress, + IDirectPlayLobby3AImpl_ConnectEx, + IDirectPlayLobby3AImpl_RegisterApplication, + IDirectPlayLobby3AImpl_UnregisterApplication, + IDirectPlayLobby3AImpl_WaitForConnectionSettings }; #undef XCAST

1 0

Michael Stefaniuc : dplayx: Introduce impl_from_IDirectPlayLobby3A().
by Alexandre Julliard 12 Apr '13

12 Apr '13

Module: wine Branch: master Commit: 9f10f092f6e6736d2861fdcc274356e0c8e1be14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f10f092f6e6736d2861fdcc2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 11 23:50:53 2013 +0200 dplayx: Introduce impl_from_IDirectPlayLobby3A(). --- dlls/dplayx/dplobby.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7ea3e05..f5c2e41 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -93,6 +93,11 @@ typedef struct IDirectPlayLobbyImpl DirectPlayLobbyData* dpl; } IDirectPlayLobbyImpl; +static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLobby3A *iface ) +{ + return (IDirectPlayLobbyImpl*)iface; /* What you gonna do? */ +} + /* Forward declarations of virtual tables */ static const IDirectPlayLobby3Vtbl directPlayLobby3WVT; static const IDirectPlayLobby3Vtbl directPlayLobby3AVT; @@ -497,7 +502,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddress( IDirectPlayLobby3A *if LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, const void *lpAddress, DWORD dwAddressSize, void *lpContext ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); TRACE("(%p)->(%p,%p,0x%08x,%p)\n", This, lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); @@ -559,7 +564,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 LPDPLENUMADDRESSTYPESCALLBACK lpEnumAddressTypeCallback, REFGUID guidSP, void *lpContext, DWORD dwFlags ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HKEY hkResult; LPCSTR searchSubKey = "SOFTWARE\\Microsoft\\DirectPlay\\Service Providers"; @@ -711,7 +716,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_EnumLocalApplications static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayLobby3A *iface, LPDPLENUMLOCALAPPLICATIONSCALLBACK lpEnumLocalAppCallback, void *lpContext, DWORD dwFlags ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HKEY hkResult; LPCSTR searchSubKey = "SOFTWARE\\Microsoft\\DirectPlay\\Applications"; @@ -810,7 +815,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL static HRESULT WINAPI IDirectPlayLobby3AImpl_GetConnectionSettings( IDirectPlayLobby3A *iface, DWORD dwAppID, void *lpData, DWORD *lpdwDataSize ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HRESULT hr; TRACE("(%p)->(0x%08x,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize ); @@ -860,7 +865,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_ReceiveLobbyMessage( IDirectPlayLob DWORD dwFlags, DWORD dwAppID, DWORD *lpdwMessageFlags, void *lpData, DWORD *lpdwDataSize ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); FIXME(":stub %p %08x %08x %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData, lpdwDataSize ); return DPERR_OUTOFMEMORY; @@ -1028,7 +1033,7 @@ static BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestPro static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A *iface, DWORD dwFlags, DWORD *lpdwAppID, DPLCONNECTION *lpConn, HANDLE hReceiveEvent ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HRESULT hr; RunApplicationEnumStruct enumData; char temp[200]; @@ -1230,7 +1235,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings static HRESULT WINAPI IDirectPlayLobby3AImpl_SetConnectionSettings( IDirectPlayLobby3A *iface, DWORD dwFlags, DWORD dwAppID, DPLCONNECTION *lpConn ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); HRESULT hr; TRACE("(%p)->(0x%08x,0x%08x,%p)\n", This, dwFlags, dwAppID, lpConn ); @@ -1480,7 +1485,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_ConnectEx ( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags, REFIID riid, LPVOID* lplpDP, IUnknown* pUnk ) { - IDirectPlayLobbyAImpl *This = (IDirectPlayLobbyAImpl *)iface ; + IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); return DPL_ConnectEx( This, dwFlags, riid, lplpDP, pUnk ); }

1 0