December 2010 - Wine-Commits

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

Dec. 5, 2010

Module: wine Branch: master Commit: ecd140cfa37df28981486bb5db4ffd0fd0e897e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd140cfa37df28981486bb5d… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Dec 5 14:02:54 2010 +0200 sane: Added Hebrew translation. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_He.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 30ae8b6..6750413 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ sane_Es.rc \ sane_Fi.rc \ sane_Fr.rc \ + sane_He.rc \ sane_Hu.rc \ sane_It.rc \ sane_Ja.rc \ diff --git a/dlls/sane.ds/sane_He.rc b/dlls/sane.ds/sane_He.rc new file mode 100644 index 0000000..a7003f2 --- /dev/null +++ b/dlls/sane.ds/sane_He.rc @@ -0,0 +1,46 @@ +/* + * Hebrew resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * 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 + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "סריקה" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "מתבצעת סריקה... נא להמתין",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE +{ + 0 "" + 1 "פיקסלים" + 2 "בתים" + 3 "מ״מ" + 4 "נק׳ לאינטש" + 5 "%" + 6 "מ״ש" +}

1 0

Alexander Puzankov : winmm: Fixed boundary condition in mmioOpen file name parsing.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 4431c32c91206040d59d3eb82a971245594d1243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4431c32c91206040d59d3eb82… Author: Alexander Puzankov <alxpnv(a)gmail.com> Date: Sun Dec 5 17:24:59 2010 +0300 winmm: Fixed boundary condition in mmioOpen file name parsing. --- dlls/winmm/mmio.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 2e414ba..6ac295e 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -399,13 +399,13 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) } else { /* Find the first '.' before '+' */ extStart = extEnd - 1; - while (*extStart != '.') { - if (extStart == szFileName) { - ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); - return ret; - } + while (extStart >= szFileName && *extStart != '.') { extStart--; } + if (extStart < szFileName) { + ERR("No extension in szFileName: %s\n", debugstr_a(szFileName)); + return ret; + } } if (extEnd - extStart - 1 > 4)

1 0

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

Dec. 5, 2010

