December 2010 - Wine-Commits

Yaron Shahrabani : website: [3/3] Hebrew fix
by Jeremy Newman Dec. 6, 2010

Dec. 6, 2010

Module: website Branch: master Commit: e56ab84d765942934814879a9c5a49f38c183217 URL: http://source.winehq.org/git/website.git/?a=commit;h=e56ab84d76594293481487… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat Dec 4 16:36:51 2010 +0200 website: [3/3] Hebrew fix --0016364267351fa58b04969697ee Content-Type: text/plain; charset=UTF-8 Some changed string Yaron Shahrabani <Hebrew translator> <div dir="ltr">Some changed string<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div> <br> </div> >From d278e89882c71f2e430aed0e35b1107c39442806 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat, 4 Dec 2010 16:26:12 +0200 Subject: Hebrew dev release name fixed --- templates/he/home.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/he/home.template b/templates/he/home.template index 471845e..28142d2 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -71,7 +71,7 @@ (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">יומן מקוצר</a>) </span> </td></tr> - <tr><td>בפיתוח:</td> + <tr><td>פיתוח:</td> <td style="padding-left: 15px;"> <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> <span class="small">

1 0

Yaron Shahrabani : website: [1/3] Hebrew fix
by Jeremy Newman Dec. 6, 2010

Dec. 6, 2010

Module: website Branch: master Commit: 24003b1e30fc99a40a0e42c0fc94a130c8897f5b URL: http://source.winehq.org/git/website.git/?a=commit;h=24003b1e30fc99a40a0e42… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat Dec 4 16:36:27 2010 +0200 website: [1/3] Hebrew fix --0016364d1dc9ae47380496969530 Content-Type: text/plain; charset=UTF-8 Some incorrect words fixed Yaron Shahrabani <Hebrew translator> <div dir="ltr">Some incorrect words fixed<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div> <br> </div> >From 3a01ac0c549a0c19b0451e4795b5d6ffde20e0c1 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat, 4 Dec 2010 16:19:56 +0200 Subject: Hebrew homepage fix --- templates/he/home.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/he/home.template b/templates/he/home.template index a31ab78..471845e 100644 --- a/templates/he/home.template +++ b/templates/he/home.template @@ -44,7 +44,7 @@ <div class="donate" onClick="document.location='{$root}/donate/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/donate/">ה</a></div> + <div class="title"><a href="{$root}/donate/">תרומה</a></div> <div class="subtitle">תרומה למיזם Wine.</div> </div> </div>

1 0

Yaron Shahrabani : website: [2/3] Hebrew fix
by Jeremy Newman Dec. 6, 2010

Dec. 6, 2010

Module: website Branch: master Commit: 70082736739da5b95092cf4024e4831e407ebd47 URL: http://source.winehq.org/git/website.git/?a=commit;h=70082736739da5b95092cf… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat Dec 4 16:36:36 2010 +0200 website: [2/3] Hebrew fix --0016e65b48fa34c4110496969684 Content-Type: text/plain; charset=UTF-8 Change language string was rephrased Yaron Shahrabani <Hebrew translator> <div dir="ltr">Change language string was rephrased<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div> <font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div><br> </div> >From 1117dd37cfa6946c685ab5ec22161cd3faeeafc9 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sat, 4 Dec 2010 16:23:14 +0200 Subject: Updated change language string --- include/data.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/data.php b/include/data.php index 19a697f..6f2f1ac 100644 --- a/include/data.php +++ b/include/data.php @@ -63,7 +63,7 @@ class data ), 'he' => array( 'name' => 'עברית', - 'change' => 'שינוי השפה' + 'change' => 'החלפת השפה' ), 'pl' => array( 'name' => 'Polski',

1 0

Frédéric Delanoy : French translation for release 1.2.2
by Jeremy Newman Dec. 6, 2010

Dec. 6, 2010

Module: website Branch: master Commit: 11fc29e5ed501fecd04f4c672b08183daef1a8c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=11fc29e5ed501fecd04f4c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 4 02:32:44 2010 +0100 French translation for release 1.2.2 --- news/fr/2010120301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/fr/2010120301.xml b/news/fr/2010120301.xml new file mode 100644 index 0000000..e8f47df --- /dev/null +++ b/news/fr/2010120301.xml @@ -0,0 +1,17 @@ +<news> +<date>3 décembre 2010</date> +<title>Sortie de Wine 1.2.2</title> +<body> +<p> La version de maintenance 1.2.2 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.2.x">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des curseurs animés.</li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.2.2.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Andrew Bogott : shdocvw: Plug a tiny memory leak in a test.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 12c218c8d8e8b2a9947704faa4b3c43b939f3797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c218c8d8e8b2a9947704faa… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Tue Nov 23 03:43:32 2010 -0600 shdocvw: Plug a tiny memory leak in a test. --- dlls/shdocvw/tests/intshcut.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 4cf289d..5245d9f 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -222,6 +222,8 @@ static void test_ReadAndWriteProperties(void) ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n",wine_dbgstr_w(pvread[0].pwszVal)); + PropVariantClear(&pvread[0]); + PropVariantClear(&pvread[1]); IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); urlA->lpVtbl->Release(urlA);

