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

2010-01-20 13:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbwin/Makefile
  + contrib/hbwin/wapi_wingdi.c
    + Added experimental WAPI wrappers for Windows GDI printing
      functions also found in win_prn1.c.
      This is partially to avoid the legacy interface which
      is a combination of WIN_* functions and Harbour class.
      Which may seem to make thing more complicated at first,
      but IME it provides a much cleaner interface, as you
      only have to adapt to MSDN docs.
      It's also a test bed for structure passing in WAPI
      situations. I've used hashes as the best looking
      solution, but even this has some things left to solve
      (like handling string types and returning values).
      Anyway it's a food for thought.

  * contrib/hbwin/hbwin.ch
    + Added WIN_DMORIENT_* constants.

  * contrib/hbwin/win_prn1.c
    ! Fixed to not accept raw pointers where HDC or HPEN is
      expected. I've added this feature last year, without
      making special mention of it in ChangeLog, so it was
      a double-mistake.
    * Minor cleanups (hb_retnl() vs hb_retni())
    % Optimization in WIN_SETBKMODE().
This commit is contained in:
Viktor Szakats
2010-01-20 12:53:44 +00:00
parent 10ccef2ce0
commit fdac3b6883
5 changed files with 463 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
harbour/ChangeLog
View File

@@ -17,10 +17,37 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-20 13:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/Makefile
+ contrib/hbwin/wapi_wingdi.c
+ Added experimental WAPI wrappers for Windows GDI printing
functions also found in win_prn1.c.
This is partially to avoid the legacy interface which
is a combination of WIN_* functions and Harbour class.
Which may seem to make thing more complicated at first,
but IME it provides a much cleaner interface, as you
only have to adapt to MSDN docs.
It's also a test bed for structure passing in WAPI
situations. I've used hashes as the best looking
solution, but even this has some things left to solve
(like handling string types and returning values).
Anyway it's a food for thought.
* contrib/hbwin/hbwin.ch
+ Added WIN_DMORIENT_* constants.
* contrib/hbwin/win_prn1.c
! Fixed to not accept raw pointers where HDC or HPEN is
expected. I've added this feature last year, without
making special mention of it in ChangeLog, so it was
a double-mistake.
* Minor cleanups (hb_retnl() vs hb_retni())
% Optimization in WIN_SETBKMODE().
2010-01-20 14:28 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/hbcairo/pdf.c
* harbour/contrib/hbcairo/png.c
* updated harbour level functions to be available, but return error
* updated harbour level functions to be available, but return error
result, if it is not supported by some version of cairo library
* harbour/contrib/hbcairo/image.c
* comment typo
@@ -32,13 +59,13 @@
* contrib/hbqt/qtgui/THBQSyntaxHighlighter.prg
* contrib/hbqt/qth/HBQSyntaxHighLighter.qth
% Improved syntax highlighting.
* contrib/hbide/hbide.prg
* contrib/hbide/ideactions.prg
* contrib/hbide/ideeditor.prg
* contrib/hbide/ideobject.prg
* contrib/hbide/idethemes.prg
! Struggling to get some artifacts fixed, mainly at a time
! Struggling to get some artifacts fixed, mainly at a time
when enter is pressed for new line.
+ Implemented F7 <Insert Separator> == "/*" + replicate( "-", 70 ) + "*/".

1
harbour/contrib/hbwin/Makefile
View File

@@ -33,6 +33,7 @@ C_SOURCES := \
wapi_shellapi.c \
wapi_winbase.c \
wapi_winbase_mutex.c \
wapi_wingdi.c \
wapi_winnls.c \
wapi_winuser.c \

4
harbour/contrib/hbwin/hbwin.ch
View File

@@ -192,6 +192,10 @@
#define WIN_DMDUP_VERTICAL 2
#define WIN_DMDUP_HORIZONTAL 3
/* WAPI DEVMODE "dmOrientation" modes */
#define WIN_DMORIENT_PORTRAIT 1
#define WIN_DMORIENT_LANDSCAPE 2
/* WIN_SETMAPMODE() parameters */
#define WIN_MM_TEXT 1
#define WIN_MM_LOMETRIC 2

