* fixed conflicting declarations

rtl/win32/ascdef.pp

@@ -23,26 +23,14 @@
 {$ifndef windows_include_files}
 
 unit ascdef;
-
-{  Automatically converted by H2PAS.EXE from asciifun.h
-   Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97
-   Further improvements by Michael Van Canneyt, April 1998
-   define handling and error recovery by Pierre Muller, June 1998 }
-
-
-  interface
-
-   uses
-      base,defines,struct;
+interface
+uses
+  base,defines,struct;
 
 {$endif windows_include_files}
 
 {$ifdef read_interface}
 
-  { C default packing is dword }
-
-{$PACKRECORDS 4}
   {
      ASCIIFunctions.h
 
@@ -72,16 +60,12 @@ unit ascdef;
      If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
-{$ifndef _GNU_H_WINDOWS32_ASCIIFUNCTIONSDEFAULT}
-{$define _GNU_H_WINDOWS32_ASCIIFUNCTIONSDEFAULT}
-{ C++ extern C conditionnal removed }
-  { __cplusplus  }
 
   function GetBinaryType(lpApplicationName:LPCSTR; lpBinaryType:LPDWORD):WINBOOL;
 
   function GetShortPathName(lpszLongPath:LPCSTR; lpszShortPath:LPSTR; cchBuffer:DWORD):DWORD;
 
-  function GetEnvironmentStrings : LPSTR;
+  function GetEnvironmentStrings:LPSTR;
 
   function FreeEnvironmentStrings(_para1:LPSTR):WINBOOL;
 
@@ -131,7 +115,7 @@ unit ascdef;
 
   procedure FatalAppExit(uAction:UINT; lpMessageText:LPCSTR);
 
-  function GetCommandLine : LPSTR;
+  function GetCommandLine:LPSTR;
 
   function GetEnvironmentVariable(lpName:LPCSTR; lpBuffer:LPSTR; nSize:DWORD):DWORD;
 
@@ -324,9 +308,6 @@ unit ascdef;
 
   function wvsprintf(_para1:LPSTR; _para2:LPCSTR; arglist:va_list):longint;
 
-  (* function wsprintf(_para1:LPSTR; _para2:LPCSTR; ...):longint;
-      not allowed in FPC *)
-
   function LoadKeyboardLayout(pwszKLID:LPCSTR; Flags:UINT):HKL;
 
   function GetKeyboardLayoutName(pwszKLID:LPSTR):WINBOOL;
@@ -816,7 +797,7 @@ unit ascdef;
 
   function EnumSystemCodePages(lpCodePageEnumProc:CODEPAGE_ENUMPROC; dwFlags:DWORD):WINBOOL;
 
-  function PeekConsoleInput(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsRead: DWORD):WINBOOL;
+  function PeekConsoleInput(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsRead:DWORD):WINBOOL;
 
   function ReadConsoleInput(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsRead:DWORD):WINBOOL;
 
@@ -825,15 +806,14 @@ unit ascdef;
   function ReadConsoleOutput(hConsoleOutput:HANDLE; lpBuffer:PCHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpReadRegion:PSMALL_RECT):WINBOOL;
 
   function WriteConsoleOutput(hConsoleOutput:HANDLE; var lpBuffer:CHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpWriteRegion:PSMALL_RECT):WINBOOL;
-  function WriteConsoleOutput(hConsoleOutput:HANDLE; lpBuffer : pointer; dwBufferSize:COORD; dwBufferCoord:COORD; var lpWriteRegion : SMALL_RECT):WINBOOL;
 
-  function ReadConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPSTR; nLength:DWORD; dwReadCoord:COORD; var lpNumberOfCharsRead:DWORD):WINBOOL;
+  function ReadConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPSTR; nLength:DWORD; dwReadCoord:COORD; lpNumberOfCharsRead:LPDWORD):WINBOOL;
 
-  function WriteConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPCSTR; nLength:DWORD; dwWriteCoord:COORD; var lpNumberOfCharsWritten:DWORD):WINBOOL;
+  function WriteConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPCSTR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL;
 