1 0

Mike Gibson : msvcrt: Implement wcsnicoll.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 23906816d87795c363f0199f33ff70f2732c6ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23906816d87795c363f0199f3… Author: Mike Gibson <mike.gibson(a)storagecraft.com> Date: Fri Dec 3 10:12:23 2010 -0700 msvcrt: Implement wcsnicoll. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ include/msvcrt/string.h | 1 + include/msvcrt/wchar.h | 1 + 8 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1c2c66f..9f2a147 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1299,7 +1299,7 @@ @ stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l -@ stub _wcsnicoll +@ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll @ stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 84a6512..f33a064 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -601,7 +601,7 @@ @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcsncoll @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp -@ stub _wcsnicoll +@ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8ab1835..1512347 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1152,7 +1152,7 @@ @ stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l -@ stub _wcsnicoll +@ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll @ stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f1a2bde..feaf80e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1139,7 +1139,7 @@ @ stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l -@ stub _wcsnicoll +@ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll @ stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 379b7cd..9fe5f64 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1073,7 +1073,7 @@ # stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp # stub _wcsnicmp_l -@ stub _wcsnicoll #(wstr wstr long) +@ cdecl _wcsnicoll(wstr wstr long) # stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset # stub _wcsnset_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 484679f..b01e60b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -58,6 +58,15 @@ INT CDECL _wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) } /********************************************************************* + * _wcsnicoll (MSVCRT.@) + */ +INT CDECL _wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count ) +{ + /* FIXME: handle collates */ + return strncmpiW( str1, str2, count ); +} + +/********************************************************************* * _wcsnset (MSVCRT.@) */ MSVCRT_wchar_t* CDECL MSVCRT__wcsnset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c, MSVCRT_size_t n ) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 24bebd0..5c83631 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -88,6 +88,7 @@ int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); wchar_t* __cdecl _wcslwr(wchar_t*); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 285168a..f7656b2 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -362,6 +362,7 @@ int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); wchar_t* __cdecl _wcslwr(wchar_t*); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t);

1 0

Andrew Bogott : shdocvw: In PersistFile_Save, output the Icon Path and Icon Index properties.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: ef06f989a255bbf97b03eac0a7e951a741a48cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef06f989a255bbf97b03eac0a… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Fri Nov 19 22:02:26 2010 -0600 shdocvw: In PersistFile_Save, output the Icon Path and Icon Index properties. --- dlls/shdocvw/intshcut.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 72bceae..a335540 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -501,15 +501,60 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam if (file != INVALID_HANDLE_VALUE) { DWORD bytesWritten; + char *iconfile; char str_header[] = "[InternetShortcut]"; char str_URL[] = "URL="; + char str_ICONFILE[] = "ICONFILE="; char str_eol[] = "\r\n"; + IPropertyStorage *pPropStgRead; + PROPSPEC ps[2]; + PROPVARIANT pvread[2]; + ps[0].ulKind = PRSPEC_PROPID; + ps[0].propid = PID_IS_ICONFILE; + ps[1].ulKind = PRSPEC_PROPID; + ps[1].propid = PID_IS_ICONINDEX; WriteFile(file, str_header, lstrlenA(str_header), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); WriteFile(file, str_URL, lstrlenA(str_URL), &bytesWritten, NULL); WriteFile(file, url, lstrlenA(url), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + + hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, STGM_READ|STGM_SHARE_EXCLUSIVE, &pPropStgRead); + if SUCCEEDED(hr) + { + hr = IPropertyStorage_ReadMultiple(pPropStgRead, 2, ps, pvread); + if SUCCEEDED(hr) + { + char indexString[50]; + len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].pwszVal, -1, NULL, 0, 0, 0); + iconfile = heap_alloc(len); + if (iconfile != NULL) + { + WideCharToMultiByte(CP_UTF8, 0, pvread[0].pwszVal, -1, iconfile, len, 0, 0); + WriteFile(file, str_ICONFILE, lstrlenA(str_ICONFILE), &bytesWritten, NULL); + WriteFile(file, iconfile, lstrlenA(iconfile), &bytesWritten, NULL); + WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + } + + sprintf(indexString, "ICONINDEX=%d", pvread[1].iVal); + WriteFile(file, indexString, lstrlenA(indexString), &bytesWritten, NULL); + WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + + IPropertyStorage_Release(pPropStgRead); + PropVariantClear(&pvread[0]); + PropVariantClear(&pvread[1]); + } + else + { + TRACE("Unable to read properties.\n"); + } + } + else + { + TRACE("Unable to get the IPropertyStorage.\n"); + } + CloseHandle(file); if (pszFileName == NULL || fRemember) This->isDirty = FALSE;

1 0

