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

Jacek Caban : mshtml: Added IHTMLElement2 implementation.
by Alexandre Julliard 24 Mar '06

24 Mar '06

Module: wine Branch: refs/heads/master Commit: ed10e5046c107971bd689b3c1564106d9ee6afce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed10e5046c107971bd689b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 21:38:38 2006 +0100 mshtml: Added IHTMLElement2 implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 5 dlls/mshtml/htmlelem2.c | 906 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 4 files changed, 916 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmlelem2.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ed10e5046c107971bd6…

1 0

Jacek Caban : exdisp.idl: Added missing IE6 methods to DWebBrowserEvents2.
by Alexandre Julliard 24 Mar '06

24 Mar '06

Module: wine Branch: refs/heads/master Commit: 9c2254468879430bb52aac5255c58ecf62a170b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c2254468879430bb52aac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 21:37:17 2006 +0100 exdisp.idl: Added missing IE6 methods to DWebBrowserEvents2. --- include/exdisp.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 2c489f8..32ce9df 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -322,6 +322,60 @@ dispinterface DWebBrowserEvents2 [id(DISPID_ONTHEATERMODE)] void OnTheaterMode([in] VARIANT_BOOL TheaterMode); + + [id(DISPID_WINDOWSETRESIZABLE)] + void WindowSetResizable([in] VARIANT_BOOL Resizable); + + [id(DISPID_WINDOWSETLEFT)] + void WindowSetLeft([in] long Left); + + [id(DISPID_WINDOWSETTOP)] + void WindowSetTop([in] long Top); + + [id(DISPID_WINDOWSETWIDTH)] + void WindowSetWidth([in] long Width); + + [id(DISPID_WINDOWSETHEIGHT)] + void WindowSetHeight([in] long Height); + + [id(DISPID_WINDOWCLOSING)] + void WindowClosing( + [in] VARIANT_BOOL IsChildWindow, + [in, out] VARIANT_BOOL *Cancel); + + [id(DISPID_CLIENTTOHOSTWINDOW)] + void ClientToHostWindow( + [in, out] long *CX, + [in, out] long *CY); + + [id(DISPID_SETSECURELOCKICON)] + void SetSecureLockIcon([in] long SecureLockIcon); + + [id(DISPID_FILEDOWNLOAD)] + void FileDownload([in, out] VARIANT_BOOL* Cancel); + + [id(DISPID_NAVIGATEERROR)] + void NavigateError( + [in] IDispatch *pDisp, + [in] VARIANT *URL, + [in] VARIANT *Frame, + [in] VARIANT *StatusCode, + [in, out] VARIANT_BOOL *Cancel); + + [id(DISPID_PRINTTEMPLATEINSTANTIATION)] + void PrintTemplateInstantiation([in] IDispatch *pDisp); + + [id(DISPID_PRINTTEMPLATETEARDOWN)] + void PrintTemplateTeardown([in] IDispatch *pDisp); + + [id(DISPID_UPDATEPAGESTATUS)] + void UpdatePageStatus( + [in] IDispatch *pDisp, + [in] VARIANT *nPage, + [in] VARIANT *fDone); + + [id(DISPID_PRIVACYIMPACTEDSTATECHANGE)] + void PrivacyImpactedStateChange([in] VARIANT_BOOL bImpacted); } [

1 0

Stefan Dösinger : wined3d: Rectpatch code fix.
by Alexandre Julliard 24 Mar '06

24 Mar '06

Module: wine Branch: refs/heads/master Commit: 6af24c816d2d5ff786d769b01332a23a12a41975 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6af24c816d2d5ff786d769b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 23 19:31:34 2006 +0100 wined3d: Rectpatch code fix. Update the wined3d code to use WINED3DRECTPATCH_INFO, which was added with an older patch. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- include/wine/wined3d_interface.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3b7b40b..525ded9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1318,7 +1318,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Draw IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, pRectPatchInfo); + return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DRECTPATCH_INFO *)pRectPatchInfo); } HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d7baa9..c61bf15 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -796,7 +796,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, pRectPatchInfo); + return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DRECTPATCH_INFO *)pRectPatchInfo); } /*http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawTriPatch.asp*/ HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea74a20..1a55b8e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5810,7 +5810,7 @@ OpenGL evaluators or tessellate surface */ /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ -HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { +HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) Handle(%d) noSegs(%p) rectpatch(%p)\n", This, Handle, pNumSegs, pRectPatchInfo); FIXME("(%p) : Stub\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index f1ff945..255ecea 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -415,7 +415,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,INT baseVIdx, UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) PURE; STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void * pIndexData,WINED3DFORMAT IndexDataFormat,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; - STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) PURE; + STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE;

