May 2011 - Wine-commits - list.winehq.org

Nicolas Le Cam : ole32/tests: Fix large integer overflow warnings.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cfe11f1875215e8f9a8b3bf4f7903b0a2cb4ecb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe11f1875215e8f9a8b3bf4f… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 02:46:02 2011 +0200 ole32/tests: Fix large integer overflow warnings. --- dlls/ole32/tests/hglobalstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b2a6ee9..769d5a1 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -175,7 +175,7 @@ static void test_streamonhglobal(IStream *pStream) ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; - ll.u.LowPart = -sizeof(data); + ll.u.LowPart = -(DWORD)sizeof(data); hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok_ole_success(hr, "IStream_Seek"); ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); @@ -190,7 +190,7 @@ static void test_streamonhglobal(IStream *pStream) ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; - ll.u.LowPart = -sizeof(data)-1; + ll.u.LowPart = -(DWORD)sizeof(data)-1; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart);

1 0

Nikolay Sivov : msxml3: A stub for MXXMLWriter class.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: a12d2d7233fdb570f2388f0c6fcae4cbb3e66cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12d2d7233fdb570f2388f0c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 30 11:42:29 2011 +0400 msxml3: A stub for MXXMLWriter class. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/factory.c | 8 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/mxwriter.c | 337 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 347 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a12d2d7233fdb570f2388…

1 0

