* some more functions fixed to get them work

rtl/win32/ascdef.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.
@@ -65,7 +65,7 @@ uses
 
   function GetShortPathName(lpszLongPath:LPCSTR; lpszShortPath:LPSTR; cchBuffer:DWORD):DWORD;
 
-  function GetEnvironmentStrings:LPSTR;
+  function GetEnvironmentStrings : LPSTR;
 
   function FreeEnvironmentStrings(_para1:LPSTR):WINBOOL;
 
@@ -115,7 +115,7 @@ uses
 
   procedure FatalAppExit(uAction:UINT; lpMessageText:LPCSTR);
 
-  function GetCommandLine:LPSTR;
+  function GetCommandLine : LPSTR;
 
   function GetEnvironmentVariable(lpName:LPCSTR; lpBuffer:LPSTR; nSize:DWORD):DWORD;
 
@@ -894,22 +894,27 @@ uses
 
   function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3:pchar; _para4:cardinal):cardinal;
 
-  function ExtractAssociatedIcon(_para1:HINST; _para2:pchar; var _para3:WORD):HICON;
+  function ExtractAssociatedIcon(_para1:HINST; _para2:pchar;
+    var _para3:WORD):HICON;
 
   function ExtractIcon(_para1:HINST; _para2:pchar; _para3:cardinal):HICON;
 
   function FindExecutable(_para1:pchar; _para2:pchar; _para3:pchar):HINST;
 
-  function ShellAbout(_para1:HWND; _para2:pchar; _para3:pchar; _para4:HICON):longint;
+  function ShellAbout(_para1:HWND; _para2:pchar; _para3:pchar;
+    _para4:HICON):longint;
 
-  function ShellExecute(_para1:HWND; _para2:pchar;_para3:pchar;_para4:pchar;_para5:pchar;
-             _para6:longint):HINST;
+  function ShellExecute(_para1:HWND; _para2:pchar; _para3:pchar; _para4:pchar;
+    _para5:pchar; _para6:longint):HINST;
 
-  function DdeCreateStringHandle(_para1:DWORD; _para2:pchar; _para3:longint):HSZ;
+  function DdeCreateStringHandle(_para1:DWORD; _para2:pchar;
+    _para3:longint):HSZ;
 
