Browse Source

* small improvements in number of found functions
all remaining are in func.pp

pierre 27 years ago
parent
commit
df384b0243
6 changed files with 48 additions and 17 deletions
  1. 6 2
      rtl/win32/ascdef.pp
  2. 6 2
      rtl/win32/ascfun.pp
  3. 7 3
      rtl/win32/func.pp
  4. 17 6
      rtl/win32/makefile
  5. 6 2
      rtl/win32/unidef.pp
  6. 6 2
      rtl/win32/unifun.pp

+ 6 - 2
rtl/win32/ascdef.pp

@@ -1506,7 +1506,7 @@ unit ascdef;
 
   function CreateScalableFontResource(_para1:DWORD; _para2:LPCSTR; _para3:LPCSTR; _para4:LPCSTR):WINBOOL; external 'gdi32.dll' name 'CreateScalableFontResourceA';
 
-  function DeviceCapabilities(_para1:LPCSTR; _para2:LPCSTR; _para3:WORD; _para4:LPSTR; var _para5:DEVMODE):longint; external External_library name 'DeviceCapabilitiesA';
+  function DeviceCapabilities(_para1:LPCSTR; _para2:LPCSTR; _para3:WORD; _para4:LPSTR; var _para5:DEVMODE):longint; external 'winspool.drv' name 'DeviceCapabilitiesA';
 
   function EnumFontFamiliesEx(_para1:HDC; _para2:LPLOGFONT; _para3:FONTENUMEXPROC; _para4:LPARAM; _para5:DWORD):longint; external 'gdi32.dll' name 'EnumFontFamiliesExA';
 
@@ -1892,7 +1892,11 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.2  1998-09-03 17:14:50  pierre
+  Revision 1.3  1998-09-03 18:17:30  pierre
+    * small improvements in number of found functions
+      all remaining are in func.pp
+
+  Revision 1.2  1998/09/03 17:14:51  pierre
     * most functions found in main DLL's
       still some missing
       use 'make dllnames' to get missing names

+ 6 - 2
rtl/win32/ascfun.pp

@@ -1506,7 +1506,7 @@ unit ascfun;
 
   function CreateScalableFontResourceA(_para1:DWORD; _para2:LPCSTR; _para3:LPCSTR; _para4:LPCSTR):WINBOOL; external 'gdi32.dll' name 'CreateScalableFontResourceA';
 
-  function DeviceCapabilitiesA(_para1:LPCSTR; _para2:LPCSTR; _para3:WORD; _para4:LPSTR; var _para5:DEVMODE):longint; external External_library name 'DeviceCapabilitiesA';
+  function DeviceCapabilitiesA(_para1:LPCSTR; _para2:LPCSTR; _para3:WORD; _para4:LPSTR; var _para5:DEVMODE):longint; external 'winspool.drv' name 'DeviceCapabilitiesA';
 
   function EnumFontFamiliesExA(_para1:HDC; _para2:LPLOGFONT; _para3:FONTENUMEXPROC; _para4:LPARAM; _para5:DWORD):longint; external 'gdi32.dll' name 'EnumFontFamiliesExA';
 
@@ -1892,7 +1892,11 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.2  1998-09-03 17:14:51  pierre
+  Revision 1.3  1998-09-03 18:17:31  pierre
+    * small improvements in number of found functions
+      all remaining are in func.pp
+
+  Revision 1.2  1998/09/03 17:14:51  pierre
     * most functions found in main DLL's
       still some missing
       use 'make dllnames' to get missing names

+ 7 - 3
rtl/win32/func.pp

@@ -3688,7 +3688,7 @@ in define line 6852 *)
   function AbortProc(_para1:HDC; _para2:longint):WINBOOL; external External_library name 'AbortProc';
 
 {$ifndef windows_include_files}