422
harbour/contrib/hbwin/wapi_wingdi.c Normal file
View File

@@ -0,0 +1,422 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* Windows API functions (wingdi.h) (alpha)
*
* Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#define HB_OS_WIN_USED
#include "hbapi.h"
#include "hbapiitm.h"
#include "hbapierr.h"
#include "hbwinuni.h"
#include "hbwapi.h"
DEVMODE * hbwapi_par_DEVMODE( DEVMODE * p, int iParam, HB_BOOL bMandatory )
{
PHB_ITEM pHash = hb_param( iParam, HB_IT_HASH );
memset( p, 0, sizeof( DEVMODE ) );
p->dmSize = sizeof( DEVMODE );
if( pHash )
{
p->dmOrientation = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmOrientation" ) );
p->dmPaperSize = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmPaperSize" ) );
p->dmPaperLength = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmPaperLength" ) );
p->dmPaperWidth = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmPaperWidth" ) );
p->dmScale = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmScale" ) );
p->dmCopies = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmCopies" ) );
p->dmDefaultSource = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmDefaultSource" ) );
p->dmPrintQuality = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmPrintQuality" ) );
p->dmDuplex = hb_itemGetNI( hb_hashGetCItemPtr( pHash, "dmDuplex" ) );
if( hb_hashGetCItemPtr( pHash, "dmOrientation" ) ) p->dmFields |= DM_ORIENTATION;
if( hb_hashGetCItemPtr( pHash, "dmPaperSize" ) ) p->dmFields |= DM_PAPERSIZE;
if( hb_hashGetCItemPtr( pHash, "dmPaperLength" ) ) p->dmFields |= DM_PAPERLENGTH;
if( hb_hashGetCItemPtr( pHash, "dmPaperWidth" ) ) p->dmFields |= DM_PAPERWIDTH;
if( hb_hashGetCItemPtr( pHash, "dmScale" ) ) p->dmFields |= DM_SCALE;
if( hb_hashGetCItemPtr( pHash, "dmCopies" ) ) p->dmFields |= DM_COPIES;
if( hb_hashGetCItemPtr( pHash, "dmDefaultSource" ) ) p->dmFields |= DM_DEFAULTSOURCE;
if( hb_hashGetCItemPtr( pHash, "dmPrintQuality" ) ) p->dmFields |= DM_PRINTQUALITY;
if( hb_hashGetCItemPtr( pHash, "dmDuplex" ) ) p->dmFields |= DM_DUPLEX;
return p;
}
else
return bMandatory ? p : NULL;
}
HB_FUNC( WAPI_CREATEDC )
{
void * hDriver;
void * hDevice;
void * hOutput;
DEVMODE dm;
hbwapi_ret_HDC( CreateDC( HB_PARSTRDEF( 1, &hDriver, NULL ),
HB_PARSTRDEF( 2, &hDevice, NULL ),
HB_PARSTR( 3, &hOutput, NULL ),
hbwapi_par_DEVMODE( &dm, 4, HB_FALSE ) ) );
hb_strfree( hDriver );
hb_strfree( hDevice );
hb_strfree( hOutput );
}
HB_FUNC( WAPI_RESETDC )
{
HDC hDC = hbwapi_par_HDC( 1 );
DEVMODE dm;
if( hDC && hbwapi_par_DEVMODE( &dm, 2, HB_TRUE ) )
hb_retl( ResetDC( hDC, &dm ) == hDC );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_STARTDOC )
{
HDC hDC = hbwapi_par_HDC( 1 );
/* TODO: Use hash */
PHB_ITEM pDOCINFO = hb_param( 2, HB_IT_ARRAY );
if( hDC && pDOCINFO && hb_arrayLen( pDOCINFO ) >= 4 )
{
DOCINFO di;
void * hDocName;
void * hOutput;
void * hDatatype;
di.cbSize = sizeof( DOCINFO );
di.lpszDocName = HB_ARRAYGETSTR( pDOCINFO, 1, &hDocName , NULL ); /* DEF? */
di.lpszOutput = HB_ARRAYGETSTR( pDOCINFO, 2, &hOutput , NULL );
di.lpszDatatype = HB_ARRAYGETSTR( pDOCINFO, 3, &hDatatype, NULL );
di.fwType = ( DWORD ) hb_arrayGetNL( pDOCINFO, 4 );
hb_retni( StartDoc( hDC, &di ) );
hb_strfree( hDocName );
hb_strfree( hOutput );
hb_strfree( hDatatype );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_ENDDOC )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( EndDoc( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_ABORTDOC )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( AbortDoc( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_STARTPAGE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( StartPage( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_ENDPAGE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( EndPage( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_SETBKMODE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( SetBkMode( hDC, hb_parni( 2 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETBKMODE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( GetBkMode( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETDEVICECAPS )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( GetDeviceCaps( hDC, hb_parni( 2 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_SETMAPMODE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( SetMapMode( hDC, hb_parni( 2 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETMAPMODE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( GetMapMode( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_SETTEXTALIGN )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( ( int ) SetTextAlign( hDC, ( UINT ) hb_parni( 2 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETTEXTALIGN )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retni( ( int ) GetTextAlign( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_TEXTOUT )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
{
void * hData;
HB_SIZE nDataLen;
LPCTSTR lpData = HB_PARSTR( 4, &hData, &nDataLen );
hb_retl( TextOut( hDC, hb_parni( 2 ) /* iRow */,
hb_parni( 3 ) /* iCol */,
lpData,
nDataLen ) );
hb_strfree( hData );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_SETTEXTCOLOR )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retnl( ( long ) SetTextColor( hDC, ( COLORREF ) hb_parnl( 2 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETTEXTCOLOR )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retnl( ( long ) GetTextColor( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_SETBKCOLOR )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retnl( ( long ) SetBkColor( hDC, ( COLORREF ) hb_parnl( 2 ) ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETBKCOLOR )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retnl( ( long ) GetBkColor( hDC ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_CREATEPEN )
{
hbwapi_ret_HPEN( CreatePen( hb_parni( 1 ) /* fnPenStyle */,
hb_parni( 2 ) /* nWidth */,
( COLORREF ) hb_parnl( 3 ) /* crColor */ ) );
}
HB_FUNC( WAPI_CREATEFONT )
{
void * hFontFace;
hbwapi_ret_HFONT( CreateFont( hb_parni( 1 ) /* nHeight */,
hb_parni( 2 ) /* nWidth */,
hb_parni( 3 ) /* nEscapement */,
hb_parni( 4 ) /* nOrientation */,
hb_parni( 5 ) /* fnWeight */,
( DWORD ) hb_parl( 6 ) /* fdwItalic */,
( DWORD ) hb_parl( 7 ) /* fdwUnderline */,
( DWORD ) hb_parl( 8 ) /* fdwStrikeOut */,
( DWORD ) hb_parnl( 9 ) /* fdwCharSet */,
( DWORD ) hb_parnldef( 10, OUT_DEVICE_PRECIS ) /* fdwOutputPrecision */,
( DWORD ) hb_parnldef( 11, CLIP_DEFAULT_PRECIS ) /* fdwClipPrecision */,
( DWORD ) hb_parnldef( 12, DRAFT_QUALITY ) /* fdwQuality */,
( DWORD ) hb_parnldef( 13, DEFAULT_PITCH | FF_DONTCARE ) /* fdwPitchAndFamily */,
HB_PARSTR( 14, &hFontFace, NULL ) /* lpszFace */ ) );
hb_strfree( hFontFace );
}
HB_FUNC( WAPI_SELECTOBJECT )
{
HDC hDC = hbwapi_par_HDC( 1 );
HGDIOBJ h;
if( ( h = hbwapi_par_HPEN( 2 ) ) );
else if( ( h = hbwapi_par_HFONT( 2 ) ) );
/* TODO: Add BRUSH, BITMAP, REGION */
else
h = NULL;
if( hDC && h )
/* TODO: Return value */
SelectObject( hDC, h );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_MOVETOEX )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
{
PHB_ITEM pPOINT = hb_param( 4, HB_IT_ARRAY );
if( pPOINT && hb_arrayLen( pPOINT ) >= 2 )
{
POINT p;
hb_retl( MoveToEx( hDC, hb_parni( 2 ) /* X */, hb_parni( 3 ) /* Y */, &p ) );
/* TODO: Use hash */
hb_arraySetNL( pPOINT, 1, p.x );
hb_arraySetNL( pPOINT, 2, p.y );
}
else
hb_retl( MoveToEx( hDC, hb_parni( 2 ) /* X */, hb_parni( 3 ) /* Y */, NULL ) );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_LINETO )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
hb_retl( LineTo( hDC, hb_parni( 2 ) /* XEnd */, hb_parni( 3 ) /* YEnd */ ) );
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( WAPI_GETTEXTFACE )
{
HDC hDC = hbwapi_par_HDC( 1 );
if( hDC )
{
TCHAR tszFontName[ 128 ];
GetTextFace( hDC, HB_SIZEOFARRAY( tszFontName ) - 1, tszFontName );
HB_RETSTR( tszFontName );
}
else
hb_errRT_BASE( EG_ARG, 2010, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}

12
harbour/contrib/hbwin/win_prn1.c
View File

@@ -161,7 +161,7 @@ HPEN hbwapi_par_HPEN( int iParam )
{
void ** ph = ( void ** ) hb_parptrGC( &s_gc_HPEN_funcs, iParam );
return ph ? ( HPEN ) * ph : ( HPEN ) hb_parptr( iParam );
return ph ? ( HPEN ) * ph : NULL;
}
static HB_GARBAGE_FUNC( s_gc_HFONT_release )
@@ -203,7 +203,7 @@ HFONT hbwapi_par_HFONT( int iParam )
{
void ** ph = ( void ** ) hb_parptrGC( &s_gc_HFONT_funcs, iParam );
return ph ? ( HFONT ) * ph : ( HFONT ) hb_parptr( iParam );
return ph ? ( HFONT ) * ph : NULL;
}
HB_FUNC( WIN_CREATEDC )
@@ -401,14 +401,14 @@ HB_FUNC( WIN_GETDEVICECAPS )
{
HDC hDC = hbwapi_par_HDC( 1 );
hb_retnl( hDC && HB_ISNUM( 2 ) ? ( long ) GetDeviceCaps( hDC, hb_parni( 2 ) ) : 0 );
hb_retni( hDC && HB_ISNUM( 2 ) ? ( long ) GetDeviceCaps( hDC, hb_parni( 2 ) ) : 0 );
}
HB_FUNC( WIN_SETMAPMODE )
{
HDC hDC = hbwapi_par_HDC( 1 );
hb_retnl( hDC && HB_ISNUM( 2 ) ? SetMapMode( hDC, hb_parni( 2 ) ) : 0 );
hb_retni( hDC && HB_ISNUM( 2 ) ? SetMapMode( hDC, hb_parni( 2 ) ) : 0 );
}
HB_FUNC( WIN_CREATEFONT )
@@ -899,9 +899,9 @@ HB_FUNC( WIN_SETBKMODE )
if( hDC )
{
if( HB_ISNUM( 2 ) )
iMode = SetBkMode( hbwapi_par_HDC( 1 ), hb_parni( 2 ) );
iMode = SetBkMode( hDC, hb_parni( 2 ) );
else
iMode = GetBkMode( hbwapi_par_HDC( 1 ) );
iMode = GetBkMode( hDC );
}
hb_retni( iMode );
}