-  function DdeInitialize(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
+  function DdeInitialize(var _para1:DWORD; _para2:CALLB; _para3:DWORD;
+    _para4:DWORD):UINT;
 
-  function DdeQueryString(_para1:DWORD; _para2:HSZ; _para3:pchar; _para4:DWORD; _para5:longint):DWORD;
+  function DdeQueryString(_para1:DWORD; _para2:HSZ; _para3:pchar;
+    _para4:DWORD; _para5:longint):DWORD;
 
   function LogonUser(_para1:LPSTR; _para2:LPSTR; _para3:LPSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL;
@@ -933,7 +938,7 @@ uses
 
   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';
 
@@ -983,7 +988,7 @@ uses
 
   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';
 
@@ -1777,22 +1782,29 @@ uses
 
   function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3 : pchar; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA';
 
-  function ExtractAssociatedIcon(_para1:HINST; _para2 : pchar; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA';
+  function ExtractAssociatedIcon(_para1:HINST; _para2:pchar;
+    var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA';
 
-  function ExtractIcon(_para1:HINST; _para2 : pchar; _para3:cardinal):HICON; external 'shell32' name 'ExtractIconA';
+  function ExtractIcon(_para1:HINST; _para2:pchar; _para3:cardinal):HICON;
+    external 'shell32' name 'ExtractIconA';
 
-  function FindExecutable(_para1 : pchar; _para2 : pchar; _para3:pchar):HINST; external 'shell32' name 'FindExecutableA';
+  function FindExecutable(_para1:pchar; _para2:pchar; _para3:pchar):HINST;
+    external 'shell32' name 'FindExecutableA';
 
-  function ShellAbout(_para1:HWND; _para2:pchar; _para3:pchar; _para4:HICON):longint; external 'shell32' name 'ShellAboutA';
+  function ShellAbout(_para1:HWND; _para2:pchar; _para3:pchar;
+    _para4:HICON):longint; external 'shell32' name 'ShellAboutA';
 
-  function ShellExecute(_para1:HWND; _para2:pchar; _para3:pchar; _para4:pchar;_para5:pchar;
-             _para6:longint):HINST; external 'shell32' name 'ShellExecuteA';
+  function ShellExecute(_para1:HWND; _para2:pchar; _para3:pchar; _para4:pchar;
+   _para5:pchar;_para6:longint):HINST; external 'shell32' name 'ShellExecuteA';
 
-  function DdeCreateStringHandle(_para1:DWORD; _para2 : pchar; _para3:longint):HSZ; external 'user32' name 'DdeCreateStringHandleA';
+  function DdeCreateStringHandle(_para1:DWORD; _para2:pchar;
+    _para3:longint):HSZ; external 'user32' name 'DdeCreateStringHandleA';
 
-  function DdeInitialize(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT; external 'user32' name 'DdeInitializeA';
+  function DdeInitialize(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
+    external 'user32' name 'DdeInitializeA';
 
-  function DdeQueryString(_para1:DWORD; _para2:HSZ; _para3 : pchar; _para4:DWORD; _para5:longint):DWORD; external 'user32' name 'DdeQueryStringA';
+  function DdeQueryString(_para1:DWORD; _para2:HSZ; _para3:pchar; _para4:DWORD; _para5:longint):DWORD;
+    external 'user32' name 'DdeQueryStringA';
 
   function LogonUser(_para1:LPSTR; _para2:LPSTR; _para3:LPSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL; external 'advapi32' name 'LogonUserA';
@@ -1808,14 +1820,17 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.11  1999-07-05 14:01:40  michael
+  Revision 1.12  1999-07-05 14:47:42  florian
+    * some more functions fixed to get them work
+
+  Revision 1.11  1999/07/05 14:01:40  michael
   + Fixed declarations of chars to pchars
 
   Revision 1.10  1999/05/10 19:34:08  florian
     * moved all opengl32.dll stuff to a newly created opengl32 unit, so
       win32 programs should also run on Windows without opengl32.dll
 
-  Revision 1.9  1999/05/01 12:27:48  peter
+  Revision 1.8  1999/05/01 12:27:50  peter
     * fixed conflicting declarations
 
   Revision 1.7  1999/04/20 11:36:08  peter

rtl/win32/ascfun.pp

@@ -892,24 +892,29 @@ uses
 
   function StartServiceA(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL;
 
-  function DragQueryFileA(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal;
+  function DragQueryFileA(_para1:HDROP; _para2:cardinal; _para3:pchar;
+    _para4:cardinal):cardinal;
 
-  function ExtractAssociatedIconA(_para1:HINST; var _para2:char; var _para3:WORD):HICON;
+  function ExtractAssociatedIconA(_para1:HINST;_para2:pchar; var _para3:WORD):HICON;
 
-  function ExtractIconA(_para1:HINST; var _para2:char; _para3:cardinal):HICON;
+  function ExtractIconA(_para1:HINST;_para2:pchar; _para3:cardinal):HICON;
 
-  function FindExecutableA(var _para1:char; var _para2:char; var _para3:char):HINST;
+  function FindExecutableA(_para1:pchar;_para2:pchar; _para3:pchar):HINST;
 
-  function ShellAboutA(_para1:HWND; var _para2:char; var _para3:char; _para4:HICON):longint;
+  function ShellAboutA(_para1:HWND; _para2:pchar;
+    _para3:pchar; _para4:HICON):longint;
 
-  function ShellExecuteA(_para1:HWND; var _para2:char; var _para3:char; var _para4:char; var _para5:char;
-             _para6:longint):HINST;
+  function ShellExecuteA(_para1:HWND; _para2:pchar; _para3:pchar;
+    _para4:pchar; _para5:pchar;_para6:longint):HINST;
 
-  function DdeCreateStringHandleA(_para1:DWORD; var _para2:char; _para3:longint):HSZ;
+  function DdeCreateStringHandleA(_para1:DWORD; _para2:pchar;
+    _para3:longint):HSZ;
 
-  function DdeInitializeA(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
+  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;
+  function DdeQueryStringA(_para1:DWORD; _para2:HSZ; _para3:pchar;
+    _para4:DWORD; _para5:longint):DWORD;
 
   function LogonUserA(_para1:LPSTR; _para2:LPSTR; _para3:LPSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL;
@@ -1775,24 +1780,33 @@ uses
 
   function StartServiceA(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; external 'advapi32' name 'StartServiceA';
 
-  function DragQueryFileA(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA';
+  function DragQueryFileA(_para1:HDROP; _para2:cardinal; _para3:Pchar;
+    _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA';
 
-  function ExtractAssociatedIconA(_para1:HINST; var _para2:char; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA';
+  function ExtractAssociatedIconA(_para1:HINST; _para2:Pchar;
+    var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA';
 
-  function ExtractIconA(_para1:HINST; var _para2:char; _para3:cardinal):HICON; external 'shell32' name 'ExtractIconA';
+  function ExtractIconA(_para1:HINST; _para2:Pchar; _para3:cardinal):HICON;
+    external 'shell32' name 'ExtractIconA';
 
-  function FindExecutableA(var _para1:char; var _para2:char; var _para3:char):HINST; external 'shell32' name 'FindExecutableA';
+  function FindExecutableA(_para1:pchar; _para2:pchar;
+    _para3:pchar):HINST; external 'shell32' name 'FindExecutableA';
 
-  function ShellAboutA(_para1:HWND; var _para2:char; var _para3:char; _para4:HICON):longint; external 'shell32' name 'ShellAboutA';
+  function ShellAboutA(_para1:HWND; _para2:pchar; _para3:pchar;
+    _para4:HICON):longint; external 'shell32' name 'ShellAboutA';
 
-  function ShellExecuteA(_para1:HWND; var _para2:char; var _para3:char; var _para4:char; var _para5:char;
-             _para6:longint):HINST; external 'shell32' name 'ShellExecuteA';
+  function ShellExecuteA(_para1:HWND; _para2:pchar; _para3:pchar;
+    _para4:pchar; _para5:pchar;
+    _para6:longint):HINST; external 'shell32' name 'ShellExecuteA';
 
-  function DdeCreateStringHandleA(_para1:DWORD; var _para2:char; _para3:longint):HSZ; external 'user32' name 'DdeCreateStringHandleA';
+  function DdeCreateStringHandleA(_para1:DWORD; _para2:pchar;
+    _para3:longint):HSZ; external 'user32' name 'DdeCreateStringHandleA';
 
-  function DdeInitializeA(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT; external 'user32' name 'DdeInitializeA';
+  function DdeInitializeA(var _para1:DWORD; _para2:CALLB; _para3:DWORD; _para4:DWORD):UINT;
+    external 'user32' name 'DdeInitializeA';
 
-  function DdeQueryStringA(_para1:DWORD; _para2:HSZ; var _para3:char; _para4:DWORD; _para5:longint):DWORD; external 'user32' name 'DdeQueryStringA';
+  function DdeQueryStringA(_para1:DWORD; _para2:HSZ; _para3:pchar;
+    _para4:DWORD; _para5:longint):DWORD; external 'user32' name 'DdeQueryStringA';
 
   function LogonUserA(_para1:LPSTR; _para2:LPSTR; _para3:LPSTR; _para4:DWORD; _para5:DWORD;
              var _para6:HANDLE):WINBOOL; external 'advapi32' name 'LogonUserA';
@@ -1808,7 +1822,10 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.9  1999-05-10 19:34:09  florian
+  Revision 1.10  1999-07-05 14:47:43  florian
+    * some more functions fixed to get them work
+
+  Revision 1.9  1999/05/10 19:34:09  florian
     * moved all opengl32.dll stuff to a newly created opengl32 unit, so
       win32 programs should also run on Windows without opengl32.dll
 

rtl/win32/unidef.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.
@@ -68,7 +68,7 @@ uses
 
   function GetShortPathName(lpszLongPath:LPCWSTR; lpszShortPath:LPWSTR; cchBuffer:DWORD):DWORD;
 
-  function GetEnvironmentStrings:LPWSTR;
+  function GetEnvironmentStrings : LPWSTR;
 
   function FreeEnvironmentStrings(_para1:LPWSTR):WINBOOL;
 
@@ -118,7 +118,7 @@ uses
 
   procedure FatalAppExit(uAction:UINT; lpMessageText:LPCWSTR);
 
-  function GetCommandLine:LPWSTR;
+  function GetCommandLine : LPWSTR;
 
   function GetEnvironmentVariable(lpName:LPCWSTR; lpBuffer:LPWSTR; nSize:DWORD):DWORD;
 
@@ -908,8 +908,6 @@ uses
 
   function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCWSTR):WINBOOL;
 
-  { -------------------------------------  }
-  { From shellapi.h in old Cygnus headers  }
   function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3:LPCWSTR; _para4:cardinal):cardinal;
 
   function ExtractAssociatedIcon(_para1:HINST; _para2:LPCWSTR; var _para3:WORD):HICON;
@@ -951,7 +949,7 @@ uses
 
   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';
 
@@ -1001,7 +999,7 @@ uses
 
   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';
 
@@ -1839,11 +1837,14 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.10  1999-05-10 19:34:12  florian
+  Revision 1.11  1999-07-05 14:47:45  florian
+    * some more functions fixed to get them work
+
+  Revision 1.9  1999/05/10 19:34:14  florian
     * moved all opengl32.dll stuff to a newly created opengl32 unit, so
       win32 programs should also run on Windows without opengl32.dll
 
-  Revision 1.9  1999/05/01 12:27:53  peter
+  Revision 1.8  1999/05/01 12:27:54  peter
     * fixed conflicting declarations
 
   Revision 1.7  1999/04/20 11:36:21  peter