paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 04:26:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed some variant issues

Browse Source 
* improved type declarations
This commit is contained in:
florian 2003-10-08 16:24:47 +00:00
parent 14ac3dc2e2
commit b6abfdae09
5 changed files with 104 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/inc/systemh.inc
View File

@ -241,6 +241,7 @@ Type
PError = ^Error; PError = ^Error;
{$ifdef HASVARIANT} {$ifdef HASVARIANT}
PVariant = ^Variant; PVariant = ^Variant;
POleVariant = ^OleVariant;
{$endif HASVARIANT} {$endif HASVARIANT}
{$ifdef HASWIDECHAR} {$ifdef HASWIDECHAR}
@ -698,8 +699,9 @@ const
{ {
$Log$ $Log$
Revision 1.73 2003-10-06 23:52:53 florian Revision 1.74 2003-10-08 16:24:47 florian
* some data types cleaned up * fixed some variant issues
* improved type declarations
Revision 1.72 2003/09/04 16:07:31 florian Revision 1.72 2003/09/04 16:07:31 florian
* fixed qword_to_double conversion on powerpc * fixed qword_to_double conversion on powerpc

31
rtl/inc/varianth.inc
View File

@ -145,11 +145,16 @@ type
varfromint64 : procedure(var dest : variant;const source : int64); varfromint64 : procedure(var dest : variant;const source : int64);
varfromword64 : procedure(var dest : variant;const source : qword); varfromword64 : procedure(var dest : variant;const source : qword);
varfromreal : procedure(var dest : variant;const source : extended); varfromreal : procedure(var dest : variant;const source : extended);
varfrompstr: procedure(var dest: variant; const source: ShortString); varfrompstr: procedure(var dest : variant; const source : ShortString);
varfromlstr: procedure(var dest: variant; const source: ansistring); varfromlstr: procedure(var dest : variant; const source : ansistring);
varfromwstr: procedure(var dest: variant; const source: WideString); varfromwstr: procedure(var dest : variant; const source : WideString);
varfromintf: procedure(var dest : variant;const source : iinterface);
{!!!!!!!} varfromdisp: procedure(var dest : variant;const source : idispatch);
varfromdynarray: procedure(var dest : variant;const source : pointer; typeinfo: pointer);
olevarfrompstr: procedure(var dest : olevariant; const source : shortstring);
olevarfromlstr: procedure(var dest : olevariant; const source : ansistring);
olevarfromvar: procedure(var dest : olevariant; const source : variant);
olevarfromint: procedure(var dest : olevariant; const source : longint;const range : shortint);
{ operators } { operators }
varop : procedure(var left : variant;const right : variant;opcode : tvarop); varop : procedure(var left : variant;const right : variant;opcode : tvarop);
@ -163,9 +168,17 @@ type
varaddref : procedure(var v : variant); varaddref : procedure(var v : variant);
varcopy : procedure(var dest : variant;const source : variant); varcopy : procedure(var dest : variant;const source : variant);
varcast : procedure(var dest : variant;const source : variant;vartype : longint); varcast : procedure(var dest : variant;const source : variant;vartype : longint);
varcastole : procedure(var dest : variant; const source : variant;vartype : longint);
dispinvoke: procedure(dest : pvardata;const source : tvardata;
calldesc : pcalldesc;params : pointer);cdecl;
vararrayredim : procedure(var a : variant;highbound : SizeInt);
vararrayget : function(var a : variant;indexcount : SizeInt;indices : SizeInt) : variant;cdecl;
vararrayput: procedure(var a : variant; const value : variant;
indexcount : SizeInt;indices : SizeInt);cdecl;
writevariant : function(var t : text;const v : variant;width : longint) : Pointer; writevariant : function(var t : text;const v : variant;width : longint) : Pointer;
write0Variant : function(var t : text;const v : Variant): Pointer; write0Variant : function(var t : text;const v : Variant) : Pointer;
end; end;
pvariantmanager = ^tvariantmanager; pvariantmanager = ^tvariantmanager;
@ -282,7 +295,11 @@ operator <=(const op1,op2 : variant) dest : boolean;
{ {
$Log$ $Log$
Revision 1.12 2003-10-04 23:40:42 florian Revision 1.13 2003-10-08 16:24:47 florian
* fixed some variant issues
* improved type declarations
Revision 1.12 2003/10/04 23:40:42 florian
* write helper comproc for variants fixed * write helper comproc for variants fixed
Revision 1.11 2002/10/10 19:24:28 florian Revision 1.11 2002/10/10 19:24:28 florian

4
rtl/win32/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/05] # Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/04]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -1342,7 +1342,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(SYSTEMUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT) windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) windows.pp $(COMPILER) -I$(WININC) windows.pp
messages$(PPUEXT): messages.pp $(SYSTEMUNIT)$(PPUEXT) messages$(PPUEXT): messages.pp $(WININC)/messages.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) messages.pp $(COMPILER) -I$(WININC) messages.pp
ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
activex$(PPUEXT) : activex.pp $(WININC)/objbase.inc windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT) activex$(PPUEXT) : activex.pp $(WININC)/objbase.inc windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT)