Nikolay Sivov : msxml3: Add ISAXContentHandler stub for MXXMLWriter.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 387966c48a73e4bfe32959fe837bbdb76d7512f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387966c48a73e4bfe32959fe8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 30 15:18:03 2011 +0400 msxml3: Add ISAXContentHandler stub for MXXMLWriter. --- dlls/msxml3/mxwriter.c | 170 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 42 ++++++++++ 2 files changed, 212 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cb827b4..6cebf76 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _mxwriter { IMXWriter IMXWriter_iface; + ISAXContentHandler ISAXContentHandler_iface; + LONG ref; } mxwriter; @@ -49,6 +51,11 @@ static inline mxwriter *impl_from_IMXWriter(IMXWriter *iface) return CONTAINING_RECORD(iface, mxwriter, IMXWriter_iface); } +static inline mxwriter *impl_from_ISAXContentHandler(ISAXContentHandler *iface) +{ + return CONTAINING_RECORD(iface, mxwriter, ISAXContentHandler_iface); +} + static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, void **obj) { mxwriter *This = impl_from_IMXWriter( iface ); @@ -61,6 +68,10 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi { *obj = &This->IMXWriter_iface; } + else if ( IsEqualGUID( riid, &IID_ISAXContentHandler ) ) + { + *obj = &This->ISAXContentHandler_iface; + } else { ERR("interface %s not implemented\n", debugstr_guid(riid)); @@ -314,6 +325,164 @@ static const struct IMXWriterVtbl mxwriter_vtbl = mxwriter_flush }; +/*** ISAXContentHandler ***/ +static HRESULT WINAPI mxwriter_saxcontent_QueryInterface( + ISAXContentHandler *iface, + REFIID riid, + void **obj) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + return IMXWriter_QueryInterface(&This->IMXWriter_iface, riid, obj); +} + +static ULONG WINAPI mxwriter_saxcontent_AddRef(ISAXContentHandler *iface) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + return IMXWriter_AddRef(&This->IMXWriter_iface); +} + +static ULONG WINAPI mxwriter_saxcontent_Release(ISAXContentHandler *iface) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + return IMXWriter_Release(&This->IMXWriter_iface); +} + +static HRESULT WINAPI mxwriter_saxcontent_putDocumentLocator( + ISAXContentHandler *iface, + ISAXLocator *locator) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%p)\n", This, locator); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_startDocument(ISAXContentHandler *iface) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_endDocument(ISAXContentHandler *iface) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_startPrefixMapping( + ISAXContentHandler *iface, + const WCHAR *prefix, + int nprefix, + const WCHAR *uri, + int nuri) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s %s)\n", This, debugstr_wn(prefix, nprefix), debugstr_wn(uri, nuri)); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_endPrefixMapping( + ISAXContentHandler *iface, + const WCHAR *prefix, + int nprefix) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s)\n", This, debugstr_wn(prefix, nprefix)); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_startElement( + ISAXContentHandler *iface, + const WCHAR *namespaceUri, + int nnamespaceUri, + const WCHAR *local_name, + int nlocal_name, + const WCHAR *QName, + int nQName, + ISAXAttributes *attr) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), + debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_endElement( + ISAXContentHandler *iface, + const WCHAR *namespaceUri, + int nnamespaceUri, + const WCHAR * local_name, + int nlocal_name, + const WCHAR *QName, + int nQName) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), + debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_characters( + ISAXContentHandler *iface, + const WCHAR *chars, + int nchars) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_ignorableWhitespace( + ISAXContentHandler *iface, + const WCHAR *chars, + int nchars) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_processingInstruction( + ISAXContentHandler *iface, + const WCHAR *target, + int ntarget, + const WCHAR *data, + int ndata) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s %s)\n", This, debugstr_wn(target, ntarget), debugstr_wn(data, ndata)); + return E_NOTIMPL; +} + +static HRESULT WINAPI mxwriter_saxcontent_skippedEntity( + ISAXContentHandler *iface, + const WCHAR *name, + int nname) +{ + mxwriter *This = impl_from_ISAXContentHandler( iface ); + FIXME("(%p)->(%s)\n", This, debugstr_wn(name, nname)); + return E_NOTIMPL; +} + +static const struct ISAXContentHandlerVtbl mxwriter_saxcontent_vtbl = +{ + mxwriter_saxcontent_QueryInterface, + mxwriter_saxcontent_AddRef, + mxwriter_saxcontent_Release, + mxwriter_saxcontent_putDocumentLocator, + mxwriter_saxcontent_startDocument, + mxwriter_saxcontent_endDocument, + mxwriter_saxcontent_startPrefixMapping, + mxwriter_saxcontent_endPrefixMapping, + mxwriter_saxcontent_startElement, + mxwriter_saxcontent_endElement, + mxwriter_saxcontent_characters, + mxwriter_saxcontent_ignorableWhitespace, + mxwriter_saxcontent_processingInstruction, + mxwriter_saxcontent_skippedEntity +}; + HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) { mxwriter *This; @@ -327,6 +496,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) return E_OUTOFMEMORY; This->IMXWriter_iface.lpVtbl = &mxwriter_vtbl; + This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; *ppObj = &This->IMXWriter_iface; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 6480f07..f6c35b8 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,6 +29,14 @@ #include "wine/test.h" +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + typedef enum _CH { CH_ENDTEST, CH_PUTDOCUMENTLOCATOR, @@ -653,6 +661,39 @@ static void test_encoding(void) } } +static void test_mxwriter_contenthandler(void) +{ + ISAXContentHandler *handler; + IMXWriter *writer, *writer2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + if (hr != S_OK) + { + win_skip("MXXMLWriter not supported\n"); + return; + } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + EXPECT_REF(writer, 1); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&handler); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + EXPECT_REF(writer, 2); + EXPECT_REF(handler, 2); + + hr = ISAXContentHandler_QueryInterface(handler, &IID_IMXWriter, (void**)&writer2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(writer2 == writer, "got %p, expected %p\n", writer2, writer); + EXPECT_REF(writer, 3); + EXPECT_REF(writer2, 3); + IMXWriter_Release(writer2); + + ISAXContentHandler_Release(handler); + IMXWriter_Release(writer); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -674,6 +715,7 @@ START_TEST(saxreader) test_saxreader(); test_encoding(); + test_mxwriter_contenthandler(); CoUninitialize(); }

1 0

Alexandre Julliard : msvcrt: Export _aexit_rtn.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: d72da002064ad39a660acafa9885180704f5e260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72da002064ad39a660acafa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 1 11:42:30 2011 +0200 msvcrt: Export _aexit_rtn. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.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/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index d95f2a1..6985965 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -226,7 +226,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 3a9b2af..6370396 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -221,7 +221,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 344c6e1..bfa87e3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -330,7 +330,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc @ stub _aligned_msize diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 30dcc26..b84e586 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -322,7 +322,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc @ stub _aligned_msize diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8f0d675..7687f5c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -287,7 +287,7 @@ @ cdecl -arch=i386 _adj_fprem1() @ cdecl -arch=i386 _adj_fptan() @ extern -arch=i386 _adjust_fdiv MSVCRT__adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn @ cdecl _aligned_free(ptr) # stub _aligned_free_dbg @ cdecl _aligned_malloc(long long) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2d2540a..014d0eb 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -526,7 +526,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ stub _atodbl diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 7dd4dad..235e324 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -602,7 +602,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ stub _atodbl diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index be3b5ba..20be6e9 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -214,7 +214,7 @@ @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv -# extern _aexit_rtn +@ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ stub _atodbl

