From f3ab1ad437e04557d31ce6c2e75470ce2a7cac2e Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 6 Jul 1999 22:44:09 +0000 Subject: [PATCH] * some fixes to compile ddraw units from the jedi project --- rtl/win32/ascdef.pp | 60 +++++++++++++++++++++++---------------------- rtl/win32/ascfun.pp | 13 ++++++---- rtl/win32/crt.pp | 7 ++++-- rtl/win32/func.pp | 13 +++++++--- rtl/win32/unidef.pp | 12 ++++----- rtl/win32/unifun.pp | 13 ++++++---- 6 files changed, 67 insertions(+), 51 deletions(-) diff --git a/rtl/win32/ascdef.pp b/rtl/win32/ascdef.pp index dd35c67c9c..7f93872f39 100644 --- a/rtl/win32/ascdef.pp +++ b/rtl/win32/ascdef.pp @@ -671,7 +671,7 @@ uses function FindNextFile(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; - function GetVersionEx(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; + function GetVersionEx(var VersionInformation:OSVERSIONINFO):WINBOOL; { was #define dname(params) def_expr } function CreateWindow(lpClassName:LPCSTR; lpWindowName:LPCSTR; dwStyle:DWORD; X:longint; @@ -729,7 +729,7 @@ uses function RegOpenKey(hKey:HKEY; lpSubKey:LPCSTR; phkResult:PHKEY):LONG; - function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; + function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM;var phkResult:HKEY):LONG; function RegQueryInfoKey(hKey:HKEY; lpClass:LPSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -892,26 +892,26 @@ uses function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; - function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3:pchar; _para4:cardinal):cardinal; + 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 ExtractIcon(_para1:HINST;_para2:pchar; _para3:cardinal):HICON; - function FindExecutable(_para1:pchar; _para2:pchar; _para3:pchar):HINST; + 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 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; @@ -1544,7 +1544,7 @@ uses function FindNextFile(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; external 'kernel32' name 'FindNextFileA'; - function GetVersionEx(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExA'; + function GetVersionEx(var VersionInformation:OSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExA'; { was #define dname(params) def_expr } function CreateWindow(lpClassName:LPCSTR; lpWindowName:LPCSTR; dwStyle:DWORD; X:longint; @@ -1617,7 +1617,7 @@ uses function RegOpenKey(hKey:HKEY; lpSubKey:LPCSTR; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyA'; - function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyExA'; + function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; var phkResult:HKEY):LONG; external 'advapi32' name 'RegOpenKeyExA'; function RegQueryInfoKey(hKey:HKEY; lpClass:LPSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1780,22 +1780,24 @@ uses function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; external 'advapi32' name 'StartServiceA'; - function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3 : pchar; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA'; + function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3:Pchar; + _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA'; - function ExtractAssociatedIcon(_para1:HINST; _para2:pchar; + function ExtractAssociatedIcon(_para1:HINST; _para2:Pchar; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA'; - function ExtractIcon(_para1:HINST; _para2:pchar; _para3:cardinal):HICON; + 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 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'; @@ -1803,8 +1805,8 @@ uses 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'; @@ -1820,13 +1822,13 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.12 1999-07-05 14:47:42 florian + Revision 1.13 1999-07-06 22:44:09 florian + * some fixes to compile ddraw units from the jedi project + + Revision 1.10 1999/07/05 14:47:43 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 + 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 diff --git a/rtl/win32/ascfun.pp b/rtl/win32/ascfun.pp index 7a4a3f4788..1a363eafd5 100644 --- a/rtl/win32/ascfun.pp +++ b/rtl/win32/ascfun.pp @@ -671,7 +671,7 @@ uses function FindNextFileA(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; - function GetVersionExA(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; + function GetVersionExA(var VersionInformation:OSVERSIONINFO):WINBOOL; { was #define dname(params) def_expr } function CreateWindowA(lpClassName:LPCSTR; lpWindowName:LPCSTR; dwStyle:DWORD; X:longint; @@ -729,7 +729,7 @@ uses function RegOpenKeyA(hKey:HKEY; lpSubKey:LPCSTR; phkResult:PHKEY):LONG; - function RegOpenKeyExA(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; + function RegOpenKeyExA(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM;var phkResult:HKEY):LONG; function RegQueryInfoKeyA(hKey:HKEY; lpClass:LPSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1544,7 +1544,7 @@ uses function FindNextFileA(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; external 'kernel32' name 'FindNextFileA'; - function GetVersionExA(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExA'; + function GetVersionExA(var VersionInformation:OSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExA'; { was #define dname(params) def_expr } function CreateWindowA(lpClassName:LPCSTR; lpWindowName:LPCSTR; dwStyle:DWORD; X:longint; @@ -1617,7 +1617,7 @@ uses function RegOpenKeyA(hKey:HKEY; lpSubKey:LPCSTR; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyA'; - function RegOpenKeyExA(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyExA'; + function RegOpenKeyExA(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; var phkResult:HKEY):LONG; external 'advapi32' name 'RegOpenKeyExA'; function RegQueryInfoKeyA(hKey:HKEY; lpClass:LPSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1822,7 +1822,10 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.10 1999-07-05 14:47:43 florian + Revision 1.11 1999-07-06 22:44:10 florian + * some fixes to compile ddraw units from the jedi project + + 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 diff --git a/rtl/win32/crt.pp b/rtl/win32/crt.pp index c59b86f09d..d0eae9f509 100644 --- a/rtl/win32/crt.pp +++ b/rtl/win32/crt.pp @@ -129,7 +129,7 @@ var OsVersion: TOSVersionInfo; begin OsVersion.dwOsVersionInfoSize := SizeOf(OsVersion); - GetVersionEx(@OsVersion); + GetVersionEx(OsVersion); Result := OsVersion.dwPlatformID; end; { func. GetPlatformID } @@ -920,7 +920,10 @@ begin end. { unit Crt } { $Log$ - Revision 1.8 1999-06-09 16:46:11 peter + Revision 1.9 1999-07-06 22:44:11 florian + * some fixes to compile ddraw units from the jedi project + + Revision 1.8 1999/06/09 16:46:11 peter * fixed fullwin,textbackground Revision 1.7 1999/05/22 14:01:01 peter diff --git a/rtl/win32/func.pp b/rtl/win32/func.pp index d7cac6b9f8..693bbc9c54 100644 --- a/rtl/win32/func.pp +++ b/rtl/win32/func.pp @@ -3536,7 +3536,8 @@ in define line 6852 *) function DescribePixelFormat(_para1:HDC; _para2:longint; _para3:UINT; _para4:LPPIXELFORMATDESCRIPTOR):longint; (* Const before type ignored *) - function SetPixelFormat(_para1:HDC; _para2:longint; var _para3:PIXELFORMATDESCRIPTOR):WINBOOL; + function SetPixelFormat(_para1:HDC; _para2:longint; + _para3:PPIXELFORMATDESCRIPTOR):WINBOOL; function SwapBuffers(_para1:HDC):WINBOOL; @@ -5526,7 +5527,7 @@ in define line 6852 *) { was #define dname(params) def_expr } function Animate_Create(hWndP:HWND; id:HMENU;dwStyle:DWORD;hInstance:HINST):HWND; begin - Animate_Create:=CreateWindow(LPCSTR(@ANIMATE_CLASS),nil,dwStyle,0,0,0,0,hwndP,id,hInstance,nil); + Animate_Create:=CreateWindow(LPCSTR(ANIMATE_CLASS),nil,dwStyle,0,0,0,0,hwndP,id,hInstance,nil); end; { was #define dname(params) def_expr } @@ -6621,7 +6622,8 @@ in define line 6826 *) { function GetPixelFormat(_para1:HDC):longint; external 'gdi32' name 'GetPixelFormat'; } - function SetPixelFormat(_para1:HDC; _para2:longint; var _para3:PIXELFORMATDESCRIPTOR):WINBOOL; external 'gdi32' name 'SetPixelFormat'; + function SetPixelFormat(_para1:HDC; _para2:longint; + _para3:PPIXELFORMATDESCRIPTOR):WINBOOL; external 'gdi32' name 'SetPixelFormat'; function SwapBuffers(_para1:HDC):WINBOOL; external 'gdi32' name 'SwapBuffers'; @@ -6696,7 +6698,10 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.11 1999-05-10 19:34:10 florian + Revision 1.12 1999-07-06 22:44:12 florian + * some fixes to compile ddraw units from the jedi project + + Revision 1.11 1999/05/10 19:34:10 florian * moved all opengl32.dll stuff to a newly created opengl32 unit, so win32 programs should also run on Windows without opengl32.dll diff --git a/rtl/win32/unidef.pp b/rtl/win32/unidef.pp index d256a705b7..c06a7bcbb2 100644 --- a/rtl/win32/unidef.pp +++ b/rtl/win32/unidef.pp @@ -683,7 +683,7 @@ uses function FindNextFile(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; - function GetVersionEx(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; + function GetVersionEx(var VersionInformation:OSVERSIONINFO):WINBOOL; { was #define dname(params) def_expr } function CreateWindow(lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint; @@ -769,7 +769,7 @@ uses function RegOpenKey(hKey:HKEY; lpSubKey:LPCWSTR; phkResult:PHKEY):LONG; - function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; + function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM;var phkResult:HKEY):LONG; function RegQueryInfoKey(hKey:HKEY; lpClass:LPWSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1563,7 +1563,7 @@ uses function FindNextFile(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; external 'kernel32' name 'FindNextFileW'; - function GetVersionEx(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExW'; + function GetVersionEx(var VersionInformation:OSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExW'; { was #define dname(params) def_expr } function CreateWindow(lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint; @@ -1664,7 +1664,7 @@ uses function RegOpenKey(hKey:HKEY; lpSubKey:LPCWSTR; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyW'; - function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyExW'; + function RegOpenKeyEx(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM; var phkResult:HKEY):LONG; external 'advapi32' name 'RegOpenKeyExW'; function RegQueryInfoKey(hKey:HKEY; lpClass:LPWSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1837,8 +1837,8 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.11 1999-07-05 14:47:45 florian - * some more functions fixed to get them work + Revision 1.12 1999-07-06 22:44:15 florian + * some fixes to compile ddraw units from the jedi project Revision 1.9 1999/05/10 19:34:14 florian * moved all opengl32.dll stuff to a newly created opengl32 unit, so diff --git a/rtl/win32/unifun.pp b/rtl/win32/unifun.pp index 9b26b57fbc..a2f1294c39 100644 --- a/rtl/win32/unifun.pp +++ b/rtl/win32/unifun.pp @@ -683,7 +683,7 @@ uses function FindNextFileW(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; - function GetVersionExW(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; + function GetVersionExW(var VersionInformation:OSVERSIONINFO):WINBOOL; { was #define dname(params) def_expr } function CreateWindowW(lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint; @@ -769,7 +769,7 @@ uses function RegOpenKeyW(hKey:HKEY; lpSubKey:LPCWSTR; phkResult:PHKEY):LONG; - function RegOpenKeyExW(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; + function RegOpenKeyExW(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM;var phkResult:HKEY):LONG; function RegQueryInfoKeyW(hKey:HKEY; lpClass:LPWSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1563,7 +1563,7 @@ uses function FindNextFileW(hFindFile:HANDLE; lpFindFileData:LPWIN32_FIND_DATA):WINBOOL; external 'kernel32' name 'FindNextFileW'; - function GetVersionExW(lpVersionInformation:LPOSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExW'; + function GetVersionExW(var VersionInformation:OSVERSIONINFO):WINBOOL; external 'kernel32' name 'GetVersionExW'; { was #define dname(params) def_expr } function CreateWindowW(lpClassName:LPCWSTR; lpWindowName:LPCWSTR; dwStyle:DWORD; X:longint; @@ -1664,7 +1664,7 @@ uses function RegOpenKeyW(hKey:HKEY; lpSubKey:LPCWSTR; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyW'; - function RegOpenKeyExW(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM; phkResult:PHKEY):LONG; external 'advapi32' name 'RegOpenKeyExW'; + function RegOpenKeyExW(hKey:HKEY; lpSubKey:LPCWSTR; ulOptions:DWORD; samDesired:REGSAM; var phkResult:HKEY):LONG; external 'advapi32' name 'RegOpenKeyExW'; function RegQueryInfoKeyW(hKey:HKEY; lpClass:LPWSTR; lpcbClass:LPDWORD; lpReserved:LPDWORD; lpcSubKeys:LPDWORD; lpcbMaxSubKeyLen:LPDWORD; lpcbMaxClassLen:LPDWORD; lpcValues:LPDWORD; lpcbMaxValueNameLen:LPDWORD; lpcbMaxValueLen:LPDWORD; @@ -1837,7 +1837,10 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.9 1999-05-10 19:34:14 florian + Revision 1.10 1999-07-06 22:44:17 florian + * some fixes to compile ddraw units from the jedi project + + 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