Module: wine Branch: master Commit: 751a4fe945843edd0e257a1181a4d2fa2ce45a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=751a4fe945843edd0e257a118… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:16:17 2010 +0100 infosoft: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/infosoft/infosoft_main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 78c097e..a177dfd 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -60,14 +60,19 @@ typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); typedef struct { - const IClassFactoryVtbl *lpVtbl; - LPFNCREATEINSTANCE lpfnCI; + IClassFactory IClassFactory_iface; + LPFNCREATEINSTANCE lpfnCI; } CFImpl; +static inline CFImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, CFImpl, IClassFactory_iface); +} + static HRESULT WINAPI infosoftcf_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - CFImpl *This = (CFImpl *)iface; + CFImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%s)\n",This,debugstr_guid(riid)); @@ -97,7 +102,7 @@ static ULONG WINAPI infosoftcf_fnRelease(LPCLASSFACTORY iface) static HRESULT WINAPI infosoftcf_fnCreateInstance( LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) { - CFImpl *This = (CFImpl *)iface; + CFImpl *This = impl_from_IClassFactory(iface); TRACE("%p->(%p,%s,%p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObject); @@ -121,7 +126,7 @@ static const IClassFactoryVtbl infosoft_cfvt = infosoftcf_fnLockServer }; -static CFImpl wb_cf = { &infosoft_cfvt, wb_Constructor }; +static CFImpl wb_cf = { { &infosoft_cfvt }, wb_Constructor }; /*********************************************************************** * DllGetClassObject (INFOSOFT.@) @@ -137,7 +142,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) *ppv = NULL; if (IsEqualIID(rclsid, &CLSID_wb_Neutral)) - pcf = (IClassFactory*) &wb_cf; + pcf = &wb_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE;

1 0

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

Dec. 5, 2010

Module: wine Branch: master Commit: dcef7c3bb5ec23aa4b4466fce15f251d04275b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcef7c3bb5ec23aa4b4466fce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:15:50 2010 +0100 dpnet: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/dpnet/dpnet_main.c | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 34429ac..b08d9d3 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -64,39 +64,44 @@ HRESULT WINAPI DirectPlay8Create(REFGUID lpGUID, LPVOID *ppvInt, LPUNKNOWN punkO typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; - REFCLSID rclsid; - HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); + IClassFactory IClassFactory_iface; + LONG ref; + REFCLSID rclsid; + HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; } static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); /* static class, won't be freed */ return InterlockedDecrement(&This->ref); } static HRESULT WINAPI DICF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,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); return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); } static HRESULT WINAPI DICF_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; } @@ -110,13 +115,13 @@ static const IClassFactoryVtbl DICF_Vtbl = { }; static IClassFactoryImpl DPNET_CFS[] = { - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Client, DPNET_CreateDirectPlay8Client }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Server, DPNET_CreateDirectPlay8Server }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8LobbiedApplication, DPNET_CreateDirectPlay8LobbiedApp }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8ThreadPool, DPNET_CreateDirectPlay8ThreadPool}, - { NULL, 0, NULL, NULL } + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8Client, DPNET_CreateDirectPlay8Client }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8Server, DPNET_CreateDirectPlay8Server }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8LobbiedApplication, DPNET_CreateDirectPlay8LobbiedApp }, + { { &DICF_Vtbl }, 1, &CLSID_DirectPlay8ThreadPool, DPNET_CreateDirectPlay8ThreadPool}, + { { NULL }, 0, NULL, NULL } }; /*********************************************************************** @@ -144,7 +149,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ while (NULL != DPNET_CFS[i].rclsid) { if (IsEqualGUID(rclsid, DPNET_CFS[i].rclsid)) { - DICF_AddRef((IClassFactory*) &DPNET_CFS[i]); + DICF_AddRef(&DPNET_CFS[i].IClassFactory_iface); *ppv = &DPNET_CFS[i]; return S_OK; }

1 0

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

Dec. 5, 2010

Module: wine Branch: master Commit: e4094231a40f679b2317547b25d56eab7d48141d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4094231a40f679b2317547b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:16:55 2010 +0100 oleaut32: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/oleaut32/olefont.c | 19 ++++++++++++------- dlls/oleaut32/olepicture.c | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 31575ee..29ebb58 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2444,13 +2444,18 @@ static void OLEFontImpl_Destroy(OLEFontImpl* fontDesc) typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; + IClassFactory IClassFactory_iface; + LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI SFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; @@ -2458,12 +2463,12 @@ SFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static ULONG WINAPI SFCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI SFCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); /* static class, won't be freed */ return InterlockedDecrement(&This->ref); } @@ -2476,7 +2481,7 @@ static HRESULT WINAPI SFCF_CreateInstance( } static HRESULT WINAPI SFCF_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; } @@ -2488,6 +2493,6 @@ static const IClassFactoryVtbl SFCF_Vtbl = { SFCF_CreateInstance, SFCF_LockServer }; -static IClassFactoryImpl STDFONT_CF = {&SFCF_Vtbl, 1 }; +static IClassFactoryImpl STDFONT_CF = {{&SFCF_Vtbl}, 1 }; void _get_STDFONT_CF(LPVOID *ppv) { *ppv = &STDFONT_CF; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 62845ed..fbec73d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2379,13 +2379,18 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; + IClassFactory IClassFactory_iface; + LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI SPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; @@ -2393,12 +2398,12 @@ SPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static ULONG WINAPI SPCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI SPCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); /* static class, won't be freed */ return InterlockedDecrement(&This->ref); } @@ -2412,7 +2417,7 @@ static HRESULT WINAPI SPCF_CreateInstance( } static HRESULT WINAPI SPCF_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; } @@ -2424,6 +2429,6 @@ static const IClassFactoryVtbl SPCF_Vtbl = { SPCF_CreateInstance, SPCF_LockServer }; -static IClassFactoryImpl STDPIC_CF = {&SPCF_Vtbl, 1 }; +static IClassFactoryImpl STDPIC_CF = {{&SPCF_Vtbl}, 1 }; void _get_STDPIC_CF(LPVOID *ppv) { *ppv = &STDPIC_CF; }

1 0