1 0

Alexandre Julliard : msvcrt: Implemented a few trivial math functions.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: abe0823b727ae498ecbb05adb468f2bb418b0645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe0823b727ae498ecbb05adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 1 12:52:22 2011 +0200 msvcrt: Implemented a few trivial math functions. --- dlls/msvcr100/msvcr100.spec | 6 ++-- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/math.c | 60 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/msvcrt.spec | 10 +++--- 5 files changed, 65 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5c95d98..3a157bb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -488,7 +488,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination -@ stub _abs64 +@ cdecl -ret64 _abs64(int64) msvcrt._abs64 @ cdecl _access(str long) msvcrt._access @ cdecl _access_s(str long) msvcrt._access_s @ extern _acmdln msvcrt._acmdln @@ -1049,9 +1049,9 @@ @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl -@ stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) msvcrt._rotl64 @ cdecl _rotr(long long) msvcrt._rotr -@ stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) msvcrt._rotr64 @ cdecl _scalb(double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bfa87e3..dc20b56 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -312,7 +312,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination -@ stub _abs64 +@ cdecl -ret64 _abs64(int64) msvcrt._abs64 @ cdecl _access(str long) msvcrt._access @ cdecl _access_s(str long) msvcrt._access_s @ extern _acmdln msvcrt._acmdln @@ -897,9 +897,9 @@ @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl -@ stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) msvcrt._rotl64 @ cdecl _rotr(long long) msvcrt._rotr -@ stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) msvcrt._rotr64 @ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b84e586..5e44d50 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -304,7 +304,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination -@ stub _abs64 +@ cdecl -ret64 _abs64(int64) msvcrt._abs64 @ cdecl _access(str long) msvcrt._access @ cdecl _access_s(str long) msvcrt._access_s @ extern _acmdln msvcrt._acmdln @@ -883,9 +883,9 @@ @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl -@ stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) msvcrt._rotl64 @ cdecl _rotr(long long) msvcrt._rotr -@ stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) msvcrt._rotr64 @ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3428398..9659f17 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -640,15 +640,6 @@ unsigned int CDECL _rotl(unsigned int num, int shift) } /********************************************************************* - * _logb (MSVCRT.@) - */ -double CDECL _logb(double num) -{ - if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return logb(num); -} - -/********************************************************************* * _lrotl (MSVCRT.@) */ MSVCRT_ulong CDECL MSVCRT__lrotl(MSVCRT_ulong num, int shift) @@ -676,6 +667,57 @@ unsigned int CDECL _rotr(unsigned int num, int shift) } /********************************************************************* + * _rotl64 (MSVCRT.@) + */ +unsigned __int64 CDECL _rotl64(unsigned __int64 num, int shift) +{ + shift &= 63; + return (num << shift) | (num >> (64-shift)); +} + +/********************************************************************* + * _rotr64 (MSVCRT.@) + */ +unsigned __int64 CDECL _rotr64(unsigned __int64 num, int shift) +{ + shift &= 63; + return (num >> shift) | (num << (64-shift)); +} + +/********************************************************************* + * abs (MSVCRT.@) + */ +int CDECL MSVCRT_abs( int n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * labs (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * _abs64 (MSVCRT.@) + */ +__int64 CDECL _abs64( __int64 n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * _logb (MSVCRT.@) + */ +double CDECL _logb(double num) +{ + if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM; + return logb(num); +} + +/********************************************************************* * _scalb (MSVCRT.@) */ double CDECL MSVCRT__scalb(double num, MSVCRT_long power) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7687f5c..104687b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -269,7 +269,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv @ cdecl _abnormal_termination() -# stub _abs64 +@ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) MSVCRT__access @ cdecl _access_s(str long) @ extern _acmdln MSVCRT__acmdln @@ -840,9 +840,9 @@ @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() @ cdecl _rotl(long long) -# stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) @ cdecl _rotr(long long) -# stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) @ cdecl -arch=i386 _safe_fdiv() @ cdecl -arch=i386 _safe_fdivr() @ cdecl -arch=i386 _safe_fprem() @@ -1210,7 +1210,7 @@ @ cdecl _y1(double) @ cdecl _yn(long double ) @ cdecl abort() MSVCRT_abort -@ cdecl abs(long) ntdll.abs +@ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=x86_64 acosf(float) MSVCRT_acosf @ cdecl asctime(ptr) MSVCRT_asctime @@ -1316,7 +1316,7 @@ @ cdecl iswupper(long) MSVCRT_iswupper @ cdecl iswxdigit(long) MSVCRT_iswxdigit @ cdecl isxdigit(long) MSVCRT_isxdigit -@ cdecl labs(long) ntdll.labs +@ cdecl labs(long) MSVCRT_labs @ cdecl ldexp( double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv

1 0

Alexandre Julliard : msvcrt: Add stubs for the 64-bit msvcirt entry points.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 9c76ed18b7642c7644b7a77419c317d7772f5c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c76ed18b7642c7644b7a7741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 1 20:01:23 2011 +0200 msvcrt: Add stubs for the 64-bit msvcirt entry points. --- dlls/msvcirt/msvcirt.spec | 1092 ++++++++++++++++++++++++++-------------- dlls/msvcrt20/msvcrt20.spec | 1187 +++++++++++++++++++++++++++---------------- dlls/msvcrt40/msvcrt40.spec | 1191 +++++++++++++++++++++++++++---------------- 3 files changed, 2241 insertions(+), 1229 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c76ed18b7642c7644b7a…

1 0

Eric Pouech : winedump: Correctly get to the optional header for 64 bit images.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 1d3dfd9e8d9cd2d575e6783d57dc6cee409d219c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3dfd9e8d9cd2d575e6783d5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:12 2011 +0200 winedump: Correctly get to the optional header for 64 bit images. --- tools/winedump/pe.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c1f6eb8..1974a42 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -941,13 +941,11 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) static void dump_dir_debug(void) { - const IMAGE_DEBUG_DIRECTORY*debugDir = get_dir(IMAGE_FILE_DEBUG_DIRECTORY); unsigned nb_dbg, i; + const IMAGE_DEBUG_DIRECTORY*debugDir = get_dir_and_size(IMAGE_FILE_DEBUG_DIRECTORY, &nb_dbg); - if (!debugDir) return; - nb_dbg = PE_nt_headers->OptionalHeader.DataDirectory[IMAGE_FILE_DEBUG_DIRECTORY].Size / - sizeof(*debugDir); - if (!nb_dbg) return; + nb_dbg /= sizeof(*debugDir); + if (!debugDir || !nb_dbg) return; printf("Debug Table (%u directories)\n", nb_dbg);

1 0

Eric Pouech : winedump: Simplify code a bit by using get_dir_and_size().
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: b722e77299ad641d70c2563ba7af7023f04e6119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b722e77299ad641d70c2563ba… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:21 2011 +0200 winedump: Simplify code a bit by using get_dir_and_size(). --- tools/winedump/pe.c | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1974a42..2ab2f34 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -756,20 +756,10 @@ static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il, int offset) static void dump_dir_imported_functions(void) { - const IMAGE_IMPORT_DESCRIPTOR *importDesc = get_dir(IMAGE_FILE_IMPORT_DIRECTORY); - DWORD directorySize; + unsigned directorySize; + const IMAGE_IMPORT_DESCRIPTOR* importDesc = get_dir_and_size(IMAGE_FILE_IMPORT_DIRECTORY, &directorySize); if (!importDesc) return; - if(PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - const IMAGE_OPTIONAL_HEADER64 *opt = (const IMAGE_OPTIONAL_HEADER64*)&PE_nt_headers->OptionalHeader; - directorySize = opt->DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].Size; - } - else - { - const IMAGE_OPTIONAL_HEADER32 *opt = (const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader; - directorySize = opt->DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].Size; - } printf("Import Table size: %08x\n", directorySize);/* FIXME */ @@ -809,6 +799,7 @@ static void dump_dir_imported_functions(void) static void dump_dir_delay_imported_functions(void) { + unsigned directorySize; const struct ImgDelayDescr { DWORD grAttrs; @@ -819,20 +810,9 @@ static void dump_dir_delay_imported_functions(void) DWORD pBoundIAT; DWORD pUnloadIAT; DWORD dwTimeStamp; - } *importDesc = get_dir(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT); - DWORD directorySize; + } *importDesc = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &directorySize); if (!importDesc) return; - if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - { - const IMAGE_OPTIONAL_HEADER64 *opt = (const IMAGE_OPTIONAL_HEADER64 *)&PE_nt_headers->OptionalHeader; - directorySize = opt->DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size; - } - else - { - const IMAGE_OPTIONAL_HEADER32 *opt = (const IMAGE_OPTIONAL_HEADER32 *)&PE_nt_headers->OptionalHeader; - directorySize = opt->DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].Size; - } printf("Delay Import Table size: %08x\n", directorySize); /* FIXME */

