August 2012 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ddrawex: Rename impl_from_dds4 to impl_from_IDirectDrawSurface4.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 9aba74a8f3ce9032feb54f1b28112a486aafd3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aba74a8f3ce9032feb54f1b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:13:12 2012 +0200 ddrawex: Rename impl_from_dds4 to impl_from_IDirectDrawSurface4. --- dlls/ddrawex/surface.c | 343 ++++++++++++++++++------------------------------ 1 files changed, 126 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9aba74a8f3ce9032feb54…

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDrawSurface4 iface.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 715372be62784ae0da72d64d55baa5112ae98683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715372be62784ae0da72d64d5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:16:57 2012 +0200 ddrawex: COM cleanup for the IDirectDrawSurface4 iface. --- dlls/ddrawex/ddrawex_private.h | 2 +- dlls/ddrawex/surface.c | 108 ++++++++++++++++++++-------------------- 2 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=715372be62784ae0da72d…

1 0

Michael Stefaniuc : ddrawex: Get rid of dds_get_inner().
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: f452057ef64fe2ae78b6c1135199ccb1a5a97345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f452057ef64fe2ae78b6c1135… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:07:56 2012 +0200 ddrawex: Get rid of dds_get_inner(). --- dlls/ddrawex/ddraw.c | 4 +++- dlls/ddrawex/ddrawex_private.h | 1 - dlls/ddrawex/surface.c | 7 ------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index ab3c731..6d2e400 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -459,9 +459,11 @@ static HRESULT WINAPI IDirectDraw4Impl_DuplicateSurface(IDirectDraw4 *iface, IDirectDrawSurface4 *src, IDirectDrawSurface4 **dst) { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); + IDirectDrawSurfaceImpl *surf = unsafe_impl_from_IDirectDrawSurface4(src); + FIXME("(%p)->(%p,%p). Create a wrapper surface\n", This, src, dst); - return IDirectDraw4_DuplicateSurface(This->parent, dds_get_inner(src), dst); + return IDirectDraw4_DuplicateSurface(This->parent, surf ? surf->parent : NULL, dst); } static HRESULT WINAPI IDirectDraw3Impl_DuplicateSurface(IDirectDraw3 *iface, diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 1db3412..e533743 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -91,7 +91,6 @@ typedef struct IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) DECLSPEC_HIDDEN; -IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer) DECLSPEC_HIDDEN; HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; #endif /* __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H */ diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 886e0f7..cb1e89d 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -1220,13 +1220,6 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) return outer; } -IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer) -{ - IDirectDrawSurfaceImpl *This = impl_from_dds4(outer); - if(This == NULL) return NULL; - return This->parent; -} - HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) { IDirectDrawSurfaceImpl *This = unsafe_impl_from_IDirectDrawSurface4(iface);

1 0

