From ce4631d02f5fd75945826a571e2ad7957ed34a48 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 5 Jun 2009 18:59:41 +0000 Subject: [PATCH] 2009-06-05 20:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/win_prn1.c ! Fixed recently introduced editing mistake which enabled it for WinCE. * contrib/hbcrypt/sha1.c ! Fixed poccarm warning (octal notation changed to hexa). --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbcrypt/sha1.c | 2 +- harbour/contrib/hbwin/win_prn1.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 891a5ec40d..e4b3f81890 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-05 20:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbwin/win_prn1.c + ! Fixed recently introduced editing mistake which + enabled it for WinCE. + + * contrib/hbcrypt/sha1.c + ! Fixed poccarm warning (octal notation changed to hexa). + 2009-06-05 20:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * debian/copyright ! Synced with COPYING. diff --git a/harbour/contrib/hbcrypt/sha1.c b/harbour/contrib/hbcrypt/sha1.c index a68d42ab32..b8c0eb5c32 100644 --- a/harbour/contrib/hbcrypt/sha1.c +++ b/harbour/contrib/hbcrypt/sha1.c @@ -142,7 +142,7 @@ void SHA1_Final(sha1_byte digest[SHA1_DIGEST_LENGTH], SHA_CTX *context) { finalcount[i] = (sha1_byte)((context->count[(i >= 4 ? 0 : 1)] >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ } - SHA1_Update(context, (sha1_byte *)"\200", 1); + SHA1_Update(context, (sha1_byte *)"\x80", 1); while ((context->count[0] & 504) != 448) { SHA1_Update(context, (sha1_byte *)"\0", 1); } diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c index 051315eca8..1cad1ef53c 100644 --- a/harbour/contrib/hbwin/win_prn1.c +++ b/harbour/contrib/hbwin/win_prn1.c @@ -75,6 +75,8 @@ #include "hbapi.h" #include "hbapiitm.h" +#if defined(HB_OS_WIN) && !defined(HB_OS_WIN_CE) + #include #ifndef INVALID_FILE_SIZE @@ -687,3 +689,5 @@ HB_FUNC( WIN_SETBKMODE ) { hb_retnl( SetBkMode( win_HDC_par( 1 ), hb_parnl( 2 ) ) ); } + +#endif