November 2010 - Wine-commits

Nikolay Sivov : msxml3: Get rid of ::get_baseName() forward.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 1e998bfc3f14ccfc9ee1b250d1a6a9c18bca3541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e998bfc3f14ccfc9ee1b250d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 31 12:39:53 2010 +0300 msxml3: Get rid of ::get_baseName() forward. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 5 +++-- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 5 +++-- dlls/msxml3/element.c | 5 +++-- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 38 +++++++------------------------------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 35 insertions(+), 49 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index c9a2cc7..34cc007 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -506,10 +506,11 @@ static HRESULT WINAPI domattr_get_prefix( static HRESULT WINAPI domattr_get_baseName( IXMLDOMAttribute *iface, - BSTR* p) + BSTR* name) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return node_get_base_name( &This->node, name ); } static HRESULT WINAPI domattr_transformNodeToObject( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e62a7d6..d602bfa 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -517,10 +517,11 @@ static HRESULT WINAPI domcdata_get_prefix( static HRESULT WINAPI domcdata_get_baseName( IXMLDOMCDATASection *iface, - BSTR* p) + BSTR* name) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + FIXME("(%p)->(%p): needs test\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domcdata_transformNodeToObject( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index b749638..5402a54 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -510,10 +510,11 @@ static HRESULT WINAPI domcomment_get_prefix( static HRESULT WINAPI domcomment_get_baseName( IXMLDOMComment *iface, - BSTR* p) + BSTR* name) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domcomment_transformNodeToObject( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 2c0ad81..792298c 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -514,10 +514,11 @@ static HRESULT WINAPI domfrag_get_prefix( static HRESULT WINAPI domfrag_get_baseName( IXMLDOMDocumentFragment *iface, - BSTR* p) + BSTR* name) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + FIXME("(%p)->(%p): needs test\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domfrag_transformNodeToObject( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b70acd4..500bde8 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1341,10 +1341,11 @@ static HRESULT WINAPI domdoc_get_prefix( static HRESULT WINAPI domdoc_get_baseName( IXMLDOMDocument3 *iface, - BSTR* nameString ) + BSTR* name ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), nameString ); + TRACE("(%p)->(%p)\n", This, name); + return return_null_bstr( name ); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index fd49874..418307e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -562,10 +562,11 @@ static HRESULT WINAPI domelem_get_prefix( static HRESULT WINAPI domelem_get_baseName( IXMLDOMElement *iface, - BSTR* p) + BSTR* name) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return node_get_base_name( &This->node, name ); } static HRESULT WINAPI domelem_transformNodeToObject( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index fae2a2c..308b9ce 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -508,10 +508,11 @@ static HRESULT WINAPI entityref_get_prefix( static HRESULT WINAPI entityref_get_baseName( IXMLDOMEntityReference *iface, - BSTR* p) + BSTR* name) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + FIXME("(%p)->(%p): needs test\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI entityref_transformNodeToObject( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8ae84cf..3d7903c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -194,6 +194,7 @@ extern HRESULT node_put_text(xmlnode*,BSTR); extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*); extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**); extern HRESULT node_get_prefix(xmlnode*,BSTR*); +extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3b2ce35..3bb0970 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1170,40 +1170,16 @@ HRESULT node_get_prefix(xmlnode *This, BSTR *prefix) return *prefix ? S_OK : S_FALSE; } -static HRESULT WINAPI xmlnode_get_baseName( - IXMLDOMNode *iface, - BSTR* nameString) +HRESULT node_get_base_name(xmlnode *This, BSTR *name) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - BSTR str = NULL; - HRESULT r = S_FALSE; - - TRACE("(%p)->(%p)\n", This, nameString ); - - if ( !nameString ) - return E_INVALIDARG; + if (!name) return E_INVALIDARG; - switch ( This->node->type ) - { - case XML_ELEMENT_NODE: - case XML_ATTRIBUTE_NODE: - case XML_PI_NODE: - str = bstr_from_xmlChar( This->node->name ); - r = S_OK; - break; - case XML_TEXT_NODE: - case XML_COMMENT_NODE: - case XML_DOCUMENT_NODE: - break; - default: - ERR("Unhandled type %d\n", This->node->type ); - break; - } + *name = bstr_from_xmlChar(This->node->name); + if (!*name) return E_OUTOFMEMORY; - TRACE("returning %08x str = %s\n", r, debugstr_w( str ) ); + TRACE("returning %s\n", debugstr_w(*name)); - *nameString = str; - return r; + return S_OK; } static HRESULT WINAPI xmlnode_transformNodeToObject( @@ -1259,7 +1235,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, xmlnode_get_namespaceURI, NULL, - xmlnode_get_baseName, + NULL, xmlnode_transformNodeToObject, }; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2158c13..44ccb96 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -524,10 +524,11 @@ static HRESULT WINAPI dom_pi_get_prefix( static HRESULT WINAPI dom_pi_get_baseName( IXMLDOMProcessingInstruction *iface, - BSTR* p) + BSTR* name) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return node_get_base_name( &This->node, name ); } static HRESULT WINAPI dom_pi_transformNodeToObject( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 0fd8b42..47bb1f0 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -523,10 +523,11 @@ static HRESULT WINAPI domtext_get_prefix( static HRESULT WINAPI domtext_get_baseName( IXMLDOMText *iface, - BSTR* p) + BSTR* name) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domtext_transformNodeToObject(

1 0

Nikolay Sivov : msxml3: Hint parser to use UTF-8 if it's specfied as BOM.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 678fbc172c5f54e6417f0fc1336a0a3b444b444c URL: http://source.winehq.org/git/wine.git/?a=commit;h=678fbc172c5f54e6417f0fc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 30 18:49:43 2010 +0400 msxml3: Hint parser to use UTF-8 if it's specfied as BOM. --- dlls/msxml3/saxreader.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a1df5c7..7d8caf4 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1770,6 +1770,8 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B /*** SAXXMLReader internal functions ***/ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int size, BOOL vbInterface) { + xmlCharEncoding encoding = XML_CHAR_ENCODING_NONE; + xmlChar *enc_name = NULL; saxlocator *locator; HRESULT hr; @@ -1777,6 +1779,22 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz if(FAILED(hr)) return hr; + if (size >= 4) + { + const unsigned char *buff = (unsigned char*)buffer; + + encoding = xmlDetectCharEncoding((xmlChar*)buffer, 4); + enc_name = (xmlChar*)xmlGetCharEncodingName(encoding); + TRACE("detected encoding: %s\n", enc_name); + /* skip BOM, parser won't switch encodings and so won't skip it on its own */ + if ((encoding == XML_CHAR_ENCODING_UTF8) && + buff[0] == 0xEF && buff[1] == 0xBB && buff[2] == 0xBF) + { + buffer += 3; + size -= 3; + } + } + locator->pParserCtxt = xmlCreateMemoryParserCtxt(buffer, size); if(!locator->pParserCtxt) { @@ -1784,6 +1802,9 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz return E_FAIL; } + if (encoding == XML_CHAR_ENCODING_UTF8) + locator->pParserCtxt->encoding = xmlStrdup(enc_name); + xmlFree(locator->pParserCtxt->sax); locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator;

1 0

Gerald Pfeifer : comctl32: Remove TOOLTIPS_WindowFromPoint, putting its functionality into its sole calling site.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: d25d6676277872321ff112725c4a9c276b01bd3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25d6676277872321ff112725… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 18:34:02 2010 +0100 comctl32: Remove TOOLTIPS_WindowFromPoint, putting its functionality into its sole calling site. --- dlls/comctl32/tooltips.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index e74c701..5b48d38 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1840,14 +1840,6 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW static LRESULT -TOOLTIPS_WindowFromPoint (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - return (LRESULT)WindowFromPoint (*((LPPOINT)lParam)); -} - - - -static LRESULT TOOLTIPS_Create (HWND hwnd) { TOOLTIPS_INFO *infoPtr; @@ -2268,8 +2260,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) uMsg == TTM_UPDATETIPTEXTW); case TTM_WINDOWFROMPOINT: - return TOOLTIPS_WindowFromPoint (hwnd, wParam, lParam); - + return (LRESULT)WindowFromPoint (*((LPPOINT)lParam)); case WM_CREATE: return TOOLTIPS_Create (hwnd);

1 0

Gerald Pfeifer : comctl32: Fix test description in test_hittest.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 42b10069253b4a17e90a792cb890b48be49326c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b10069253b4a17e90a792cb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 31 19:15:05 2010 +0100 comctl32: Fix test description in test_hittest. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d249af8..0223167 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3025,7 +3025,7 @@ static void test_hittest(void) horiz = LOWORD(r); vert = HIWORD(r); ok(bounds.bottom - bounds.top == vert, - "Horizontal spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); + "Vertical spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert); r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pos); expect(TRUE, r);

1 0

Eric Pouech : msvcrt: Added macro to ease implementation of so called secure (_s postfix) APIs.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: fd3ad8cd2ae938189ddf460b159a6ab3ec936de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3ad8cd2ae938189ddf460b1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:46 2010 +0200 msvcrt: Added macro to ease implementation of so called secure (_s postfix) APIs. --- dlls/msvcrt/msvcrt.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 167fa83..c36b5bd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -847,6 +847,17 @@ void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); + +/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) + * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) + * #define MSVCRT_CHECK_PMT(x) ((x) ? TRUE : MSVCRT_INVALID_PMT(#x),FALSE) + * Until this is done, just keep the same semantics for CHECK_PMT(), but without generating / sending + * any information + * NB : MSVCRT_call_invalid_parameter_handler is a wrapper around MSVCRT__invalid_parameter in order + * to do the Ansi to Unicode transformation + */ +#define MSVCRT_INVALID_PMT(x) MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0) +#define MSVCRT_CHECK_PMT(x) ((x) || (MSVCRT_INVALID_PMT(0),FALSE)) #endif #endif /* __WINE_MSVCRT_H */