1 0

lostwages/wwn wn20060324_309.xml
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23749 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/24 01:05:25 Modified files: wwn : wn20060324_309.xml Log message: minor edits Patch: http://cvs.winehq.org/patch.py?id=23749 Old revision New revision Changes Path 1.1 1.2 +4 -5 lostwages/wwn/wn20060324_309.xml Index: lostwages/wwn/wn20060324_309.xml diff -u -p lostwages/wwn/wn20060324_309.xml:1.1 lostwages/wwn/wn20060324_309.xml:1.2 --- lostwages/wwn/wn20060324_309.xml:1.1 24 Mar 2006 7: 5:25 -0000 +++ lostwages/wwn/wn20060324_309.xml 24 Mar 2006 7: 5:25 -0000 @@ -37,13 +37,12 @@ Its main goal is to become long overdue <person posts="2" size="5" who="a_villacis at palosanto.com (=?ISO-8859-1?Q?Alex_Villac=ED=ADs_Lasso?=)" /> <person posts="2" size="5" who="scott at open-vote.org (Scott Ritchie)" /> <person posts="2" size="4" who="nunoplopes at gmail.com (Nuno Lopes)" /> -<person posts="2" size="3" who="meissner at suse.de (Marcus Meissner)" /> +<person posts="4" size="5" who="meissner at suse.de (Marcus Meissner)" /> <person posts="2" size="2" who="jim at pagesmiths.com (Jim White)" /> <person posts="2" size="2" who="wes.parish at paradise.net.nz (Wesley Parish)" /> <person posts="2" size="2" who="Paul.Vriens at xs4all.nl (Paul Vriens)" /> <person posts="2" size="2" who="eric.pouech at wanadoo.fr (Eric Pouech)" /> <person posts="2" size="2" who="fgouget at free.fr (Francois Gouget)" /> -<person posts="2" size="2" who="marcus at jet.franken.de (Marcus Meissner)" /> <person posts="2" size="2" who="jacek at codeweavers.com (Jacek Caban)" /> <person posts="2" size="2" who="andi at rhlx01.fht-esslingen.de (Andreas Mohr)" /> <person posts="2" size="1" who="jeffl at yless4u.com.au (Jeff Latimer)" /> @@ -93,7 +92,7 @@ Its main goal is to become long overdue posts="1" > <topic>News</topic> -On Wednesday, Alexandre released Wine 0.9.10. It followed less than +Last Wednesday, Alexandre released Wine 0.9.10. It followed less than 2 weeks on the heels of 0.9.9. He noted the following changes: <quote who="Alexandre Julliard"> <ul> @@ -156,7 +155,7 @@ And even a "yum install wine" should do Well, that's pretty simple. Andreas Bierfert noted that Wine made it into the x86_64 tree of Fedora Extras as well and a -<tt>yum install wine</tt> should work there as well. +<tt>yum install wine</tt> should work. Eddy Nigg of <a href="http://www.startcom.org">StartCom Linux</a> mentioned they had Wine in RPM packages that should be compatible: @@ -359,7 +358,7 @@ typesafe, it just looks like it is.< within applications: <quote who="Rauschi"> -I think it would be very usefull to disallow an application started with wine i +I think it would be very useful to disallow an application started with wine i to connect to the network/internet by an options flag.</quote> That's a valid question - a lot of apps like to "phone home" and that's

