March 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DVolumeTexture9Impl_QueryInterface ().
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 8db93e2a551d973f79ece1faa9cea29e5caa3984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db93e2a551d973f79ece1faa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:51 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DVolumeTexture9Impl_QueryInterface(). --- dlls/d3d9/volumetexture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index d6d625b..03a467f 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -32,20 +32,20 @@ static inline IDirect3DVolumeTexture9Impl *impl_from_IDirect3DVolumeTexture9(IDi static HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(IDirect3DVolumeTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DVolumeTexture9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DVolume9Impl_QueryInterface ().
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: ad0980c65541b9ab04e684b9615fdeb1465e0fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0980c65541b9ab04e684b96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:52 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DVolume9Impl_QueryInterface(). --- dlls/d3d9/volume.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 58e7827..7814b93 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -32,18 +32,18 @@ static inline IDirect3DVolume9Impl *impl_from_IDirect3DVolume9(IDirect3DVolume9 static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(IDirect3DVolume9 *iface, REFIID riid, void **ppobj) { - IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DVolume9)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolume9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DVolume9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : wined3d: Recognise AMD HD 6770M and HD 6750M with closed drivers.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 426535a7dd35aae347c586e721116a3d0fb55252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426535a7dd35aae347c586e72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 27 20:35:53 2012 +0200 wined3d: Recognise AMD HD 6770M and HD 6750M with closed drivers. --- dlls/wined3d/directx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e5be4ad..3ae0945 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1709,6 +1709,8 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in /* Northern Islands */ {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, + {"HD 6770M",CARD_AMD_RADEON_HD6600M}, + {"HD 6750M",CARD_AMD_RADEON_HD6600M}, {"HD 6630M",CARD_AMD_RADEON_HD6600M}, {"HD 6600M",CARD_AMD_RADEON_HD6600M}, {"HD 6600", CARD_AMD_RADEON_HD6600},

1 0

Bruno Jesus : kernel32/tests: Show that ini cache must not be used if file no longer exists.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: a4e3268886c0dc719ef2882ce9830195fbb5ca08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e3268886c0dc719ef2882ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 28 02:26:42 2012 -0300 kernel32/tests: Show that ini cache must not be used if file no longer exists. --- dlls/kernel32/tests/profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 44a7927..745f3b5 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -500,6 +500,13 @@ static void test_profile_refresh(void) /* This also deletes the file */ CloseHandle(h); + + /* Cache must be invalidated if file no longer exists and default must be returned */ + SetLastError(0xdeadbeef); + res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); + todo_wine ok( res == 421 || + broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "Got %d instead of 421\n", res); } static void create_test_file(LPCSTR name, LPCSTR data, DWORD size)

1 0

Bruno Jesus : kernel32: Avoid ini cache if file does not exist anymore.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 40f0145d002404ca75c3f998437df1556df45677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f0145d002404ca75c3f9984… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 28 02:30:27 2012 -0300 kernel32: Avoid ini cache if file does not exist anymore. --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 89b96a1..3d00c29 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -817,10 +817,10 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); + return TRUE; } else TRACE("(%s): already opened, not yet created (mru=%d)\n", debugstr_w(buffer), i); - return TRUE; } } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 745f3b5..211d0c6 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -504,7 +504,7 @@ static void test_profile_refresh(void) /* Cache must be invalidated if file no longer exists and default must be returned */ SetLastError(0xdeadbeef); res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); - todo_wine ok( res == 421 || + ok( res == 421 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 421\n", res); }

1 0

Michael Stefaniuc : riched20: Avoid a forward declaration of a vtbl.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 6f299c5d76bcece865d46fafae288443c89ce902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f299c5d76bcece865d46fafa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:31:45 2012 +0200 riched20: Avoid a forward declaration of a vtbl. --- dlls/riched20/txtsrv.c | 84 +++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index a2fe8dc..25b3283 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -62,49 +62,6 @@ typedef struct ITextServicesImpl { char spare[256]; } ITextServicesImpl; -static const ITextServicesVtbl textservices_Vtbl; - -/****************************************************************** - * CreateTextServices (RICHED20.4) - */ -HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, - ITextHost * pITextHost, - IUnknown **ppUnk) -{ - ITextServicesImpl *ITextImpl; - HRESULT hres; - TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); - if (pITextHost == NULL) - return E_POINTER; - - ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); - if (ITextImpl == NULL) - return E_OUTOFMEMORY; - InitializeCriticalSection(&ITextImpl->csTxtSrv); - ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); - ITextImpl->ref = 1; - ITextHost_AddRef(pITextHost); - ITextImpl->pMyHost = pITextHost; - ITextImpl->ITextServices_iface.lpVtbl = &textservices_Vtbl; - ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); - ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat.left = 0; - ITextImpl->editor->rcFormat.top = 0; - ITextImpl->editor->rcFormat.right = 0; - ITextImpl->editor->rcFormat.bottom = 0; - - ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); - - if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } - - *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; - return S_OK; -} - static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) { return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); @@ -370,7 +327,7 @@ DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) -static const ITextServicesVtbl textservices_Vtbl = +static const ITextServicesVtbl textservices_vtbl = { fnTextSrv_QueryInterface, fnTextSrv_AddRef, @@ -394,3 +351,42 @@ static const ITextServicesVtbl textservices_Vtbl = THISCALL(fnTextSrv_OnTxPropertyBitsChange), THISCALL(fnTextSrv_TxGetCachedSize) }; + +/****************************************************************** + * CreateTextServices (RICHED20.4) + */ +HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, IUnknown **ppUnk) +{ + ITextServicesImpl *ITextImpl; + HRESULT hres; + TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); + if (pITextHost == NULL) + return E_POINTER; + + ITextImpl = CoTaskMemAlloc(sizeof(*ITextImpl)); + if (ITextImpl == NULL) + return E_OUTOFMEMORY; + InitializeCriticalSection(&ITextImpl->csTxtSrv); + ITextImpl->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); + ITextImpl->ref = 1; + ITextHost_AddRef(pITextHost); + ITextImpl->pMyHost = pITextHost; + ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; + ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); + ITextImpl->editor->exStyleFlags = 0; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; + + ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); + + if (pUnkOuter) + { + FIXME("Support aggregation\n"); + return CLASS_E_NOAGGREGATION; + } + + *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; + return S_OK; +}

