fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-01-10 12:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbwin/win_prn3.c
    % Dropped hb_xgrab() return value checks for NULL.
    * Avoided lstrcpy().
This commit is contained in:
Viktor Szakats
2010-01-10 11:59:23 +00:00
parent 7d0eb012a9
commit 83d8970362
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-10 12:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_prn3.c
% Dropped hb_xgrab() return value checks for NULL.
* Avoided lstrcpy().
2010-01-10 11:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added gcc pkg to opensolaris pkg list.

24
harbour/contrib/hbwin/win_prn3.c
View File

@@ -104,11 +104,6 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
/* Allocate enough space for PRINTER_INFO_2. */
ppi2 = ( PRINTER_INFO_2 * ) hb_xgrab( dwNeeded );
if( ! ppi2 )
{
ClosePrinter( hPrinter );
return HB_FALSE;
}
/* The second GetPrinter() will fill in all the current information
so that all you have to do is modify what you are interested in. */
@@ -188,11 +183,6 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
/* Allocate enough space for PRINTER_INFO_2. */
ppi2 = ( PRINTER_INFO_2 * ) hb_xgrab( dwNeeded );
if( ! ppi2 )
{
ClosePrinter( hPrinter );
return HB_FALSE;
}
/* The second GetPrinter() fills in all the current
information. */
@@ -204,7 +194,7 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
return HB_FALSE;
}
/* TOFIX: Use safe string functions instead of lstrlen(), lstrcpy() and lstrcat().
/* TOFIX: Use safe string functions instead of lstrlen() and lstrcat().
[vszakats] */
/* Allocate buffer big enough for concatenated string.
@@ -212,21 +202,17 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
pBuffer = ( LPTSTR ) hb_xgrab( ( lstrlen( lpPrinterName ) +
lstrlen( ppi2->pDriverName ) +
lstrlen( ppi2->pPortName ) + 3 ) * sizeof( TCHAR ) );
if( ! pBuffer )
{
ClosePrinter( hPrinter );
hb_xfree( ppi2 );
return HB_FALSE;
}
pBuffer[ 0 ] = '\0';
/* Build string in form "printername,drivername,portname". */
lstrcpy( pBuffer, lpPrinterName );
lstrcat( pBuffer, lpPrinterName );
lstrcat( pBuffer, TEXT( "," ) );
lstrcat( pBuffer, ppi2->pDriverName );
lstrcat( pBuffer, TEXT( "," ) );
lstrcat( pBuffer, ppi2->pPortName );
/* Set the default printer in Win.ini and registry. */
/* Set the default printer in win.ini and registry. */
bFlag = WriteProfileString( TEXT( "windows" ), TEXT( "device" ), pBuffer );
if( ! bFlag )
{