wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

André Hentschel : msvcrt: Forward _setjmp on x86_64.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 28bdb8c58a3c07f7cc4867a74ff8b1a069cef514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bdb8c58a3c07f7cc4867a74… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 31 16:04:05 2010 +0100 msvcrt: Forward _setjmp on x86_64. --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index c04751c..5932338 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -265,7 +265,7 @@ @ cdecl _scalb( double long) msvcrt._scalb @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl _setmode(long long) msvcrt._setmode @ cdecl _setsystime(ptr long) msvcrt._setsystime @ cdecl _sleep(long) msvcrt._sleep diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f33a064..3e0f68a 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -518,7 +518,7 @@ @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ stub _set_security_error_handler @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index d4b05b0..851c4a3 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -514,7 +514,7 @@ @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ stub _set_security_error_handler @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ea40a8e..63d8f14 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -934,7 +934,7 @@ @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 578e6fb..3e8f0bf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -920,7 +920,7 @@ @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 64764bd..dbbd764 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -771,7 +771,7 @@ @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 __seh_longjmp_unwind@4(ptr) msvcrt._seh_longjmp_unwind @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmbcp(long) msvcrt._setmbcp @ cdecl _setmode(long long) msvcrt._setmode diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index da49007..9fa8f44 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -860,7 +860,7 @@ @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 84fafd3..c1b3077 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -488,7 +488,7 @@ @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp

1 0

Marcus Meissner : mmdevapi: Fixed buffer size passed to RegEnumKeyExW.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: acefa93cd64af42d517422ca088206c8de5dcd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acefa93cd64af42d517422ca0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 31 15:15:58 2010 +0100 mmdevapi: Fixed buffer size passed to RegEnumKeyExW. --- dlls/mmdevapi/devenum.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e53566a..d375de9 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -950,7 +950,7 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DWORD len; PROPVARIANT pv = { VT_EMPTY }; - len = sizeof(guidvalue); + len = sizeof(guidvalue)/sizeof(guidvalue[0]); ret = RegEnumKeyExW(cur, i++, guidvalue, &len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) {

1 0

Marcus Meissner : crypt32: NULL ptr could leak into function (Coverity).
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: aa16c89b29a8ab0b53b31a2ccc8fa4e456918998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa16c89b29a8ab0b53b31a2cc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 31 12:00:22 2010 +0100 crypt32: NULL ptr could leak into function (Coverity). --- dlls/crypt32/encode.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 5d6affe..f10c92e 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4628,8 +4628,13 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, } SetLastError(NOERROR); - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG && pvEncoded) + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) { + if (!pvEncoded) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } *(BYTE **)pvEncoded = NULL; + } encodeFunc = CRYPT_GetBuiltinEncoder(dwCertEncodingType, lpszStructType); if (!encodeFunc) {

1 0

Nikolay Sivov : oleview: Fix a crash on null helpstring and name on library level.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: cd028045f18e2314540c9e4add0d4b0d54bc9157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd028045f18e2314540c9e4ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 31 15:46:50 2010 +0300 oleview: Fix a crash on null helpstring and name on library level. --- programs/oleview/typelib.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 7be31c9..2b69ec4 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1227,20 +1227,26 @@ static int PopulateTree(void) AddSpaces(tld, TAB_SIZE); wsprintfW(wszText, wszFormat2, pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum); AddToTLDataStrW(tld, wszText); - AddToTLDataStrW(tld, wszComa); - AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, TAB_SIZE); - AddToTLDataStrW(tld, wszHelpstring); - AddToTLDataStrW(tld, wszOpenBrackets2); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, bstrData); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, wszCloseBrackets2); + + if (bstrData) + { + /* helpstring is optional */ + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszNewLine); + AddSpaces(tld, TAB_SIZE); + AddToTLDataStrW(tld, wszHelpstring); + AddToTLDataStrW(tld, wszOpenBrackets2); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, bstrData); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, wszCloseBrackets2); + } + AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszCloseBrackets1); AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszLibrary); - AddToTLDataStrW(tld, bstrName); + if (bstrName) AddToTLDataStrW(tld, bstrName); AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszOpenBrackets3); AddToTLDataStrW(tld, wszNewLine);

1 0