1 0

Eric Pouech : msvcrt: Moved _get_osplatform to the new macros for parameters validation.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 4b9489074115d790cc91bd867c9d85e2f50a2627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9489074115d790cc91bd867… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:51 2010 +0200 msvcrt: Moved _get_osplatform to the new macros for parameters validation. --- dlls/msvcrt/data.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 068b29f..53dd114 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -228,15 +228,14 @@ MSVCRT_wchar_t*** CDECL __p___winitenv(void) { return &MSVCRT___winitenv; } /********************************************************************* * _get_osplatform (MSVCRT.@) */ -int CDECL MSVCRT__get_osplatform(int *ret) +int CDECL MSVCRT__get_osplatform(int *pValue) { - if(!ret) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(pValue != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } - *ret = MSVCRT__osplatform; + *pValue = MSVCRT__osplatform; return 0; }

1 0

Eric Pouech : msvcrt: Use the new parameter checking macros for f(w) open_s functions.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 00f07046c0be658d97c47f69e1b4c518bc06b3a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f07046c0be658d97c47f69e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:38:57 2010 +0200 msvcrt: Use the new parameter checking macros for f(w)open_s functions. --- dlls/msvcrt/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f906401..3eb93ac 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2686,8 +2686,8 @@ MSVCRT_FILE * CDECL MSVCRT_fopen(const char *path, const char *mode) int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, const char *filename, const char *mode) { - if(!pFile) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || + MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -2713,8 +2713,8 @@ MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wcha int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *mode) { - if(!pFile) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || + MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; }