Michael Stefaniuc : ddrawex: Use unsafe_impl_from_IDirectDrawSurface4() for application provided ifaces.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: cb1248da3315c0a0b392234af9bc9854ebb0f7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1248da3315c0a0b392234af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:05:15 2012 +0200 ddrawex: Use unsafe_impl_from_IDirectDrawSurface4() for application provided ifaces. --- dlls/ddrawex/ddrawex_private.h | 1 + dlls/ddrawex/surface.c | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index b8d435a..1db3412 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -89,6 +89,7 @@ typedef struct } IDirectDrawSurfaceImpl; +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) DECLSPEC_HIDDEN; IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer) DECLSPEC_HIDDEN; HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 4e9ad96..886e0f7 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -161,7 +161,7 @@ IDirectDrawSurface4Impl_AddAttachedSurface(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *Attach_iface) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *attach = impl_from_dds4(Attach_iface); + IDirectDrawSurfaceImpl *attach = unsafe_impl_from_IDirectDrawSurface4(Attach_iface); TRACE("(%p)->(%p)\n", This, attach); return IDirectDrawSurface4_AddAttachedSurface(This->parent, attach->parent); } @@ -201,7 +201,7 @@ IDirectDrawSurface4Impl_Blt(IDirectDrawSurface4 *iface, DDBLTFX *DDBltFx) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *Src = impl_from_dds4(SrcSurface); + IDirectDrawSurfaceImpl *Src = unsafe_impl_from_IDirectDrawSurface4(SrcSurface); TRACE("(%p)->(%p,%p,%p,0x%08x,%p)\n", This, DestRect, Src, SrcRect, Flags, DDBltFx); return IDirectDrawSurface4_Blt(This->parent, DestRect, Src ? Src->parent : NULL, SrcRect, Flags, DDBltFx); @@ -245,7 +245,7 @@ IDirectDrawSurface4Impl_BltFast(IDirectDrawSurface4 *iface, DWORD trans) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *Src = impl_from_dds4(Source); + IDirectDrawSurfaceImpl *Src = unsafe_impl_from_IDirectDrawSurface4(Source); TRACE("(%p)->(%u,%u,%p,%p,0x%08x)\n", This, dstx, dsty, Src, rsrc, trans); return IDirectDrawSurface4_BltFast(This->parent, dstx, dsty, Src ? Src->parent : NULL, rsrc, trans); @@ -267,7 +267,7 @@ IDirectDrawSurface4Impl_DeleteAttachedSurface(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *Attach) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *Att = impl_from_dds4(Attach); + IDirectDrawSurfaceImpl *Att = unsafe_impl_from_IDirectDrawSurface4(Attach); TRACE("(%p)->(0x%08x,%p)\n", This, Flags, Att); return IDirectDrawSurface4_DeleteAttachedSurface(This->parent, Flags, Att ? Att->parent : NULL); @@ -321,10 +321,10 @@ struct enumsurfaces_thunk void *orig_ctx; }; -static HRESULT WINAPI -enumsurfaces_thunk_cb(IDirectDrawSurface4 *surf, DDSURFACEDESC2 *desc2, void *vctx) +static HRESULT WINAPI enumsurfaces_thunk_cb(IDirectDrawSurface4 *surf, DDSURFACEDESC2 *desc2, + void *vctx) { - IDirectDrawSurfaceImpl *This = impl_from_dds4(surf); + IDirectDrawSurfaceImpl *This = unsafe_impl_from_IDirectDrawSurface4(surf); struct enumsurfaces_thunk *ctx = vctx; DDSURFACEDESC desc; @@ -381,7 +381,7 @@ IDirectDrawSurface4Impl_Flip(IDirectDrawSurface4 *iface, DWORD Flags) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *Dest = impl_from_dds4(DestOverride); + IDirectDrawSurfaceImpl *Dest = unsafe_impl_from_IDirectDrawSurface4(DestOverride); TRACE("(%p)->(%p,0x%08x)\n", This, Dest, Flags); return IDirectDrawSurface4_Flip(This->parent, Dest ? Dest->parent : NULL, Flags); } @@ -858,7 +858,7 @@ IDirectDrawSurface4Impl_UpdateOverlay(IDirectDrawSurface4 *iface, LPDDOVERLAYFX FX) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *Dst = impl_from_dds4(DstSurface); + IDirectDrawSurfaceImpl *Dst = unsafe_impl_from_IDirectDrawSurface4(DstSurface); TRACE("(%p)->(%p,%p,%p,0x%08x,%p)\n", This, SrcRect, Dst, DstRect, Flags, FX); return IDirectDrawSurface4_UpdateOverlay(This->parent, SrcRect, Dst ? Dst->parent : NULL, DstRect, Flags, FX); @@ -898,7 +898,7 @@ IDirectDrawSurface4Impl_UpdateOverlayZOrder(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *DDSRef) { IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); - IDirectDrawSurfaceImpl *Ref = impl_from_dds4(DDSRef); + IDirectDrawSurfaceImpl *Ref = unsafe_impl_from_IDirectDrawSurface4(DDSRef); TRACE("(%p)->(0x%08x,%p)\n", This, Flags, Ref); return IDirectDrawSurface4_UpdateOverlayZOrder(This->parent, Flags, Ref ? Ref->parent : NULL); } @@ -1164,6 +1164,13 @@ static IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawS return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) +{ + if (!iface) return NULL; + if (iface->lpVtbl != &IDirectDrawSurface4_Vtbl) return NULL; + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface4_Vtbl); +} + /* dds_get_outer * * Given a surface from ddraw.dll it retrieves the pointer to the ddrawex.dll wrapper around it @@ -1222,7 +1229,7 @@ IDirectDrawSurface4 *dds_get_inner(IDirectDrawSurface4 *outer) HRESULT prepare_permanent_dc(IDirectDrawSurface4 *iface) { - IDirectDrawSurfaceImpl *This = impl_from_dds4(iface); + IDirectDrawSurfaceImpl *This = unsafe_impl_from_IDirectDrawSurface4(iface); HRESULT hr; This->permanent_dc = TRUE;

1 0

Michael Stefaniuc : d3d9/tests: Simplify some logic operations.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: b410bc3a1abb5f5153f713b0c88fb362e2b5a789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b410bc3a1abb5f5153f713b0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:21:16 2012 +0200 d3d9/tests: Simplify some logic operations. --- dlls/d3d9/tests/query.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 97d3508..834f5b3 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -108,21 +108,21 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type)); - supported = (hr == D3D_OK ? TRUE : FALSE); + supported = hr == D3D_OK; trace("query %s is %s\n", queryName(queries[i].type), supported ? "supported" : "not supported"); - ok(!(supported == TRUE && queries[i].foundSupported == FALSE), + ok(!supported || queries[i].foundSupported, "Query %s is supported on this system, but was not found supported before\n", queryName(queries[i].type)); - ok(!(supported == FALSE && queries[i].foundUnsupported == FALSE), + ok(supported || queries[i].foundUnsupported, "Query %s is not supported on this system, but was found to be supported on all other systems tested before\n", queryName(queries[i].type)); hr = IDirect3DDevice9_CreateQuery(pDevice, queries[i].type, &pQuery); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type)); - ok(!(supported && !pQuery), "Query %s was claimed to be supported, but can't be created\n", queryName(queries[i].type)); - ok(!(!supported && pQuery), "Query %s was claimed not to be supported, but can be created\n", queryName(queries[i].type)); + ok(!supported || pQuery, "Query %s was claimed to be supported, but can't be created\n", queryName(queries[i].type)); + ok(supported || !pQuery, "Query %s was claimed not to be supported, but can be created\n", queryName(queries[i].type)); if(pQuery) { IDirect3DQuery9_Release(pQuery);

1 0

Sergey Guralnik : comctl32: Correct values passed in MCN_SELECT/ MCN_SELCHANGE notifications.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: d54979e329647f5bf0f19de7f917129ae3e58564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54979e329647f5bf0f19de7f… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Fri Aug 17 10:24:12 2012 +0400 comctl32: Correct values passed in MCN_SELECT/MCN_SELCHANGE notifications. --- dlls/comctl32/monthcal.c | 17 +++++++++++++++-- dlls/comctl32/tests/monthcal.c | 7 +++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c5b6d91..f27eee3 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -185,7 +185,14 @@ static inline void MONTHCAL_NotifySelectionChange(const MONTHCAL_INFO *infoPtr) nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmsc.nmhdr.code = MCN_SELCHANGE; nmsc.stSelStart = infoPtr->minSel; - nmsc.stSelEnd = infoPtr->maxSel; + nmsc.stSelStart.wDayOfWeek = 0; + if(infoPtr->dwStyle & MCS_MULTISELECT){ + nmsc.stSelEnd = infoPtr->maxSel; + nmsc.stSelEnd.wDayOfWeek = 0; + } + else + nmsc.stSelEnd = st_null; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); } @@ -198,7 +205,13 @@ static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr) nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmsc.nmhdr.code = MCN_SELECT; nmsc.stSelStart = infoPtr->minSel; - nmsc.stSelEnd = infoPtr->maxSel; + nmsc.stSelStart.wDayOfWeek = 0; + if(infoPtr->dwStyle & MCS_MULTISELECT){ + nmsc.stSelEnd = infoPtr->maxSel; + nmsc.stSelEnd.wDayOfWeek = 0; + } + else + nmsc.stSelEnd = st_null; SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 7bba895..1fed831 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -502,19 +502,18 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP expect(st[0].wYear, nmchg->stSelStart.wYear); expect(st[0].wMonth, nmchg->stSelStart.wMonth); - todo_wine expect(0, nmchg->stSelStart.wDayOfWeek); + expect(0, nmchg->stSelStart.wDayOfWeek); expect(st[0].wDay, nmchg->stSelStart.wDay); if(is_multisel) { expect(st[1].wYear, nmchg->stSelEnd.wYear); expect(st[1].wMonth, nmchg->stSelEnd.wMonth); - todo_wine expect(0, nmchg->stSelEnd.wDayOfWeek); + expect(0, nmchg->stSelEnd.wDayOfWeek); expect(st[1].wDay, nmchg->stSelEnd.wDay); } else - todo_wine - ok(!(nmchg->stSelEnd.wYear | nmchg->stSelEnd.wMonth | + ok(!(nmchg->stSelEnd.wYear | nmchg->stSelEnd.wMonth | nmchg->stSelEnd.wDayOfWeek | nmchg->stSelEnd.wDay | nmchg->stSelEnd.wHour | nmchg->stSelEnd.wMinute | nmchg->stSelEnd.wSecond | nmchg->stSelEnd.wMilliseconds),

1 0

Michael Stefaniuc : advapi32/tests: Don't shadow some local variables.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: ccc4c35a7afbf11508f3ccc883fbb8e49c5927e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc4c35a7afbf11508f3ccc88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 17 16:22:01 2012 +0200 advapi32/tests: Don't shadow some local variables. --- dlls/advapi32/tests/security.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 291c99d..ba0750b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -65,7 +65,7 @@ typedef struct _OBJECT_BASIC_INFORMATION { LARGE_INTEGER CreateTime; } OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; -#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } +#define expect_eq(expr, value, type, format) { type ret_ = expr; ok((value) == ret_, #expr " expected " format " got " format "\n", (value), (ret_)); } static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); static BOOL (WINAPI *pAddAccessDeniedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); @@ -254,8 +254,6 @@ static void test_sid(void) for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { - PISID pisid; - r = AllocateAndInitializeSid( &refs[i].auth, 1,1,0,0,0,0,0,0,0, &psid ); ok( r, "failed to allocate sid\n" ); @@ -2431,15 +2429,15 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access, #define CHECK_SET_SECURITY(o,i,e) \ do{ \ - BOOL res; \ + BOOL res_; \ DWORD err; \ SetLastError( 0xdeadbeef ); \ - res = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \ + res_ = SetKernelObjectSecurity( o, i, SecurityDescriptor ); \ err = GetLastError(); \ if (e == ERROR_SUCCESS) \ - ok(res, "SetKernelObjectSecurity failed with %d\n", err); \ + ok(res_, "SetKernelObjectSecurity failed with %d\n", err); \ else \ - ok(!res && err == e, "SetKernelObjectSecurity should have failed " \ + ok(!res_ && err == e, "SetKernelObjectSecurity should have failed " \ "with %s, instead of %d\n", #e, err); \ }while(0)

1 0

Piotr Caban : msvcp60: Manually define virtual destructors in vtables.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 819b94b869343e09f7d67f25bcdd9b0ae7d315b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819b94b869343e09f7d67f25b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 17 11:25:48 2012 +0200 msvcp60: Manually define virtual destructors in vtables. --- dlls/msvcp60/cxx.h | 2 -- dlls/msvcp60/exception.c | 34 +++++++++------------------------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index cc3915c..f709d12 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -48,7 +48,6 @@ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ - "\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ funcs "\n\t.text") #else @@ -61,7 +60,6 @@ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ - "\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ funcs "\n\t.text") #endif /* _WIN64 */ diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index e85463d..ec8dfcd 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -465,14 +465,6 @@ length_error* __thiscall MSVCP_length_error_ctor_bstr(length_error *this, const return MSVCP_length_error_ctor(this, MSVCP_basic_string_char_c_str(str)); } -DEFINE_THISCALL_WRAPPER(MSVCP_length_error_vector_dtor, 8) -void* __thiscall MSVCP_length_error_vector_dtor( - length_error *this, unsigned int flags) -{ - TRACE("%p %x\n", this, flags); - return MSVCP_logic_error_vector_dtor(this, flags); -} - /* ??4length_error(a)std@@QAEAAV01(a)ABV01@@Z */ /* ??4length_error(a)std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_length_error_assign, 8) @@ -542,14 +534,6 @@ out_of_range* __thiscall MSVCP_out_of_range_ctor_bstr(out_of_range *this, const return MSVCP_out_of_range_ctor(this, MSVCP_basic_string_char_c_str(str)); } -DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_vector_dtor, 8) -void* __thiscall MSVCP_out_of_range_vector_dtor( - out_of_range *this, unsigned int flags) -{ - TRACE("%p %x\n", this, flags); - return MSVCP_logic_error_vector_dtor(this, flags); -} - /* ??4out_of_range(a)std@@QAEAAV01(a)ABV01@@Z */ /* ??4out_of_range(a)std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_assign, 8) @@ -608,14 +592,6 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_vector_dtor, 8) -void* __thiscall MSVCP_invalid_argument_vector_dtor( - invalid_argument *this, unsigned int flags) -{ - TRACE("%p %x\n", this, flags); - return MSVCP_logic_error_vector_dtor(this, flags); -} - DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument(a)std@@"); static const cxx_type_info invalid_argument_cxx_type_info = { @@ -731,26 +707,34 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_VTABLE(type_info,""); + __ASM_VTABLE(type_info, + VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); __ASM_VTABLE(exception, + VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCP_bad_alloc_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(logic_error, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(length_error, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(out_of_range, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(invalid_argument, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); __ASM_VTABLE(runtime_error, + VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); #ifndef __GNUC__

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: df4874079a73cd0edcb9cd7b949abf1019d434b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4874079a73cd0edcb9cd7b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 17 11:23:37 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp70/msvcp70.spec | 878 ++++++++++++++++---------------- dlls/msvcp71/msvcp71.spec | 1008 ++++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 1246 ++++++++++++++++++++++---------------------- 3 files changed, 1566 insertions(+), 1566 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df4874079a73cd0edcb9c…

1 0

Piotr Caban : msvcp90: Manually define virtual destructors in vtables.
by Alexandre Julliard Aug. 17, 2012

Aug. 17, 2012

Module: wine Branch: master Commit: 584a48a380f7980f1cad66bc435640630c850d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584a48a380f7980f1cad66bc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 17 11:25:35 2012 +0200 msvcp90: Manually define virtual destructors in vtables. --- dlls/msvcp90/cxx.h | 2 - dlls/msvcp90/exception.c | 59 ++++----- dlls/msvcp90/ios.c | 301 ++++++++++++++++++++-------------------------- dlls/msvcp90/locale.c | 131 +++++++++----------- 4 files changed, 216 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=584a48a380f7980f1cad6…

1 0