Michael Stefaniuc : itss: Standardize the COM usage in itss.c.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 8333eaa9b782a59a73b4e6a2f19ebd427208e55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8333eaa9b782a59a73b4e6a2f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:16:28 2010 +0100 itss: Standardize the COM usage in itss.c. --- dlls/itss/itss.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 3ecab25..d21e6d2 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -67,14 +67,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * ITSS ClassFactory */ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) @@ -104,7 +109,7 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -140,9 +145,9 @@ static const IClassFactoryVtbl ITSSCF_Vtbl = ITSSCF_LockServer }; -static const IClassFactoryImpl ITStorage_factory = { &ITSSCF_Vtbl, ITSS_create }; -static const IClassFactoryImpl MSITStore_factory = { &ITSSCF_Vtbl, ITS_IParseDisplayName_create }; -static const IClassFactoryImpl ITSProtocol_factory = { &ITSSCF_Vtbl, ITSProtocol_create }; +static const IClassFactoryImpl ITStorage_factory = { { &ITSSCF_Vtbl }, ITSS_create }; +static const IClassFactoryImpl MSITStore_factory = { { &ITSSCF_Vtbl }, ITS_IParseDisplayName_create }; +static const IClassFactoryImpl ITSProtocol_factory = { { &ITSSCF_Vtbl }, ITSProtocol_create }; /*********************************************************************** * DllGetClassObject (ITSS.@) @@ -171,17 +176,22 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) /*****************************************************************************/ typedef struct { - const IITStorageVtbl *vtbl_IITStorage; + IITStorage IITStorage_iface; LONG ref; } ITStorageImpl; +static inline ITStorageImpl *impl_from_IITStorage(IITStorage *iface) +{ + return CONTAINING_RECORD(iface, ITStorageImpl, IITStorage_iface); +} + static HRESULT WINAPI ITStorageImpl_QueryInterface( IITStorage* iface, REFIID riid, void** ppvObject) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IITStorage)) { @@ -197,7 +207,7 @@ static HRESULT WINAPI ITStorageImpl_QueryInterface( static ULONG WINAPI ITStorageImpl_AddRef( IITStorage* iface) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); TRACE("%p\n", This); return InterlockedIncrement(&This->ref); } @@ -205,7 +215,7 @@ static ULONG WINAPI ITStorageImpl_AddRef( static ULONG WINAPI ITStorageImpl_Release( IITStorage* iface) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) { @@ -223,7 +233,7 @@ static HRESULT WINAPI ITStorageImpl_StgCreateDocfile( DWORD reserved, IStorage** ppstgOpen) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); TRACE("%p %s %u %u %p\n", This, debugstr_w(pwcsName), grfMode, reserved, ppstgOpen ); @@ -239,7 +249,7 @@ static HRESULT WINAPI ITStorageImpl_StgCreateDocfileOnILockBytes( DWORD reserved, IStorage** ppstgOpen) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -248,7 +258,7 @@ static HRESULT WINAPI ITStorageImpl_StgIsStorageFile( IITStorage* iface, const WCHAR* pwcsName) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -257,7 +267,7 @@ static HRESULT WINAPI ITStorageImpl_StgIsStorageILockBytes( IITStorage* iface, ILockBytes* plkbyt) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -271,7 +281,7 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorage( DWORD reserved, IStorage** ppstgOpen) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); TRACE("%p %s %p %d %p\n", This, debugstr_w( pwcsName ), pstgPriority, grfMode, snbExclude ); @@ -289,7 +299,7 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorageOnILockBytes( DWORD reserved, IStorage** ppstgOpen) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -301,7 +311,7 @@ static HRESULT WINAPI ITStorageImpl_StgSetTimes( const FILETIME* patime, const FILETIME* pmtime) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -310,7 +320,7 @@ static HRESULT WINAPI ITStorageImpl_SetControlData( IITStorage* iface, PITS_Control_Data pControlData) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -319,7 +329,7 @@ static HRESULT WINAPI ITStorageImpl_DefaultControlData( IITStorage* iface, PITS_Control_Data* ppControlData) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -329,7 +339,7 @@ static HRESULT WINAPI ITStorageImpl_Compact( const WCHAR* pwcsName, ECompactionLev iLev) { - ITStorageImpl *This = (ITStorageImpl *)iface; + ITStorageImpl *This = impl_from_IITStorage(iface); FIXME("%p\n", This); return E_NOTIMPL; } @@ -359,7 +369,7 @@ static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj) return CLASS_E_NOAGGREGATION; its = HeapAlloc( GetProcessHeap(), 0, sizeof(ITStorageImpl) ); - its->vtbl_IITStorage = &ITStorageImpl_Vtbl; + its->IITStorage_iface.lpVtbl = &ITStorageImpl_Vtbl; its->ref = 1; TRACE("-> %p\n", its);

1 0

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

Dec. 5, 2010