1 0

Eric Pouech : msvcrt: Use the parameter checking macros for strncpy_s.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: c10a6d74d5a0df8dce3e54dec2ae98706c9b8d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10a6d74d5a0df8dce3e54dec… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:03 2010 +0200 msvcrt: Use the parameter checking macros for strncpy_s. --- dlls/msvcrt/heap.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index b1d4076..548dd82 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -572,8 +572,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, if(!count) return 0; - if(!dest || !src || !numberOfElements) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(dest != NULL) || !MSVCRT_CHECK_PMT(src != NULL) || !MSVCRT_CHECK_PMT(numberOfElements != 0)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -591,7 +590,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, return 0; } - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + MSVCRT_INVALID_PMT("dest[numberOfElements] is too small"); dest[0] = '\0'; *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL;

1 0

Eric Pouech : msvcrt: Use parameter validation macros for mcstowcs_s_l.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 8583bd317e25e42df592de56249997bb931a465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8583bd317e25e42df592de562… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:08 2010 +0200 msvcrt: Use parameter validation macros for mcstowcs_s_l. --- dlls/msvcrt/mbcs.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d92365f..5767242 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1824,8 +1824,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, return 0; } - if(!mbstr || !wcstr) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(!MSVCRT_CHECK_PMT(mbstr != NULL) || !MSVCRT_CHECK_PMT(wcstr != NULL)) { if(wcstr && size) wcstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_EINVAL; @@ -1843,7 +1842,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0')) wcstr[conv-1] = '\0'; else { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + MSVCRT_INVALID_PMT("wcstr[size] is too small"); if(size) wcstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_ERANGE;

1 0

Eric Pouech : msvcrt: Use parameter checking macros for strtok_s.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 14187ed2aa9b2d42295519a895b511aa9bbfade0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14187ed2aa9b2d42295519a89… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:14 2010 +0200 msvcrt: Use parameter checking macros for strtok_s. --- dlls/msvcrt/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 944c7e6..fb02bd5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -152,8 +152,8 @@ char * CDECL MSVCRT_strtok( char *str, const char *delim ) */ char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx) { - if(!delim || !ctx || (!str && !*ctx)) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(ctx != NULL) || + !MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; }

1 0