Skip to content

Commit 4b0ab57

Browse files
committed
2017-09-09 18:28 UTC Viktor Szakats (vszakats users.noreply.github.com)
* contrib/gtwvg/wvgwing.c * contrib/gtwvg/gtwvglo.h * WVG_PREPAREBITMAPFROMFILE(): rewritten to use VF file I/O instead of CreateFile() Windows API * contrib/gtwvg/gtwvg.h * contrib/gtwvg/wvgcore.c * contrib/gtwvg/wvgcuig.c * hb_wvt_gtLoadPicture(): rewritten to use VF file I/O instead of CreateFile() Windows API. [INCOMPATIBLE] for C code that called this function directly, as the input filename is now a char * instead of an LPCTSTR. Harbour-level functions affected: wvg_SetGObjData(), wvg_Image(), wvt_LoadPicture(), wvt_LoadPictureEx() * hb_wvt_gtLoadPicture(), hb_wvt_gtLoadPictureFromResource(): define and export these on WinCE too, they will act as dummy functions on this platform. Previously it remained undefined instead. * contrib/gtwvg/wvgcore.c * hb_wvt_DrawImage(): rewritten to use VF file I/O instead of CreateFile() Windows API. Harbour-level functions affected: wvg_DrawImage(), wvt_DrawImage(), wvt_DrawButton(), wvt_DrawProgressBar() * contrib/gtwvw/gtwvwd.c * hb_gt_wvw_LoadPicture(): rewritten to use VF file I/O instead of CreateFile() Windows API. ; After these updates, gtwvg/gtwvw no longer accesses the filesystem directly. All VF filters/features work in filenames passed to them. * .gitattributes * .odt is a no longer a binary
1 parent 9773707 commit 4b0ab57

File tree

8 files changed

+205
-185
lines changed

8 files changed

+205
-185
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*.jpg binary
1212
*.lbl binary
1313
*.mdb binary
14-
*.odt binary
1514
*.pdf binary
1615
*.png binary
1716
*.sqlite3 binary

ChangeLog.txt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,43 @@
33
Entries may not always be in chronological/commit order.
44
See license at the end of file. */
55

6+
2017-09-09 18:28 UTC Viktor Szakats (vszakats users.noreply.github.com)
7+
* contrib/gtwvg/wvgwing.c
8+
* contrib/gtwvg/gtwvglo.h
9+
* WVG_PREPAREBITMAPFROMFILE(): rewritten to use VF file I/O instead
10+
of CreateFile() Windows API
11+
12+
* contrib/gtwvg/gtwvg.h
13+
* contrib/gtwvg/wvgcore.c
14+
* contrib/gtwvg/wvgcuig.c
15+
* hb_wvt_gtLoadPicture(): rewritten to use VF file I/O instead of
16+
CreateFile() Windows API. [INCOMPATIBLE] for C code that called
17+
this function directly, as the input filename is now a char *
18+
instead of an LPCTSTR. Harbour-level functions affected:
19+
wvg_SetGObjData(), wvg_Image(),
20+
wvt_LoadPicture(), wvt_LoadPictureEx()
21+
* hb_wvt_gtLoadPicture(), hb_wvt_gtLoadPictureFromResource():
22+
define and export these on WinCE too, they will act as dummy
23+
functions on this platform. Previously it remained undefined
24+
instead.
25+
26+
* contrib/gtwvg/wvgcore.c
27+
* hb_wvt_DrawImage(): rewritten to use VF file I/O instead of
28+
CreateFile() Windows API.
29+
Harbour-level functions affected:
30+
wvg_DrawImage(), wvt_DrawImage(), wvt_DrawButton(),
31+
wvt_DrawProgressBar()
32+
33+
* contrib/gtwvw/gtwvwd.c
34+
* hb_gt_wvw_LoadPicture(): rewritten to use VF file I/O instead of
35+
CreateFile() Windows API.
36+
37+
; After these updates, gtwvg/gtwvw no longer accesses the filesystem
38+
directly. All VF filters/features work in filenames passed to them.
39+
40+
* .gitattributes
41+
* .odt is a no longer a binary
42+
643
2017-09-08 21:31 UTC Viktor Szakats (vszakats users.noreply.github.com)
744
* debian/copyright
845
* LICENSE.txt

contrib/gtwvg/gtwvg.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,8 @@ typedef struct
304304
#define PHB_GTWVT PHB_GTWVG
305305

306306
extern HB_EXPORT POINT hb_wvt_gtGetXYFromColRow( int col, int row );
307-
#if ! defined( HB_OS_WIN_CE )
308-
extern HB_EXPORT IPicture * hb_wvt_gtLoadPicture( LPCTSTR image );
307+
extern HB_EXPORT IPicture * hb_wvt_gtLoadPicture( const char * pszFileName );
309308
extern HB_EXPORT IPicture * hb_wvt_gtLoadPictureFromResource( LPCTSTR resource, LPCTSTR section );
310-
#endif
311309
extern HB_EXPORT void hb_wvt_GetStringAttrib( int top, int left, int bottom, int right, HB_BYTE * sBuffer, HB_BYTE * sAttrib );
312310
extern HB_EXPORT void hb_wvt_PutStringAttrib( int top, int left, int bottom, int right, HB_BYTE * sBuffer, HB_BYTE * sAttrib );
313311

contrib/gtwvg/gtwvglo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#include "hbgtcore.h"
6767
#include "hbapicdp.h"
6868
#include "hbapierr.h"
69+
#include "hbapifs.h"
6970
#include "hbapiitm.h"
7071
#include "hbset.h"
7172
#include "hbinit.h"

0 commit comments

Comments
 (0)