2008-09-10 09:46 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* doc/whatsnew.txt
+ Updated.
* contrib/Makefile
* contrib/make_b32_all.bat
* contrib/make_gcc_all.sh
* contrib/make_vc_all.bat
- contrib/hbwhat32
+ contrib/hbwhat
* Renamed to not contain '32'.
; NOTE: I plan to do this with a couple of other
names too in the future.
* contrib/hbwhat/Makefile
* contrib/hbwhat/common.mak
- contrib/hbwhat/what32.ch
+ contrib/hbwhat/hbwhat.ch
* Renamed what32.ch to not contain '32' (and added
hb for consistency if it got renamed anyway).
* utils/hbmake/hbmake.prg
* Updated by Bill Robertson to fix too many things to
mention here. (cleaned up lots of stuff, using hb_run()s
return values, cleaned to not call main() function
recursively (!), display output cleanups, etcetc)
* hbwhat32, hbziparch lib name changes.
* contrib/examples/pp/hbppcore.c
* contrib/examples/pp/hbppcomp.c
* contrib/rddads/ads1.c
* source/pp/ppcore.c
* source/vm/asort.c
* source/vm/hvm.c
* source/rtl/disksphb.c
* source/rdd/dbfntx/dbfntx1.c
* source/rdd/workarea.c
* contrib/hbct/screen2.c
* contrib/hbct/token2.c
* while( TRUE ) -> for( ;; )
* do {} while( TRUE ) -> for( ;; ) {}
; To avoid warnings about conditions being constant.
This commit is contained in:
Viktor Szakats
@@ -8,6 +8,49 @@
|
||||
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
|
||||
*/
|
||||
|
||||
2008-09-10 09:46 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
|
||||
* doc/whatsnew.txt
|
||||
+ Updated.
|
||||
|
||||
* contrib/Makefile
|
||||
* contrib/make_b32_all.bat
|
||||
* contrib/make_gcc_all.sh
|
||||
* contrib/make_vc_all.bat
|
||||
- contrib/hbwhat32
|
||||
+ contrib/hbwhat
|
||||
* Renamed to not contain '32'.
|
||||
; NOTE: I plan to do this with a couple of other
|
||||
names too in the future.
|
||||
|
||||
* contrib/hbwhat/Makefile
|
||||
* contrib/hbwhat/common.mak
|
||||
- contrib/hbwhat/what32.ch
|
||||
+ contrib/hbwhat/hbwhat.ch
|
||||
* Renamed what32.ch to not contain '32' (and added
|
||||
hb for consistency if it got renamed anyway).
|
||||
|
||||
* utils/hbmake/hbmake.prg
|
||||
* Updated by Bill Robertson to fix too many things to
|
||||
mention here. (cleaned up lots of stuff, using hb_run()s
|
||||
return values, cleaned to not call main() function
|
||||
recursively (!), display output cleanups, etcetc)
|
||||
* hbwhat32, hbziparch lib name changes.
|
||||
|
||||
* contrib/examples/pp/hbppcore.c
|
||||
* contrib/examples/pp/hbppcomp.c
|
||||
* contrib/rddads/ads1.c
|
||||
* source/pp/ppcore.c
|
||||
* source/vm/asort.c
|
||||
* source/vm/hvm.c
|
||||
* source/rtl/disksphb.c
|
||||
* source/rdd/dbfntx/dbfntx1.c
|
||||
* source/rdd/workarea.c
|
||||
* contrib/hbct/screen2.c
|
||||
* contrib/hbct/token2.c
|
||||
* while( TRUE ) -> for( ;; )
|
||||
* do {} while( TRUE ) -> for( ;; ) {}
|
||||
; To avoid warnings about conditions being constant.
|
||||
|
||||
2008-09-09 21:54 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
|
||||
* contrib/hbwhat32/hbwhat.h
|
||||
* contrib/hbwhat32/whtcall.c
|
||||
|
||||
@@ -25,7 +25,7 @@ DIRS=\
|
||||
hbtpathy \
|
||||
hbvpdf \
|
||||
hbw32 \
|
||||
hbwhat32 \
|
||||
hbwhat \
|
||||
hbziparc \
|
||||
rddado \
|
||||
xhb \
|
||||
|
||||
@@ -138,7 +138,7 @@ int hb_pp_Internal_( FILE * handl_o, char * sOut )
|
||||
|
||||
hb_pp_NestedLiteralString = FALSE;
|
||||
hb_pp_LiteralEscSeq = FALSE;
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
pFile = hb_comp_files.pLast;
|
||||
lens = 0;
|
||||
@@ -568,7 +568,7 @@ int hb_pp_ReadRules( void )
|
||||
if( ! s_szOutLine )
|
||||
s_szOutLine = (char *) hb_xgrab( HB_PP_STR_SIZE );
|
||||
#endif
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
pFile = hb_comp_files.pLast;
|
||||
lens = lContinue = 0;
|
||||
|
||||
@@ -1753,7 +1753,8 @@ static int WorkPseudoF( char **ptri, char *ptro, DEFINES * stdef )
|
||||
{
|
||||
ipos = 0;
|
||||
ibeg = 0;
|
||||
do /* Parsing through parameters */
|
||||
|
||||
for( ;; ) /* Parsing through parameters */
|
||||
{ /* in macro definition */
|
||||
if( *( stdef->pars + ipos ) == ',' || *( stdef->pars + ipos ) == '\0' )
|
||||
{
|
||||
@@ -1798,7 +1799,6 @@ static int WorkPseudoF( char **ptri, char *ptro, DEFINES * stdef )
|
||||
|
||||
ipos++;
|
||||
}
|
||||
while( TRUE );
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3211,7 +3211,7 @@ static BOOL CheckOptional( char *ptrmp, char *ptri, char *ptro, int *lenres, BOO
|
||||
|
||||
if( *ptri == '\0' )
|
||||
{
|
||||
do
|
||||
for( ;; )
|
||||
{
|
||||
HB_SKIPTABSPACES( ptrmp );
|
||||
if( *ptrmp == HB_PP_OPT_START )
|
||||
@@ -3227,7 +3227,6 @@ static BOOL CheckOptional( char *ptrmp, char *ptri, char *ptro, int *lenres, BOO
|
||||
break;
|
||||
}
|
||||
}
|
||||
while( TRUE );
|
||||
}
|
||||
s_Repeate = save_Repeate;
|
||||
s_numBrackets = save_numBr;
|
||||
@@ -3720,7 +3719,7 @@ int hb_pp_RdStr( FILE * handl_i, char *buffer, int maxlen, BOOL lContinue, char
|
||||
return -1;
|
||||
}
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
if( *iBuffer == *lenBuffer )
|
||||
{
|
||||
|
||||
@@ -270,7 +270,7 @@ HB_FUNC( CLEARSLOW )
|
||||
dXX = dYY = 0;
|
||||
|
||||
hb_gtBeginWrite();
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
hb_gtBoxEx( iTop, iLeft, iBottom, iRight, pbFrame, bColor );
|
||||
if( lDelay )
|
||||
|
||||
@@ -420,7 +420,7 @@ HB_FUNC( TOKENINIT )
|
||||
/* scan start condition */
|
||||
pc = pcSubStr - 1;
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
size_t sMatchedPos = sSeparatorStrLen;
|
||||
|
||||
@@ -462,7 +462,7 @@ HB_FUNC( TOKENINIT )
|
||||
|
||||
if( pc == NULL )
|
||||
break;
|
||||
} /* while( TRUE ); */
|
||||
} /* for( ;; ) */
|
||||
|
||||
/* save token environment to 4th parameter OR to the static */
|
||||
if( ISBYREF( 4 ) )
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
ROOT = ../../
|
||||
|
||||
LIBNAME=hbwhat32
|
||||
LIBNAME=hbwhat
|
||||
|
||||
ifeq ($(HB_ARCHITECTURE),w32)
|
||||
|
||||
@@ -74,9 +74,9 @@ PRG_HEADERS= \
|
||||
commctrl.ch \
|
||||
commdlg.ch \
|
||||
debug.ch \
|
||||
hbwhat.ch \
|
||||
import.ch \
|
||||
sqltypes.ch \
|
||||
what32.ch \
|
||||
wingdi.ch \
|
||||
wininet.ch \
|
||||
winstruc.ch \
|
||||
@@ -2,7 +2,7 @@
|
||||
# $Id$
|
||||
#
|
||||
|
||||
LIBNAME = $(LIBPREF)hbwhat32
|
||||
LIBNAME = $(LIBPREF)hbwhat
|
||||
|
||||
LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
|
||||
|
||||
@@ -10,9 +10,9 @@ PRG_HEADERS = \
|
||||
commctrl.ch \
|
||||
commdlg.ch \
|
||||
debug.ch \
|
||||
hbwhat.ch \
|
||||
import.ch \
|
||||
sqltypes.ch \
|
||||
what32.ch \
|
||||
wingdi.ch \
|
||||
wininet.ch \
|
||||
winstruc.ch \
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
/*
|
||||
|
||||
hbwhat32.lib
|
||||
hbwhat.lib
|
||||
AJ Wos: IMPORT syntax added
|
||||
|
||||
Modified from:
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "common.ch"
|
||||
|
||||
#include "winuser.ch"
|
||||
#include "what32.ch"
|
||||
#include "hbwhat.ch"
|
||||
#include "debug.ch"
|
||||
#include "wingdi.ch"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
// Bitmap and raster operations related functions
|
||||
|
||||
|
||||
@@ -124,10 +124,10 @@ HB_FUNC( SETBITMAPDIMENSIONEX )
|
||||
) )
|
||||
{
|
||||
PHB_ITEM aSize = hb_itemArrayNew( 2 );
|
||||
|
||||
|
||||
hb_arraySetNL( aSize, 1, Size.cx );
|
||||
hb_arraySetNL( aSize, 2, Size.cy );
|
||||
|
||||
|
||||
hb_itemReturnRelease( aSize );
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
// Brush functions
|
||||
|
||||
/*
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
|
||||
// Common dialogs
|
||||
|
||||
@@ -45,7 +45,7 @@ HB_FUNC( COMMDLGEXTENDEDERROR )
|
||||
HB_FUNC( CHOOSEFONT )
|
||||
{
|
||||
CHOOSEFONT *cf = (CHOOSEFONT * ) hb_parc( 1 );
|
||||
//hb_param( 1, HB_IT_STRING )->item.asString.value;
|
||||
//hb_param( 1, HB_IT_STRING )->item.asString.value;
|
||||
|
||||
cf->lStructSize = sizeof(CHOOSEFONT);
|
||||
|
||||
@@ -246,7 +246,7 @@ HB_FUNC( _GETSAVEFILENAME )
|
||||
ofn.hwndOwner = ISNIL (1) ? GetActiveWindow() : (HWND) HB_PARWH(1);
|
||||
ofn.lpstrTitle = hb_parc (3);
|
||||
ofn.lpstrFilter = hb_parc (4);
|
||||
ofn.Flags = (ISNIL (5) ? OFN_FILEMUSTEXIST|OFN_EXPLORER : hb_parnl(4) );
|
||||
ofn.Flags = (ISNIL (5) ? OFN_FILEMUSTEXIST|OFN_EXPLORER : hb_parnl(4) );
|
||||
ofn.lpstrInitialDir = hb_parc (6);
|
||||
ofn.lpstrDefExt = hb_parc (7);
|
||||
ofn.nFilterIndex = hb_parni(8);
|
||||
@@ -6,7 +6,7 @@
|
||||
//----------------------------------------------------------------------------//
|
||||
//----------------------------------------------------------------------------//
|
||||
//
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Clipboard functions
|
||||
//
|
||||
//----------------------------------------------------------------------------//
|
||||
@@ -208,7 +208,7 @@ HB_FUNC( GETCLIPBOARDDATA )
|
||||
hb_retclen( lpClip, GlobalSize( hClipMem ) );
|
||||
GlobalUnlock( hClipMem );
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// DateTimePicker functions
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Device Context functions
|
||||
|
||||
// modified:
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// disk, directory and file functions
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
// Dialog functions
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// DLL access functions
|
||||
|
||||
#define _WIN32_WINNT 0x0400
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Graphics & Drawing
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// Font functions
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
|
||||
|
||||
// GDI functions
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
// Header control functions
|
||||
// What32
|
||||
// hbwhat
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
#define _WIN32_WINNT 0x0400
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// ImageList functions
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
@@ -6,7 +6,7 @@
|
||||
// INI file interface
|
||||
|
||||
/*
|
||||
* What32 Project source code:
|
||||
* hbwhat Project source code:
|
||||
* Windows Profile functions (Windows .ini rounines)
|
||||
*
|
||||
* Copyright 2001-2002 Luiz Rafael Culik<culikr@uol.com.br>
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// Metafile functions
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Miscellaneous functions
|
||||
|
||||
// AJ Wos
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* WHAT32 source code:
|
||||
* hbwhat source code:
|
||||
* Functions for video capture
|
||||
*
|
||||
* Copyright 2004 Marcos Antonio Gambeta <marcosgambeta@uol.com.br>
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
|
||||
// Graphic Pen functions
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Printing
|
||||
|
||||
#define _WIN32_WINNT 0x0400
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// rectangle functions
|
||||
|
||||
// Thanks Luiz
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Region functions
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// Scrollbar API functions
|
||||
|
||||
#define _WIN32_WINNT 0x0400
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// Shell API
|
||||
|
||||
#define _WIN32_WINNT 0x0400
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// AJ Wos
|
||||
|
||||
// Note: functions: SELECT and ACCEPT may collide with Clipper/xHarbour names
|
||||
@@ -11,7 +11,7 @@
|
||||
//-------------------------------------------------------------------//
|
||||
//-------------------------------------------------------------------//
|
||||
//
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
// System Services
|
||||
//
|
||||
//-------------------------------------------------------------------//
|
||||
@@ -202,7 +202,7 @@ HB_FUNC( SYSTEMPARAMETERSINFO )
|
||||
{
|
||||
if( ! hb_storclen_buffer( cText, hb_itemGetCLen( pBuffer ), 3 ) )
|
||||
hb_xfree( cText );
|
||||
|
||||
|
||||
hb_retl( TRUE );
|
||||
return;
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// ToolBar functions
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// Text display functions
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// What32
|
||||
// hbwhat
|
||||
// ViewPort functions
|
||||
|
||||
#define HB_OS_WIN_32_USED
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
// Common Dialog interface
|
||||
#define WT_DIALOG 0 // used internally (user custom dialog class - advanced option)
|
||||
#include "commdlg.ch"
|
||||
@@ -2,13 +2,13 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
|
||||
// common controls and common dialogs
|
||||
|
||||
#include "winuser.ch"
|
||||
#include "commctrl.ch"
|
||||
#include "what32.ch"
|
||||
#include "hbwhat.ch"
|
||||
|
||||
|
||||
*------------------------------------------------------------------------------
|
||||
@@ -3,13 +3,13 @@
|
||||
*/
|
||||
|
||||
|
||||
// WHAT32 ErrorSys
|
||||
// hbwhat ErrorSys
|
||||
// A.J. Wos 08/06/2002
|
||||
// Scaled down and adapted for Harbour + what32.lib
|
||||
// Scaled down and adapted for Harbour + hbwhat
|
||||
|
||||
#include "common.ch"
|
||||
|
||||
#include "what32.ch"
|
||||
#include "hbwhat.ch"
|
||||
#include "winuser.ch"
|
||||
#include "error.ch"
|
||||
#include "debug.ch"
|
||||
@@ -167,7 +167,7 @@ STATIC FUNCTION LogError( e, cProcStack )
|
||||
cErr += ( CRLF + '------' )
|
||||
cErr += ( CRLF + 'Error date:' + dtoc( date( ) ) + ' time:' + time( ) )
|
||||
cErr += ( CRLF + 'Application: ' + GetModuleFileName( ) )
|
||||
cErr += ( CRLF + 'hbwhat32 library ver.' + WhatVersion( @dVer ) + ", " + DTOC( dVer ) )
|
||||
cErr += ( CRLF + 'hbwhat library ver.' + WhatVersion( @dVer ) + ", " + DTOC( dVer ) )
|
||||
|
||||
// T.B.D.:
|
||||
// add here Windows version, memory info, diskspace info, free resources info
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// WHAT32
|
||||
// hbwhat
|
||||
|
||||
* Useful .ini Interface enhancements
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Rebar class
|
||||
|
||||
#include "common.ch"
|
||||
@@ -17,7 +17,7 @@ pragma pack(4)
|
||||
|
||||
#include "winstruc.ch"
|
||||
|
||||
#include 'what32.ch'
|
||||
#include 'hbwhat.ch'
|
||||
#include "commctrl.ch"
|
||||
|
||||
#include 'debug.ch'
|
||||
478
harbour/contrib/hbwhat/winstruc.ch
Normal file
478
harbour/contrib/hbwhat/winstruc.ch
Normal file
@@ -0,0 +1,478 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
// hbwhat
|
||||
// structures
|
||||
|
||||
|
||||
#Include "wintypes.ch"
|
||||
|
||||
#ifndef MAX_PATH
|
||||
#define MAX_PATH 260
|
||||
#endif
|
||||
|
||||
|
||||
/* POINT */
|
||||
|
||||
typedef struct tagPOINT {;
|
||||
LONG x;
|
||||
LONG y;
|
||||
} POINT
|
||||
|
||||
/* RECT */
|
||||
|
||||
typedef struct _RECT { ;
|
||||
LONG left;
|
||||
LONG top;
|
||||
LONG right;
|
||||
LONG bottom;
|
||||
} RECT
|
||||
|
||||
typedef struct tagNMHDR {;
|
||||
HWND hwndFrom;
|
||||
UINT idFrom;
|
||||
UINT code;
|
||||
} NMHDR;
|
||||
|
||||
|
||||
|
||||
/* CreateFile */
|
||||
|
||||
typedef struct _SECURITY_ATTRIBUTES { ;
|
||||
DWORD nLength;
|
||||
LPVOID lpSecurityDescriptor;
|
||||
BOOL bInheritHandle;
|
||||
} SECURITY_ATTRIBUTES
|
||||
|
||||
/* register class */
|
||||
|
||||
typedef struct _WNDCLASS { ;
|
||||
UINT style;
|
||||
WNDPROC lpfnWndProc;
|
||||
int cbClsExtra;
|
||||
int cbWndExtra;
|
||||
HANDLE hInstance;
|
||||
HICON hIcon;
|
||||
HCURSOR hCursor;
|
||||
HBRUSH hbrBackground;
|
||||
LPCTSTR lpszMenuName;
|
||||
LPCTSTR lpszClassName;
|
||||
} WNDCLASS
|
||||
|
||||
/* Bitmap Header Definition */
|
||||
|
||||
typedef struct tagBITMAP { ;
|
||||
LONG bmType;
|
||||
LONG bmWidth;
|
||||
LONG bmHeight;
|
||||
LONG bmWidthBytes;
|
||||
WORD bmPlanes;
|
||||
WORD bmBitsPixel;
|
||||
LPVOID bmBits;
|
||||
} BITMAP, *PBITMAP, NEAR *NPBITMAP, FAR *LPBITMAP
|
||||
|
||||
typedef struct tagBITMAPINFOHEADER{; // bmih
|
||||
DWORD biSize;
|
||||
LONG biWidth;
|
||||
LONG biHeight;
|
||||
WORD biPlanes;
|
||||
WORD biBitCount;
|
||||
DWORD biCompression;
|
||||
DWORD biSizeImage;
|
||||
LONG biXPelsPerMeter;
|
||||
LONG biYPelsPerMeter;
|
||||
DWORD biClrUsed;
|
||||
DWORD biClrImportant;
|
||||
} BITMAPINFOHEADER
|
||||
|
||||
/* DIBSECTION */
|
||||
|
||||
typedef struct tagDIBSECTION { ;
|
||||
BITMAP dsBm;
|
||||
BITMAPINFOHEADER dsBmih;
|
||||
DWORD dsBitfields[3];
|
||||
HANDLE dshSection;
|
||||
DWORD dsOffset;
|
||||
} DIBSECTION
|
||||
|
||||
/* BRUSH */
|
||||
|
||||
typedef struct tagLOGBRUSH { ;
|
||||
UINT lbStyle;
|
||||
COLORREF lbColor;
|
||||
LONG lbHatch;
|
||||
} LOGBRUSH
|
||||
|
||||
/* PEN */
|
||||
|
||||
typedef struct tagLOGPEN { ;
|
||||
UINT lopnStyle;
|
||||
POINT lopnWidth;
|
||||
COLORREF lopnColor;
|
||||
} LOGPEN
|
||||
|
||||
/* ext LOGPEN */
|
||||
|
||||
|
||||
|
||||
typedef struct tagEXTLOGPEN { ;
|
||||
UINT elpPenStyle;
|
||||
UINT elpWidth;
|
||||
UINT elpBrushStyle;
|
||||
COLORREF elpColor;
|
||||
LONG elpHatch;
|
||||
DWORD elpNumEntries;
|
||||
DWORD elpStyleEntry[1];
|
||||
} EXTLOGPEN
|
||||
|
||||
/* LOFFONT */
|
||||
|
||||
|
||||
|
||||
typedef struct tagLOGFONT { ;
|
||||
LONG lfHeight;
|
||||
LONG lfWidth;
|
||||
LONG lfEscapement;
|
||||
LONG lfOrientation;
|
||||
LONG lfWeight;
|
||||
BYTE lfItalic;
|
||||
BYTE lfUnderline;
|
||||
BYTE lfStrikeOut;
|
||||
BYTE lfCharSet;
|
||||
BYTE lfOutPrecision;
|
||||
BYTE lfClipPrecision;
|
||||
BYTE lfQuality;
|
||||
BYTE lfPitchAndFamily;
|
||||
TCHAR lfFaceName[32];
|
||||
} LOGFONT
|
||||
|
||||
|
||||
/* choose font */
|
||||
|
||||
typedef struct tagCHOOSEFONT { ;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HDC hDC;
|
||||
LOGFONT* lpLogFont;
|
||||
INT iPointSize;
|
||||
DWORD Flags;
|
||||
DWORD rgbColors;
|
||||
LPARAM lCustData;
|
||||
LPCFHOOKPROC lpfnHook;
|
||||
LPCTSTR lpTemplateName;
|
||||
HINSTANCE hInstance;
|
||||
LPTSTR lpszStyle;
|
||||
WORD nFontType;
|
||||
WORD ___MISSING_ALIGNMENT__;
|
||||
INT nSizeMin;
|
||||
INT nSizeMax;
|
||||
} CHOOSEFONT
|
||||
|
||||
|
||||
/* FINDREPLACE */
|
||||
|
||||
typedef struct tagFR { ;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HINSTANCE hInstance;
|
||||
DWORD Flags;
|
||||
LPTSTR lpstrFindWhat;
|
||||
LPTSTR lpstrReplaceWith;
|
||||
WORD wFindWhatLen;
|
||||
WORD wReplaceWithLen;
|
||||
LPARAM lCustData;
|
||||
LPFRHOOKPROC lpfnHook;
|
||||
LPCTSTR lpTemplateName;
|
||||
} FINDREPLACE
|
||||
|
||||
/* PAGESETUPDLG */
|
||||
|
||||
typedef struct tagPSD { ;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HGLOBAL hDevMode;
|
||||
HGLOBAL hDevNames;
|
||||
DWORD Flags;
|
||||
POINT ptPaperSize;
|
||||
RECT rtMinMargin;
|
||||
RECT rtMargin;
|
||||
HINSTANCE hInstance;
|
||||
LPARAM lCustData;
|
||||
LPPAGESETUPHOOK lpfnPageSetupHook;
|
||||
LPPAGEPAINTHOOK lpfnPagePaintHook;
|
||||
LPCTSTR lpPageSetupTemplateName;
|
||||
HGLOBAL hPageSetupTemplate;
|
||||
} PAGESETUPDLG, * LPPAGESETUPDLG
|
||||
|
||||
/* OPENFILENAME */
|
||||
|
||||
typedef struct tagOFN {;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HINSTANCE hInstance;
|
||||
LPCTSTR lpstrFilter;
|
||||
LPTSTR lpstrCustomFilter;
|
||||
DWORD nMaxCustFilter;
|
||||
DWORD nFilterIndex;
|
||||
LPTSTR lpstrFile;
|
||||
DWORD nMaxFile;
|
||||
LPTSTR lpstrFileTitle;
|
||||
DWORD nMaxFileTitle;
|
||||
LPCTSTR lpstrInitialDir;
|
||||
LPCTSTR lpstrTitle;
|
||||
DWORD Flags;
|
||||
WORD nFileOffset;
|
||||
WORD nFileExtension;
|
||||
LPCTSTR lpstrDefExt;
|
||||
DWORD lCustData;
|
||||
LPOFNHOOKPROC lpfnHook;
|
||||
LPCTSTR lpTemplateName;
|
||||
} OPENFILENAME
|
||||
|
||||
/* BROWSEINFO */
|
||||
|
||||
/*
|
||||
typedef struct _browseinfo {;
|
||||
HWND hwndOwner;
|
||||
LPCITEMIDLIST pidlRoot;
|
||||
LPSTR pszDisplayName;
|
||||
LPCSTR lpszTitle;
|
||||
UINT ulFlags;
|
||||
BFFCALLBACK lpfn;
|
||||
LPARAM lParam;
|
||||
int iImage;
|
||||
} BROWSEINFO, *PBROWSEINFO, *LPBROWSEINFO
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
typedef struct tagMOUSEINPUT {;
|
||||
LONG dx;
|
||||
LONG dy;
|
||||
DWORD mouseData;
|
||||
DWORD dwFlags;
|
||||
DWORD time;
|
||||
DWORD dwExtraInfo;
|
||||
} MOUSEINPUT, *PMOUSEINPUT, FAR* LPMOUSEINPUT
|
||||
|
||||
|
||||
typedef struct tagKEYBDINPUT {;
|
||||
WORD wVk;
|
||||
WORD wScan;
|
||||
DWORD dwFlags;
|
||||
DWORD time;
|
||||
DWORD dwExtraInfo;
|
||||
} KEYBDINPUT, *PKEYBDINPUT, FAR* LPKEYBDINPUT
|
||||
|
||||
|
||||
typedef struct tagHARDWAREINPUT {;
|
||||
DWORD uMsg;
|
||||
WORD wParamL;
|
||||
WORD wParamH;
|
||||
DWORD dwExtraInfo;
|
||||
} HARDWAREINPUT, *PHARDWAREINPUT, FAR* LPHARDWAREINPUT
|
||||
|
||||
|
||||
typedef struct tagINPUT { ;
|
||||
DWORD type;
|
||||
union
|
||||
{
|
||||
MOUSEINPUT mi;
|
||||
KEYBDINPUT ki;
|
||||
HARDWAREINPUT hi;
|
||||
};
|
||||
} INPUT, *PINPUT, FAR* LPINPUT
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/* PAINTSTRUCT */
|
||||
|
||||
typedef struct tagPAINTSTRUCT {;
|
||||
HDC hdc;
|
||||
BOOL fErase;
|
||||
RECT rcPaint;
|
||||
BOOL fRestore;
|
||||
BOOL fIncUpdate;
|
||||
BYTE rgbReserved[32];
|
||||
} PAINTSTRUCT
|
||||
|
||||
|
||||
/* drawitem struct */
|
||||
|
||||
typedef struct tagDRAWITEMSTRUCT {;
|
||||
UINT CtlType;
|
||||
UINT CtlID;
|
||||
UINT itemID;
|
||||
UINT itemAction;
|
||||
UINT itemState;
|
||||
HWND hwndItem;
|
||||
HDC hDC;
|
||||
RECT rcItem;
|
||||
DWORD itemData;
|
||||
} DRAWITEMSTRUCT
|
||||
|
||||
/* memory status */
|
||||
|
||||
typedef struct _MEMORYSTATUS {;
|
||||
DWORD dwLength;
|
||||
DWORD dwMemoryLoad;
|
||||
DWORD dwTotalPhys;
|
||||
DWORD dwAvailPhys;
|
||||
DWORD dwTotalPageFile;
|
||||
DWORD dwAvailPageFile;
|
||||
DWORD dwTotalVirtual;
|
||||
DWORD dwAvailVirtual;
|
||||
} MEMORYSTATUS, *LPMEMORYSTATUS
|
||||
|
||||
|
||||
/* TRACKMOUSEEVENT */
|
||||
|
||||
typedef struct tagTRACKMOUSEEVENT { ;
|
||||
DWORD cbSize;
|
||||
DWORD dwFlags;
|
||||
HWND hwndTrack;
|
||||
DWORD dwHoverTime;
|
||||
} TRACKMOUSEEVENT, *LPTRACKMOUSEEVENT
|
||||
|
||||
|
||||
/* MSG */
|
||||
|
||||
typedef struct tagMSG { ;
|
||||
HWND hwnd;
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
DWORD time;
|
||||
POINT pt;
|
||||
} MSG
|
||||
|
||||
/* scrollinfo */
|
||||
|
||||
typedef struct tagSCROLLINFO { ;
|
||||
UINT cbSize;
|
||||
UINT fMask;
|
||||
int nMin;
|
||||
int nMax;
|
||||
UINT nPage;
|
||||
int nPos;
|
||||
int nTrackPos;
|
||||
} SCROLLINFO;
|
||||
|
||||
/* APPBARDATA */
|
||||
|
||||
typedef struct _AppBarData {;
|
||||
DWORD cbSize;
|
||||
HWND hWnd;
|
||||
UINT uCallbackMessage;
|
||||
UINT uEdge;
|
||||
RECT rc;
|
||||
LPARAM lParam;
|
||||
} APPBARDATA, *PAPPBARDATA
|
||||
|
||||
/*shellexecuteinfo */
|
||||
|
||||
typedef struct _SHELLEXECUTEINFO{;
|
||||
DWORD cbSize;
|
||||
ULONG fMask;
|
||||
HWND hwnd;
|
||||
LPCTSTR lpVerb;
|
||||
LPCTSTR lpFile;
|
||||
LPCTSTR lpParameters;
|
||||
LPCTSTR lpDirectory;
|
||||
int nShow;
|
||||
HINSTANCE hInstApp;
|
||||
LPVOID lpIDList;
|
||||
LPCSTR lpClass;
|
||||
HKEY hkeyClass;
|
||||
DWORD dwHotKey;
|
||||
HANDLE hIcon;
|
||||
HANDLE hProcess;
|
||||
} SHELLEXECUTEINFO, FAR *LPSHELLEXECUTEINFO
|
||||
|
||||
|
||||
/* SHFILEINFO */
|
||||
/*
|
||||
typedef struct _SHFILEINFO{ ;
|
||||
HICON hIcon;
|
||||
int iIcon;
|
||||
DWORD dwAttributes;
|
||||
char szDisplayName[MAX_PATH];
|
||||
char szTypeName[80];
|
||||
} SHFILEINFO
|
||||
*/
|
||||
|
||||
/* notifyicondata */
|
||||
|
||||
typedef struct _NOTIFYICONDATA { ;
|
||||
DWORD cbSize;
|
||||
HWND hWnd;
|
||||
UINT uID;
|
||||
UINT uFlags;
|
||||
UINT uCallbackMessage;
|
||||
HICON hIcon;
|
||||
char szTip[64];
|
||||
} NOTIFYICONDATA, *PNOTIFYICONDATA
|
||||
|
||||
/* SYSTEMTIME */
|
||||
|
||||
typedef struct _SYSTEMTIME {;
|
||||
WORD wYear;
|
||||
WORD wMonth;
|
||||
WORD wDayOfWeek;
|
||||
WORD wDay;
|
||||
WORD wHour;
|
||||
WORD wMinute;
|
||||
WORD wSecond;
|
||||
WORD wMilliseconds;
|
||||
} SYSTEMTIME
|
||||
|
||||
|
||||
/* textmetric */
|
||||
|
||||
typedef struct tagTEXTMETRIC { ;
|
||||
LONG tmHeight;
|
||||
LONG tmAscent;
|
||||
LONG tmDescent;
|
||||
LONG tmInternalLeading;
|
||||
LONG tmExternalLeading;
|
||||
LONG tmAveCharWidth;
|
||||
LONG tmMaxCharWidth;
|
||||
LONG tmWeight;
|
||||
LONG tmOverhang;
|
||||
LONG tmDigitizedAspectX;
|
||||
LONG tmDigitizedAspectY;
|
||||
BCHAR tmFirstChar;
|
||||
BCHAR tmLastChar;
|
||||
BCHAR tmDefaultChar;
|
||||
BCHAR tmBreakChar;
|
||||
BYTE tmItalic;
|
||||
BYTE tmUnderlined;
|
||||
BYTE tmStruckOut;
|
||||
BYTE tmPitchAndFamily;
|
||||
BYTE tmCharSet;
|
||||
} TEXTMETRIC
|
||||
|
||||
|
||||
/* MDI: CLIENTCREATESTRUCT */
|
||||
|
||||
typedef struct tagCLIENTCREATESTRUCT {;
|
||||
HANDLE hWindowMenu;
|
||||
UINT idFirstChild;
|
||||
} CLIENTCREATESTRUCT
|
||||
|
||||
|
||||
/* DRAWPATRECT */
|
||||
|
||||
typedef struct _DRAWPATRECT {;
|
||||
POINT ptPosition;
|
||||
POINT ptSize;
|
||||
WORD wStyle;
|
||||
WORD wPattern;
|
||||
} DRAWPATRECT, *PDRAWPATRECT
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
*/
|
||||
|
||||
|
||||
// what32.lib
|
||||
// hbwhat
|
||||
// Tollbar class
|
||||
|
||||
#include "common.ch"
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "debug.ch"
|
||||
#include "wintypes.ch"
|
||||
#include "cstruct.ch"
|
||||
#include "what32.ch"
|
||||
#include "hbwhat.ch"
|
||||
|
||||
pragma pack(4)
|
||||
|
||||
@@ -254,10 +254,10 @@ RETURN(::hWnd)
|
||||
|
||||
*-----------------------------------------------------------------------------*
|
||||
|
||||
#undef TBN_DROPDOWN
|
||||
#undef TTN_NEEDTEXT
|
||||
#undef TBN_QUERYINSERT
|
||||
#undef TBN_QUERYDELETE
|
||||
#undef TBN_DROPDOWN
|
||||
#undef TTN_NEEDTEXT
|
||||
#undef TBN_QUERYINSERT
|
||||
#undef TBN_QUERYDELETE
|
||||
#undef TBN_GETBUTTONINFO
|
||||
|
||||
#DEFINE TBN_DROPDOWN 0
|
||||
@@ -1,478 +0,0 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
|
||||
// what32.lib
|
||||
// structures
|
||||
|
||||
|
||||
#Include "wintypes.ch"
|
||||
|
||||
#ifndef MAX_PATH
|
||||
#define MAX_PATH 260
|
||||
#endif
|
||||
|
||||
|
||||
/* POINT */
|
||||
|
||||
typedef struct tagPOINT {;
|
||||
LONG x;
|
||||
LONG y;
|
||||
} POINT
|
||||
|
||||
/* RECT */
|
||||
|
||||
typedef struct _RECT { ;
|
||||
LONG left;
|
||||
LONG top;
|
||||
LONG right;
|
||||
LONG bottom;
|
||||
} RECT
|
||||
|
||||
typedef struct tagNMHDR {;
|
||||
HWND hwndFrom;
|
||||
UINT idFrom;
|
||||
UINT code;
|
||||
} NMHDR;
|
||||
|
||||
|
||||
|
||||
/* CreateFile */
|
||||
|
||||
typedef struct _SECURITY_ATTRIBUTES { ;
|
||||
DWORD nLength;
|
||||
LPVOID lpSecurityDescriptor;
|
||||
BOOL bInheritHandle;
|
||||
} SECURITY_ATTRIBUTES
|
||||
|
||||
/* register class */
|
||||
|
||||
typedef struct _WNDCLASS { ;
|
||||
UINT style;
|
||||
WNDPROC lpfnWndProc;
|
||||
int cbClsExtra;
|
||||
int cbWndExtra;
|
||||
HANDLE hInstance;
|
||||
HICON hIcon;
|
||||
HCURSOR hCursor;
|
||||
HBRUSH hbrBackground;
|
||||
LPCTSTR lpszMenuName;
|
||||
LPCTSTR lpszClassName;
|
||||
} WNDCLASS
|
||||
|
||||
/* Bitmap Header Definition */
|
||||
|
||||
typedef struct tagBITMAP { ;
|
||||
LONG bmType;
|
||||
LONG bmWidth;
|
||||
LONG bmHeight;
|
||||
LONG bmWidthBytes;
|
||||
WORD bmPlanes;
|
||||
WORD bmBitsPixel;
|
||||
LPVOID bmBits;
|
||||
} BITMAP, *PBITMAP, NEAR *NPBITMAP, FAR *LPBITMAP
|
||||
|
||||
typedef struct tagBITMAPINFOHEADER{; // bmih
|
||||
DWORD biSize;
|
||||
LONG biWidth;
|
||||
LONG biHeight;
|
||||
WORD biPlanes;
|
||||
WORD biBitCount;
|
||||
DWORD biCompression;
|
||||
DWORD biSizeImage;
|
||||
LONG biXPelsPerMeter;
|
||||
LONG biYPelsPerMeter;
|
||||
DWORD biClrUsed;
|
||||
DWORD biClrImportant;
|
||||
} BITMAPINFOHEADER
|
||||
|
||||
/* DIBSECTION */
|
||||
|
||||
typedef struct tagDIBSECTION { ;
|
||||
BITMAP dsBm;
|
||||
BITMAPINFOHEADER dsBmih;
|
||||
DWORD dsBitfields[3];
|
||||
HANDLE dshSection;
|
||||
DWORD dsOffset;
|
||||
} DIBSECTION
|
||||
|
||||
/* BRUSH */
|
||||
|
||||
typedef struct tagLOGBRUSH { ;
|
||||
UINT lbStyle;
|
||||
COLORREF lbColor;
|
||||
LONG lbHatch;
|
||||
} LOGBRUSH
|
||||
|
||||
/* PEN */
|
||||
|
||||
typedef struct tagLOGPEN { ;
|
||||
UINT lopnStyle;
|
||||
POINT lopnWidth;
|
||||
COLORREF lopnColor;
|
||||
} LOGPEN
|
||||
|
||||
/* ext LOGPEN */
|
||||
|
||||
|
||||
|
||||
typedef struct tagEXTLOGPEN { ;
|
||||
UINT elpPenStyle;
|
||||
UINT elpWidth;
|
||||
UINT elpBrushStyle;
|
||||
COLORREF elpColor;
|
||||
LONG elpHatch;
|
||||
DWORD elpNumEntries;
|
||||
DWORD elpStyleEntry[1];
|
||||
} EXTLOGPEN
|
||||
|
||||
/* LOFFONT */
|
||||
|
||||
|
||||
|
||||
typedef struct tagLOGFONT { ;
|
||||
LONG lfHeight;
|
||||
LONG lfWidth;
|
||||
LONG lfEscapement;
|
||||
LONG lfOrientation;
|
||||
LONG lfWeight;
|
||||
BYTE lfItalic;
|
||||
BYTE lfUnderline;
|
||||
BYTE lfStrikeOut;
|
||||
BYTE lfCharSet;
|
||||
BYTE lfOutPrecision;
|
||||
BYTE lfClipPrecision;
|
||||
BYTE lfQuality;
|
||||
BYTE lfPitchAndFamily;
|
||||
TCHAR lfFaceName[32];
|
||||
} LOGFONT
|
||||
|
||||
|
||||
/* choose font */
|
||||
|
||||
typedef struct tagCHOOSEFONT { ;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HDC hDC;
|
||||
LOGFONT* lpLogFont;
|
||||
INT iPointSize;
|
||||
DWORD Flags;
|
||||
DWORD rgbColors;
|
||||
LPARAM lCustData;
|
||||
LPCFHOOKPROC lpfnHook;
|
||||
LPCTSTR lpTemplateName;
|
||||
HINSTANCE hInstance;
|
||||
LPTSTR lpszStyle;
|
||||
WORD nFontType;
|
||||
WORD ___MISSING_ALIGNMENT__;
|
||||
INT nSizeMin;
|
||||
INT nSizeMax;
|
||||
} CHOOSEFONT
|
||||
|
||||
|
||||
/* FINDREPLACE */
|
||||
|
||||
typedef struct tagFR { ;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HINSTANCE hInstance;
|
||||
DWORD Flags;
|
||||
LPTSTR lpstrFindWhat;
|
||||
LPTSTR lpstrReplaceWith;
|
||||
WORD wFindWhatLen;
|
||||
WORD wReplaceWithLen;
|
||||
LPARAM lCustData;
|
||||
LPFRHOOKPROC lpfnHook;
|
||||
LPCTSTR lpTemplateName;
|
||||
} FINDREPLACE
|
||||
|
||||
/* PAGESETUPDLG */
|
||||
|
||||
typedef struct tagPSD { ;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HGLOBAL hDevMode;
|
||||
HGLOBAL hDevNames;
|
||||
DWORD Flags;
|
||||
POINT ptPaperSize;
|
||||
RECT rtMinMargin;
|
||||
RECT rtMargin;
|
||||
HINSTANCE hInstance;
|
||||
LPARAM lCustData;
|
||||
LPPAGESETUPHOOK lpfnPageSetupHook;
|
||||
LPPAGEPAINTHOOK lpfnPagePaintHook;
|
||||
LPCTSTR lpPageSetupTemplateName;
|
||||
HGLOBAL hPageSetupTemplate;
|
||||
} PAGESETUPDLG, * LPPAGESETUPDLG
|
||||
|
||||
/* OPENFILENAME */
|
||||
|
||||
typedef struct tagOFN {;
|
||||
DWORD lStructSize;
|
||||
HWND hwndOwner;
|
||||
HINSTANCE hInstance;
|
||||
LPCTSTR lpstrFilter;
|
||||
LPTSTR lpstrCustomFilter;
|
||||
DWORD nMaxCustFilter;
|
||||
DWORD nFilterIndex;
|
||||
LPTSTR lpstrFile;
|
||||
DWORD nMaxFile;
|
||||
LPTSTR lpstrFileTitle;
|
||||
DWORD nMaxFileTitle;
|
||||
LPCTSTR lpstrInitialDir;
|
||||
LPCTSTR lpstrTitle;
|
||||
DWORD Flags;
|
||||
WORD nFileOffset;
|
||||
WORD nFileExtension;
|
||||
LPCTSTR lpstrDefExt;
|
||||
DWORD lCustData;
|
||||
LPOFNHOOKPROC lpfnHook;
|
||||
LPCTSTR lpTemplateName;
|
||||
} OPENFILENAME
|
||||
|
||||
/* BROWSEINFO */
|
||||
|
||||
/*
|
||||
typedef struct _browseinfo {;
|
||||
HWND hwndOwner;
|
||||
LPCITEMIDLIST pidlRoot;
|
||||
LPSTR pszDisplayName;
|
||||
LPCSTR lpszTitle;
|
||||
UINT ulFlags;
|
||||
BFFCALLBACK lpfn;
|
||||
LPARAM lParam;
|
||||
int iImage;
|
||||
} BROWSEINFO, *PBROWSEINFO, *LPBROWSEINFO
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
typedef struct tagMOUSEINPUT {;
|
||||
LONG dx;
|
||||
LONG dy;
|
||||
DWORD mouseData;
|
||||
DWORD dwFlags;
|
||||
DWORD time;
|
||||
DWORD dwExtraInfo;
|
||||
} MOUSEINPUT, *PMOUSEINPUT, FAR* LPMOUSEINPUT
|
||||
|
||||
|
||||
typedef struct tagKEYBDINPUT {;
|
||||
WORD wVk;
|
||||
WORD wScan;
|
||||
DWORD dwFlags;
|
||||
DWORD time;
|
||||
DWORD dwExtraInfo;
|
||||
} KEYBDINPUT, *PKEYBDINPUT, FAR* LPKEYBDINPUT
|
||||
|
||||
|
||||
typedef struct tagHARDWAREINPUT {;
|
||||
DWORD uMsg;
|
||||
WORD wParamL;
|
||||
WORD wParamH;
|
||||
DWORD dwExtraInfo;
|
||||
} HARDWAREINPUT, *PHARDWAREINPUT, FAR* LPHARDWAREINPUT
|
||||
|
||||
|
||||
typedef struct tagINPUT { ;
|
||||
DWORD type;
|
||||
union
|
||||
{
|
||||
MOUSEINPUT mi;
|
||||
KEYBDINPUT ki;
|
||||
HARDWAREINPUT hi;
|
||||
};
|
||||
} INPUT, *PINPUT, FAR* LPINPUT
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/* PAINTSTRUCT */
|
||||
|
||||
typedef struct tagPAINTSTRUCT {;
|
||||
HDC hdc;
|
||||
BOOL fErase;
|
||||
RECT rcPaint;
|
||||
BOOL fRestore;
|
||||
BOOL fIncUpdate;
|
||||
BYTE rgbReserved[32];
|
||||
} PAINTSTRUCT
|
||||
|
||||
|
||||
/* drawitem struct */
|
||||
|
||||
typedef struct tagDRAWITEMSTRUCT {;
|
||||
UINT CtlType;
|
||||
UINT CtlID;
|
||||
UINT itemID;
|
||||
UINT itemAction;
|
||||
UINT itemState;
|
||||
HWND hwndItem;
|
||||
HDC hDC;
|
||||
RECT rcItem;
|
||||
DWORD itemData;
|
||||
} DRAWITEMSTRUCT
|
||||
|
||||
/* memory status */
|
||||
|
||||
typedef struct _MEMORYSTATUS {;
|
||||
DWORD dwLength;
|
||||
DWORD dwMemoryLoad;
|
||||
DWORD dwTotalPhys;
|
||||
DWORD dwAvailPhys;
|
||||
DWORD dwTotalPageFile;
|
||||
DWORD dwAvailPageFile;
|
||||
DWORD dwTotalVirtual;
|
||||
DWORD dwAvailVirtual;
|
||||
} MEMORYSTATUS, *LPMEMORYSTATUS
|
||||
|
||||
|
||||
/* TRACKMOUSEEVENT */
|
||||
|
||||
typedef struct tagTRACKMOUSEEVENT { ;
|
||||
DWORD cbSize;
|
||||
DWORD dwFlags;
|
||||
HWND hwndTrack;
|
||||
DWORD dwHoverTime;
|
||||
} TRACKMOUSEEVENT, *LPTRACKMOUSEEVENT
|
||||
|
||||
|
||||
/* MSG */
|
||||
|
||||
typedef struct tagMSG { ;
|
||||
HWND hwnd;
|
||||
UINT message;
|
||||
WPARAM wParam;
|
||||
LPARAM lParam;
|
||||
DWORD time;
|
||||
POINT pt;
|
||||
} MSG
|
||||
|
||||
/* scrollinfo */
|
||||
|
||||
typedef struct tagSCROLLINFO { ;
|
||||
UINT cbSize;
|
||||
UINT fMask;
|
||||
int nMin;
|
||||
int nMax;
|
||||
UINT nPage;
|
||||
int nPos;
|
||||
int nTrackPos;
|
||||
} SCROLLINFO;
|
||||
|
||||
/* APPBARDATA */
|
||||
|
||||
typedef struct _AppBarData {;
|
||||
DWORD cbSize;
|
||||
HWND hWnd;
|
||||
UINT uCallbackMessage;
|
||||
UINT uEdge;
|
||||
RECT rc;
|
||||
LPARAM lParam;
|
||||
} APPBARDATA, *PAPPBARDATA
|
||||
|
||||
/*shellexecuteinfo */
|
||||
|
||||
typedef struct _SHELLEXECUTEINFO{;
|
||||
DWORD cbSize;
|
||||
ULONG fMask;
|
||||
HWND hwnd;
|
||||
LPCTSTR lpVerb;
|
||||
LPCTSTR lpFile;
|
||||
LPCTSTR lpParameters;
|
||||
LPCTSTR lpDirectory;
|
||||
int nShow;
|
||||
HINSTANCE hInstApp;
|
||||
LPVOID lpIDList;
|
||||
LPCSTR lpClass;
|
||||
HKEY hkeyClass;
|
||||
DWORD dwHotKey;
|
||||
HANDLE hIcon;
|
||||
HANDLE hProcess;
|
||||
} SHELLEXECUTEINFO, FAR *LPSHELLEXECUTEINFO
|
||||
|
||||
|
||||
/* SHFILEINFO */
|
||||
/*
|
||||
typedef struct _SHFILEINFO{ ;
|
||||
HICON hIcon;
|
||||
int iIcon;
|
||||
DWORD dwAttributes;
|
||||
char szDisplayName[MAX_PATH];
|
||||
char szTypeName[80];
|
||||
} SHFILEINFO
|
||||
*/
|
||||
|
||||
/* notifyicondata */
|
||||
|
||||
typedef struct _NOTIFYICONDATA { ;
|
||||
DWORD cbSize;
|
||||
HWND hWnd;
|
||||
UINT uID;
|
||||
UINT uFlags;
|
||||
UINT uCallbackMessage;
|
||||
HICON hIcon;
|
||||
char szTip[64];
|
||||
} NOTIFYICONDATA, *PNOTIFYICONDATA
|
||||
|
||||
/* SYSTEMTIME */
|
||||
|
||||
typedef struct _SYSTEMTIME {;
|
||||
WORD wYear;
|
||||
WORD wMonth;
|
||||
WORD wDayOfWeek;
|
||||
WORD wDay;
|
||||
WORD wHour;
|
||||
WORD wMinute;
|
||||
WORD wSecond;
|
||||
WORD wMilliseconds;
|
||||
} SYSTEMTIME
|
||||
|
||||
|
||||
/* textmetric */
|
||||
|
||||
typedef struct tagTEXTMETRIC { ;
|
||||
LONG tmHeight;
|
||||
LONG tmAscent;
|
||||
LONG tmDescent;
|
||||
LONG tmInternalLeading;
|
||||
LONG tmExternalLeading;
|
||||
LONG tmAveCharWidth;
|
||||
LONG tmMaxCharWidth;
|
||||
LONG tmWeight;
|
||||
LONG tmOverhang;
|
||||
LONG tmDigitizedAspectX;
|
||||
LONG tmDigitizedAspectY;
|
||||
BCHAR tmFirstChar;
|
||||
BCHAR tmLastChar;
|
||||
BCHAR tmDefaultChar;
|
||||
BCHAR tmBreakChar;
|
||||
BYTE tmItalic;
|
||||
BYTE tmUnderlined;
|
||||
BYTE tmStruckOut;
|
||||
BYTE tmPitchAndFamily;
|
||||
BYTE tmCharSet;
|
||||
} TEXTMETRIC
|
||||
|
||||
|
||||
/* MDI: CLIENTCREATESTRUCT */
|
||||
|
||||
typedef struct tagCLIENTCREATESTRUCT {;
|
||||
HANDLE hWindowMenu;
|
||||
UINT idFirstChild;
|
||||
} CLIENTCREATESTRUCT
|
||||
|
||||
|
||||
/* DRAWPATRECT */
|
||||
|
||||
typedef struct _DRAWPATRECT {;
|
||||
POINT ptPosition;
|
||||
POINT ptSize;
|
||||
WORD wStyle;
|
||||
WORD wPattern;
|
||||
} DRAWPATRECT, *PDRAWPATRECT
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6
|
||||
set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3
|
||||
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
||||
set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbwhat32 hbziparc
|
||||
set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbwhat hbziparc
|
||||
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
||||
set _HB_DIRS=rddado xhb
|
||||
|
||||
@@ -43,7 +43,7 @@ _HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbs
|
||||
|
||||
case "$HB_ARCHITECTURE" in
|
||||
w32|cyg|os2)
|
||||
_HB_DIRS_ADD="gtwvg hbole hbodbc hbw32 hbwhat32 rddado"
|
||||
_HB_DIRS_ADD="gtwvg hbole hbodbc hbw32 hbwhat rddado"
|
||||
;;
|
||||
*)
|
||||
_HB_DIRS_ADD=;;
|
||||
|
||||
@@ -45,7 +45,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6
|
||||
set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3
|
||||
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
||||
set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbwhat32 hbziparc
|
||||
set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbwhat hbziparc
|
||||
for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
|
||||
|
||||
set _HB_DIRS=rddado xhb
|
||||
|
||||
@@ -3942,7 +3942,7 @@ static ERRCODE adsOrderInfo( ADSAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde
|
||||
*/
|
||||
SELF_RECNO( ( AREAP ) pArea, &ulRecNo );
|
||||
AdsGotoTop( hIndex );
|
||||
do
|
||||
for( ;; )
|
||||
{
|
||||
AdsAtEOF( pArea->hTable, &u16 );
|
||||
if( u16 )
|
||||
@@ -3951,7 +3951,6 @@ static ERRCODE adsOrderInfo( ADSAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde
|
||||
if( AdsSkip( hIndex, 1 ) == AE_NO_CURRENT_RECORD )
|
||||
break;
|
||||
}
|
||||
while( TRUE );
|
||||
SELF_GOTO( ( AREAP ) pArea, ulRecNo );
|
||||
}
|
||||
else /* no scope set */
|
||||
|
||||
@@ -147,6 +147,10 @@ Core
|
||||
- Fixed dbInfo( DBI_POSITIONED ) returned value.
|
||||
- Fixed internal error in dirty index reading.
|
||||
- Fixed return value of HB_INETGETSNDBUFSIZE().
|
||||
- Fixed GPF when user sort code block reduces the size of sorted array.
|
||||
- Fixed typo in hash cloning code which caused that references
|
||||
was copied to cloned array. Thanks to Mindaugas for example.
|
||||
- Added missing MESSAGE <MessageName> TO <oObject> to hbclass.ch.
|
||||
|
||||
Contrib
|
||||
=============================
|
||||
@@ -197,6 +201,13 @@ Contrib
|
||||
- hbbmcdx fixed internal error in dirty index reading.
|
||||
- hbcurl added support for libcurl 7.19.0 features.
|
||||
- hbhpdf added support for libharu 2.1.0.
|
||||
- Fixed so that contrib source files cannot collide with each
|
||||
other when building them using the non-GNU make system.
|
||||
- Former hbwhat32 lib added to the default contrib list
|
||||
under the name of hbwhat, compilation was fully cleaned
|
||||
and fixed to support Win64 platform. INTERNETREADFILE(),
|
||||
INTERNETWRITEFILE() functions were fixed. what32.ch renamed
|
||||
to hbwhat.ch.
|
||||
|
||||
Known build issues
|
||||
=============================
|
||||
|
||||
@@ -656,7 +656,7 @@ static void hb_pp_readLine( PHB_PP_STATE pState )
|
||||
{
|
||||
int ch, iLine = 0;
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
if( pState->pFile->pLineBuf )
|
||||
{
|
||||
@@ -2548,7 +2548,7 @@ static void hb_pp_defineNew( PHB_PP_STATE pState, PHB_PP_TOKEN pToken, BOOL fDir
|
||||
pLast->spaces == 0 )
|
||||
{
|
||||
USHORT type = HB_PP_TOKEN_KEYWORD;
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
pLast = pLast->pNext;
|
||||
if( pLast && ( usPCount == 0 || type == HB_PP_TOKEN_COMMA ) &&
|
||||
@@ -3363,7 +3363,7 @@ static BOOL hb_pp_tokenSkipExp( PHB_PP_TOKEN * pTokenPtr, PHB_PP_TOKEN pStop,
|
||||
if( pfStop )
|
||||
* pfStop = FALSE;
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
pPrev = pToken;
|
||||
if( hb_pp_tokenStartExtBlock( &pToken ) )
|
||||
@@ -3771,7 +3771,7 @@ static PHB_PP_TOKEN * hb_pp_matchResultLstAdd( PHB_PP_STATE pState,
|
||||
PHB_PP_TOKEN pNext;
|
||||
BOOL fFirst = TRUE, fStop = FALSE;
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
pNext = pToken;
|
||||
if( hb_pp_tokenSkipExp( &pNext, pStop, HB_PP_CMP_ADDR, &fStop ) &&
|
||||
|
||||
@@ -1120,7 +1120,7 @@ static LPPAGEINFO hb_ntxPageGetBuffer( LPTAGINFO pTag, ULONG ulPage )
|
||||
else
|
||||
{
|
||||
ULONG ul = pIndex->ulPageLast;
|
||||
do
|
||||
for( ;; )
|
||||
{
|
||||
if( ++ul >= pIndex->ulPagesDepth )
|
||||
ul = 0;
|
||||
@@ -1144,7 +1144,6 @@ static LPPAGEINFO hb_ntxPageGetBuffer( LPTAGINFO pTag, ULONG ulPage )
|
||||
break;
|
||||
}
|
||||
}
|
||||
while( TRUE );
|
||||
}
|
||||
|
||||
if( !*pPagePtr )
|
||||
@@ -4716,7 +4715,7 @@ static void hb_ntxSortAddNodeKey( LPNTXSORTINFO pSort, BYTE *pKeyVal, ULONG ulRe
|
||||
ULONG ulPage = 0;
|
||||
int iLevel = 0;
|
||||
|
||||
do
|
||||
for( ;; )
|
||||
{
|
||||
pPage = pSort->NodeList[ iLevel ];
|
||||
if( pPage == NULL )
|
||||
@@ -4735,7 +4734,6 @@ static void hb_ntxSortAddNodeKey( LPNTXSORTINFO pSort, BYTE *pKeyVal, ULONG ulRe
|
||||
else
|
||||
break;
|
||||
}
|
||||
while( TRUE );
|
||||
|
||||
memcpy( hb_ntxGetKeyVal( pPage, pPage->uiKeys ), pKeyVal, pSort->pTag->KeyLength );
|
||||
hb_ntxSetKeyRec( pPage, pPage->uiKeys, ulRec );
|
||||
|
||||
@@ -1032,7 +1032,7 @@ static ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo )
|
||||
|
||||
if( !pEvalInfo->dbsci.lNext || lNext > 0 )
|
||||
{
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
if( SELF_EOF( pArea, &fEof ) != SUCCESS )
|
||||
return FAILURE;
|
||||
@@ -1114,7 +1114,7 @@ static ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue )
|
||||
|
||||
if( !pArea->dbsi.lNext || lNext > 0 )
|
||||
{
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
if( SELF_EOF( pArea, &fEof ) != SUCCESS )
|
||||
return FAILURE;
|
||||
@@ -1189,7 +1189,7 @@ static ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo )
|
||||
|
||||
if( !pTransInfo->dbsci.lNext || lNext > 0 )
|
||||
{
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
if( SELF_EOF( pArea, &fEof ) != SUCCESS )
|
||||
return FAILURE;
|
||||
|
||||
@@ -102,7 +102,7 @@ HB_FUNC( HB_DISKSPACE )
|
||||
szPath[ 0 ] - 'A' + 1 :
|
||||
( szPath[ 0 ] >= 'a' && szPath[ 0 ] <= 'z' ?
|
||||
szPath[ 0 ] - 'a' + 1 : 0 ) );
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
union REGS regs;
|
||||
|
||||
@@ -168,7 +168,7 @@ HB_FUNC( HB_DISKSPACE )
|
||||
typedef BOOL ( WINAPI * P_GDFSE )( LPCSTR, PULARGE_INTEGER,
|
||||
PULARGE_INTEGER, PULARGE_INTEGER );
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
ULARGE_INTEGER i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes;
|
||||
UINT uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS );
|
||||
|
||||
@@ -134,7 +134,7 @@ static LONG hb_arraySortQuickPartition( PHB_BASEARRAY pBaseArray, LONG lb, LONG
|
||||
i = lb + 1;
|
||||
j = ub;
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
while( j >= i && !hb_itemIsLess( pBaseArray->pItems + j, pBaseArray->pItems + lb, pBlock, pBaseArray, j ) )
|
||||
{
|
||||
|
||||
@@ -584,7 +584,7 @@ HB_EXPORT void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols )
|
||||
ulPastClock = ( ULONG ) clock();
|
||||
#endif
|
||||
|
||||
while( TRUE )
|
||||
for( ;; )
|
||||
{
|
||||
#ifndef HB_NO_PROFILER
|
||||
if( hb_bProfiler )
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user