1 0

Michael Stefaniuc : riched20: Support COM aggregation in CreateTextServices ().
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 74c5d202a18b40a784a6464e2bde4727452b100b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5d202a18b40a784a6464e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:33:10 2012 +0200 riched20: Support COM aggregation in CreateTextServices(). --- dlls/riched20/txtsrv.c | 96 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 25b3283..e9cc5e1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -54,53 +54,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); typedef struct ITextServicesImpl { + IUnknown IUnknown_inner; ITextServices ITextServices_iface; - ITextHost *pMyHost; + IUnknown *outer_unk; LONG ref; + ITextHost *pMyHost; CRITICAL_SECTION csTxtSrv; ME_TextEditor *editor; char spare[256]; } ITextServicesImpl; -static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) +static inline ITextServicesImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); + return CONTAINING_RECORD(iface, ITextServicesImpl, IUnknown_inner); } -static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextServices)) - *ppv = This; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - TRACE ("-- Interface = %p\n", *ppv); - return S_OK; + ITextServicesImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppv = &This->IUnknown_inner; + else if IsEqualIID(riid, &IID_ITextServices) + *ppv = &This->ITextServices_iface; + else { + *ppv = NULL; + FIXME("Unknown interface: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - FIXME("Unknown interface: %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +static ULONG WINAPI ITextServicesImpl_AddRef(IUnknown *iface) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - DWORD ref = InterlockedIncrement(&This->ref); + ITextServicesImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); - TRACE("(%p/%p)->() AddRef from %d\n", This, iface, ref - 1); return ref; } -static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) { - ITextServicesImpl *This = impl_from_ITextServices(iface); - DWORD ref = InterlockedDecrement(&This->ref); + ITextServicesImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->() Release from %d\n", This, iface, ref + 1); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { @@ -112,6 +116,36 @@ static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) return ref; } +static const IUnknownVtbl textservices_inner_vtbl = +{ + ITextServicesImpl_QueryInterface, + ITextServicesImpl_AddRef, + ITextServicesImpl_Release +}; + +static inline ITextServicesImpl *impl_from_ITextServices(ITextServices *iface) +{ + return CONTAINING_RECORD(iface, ITextServicesImpl, ITextServices_iface); +} + +static HRESULT WINAPI fnTextSrv_QueryInterface(ITextServices *iface, REFIID riid, void **ppv) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI fnTextSrv_AddRef(ITextServices *iface) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) +{ + ITextServicesImpl *This = impl_from_ITextServices(iface); + return IUnknown_Release(This->outer_unk); +} + DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *plresult) { @@ -371,6 +405,7 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ITextImpl->ref = 1; ITextHost_AddRef(pITextHost); ITextImpl->pMyHost = pITextHost; + ITextImpl->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; ITextImpl->ITextServices_iface.lpVtbl = &textservices_vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; @@ -382,11 +417,10 @@ HRESULT WINAPI CreateTextServices(IUnknown *pUnkOuter, ITextHost *pITextHost, I ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter) - { - FIXME("Support aggregation\n"); - return CLASS_E_NOAGGREGATION; - } + ITextImpl->outer_unk = pUnkOuter; + else + ITextImpl->outer_unk = &ITextImpl->IUnknown_inner; - *ppUnk = (IUnknown *)&ITextImpl->ITextServices_iface; + *ppUnk = &ITextImpl->IUnknown_inner; return S_OK; }

1 0

Michael Stefaniuc : riched20/tests: Get the CreateTextServices() pointer only once.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 67389533bcb46f5281d074bd115d5278c39340e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67389533bcb46f5281d074bd1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 28 00:34:31 2012 +0200 riched20/tests: Get the CreateTextServices() pointer only once. --- dlls/riched20/tests/txtsrv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 8d126ea..e55f5ef 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -38,6 +38,7 @@ static HMODULE hmoduleRichEdit; static IID *pIID_ITextServices; static IID *pIID_ITextHost; static IID *pIID_ITextHost2; +static PCreateTextServices pCreateTextServices; static const char *debugstr_guid(REFIID riid) { @@ -620,7 +621,6 @@ static BOOL init_texthost(void) { IUnknown *init; HRESULT result; - PCreateTextServices pCreateTextServices; dummyTextHost = CoTaskMemAlloc(sizeof(*dummyTextHost)); if (dummyTextHost == NULL) { @@ -633,7 +633,6 @@ static BOOL init_texthost(void) /* MSDN states that an IUnknown object is returned by CreateTextServices which is then queried to obtain a ITextServices object. */ - pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); result = (*pCreateTextServices)(NULL, &dummyTextHost->ITextHost_iface, &init); ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { @@ -825,6 +824,8 @@ START_TEST( txtsrv ) pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices"); pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost"); pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2"); + pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); + test_IIDs(); if (init_texthost())

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to define locale_facet RTTI base descriptor.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 1328da18151f83b98b84d0fa1e70f79d08450a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1328da18151f83b98b84d0fa1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:41:05 2012 +0200 msvcp90: Use DEFINE_RTTI_DATA to define locale_facet RTTI base descriptor. --- dlls/msvcp90/locale.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f667d91..d2e7798 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -182,9 +182,7 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi return this; } -const vtable_ptr MSVCP_locale_facet_vtable[] = { - (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) -}; +extern const vtable_ptr MSVCP_locale_facet_vtable; /* ??0id(a)locale@std@@QAE(a)I@Z */ /* ??0id(a)locale@std@@QEAA(a)_K@Z */ @@ -240,7 +238,7 @@ DEFINE_THISCALL_WRAPPER(locale_facet_ctor, 4) locale_facet* __thiscall locale_facet_ctor(locale_facet *this) { TRACE("(%p)\n", this); - this->vtable = MSVCP_locale_facet_vtable; + this->vtable = &MSVCP_locale_facet_vtable; this->refs = 0; return this; } @@ -251,7 +249,7 @@ DEFINE_THISCALL_WRAPPER(locale_facet_ctor_refs, 8) locale_facet* __thiscall locale_facet_ctor_refs(locale_facet *this, MSVCP_size_t refs) { TRACE("(%p %lu)\n", this, refs); - this->vtable = MSVCP_locale_facet_vtable; + this->vtable = &MSVCP_locale_facet_vtable; this->refs = refs; return this; } @@ -666,12 +664,6 @@ _Timevec*__thiscall _Locinfo__Gettnames(const _Locinfo *this, _Timevec *ret) return ret; } -static const type_info locale_facet_type_info = { - MSVCP_locale_facet_vtable, - NULL, - ".?AVfacet(a)locale@std@@" -}; - /* ?id@?$collate(a)D@std@@2V0locale(a)2@A */ locale_id collate_char_id = {0}; @@ -4127,13 +4119,7 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } -static const rtti_base_descriptor locale_facet_rtti_base_descriptor = { - &locale_facet_type_info, - 0, - { 0, -1, 0}, - 64 -}; - +DEFINE_RTTI_DATA(locale_facet, 0, 0, NULL, NULL, NULL, ".?AVfacet(a)locale@std@@"); DEFINE_RTTI_DATA(collate_char, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate(a)D@std@@"); DEFINE_RTTI_DATA(collate_wchar, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate(a)_W@std@@"); DEFINE_RTTI_DATA(collate_short, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate(a)G@std@@"); @@ -4151,6 +4137,7 @@ DEFINE_RTTI_DATA(num_get_short, 0, 1, &locale_facet_rtti_base_descriptor, NULL, #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(locale_facet, ""); __ASM_VTABLE(collate_char, VTABLE_ADD_FUNC(collate_char_do_compare) VTABLE_ADD_FUNC(collate_char_do_transform)

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to initialize exception RTTI data.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d18b406b5647f102fe83d80f369c129476f72154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18b406b5647f102fe83d80f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:41:39 2012 +0200 msvcp90: Use DEFINE_RTTI_DATA to initialize exception RTTI data. --- dlls/msvcp90/exception.c | 48 +++++++++++++++++++++++------------------- dlls/msvcp90/msvcp90.h | 1 - dlls/msvcp90/msvcp90_main.c | 1 - 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 5eeca1d..040c274 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -61,6 +61,7 @@ typedef struct __cxx_exception_type void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ +extern const vtable_ptr MSVCP_exception_vtable; extern const vtable_ptr MSVCP_bad_alloc_vtable; extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; @@ -68,19 +69,12 @@ extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; extern const vtable_ptr MSVCP_runtime_error_vtable; -/* exception class data */ -static type_info exception_type_info = { - NULL, /* set by set_exception_vtable */ - NULL, - ".?AVexception(a)std@@" -}; - DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name) { TRACE("(%p %s)\n", this, *name); - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; if(*name) { unsigned int name_len = strlen(*name) + 1; this->name = malloc(name_len); @@ -99,7 +93,7 @@ exception* __thiscall MSVCP_exception_copy_ctor(exception *this, const exception TRACE("(%p,%p)\n", this, rhs); if(!rhs->do_free) { - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; this->name = rhs->name; this->do_free = FALSE; } else @@ -112,17 +106,32 @@ DEFINE_THISCALL_WRAPPER(MSVCP_exception_dtor,4) void __thiscall MSVCP_exception_dtor(exception *this) { TRACE("(%p)\n", this); - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; if(this->do_free) free(this->name); } -static const rtti_base_descriptor exception_rtti_base_descriptor = { - &exception_type_info, - 0, - { 0, -1, 0 }, - 0 -}; +DEFINE_THISCALL_WRAPPER(MSVCP_exception_vector_dtor, 8) +void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_exception_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_exception_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_RTTI_DATA(exception, 0, 0, NULL, NULL, NULL, ".?AVexception(a)std@@"); static const cxx_type_info exception_cxx_type_info = { 0, @@ -148,12 +157,6 @@ static const cxx_exception_type exception_cxx_type = { &exception_cxx_type_table }; -void set_exception_vtable(void) -{ - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); - exception_type_info.vtable = (void*)GetProcAddress(hmod, "??_7exception@@6B@"); -} - /* bad_alloc class data */ typedef exception bad_alloc; @@ -591,6 +594,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(logic_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); __ASM_VTABLE(length_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a57eedf..f59efa6 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -166,7 +166,6 @@ typedef enum __exception_type { EXCEPTION_RUNTIME_ERROR } exception_type; void throw_exception(exception_type, const char *); -void set_exception_vtable(void); /* rtti */ typedef struct __type_info diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index fa9513f..6a1d4d2 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -89,7 +89,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); - set_exception_vtable(); init_lockit(); break; case DLL_PROCESS_DETACH:

1 0