1 0

lostwages/ news/2006032401.xml wwn/wn20060324_ ...
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23748 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/24 00:30:09 Added files: news : 2006032401.xml wwn : wn20060324_309.xml Log message: WWN #309 Patch: http://cvs.winehq.org/patch.py?id=23748 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006032401.xml Added 1.1 +0 -0 lostwages/wwn/wn20060324_309.xml

1 0

appdb/include comment.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23747 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 23:01:48 Modified files: include : comment.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add tag to comment id and link it to the notification email Patch: http://cvs.winehq.org/patch.py?id=23747 Old revision New revision Changes Path 1.13 1.14 +5 -2 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.13 appdb/include/comment.php:1.14 --- appdb/include/comment.php:1.13 24 Mar 2006 5: 1:48 -0000 +++ appdb/include/comment.php 24 Mar 2006 5: 1:48 -0000 @@ -88,7 +88,7 @@ class Comment { } $sSubject = "Comment for '".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)."' added by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; + $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&mode=nested#Comment-".$this->iCommentId."\n"; $sMsg .= "\n"; $sMsg .= "Subject: ".$this->sSubject."\r\n"; $sMsg .= "\n"; @@ -214,7 +214,7 @@ function view_app_comment($ob) $ob->body = stripslashes($ob->body); // message header - echo "<tr bgcolor=\"#E0E0E0\"><td>\n"; + echo "<tr bgcolor=\"#E0E0E0\"><td><a name=Comment-".$ob->commentId."></a>\n"; echo " ".$ob->subject." \n"; echo " by ".forum_lookup_user($ob->userId)." on ".$ob->time." \n"; echo "</td></tr><tr><td>\n"; @@ -417,6 +417,9 @@ function view_app_comments($versionId, $ else $mode = "threaded"; /* default non-logged in users to threaded comment display mode */ + if ($_REQUEST['mode']=="nested") + $mode = "nested"; + switch ($mode) { case "flat":

1 0

appdb/include mail.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23746 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 21:21:26 Modified files: include : mail.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Change link in email footer to link to the AppDB site instead of WineHQ Patch: http://cvs.winehq.org/patch.py?id=23746 Old revision New revision Changes Path 1.4 1.5 +1 -1 appdb/include/mail.php Index: appdb/include/mail.php diff -u -p appdb/include/mail.php:1.4 appdb/include/mail.php:1.5 --- appdb/include/mail.php:1.4 24 Mar 2006 3:21:26 -0000 +++ appdb/include/mail.php 24 Mar 2006 3:21:26 -0000 @@ -10,7 +10,7 @@ function mail_appdb($sEmailList,$sSubjec $sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n"; $sMsg .= "Best regards.\n"; $sMsg .= "The AppDB team\n"; - $sMsg .= APPDB_OWNER_URL."\n"; + $sMsg .= APPDB_ROOT."\n"; $sMsg .= "\n\nIf you don't want to receive any other e-mail, please change your preferences:\n"; $sMsg .= APPDB_ROOT."preferences.php\n";

1 0

appdb/ cron/cleanup.php include/user.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23745 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 21:20:34 Modified files: cron : cleanup.php include : user.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix up inactivity warnings and include login link on inactivity email Patch: http://cvs.winehq.org/patch.py?id=23745 Old revision New revision Changes Path 1.24 1.25 +2 -2 appdb/cron/cleanup.php 1.64 1.65 +3 -2 appdb/include/user.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.24 appdb/cron/cleanup.php:1.25 --- appdb/cron/cleanup.php:1.24 24 Mar 2006 3:20:34 -0000 +++ appdb/cron/cleanup.php 24 Mar 2006 3:20:34 -0000 @@ -103,7 +103,7 @@ function deleteUser($iUserId) function warnUserDeleted($sEmail) { $sSubject = "Warning: account removed"; - $sMsg = "You didn't log in in the past seven month to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past seven months to the AppDB.\r\n"; $sMsg .= "As you don't have any data associated to your account we have removed it.\r\n"; $sMsg .= "Please feel free to recreate an account anytime.\r\n"; @@ -166,4 +166,4 @@ function orphanVersionCheck() $sEmail = get_notify_email_address_list(null, null); /* get list admins */ if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); -} \ No newline at end of file +} Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.64 appdb/include/user.php:1.65 --- appdb/include/user.php:1.64 24 Mar 2006 3:20:34 -0000 +++ appdb/include/user.php 24 Mar 2006 3:20:34 -0000 @@ -656,15 +656,16 @@ class User { if($this->isMaintainer()) { $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six month to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; $sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n"; $sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n"; } else { $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six month to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; $sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n"; } + $sMsg .= APPDB_ROOT."account.php?cmd=login\r\n"; mail_appdb($this->sEmail, $sSubject, $sMsg);