Module: wine Branch: master Commit: f4f05ff9aca515487165cb675e520d3796b84202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f05ff9aca515487165cb675… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:14:58 2010 +0100 oleaut32: Use an iface instead of a vtbl pointer in TMarshalDispatchChannel. --- dlls/oleaut32/tmarshal.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9f0145d..440319f 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1526,13 +1526,18 @@ static HRESULT WINAPI ProxyIDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMembe typedef struct { - const IRpcChannelBufferVtbl *lpVtbl; + IRpcChannelBuffer IRpcChannelBuffer_iface; LONG refs; /* the IDispatch-derived interface we are handling */ - IID tmarshal_iid; + IID tmarshal_iid; IRpcChannelBuffer *pDelegateChannel; } TMarshalDispatchChannel; +static inline TMarshalDispatchChannel *impl_from_IRpcChannelBuffer(IRpcChannelBuffer *iface) +{ + return CONTAINING_RECORD(iface, TMarshalDispatchChannel, IRpcChannelBuffer_iface); +} + static HRESULT WINAPI TMarshalDispatchChannel_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; @@ -1547,13 +1552,13 @@ static HRESULT WINAPI TMarshalDispatchChannel_QueryInterface(LPRPCCHANNELBUFFER static ULONG WINAPI TMarshalDispatchChannel_AddRef(LPRPCCHANNELBUFFER iface) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); return InterlockedIncrement(&This->refs); } static ULONG WINAPI TMarshalDispatchChannel_Release(LPRPCCHANNELBUFFER iface) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); ULONG ref; ref = InterlockedDecrement(&This->refs); @@ -1567,7 +1572,7 @@ static ULONG WINAPI TMarshalDispatchChannel_Release(LPRPCCHANNELBUFFER iface) static HRESULT WINAPI TMarshalDispatchChannel_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); TRACE("(%p, %s)\n", olemsg, debugstr_guid(riid)); /* Note: we are pretending to invoke a method on the interface identified * by tmarshal_iid so that we can re-use the IDispatch proxy/stub code @@ -1577,28 +1582,28 @@ static HRESULT WINAPI TMarshalDispatchChannel_GetBuffer(LPRPCCHANNELBUFFER iface static HRESULT WINAPI TMarshalDispatchChannel_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); TRACE("(%p, %p)\n", olemsg, pstatus); return IRpcChannelBuffer_SendReceive(This->pDelegateChannel, olemsg, pstatus); } static HRESULT WINAPI TMarshalDispatchChannel_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); TRACE("(%p)\n", olemsg); return IRpcChannelBuffer_FreeBuffer(This->pDelegateChannel, olemsg); } static HRESULT WINAPI TMarshalDispatchChannel_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); return IRpcChannelBuffer_GetDestCtx(This->pDelegateChannel, pdwDestContext, ppvDestContext); } static HRESULT WINAPI TMarshalDispatchChannel_IsConnected(LPRPCCHANNELBUFFER iface) { - TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TMarshalDispatchChannel *This = impl_from_IRpcChannelBuffer(iface); TRACE("()\n"); return IRpcChannelBuffer_IsConnected(This->pDelegateChannel); } @@ -1623,13 +1628,13 @@ static HRESULT TMarshalDispatchChannel_Create( if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &TMarshalDispatchChannelVtbl; + This->IRpcChannelBuffer_iface.lpVtbl = &TMarshalDispatchChannelVtbl; This->refs = 1; IRpcChannelBuffer_AddRef(pDelegateChannel); This->pDelegateChannel = pDelegateChannel; This->tmarshal_iid = *tmarshal_riid; - *ppChannel = (IRpcChannelBuffer *)&This->lpVtbl; + *ppChannel = &This->IRpcChannelBuffer_iface; return S_OK; }

1 0

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

Dec. 5, 2010

Module: wine Branch: master Commit: 3ef0a523464c4f25b4d10c8b3a5569aed41f548e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef0a523464c4f25b4d10c8b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:15:26 2010 +0100 dplayx: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/dplayx/dpclassfactory.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 3da134d..d14169d 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -43,13 +43,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; + IClassFactory IClassFactory_iface; + LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); @@ -58,12 +63,12 @@ DP_and_DPL_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static ULONG WINAPI DP_and_DPL_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); /* static class (reference starts @ 1), won't ever be freed */ return InterlockedDecrement(&This->ref); } @@ -71,7 +76,7 @@ static ULONG WINAPI DP_and_DPL_Release(LPCLASSFACTORY iface) { static HRESULT WINAPI DP_and_DPL_CreateInstance( LPCLASSFACTORY iface,LPUNKNOWN pOuter,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); @@ -88,7 +93,7 @@ static HRESULT WINAPI DP_and_DPL_CreateInstance( } static HRESULT WINAPI DP_and_DPL_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; } @@ -101,7 +106,7 @@ static const IClassFactoryVtbl DP_and_DPL_Vtbl = { DP_and_DPL_LockServer }; -static IClassFactoryImpl DP_and_DPL_CF = {&DP_and_DPL_Vtbl, 1 }; +static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 }; /*******************************************************************************

1 0

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

Dec. 5, 2010

Module: wine Branch: master Commit: 425dd093095d3958d169ffc5d0d41f3fbddafe14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425dd093095d3958d169ffc5d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:13:41 2010 +0100 hlink: Use an iface instead of a vtbl pointer in HlinkBCImpl. --- dlls/hlink/browse_ctx.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 1e15c13..2496f9a 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -28,12 +28,17 @@ static const IHlinkBrowseContextVtbl hlvt; typedef struct { - const IHlinkBrowseContextVtbl *lpVtbl; + IHlinkBrowseContext IHlinkBrowseContext_iface; LONG ref; HLBWINFO* BrowseWindowInfo; IHlink* CurrentPage; } HlinkBCImpl; +static inline HlinkBCImpl *impl_from_IHlinkBrowseContext(IHlinkBrowseContext *iface) +{ + return CONTAINING_RECORD(iface, HlinkBCImpl, IHlinkBrowseContext_iface); +} + HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) @@ -51,7 +56,7 @@ HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, return E_OUTOFMEMORY; hl->ref = 1; - hl->lpVtbl = &hlvt; + hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; *ppv = hl; return S_OK; @@ -60,7 +65,7 @@ HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface, REFIID riid, LPVOID* ppvObj) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppvObj); if (IsEqualIID(riid, &IID_IUnknown) || @@ -77,7 +82,7 @@ static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface, static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -87,7 +92,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount + 1); @@ -106,7 +111,7 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); IMoniker *mon; IMoniker *composite; IRunningObjectTable *ROT; @@ -138,7 +143,7 @@ static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, { HRESULT r = S_OK; IRunningObjectTable *ROT; - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); FIXME("(%p)->(%i)\n", This, dwRegister); @@ -152,7 +157,7 @@ static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, HLBWINFO *phlbwi) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE("(%p)->(%p)\n", This, phlbwi); if(!phlbwi) @@ -168,7 +173,7 @@ static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, HLBWINFO *phlbwi) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE("(%p)->(%p)\n", This, phlbwi); if(!phlbwi) @@ -185,7 +190,7 @@ static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); FIXME("(%p)->(%p %s %s)\n", This, pimkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); @@ -203,7 +208,7 @@ static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface, DWORD grfHLNF, IMoniker* pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG *puHLID) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); @@ -236,7 +241,7 @@ static HRESULT WINAPI IHlinkBC_QueryHlink( IHlinkBrowseContext* iface, static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, ULONG uHLID, IHlink** ppihl) { - HlinkBCImpl *This = (HlinkBCImpl*)iface; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); TRACE("(%p)->(%x %p)\n", This, uHLID, ppihl);

1 0

Alexandre Julliard : wrc: Only allow 7-bit ASCII characters in wide string constants.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 577f202d25005aae5aa61c456d838e1d7bbb6bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=577f202d25005aae5aa61c456… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 5 16:33:13 2010 +0100 wrc: Only allow 7-bit ASCII characters in wide string constants. --- tools/wrc/parser.l | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 834c568..a1ef1cf 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -470,7 +470,11 @@ L\" { <tklstr>\\r addwchar('\r'); <tklstr>\\t addwchar('\t'); <tklstr>\\v addwchar('\v'); -<tklstr>\\. addwchar(yytext[1]); +<tklstr>\\. { + if (yytext[1] & 0x80) + parser_error("Invalid char %u in wide string", (unsigned char)yytext[1]); + addwchar(yytext[1]); + } <tklstr>\\\r\n addwchar(yytext[2]); line_number++; char_number = 1; <tklstr>\"\" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ <tklstr>\\\"\" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ @@ -478,7 +482,11 @@ L\" { <tklstr>[^\\\n\"]+ { char *yptr = yytext; while(*yptr) /* FIXME: codepage translation */ - addwchar(*yptr++ & 0xff); + { + if (*yptr & 0x80) + parser_error("Invalid char %u in wide string", (unsigned char)*yptr); + addwchar(*yptr++ & 0xff); + } } <tklstr>\n parser_error("Unterminated string");

1 0