Yaron Shahrabani : view: Added Hebrew translation.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 0114fdc5546aa1842ed280fc0e3a8aa6531cd7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0114fdc5546aa1842ed280fc0… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Dec 5 13:52:44 2010 +0200 view: Added Hebrew translation. --- programs/view/He.rc | 76 +++++++++++++++++++++++++++++++++++++++++++++ programs/view/Makefile.in | 1 + 2 files changed, 77 insertions(+), 0 deletions(-) diff --git a/programs/view/He.rc b/programs/view/He.rc new file mode 100644 index 0000000..d630e75 --- /dev/null +++ b/programs/view/He.rc @@ -0,0 +1,76 @@ +/* + * View + * Hebrew Language Support + * + * Copyright 1998 Douglas Ridgway + * Copyright 2003 Marcelo Duarte + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* + * + * Menu + * + */ + +VIEW MENU +BEGIN + POPUP "&קובץ" + BEGIN + MENUITEM "&פתיחה", IDM_OPEN + MENUITEM "י&ציאה", IDM_EXIT + END + POPUP "ה&זחה" + BEGIN + MENUITEM "ה&תאמה לחלון", IDM_SET_EXT_TO_WIN + MENUITEM SEPARATOR + MENUITEM "&שמאלה", IDM_LEFT + MENUITEM "&ימינה", IDM_RIGHT + MENUITEM "למ&עלה", IDM_UP + MENUITEM "למ&טה", IDM_DOWN + END +END + + +/* + * + * Accelerator + * + */ + +VIEW ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +/* + * + * String Table + * + */ + +STRINGTABLE +BEGIN + IDS_DESCRIPTION "מציג קובצי על רגיל" +END diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index 6fa4acf..7583325 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ Eo.rc \ Es.rc \ Fr.rc \ + He.rc \ It.rc \ Ja.rc \ Ko.rc \

1 0

Michael Stefaniuc : wbemprox: Use an iface instead of a vtbl pointer in wbem_locator.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: e75635a7385d4740c6cdbe7ba4ffe3871065a5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75635a7385d4740c6cdbe7ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:15:04 2010 +0100 wbemprox: Use an iface instead of a vtbl pointer in wbem_locator. --- dlls/wbemprox/wbemlocator.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index ad6a75d..a1dd5a1 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); typedef struct { - const IWbemLocatorVtbl *vtbl; + IWbemLocator IWbemLocator_iface; LONG refs; } wbem_locator; static inline wbem_locator *impl_from_IWbemLocator( IWbemLocator *iface ) { - return (wbem_locator *)((char *)iface - FIELD_OFFSET( wbem_locator, vtbl )); + return CONTAINING_RECORD(iface, wbem_locator, IWbemLocator_iface); } static ULONG WINAPI wbem_locator_AddRef( @@ -120,10 +120,10 @@ HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj ) wl = HeapAlloc( GetProcessHeap(), 0, sizeof(*wl) ); if (!wl) return E_OUTOFMEMORY; - wl->vtbl = &wbem_locator_vtbl; + wl->IWbemLocator_iface.lpVtbl = &wbem_locator_vtbl; wl->refs = 1; - *ppObj = &wl->vtbl; + *ppObj = &wl->IWbemLocator_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : dsound: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: d2e90cddfdbbdf46e64c7c2bf66902025885fbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e90cddfdbbdf46e64c7c2bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:16:07 2010 +0100 dsound: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/dsound/dsound_main.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 8d02e7f..5d4fb24 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -506,15 +506,20 @@ DirectSoundCaptureEnumerateW( typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; REFCLSID rclsid; FnCreateInstance pfnCreateInstance; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); if (ppobj == NULL) return E_POINTER; @@ -546,7 +551,7 @@ static HRESULT WINAPI DSCF_CreateInstance( REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p, %p, %s, %p)\n", This, pOuter, debugstr_guid(riid), ppobj); if (pOuter) @@ -562,7 +567,7 @@ static HRESULT WINAPI DSCF_CreateInstance( static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p, %d) stub!\n", This, dolock); return S_OK; } @@ -576,13 +581,13 @@ static const IClassFactoryVtbl DSCF_Vtbl = { }; static IClassFactoryImpl DSOUND_CF[] = { - { &DSCF_Vtbl, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create }, - { &DSCF_Vtbl, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 }, - { &DSCF_Vtbl, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, - { &DSCF_Vtbl, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, - { &DSCF_Vtbl, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, - { &DSCF_Vtbl, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, - { NULL, NULL, NULL } + { { &DSCF_Vtbl }, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create }, + { { &DSCF_Vtbl }, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, + { { &DSCF_Vtbl }, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, + { { NULL }, NULL, NULL } }; /******************************************************************************* @@ -622,7 +627,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) while (NULL != DSOUND_CF[i].rclsid) { if (IsEqualGUID(rclsid, DSOUND_CF[i].rclsid)) { - DSCF_AddRef((IClassFactory*) &DSOUND_CF[i]); + DSCF_AddRef(&DSOUND_CF[i].IClassFactory_iface); *ppv = &DSOUND_CF[i]; return S_OK; }

1 0