Sven Baars : msvcr80: Fix the _ctime32/64_s spec entries.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 9e871539d1fee7f4d522a11f5f93a5bef199d678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e871539d1fee7f4d522a11f5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Dec 31 12:26:52 2010 +0100 msvcr80: Fix the _ctime32/64_s spec entries. --- dlls/msvcr80/msvcr80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index da36e24..ea40a8e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -399,9 +399,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ cdecl _ctime32_s(str ptr long) msvcrt._ctime32_s +@ cdecl _ctime32_s(str long ptr) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ cdecl _ctime64_s(str ptr long) msvcrt._ctime64_s +@ cdecl _ctime64_s(str long ptr) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l

1 0

Greg Geldorp : oledb32: Use correct 32/64-bit typedefs.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: f8e71a346c3321cc894fbf2760fb67145b6c50f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e71a346c3321cc894fbf276… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Dec 31 01:14:39 2010 +0100 oledb32: Use correct 32/64-bit typedefs. Paul Vriens did the hard stuff of figuring out that the typedefs in oledb.idl were not correct. --- dlls/msdaps/row_server.c | 42 +++--- dlls/msdaps/row_server.idl | 56 +++--- dlls/msdaps/usrmarshal.c | 22 ++-- dlls/oledb32/convert.c | 2 +- dlls/oledb32/tests/convert.c | 372 +++++++++++++++++++++--------------------- include/access.idl | 6 +- include/cmdbas.idl | 4 +- include/oledb.idl | 24 ++-- 8 files changed, 264 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8e71a346c3321cc894fb…

1 0

Michael Stefaniuc : comdlg32: Use ifaces instead of vtbl pointers in IShellBrowserImpl.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 65892b5be474a76af106dce863b9a9702a63f68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65892b5be474a76af106dce86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:13:44 2010 +0100 comdlg32: Use ifaces instead of vtbl pointers in IShellBrowserImpl. --- dlls/comdlg32/filedlgbrowser.c | 89 ++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65892b5be474a76af106d…

1 0