-  function FillConsoleOutputCharacter(hConsoleOutput:HANDLE; cCharacter:CHAR; nLength:DWORD; dwWriteCoord:COORD; var lpNumberOfCharsWritten:DWORD):WINBOOL;
+  function FillConsoleOutputCharacter(hConsoleOutput:HANDLE; cCharacter:CHAR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL;
 
-  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; lpClipRectangle:PSMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL;
+  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; var lpClipRectangle:SMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL;
 
   function GetConsoleTitle(lpConsoleTitle:LPSTR; nSize:DWORD):DWORD;
 
@@ -912,14 +892,11 @@ unit ascdef;
 
   function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL;
 
-  { Extensions to OpenGL  }
   function wglUseFontBitmaps(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL;
 
   function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
              _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
 
-  { -------------------------------------  }
-  { From shellapi.h in old Cygnus headers  }
   function DragQueryFile(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal;
 
   function ExtractAssociatedIcon(_para1:HINST; var _para2:char; var _para3:WORD):HICON;
@@ -933,17 +910,12 @@ unit ascdef;
   function ShellExecute(_para1:HWND; var _para2:char; var _para3:char; var _para4:char; var _para5:char;
              _para6:longint):HINST;
 
-  { end of stuff from shellapi.h in old Cygnus headers  }
-  { --------------------------------------------------  }
-  { From ddeml.h in old Cygnus headers  }
   function DdeCreateStringHandle(_para1:DWORD; var _para2:char; _para3:longint):HSZ;
 
   function DdeInitialize(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
 
   function DdeQueryString(_para1:DWORD; _para2:HSZ; var _para3:char; _para4:DWORD; _para5:longint):DWORD;
 
-  { end of stuff from ddeml.h in old Cygnus headers  }
-  { -----------------------------------------------  }
   function LogonUser(_para1:LPSTR; _para2:LPSTR; _para3:LPSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL;
 
@@ -951,11 +923,6 @@ unit ascdef;
              _para6:WINBOOL; _para7:DWORD; _para8:LPVOID; _para9:LPCTSTR; var _para10:STARTUPINFO;
              var _para11:PROCESS_INFORMATION):WINBOOL;
 
-{ C++ end of extern C conditionnal removed }
-  { __cplusplus  }
-{$endif}
-  { _GNU_H_WINDOWS32_ASCIIFUNCTIONSDEFAULT  }
-
 {$endif read_interface}
 
 {$ifndef windows_include_files}
@@ -971,7 +938,7 @@ unit ascdef;
 
   function GetShortPathName(lpszLongPath:LPCSTR; lpszShortPath:LPSTR; cchBuffer:DWORD):DWORD; external 'kernel32' name 'GetShortPathNameA';
 
-  function GetEnvironmentStrings : LPSTR; external 'kernel32' name 'GetEnvironmentStringsA';
+  function GetEnvironmentStrings:LPSTR; external 'kernel32' name 'GetEnvironmentStringsA';
 
   function FreeEnvironmentStrings(_para1:LPSTR):WINBOOL; external 'kernel32' name 'FreeEnvironmentStringsA';
 
@@ -1021,7 +988,7 @@ unit ascdef;
 
   procedure FatalAppExit(uAction:UINT; lpMessageText:LPCSTR); external 'kernel32' name 'FatalAppExitA';
 
-  function GetCommandLine : LPSTR; external 'kernel32' name 'GetCommandLineA';
+  function GetCommandLine:LPSTR; external 'kernel32' name 'GetCommandLineA';
 
   function GetEnvironmentVariable(lpName:LPCSTR; lpBuffer:LPSTR; nSize:DWORD):DWORD; external 'kernel32' name 'GetEnvironmentVariableA';
 
@@ -1727,15 +1694,14 @@ unit ascdef;
   function ReadConsoleOutput(hConsoleOutput:HANDLE; lpBuffer:PCHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpReadRegion:PSMALL_RECT):WINBOOL; external 'kernel32' name 'ReadConsoleOutputA';
 
   function WriteConsoleOutput(hConsoleOutput:HANDLE; var lpBuffer:CHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpWriteRegion:PSMALL_RECT):WINBOOL; external 'kernel32' name 'WriteConsoleOutputA';
-  function WriteConsoleOutput(hConsoleOutput:HANDLE; lpBuffer : pointer; dwBufferSize:COORD; dwBufferCoord:COORD; var lpWriteRegion : SMALL_RECT):WINBOOL; external 'kernel32' name 'WriteConsoleOutputA';
 
-  function ReadConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPSTR; nLength:DWORD; dwReadCoord:COORD; var lpNumberOfCharsRead:DWORD):WINBOOL; external 'kernel32' name 'ReadConsoleOutputCharacterA';
+  function ReadConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPSTR; nLength:DWORD; dwReadCoord:COORD; lpNumberOfCharsRead:LPDWORD):WINBOOL; external 'kernel32' name 'ReadConsoleOutputCharacterA';
 
-  function WriteConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPCSTR; nLength:DWORD; dwWriteCoord:COORD; var lpNumberOfCharsWritten:DWORD):WINBOOL; external 'kernel32' name 'WriteConsoleOutputCharacterA';
+  function WriteConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPCSTR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL; external 'kernel32' name 'WriteConsoleOutputCharacterA';
 
-  function FillConsoleOutputCharacter(hConsoleOutput:HANDLE; cCharacter:CHAR; nLength:DWORD; dwWriteCoord:COORD; var lpNumberOfCharsWritten:DWORD):WINBOOL; external 'kernel32' name 'FillConsoleOutputCharacterA';
+  function FillConsoleOutputCharacter(hConsoleOutput:HANDLE; cCharacter:CHAR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL; external 'kernel32' name 'FillConsoleOutputCharacterA';
 
-  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; lpClipRectangle: PSMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL; external 'kernel32' name 'ScrollConsoleScreenBufferA';
+  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; var lpClipRectangle:SMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL; external 'kernel32' name 'ScrollConsoleScreenBufferA';
 
   function GetConsoleTitle(lpConsoleTitle:LPSTR; nSize:DWORD):DWORD; external 'kernel32' name 'GetConsoleTitleA';
 
@@ -1852,19 +1818,19 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.8  1999-04-20 11:36:07  peter
-    * compatibility fixes
+  Revision 1.9  1999-05-01 12:27:48  peter
+    * fixed conflicting declarations
 
-  Revision 1.7  1999/01/09 07:29:46  florian
-    * some updates to compile API units for win32
+  Revision 1.7  1999/04/20 11:36:08  peter
+    * compatibility fixes
 
-  Revision 1.6  1999/01/07 15:52:22  peter
+  Revision 1.6  1999/01/07 15:52:23  peter
     * removed winspool requirement
 
-  Revision 1.5  1998/10/27 11:17:07  peter
+  Revision 1.5  1998/10/27 11:17:09  peter
     * type HINSTANCE -> HINST
 
-  Revision 1.4  1998/09/04 17:17:28  pierre
+  Revision 1.4  1998/09/04 17:17:31  pierre
     + all unknown function ifdef with
       conditionnal unknown_functions
       testwin works now, but windowcreate still fails !!

rtl/win32/ascfun.pp

@@ -1,9 +1,9 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    This unit contains the record definition for the Win32 API
-    Copyright (c) 1993,97 by Florian KLaempfl,
-    member of the Free Pascal development team.
+    Copyright (c) 1999 by the Free Pascal development team.
+
+    Contains the Ascii functions for windows unit
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -23,26 +23,14 @@
 {$ifndef windows_include_files}
 
 unit ascfun;
-
-{  Automatically converted by H2PAS.EXE from asciifun.h
-   Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97
-   Further improvements by Michael Van Canneyt, April 1998
-   define handling and error recovery by Pierre Muller, June 1998 }
-
-
-  interface
-
-   uses
-      base,defines,struct;
+interface
+uses
+  base,defines,struct;
 
 {$endif windows_include_files}
 
 {$ifdef read_interface}
 
-  { C default packing is dword }
-
-{$PACKRECORDS 4}
   {
      ASCIIFunctions.h
 
@@ -72,10 +60,6 @@ unit ascfun;
      If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
-{$ifndef _GNU_H_WINDOWS32_ASCIIFUNCTIONS}
-{$define _GNU_H_WINDOWS32_ASCIIFUNCTIONS}
-{ C++ extern C conditionnal removed }
-  { __cplusplus  }
 
   function GetBinaryTypeA(lpApplicationName:LPCSTR; lpBinaryType:LPDWORD):WINBOOL;
 
@@ -324,9 +308,6 @@ unit ascfun;
 
   function wvsprintfA(_para1:LPSTR; _para2:LPCSTR; arglist:va_list):longint;
 
-  (* function wsprintfA(_para1:LPSTR; _para2:LPCSTR; ...):longint;
-      not allowed in FPC *)
-
   function LoadKeyboardLayoutA(pwszKLID:LPCSTR; Flags:UINT):HKL;
 
   function GetKeyboardLayoutNameA(pwszKLID:LPSTR):WINBOOL;
@@ -911,14 +892,11 @@ unit ascfun;
 
   function StartServiceA(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL;
 
-  { Extensions to OpenGL  }
   function wglUseFontBitmapsA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL;
 
   function wglUseFontOutlinesA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT;
              _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL;
 
-  { -------------------------------------  }
-  { From shellapi.h in old Cygnus headers  }
   function DragQueryFileA(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal;
 
   function ExtractAssociatedIconA(_para1:HINST; var _para2:char; var _para3:WORD):HICON;
@@ -932,17 +910,12 @@ unit ascfun;
   function ShellExecuteA(_para1:HWND; var _para2:char; var _para3:char; var _para4:char; var _para5:char;
              _para6:longint):HINST;
 
-  { end of stuff from shellapi.h in old Cygnus headers  }
-  { --------------------------------------------------  }
-  { From ddeml.h in old Cygnus headers  }
   function DdeCreateStringHandleA(_para1:DWORD; var _para2:char; _para3:longint):HSZ;
 
   function DdeInitializeA(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
 
   function DdeQueryStringA(_para1:DWORD; _para2:HSZ; var _para3:char; _para4:DWORD; _para5:longint):DWORD;
 
-  { end of stuff from ddeml.h in old Cygnus headers  }
-  { -----------------------------------------------  }
   function LogonUserA(_para1:LPSTR; _para2:LPSTR; _para3:LPSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL;
 
@@ -950,11 +923,6 @@ unit ascfun;
              _para6:WINBOOL; _para7:DWORD; _para8:LPVOID; _para9:LPCTSTR; var _para10:STARTUPINFO;
              var _para11:PROCESS_INFORMATION):WINBOOL;
 
-{ C++ end of extern C conditionnal removed }
-  { __cplusplus  }
-{$endif}
-  { _GNU_H_WINDOWS32_ASCIIFUNCTIONS  }
-
 {$endif read_interface}
 
 {$ifndef windows_include_files}
@@ -1850,7 +1818,10 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.7  1999-04-20 11:36:08  peter
+  Revision 1.8  1999-05-01 12:27:50  peter
+    * fixed conflicting declarations
+
+  Revision 1.7  1999/04/20 11:36:08  peter
     * compatibility fixes
 
   Revision 1.6  1999/01/07 15:52:23  peter

rtl/win32/unidef.pp

@@ -23,18 +23,9 @@
 {$ifndef windows_include_files}
 
 unit unidef;
-
-{  Automatically converted by H2PAS.EXE from unicfun.h
-   Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97
-   Further improvements by Michael Van Canneyt, April 1998
-   define handling and error recovery by Pierre Muller, June 1998 }
-
-
-  interface
-
-   uses
-      base,defines,struct;
+interface
+uses
+  base,defines,struct;
 
 {$endif not windows_include_files}
 
@@ -42,7 +33,6 @@ unit unidef;
 
   { C default packing is dword }
 
-{$PACKRECORDS 4}
   {
      UnicodeFunctions.h
 
@@ -73,16 +63,12 @@ unit unidef;
      If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
-{$ifndef _GNU_H_WINDOWS32_UNICODEFUNCTIONSDEFAULT}
-{$define _GNU_H_WINDOWS32_UNICODEFUNCTIONSDEFAULT}
-{ C++ extern C conditionnal removed }
-  { __cplusplus  }
 
   function GetBinaryType(lpApplicationName:LPCWSTR; lpBinaryType:LPDWORD):WINBOOL;
 
   function GetShortPathName(lpszLongPath:LPCWSTR; lpszShortPath:LPWSTR; cchBuffer:DWORD):DWORD;
 
-  function GetEnvironmentStrings : LPWSTR;
+  function GetEnvironmentStrings:LPWSTR;
 
   function FreeEnvironmentStrings(_para1:LPWSTR):WINBOOL;
 
@@ -132,7 +118,7 @@ unit unidef;
 
   procedure FatalAppExit(uAction:UINT; lpMessageText:LPCWSTR);
 
-  function GetCommandLine : LPWSTR;
+  function GetCommandLine:LPWSTR;
 
   function GetEnvironmentVariable(lpName:LPCWSTR; lpBuffer:LPWSTR; nSize:DWORD):DWORD;
 
@@ -353,7 +339,6 @@ unit unidef;
 
   function GetMessage(lpMsg:LPMSG; hWnd:HWND; wMsgFilterMin:UINT; wMsgFilterMax:UINT):WINBOOL;
 
-(* Const before type ignored *)
   function DispatchMessage(var lpMsg:MSG):LONG;
 
   function PeekMessage(lpMsg:LPMSG; hWnd:HWND; wMsgFilterMin:UINT; wMsgFilterMax:UINT; wRemoveMsg:UINT):WINBOOL;
@@ -376,14 +361,12 @@ unit unidef;
 
   function CallWindowProc(lpPrevWndFunc:WNDPROC; hWnd:HWND; Msg:UINT; wParam:WPARAM; lParam:LPARAM):LRESULT;
 
-(* Const before type ignored *)
   function RegisterClass(var lpWndClass:WNDCLASS):ATOM;
 
   function UnregisterClass(lpClassName:LPCWSTR; hInstance:HINST):WINBOOL;
 
   function GetClassInfo(hInstance:HINST; lpClassName:LPCWSTR; lpWndClass:LPWNDCLASS):WINBOOL;
 
-(* Const before type ignored *)
   function RegisterClassEx(var _para1:WNDCLASSEX):ATOM;
 
   function GetClassInfoEx(_para1:HINST; _para2:LPCWSTR; _para3:LPWNDCLASSEX):WINBOOL;
@@ -462,7 +445,6 @@ unit unidef;
 
   function LoadMenu(hInstance:HINST; lpMenuName:LPCWSTR):HMENU;
 
-(* Const before type ignored *)
   function LoadMenuIndirect(var lpMenuTemplate:MENUTEMPLATE):HMENU;
 
   function ChangeMenu(hMenu:HMENU; cmd:UINT; lpszNewItem:LPCWSTR; cmdInsert:UINT; flags:UINT):WINBOOL;
@@ -577,14 +559,12 @@ unit unidef;
 
   function CopyMetaFile(_para1:HMETAFILE; _para2:LPCWSTR):HMETAFILE;
 
-(* Const before type ignored *)
   function CreateFontIndirect(var _para1:LOGFONT):HFONT;
 
   function CreateFont(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;
              _para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;
              _para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCWSTR):HFONT;
 
-(* Const before type ignored *)
   function CreateIC(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR; var _para4:DEVMODE):HDC;
 
   function CreateMetaFile(_para1:LPCWSTR):HDC;
@@ -607,7 +587,6 @@ unit unidef;
 
   function GetCharABCWidthsFloat(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABCFLOAT):WINBOOL;
 
-(* Const before type ignored *)
   function GetGlyphOutline(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPGLYPHMETRICS; _para5:DWORD;
              _para6:LPVOID; var _para7:MAT2):DWORD;
 
@@ -625,14 +604,12 @@ unit unidef;
   function GetCharacterPlacement(_para1:HDC; _para2:LPCWSTR; _para3:longint; _para4:longint; _para5:LPGCP_RESULTS;
              _para6:DWORD):DWORD;
 
-(* Const before type ignored *)
   function ResetDC(_para1:HDC; var _para2:DEVMODE):HDC;
 
   function RemoveFontResource(_para1:LPCWSTR):WINBOOL;
 
   function CopyEnhMetaFile(_para1:HENHMETAFILE; _para2:LPCWSTR):HENHMETAFILE;
 
-(* Const before type ignored *)
   function CreateEnhMetaFile(_para1:HDC; _para2:LPCWSTR; var _para3:RECT; _para4:LPCWSTR):HDC;
 
   function GetEnhMetaFile(_para1:LPCWSTR):HENHMETAFILE;
@@ -641,19 +618,15 @@ unit unidef;
 
   function GetTextMetrics(_para1:HDC; _para2:LPTEXTMETRIC):WINBOOL;
 
-(* Const before type ignored *)
   function StartDoc(_para1:HDC; var _para2:DOCINFO):longint;
 
   function GetObject(_para1:HGDIOBJ; _para2:longint; _para3:LPVOID):longint;
 
   function TextOut(_para1:HDC; _para2:longint; _para3:longint; _para4:LPCWSTR; _para5:longint):WINBOOL;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ExtTextOut(_para1:HDC; _para2:longint; _para3:longint; _para4:UINT; var _para5:RECT;
              _para6:LPCWSTR; _para7:UINT; var _para8:INT):WINBOOL;
 
-(* Const before type ignored *)
   function PolyTextOut(_para1:HDC; var _para2:POLYTEXT; _para3:longint):WINBOOL;
 
   function GetTextFace(_para1:HDC; _para2:longint; _para3:LPWSTR):longint;
@@ -729,7 +702,6 @@ unit unidef;
   { was #define dname(params) def_expr }
   function DialogBoxIndirect(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndParent:HWND; lpDialogFunc:DLGPROC):longint;
 
-(* Const before type ignored *)
   function CreateDC(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR; var _para4:DEVMODE):HDC;
 
   function CreateFontA(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;
@@ -745,13 +717,11 @@ unit unidef;
 
   function VerLanguageName(wLang:DWORD; szLang:LPWSTR; nSize:DWORD):DWORD;
 
-(* Const before type ignored *)
   function VerQueryValue(pBlock:LPVOID; lpSubBlock:LPWSTR; var lplpBuffer:LPVOID; puLen:PUINT):WINBOOL;
 
   function VerFindFile(uFlags:DWORD; szFileName:LPWSTR; szWinDir:LPWSTR; szAppDir:LPWSTR; szCurDir:LPWSTR;
              lpuCurDirLen:PUINT; szDestDir:LPWSTR; lpuDestDirLen:PUINT):DWORD;
 
-(* Const before type ignored *)
   function RegSetValueEx(hKey:HKEY; lpValueName:LPCWSTR; Reserved:DWORD; dwType:DWORD; var lpData:BYTE;
              cbData:DWORD):LONG;
 
@@ -815,19 +785,15 @@ unit unidef;
 
   function SetLocaleInfo(Locale:LCID; LCType:LCTYPE; lpLCData:LPCWSTR):WINBOOL;
 
-(* Const before type ignored *)
   function GetTimeFormat(Locale:LCID; dwFlags:DWORD; var lpTime:SYSTEMTIME; lpFormat:LPCWSTR; lpTimeStr:LPWSTR;
              cchTime:longint):longint;
 
-(* Const before type ignored *)
   function GetDateFormat(Locale:LCID; dwFlags:DWORD; var lpDate:SYSTEMTIME; lpFormat:LPCWSTR; lpDateStr:LPWSTR;
              cchDate:longint):longint;
 
-(* Const before type ignored *)
   function GetNumberFormat(Locale:LCID; dwFlags:DWORD; lpValue:LPCWSTR; var lpFormat:NUMBERFMT; lpNumberStr:LPWSTR;
              cchNumber:longint):longint;
 
-(* Const before type ignored *)
   function GetCurrencyFormat(Locale:LCID; dwFlags:DWORD; lpValue:LPCWSTR; var lpFormat:CURRENCYFMT; lpCurrencyStr:LPWSTR;
              cchCurrency:longint):longint;
 
@@ -851,12 +817,10 @@ unit unidef;
 
   function ReadConsoleInput(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsRead:DWORD):WINBOOL;
 
-(* Const before type ignored *)
   function WriteConsoleInput(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsWritten:DWORD):WINBOOL;
 
   function ReadConsoleOutput(hConsoleOutput:HANDLE; lpBuffer:PCHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpReadRegion:PSMALL_RECT):WINBOOL;
 
-(* Const before type ignored *)
   function WriteConsoleOutput(hConsoleOutput:HANDLE; var lpBuffer:CHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpWriteRegion:PSMALL_RECT):WINBOOL;
 
   function ReadConsoleOutputCharacter(hConsoleOutput:HANDLE; lpCharacter:LPWSTR; nLength:DWORD; dwReadCoord:COORD; lpNumberOfCharsRead:LPDWORD):WINBOOL;
@@ -865,10 +829,7 @@ unit unidef;
 
   function FillConsoleOutputCharacter(hConsoleOutput:HANDLE; cCharacter:WCHAR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
-(* Const before type ignored *)
-  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; lpClipRectangle:PSMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL;
+  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; var lpClipRectangle:SMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL;
 
   function GetConsoleTitle(lpConsoleTitle:LPWSTR; nSize:DWORD):DWORD;
 
@@ -876,7 +837,6 @@ unit unidef;
 
   function ReadConsole(hConsoleInput:HANDLE; lpBuffer:LPVOID; nNumberOfCharsToRead:DWORD; lpNumberOfCharsRead:LPDWORD; lpReserved:LPVOID):WINBOOL;
 
-(* Const before type ignored *)
   function WriteConsole(hConsoleOutput:HANDLE;lpBuffer:pointer; nNumberOfCharsToWrite:DWORD; lpNumberOfCharsWritten:LPDWORD; lpReserved:LPVOID):WINBOOL;
 
   function WNetAddConnection(lpRemoteName:LPCWSTR; lpPassword:LPCWSTR; lpLocalName:LPCWSTR):DWORD;
@@ -960,34 +920,21 @@ unit unidef;
 
   function ExtractAssociatedIcon(_para1:HINST; _para2:LPCWSTR; var _para3:WORD):HICON;
 
-(* Const before type ignored *)
   function ExtractIcon(_para1:HINST; _para2:LPCWSTR; _para3:cardinal):HICON;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
   function FindExecutable(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR):HINST;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ShellAbout(_para1:HWND; _para2:LPCWSTR; _para3:LPCWSTR; _para4:HICON):longint;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ShellExecute(_para1:HWND; _para2:LPCWSTR; _para3:LPCWSTR; _para4:LPCWSTR; _para5:LPCWSTR;
              _para6:longint):HINST;
 
-  { end of stuff from shellapi.h in old Cygnus headers  }
-  { --------------------------------------------------  }
-  { From ddeml.h in old Cygnus headers  }
   function DdeCreateStringHandle(_para1:DWORD; _para2:LPCWSTR; _para3:longint):HSZ;
 
   function DdeInitialize(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
 
   function DdeQueryString(_para1:DWORD; _para2:HSZ; _para3:LPCWSTR; _para4:DWORD; _para5:longint):DWORD;
 
-  { end of stuff from ddeml.h in old Cygnus headers  }
-  { -----------------------------------------------  }
   function LogonUser(_para1:LPWSTR; _para2:LPWSTR; _para3:LPWSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL;
 
@@ -995,11 +942,6 @@ unit unidef;
              _para6:WINBOOL; _para7:DWORD; _para8:LPVOID; _para9:LPCWSTR; var _para10:STARTUPINFO;
              var _para11:PROCESS_INFORMATION):WINBOOL;
 
-{ C++ end of extern C conditionnal removed }
-  { __cplusplus  }
-{$endif}
-  { _GNU_H_WINDOWS32_UNICODEFUNCTIONSDEFAULT  }
-
 {$endif read_interface}
 
 {$ifndef windows_include_files}
@@ -1015,7 +957,7 @@ unit unidef;
 
   function GetShortPathName(lpszLongPath:LPCWSTR; lpszShortPath:LPWSTR; cchBuffer:DWORD):DWORD; external 'kernel32' name 'GetShortPathNameW';
 
-  function GetEnvironmentStrings : LPWSTR; external 'kernel32' name 'GetEnvironmentStringsW';
+  function GetEnvironmentStrings:LPWSTR; external 'kernel32' name 'GetEnvironmentStringsW';
 
   function FreeEnvironmentStrings(_para1:LPWSTR):WINBOOL; external 'kernel32' name 'FreeEnvironmentStringsW';
 
@@ -1065,7 +1007,7 @@ unit unidef;
 
   procedure FatalAppExit(uAction:UINT; lpMessageText:LPCWSTR); external 'kernel32' name 'FatalAppExitW';
 
-  function GetCommandLine : LPWSTR; external 'kernel32' name 'GetCommandLineW';
+  function GetCommandLine:LPWSTR; external 'kernel32' name 'GetCommandLineW';
 
   function GetEnvironmentVariable(lpName:LPCWSTR; lpBuffer:LPWSTR; nSize:DWORD):DWORD; external 'kernel32' name 'GetEnvironmentVariableW';
 
@@ -1790,7 +1732,7 @@ unit unidef;
 
   function FillConsoleOutputCharacter(hConsoleOutput:HANDLE; cCharacter:WCHAR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL; external 'kernel32' name 'FillConsoleOutputCharacterW';
 
-  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; lpClipRectangle:PSMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL; external 'kernel32' name 'ScrollConsoleScreenBufferW';
+  function ScrollConsoleScreenBuffer(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; var lpClipRectangle:SMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL; external 'kernel32' name 'ScrollConsoleScreenBufferW';
 
   function GetConsoleTitle(lpConsoleTitle:LPWSTR; nSize:DWORD):DWORD; external 'kernel32' name 'GetConsoleTitleW';
 
@@ -1908,11 +1850,11 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.8  1999-04-20 11:36:19  peter
-    * compatibility fixes
+  Revision 1.9  1999-05-01 12:27:53  peter
+    * fixed conflicting declarations
 
-  Revision 1.7  1999/01/29 09:24:46  pierre
-  win32.inc
+  Revision 1.7  1999/04/20 11:36:21  peter
+    * compatibility fixes
 
   Revision 1.6  1999/01/07 15:52:27  peter
     * removed winspool requirement

rtl/win32/unifun.pp

@@ -1,9 +1,9 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    This unit contains the record definition for the Win32 API
-    Copyright (c) 1993,97 by Florian KLaempfl,
-    member of the Free Pascal development team.
+    Copyright (c) 1999 by the Free Pascal development team.
+
+    Contains the Unicode functions for windows unit
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -23,18 +23,9 @@
 {$ifndef windows_include_files}
 
 unit unifun;
-
-{  Automatically converted by H2PAS.EXE from unicfun.h
-   Utility made by Florian Klaempfl 25th-28th september 96
-   Improvements made by Mark A. Malakanov 22nd-25th may 97
-   Further improvements by Michael Van Canneyt, April 1998
-   define handling and error recovery by Pierre Muller, June 1998 }
-
-
-  interface
-
-   uses
-      base,defines,struct;
+interface
+uses
+  base,defines,struct;
 
 {$endif not windows_include_files}
 
@@ -42,7 +33,6 @@ unit unifun;
 
   { C default packing is dword }
 
-{$PACKRECORDS 4}
   {
      UnicodeFunctions.h
 
@@ -73,10 +63,6 @@ unit unifun;
      If not, write to the Free Software Foundation,
      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    }
-{$ifndef _GNU_H_WINDOWS32_UNICODEFUNCTIONS}
-{$define _GNU_H_WINDOWS32_UNICODEFUNCTIONS}
-{ C++ extern C conditionnal removed }
-  { __cplusplus  }
 
   function GetBinaryTypeW(lpApplicationName:LPCWSTR; lpBinaryType:LPDWORD):WINBOOL;
 
@@ -353,7 +339,6 @@ unit unifun;
 
   function GetMessageW(lpMsg:LPMSG; hWnd:HWND; wMsgFilterMin:UINT; wMsgFilterMax:UINT):WINBOOL;
 
-(* Const before type ignored *)
   function DispatchMessageW(var lpMsg:MSG):LONG;
 
   function PeekMessageW(lpMsg:LPMSG; hWnd:HWND; wMsgFilterMin:UINT; wMsgFilterMax:UINT; wRemoveMsg:UINT):WINBOOL;
@@ -376,14 +361,12 @@ unit unifun;
 
   function CallWindowProcW(lpPrevWndFunc:WNDPROC; hWnd:HWND; Msg:UINT; wParam:WPARAM; lParam:LPARAM):LRESULT;
 
-(* Const before type ignored *)
   function RegisterClassW(var lpWndClass:WNDCLASS):ATOM;
 
   function UnregisterClassW(lpClassName:LPCWSTR; hInstance:HINST):WINBOOL;
 
   function GetClassInfoW(hInstance:HINST; lpClassName:LPCWSTR; lpWndClass:LPWNDCLASS):WINBOOL;
 
-(* Const before type ignored *)
   function RegisterClassExW(var _para1:WNDCLASSEX):ATOM;
 
   function GetClassInfoExW(_para1:HINST; _para2:LPCWSTR; _para3:LPWNDCLASSEX):WINBOOL;
@@ -462,7 +445,6 @@ unit unifun;
 
   function LoadMenuW(hInstance:HINST; lpMenuName:LPCWSTR):HMENU;
 
-(* Const before type ignored *)
   function LoadMenuIndirectW(var lpMenuTemplate:MENUTEMPLATE):HMENU;
 
   function ChangeMenuW(hMenu:HMENU; cmd:UINT; lpszNewItem:LPCWSTR; cmdInsert:UINT; flags:UINT):WINBOOL;
@@ -577,14 +559,12 @@ unit unifun;
 
   function CopyMetaFileW(_para1:HMETAFILE; _para2:LPCWSTR):HMETAFILE;
 
-(* Const before type ignored *)
   function CreateFontIndirectW(var _para1:LOGFONT):HFONT;
 
   function CreateFontW(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;
              _para6:DWORD; _para7:DWORD; _para8:DWORD; _para9:DWORD; _para10:DWORD;
              _para11:DWORD; _para12:DWORD; _para13:DWORD; _para14:LPCWSTR):HFONT;
 
-(* Const before type ignored *)
   function CreateICW(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR; var _para4:DEVMODE):HDC;
 
   function CreateMetaFileW(_para1:LPCWSTR):HDC;
@@ -607,7 +587,6 @@ unit unifun;
 
   function GetCharABCWidthsFloatW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPABCFLOAT):WINBOOL;
 
-(* Const before type ignored *)
   function GetGlyphOutlineW(_para1:HDC; _para2:UINT; _para3:UINT; _para4:LPGLYPHMETRICS; _para5:DWORD;
              _para6:LPVOID; var _para7:MAT2):DWORD;
 
@@ -625,14 +604,12 @@ unit unifun;
   function GetCharacterPlacementW(_para1:HDC; _para2:LPCWSTR; _para3:longint; _para4:longint; _para5:LPGCP_RESULTS;
              _para6:DWORD):DWORD;
 
-(* Const before type ignored *)
   function ResetDCW(_para1:HDC; var _para2:DEVMODE):HDC;
 
   function RemoveFontResourceW(_para1:LPCWSTR):WINBOOL;
 
   function CopyEnhMetaFileW(_para1:HENHMETAFILE; _para2:LPCWSTR):HENHMETAFILE;
 
-(* Const before type ignored *)
   function CreateEnhMetaFileW(_para1:HDC; _para2:LPCWSTR; var _para3:RECT; _para4:LPCWSTR):HDC;
 
   function GetEnhMetaFileW(_para1:LPCWSTR):HENHMETAFILE;
@@ -641,19 +618,15 @@ unit unifun;
 
   function GetTextMetricsW(_para1:HDC; _para2:LPTEXTMETRIC):WINBOOL;
 
-(* Const before type ignored *)
   function StartDocW(_para1:HDC; var _para2:DOCINFO):longint;
 
   function GetObjectW(_para1:HGDIOBJ; _para2:longint; _para3:LPVOID):longint;
 
   function TextOutW(_para1:HDC; _para2:longint; _para3:longint; _para4:LPCWSTR; _para5:longint):WINBOOL;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ExtTextOutW(_para1:HDC; _para2:longint; _para3:longint; _para4:UINT; var _para5:RECT;
              _para6:LPCWSTR; _para7:UINT; var _para8:INT):WINBOOL;
 
-(* Const before type ignored *)
   function PolyTextOutW(_para1:HDC; var _para2:POLYTEXT; _para3:longint):WINBOOL;
 
   function GetTextFaceW(_para1:HDC; _para2:longint; _para3:LPWSTR):longint;
@@ -729,7 +702,6 @@ unit unifun;
   { was #define dname(params) def_expr }
   function DialogBoxIndirectW(hInstance:HINST; lpTemplate:LPCDLGTEMPLATE; hWndParent:HWND; lpDialogFunc:DLGPROC):longint;
 
-(* Const before type ignored *)
   function CreateDCW(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR; var _para4:DEVMODE):HDC;
 
   function CreateFontA(_para1:longint; _para2:longint; _para3:longint; _para4:longint; _para5:longint;
@@ -745,13 +717,11 @@ unit unifun;
 
   function VerLanguageNameW(wLang:DWORD; szLang:LPWSTR; nSize:DWORD):DWORD;
 
-(* Const before type ignored *)
   function VerQueryValueW(pBlock:LPVOID; lpSubBlock:LPWSTR; var lplpBuffer:LPVOID; puLen:PUINT):WINBOOL;
 
   function VerFindFileW(uFlags:DWORD; szFileName:LPWSTR; szWinDir:LPWSTR; szAppDir:LPWSTR; szCurDir:LPWSTR;
              lpuCurDirLen:PUINT; szDestDir:LPWSTR; lpuDestDirLen:PUINT):DWORD;
 
-(* Const before type ignored *)
   function RegSetValueExW(hKey:HKEY; lpValueName:LPCWSTR; Reserved:DWORD; dwType:DWORD; var lpData:BYTE;
              cbData:DWORD):LONG;
 
@@ -815,19 +785,15 @@ unit unifun;
 
   function SetLocaleInfoW(Locale:LCID; LCType:LCTYPE; lpLCData:LPCWSTR):WINBOOL;
 
-(* Const before type ignored *)
   function GetTimeFormatW(Locale:LCID; dwFlags:DWORD; var lpTime:SYSTEMTIME; lpFormat:LPCWSTR; lpTimeStr:LPWSTR;
              cchTime:longint):longint;
 
-(* Const before type ignored *)
   function GetDateFormatW(Locale:LCID; dwFlags:DWORD; var lpDate:SYSTEMTIME; lpFormat:LPCWSTR; lpDateStr:LPWSTR;
              cchDate:longint):longint;
 
-(* Const before type ignored *)
   function GetNumberFormatW(Locale:LCID; dwFlags:DWORD; lpValue:LPCWSTR; var lpFormat:NUMBERFMT; lpNumberStr:LPWSTR;
              cchNumber:longint):longint;
 
-(* Const before type ignored *)
   function GetCurrencyFormatW(Locale:LCID; dwFlags:DWORD; lpValue:LPCWSTR; var lpFormat:CURRENCYFMT; lpCurrencyStr:LPWSTR;
              cchCurrency:longint):longint;
 
@@ -851,12 +817,10 @@ unit unifun;
 
   function ReadConsoleInputW(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsRead:DWORD):WINBOOL;
 
-(* Const before type ignored *)
   function WriteConsoleInputW(hConsoleInput:HANDLE; var lpBuffer:TINPUTRECORD; nLength:DWORD; var lpNumberOfEventsWritten:DWORD):WINBOOL;
 
   function ReadConsoleOutputW(hConsoleOutput:HANDLE; lpBuffer:PCHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpReadRegion:PSMALL_RECT):WINBOOL;
 
-(* Const before type ignored *)
   function WriteConsoleOutputW(hConsoleOutput:HANDLE; var lpBuffer:CHAR_INFO; dwBufferSize:COORD; dwBufferCoord:COORD; lpWriteRegion:PSMALL_RECT):WINBOOL;
 
   function ReadConsoleOutputCharacterW(hConsoleOutput:HANDLE; lpCharacter:LPWSTR; nLength:DWORD; dwReadCoord:COORD; lpNumberOfCharsRead:LPDWORD):WINBOOL;
@@ -865,9 +829,6 @@ unit unifun;
 
   function FillConsoleOutputCharacterW(hConsoleOutput:HANDLE; cCharacter:WCHAR; nLength:DWORD; dwWriteCoord:COORD; lpNumberOfCharsWritten:LPDWORD):WINBOOL;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ScrollConsoleScreenBufferW(hConsoleOutput:HANDLE; var lpScrollRectangle:SMALL_RECT; var lpClipRectangle:SMALL_RECT; dwDestinationOrigin:COORD; var lpFill:CHAR_INFO):WINBOOL;
 
   function GetConsoleTitleW(lpConsoleTitle:LPWSTR; nSize:DWORD):DWORD;
@@ -876,7 +837,6 @@ unit unifun;
 
   function ReadConsoleW(hConsoleInput:HANDLE; lpBuffer:LPVOID; nNumberOfCharsToRead:DWORD; lpNumberOfCharsRead:LPDWORD; lpReserved:LPVOID):WINBOOL;
 
-(* Const before type ignored *)
   function WriteConsoleW(hConsoleOutput:HANDLE;lpBuffer:pointer; nNumberOfCharsToWrite:DWORD; lpNumberOfCharsWritten:LPDWORD; lpReserved:LPVOID):WINBOOL;
 
   function WNetAddConnectionW(lpRemoteName:LPCWSTR; lpPassword:LPCWSTR; lpLocalName:LPCWSTR):DWORD;
@@ -960,34 +920,21 @@ unit unifun;
 
   function ExtractAssociatedIconW(_para1:HINST; _para2:LPCWSTR; var _para3:WORD):HICON;
 
-(* Const before type ignored *)
   function ExtractIconW(_para1:HINST; _para2:LPCWSTR; _para3:cardinal):HICON;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
   function FindExecutableW(_para1:LPCWSTR; _para2:LPCWSTR; _para3:LPCWSTR):HINST;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ShellAboutW(_para1:HWND; _para2:LPCWSTR; _para3:LPCWSTR; _para4:HICON):longint;
 
-(* Const before type ignored *)
-(* Const before type ignored *)
-(* Const before type ignored *)
   function ShellExecuteW(_para1:HWND; _para2:LPCWSTR; _para3:LPCWSTR; _para4:LPCWSTR; _para5:LPCWSTR;
              _para6:longint):HINST;
 
-  { end of stuff from shellapi.h in old Cygnus headers  }
-  { --------------------------------------------------  }
-  { From ddeml.h in old Cygnus headers  }
   function DdeCreateStringHandleW(_para1:DWORD; _para2:LPCWSTR; _para3:longint):HSZ;
 
   function DdeInitializeW(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
 
   function DdeQueryStringW(_para1:DWORD; _para2:HSZ; _para3:LPCWSTR; _para4:DWORD; _para5:longint):DWORD;
 
-  { end of stuff from ddeml.h in old Cygnus headers  }
-  { -----------------------------------------------  }
   function LogonUserW(_para1:LPWSTR; _para2:LPWSTR; _para3:LPWSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL;
 
@@ -995,11 +942,6 @@ unit unifun;
              _para6:WINBOOL; _para7:DWORD; _para8:LPVOID; _para9:LPCWSTR; var _para10:STARTUPINFO;
              var _para11:PROCESS_INFORMATION):WINBOOL;
 
-{ C++ end of extern C conditionnal removed }
-  { __cplusplus  }
-{$endif}
-  { _GNU_H_WINDOWS32_UNICODEFUNCTIONS  }
-
 {$endif read_interface}
 
 {$ifndef windows_include_files}
@@ -1908,7 +1850,10 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.7  1999-04-20 11:36:21  peter
+  Revision 1.8  1999-05-01 12:27:54  peter
+    * fixed conflicting declarations
+
+  Revision 1.7  1999/04/20 11:36:21  peter
     * compatibility fixes
 
   Revision 1.6  1999/01/07 15:52:27  peter