diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9179f9addf..2a77500a59 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-17 19:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * package/winuni/RELNOTES + * INSTALL + * contrib/rddads/rddads.h + * contrib/rddads/rddads.hbc + * contrib/rddads/rddads.hbp + + Added support for ACE 10.00, including win64 build. + + * contrib/hbwin/hbwin.ch + + contrib/xhb/win32prn.ch + + Added compatibility header. + * Moved compatibility definitions from hbwin.ch there. + (may be incompatible for some users) + + * contrib/hbgd/hbgd.hbp + + contrib/hbgd/gdextern.prg + + Added extern puller. + + * contrib/rddads/adsextrn.prg + * Minor. + 2010-08-17 09:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + contrib/hbqt/qtgui/hbqt_hbqgraphicsrectitem.h + Added: miss from the prev commit. diff --git a/harbour/INSTALL b/harbour/INSTALL index 9e8df613fc..18f51d51ef 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -389,7 +389,7 @@ HARBOUR For contrib/rddads lib: Download and install 'Advantage Client Engine API for Linux' package - (f.e. aceapi-9.10.0.0.tar.gz) + (f.e. aceapi-10.00.0.3.tar.gz) For contrib/hbhpdf lib, if you don't wish to use locally hosted version: Download libharu from http://libharu.org/ -> './configure' -> 'make install' diff --git a/harbour/contrib/hbgd/gdextern.prg b/harbour/contrib/hbgd/gdextern.prg new file mode 100644 index 0000000000..2320420d35 --- /dev/null +++ b/harbour/contrib/hbgd/gdextern.prg @@ -0,0 +1,55 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Extern puller + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://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 __HBEXTERN__HBGD__ANNOUNCE +#define __HBEXTERN__HBGD__REQUEST +#include "hbgd.hbx" diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp index dcabd9b1e7..dc5435d52b 100644 --- a/harbour/contrib/hbgd/hbgd.hbp +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -29,4 +29,5 @@ gd.prg gdbar.prg gdchart.prg gdimage.prg +gdextern.prg gdbarcod.prg diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch index f8ef0ed3aa..0ab3b368dc 100644 --- a/harbour/contrib/hbwin/hbwin.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -742,170 +742,4 @@ #define HB_WIN_DE_ERRORONDEST_ 0x10000 /* An unspecified error occurred on the destination. */ #define HB_WIN_DE_ROOTDIR_ERRORONDEST_ 0x10074 /* Destination is a root directory and cannot be renamed. */ -/* ------------------------------- */ -/* Deprecated constants and macros */ -/* ------------------------------- */ - -#if defined( HB_LEGACY_LEVEL3 ) -#if ! defined( HB_WIN_NO_LEGACY ) - -#define HKEY_CLASSES_ROOT WIN_HKEY_CLASSES_ROOT -#define HKEY_CURRENT_USER WIN_HKEY_CURRENT_USER -#define HKEY_LOCAL_MACHINE WIN_HKEY_LOCAL_MACHINE -#define HKEY_USERS WIN_HKEY_USERS -#define HKEY_PERFORMANCE_DATA WIN_HKEY_PERFORMANCE_DATA -#define HKEY_CURRENT_CONFIG WIN_HKEY_CURRENT_CONFIG -#define HKEY_DYN_DATA WIN_HKEY_DYN_DATA - -#define CBR_110 WIN_CBR_110 -#define CBR_300 WIN_CBR_300 -#define CBR_600 WIN_CBR_600 -#define CBR_1200 WIN_CBR_1200 -#define CBR_2400 WIN_CBR_2400 -#define CBR_4800 WIN_CBR_4800 -#define CBR_9600 WIN_CBR_9600 -#define CBR_14400 WIN_CBR_14400 -#define CBR_19200 WIN_CBR_19200 -#define CBR_38400 WIN_CBR_38400 -#define CBR_56000 WIN_CBR_56000 -#define CBR_57600 WIN_CBR_57600 -#define CBR_115200 WIN_CBR_115200 -#define CBR_128000 WIN_CBR_128000 -#define CBR_256000 WIN_CBR_256000 - -#define NOPARITY WIN_NOPARITY -#define ODDPARITY WIN_ODDPARITY -#define EVENPARITY WIN_EVENPARITY -#define MARKPARITY WIN_MARKPARITY -#define SPACEPARITY WIN_SPACEPARITY - -#define ONESTOPBIT WIN_ONESTOPBIT -#define ONE5STOPBITS WIN_ONE5STOPBITS -#define TWOSTOPBITS WIN_TWOSTOPBITS - -#define DTR_CONTROL_DISABLE WIN_DTR_CONTROL_DISABLE -#define DTR_CONTROL_ENABLE WIN_DTR_CONTROL_ENABLE -#define DTR_CONTROL_HANDSHAKE WIN_DTR_CONTROL_HANDSHAKE - -#define RTS_CONTROL_DISABLE WIN_RTS_CONTROL_DISABLE -#define RTS_CONTROL_ENABLE WIN_RTS_CONTROL_ENABLE -#define RTS_CONTROL_HANDSHAKE WIN_RTS_CONTROL_HANDSHAKE -#define RTS_CONTROL_TOGGLE WIN_RTS_CONTROL_TOGGLE - -#define FORM_LETTER WIN_DMPAPER_LETTER -#define FORM_A4 WIN_DMPAPER_A4 -#define FORM_CUSTOM WIN_DMPAPER_USER - -#define PS_SOLID WIN_PS_SOLID - -#define RGB( nR, nG, nB ) WIN_RGB( nR, nG, nB ) - -#define RGB_BLACK HB_WIN_RGB_BLACK -#define RGB_BLUE HB_WIN_RGB_BLUE -#define RGB_GREEN HB_WIN_RGB_GREEN -#define RGB_CYAN HB_WIN_RGB_CYAN -#define RGB_RED HB_WIN_RGB_RED -#define RGB_MAGENTA HB_WIN_RGB_MAGENTA -#define RGB_BROWN HB_WIN_RGB_YELLOW -#define RGB_WHITE HB_WIN_RGB_WHITE - -#define MM_TEXT WIN_MM_TEXT -#define MM_LOMETRIC WIN_MM_LOMETRIC -#define MM_HIMETRIC WIN_MM_HIMETRIC -#define MM_LOENGLISH WIN_MM_LOENGLISH -#define MM_HIENGLISH WIN_MM_HIENGLISH - -#define FW_DONTCARE WIN_FW_DONTCARE -#define FW_THIN WIN_FW_THIN -#define FW_EXTRALIGHT WIN_FW_EXTRALIGHT -#define FW_ULTRALIGHT WIN_FW_ULTRALIGHT -#define FW_LIGHT WIN_FW_LIGHT -#define FW_NORMAL WIN_FW_NORMAL -#define FW_REGULAR WIN_FW_REGULAR -#define FW_MEDIUM WIN_FW_MEDIUM -#define FW_SEMIBOLD WIN_FW_SEMIBOLD -#define FW_DEMIBOLD WIN_FW_DEMIBOLD -#define FW_BOLD WIN_FW_BOLD -#define FW_EXTRABOLD WIN_FW_EXTRABOLD -#define FW_ULTRABOLD WIN_FW_ULTRABOLD -#define FW_HEAVY WIN_FW_HEAVY -#define FW_BLACK WIN_FW_BLACK - -#define TA_NOUPDATECP WIN_TA_NOUPDATECP -#define TA_UPDATECP WIN_TA_UPDATECP -#define TA_LEFT WIN_TA_LEFT -#define TA_RIGHT WIN_TA_RIGHT -#define TA_CENTER WIN_TA_CENTER -#define TA_TOP WIN_TA_TOP -#define TA_BOTTOM WIN_TA_BOTTOM -#define TA_BASELINE WIN_TA_BASELINE - -#define HORZSIZE WIN_HORZSIZE -#define VERTSIZE WIN_VERTSIZE -#define HORZRES WIN_HORZRES -#define VERTRES WIN_VERTRES -#define NUMBRUSHES WIN_NUMBRUSHES -#define NUMPENS WIN_NUMPENS -#define NUMFONTS WIN_NUMFONTS -#define NUMCOLORS WIN_NUMCOLORS -#define RASTERCAPS WIN_RASTERCAPS -#define LOGPIXELSX WIN_LOGPIXELSX -#define LOGPIXELSY WIN_LOGPIXELSY -#define PHYSICALWIDTH WIN_PHYSICALWIDTH -#define PHYSICALHEIGHT WIN_PHYSICALHEIGHT -#define PHYSICALOFFSETX WIN_PHYSICALOFFSETX -#define PHYSICALOFFSETY WIN_PHYSICALOFFSETY -#define SCALINGFACTORX WIN_SCALINGFACTORX -#define SCALINGFACTORY WIN_SCALINGFACTORY - -#define DMBIN_UPPER WIN_DMBIN_UPPER -#define DMBIN_ONLYONE WIN_DMBIN_ONLYONE -#define DMBIN_LOWER WIN_DMBIN_LOWER -#define DMBIN_MIDDLE WIN_DMBIN_MIDDLE -#define DMBIN_MANUAL WIN_DMBIN_MANUAL -#define DMBIN_ENVELOPE WIN_DMBIN_ENVELOPE -#define DMBIN_ENVMANUAL WIN_DMBIN_ENVMANUAL -#define DMBIN_AUTO WIN_DMBIN_AUTO -#define DMBIN_TRACTOR WIN_DMBIN_TRACTOR -#define DMBIN_SMALLFMT WIN_DMBIN_SMALLFMT -#define DMBIN_LARGEFMT WIN_DMBIN_LARGEFMT -#define DMBIN_LARGECAPACITY WIN_DMBIN_LARGECAPACITY -#define DMBIN_CASSETTE WIN_DMBIN_CASSETTE -#define DMBIN_FORMSOURCE WIN_DMBIN_FORMSOURCE -#define DMBIN_FIRST WIN_DMBIN_FIRST -#define DMBIN_LAST WIN_DMBIN_LAST - -#define DMRES_DRAFT WIN_DMRES_DRAFT -#define DMRES_LOW WIN_DMRES_LOW -#define DMRES_MEDIUM WIN_DMRES_MEDIUM -#define DMRES_HIGH WIN_DMRES_HIGH - -#define DMDUP_SIMPLEX WIN_DMDUP_SIMPLEX -#define DMDUP_VERTICAL WIN_DMDUP_VERTICAL -#define DMDUP_HORIZONTAL WIN_DMDUP_HORIZONTAL - -#define ANSI_CHARSET WIN_ANSI_CHARSET -#define DEFAULT_CHARSET WIN_DEFAULT_CHARSET -#define SYMBOL_CHARSET WIN_SYMBOL_CHARSET -#define MAC_CHARSET WIN_MAC_CHARSET -#define SHIFTJIS_CHARSET WIN_SHIFTJIS_CHARSET -#define HANGEUL_CHARSET WIN_HANGEUL_CHARSET -#define HANGUL_CHARSET WIN_HANGUL_CHARSET -#define JOHAB_CHARSET WIN_JOHAB_CHARSET -#define GB2312_CHARSET WIN_GB2312_CHARSET -#define CHINESEBIG5_CHARSET WIN_CHINESEBIG5_CHARSET -#define GREEK_CHARSET WIN_GREEK_CHARSET -#define TURKISH_CHARSET WIN_TURKISH_CHARSET -#define VIETNAMESE_CHARSET WIN_VIETNAMESE_CHARSET -#define HEBREW_CHARSET WIN_HEBREW_CHARSET -#define ARABIC_CHARSET WIN_ARABIC_CHARSET -#define BALTIC_CHARSET WIN_BALTIC_CHARSET -#define RUSSIAN_CHARSET WIN_RUSSIAN_CHARSET -#define THAI_CHARSET WIN_THAI_CHARSET -#define EASTEUROPE_CHARSET WIN_EASTEUROPE_CHARSET -#define OEM_CHARSET WIN_OEM_CHARSET - -#endif -#endif - #endif /* HBWIN_CH_ */ diff --git a/harbour/contrib/rddads/adsextrn.prg b/harbour/contrib/rddads/adsextrn.prg index 976284ba10..2718616f8b 100644 --- a/harbour/contrib/rddads/adsextrn.prg +++ b/harbour/contrib/rddads/adsextrn.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Windows API functions (winnetwk.h - mpr.dll) + * Extern puller * * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) * www - http://harbour-project.org diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h index 7adc81764e..224977b21c 100644 --- a/harbour/contrib/rddads/rddads.h +++ b/harbour/contrib/rddads/rddads.h @@ -72,8 +72,10 @@ #include "ace.h" /* Autodetect ACE version. */ -#if defined( DANISH_ADS_CS_AS_1252 ) - #define _ADS_LIB_VERSION 910 /* or upper */ +#if defined( ADS_DEFAULT_SQL_TIMEOUT ) + #define _ADS_LIB_VERSION 1000 /* or upper */ +#elif defined( DANISH_ADS_CS_AS_1252 ) + #define _ADS_LIB_VERSION 910 #elif defined( ADS_NOTIFICATION_CONNECTION ) #define _ADS_LIB_VERSION 900 #elif defined( ADS_UDP_IP_CONNECTION ) diff --git a/harbour/contrib/rddads/rddads.hbc b/harbour/contrib/rddads/rddads.hbc index 91d9a3a2d8..ba2c63b04f 100644 --- a/harbour/contrib/rddads/rddads.hbc +++ b/harbour/contrib/rddads/rddads.hbc @@ -13,5 +13,6 @@ incpaths=. {HB_DYNLOAD_RDDADS}shared=yes {!HB_DYNLOAD_RDDADS}libs=${hb_name}${__HB_DYN__} -{!HB_DYNLOAD_RDDADS&win}libs=ace32 +{!HB_DYNLOAD_RDDADS&win&x86}libs=ace32 +{!HB_DYNLOAD_RDDADS&win&x86_64}libs=ace64 {!HB_DYNLOAD_RDDADS&linux}libs=ace diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index a01debec1f..f0bae8791f 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -15,9 +15,10 @@ -depcontrol=ads:${HB_WITH_ADS} -depincpath=ads:/usr/local/ads/acesdk -depincpath=ads:${HOME}/ads/acesdk --depimplibs=ads:Redistribute/ace32.dll --depimplibs=ads:ace32.dll --depimplibs=ads:32bit/ace32.dll +{x86_64}-depimplibs=ads:ace64.dll +{x86}-depimplibs=ads:ace32.dll +{x86}-depimplibs=ads:Redistribute/ace32.dll +{x86}-depimplibs=ads:32bit/ace32.dll -instfile=inc:ads.ch -instfile=inc:adsextrn.ch diff --git a/harbour/contrib/xhb/win32prn.ch b/harbour/contrib/xhb/win32prn.ch new file mode 100644 index 0000000000..fd3fcae025 --- /dev/null +++ b/harbour/contrib/xhb/win32prn.ch @@ -0,0 +1,444 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Compatibility header + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://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. + * + */ + +#ifndef _WIN32PRN_CH +#define _WIN32PRN_CH + +#include "hbwin.ch" + +/* ------------------------------- */ +/* Deprecated constants and macros */ +/* ------------------------------- */ + +#define HKEY_CLASSES_ROOT WIN_HKEY_CLASSES_ROOT +#define HKEY_CURRENT_USER WIN_HKEY_CURRENT_USER +#define HKEY_LOCAL_MACHINE WIN_HKEY_LOCAL_MACHINE +#define HKEY_USERS WIN_HKEY_USERS +#define HKEY_PERFORMANCE_DATA WIN_HKEY_PERFORMANCE_DATA +#define HKEY_CURRENT_CONFIG WIN_HKEY_CURRENT_CONFIG +#define HKEY_DYN_DATA WIN_HKEY_DYN_DATA + +#define CBR_110 WIN_CBR_110 +#define CBR_300 WIN_CBR_300 +#define CBR_600 WIN_CBR_600 +#define CBR_1200 WIN_CBR_1200 +#define CBR_2400 WIN_CBR_2400 +#define CBR_4800 WIN_CBR_4800 +#define CBR_9600 WIN_CBR_9600 +#define CBR_14400 WIN_CBR_14400 +#define CBR_19200 WIN_CBR_19200 +#define CBR_38400 WIN_CBR_38400 +#define CBR_56000 WIN_CBR_56000 +#define CBR_57600 WIN_CBR_57600 +#define CBR_115200 WIN_CBR_115200 +#define CBR_128000 WIN_CBR_128000 +#define CBR_256000 WIN_CBR_256000 + +#define NOPARITY WIN_NOPARITY +#define ODDPARITY WIN_ODDPARITY +#define EVENPARITY WIN_EVENPARITY +#define MARKPARITY WIN_MARKPARITY +#define SPACEPARITY WIN_SPACEPARITY + +#define ONESTOPBIT WIN_ONESTOPBIT +#define ONE5STOPBITS WIN_ONE5STOPBITS +#define TWOSTOPBITS WIN_TWOSTOPBITS + +#define DTR_CONTROL_DISABLE WIN_DTR_CONTROL_DISABLE +#define DTR_CONTROL_ENABLE WIN_DTR_CONTROL_ENABLE +#define DTR_CONTROL_HANDSHAKE WIN_DTR_CONTROL_HANDSHAKE + +#define RTS_CONTROL_DISABLE WIN_RTS_CONTROL_DISABLE +#define RTS_CONTROL_ENABLE WIN_RTS_CONTROL_ENABLE +#define RTS_CONTROL_HANDSHAKE WIN_RTS_CONTROL_HANDSHAKE +#define RTS_CONTROL_TOGGLE WIN_RTS_CONTROL_TOGGLE + +#define FORM_LETTER WIN_DMPAPER_LETTER +#define FORM_A4 WIN_DMPAPER_A4 +#define FORM_CUSTOM WIN_DMPAPER_USER + +#define PS_SOLID WIN_PS_SOLID + +#define RGB( nR, nG, nB ) WIN_RGB( nR, nG, nB ) + +#define RGB_BLACK HB_WIN_RGB_BLACK +#define RGB_BLUE HB_WIN_RGB_BLUE +#define RGB_GREEN HB_WIN_RGB_GREEN +#define RGB_CYAN HB_WIN_RGB_CYAN +#define RGB_RED HB_WIN_RGB_RED +#define RGB_MAGENTA HB_WIN_RGB_MAGENTA +#define RGB_BROWN HB_WIN_RGB_YELLOW +#define RGB_WHITE HB_WIN_RGB_WHITE + +#define MM_TEXT WIN_MM_TEXT +#define MM_LOMETRIC WIN_MM_LOMETRIC +#define MM_HIMETRIC WIN_MM_HIMETRIC +#define MM_LOENGLISH WIN_MM_LOENGLISH +#define MM_HIENGLISH WIN_MM_HIENGLISH + +#define FW_DONTCARE WIN_FW_DONTCARE +#define FW_THIN WIN_FW_THIN +#define FW_EXTRALIGHT WIN_FW_EXTRALIGHT +#define FW_ULTRALIGHT WIN_FW_ULTRALIGHT +#define FW_LIGHT WIN_FW_LIGHT +#define FW_NORMAL WIN_FW_NORMAL +#define FW_REGULAR WIN_FW_REGULAR +#define FW_MEDIUM WIN_FW_MEDIUM +#define FW_SEMIBOLD WIN_FW_SEMIBOLD +#define FW_DEMIBOLD WIN_FW_DEMIBOLD +#define FW_BOLD WIN_FW_BOLD +#define FW_EXTRABOLD WIN_FW_EXTRABOLD +#define FW_ULTRABOLD WIN_FW_ULTRABOLD +#define FW_HEAVY WIN_FW_HEAVY +#define FW_BLACK WIN_FW_BLACK + +#define TA_NOUPDATECP WIN_TA_NOUPDATECP +#define TA_UPDATECP WIN_TA_UPDATECP +#define TA_LEFT WIN_TA_LEFT +#define TA_RIGHT WIN_TA_RIGHT +#define TA_CENTER WIN_TA_CENTER +#define TA_TOP WIN_TA_TOP +#define TA_BOTTOM WIN_TA_BOTTOM +#define TA_BASELINE WIN_TA_BASELINE + +#define HORZSIZE WIN_HORZSIZE +#define VERTSIZE WIN_VERTSIZE +#define HORZRES WIN_HORZRES +#define VERTRES WIN_VERTRES +#define NUMBRUSHES WIN_NUMBRUSHES +#define NUMPENS WIN_NUMPENS +#define NUMFONTS WIN_NUMFONTS +#define NUMCOLORS WIN_NUMCOLORS +#define RASTERCAPS WIN_RASTERCAPS +#define LOGPIXELSX WIN_LOGPIXELSX +#define LOGPIXELSY WIN_LOGPIXELSY +#define PHYSICALWIDTH WIN_PHYSICALWIDTH +#define PHYSICALHEIGHT WIN_PHYSICALHEIGHT +#define PHYSICALOFFSETX WIN_PHYSICALOFFSETX +#define PHYSICALOFFSETY WIN_PHYSICALOFFSETY +#define SCALINGFACTORX WIN_SCALINGFACTORX +#define SCALINGFACTORY WIN_SCALINGFACTORY + +#define DMBIN_UPPER WIN_DMBIN_UPPER +#define DMBIN_ONLYONE WIN_DMBIN_ONLYONE +#define DMBIN_LOWER WIN_DMBIN_LOWER +#define DMBIN_MIDDLE WIN_DMBIN_MIDDLE +#define DMBIN_MANUAL WIN_DMBIN_MANUAL +#define DMBIN_ENVELOPE WIN_DMBIN_ENVELOPE +#define DMBIN_ENVMANUAL WIN_DMBIN_ENVMANUAL +#define DMBIN_AUTO WIN_DMBIN_AUTO +#define DMBIN_TRACTOR WIN_DMBIN_TRACTOR +#define DMBIN_SMALLFMT WIN_DMBIN_SMALLFMT +#define DMBIN_LARGEFMT WIN_DMBIN_LARGEFMT +#define DMBIN_LARGECAPACITY WIN_DMBIN_LARGECAPACITY +#define DMBIN_CASSETTE WIN_DMBIN_CASSETTE +#define DMBIN_FORMSOURCE WIN_DMBIN_FORMSOURCE +#define DMBIN_FIRST WIN_DMBIN_FIRST +#define DMBIN_LAST WIN_DMBIN_LAST + +#define DMRES_DRAFT WIN_DMRES_DRAFT +#define DMRES_LOW WIN_DMRES_LOW +#define DMRES_MEDIUM WIN_DMRES_MEDIUM +#define DMRES_HIGH WIN_DMRES_HIGH + +#define DMDUP_SIMPLEX WIN_DMDUP_SIMPLEX +#define DMDUP_VERTICAL WIN_DMDUP_VERTICAL +#define DMDUP_HORIZONTAL WIN_DMDUP_HORIZONTAL + +#define ANSI_CHARSET WIN_ANSI_CHARSET +#define DEFAULT_CHARSET WIN_DEFAULT_CHARSET +#define SYMBOL_CHARSET WIN_SYMBOL_CHARSET +#define MAC_CHARSET WIN_MAC_CHARSET +#define SHIFTJIS_CHARSET WIN_SHIFTJIS_CHARSET +#define HANGEUL_CHARSET WIN_HANGEUL_CHARSET +#define HANGUL_CHARSET WIN_HANGUL_CHARSET +#define JOHAB_CHARSET WIN_JOHAB_CHARSET +#define GB2312_CHARSET WIN_GB2312_CHARSET +#define CHINESEBIG5_CHARSET WIN_CHINESEBIG5_CHARSET +#define GREEK_CHARSET WIN_GREEK_CHARSET +#define TURKISH_CHARSET WIN_TURKISH_CHARSET +#define VIETNAMESE_CHARSET WIN_VIETNAMESE_CHARSET +#define HEBREW_CHARSET WIN_HEBREW_CHARSET +#define ARABIC_CHARSET WIN_ARABIC_CHARSET +#define BALTIC_CHARSET WIN_BALTIC_CHARSET +#define RUSSIAN_CHARSET WIN_RUSSIAN_CHARSET +#define THAI_CHARSET WIN_THAI_CHARSET +#define EASTEUROPE_CHARSET WIN_EASTEUROPE_CHARSET +#define OEM_CHARSET WIN_OEM_CHARSET + +#define MM_TO_INCH 25.4 + +/* Background mode */ +#define TRANSPARENT 1 +#define OPAQUE 2 + +/* Brush Styles */ +#define BS_SOLID 0 +#define BS_NULL 1 +#define BS_HOLLOW BS_NULL +#define BS_HATCHED 2 +#define BS_PATTERN 3 +#define BS_INDEXED 4 +#define BS_DIBPATTERN 5 +#define BS_DIBPATTERNPT 6 +#define BS_PATTERN8X8 7 +#define BS_DIBPATTERN8X8 8 +#define BS_MONOPATTERN 9 + +/* Hatch Styles */ +#define HS_HORIZONTAL 0 +#define HS_VERTICAL 1 +#define HS_FDIAGONAL 2 +#define HS_BDIAGONAL 3 +#define HS_CROSS 4 +#define HS_DIAGCROSS 5 + +/* Pen Styles */ +#define PS_SOLID 0 +#define PS_DASH 1 +#define PS_DOT 2 +#define PS_DASHDOT 3 +#define PS_DASHDOTDOT 4 +#define PS_NULL 5 +#define PS_INSIDEFRAME 6 +#define PS_USERSTYLE 7 +#define PS_ALTERNATE 8 +#define PS_STYLE_MASK 0x0000000F + +/* Stock Logical Objects */ +#define WHITE_BRUSH 0 +#define LTGRAY_BRUSH 1 +#define GRAY_BRUSH 2 +#define DKGRAY_BRUSH 3 +#define BLACK_BRUSH 4 +#define NULL_BRUSH 5 +#define HOLLOW_BRUSH NULL_BRUSH + +#define WHITE_PEN 6 +#define BLACK_PEN 7 +#define NULL_PEN 8 + +#define OEM_FIXED_FONT 10 +#define ANSI_FIXED_FONT 11 +#define ANSI_VAR_FONT 12 +#define SYSTEM_FONT 13 +#define DEVICE_DEFAULT_FONT 14 +#define DEFAULT_PALETTE 15 +#define SYSTEM_FIXED_FONT 16 + +/* Draw Text Styles */ +#define DT_TOP 0x00000000 +#define DT_LEFT 0x00000000 +#define DT_CENTER 0x00000001 +#define DT_RIGHT 0x00000002 +#define DT_VCENTER 0x00000004 +#define DT_BOTTOM 0x00000008 +#define DT_WORDBREAK 0x00000010 +#define DT_SINGLELINE 0x00000020 +#define DT_EXPANDTABS 0x00000040 +#define DT_TABSTOP 0x00000080 +#define DT_NOCLIP 0x00000100 +#define DT_EXTERNALLEADING 0x00000200 +#define DT_CALCRECT 0x00000400 +#define DT_NOPREFIX 0x00000800 +#define DT_INTERNAL 0x00001000 + +#define DT_EDITCONTROL 0x00002000 +#define DT_PATH_ELLIPSIS 0x00004000 +#define DT_END_ELLIPSIS 0x00008000 +#define DT_MODIFYSTRING 0x00010000 +#define DT_RTLREADING 0x00020000 +#define DT_WORD_ELLIPSIS 0x00040000 +#define DT_NOFULLWIDTHCHARBREAK 0x00080000 +#define DT_HIDEPREFIX 0x00100000 +#define DT_PREFIXONLY 0x00200000 + +/* Color */ +#define BLACK 0x00000000 +#define BLUE 0x00FF0000 +#define BROWN 0x000A0A80 +#define CYAN 0x00FFFF00 +#define GRAY 0x00808080 +#define GREEN 0x0000FF00 +#define MAGENTA 0x00FF00FF +#define ORANGE 0X000A80FF +#define PINK 0x00CBC0FF +#define PURPLE 0x00800080 +#define RED 0x000000FF +#define WHITE 0x00FFFFFF +#define YELLOW 0x0000FFFF +#define DARKGRAY 0x00A9A9A9 +#define LIGHTGRAY 0x00D3D3D3 + +/* Device mode: Paper Size */ +#define DMPAPER_FIRST DMPAPER_LETTER +#define DMPAPER_LETTER 1 +#define DMPAPER_LETTERSMALL 2 +#define DMPAPER_TABLOID 3 +#define DMPAPER_LEDGER 4 +#define DMPAPER_LEGAL 5 +#define DMPAPER_STATEMENT 6 +#define DMPAPER_EXECUTIVE 7 +#define DMPAPER_A3 8 +#define DMPAPER_A4 9 +#define DMPAPER_A4SMALL 10 +#define DMPAPER_A5 11 +#define DMPAPER_B4 12 +#define DMPAPER_B5 13 +#define DMPAPER_FOLIO 14 +#define DMPAPER_QUARTO 15 +#define DMPAPER_10X14 16 +#define DMPAPER_11X17 17 +#define DMPAPER_NOTE 18 +#define DMPAPER_ENV_9 19 +#define DMPAPER_ENV_10 20 +#define DMPAPER_ENV_11 21 +#define DMPAPER_ENV_12 22 +#define DMPAPER_ENV_14 23 +#define DMPAPER_CSHEET 24 +#define DMPAPER_DSHEET 25 +#define DMPAPER_ESHEET 26 +#define DMPAPER_ENV_DL 27 +#define DMPAPER_ENV_C5 28 +#define DMPAPER_ENV_C3 29 +#define DMPAPER_ENV_C4 30 +#define DMPAPER_ENV_C6 31 +#define DMPAPER_ENV_C65 32 +#define DMPAPER_ENV_B4 33 +#define DMPAPER_ENV_B5 34 +#define DMPAPER_ENV_B6 35 +#define DMPAPER_ENV_ITALY 36 +#define DMPAPER_ENV_MONARCH 37 +#define DMPAPER_ENV_PERSONAL 38 +#define DMPAPER_FANFOLD_US 39 +#define DMPAPER_FANFOLD_STD_GERMAN 40 +#define DMPAPER_FANFOLD_LGL_GERMAN 41 +#define DMPAPER_ISO_B4 42 +#define DMPAPER_JAPANESE_POSTCARD 43 +#define DMPAPER_9X11 44 +#define DMPAPER_10X11 45 +#define DMPAPER_15X11 46 +#define DMPAPER_ENV_INVITE 47 +#define DMPAPER_RESERVED_48 48 +#define DMPAPER_RESERVED_49 49 +#define DMPAPER_LETTER_EXTRA 50 +#define DMPAPER_LEGAL_EXTRA 51 +#define DMPAPER_TABLOID_EXTRA 52 +#define DMPAPER_A4_EXTRA 53 +#define DMPAPER_LETTER_TRANSVERSE 54 +#define DMPAPER_A4_TRANSVERSE 55 +#define DMPAPER_LETTER_EXTRA_TRANSVERSE 56 +#define DMPAPER_A_PLUS 57 +#define DMPAPER_B_PLUS 58 +#define DMPAPER_LETTER_PLUS 59 +#define DMPAPER_A4_PLUS 60 +#define DMPAPER_A5_TRANSVERSE 61 +#define DMPAPER_B5_TRANSVERSE 62 +#define DMPAPER_A3_EXTRA 63 +#define DMPAPER_A5_EXTRA 64 +#define DMPAPER_B5_EXTRA 65 +#define DMPAPER_A2 66 +#define DMPAPER_A3_TRANSVERSE 67 +#define DMPAPER_A3_EXTRA_TRANSVERSE 68 +#define DMPAPER_DBL_JAPANESE_POSTCARD 69 +#define DMPAPER_A6 70 +#define DMPAPER_JENV_KAKU2 71 +#define DMPAPER_JENV_KAKU3 72 +#define DMPAPER_JENV_CHOU3 73 +#define DMPAPER_JENV_CHOU4 74 +#define DMPAPER_LETTER_ROTATED 75 +#define DMPAPER_A3_ROTATED 76 +#define DMPAPER_A4_ROTATED 77 +#define DMPAPER_A5_ROTATED 78 +#define DMPAPER_B4_JIS_ROTATED 79 +#define DMPAPER_B5_JIS_ROTATED 80 +#define DMPAPER_JAPANESE_POSTCARD_ROTATED 81 +#define DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED 82 +#define DMPAPER_A6_ROTATED 83 +#define DMPAPER_JENV_KAKU2_ROTATED 84 +#define DMPAPER_JENV_KAKU3_ROTATED 85 +#define DMPAPER_JENV_CHOU3_ROTATED 86 +#define DMPAPER_JENV_CHOU4_ROTATED 87 +#define DMPAPER_B6_JIS 88 +#define DMPAPER_B6_JIS_ROTATED 89 +#define DMPAPER_12X11 90 +#define DMPAPER_JENV_YOU4 91 +#define DMPAPER_JENV_YOU4_ROTATED 92 +#define DMPAPER_P16K 93 +#define DMPAPER_P32K 94 +#define DMPAPER_P32KBIG 95 +#define DMPAPER_PENV_1 96 +#define DMPAPER_PENV_2 97 +#define DMPAPER_PENV_3 98 +#define DMPAPER_PENV_4 99 +#define DMPAPER_PENV_5 100 +#define DMPAPER_PENV_6 101 +#define DMPAPER_PENV_7 102 +#define DMPAPER_PENV_8 103 +#define DMPAPER_PENV_9 104 +#define DMPAPER_PENV_10 105 +#define DMPAPER_P16K_ROTATED 106 +#define DMPAPER_P32K_ROTATED 107 +#define DMPAPER_P32KBIG_ROTATED 108 +#define DMPAPER_PENV_1_ROTATED 109 +#define DMPAPER_PENV_2_ROTATED 110 +#define DMPAPER_PENV_3_ROTATED 111 +#define DMPAPER_PENV_4_ROTATED 112 +#define DMPAPER_PENV_5_ROTATED 113 +#define DMPAPER_PENV_6_ROTATED 114 +#define DMPAPER_PENV_7_ROTATED 115 +#define DMPAPER_PENV_8_ROTATED 116 +#define DMPAPER_PENV_9_ROTATED 117 +#define DMPAPER_PENV_10_ROTATED 118 +#define DMPAPER_USER 256 + +#endif diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES index 574490ef41..e8a1856e3d 100644 --- a/harbour/package/winuni/RELNOTES +++ b/harbour/package/winuni/RELNOTES @@ -54,7 +54,7 @@ Tool/lib versions used to create this package: External lib dependencies ------------------------- - ACE 9.10 + ACE 10.00 Allegro 4.2.2 Blat 2.6.2 Cairo 1.8.8