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

2010-03-08 00:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbwin/win_prn3.c
    % Changed local version detection to hb_iswin*() calls.
This commit is contained in:
Viktor Szakats
2010-03-07 23:38:34 +00:00
parent 8931845f33
commit f7c6bf4305
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -17,6 +17,10 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-08 00:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_prn3.c
% Changed local version detection to hb_iswin*() calls.
2010-03-08 00:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/win_prn2.c
! Changed one remaining local version detection to hb_iswin*() call.

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

@@ -93,16 +93,11 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
{
#if ! defined( HB_OS_WIN_CE )
BOOL bFlag;
OSVERSIONINFO osv;
DWORD dwNeeded = 0;
HANDLE hPrinter = NULL;
PRINTER_INFO_2 * ppi2 = NULL;
LPTSTR pBuffer = NULL;
/* What version of Windows are you running? */
osv.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
GetVersionEx( &osv );
/* If Windows 95 or 98, use SetPrinter. */
if( hb_iswin9x() )
{
@@ -155,9 +150,9 @@ static HB_BOOL hb_SetDefaultPrinter( LPCTSTR lpPrinterName )
}
/* If Windows NT, use the SetDefaultPrinter API for Windows 2000,
or WriteProfileString for version 4.0 and earlier. */
else if( osv.dwPlatformId == VER_PLATFORM_WIN32_NT )
else if( hb_iswinnt() )
{
if( osv.dwMajorVersion >= 5 ) /* Windows 2000 or later (use explicit call) */
if( hb_iswin2k() ) /* Windows 2000 or later (use explicit call) */
{
HMODULE hWinSpool;
typedef BOOL ( WINAPI * DEFPRINTER )( LPCTSTR ); /* stops warnings */