1 0

Eric Pouech : winedump: Simplify code a bit by using IMAGE_FIRST_SECTION() macro.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 0957cd03dd0ff98f22eb9f80a7973b01d1b21157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0957cd03dd0ff98f22eb9f80a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:27 2011 +0200 winedump: Simplify code a bit by using IMAGE_FIRST_SECTION() macro. --- tools/winedump/debug.c | 3 +-- tools/winedump/pe.c | 11 ++++------- tools/winedump/winedump.h | 3 ++- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 4f2cedf..c59efa6 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -570,12 +570,11 @@ void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sy } } -void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) +void dump_coff(unsigned long coffbase, unsigned long len, const IMAGE_SECTION_HEADER* sectHead) { const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); const IMAGE_SYMBOL *coff_symbols = (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); - const IMAGE_SECTION_HEADER *sectHead = pmt; dump_coff_symbol_table(coff_symbols, coff->NumberOfSymbols, sectHead); } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 2ab2f34..1f8ee38 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -882,8 +882,8 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_UNKNOWN: break; case IMAGE_DEBUG_TYPE_COFF: - dump_coff(idd->PointerToRawData, idd->SizeOfData, - (const char*)PE_nt_headers + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader); + dump_coff(idd->PointerToRawData, idd->SizeOfData, + IMAGE_FIRST_SECTION(PE_nt_headers)); break; case IMAGE_DEBUG_TYPE_CODEVIEW: dump_codeview(idd->PointerToRawData, idd->SizeOfData); @@ -1383,9 +1383,7 @@ static void dump_debug(void) unsigned i; const IMAGE_SECTION_HEADER* sectHead; - sectHead = (const IMAGE_SECTION_HEADER*) - ((const char*)PE_nt_headers + sizeof(DWORD) + - sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader); + sectHead = IMAGE_FIRST_SECTION(PE_nt_headers); for (i = 0; i < PE_nt_headers->FileHeader.NumberOfSections; i++, sectHead++) { @@ -1456,8 +1454,7 @@ void pe_dump(void) { dump_pe_header(); /* FIXME: should check ptr */ - dump_sections(PRD(0, 1), (const char*)PE_nt_headers + sizeof(DWORD) + - sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader, + dump_sections(PRD(0, 1), IMAGE_FIRST_SECTION(PE_nt_headers), PE_nt_headers->FileHeader.NumberOfSections); } else if (!globals.dumpsect) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 82eb6d8..7141d0d 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -260,7 +260,8 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const ch void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); void dump_codeview(unsigned long ptr, unsigned long len); -void dump_coff(unsigned long coffbase, unsigned long len, const void* sect_map); +void dump_coff(unsigned long coffbase, unsigned long len, + const IMAGE_SECTION_HEADER *sectHead); void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sym, const IMAGE_SECTION_HEADER *sectHead); void dump_frame_pointer_omission(unsigned long base, unsigned long len);

