November 2006 - Wine-Commits

Mike McCormack : msi: Defer package deletion until after the database is closed.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 3c2e79e72713a61f0eb4ea87235dbd8ed3f5434f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2e79e72713a61f0eb4ea872… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 12:42:50 2006 +0900 msi: Defer package deletion until after the database is closed. --- dlls/msi/package.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1455c6d..6f3815f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -54,11 +54,10 @@ static void MSI_FreePackage( MSIOBJECTHD if( package->dialog ) msi_dialog_destroy( package->dialog ); - ACTION_free_package_structures(package); - - msi_free_properties( package ); msiobj_release( &package->db->hdr ); + ACTION_free_package_structures(package); + msi_free_properties( package ); } static UINT clone_properties( MSIPACKAGE *package ) @@ -548,15 +547,16 @@ LPCWSTR msi_download_file( LPCWSTR szUrl UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { + static const WCHAR OriginalDatabase[] = + {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; + static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; MSIDATABASE *db = NULL; MSIPACKAGE *package; MSIHANDLE handle; LPWSTR ptr, base_url = NULL; UINT r; - - static const WCHAR OriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; - static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; + WCHAR temppath[MAX_PATH]; + LPCWSTR file = szPackage; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -569,9 +569,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, } else { - WCHAR temppath[MAX_PATH]; - LPCWSTR file; - if ( UrlIsW( szPackage, URLIS_URL ) ) { file = msi_download_file( szPackage, temppath ); @@ -587,14 +584,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, file = copy_package_to_temp( szPackage, temppath ); r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); - - if (file != szPackage) - DeleteFileW( file ); - if( r != ERROR_SUCCESS ) { if (GetLastError() == ERROR_FILE_NOT_FOUND) msi_ui_error( 4, MB_OK | MB_ICONWARNING ); + if (file != szPackage) + DeleteFileW( file ); return r; } @@ -604,7 +599,14 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, msi_free( base_url ); msiobj_release( &db->hdr ); if( !package ) + { + if (file != szPackage) + DeleteFileW( file ); return ERROR_FUNCTION_FAILED; + } + + if( file != szPackage ) + track_tempfile( package, file ); if( szPackage[0] != '#' ) {

1 0

Mike McCormack : msi: Remove track_tempfile()'s unused 2nd parameter.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: c88c0b453d9ef07e8c47c2989c8476e2e157b8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c88c0b453d9ef07e8c47c2989… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 12:42:27 2006 +0900 msi: Remove track_tempfile()'s unused 2nd parameter. --- dlls/msi/custom.c | 2 +- dlls/msi/files.c | 2 +- dlls/msi/helpers.c | 22 ++++++---------------- dlls/msi/msipriv.h | 3 +-- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 6ec4bb3..14e9918 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -307,7 +307,7 @@ static UINT store_binary_to_temp(MSIPACK TRACE("Unable to create file\n"); return ERROR_FUNCTION_FAILED; } - track_tempfile(package, tmp_file, tmp_file); + track_tempfile(package, tmp_file); row = MSI_QueryGetRecord(package->db, query, source); if (!row) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8d3992e..9793a0a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -123,7 +123,7 @@ static UINT writeout_cabinet_stream(MSIP GetTempFileNameW(tmp,stream_name,0,source); - track_tempfile(package,strrchrW(source,'\\'), source); + track_tempfile(package, source); the_file = CreateFileW(source, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 819c310..427c1af 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -108,39 +108,30 @@ MSIFILE* get_loaded_file( MSIPACKAGE* pa return NULL; } -int track_tempfile( MSIPACKAGE *package, LPCWSTR name, LPCWSTR path ) +int track_tempfile( MSIPACKAGE *package, LPCWSTR path ) { MSITEMPFILE *temp; + TRACE("%s\n", debugstr_w(path)); + LIST_FOR_EACH_ENTRY( temp, &package->tempfiles, MSITEMPFILE, entry ) - { - if (lstrcmpW( name, temp->File )==0) - { - TRACE("tempfile %s already exists with path %s\n", - debugstr_w(temp->File), debugstr_w(temp->Path)); - return -1; - } - } + if (!lstrcmpW( path, temp->Path )) + return 0; temp = msi_alloc_zero( sizeof (MSITEMPFILE) ); if (!temp) return -1; list_add_head( &package->tempfiles, &temp->entry ); - - temp->File = strdupW( name ); temp->Path = strdupW( path ); - TRACE("adding tempfile %s with path %s\n", - debugstr_w(temp->File), debugstr_w(temp->Path)); - return 0; } MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ) { MSIFOLDER *folder; - + LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) { if (lstrcmpW( dir, folder->Directory )==0) @@ -407,7 +398,6 @@ static void remove_tracked_tempfiles(MSI TRACE("deleting temp file %s\n", debugstr_w( temp->Path )); if (!DeleteFileW( temp->Path )) ERR("failed to delete %s\n", debugstr_w( temp->Path )); - msi_free( temp->File ); msi_free( temp->Path ); msi_free( temp ); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 44e9170..23879a4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -366,7 +366,6 @@ typedef struct tagMSIFILE typedef struct tagMSITEMPFILE { struct list entry; - LPWSTR File; LPWSTR Path; } MSITEMPFILE; @@ -751,7 +750,7 @@ extern MSICOMPONENT *get_loaded_componen extern MSIFEATURE *get_loaded_feature( MSIPACKAGE* package, LPCWSTR Feature ); extern MSIFILE *get_loaded_file( MSIPACKAGE* package, LPCWSTR file ); extern MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ); -extern int track_tempfile(MSIPACKAGE *package, LPCWSTR name, LPCWSTR path); +extern int track_tempfile(MSIPACKAGE *package, LPCWSTR path); extern UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action); extern void msi_free_action_script(MSIPACKAGE *package, UINT script); extern LPWSTR build_icon_path(MSIPACKAGE *, LPCWSTR);

1 0

Mike McCormack : msi: Always delete temp files after creating them.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: f241daef54306ae58a27ddb24131c57039ba4f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f241daef54306ae58a27ddb24… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 12:42:06 2006 +0900 msi: Always delete temp files after creating them. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a134aea..9fe5b8e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -505,10 +505,10 @@ static HANDLE msi_load_image( MSIDATABAS if( r == ERROR_SUCCESS ) { himage = LoadImageW( 0, tmp, type, cx, cy, flags ); - DeleteFileW( tmp ); } msiobj_release( &rec->hdr ); } + DeleteFileW( tmp ); msi_free( tmp ); return himage;

1 0

Mike McCormack : msi: Print a message if we fail to delete a file.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 6914c4749e62ae129efc6fd83c77664a1a197dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6914c4749e62ae129efc6fd83… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 12:41:40 2006 +0900 msi: Print a message if we fail to delete a file. --- dlls/msi/helpers.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 490e181..819c310 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -405,7 +405,8 @@ static void remove_tracked_tempfiles(MSI list_remove( &temp->entry ); TRACE("deleting temp file %s\n", debugstr_w( temp->Path )); - DeleteFileW( temp->Path ); + if (!DeleteFileW( temp->Path )) + ERR("failed to delete %s\n", debugstr_w( temp->Path )); msi_free( temp->File ); msi_free( temp->Path ); msi_free( temp );

1 0

Huw Davies : msxml3: Support both v 2.x and 3. 0 version independent clsids as well as the v 3.0 version dependent clsid.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 46964179419f312afe43ed844f40136a5783fa4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46964179419f312afe43ed844… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 13 15:49:49 2006 +0000 msxml3: Support both v 2.x and 3.0 version independent clsids as well as the v 3.0 version dependent clsid. --- dlls/msxml3/factory.c | 4 +++- dlls/msxml3/regsvr.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 3d042bc..53d59d1 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -141,7 +141,9 @@ HRESULT WINAPI DllGetClassObject( REFCLS TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv ); - if( IsEqualGUID( rclsid, &CLSID_DOMDocument ) ) + if( IsEqualGUID( rclsid, &CLSID_DOMDocument ) || /* Version indep. v 2.x */ + IsEqualGUID( rclsid, &CLSID_DOMDocument2 ) || /* Version indep. v 3.0 */ + IsEqualGUID( rclsid, &CLSID_DOMDocument30 ) ) /* Version dep. v 3.0 */ cf = (IClassFactory*) &domdoccf.lpVtbl; if ( !cf ) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index efdbd7d..3686590 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -31,6 +31,11 @@ #include "ole2.h" #include "msxml.h" #include "xmldom.h" #include "xmldso.h" +#include "msxml2.h" + +/* undef the #define in msxml2 so that we can access the v.2 version + independent CLSID as well as the v.3 one. */ +#undef CLSID_DOMDocument #include "msxml_private.h" @@ -529,6 +534,22 @@ static struct regsvr_coclass const cocla "Microsoft.XMLDOM", "1.0" }, + { &CLSID_DOMDocument2, + "XML DOM Document", + NULL, + "msxml3.dll", + "Both", + "Msxml2.DOMDocument", + "3.0" + }, + { &CLSID_DOMDocument30, + "XML DOM Document 3.0", + NULL, + "msxml3.dll", + "Both", + "Msxml2.DOMDocument", + "3.0" + }, { &CLSID_DOMFreeThreadedDocument, "Free threaded XML DOM Document", NULL, @@ -589,6 +610,16 @@ static struct progid const progid_list[] &CLSID_DOMDocument, "Microsoft.XMLDOM.1.0" }, + { "Msxml2.DOMDocument", + "XML DOM Document", + &CLSID_DOMDocument2, + "Msxml2.DOMDocument.3.0" + }, + { "Msxml2.DOMDocument.3.0", + "XML DOM Document 3.0", + &CLSID_DOMDocument30, + NULL + }, { "Microsoft.FreeThreadedXMLDOM", "Free threaded XML DOM Document", &CLSID_DOMFreeThreadedDocument,

1 0

Huw Davies : msxml3: Initialize the uuids that aren't in libuuid.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 8518ee38e3331ff8655a23746907cd4774495cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8518ee38e3331ff8655a23746… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 13 15:39:42 2006 +0000 msxml3: Initialize the uuids that aren't in libuuid. --- dlls/msxml3/Makefile.in | 3 +- dlls/msxml3/uuid.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 08ede48..5b9261f 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -20,7 +20,8 @@ C_SRCS = \ nodemap.c \ parseerror.c \ regsvr.c \ - text.c + text.c \ + uuid.c RC_SRCS = version.rc diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c new file mode 100644 index 0000000..a3c7965 --- /dev/null +++ b/dlls/msxml3/uuid.c @@ -0,0 +1,58 @@ +/* + * MSXML2 uuids + * + * Copyright 2006 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * We can't use the autogenerated _i.c file from msxml2.idl as that + * will contain some of the (version 2) uuids defined in libuuid. + * Therefore we roll our own. + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +/* + * First include the version 2 headers so that we don't redefine their + * uuids - they're already in libuuid + */ +#include "xmldom.h" +#include "xmldso.h" +#include "msxml.h" + +/* Now we can initialize the rest of the uuids */ +#include "initguid.h" +#include "msxml2.h" + +/* + * Note that because of a #define in msxml2.h, we end up initializing + * CLSID_DOMDocument2 to be the v.3 version independent DOMDocument + * class {f6d90f11-9c73-11d3-b32e-00c04f990bb4}. The other version + * independent CLSIDs all have slightly different names: + * + * v.2.x v.3.0 + * + * DOMFreeThreadedDocument FreeThreadedDOMDocument + * XMLHTTPRequest XMLHTTP + * XMLDSOControl DSOControl + * + */

1 0

Huw Davies : msxml3: Add the CLSID_DOMDocument define in msxml2. idl to match the PSDK.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 9e1284df231cfb8da78b66ea29a1d39b1c900990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1284df231cfb8da78b66ea2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 13 15:31:45 2006 +0000 msxml3: Add the CLSID_DOMDocument define in msxml2.idl to match the PSDK. --- dlls/msxml3/factory.c | 6 ++++++ dlls/msxml3/tests/domdoc.c | 2 ++ include/msxml2.idl | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 5d15751..3d042bc 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -26,8 +26,14 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "msxml.h" +#include "xmldom.h" #include "msxml2.h" +/* undef the #define in msxml2 so that we can access the v.2 version + independent CLSID as well as the v.3 one. */ +#undef CLSID_DOMDocument + #include "wine/debug.h" #include "msxml_private.h" diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 547436b..f082991 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -28,6 +28,8 @@ #include <stdio.h> #include "wine/test.h" +const CLSID CLSID_DOMDocument2 = {0xf6d90f11, 0x9c73, 0x11d3, {0xb3, 0x2e, 0x00,0xc0, 0x4f, 0x99, 0x0b, 0xb4}}; + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', diff --git a/include/msxml2.idl b/include/msxml2.idl index dc50aad..fb32a79 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -47,6 +47,9 @@ interface IXTLRuntime; interface IXSLTemplate; interface IXSLProcessor; +cpp_quote("#define DOMDocument DOMDocument2") +cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") + cpp_quote("#ifndef __WIDL_XMLDOM_H") typedef enum tagDOMNodeType {

1 0

Huw Davies : msxml3: Add a guard around DOMNodeType just like in the PSDK, so that we can include version 2 and version 3 msxml headers simultaneously .
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 1615497233c7e01285a642414bf8f32f989d3223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1615497233c7e01285a642414… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 13 15:09:10 2006 +0000 msxml3: Add a guard around DOMNodeType just like in the PSDK, so that we can include version 2 and version 3 msxml headers simultaneously. --- include/msxml2.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index b394699..dc50aad 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -47,6 +47,7 @@ interface IXTLRuntime; interface IXSLTemplate; interface IXSLProcessor; +cpp_quote("#ifndef __WIDL_XMLDOM_H") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -63,6 +64,7 @@ typedef enum tagDOMNodeType NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; +cpp_quote("#endif /* __WIDL_XMLDOM_H */") [ local,

1 0

Jesse Allen : msvcrt: printf buffer overrun tests.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: a697fe51e0bff326c1a7fc8360672f128490a769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a697fe51e0bff326c1a7fc836… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Nov 13 20:56:19 2006 -0700 msvcrt: printf buffer overrun tests. --- dlls/msvcrt/tests/printf.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index b60dc17..7613c91 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -187,6 +187,18 @@ static void test_sprintf( void ) r = sprintf(buffer,format,(LONGLONG)100); ok(!strcmp(buffer,"+00100 ") && r==8,"#-+ 08.5I64d failed: '%s'\n", buffer); + format = "%.80I64d"; + r = sprintf(buffer,format,(LONGLONG)1); + ok(r==80,"%s format failed\n", format); + + format = "% .80I64d"; + r = sprintf(buffer,format,(LONGLONG)1); + ok(r==81,"%s format failed\n", format); + + format = "% .80d"; + r = sprintf(buffer,format,1); + ok(r==81,"%s format failed\n", format); + format = "%lld"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation\n");

1 0

Jesse Allen : msvcrt: Estimate required buffer size better in pf_vsnprintf.
by Alexandre Julliard Nov. 14, 2006

Nov. 14, 2006

Module: wine Branch: master Commit: 5b75c86921e41f794bd8d126bb37f08f8c63b36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b75c86921e41f794bd8d126b… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Nov 13 20:55:02 2006 -0700 msvcrt: Estimate required buffer size better in pf_vsnprintf. --- dlls/msvcrt/wcs.c | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 591f28f..800d3b5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -281,6 +281,7 @@ static inline int pf_output_stringA( pf_ return -1; } +/* pf_fill: takes care of signs, alignment, zero and field padding */ static inline int pf_fill( pf_output *out, int len, pf_flags *flags, char left ) { int i, r = 0; @@ -426,15 +427,19 @@ static void pf_rebuild_format_string( ch *p++ = 0; } -/* pf_integer_conv: prints x to buf, including alternate formats, - but not the sign */ -static void pf_integer_conv( char *buf, pf_flags *flags, LONGLONG x ) +/* pf_integer_conv: prints x to buf, including alternate formats and + additional precision digits, but not field characters or the sign */ +static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, + LONGLONG x ) { unsigned int base; const char *digits; int i, j, k; - char tmp[40]; + char number[40], *tmp = number; + + if( buf_len > sizeof number ) + tmp = HeapAlloc( GetProcessHeap(), 0, buf_len ); base = 10; if( flags->Format == 'o' ) @@ -487,6 +492,9 @@ static void pf_integer_conv( char *buf, /* Adjust precision so pf_fill won't truncate the number later */ flags->Precision = strlen( buf ); + if( tmp != number ) + HeapFree( GetProcessHeap(), 0, tmp ); + return; } @@ -660,10 +668,18 @@ static int pf_vsnprintf( pf_output *out, { char number[40], *x = number; - if( flags.FieldLength >= sizeof number ) - x = HeapAlloc( GetProcessHeap(), 0, flags.FieldLength+1 ); + /* Estimate largest possible required buffer size: + * Chooses the larger of the field or precision + * Includes extra bytes: 1 byte for null, 1 byte for sign, + 4 bytes for exponent, 2 bytes for alternate formats, 1 byte + for a decimal, and 1 byte for an additional float digit. */ + int x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10; - pf_integer_conv( x, &flags, va_arg(valist, LONGLONG) ); + if( x_len >= sizeof number) + x = HeapAlloc( GetProcessHeap(), 0, x_len ); + + pf_integer_conv( x, x_len, &flags, va_arg(valist, LONGLONG) ); r = pf_output_format_A( out, x, -1, &flags ); if( x != number ) @@ -675,8 +691,16 @@ static int pf_vsnprintf( pf_output *out, { char fmt[20], number[40], *x = number; - if( flags.FieldLength >= sizeof number ) - x = HeapAlloc( GetProcessHeap(), 0, flags.FieldLength+1 ); + /* Estimate largest possible required buffer size: + * Chooses the larger of the field or precision + * Includes extra bytes: 1 byte for null, 1 byte for sign, + 4 bytes for exponent, 2 bytes for alternate formats, 1 byte + for a decimal, and 1 byte for an additional float digit. */ + int x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10; + + if( x_len >= sizeof number) + x = HeapAlloc( GetProcessHeap(), 0, x_len ); pf_rebuild_format_string( fmt, &flags );

1 0