1 0

appdb/. vendorview.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23744 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 21:15:04 Modified files: . : vendorview.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix up vendor view code to be more useful with a link for administrators to edit the vendor. Fix the link to the vendors website Patch: http://cvs.winehq.org/patch.py?id=23744 Old revision New revision Changes Path 1.12 1.13 +7 -2 appdb/vendorview.php Index: appdb/vendorview.php diff -u -p appdb/vendorview.php:1.12 appdb/vendorview.php:1.13 --- appdb/vendorview.php:1.12 24 Mar 2006 3:15: 4 -0000 +++ appdb/vendorview.php 24 Mar 2006 3:15: 4 -0000 @@ -36,10 +36,15 @@ if($oVendor->iVendorId) apidb_header("View Vendor"); echo html_frame_start("Vendor Information",500); - echo 'Vendor Name: '.$oVendor->sName.' ',"\n"; + echo 'Vendor Name: '.$oVendor->sName,"\n"; + if($_SESSION['current']->hasPriv("admin")) + { + echo ' [<a href="'.apidb_fullurl("admin/editVendor.php").'?iVendorId='.$oVendor->iVendorId.'">edit</a>]',"\n"; + } + echo ' ',"\n"; if ($oVendor->sWebpage) - echo 'Vendor URL: <a href="'.$oVendor->sWebpage.'">'.$oVendor->vendorURL.'</a> ',"\n"; + echo 'Vendor URL: <a href="'.$oVendor->sWebpage.'">'.$oVendor->sWebpage.'</a> ',"\n"; if($oVendor->aApplicationsIds)

1 0

Alexandre Julliard : msvcrt: Implementation of wcsftime ( based on a patch by Mike McCormack).
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 7fe881c7f2712e2e0d39342450470a94855782d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fe881c7f2712e2e0d39342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 20:35:52 2006 +0100 msvcrt: Implementation of wcsftime (based on a patch by Mike McCormack). --- dlls/msvcrt/time.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 819f905..ba1be48 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -445,10 +445,28 @@ MSVCRT_size_t MSVCRT_strftime( char *str MSVCRT_size_t MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) { - FIXME( "%p, %d, %s, %p - stub\n", str, max, debugstr_w(format), mstm ); + char *s, *fmt; + MSVCRT_size_t len; - *str = '\0'; - return 0; + TRACE("%p %d %s %p\n", str, max, debugstr_w(format), mstm ); + + len = WideCharToMultiByte( CP_UNIXCP, 0, format, -1, NULL, 0, NULL, NULL ); + if (!(fmt = MSVCRT_malloc( len ))) return 0; + WideCharToMultiByte( CP_UNIXCP, 0, format, -1, fmt, len, NULL, NULL ); + + if ((s = MSVCRT_malloc( max*4 ))) + { + struct tm tm; + msvcrt_tm_to_unix( &tm, mstm ); + if (!strftime( s, max*4, fmt, &tm )) s[0] = 0; + len = MultiByteToWideChar( CP_UNIXCP, 0, s, -1, str, max ); + if (len) len--; + MSVCRT_free( s ); + } + else len = 0; + + MSVCRT_free( fmt ); + return len; } /*********************************************************************

1 0