2
rtl/win32/Makefile.fpc
View File

@ -124,7 +124,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT) windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) windows.pp $(COMPILER) -I$(WININC) windows.pp
messages$(PPUEXT): messages.pp $(SYSTEMUNIT)$(PPUEXT) messages$(PPUEXT): messages.pp $(WININC)/messages.inc $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) messages.pp $(COMPILER) -I$(WININC) messages.pp
ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)

75
rtl/win32/wininc/messages.inc
View File

@ -1190,17 +1190,88 @@ Type
TWMSize = packed record TWMSize = packed record
Msg: Cardinal; Msg: Cardinal;
SizeType: LongInt; SizeType : LongInt;
Width : Word; Width : Word;
Height : Word; Height : Word;
Result : LongInt; Result : LongInt;
End; End;
TWMNoParams = packed record
Msg : Cardinal;
Unused : array[0..3] of Word;
Result : Longint;
end;
TWMGetDlgCode = TWMNoParams;
TWMFontChange = TWMNoParams;
TWMGetFont = TWMNoParams;
TWMScroll = record
Msg : Cardinal;
ScrollCode : SmallInt;
Pos : SmallInt;
ScrollBar : HWND;
Result : LongInt;
end;
TWMHScroll = TWMScroll;
TWMVScroll = TWMScroll;
TWMGetText = packed record
Msg : Cardinal;
TextMax : LongInt;
Text : PChar;
Result : LongInt;
end;
TWMGetTextLength = TWMNoParams;
TWMKillFocus = packed record
Msg : Cardinal;
FocusedWnd : HWND;
UnUsed : LongInt;
Result : LongInt;
End;
TWMSetCursor = packed record
Msg : Cardinal;
CursorWnd : HWND;
HitTest : Word;
MouseMsg : Word;
Result : LongInt;
end;
TWMSetFocus = packed record
Msg : Cardinal;
FocusedWnd : HWND;
Unused : LongInt;
Result : LongInt;
end;
TWMSetFont = packed record
Msg : Cardinal;
Font : HFONT;
Redraw : WordBool;
Unused : Word;
Result : LongInt;
end;
TWMShowWindow = packed record
Msg : Cardinal;
Show : BOOL;
Status : LongInt;
Result : LongInt;
end;
{$endif read_interface} {$endif read_interface}
{ {
$Log$ $Log$
Revision 1.6 2003-10-06 23:52:53 florian Revision 1.7 2003-10-08 16:24:47 florian
* fixed some variant issues
* improved type declarations
Revision 1.6 2003/10/06 23:52:53 florian
* some data types cleaned up * some data types cleaned up
Revision 1.5 2003/01/02 22:07:00 peter Revision 1.5 2003/01/02 22:07:00 peter