-  function AbortSystemShutdown(_para1:LPTSTR):WINBOOL; external External_library name 'AbortSystemShutdownA';
+  function AbortSystemShutdown(_para1:LPTSTR):WINBOOL; external 'advapi32.dll' name 'AbortSystemShutdownA';
 {$endif windows_include_files}
 
   function AccessCheck(pSecurityDescriptor:PSECURITY_DESCRIPTOR; ClientToken:HANDLE; DesiredAccess:DWORD; GenericMapping:PGENERIC_MAPPING; PrivilegeSet:PPRIVILEGE_SET; 
@@ -3697,7 +3697,7 @@ in define line 6852 *)
 {$ifndef windows_include_files}
   function AccessCheckAndAuditAlarm(SubsystemName:LPCTSTR; HandleId:LPVOID; ObjectTypeName:LPTSTR; ObjectName:LPTSTR; SecurityDescriptor:PSECURITY_DESCRIPTOR; 
              DesiredAccess:DWORD; GenericMapping:PGENERIC_MAPPING; ObjectCreation:WINBOOL; GrantedAccess:LPDWORD; AccessStatus:LPBOOL; 
-             pfGenerateOnClose:LPBOOL):WINBOOL; external External_library name 'AccessCheckAndAuditAlarmA';
+             pfGenerateOnClose:LPBOOL):WINBOOL; external 'advapi32.dll' name 'AccessCheckAndAuditAlarmA';
 {$endif windows_include_files}
 
   function InterlockedIncrement(lpAddend:LPLONG):LONG; external 'kernel32.dll' name 'InterlockedIncrement';
@@ -6707,7 +6707,11 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.2  1998-09-03 17:14:52  pierre
+  Revision 1.3  1998-09-03 18:17:33  pierre
+    * small improvements in number of found functions
+      all remaining are in func.pp
+
+  Revision 1.2  1998/09/03 17:14:52  pierre
     * most functions found in main DLL's
       still some missing
       use 'make dllnames' to get missing names

+ 17 - 6
rtl/win32/makefile

@@ -249,18 +249,25 @@ libsclean : clean
 # gdi32.exp will contain all exported functions names of gdi32.dll
 
 WINDOWS_DIR:=c:/windows
+
 %.exp : $(WINDOWS_DIR)/system/%.dll
 	pedump $< > $*.tmp
 	sed -n -e "s/Addr:\(.*\)Ord:\(.*\)Name: \(.*\)/@\3@/p" $*.tmp > $*.exp
 	-rm $*.tmp
 
+%.exd : $(WINDOWS_DIR)/system/%.drv
+	pedump $< > $*.tmp
+	sed -n -e "s/Addr:\(.*\)Ord:\(.*\)Name: \(.*\)/@\3@/p" $*.tmp > $*.exd
+	-rm $*.tmp
+
 # list of usefull dll's for windows.pp
 dllexps : gdi32.exp kernel32.exp advapi32.exp user32.exp mapi32.exp  \
 	comdlg32.exp shell32.exp mpr.exp comctl32.exp version.exp \
-	opengl32.exp spoolss.exp
+	opengl32.exp spoolss.exp winspool.exd
 
 # get a complete listing of all system dll's
