diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 52c2d0b4ef..3b07b8e14c 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -62,7 +62,7 @@ LOADEROBJECTS=wprt0 wdllprt0 # Unit Objects UNITOBJECTS=$(SYSTEMUNIT) objpas strings \ - windows ole2 \ + windows ole2 opengl32 \ dos crt objects \ sysutils typinfo math \ cpu mmx getopts heaptrc @@ -378,7 +378,11 @@ endif # # $Log$ -# Revision 1.29 1999-05-05 22:24:09 peter +# Revision 1.30 1999-05-10 19:34:06 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.29 1999/05/05 22:24:09 peter # * 0.99.10 check for browser # # Revision 1.28 1999/05/04 11:59:52 peter diff --git a/rtl/win32/ascdef.pp b/rtl/win32/ascdef.pp index e55bd5be98..b1676a75fc 100644 --- a/rtl/win32/ascdef.pp +++ b/rtl/win32/ascdef.pp @@ -892,11 +892,6 @@ uses function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; - 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; - function DragQueryFile(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal; function ExtractAssociatedIcon(_para1:HINST; var _para2:char; var _para3:WORD):HICON; @@ -1780,11 +1775,6 @@ uses function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; external 'advapi32' name 'StartServiceA'; - function wglUseFontBitmaps(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsA'; - - function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT; - _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesA'; - function DragQueryFile(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA'; function ExtractAssociatedIcon(_para1:HINST; var _para2:char; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA'; @@ -1818,7 +1808,11 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.9 1999-05-01 12:27:48 peter + 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 * fixed conflicting declarations Revision 1.7 1999/04/20 11:36:08 peter diff --git a/rtl/win32/ascfun.pp b/rtl/win32/ascfun.pp index ab634af415..fb8642bc0e 100644 --- a/rtl/win32/ascfun.pp +++ b/rtl/win32/ascfun.pp @@ -892,11 +892,6 @@ uses function StartServiceA(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; - 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; - function DragQueryFileA(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal; function ExtractAssociatedIconA(_para1:HINST; var _para2:char; var _para3:WORD):HICON; @@ -1780,11 +1775,6 @@ uses function StartServiceA(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCSTR):WINBOOL; external 'advapi32' name 'StartServiceA'; - function wglUseFontBitmapsA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsA'; - - function wglUseFontOutlinesA(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT; - _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesA'; - function DragQueryFileA(_para1:HDROP; _para2:cardinal; var _para3:char; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileA'; function ExtractAssociatedIconA(_para1:HINST; var _para2:char; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconA'; @@ -1818,7 +1808,11 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.8 1999-05-01 12:27:50 peter + 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 + + Revision 1.8 1999/05/01 12:27:50 peter * fixed conflicting declarations Revision 1.7 1999/04/20 11:36:08 peter diff --git a/rtl/win32/func.pp b/rtl/win32/func.pp index 6a482e2f97..d7cac6b9f8 100644 --- a/rtl/win32/func.pp +++ b/rtl/win32/func.pp @@ -3535,66 +3535,11 @@ in define line 6852 *) function DescribePixelFormat(_para1:HDC; _para2:longint; _para3:UINT; _para4:LPPIXELFORMATDESCRIPTOR):longint; -(* Const before type ignored *) -{ Not in my gdi32.dll - function GetEnhMetaFilePixelFormat(_para1:HENHMETAFILE; _para2:DWORD; var _para3:PIXELFORMATDESCRIPTOR):UINT; -} -{ function GetPixelFormat(_para1:HDC):longint; already above } - (* Const before type ignored *) function SetPixelFormat(_para1:HDC; _para2:longint; var _para3:PIXELFORMATDESCRIPTOR):WINBOOL; function SwapBuffers(_para1:HDC):WINBOOL; - function wglCreateContext(_para1:HDC):HGLRC; - - function wglCreateLayerContext(_para1:HDC; _para2:longint):HGLRC; - - function wglCopyContext(_para1:HGLRC; _para2:HGLRC; _para3:UINT):WINBOOL; - - function wglDeleteContext(_para1:HGLRC):WINBOOL; - - function wglDescribeLayerPlane(_para1:HDC; _para2:longint; _para3:longint; _para4:UINT; _para5:LPLAYERPLANEDESCRIPTOR):WINBOOL; - - function wglGetCurrentContext:HGLRC; - - function wglGetCurrentDC:HDC; - -(* Const before type ignored *) - function wglGetLayerPaletteEntries(_para1:HDC; _para2:longint; _para3:longint; _para4:longint; var _para5:COLORREF):longint; - - function wglGetProcAddress(_para1:LPCSTR):PROC; - - function wglMakeCurrent(_para1:HDC; _para2:HGLRC):WINBOOL; - - function wglRealizeLayerPalette(_para1:HDC; _para2:longint; _para3:WINBOOL):WINBOOL; - -(* Const before type ignored *) - function wglSetLayerPaletteEntries(_para1:HDC; _para2:longint; _para3:longint; _para4:longint; var _para5:COLORREF):longint; - - function wglShareLists(_para1:HGLRC; _para2:HGLRC):WINBOOL; - - function wglSwapLayerBuffers(_para1:HDC; _para2:UINT):WINBOOL; - - { - Why are these different between ANSI and UNICODE? - There doesn't seem to be any difference. - } -(*{$ifdef UNICODE} - - const - wglUseFontBitmaps = wglUseFontBitmapsW; - wglUseFontOutlines = wglUseFontOutlinesW; -{$else} - - const - wglUseFontBitmaps = wglUseFontBitmapsA; - wglUseFontOutlines = wglUseFontOutlinesA; -{$endif} - { !UNICODE } *) - { ------------------------------------- } - { From shellapi.h in old Cygnus headers } - function DragQueryPoint(_para1:HDROP; _para2:LPPOINT):WINBOOL; procedure DragFinish(_para1:HDROP); @@ -6680,34 +6625,6 @@ in define line 6826 *) function SwapBuffers(_para1:HDC):WINBOOL; external 'gdi32' name 'SwapBuffers'; - function wglCreateContext(_para1:HDC):HGLRC; external 'opengl32' name 'wglCreateContext'; - - function wglCreateLayerContext(_para1:HDC; _para2:longint):HGLRC; external 'opengl32' name 'wglCreateLayerContext'; - - function wglCopyContext(_para1:HGLRC; _para2:HGLRC; _para3:UINT):WINBOOL; external 'opengl32' name 'wglCopyContext'; - - function wglDeleteContext(_para1:HGLRC):WINBOOL; external 'opengl32' name 'wglDeleteContext'; - - function wglDescribeLayerPlane(_para1:HDC; _para2:longint; _para3:longint; _para4:UINT; _para5:LPLAYERPLANEDESCRIPTOR):WINBOOL; external 'opengl32' name 'wglDescribeLayerPlane'; - - function wglGetCurrentContext:HGLRC; external 'opengl32' name 'wglGetCurrentContext'; - - function wglGetCurrentDC:HDC; external 'opengl32' name 'wglGetCurrentDC'; - - function wglGetLayerPaletteEntries(_para1:HDC; _para2:longint; _para3:longint; _para4:longint; var _para5:COLORREF):longint; external 'opengl32' name 'wglGetLayerPaletteEntries'; - - function wglGetProcAddress(_para1:LPCSTR):PROC; external 'opengl32' name 'wglGetProcAddress'; - - function wglMakeCurrent(_para1:HDC; _para2:HGLRC):WINBOOL; external 'opengl32' name 'wglMakeCurrent'; - - function wglRealizeLayerPalette(_para1:HDC; _para2:longint; _para3:WINBOOL):WINBOOL; external 'opengl32' name 'wglRealizeLayerPalette'; - - function wglSetLayerPaletteEntries(_para1:HDC; _para2:longint; _para3:longint; _para4:longint; var _para5:COLORREF):longint; external 'opengl32' name 'wglSetLayerPaletteEntries'; - - function wglShareLists(_para1:HGLRC; _para2:HGLRC):WINBOOL; external 'opengl32' name 'wglShareLists'; - - function wglSwapLayerBuffers(_para1:HDC; _para2:UINT):WINBOOL; external 'opengl32' name 'wglSwapLayerBuffers'; - function DragQueryPoint(_para1:HDROP; _para2:LPPOINT):WINBOOL; external 'shell32' name 'DragQueryPoint'; procedure DragFinish(_para1:HDROP); external 'shell32' name 'DragFinish'; @@ -6779,7 +6696,11 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.10 1999-04-20 11:36:14 peter + 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 + + Revision 1.10 1999/04/20 11:36:14 peter * compatibility fixes Revision 1.9 1999/03/30 17:00:23 peter diff --git a/rtl/win32/unidef.pp b/rtl/win32/unidef.pp index 8105887ecb..ded75bcf09 100644 --- a/rtl/win32/unidef.pp +++ b/rtl/win32/unidef.pp @@ -908,12 +908,6 @@ uses function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCWSTR):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; _para3:LPCWSTR; _para4:cardinal):cardinal; @@ -1811,11 +1805,6 @@ uses function StartService(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCWSTR):WINBOOL; external 'advapi32' name 'StartServiceW'; - function wglUseFontBitmaps(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsW'; - - function wglUseFontOutlines(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT; - _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesW'; - function DragQueryFile(_para1:HDROP; _para2:cardinal; _para3:LPCWSTR; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileW'; function ExtractAssociatedIcon(_para1:HINST; _para2:LPCWSTR; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconW'; @@ -1850,7 +1839,11 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.9 1999-05-01 12:27:53 peter + Revision 1.10 1999-05-10 19:34:12 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 * fixed conflicting declarations Revision 1.7 1999/04/20 11:36:21 peter diff --git a/rtl/win32/unifun.pp b/rtl/win32/unifun.pp index 0d3695bdc4..9b26b57fbc 100644 --- a/rtl/win32/unifun.pp +++ b/rtl/win32/unifun.pp @@ -908,14 +908,6 @@ uses function StartServiceW(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCWSTR):WINBOOL; - { Extensions to OpenGL } - function wglUseFontBitmapsW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; - - function wglUseFontOutlinesW(_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 DragQueryFileW(_para1:HDROP; _para2:cardinal; _para3:LPCWSTR; _para4:cardinal):cardinal; function ExtractAssociatedIconW(_para1:HINST; _para2:LPCWSTR; var _para3:WORD):HICON; @@ -1811,11 +1803,6 @@ uses function StartServiceW(hService:SC_HANDLE; dwNumServiceArgs:DWORD; var lpServiceArgVectors:LPCWSTR):WINBOOL; external 'advapi32' name 'StartServiceW'; - function wglUseFontBitmapsW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsW'; - - function wglUseFontOutlinesW(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD; _para5:FLOAT; - _para6:FLOAT; _para7:longint; _para8:LPGLYPHMETRICSFLOAT):WINBOOL; external 'opengl32' name 'wglUseFontOutlinesW'; - function DragQueryFileW(_para1:HDROP; _para2:cardinal; _para3:LPCWSTR; _para4:cardinal):cardinal; external 'shell32' name 'DragQueryFileW'; function ExtractAssociatedIconW(_para1:HINST; _para2:LPCWSTR; var _para3:WORD):HICON; external 'shell32' name 'ExtractAssociatedIconW'; @@ -1850,7 +1837,11 @@ end. {$endif not windows_include_files} { $Log$ - Revision 1.8 1999-05-01 12:27:54 peter + 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.8 1999/05/01 12:27:54 peter * fixed conflicting declarations Revision 1.7 1999/04/20 11:36:21 peter diff --git a/rtl/win32/windows.pp b/rtl/win32/windows.pp index e0b9395f17..ba4aa9011f 100644 --- a/rtl/win32/windows.pp +++ b/rtl/win32/windows.pp @@ -23,7 +23,7 @@ unit windows; {$define read_interface} {$undef read_implementation} -{$warning starting interface of windows unit } +{$message starting interface of windows unit } {$i base.pp} {$i errors.pp} @@ -68,7 +68,11 @@ const External_library='kernel32'; end. { $Log$ - Revision 1.2 1999-01-09 07:29:51 florian + Revision 1.3 1999-05-10 19:34:15 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.2 1999/01/09 07:29:51 florian * some updates to compile API units for win32 Revision 1.1 1998/08/31 11:54:02 pierre