Michael Stefaniuc : comdlg32: Pass an object instead of an iface to a helper function.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 8e999df0c1e6b887399987c39a15024f32782ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e999df0c1e6b887399987c39… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:12:19 2010 +0100 comdlg32: Pass an object instead of an iface to a helper function. --- dlls/comdlg32/filedlgbrowser.c | 62 +++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 078001e..439d2a9 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -72,12 +72,6 @@ static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; static const ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl; static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl; -/************************************************************************** -* Local Prototypes -*/ - -static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, const IShellView *ppshv); - /* * Helper functions */ @@ -805,6 +799,32 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl } /************************************************************************** +* IShellBrowserImpl_OnSelChange +*/ +static HRESULT IShellBrowserImpl_OnSelChange(IShellBrowserImpl *This, const IShellView *ppshv) +{ + FileOpenDlgInfos *fodInfos; + + fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + TRACE("(%p do=%p view=%p)\n", This, fodInfos->Shell.FOIDataObject, fodInfos->Shell.FOIShellView); + + /* release old selections */ + if (fodInfos->Shell.FOIDataObject) + IDataObject_Release(fodInfos->Shell.FOIDataObject); + + /* get a new DataObject from the ShellView */ + if(FAILED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView, SVGIO_SELECTION, + &IID_IDataObject, (void**)&fodInfos->Shell.FOIDataObject))) + return E_FAIL; + + FILEDLG95_FILENAME_FillFromSelection(This->hwndOwner); + + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); + return S_OK; +} + +/************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_OnStateChange */ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *iface, @@ -838,7 +858,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBr } break; case CDBOSC_SELCHANGE: - return IShellBrowserImpl_ICommDlgBrowser_OnSelChange(iface,ppshv); + return IShellBrowserImpl_OnSelChange(This, ppshv); case CDBOSC_RENAME: /* nothing to do */ break; @@ -938,34 +958,6 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr } -/************************************************************************** -* IShellBrowserImpl_ICommDlgBrowser_OnSelChange -*/ -static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, const IShellView *ppshv) -{ - FileOpenDlgInfos *fodInfos; - - IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); - - fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); - TRACE("(%p do=%p view=%p)\n", This, fodInfos->Shell.FOIDataObject, fodInfos->Shell.FOIShellView); - - /* release old selections */ - if (fodInfos->Shell.FOIDataObject) - IDataObject_Release(fodInfos->Shell.FOIDataObject); - - /* get a new DataObject from the ShellView */ - if(FAILED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView, SVGIO_SELECTION, - &IID_IDataObject, (LPVOID*)&fodInfos->Shell.FOIDataObject))) - return E_FAIL; - - FILEDLG95_FILENAME_FillFromSelection(This->hwndOwner); - - if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) - SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE); - return S_OK; -} - static const ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl = { /* IUnknown */

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IUnknown iface.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: cc43c46fd5cfc50bfd2c5de79a038a0f0c42353f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc43c46fd5cfc50bfd2c5de79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:10:43 2010 +0100 mshtml: COM cleanup for the IUnknown iface. --- dlls/mshtml/dispex.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index cd32a74..b360442 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -59,13 +59,11 @@ typedef struct { typedef struct { DispatchEx dispex; - const IUnknownVtbl *lpIUnknownVtbl; + IUnknown IUnknown_iface; DispatchEx *obj; func_info_t *info; } func_disp_t; -#define FUNCUNKNOWN(x) ((IUnknown*) &(x)->lpIUnknownVtbl) - struct dispex_dynamic_data_t { DWORD buf_size; DWORD prop_cnt; @@ -488,15 +486,18 @@ static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, return hres; } -#define FUNCTION_THIS(iface) DEFINE_THIS(func_disp_t, IUnknown, iface) +static inline func_disp_t *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, func_disp_t, IUnknown_iface); +} static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - func_disp_t *This = FUNCTION_THIS(iface); + func_disp_t *This = impl_from_IUnknown(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = FUNCUNKNOWN(This); + *ppv = &This->IUnknown_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -510,7 +511,7 @@ static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Function_AddRef(IUnknown *iface) { - func_disp_t *This = FUNCTION_THIS(iface); + func_disp_t *This = impl_from_IUnknown(iface); TRACE("(%p)\n", This); @@ -519,15 +520,13 @@ static ULONG WINAPI Function_AddRef(IUnknown *iface) static ULONG WINAPI Function_Release(IUnknown *iface) { - func_disp_t *This = FUNCTION_THIS(iface); + func_disp_t *This = impl_from_IUnknown(iface); TRACE("(%p)\n", This); return IDispatchEx_Release(&This->obj->IDispatchEx_iface); } -#undef FUNCTION_THIS - static const IUnknownVtbl FunctionUnkVtbl = { Function_QueryInterface, Function_AddRef, @@ -583,8 +582,8 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) if(!ret) return NULL; - ret->lpIUnknownVtbl = &FunctionUnkVtbl; - init_dispex(&ret->dispex, FUNCUNKNOWN(ret), &function_dispex); + ret->IUnknown_iface.lpVtbl = &FunctionUnkVtbl; + init_dispex(&ret->dispex, &ret->IUnknown_iface, &function_dispex); ret->obj = obj; ret->info = info;

1 0

Michael Stefaniuc : mshtml: Remove some stray #undef.
by Alexandre Julliard 31 Dec '10

31 Dec '10

Module: wine Branch: master Commit: 1412b471d04bbf8660593c52e4e6a9d1d5f938a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1412b471d04bbf8660593c52e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 31 11:09:55 2010 +0100 mshtml: Remove some stray #undef. --- dlls/mshtml/htmlframe.c | 2 -- dlls/mshtml/htmlobject.c | 2 -- dlls/mshtml/ipwindow.c | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 5877efb..5d34bd4 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -266,8 +266,6 @@ static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) return hres; } -#undef impl_from_HTMLDOMNode - static const NodeImplVtbl HTMLFrameElementImplVtbl = { HTMLFrameElement_QI, HTMLFrameElement_destructor, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 3c28352..dce6c8c 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -466,8 +466,6 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); } -#undef impl_from_HTMLDOMNode - static const NodeImplVtbl HTMLObjectElementImplVtbl = { HTMLObjectElement_QI, HTMLObjectElement_destructor, diff --git a/dlls/mshtml/ipwindow.c b/dlls/mshtml/ipwindow.c index eb81b8e..bce01eb 100644 --- a/dlls/mshtml/ipwindow.c +++ b/dlls/mshtml/ipwindow.c @@ -188,8 +188,6 @@ static HRESULT WINAPI InPlaceFrame_TranslateAccelerator(IOleInPlaceFrame *iface, return E_NOTIMPL; } -#undef impl_from_IOleInPlaceFrame - static const IOleInPlaceFrameVtbl OleInPlaceFrameVtbl = { InPlaceFrame_QueryInterface, InPlaceFrame_AddRef,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010