-allexps : $(notdir $(patsubst %.dll,%.exp,$(wildcard $(WINDOWS_DIR)/system/*.dll)))
+allexps : $(notdir $(patsubst %.dll,%.exp,$(wildcard $(WINDOWS_DIR)/system/*.dll)) \
+	$(patsubst %.drv,%.exd,$(wildcard $(WINDOWS_DIR)/system/*.drv)))
 
 # extract the dllnames for which the real dll file is not 
 # known yet
@@ -273,7 +280,7 @@ allexps : $(notdir $(patsubst %.dll,%.exp,$(wildcard $(WINDOWS_DIR)/system/*.dll
 # get the DLL name from the listing in .exp files
 # of the current target 
 define grepname
-$(filter %.dll,$(subst .exp:,.dll ,$(shell grep @$*@ *.exp)))
+$(filter %.dll %.drv ,$(subst .exd:,.drv ,$(subst .exp:,.dll ,$(shell grep @$*@ *.ex*))))
 endef
 
 # creating of a sed script that
@@ -311,11 +318,11 @@ endif
 	@echo $* is in $(grepname)
 ifdef subfile
 	@echo s/external External_library name \'$*\'/external\
-	\'$(filter %.dll,$(subst .exp:,.dll ,$(shell grep @$*@ *.exp)))\'\
+	\'$(filter %.dll %.drv ,$(subst .exd:,.drv ,$(subst .exp:,.dll ,$(shell grep @$*@ *.ex*))))\'\
 	name \'$*\'/ >>$(subfile)
 else
 	@echo external \
-	\'$(filter %.dll,$(subst .exp:,.dll ,$(shell grep @$*@ *.exp)))\'\
+	\'$(filter %.dll %.drv ,$(subst .exd:,.drv ,$(subst .exp:,.dll ,$(shell grep @$*@ *.ex*))))\'\
 	name $* 
 endif
 
@@ -339,7 +346,11 @@ include $(CFG)/makefile.def
 
 #
 # $Log$
-# Revision 1.9  1998-09-03 17:14:54  pierre
+# Revision 1.10  1998-09-03 18:17:35  pierre
+#   * small improvements in number of found functions
+#     all remaining are in func.pp
+#
+# Revision 1.9  1998/09/03 17:14:54  pierre
 #   * most functions found in main DLL's
 #     still some missing
 #     use 'make dllnames' to get missing names

+ 6 - 2
rtl/win32/unidef.pp

@@ -1520,7 +1520,7 @@ unit unidef;
 
   function CreateScalableFontResource(_para1:DWORD; _para2:LPCWSTR; _para3:LPCWSTR; _para4:LPCWSTR):WINBOOL; external 'gdi32.dll' name 'CreateScalableFontResourceW';
 
-  function DeviceCapabilities(_para1:LPCWSTR; _para2:LPCWSTR; _para3:WORD; _para4:LPWSTR; var _para5:DEVMODE):longint; external External_library name 'DeviceCapabilitiesW';
+  function DeviceCapabilities(_para1:LPCWSTR; _para2:LPCWSTR; _para3:WORD; _para4:LPWSTR; var _para5:DEVMODE):longint; external 'winspool.drv' name 'DeviceCapabilitiesW';
 
   function EnumFontFamiliesEx(_para1:HDC; _para2:LPLOGFONT; _para3:FONTENUMEXPROC; _para4:LPARAM; _para5:DWORD):longint; external 'gdi32.dll' name 'EnumFontFamiliesExW';
 
@@ -1913,7 +1913,11 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.2  1998-09-03 17:14:55  pierre
+  Revision 1.3  1998-09-03 18:17:36  pierre
+    * small improvements in number of found functions
+      all remaining are in func.pp
+
+  Revision 1.2  1998/09/03 17:14:57  pierre
     * most functions found in main DLL's
       still some missing
       use 'make dllnames' to get missing names

+ 6 - 2
rtl/win32/unifun.pp

@@ -1520,7 +1520,7 @@ unit unifun;
 
   function CreateScalableFontResourceW(_para1:DWORD; _para2:LPCWSTR; _para3:LPCWSTR; _para4:LPCWSTR):WINBOOL; external 'gdi32.dll' name 'CreateScalableFontResourceW';
 
-  function DeviceCapabilitiesW(_para1:LPCWSTR; _para2:LPCWSTR; _para3:WORD; _para4:LPWSTR; var _para5:DEVMODE):longint; external External_library name 'DeviceCapabilitiesW';
+  function DeviceCapabilitiesW(_para1:LPCWSTR; _para2:LPCWSTR; _para3:WORD; _para4:LPWSTR; var _para5:DEVMODE):longint; external 'winspool.drv' name 'DeviceCapabilitiesW';
 
   function EnumFontFamiliesExW(_para1:HDC; _para2:LPLOGFONT; _para3:FONTENUMEXPROC; _para4:LPARAM; _para5:DWORD):longint; external 'gdi32.dll' name 'EnumFontFamiliesExW';
 
@@ -1913,7 +1913,11 @@ end.
 {$endif not windows_include_files}
 {
   $Log$
-  Revision 1.2  1998-09-03 17:14:57  pierre
+  Revision 1.3  1998-09-03 18:17:38  pierre
+    * small improvements in number of found functions
+      all remaining are in func.pp
+
+  Revision 1.2  1998/09/03 17:14:57  pierre
     * most functions found in main DLL's
       still some missing
       use 'make dllnames' to get missing names