1 0

Eric Pouech : dbghelp: Don' t try to load fieldlist for a forward declaration.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 2c2da87ccdd395cf78c0773122c2b9c5c8b0914a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2da87ccdd395cf78c077312… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:29 2011 +0200 dbghelp: Don't try to load fieldlist for a forward declaration. --- dlls/dbghelp/msc.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index cab3338..451018b 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1156,8 +1156,9 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, if (details) { codeview_add_type(curr_type, symt); - codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, - type->struct_v1.fieldlist); + if (!(type->struct_v1.property & 0x80)) /* 0x80 = forward declaration */ + codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, + type->struct_v1.fieldlist); } break; @@ -1171,8 +1172,9 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, if (details) { codeview_add_type(curr_type, symt); - codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, - type->struct_v2.fieldlist); + if (!(type->struct_v2.property & 0x80)) /* 0x80 = forward declaration */ + codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, + type->struct_v2.fieldlist); } break; @@ -1186,8 +1188,9 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, if (details) { codeview_add_type(curr_type, symt); - codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, - type->struct_v3.fieldlist); + if (!(type->struct_v3.property & 0x80)) /* 0x80 = forward declaration */ + codeview_add_type_struct_field_list(ctp, (struct symt_udt*)symt, + type->struct_v3.fieldlist); } break;

1 0