* moved commdlg functions from windows to commdlg unit. Constants still have to be done.

git-svn-id: trunk@10323 -

.gitattributes

@@ -4338,6 +4338,7 @@ packages/winunits-base/src/activex.pp svneol=native#text/plain
 packages/winunits-base/src/buildwinutilsbase.pp svneol=native#text/plain
 packages/winunits-base/src/comconst.pp svneol=native#text/plain
 packages/winunits-base/src/commctrl.pp svneol=native#text/plain
+packages/winunits-base/src/commdlg.pp svneol=native#text/plain
 packages/winunits-base/src/comobj.pp svneol=native#text/plain
 packages/winunits-base/src/flatsb.pp svneol=native#text/plain
 packages/winunits-base/src/imagehlp.pp svneol=native#text/plain

packages/winunits-base/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/02/09]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/02/13]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -401,164 +401,170 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_UNITS+=buildwinutilsbase
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_UNITS+=buildwinutilsbase
+endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
+endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_IMPLICITUNITS+=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver shfolder richedit imagehlp
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_RSTS+=jwawintype comconst
@@ -719,6 +725,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_RSTS+=jwawintype comconst
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_RSTS+=jwawintype comconst
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLES+=examples
 endif
@@ -878,6 +887,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_EXAMPLES+=examples
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override TARGET_EXAMPLES+=examples
+endif
 override INSTALL_BUILDUNIT=buildwinutilsbase
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -1039,6 +1051,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_OPTIONS+=-Ur
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override COMPILER_OPTIONS+=-Ur
+endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_SOURCEDIR+=src
 endif
@@ -1198,6 +1213,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_SOURCEDIR+=src
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+override COMPILER_SOURCEDIR+=src
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -2105,6 +2123,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(FULL_TARGET),avr-embedded)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)

packages/winunits-base/Makefile.fpc

@@ -8,7 +8,7 @@ version=2.2.0
 
 [target]
 units=buildwinutilsbase
-implicitunits=flatsb winver mmsystem comobj comconst commctrl ole2 activex shellapi shlobj oleserver \
+implicitunits=flatsb winver mmsystem comobj comconst commdlg commctrl ole2 activex shellapi shlobj oleserver \
                shfolder richedit imagehlp
 
 examples=examples

packages/winunits-base/fpmake.pp

@@ -53,6 +53,7 @@ begin
     T:=P.Targets.AddImplicitUnit('shlobj.pp');
     T:=P.Targets.AddImplicitUnit('winver.pp');
     T:=P.Targets.AddImplicitUnit('imagehlp.pp');
+    T:=P.Targets.AddImplicitUnit('commdlg.pp');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/winunits-base/src/buildwinutilsbase.pp

@@ -21,7 +21,7 @@ unit buildwinutilsbase;
 interface
 
 uses
-    flatsb, winver, mmsystem, comconst, commctrl, comobj, 
+    flatsb, winver, mmsystem, comconst, commctrl, comobj, commdlg,
     ole2, activex, shellapi, shlobj, oleserver,  shfolder, richedit,imagehlp;
 
 implementation

packages/winunits-base/src/commdlg.pp

@@ -0,0 +1,610 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2008 by Marco van de Voort
+    member of the Free Pascal development team.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    Note these functions were in the windows unit in older versions
+
+ **********************************************************************}
+unit commdlg;
+
+interface
+{$mode delphi} // interface
+uses windows;
+
+Type
+     LPOFNHOOKPROC=function (h:HWND; u:UINT; w:WPARAM; l:LPARAM):  UINT_PTR; stdcall;
+     OPENFILENAMEA_NT4 = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HINST;
+          lpstrFilter : LPCTSTR;
+          lpstrCustomFilter : LPTSTR;
+          nMaxCustFilter : DWORD;
+          nFilterIndex : DWORD;
+          lpstrFile : LPTSTR;
+          nMaxFile : DWORD;
+          lpstrFileTitle : LPTSTR;
+          nMaxFileTitle : DWORD;
+          lpstrInitialDir : LPCTSTR;
+          lpstrTitle : LPCTSTR;
+          Flags : DWORD;
+          nFileOffset : WORD;
+          nFileExtension : WORD;
+          lpstrDefExt : LPCTSTR;
+          lCustData : LPARAM;
+          lpfnHook : LPOFNHOOKPROC;
+          lpTemplateName : LPCTSTR;
+       end;
+     LPOPENFILENAMEA_NT4 = ^OPENFILENAMEA_NT4;
+     TOPENFILENAMEA_NT4 = OPENFILENAMEA_NT4;
+     POPENFILENAMEA_NT4 = ^OPENFILENAMEA_NT4;
+	 
+     OPENFILENAMEW_NT4 = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HINST;
+          lpstrFilter : LPWSTR;
+          lpstrCustomFilter : LPWSTR;
+          nMaxCustFilter : DWORD;
+          nFilterIndex : DWORD;
+          lpstrFile : LPWSTR;
+          nMaxFile : DWORD;
+          lpstrFileTitle : LPWSTR;
+          nMaxFileTitle : DWORD;
+          lpstrInitialDir : LPWSTR;
+          lpstrTitle : LPWSTR;
+          Flags : DWORD;
+          nFileOffset : WORD;
+          nFileExtension : WORD;
+          lpstrDefExt : LPWSTR;
+          lCustData : LPARAM;
+          lpfnHook : LPOFNHOOKPROC;
+          lpTemplateName : LPWSTR;
+       end;
+     LPOPENFILENAMEW_NT4 = ^OPENFILENAMEW_NT4;
+     TOPENFILENAMEW_NT4 = OPENFILENAMEW_NT4;
+     POPENFILENAMEW_NT4 = ^OPENFILENAMEW_NT4;
+	 {$IFDEF UNICODE}  
+	  LPOPENFILENAME_NT4 = ^OPENFILENAMEW_NT4;
+      TOPENFILENAME_NT4 = OPENFILENAMEW_NT4;
+      POPENFILENAME_NT4 = ^OPENFILENAMEW_NT4;	  
+      OPENFILENAME_NT4 = OPENFILENAMEW_NT4;	  
+	 {$else}
+	  LPOPENFILENAME_NT4 = ^OPENFILENAMEA_NT4;
+      TOPENFILENAME_NT4 = OPENFILENAMEA_NT4;
+      POPENFILENAME_NT4 = ^OPENFILENAMEA_NT4;
+      OPENFILENAME_NT4 = OPENFILENAMEA_NT4;	  
+	 {$endif}
+     
+	 OPENFILENAMEA = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HINST;
+          lpstrFilter : LPCTSTR;
+          lpstrCustomFilter : LPTSTR;
+          nMaxCustFilter : DWORD;
+          nFilterIndex : DWORD;
+          lpstrFile : LPTSTR;
+          nMaxFile : DWORD;
+          lpstrFileTitle : LPTSTR;
+          nMaxFileTitle : DWORD;
+          lpstrInitialDir : LPCTSTR;
+          lpstrTitle : LPCTSTR;
+          Flags : DWORD;
+          nFileOffset : WORD;
+          nFileExtension : WORD;
+          lpstrDefExt : LPCTSTR;
+          lCustData : LPARAM;
+          lpfnHook : LPOFNHOOKPROC;
+          lpTemplateName : LPCTSTR;
+          pvReserved : pointer;
+          dwreserved : dword;
+          FlagsEx    : dword; 
+       end;
+     LPOPENFILENAMEA = ^OPENFILENAMEA;
+     TOPENFILENAMEA = OPENFILENAMEA;
+     POPENFILENAMEA = ^OPENFILENAMEA;
+
+	 OPENFILENAMEW = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HINST;
+          lpstrFilter : LPWSTR;
+          lpstrCustomFilter : LPWSTR;
+          nMaxCustFilter : DWORD;
+          nFilterIndex : DWORD;
+          lpstrFile : LPWSTR;
+          nMaxFile : DWORD;
+          lpstrFileTitle : LPWSTR;
+          nMaxFileTitle : DWORD;
+          lpstrInitialDir : LPWSTR;
+          lpstrTitle : LPWSTR;
+          Flags : DWORD;
+          nFileOffset : WORD;
+          nFileExtension : WORD;
+          lpstrDefExt : LPWSTR;
+          lCustData : LPARAM;
+          lpfnHook : LPOFNHOOKPROC;
+          lpTemplateName : LPWSTR;
+          pvReserved : pointer;
+          dwreserved : dword;
+          FlagsEx    : dword; 
+       end;
+     LPOPENFILENAMEW = ^OPENFILENAMEW;
+     TOPENFILENAMEW = OPENFILENAMEW;
+     POPENFILENAMEW = ^OPENFILENAMEW;	 
+	 
+     OFNOTIFYA = record
+          hdr : NMHDR;
+          lpOFN : LPOPENFILENAME;
+          pszFile : LPTSTR;
+       end;
+     LPOFNOTIFYA = ^OFNOTIFYA;
+     _OFNOTIFYA = OFNOTIFYA;
+     TOFNOTIFYA = OFNOTIFYA;
+     POFNOTIFYA = ^OFNOTIFYA;
+
+     OFNOTIFYW = record
+          hdr : NMHDR;
+          lpOFN : LPOPENFILENAMEW;
+          pszFile : LPWSTR;
+       end;
+     LPOFNOTIFYW = ^OFNOTIFYW;
+     _OFNOTIFYW = OFNOTIFYW;
+     TOFNOTIFYW = OFNOTIFYW;
+     POFNOTIFYW = ^OFNOTIFYW;
+     {$ifdef unicode}
+       OFNOTIFY = OFNOTIFYW;
+       _OFNOTIFY = OFNOTIFYW;
+       TOFNOTIFY = OFNOTIFYW;
+       POFNOTIFY = ^OFNOTIFYW;
+      LPOFNOTIFY = POFNOTIFYW;	   
+     {$else}
+       OFNOTIFY = OFNOTIFYA;
+       _OFNOTIFY = OFNOTIFYA;
+       TOFNOTIFY = OFNOTIFYA;
+       POFNOTIFY = ^OFNOTIFYA;
+	   LPOFNOTIFY = POFNOTIFYA;	   
+     {$endif}
+
+     OFNOTIFYEXA = record
+          hdr : NMHDR;
+          lpOFN : LPOPENFILENAMEA;
+          pszFile : pointer;
+		  pidl	  : pointer;
+       end;
+     LPOFNOTIFYEXA = ^OFNOTIFYEXA;
+     _OFNOTIFYEXA = OFNOTIFYEXA;
+     TOFNOTIFYEXA = OFNOTIFYEXA;
+     POFNOTIFYEXA = ^OFNOTIFYEXA;
+
+     OFNOTIFYEXW = record
+          hdr : NMHDR;
+          lpOFN : LPOPENFILENAMEW;
+          pszFile : pointer;
+		  pidl	  : pointer;
+       end;
+     LPOFNOTIFYEXW = ^OFNOTIFYEXW;
+     _OFNOTIFYEXW = OFNOTIFYEXW;
+     TOFNOTIFYEXW = OFNOTIFYEXW;
+     POFNOTIFYEXW = ^OFNOTIFYEXW;
+     {$ifdef unicode}
+       OFNOTIFYEX = OFNOTIFYEXW;
+       _OFNOTIFYEX = OFNOTIFYEXW;
+       TOFNOTIFYEX = OFNOTIFYEXW;
+       POFNOTIFYEX = ^OFNOTIFYEXW;
+     {$else}
+       OFNOTIFYEX = OFNOTIFYEXA;
+       _OFNOTIFYEX = OFNOTIFYEXA;
+       TOFNOTIFYEX = OFNOTIFYEXA;
+       POFNOTIFYEX = ^OFNOTIFYEXA;
+     {$endif}
+
+   {CHOOSECOLOR = record confilcts with function ChooseColor }
+    TCHOOSECOLORA = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HWND;
+          rgbResult : COLORREF;
+          lpCustColors : ^COLORREF;
+          Flags : DWORD;
+          lCustData : LPARAM;
+          lpfnHook : LPCCHOOKPROC;
+          lpTemplateName : LPCTSTR;		  
+       end;
+   LPCHOOSECOLORA = ^TCHOOSECOLORA;
+   PCHOOSECOLORA  = ^TCHOOSECOLORA;
+   _CHOOSECOLORA   = TCHOOSECOLORA;
+   
+   TCHOOSECOLORW  = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HWND;
+          rgbResult : COLORREF;
+          lpCustColors : ^COLORREF;
+          Flags : DWORD;
+          lCustData : LPARAM;
+          lpfnHook : LPCCHOOKPROC;
+          lpTemplateName : LPCWSTR;
+       end;
+     LPCHOOSECOLORW = ^TCHOOSECOLORW;
+     PCHOOSECOLORW  = ^TCHOOSECOLORW;
+	 _CHOOSECOLORW   = TCHOOSECOLORW;
+    {$ifdef unicode}       
+       _CHOOSECOLOR = TCHOOSECOLORW;
+       TCHOOSECOLOR = TCHOOSECOLORW;
+       PCHOOSECOLOR = ^TCHOOSECOLORW;
+       LPCHOOSECOLOR = PCHOOSECOLORW;	   
+     {$else}       
+       _CHOOSECOLOR = TCHOOSECOLORA;
+       TCHOOSECOLOR = TCHOOSECOLORA;
+       PCHOOSECOLOR = ^TCHOOSECOLORA;
+       LPCHOOSECOLOR = PCHOOSECOLORA;	   	   
+     {$endif}
+  
+    FINDREPLACEA = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HINST;
+          Flags : DWORD;
+          lpstrFindWhat : LPTSTR;
+          lpstrReplaceWith : LPTSTR;
+          wFindWhatLen : WORD;
+          wReplaceWithLen : WORD;
+          lCustData : LPARAM;
+          lpfnHook : LPFRHOOKPROC;
+          lpTemplateName : LPCTSTR;
+       end;
+     LPFINDREPLACEA = ^FINDREPLACEA;
+     TFINDREPLACEA = FINDREPLACEA;
+     PFINDREPLACEA = ^FINDREPLACEA;
+     FINDREPLACEW = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hInstance : HINST;
+          Flags : DWORD;
+          lpstrFindWhat : LPWSTR;
+          lpstrReplaceWith : LPWSTR;
+          wFindWhatLen : WORD;
+          wReplaceWithLen : WORD;
+          lCustData : LPARAM;
+          lpfnHook : LPFRHOOKPROC;
+          lpTemplateName : LPWSTR;
+       end;
+     LPFINDREPLACEW = ^FINDREPLACEW;
+     TFINDREPLACEW = FINDREPLACEW;
+     PFINDREPLACEW = ^FINDREPLACEW;
+     {$ifdef unicode}       
+       _FINDREPLACE = FINDREPLACEW;
+       TFINDREPLACE = FINDREPLACEW;
+       PFINDREPLACE = ^FINDREPLACEW;
+       LPFINDREPLACE = PFINDREPLACEW;	   
+     {$else}       
+       _FINDREPLACE = FINDREPLACEA;
+       TFINDREPLACE = FINDREPLACEA;
+       PFINDREPLACE = ^FINDREPLACEA;
+       LPFINDREPLACE = PFINDREPLACEA;	   	   
+     {$endif}
+	
+     LOGFONTA = record
+          lfHeight : LONG;
+          lfWidth : LONG;
+          lfEscapement : LONG;
+          lfOrientation : LONG;
+          lfWeight : LONG;
+          lfItalic : BYTE;
+          lfUnderline : BYTE;
+          lfStrikeOut : BYTE;
+          lfCharSet : BYTE;
+          lfOutPrecision : BYTE;
+          lfClipPrecision : BYTE;
+          lfQuality : BYTE;
+          lfPitchAndFamily : BYTE;
+          lfFaceName : array[0..(LF_FACESIZE)-1] of TCHAR;
+       end;
+     
+     TLOGFONTA = LOGFONTA;
+     PLOGFONTA = ^LOGFONTA;
+     LPLOGFONTA = PLOGFONTA;
+
+     LOGFONTW = record
+       lfHeight: LONG;
+       lfWidth: LONG;
+       lfEscapement: LONG;
+       lfOrientation: LONG;
+       lfWeight: LONG;
+       lfItalic: BYTE;
+       lfUnderline: BYTE;
+       lfStrikeOut: BYTE;
+       lfCharSet: BYTE;
+       lfOutPrecision: BYTE;
+       lfClipPrecision: BYTE;
+       lfQuality: BYTE;
+       lfPitchAndFamily: BYTE;
+       lfFaceName: array [0..LF_FACESIZE - 1] of WCHAR;
+     end;
+     LPLOGFONTW = ^LOGFONTW;
+     NPLOGFONTW = ^LOGFONTW;
+     TLogFontW = LOGFONTW;
+     PLogFontW = ^TLogFontW;
+     {$ifdef unicode}
+       LOGFONT = LOGFONTW;
+       _LOGFONT = LOGFONTW;
+       TLOGFONT = LOGFONTW;
+       PLOGFONT = ^LOGFONTW;
+       LPLOGFONT = PLOGFONTW;	   
+     {$else}
+       LOGFONT = LOGFONTA;
+       _LOGFONT = LOGFONTA;
+       TLOGFONT = LOGFONTA;
+       PLOGFONT = ^LOGFONTA;
+       LPLOGFONT = PLOGFONTA;	   	   
+     {$endif}
+ 
+	 _CHOOSEFONTA = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hDC : HDC;
+          lpLogFont : LPLOGFONTA;
+          iPointSize : WINT;
+          Flags : DWORD;
+          rgbColors : DWORD;
+          lCustData : LPARAM;
+          lpfnHook : LPCFHOOKPROC;
+          lpTemplateName : LPCTSTR;
+          hInstance : HINST;
+          lpszStyle : LPTSTR;
+          nFontType : WORD;
+          ___MISSING_ALIGNMENT__ : WORD;
+          nSizeMin : WINT;
+          nSizeMax : WINT;
+       end;
+     LPCHOOSEFONTA = ^TCHOOSEFONTA;
+     PCHOOSEFONTA = ^TCHOOSEFONTA;
+     TCHOOSEFONTA = _CHOOSEFONTA;	 
+	 _CHOOSEFONTW = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hDC : HDC;
+          lpLogFont : LPLOGFONTW;
+          iPointSize : WINT;
+          Flags : DWORD;
+          rgbColors : DWORD;
+          lCustData : LPARAM;
+          lpfnHook : LPCFHOOKPROC;
+          lpTemplateName : LPWSTR;
+          hInstance : HINST;
+          lpszStyle : LPWSTR;
+          nFontType : WORD;
+          ___MISSING_ALIGNMENT__ : WORD;
+          nSizeMin : WINT;
+          nSizeMax : WINT;
+       end;
+     LPCHOOSEFONTW = ^TCHOOSEFONTW;
+     PCHOOSEFONTW = ^TCHOOSEFONTW;
+	 TCHOOSEFONTW = _CHOOSEFONTW;	 
+    {$ifdef unicode}     
+       _choosefont = TchoosefontW;
+       Tchoosefont = TchoosefontW;
+       Pchoosefont = ^_choosefontW;
+       LPchoosefont = PchoosefontW;	   
+     {$else}
+     
+       _choosefont = TchoosefontA;
+       Tchoosefont = TchoosefontA;
+       Pchoosefont = ^_choosefontA;
+       LPchoosefont = PchoosefontA;	   	   
+     {$endif}
+	 DEVNAMES = record
+          wDriverOffset : WORD;
+          wDeviceOffset : WORD;
+          wOutputOffset : WORD;
+          wDefault : WORD;
+       end;
+     LPDEVNAMES = ^DEVNAMES;
+     tagDEVNAMES = DEVNAMES;
+     TDEVNAMES = DEVNAMES;
+     PDEVNAMES = ^DEVNAMES;
+    
+	TPRINTDLGA = packed record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hDevMode : HANDLE;
+          hDevNames : HANDLE;
+          hDC : HDC;
+          Flags : DWORD;
+          nFromPage : WORD;
+          nToPage : WORD;
+          nMinPage : WORD;
+          nMaxPage : WORD;
+          nCopies : WORD;
+          hInstance : HINST;
+          lCustData : DWORD;
+          lpfnPrintHook : LPPRINTHOOKPROC;
+          lpfnSetupHook : LPSETUPHOOKPROC;
+          lpPrintTemplateName : LPCTSTR;
+          lpSetupTemplateName : LPCTSTR;
+          hPrintTemplate : HANDLE;
+          hSetupTemplate : HANDLE;
+       end;
+     LPPRINTDLGA = ^TPRINTDLGA;
+     PPRINTDLGA = ^TPRINTDLGA;
+     _PRINTDLGA = TPRINTDLGA; 
+     tagPDA = TPRINTDLGA;
+     TPDA = TPRINTDLGA;
+     PPDA = ^TPRINTDLGA;
+	 	 
+     TPRINTDLGW = packed record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hDevMode : HANDLE;
+          hDevNames : HANDLE;
+          hDC : HDC;
+          Flags : DWORD;
+          nFromPage : WORD;
+          nToPage : WORD;
+          nMinPage : WORD;
+          nMaxPage : WORD;
+          nCopies : WORD;
+          hInstance : HINST;
+          lCustData : DWORD;
+          lpfnPrintHook : LPPRINTHOOKPROC;
+          lpfnSetupHook : LPSETUPHOOKPROC;
+          lpPrintTemplateName : LPWSTR;
+          lpSetupTemplateName : LPWSTR;
+          hPrintTemplate : HANDLE;
+          hSetupTemplate : HANDLE;
+       end;
+     LPPRINTDLGW = ^TPRINTDLGW;
+     PPRINTDLGW = ^TPRINTDLGW;
+     _PRINTDLGW = TPRINTDLGW; 
+     tagPDW = TPRINTDLGW;
+     TPDW = TPRINTDLGW;
+     PPDW = ^TPRINTDLGW;
+     {$ifdef unicode}
+	  LPPRINTDLG = ^TPRINTDLGA;
+      PPRINTDLG = ^TPRINTDLGA;
+      _PRINTDLG = TPRINTDLGA; 
+      tagPD = TPRINTDLGA;
+      TPD = TPRINTDLGA;
+      PPD = ^TPRINTDLGA;
+	 {$else}
+	  LPPRINTDLG = ^TPRINTDLGW;
+      PPRINTDLG = ^TPRINTDLGW;
+      _PRINTDLG = TPRINTDLGW; 
+      tagPD = TPRINTDLGW;
+      TPD = TPRINTDLGW;
+      PPD = ^TPRINTDLGW;
+	 {$endif}
+	 
+	TPAGESETUPDLGA = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hDevMode : HGLOBAL;
+          hDevNames : HGLOBAL;
+          Flags : DWORD;
+          ptPaperSize : POINT;
+          rtMinMargin : RECT;
+          rtMargin : RECT;
+          hInstance : HINST;
+          lCustData : LPARAM;
+          lpfnPageSetupHook : LPPAGESETUPHOOK;
+          lpfnPagePaintHook : LPPAGEPAINTHOOK;
+          lpPageSetupTemplateName : LPCTSTR;
+          hPageSetupTemplate : HGLOBAL;
+       end;
+     LPPAGESETUPDLGA = ^TPAGESETUPDLGA;
+     PPAGESETUPDLGA = ^TPAGESETUPDLGA;
+     _PAGESETUPDLGA = TPAGESETUPDLGA;
+     tagPSDA = TPAGESETUPDLGA;
+     TPSDA = TPAGESETUPDLGA;
+     PPSDA = ^TPAGESETUPDLGA;
+	 
+	 TPAGESETUPDLGW = record
+          lStructSize : DWORD;
+          hwndOwner : HWND;
+          hDevMode : HGLOBAL;
+          hDevNames : HGLOBAL;
+          Flags : DWORD;
+          ptPaperSize : POINT;
+          rtMinMargin : RECT;
+          rtMargin : RECT;
+          hInstance : HINST;
+          lCustData : LPARAM;
+          lpfnPageSetupHook : LPPAGESETUPHOOK;
+          lpfnPagePaintHook : LPPAGEPAINTHOOK;
+          lpPageSetupTemplateName : LPWSTR;
+          hPageSetupTemplate : HGLOBAL;
+       end;
+     LPPAGESETUPDLGW = ^TPAGESETUPDLGW;
+     PPAGESETUPDLGW = ^TPAGESETUPDLGW;
+     _PAGESETUPDLGW = TPAGESETUPDLGW;
+     tagPSDW = TPAGESETUPDLGW;
+     TPSDW = TPAGESETUPDLGW;
+     PPSDW = ^TPAGESETUPDLGW;
+
+    {$ifdef unicode}
+       
+       _PAGESETUPDLG = TPAGESETUPDLGW;
+       TPAGESETUPDLG = TPAGESETUPDLGW;
+       PPAGESETUPDLG = ^TPAGESETUPDLGW;
+       LPPAGESETUPDLG = PPAGESETUPDLGW;	   
+     {$else}
+       
+       _PAGESETUPDLG = TPAGESETUPDLGA;
+       TPAGESETUPDLG = TPAGESETUPDLGA;
+       PPAGESETUPDLG = ^TPAGESETUPDLGA;
+       LPPAGESETUPDLG = PPAGESETUPDLGA;	   	   
+     {$endif}
+	 	 
+// todo  tagpdexa, psdax 	
+	
+    IPrintDialogCallback= interface(IUnknown)
+	    ['{5852A2C3-6530-11D1-B6A3-0000F8757BF9}']
+         function InitDone:HResult;Stdcall;
+         function SelectionDone:HResult;Stdcall;		 
+         function handleMessage(hdlg:HWND;uMsg:UINT;wparm:WPARAM;Lparm:LPARAM;pres :PLRESULT):HRESULT;StdCall;
+        end;
+	IPrintDialogServices= interface (IUnknown) 
+	    ['{509AAEDA-5639-11D1-B6A1-0000F8757BF9}']
+		 function GetCurrentDevMode(pDevMode: LPDEVMODE;pcbSize:PUINT):HResult;Stdcall;
+         function GetCurrentPrinterName(pPrinterName:LPWSTR;pcchSize:PUINT):HREsult;Stdcall;
+         function GetCurrentPortName(PortName:LPWSTR;pcchSize:PUINT):HREsult;Stdcall;		 
+		end;
+Const
+  comctl32 = 'comctl32.dll';
+
+{$ifdef unicode}
+function GetOpenFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameA';
+function GetSaveFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetSaveFileNameA';
+function GetFileTitle(_para1:LPCSTR; _para2:LPSTR; _para3:WORD):integer; external 'comdlg32' name 'GetFileTitleA';
+function ChooseColor(_para1:LPCHOOSECOLOR):WINBOOL; external 'comdlg32' name 'ChooseColorA';
+function FindText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'FindTextA';
+function ReplaceText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'ReplaceTextA';
+function ChooseFont(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontA';
+function PrintDlg(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgA';
+function PageSetupDlg(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgA';
+function CreateProcess(lpApplicationName:LPCSTR; lpCommandLine:LPSTR; lpProcessAttributes:LPSECURITY_ATTRIBUTES; lpThreadAttributes:LPSECURITY_ATTRIBUTES; bInheritHandles:WINBOOL;dwCreationFlags:DWORD; lpEnvironment:LPVOID;
+{$else}
+function GetOpenFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameW';
+function GetSaveFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetSaveFileNameW';
+function GetFileTitle(_para1:LPCWSTR; _para2:LPWSTR; _para3:WORD):integer; external 'comdlg32' name 'GetFileTitleW';
+function ChooseColor(_para1:LPCHOOSECOLOR):WINBOOL; external 'comdlg32' name 'ChooseColorW';
+function ReplaceText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'ReplaceTextW';
+function ChooseFont(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontW';
+function FindText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'FindTextW';
+function PrintDlg(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgW';
+function PageSetupDlg(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgW';
+{$endif}
+
+function GetOpenFileNameA(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameA';
+function GetSaveFileNameA(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetSaveFileNameA';
+function GetFileTitleA(_para1:LPCSTR; _para2:LPSTR; _para3:WORD):integer; external 'comdlg32' name 'GetFileTitleA';
+function ChooseColorA(_para1:LPCHOOSECOLOR):WINBOOL; external 'comdlg32' name 'ChooseColorA';
+function FindTextA(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'FindTextA';
+function ReplaceTextA(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'ReplaceTextA';
+function ChooseFontA(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontA';
+function PrintDlgA(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgA';
+function PageSetupDlgA(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgA';
+function CommDlgExtendedError : DWORD; external 'comdlg32' name 'CommDlgExtendedError';
+function GetOpenFileNameW(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameW';
+function GetSaveFileNameW(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetSaveFileNameW';
+function GetFileTitleW(_para1:LPCWSTR; _para2:LPWSTR; _para3:WORD):integer; external 'comdlg32' name 'GetFileTitleW';
+function ChooseColorW(_para1:LPCHOOSECOLOR):WINBOOL; external 'comdlg32' name 'ChooseColorW';
+function ReplaceTextW(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'ReplaceTextW';
+function ChooseFontW(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontW';
+function FindTextW(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'FindTextW';
+function PrintDlgW(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgW';
+function PageSetupDlgW(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgW';
+
+implementation
+
+end.

rtl/win/wininc/ascdef.inc

@@ -342,7 +342,7 @@ function PropertySheet(lppsph:LPCPROPSHEETHEADER):longint; external 'comctl32' n
 function ImageList_LoadImage(hi:HINST; lpbmp:LPCSTR; cx:longint; cGrow:longint; crMask:COLORREF;uType:UINT; uFlags:UINT):HIMAGELIST; external 'comctl32' name 'ImageList_LoadImageA';
 function CreateStatusWindow(style:LONG; lpszText:LPCSTR; hwndParent:HWND; wID:UINT):HWND; external 'comctl32' name 'CreateStatusWindowA';
 procedure DrawStatusText(hDC:HDC; lprc:LPRECT; pszText:LPCSTR; uFlags:UINT); external 'comctl32' name 'DrawStatusTextA';
-}
+
 function GetOpenFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameA';
 function GetSaveFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetSaveFileNameA';
 function GetFileTitle(_para1:LPCSTR; _para2:LPSTR; _para3:WORD):integer; external 'comdlg32' name 'GetFileTitleA';
@@ -352,6 +352,8 @@ function ReplaceText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'Repla
 function ChooseFont(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontA';
 function PrintDlg(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgA';
 function PageSetupDlg(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgA';
+}
+
 function CreateProcess(lpApplicationName:LPCSTR; lpCommandLine:LPSTR; lpProcessAttributes:LPSECURITY_ATTRIBUTES; lpThreadAttributes:LPSECURITY_ATTRIBUTES; bInheritHandles:WINBOOL;dwCreationFlags:DWORD; lpEnvironment:LPVOID;
   lpCurrentDirectory:LPCSTR; lpStartupInfo:LPSTARTUPINFO; lpProcessInformation:LPPROCESS_INFORMATION):WINBOOL; external 'kernel32' name 'CreateProcessA';
 procedure GetStartupInfo(lpStartupInfo:LPSTARTUPINFO); external 'kernel32' name 'GetStartupInfoA';

rtl/win/wininc/ascfun.inc

@@ -340,8 +340,10 @@ function GetICMProfileA(_para1:HDC; _para2:DWORD; _para3:LPSTR):WINBOOL; externa
 function SetICMProfileA(_para1:HDC; _para2:LPSTR):WINBOOL; external 'gdi32' name 'SetICMProfileA';
 function UpdateICMRegKeyA(_para1:DWORD; _para2:DWORD; _para3:LPSTR; _para4:UINT):WINBOOL; external 'gdi32' name 'UpdateICMRegKeyA';
 function EnumICMProfilesA(_para1:HDC; _para2:ICMENUMPROC; _para3:LPARAM):longint; external 'gdi32' name 'EnumICMProfilesA';
+{
 function PropertySheetA(lppsph:LPCPROPSHEETHEADER):longint; external 'comctl32' name 'PropertySheetA';
 function ImageList_LoadImageA(hi:HINST; lpbmp:LPCSTR; cx:longint; cGrow:longint; crMask:COLORREF;uType:UINT; uFlags:UINT):HIMAGELIST; external 'comctl32' name 'ImageList_LoadImageA';
+
 function CreateStatusWindowA(style:LONG; lpszText:LPCSTR; hwndParent:HWND; wID:UINT):HWND; external 'comctl32' name 'CreateStatusWindowA';
 procedure DrawStatusTextA(hDC:HDC; lprc:LPRECT; pszText:LPCSTR; uFlags:UINT); external 'comctl32' name 'DrawStatusTextA';
 function GetOpenFileNameA(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameA';
@@ -353,6 +355,7 @@ function ReplaceTextA(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'Repl
 function ChooseFontA(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontA';
 function PrintDlgA(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgA';
 function PageSetupDlgA(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgA';
+}
 function CreateProcessA(lpApplicationName:LPCSTR; lpCommandLine:LPSTR; lpProcessAttributes:LPSECURITY_ATTRIBUTES; lpThreadAttributes:LPSECURITY_ATTRIBUTES; bInheritHandles:WINBOOL;dwCreationFlags:DWORD; lpEnvironment:LPVOID;
   lpCurrentDirectory:LPCSTR; lpStartupInfo:LPSTARTUPINFO; lpProcessInformation:LPPROCESS_INFORMATION):WINBOOL; external 'kernel32' name 'CreateProcessA';
 procedure GetStartupInfoA(lpStartupInfo:LPSTARTUPINFO); external 'kernel32' name 'GetStartupInfoA';

rtl/win/wininc/func.inc

@@ -1046,8 +1046,9 @@ function SHGetPathFromIDList(_para1:LPCITEMIDLIST; _para2:LPTSTR):WINBOOL; exter
 function SHGetSpecialFolderLocation(_para1:HWND; _para2:longint; var _para3:LPITEMIDLIST):HRESULT; external 'shell32' name 'SHGetSpecialFolderLocation';
 
 { was missing, bug report 1808 PM }
+{
 function CommDlgExtendedError : DWORD; external 'comdlg32' name 'CommDlgExtendedError';
-
+}
 { wgl Windows OpenGL helper functions }
 function wglUseFontBitmaps(_para1:HDC; _para2:DWORD; _para3:DWORD; _para4:DWORD):WINBOOL; external 'opengl32' name 'wglUseFontBitmapsA';
 function wglCreateContext(_para1:HDC):HGLRC; external 'opengl32' name 'wglCreateContext';

rtl/win/wininc/redef.inc

@@ -654,7 +654,7 @@ function GetWorldTransform(DC: HDC; var p2: TXForm): BOOL; external 'gdi32' name
 //function GradientFill(DC: HDC; var p2: TTriVertex; p3: ULONG; p4: Pointer; p5, p6: ULONG): BOOL;external 'gdi32' name 'GradientFill';
 procedure GlobalMemoryStatus(var Buffer: MEMORYSTATUS); external 'kernel32' name 'GlobalMemoryStatus';
 function HeapWalk(hHeap: THandle; var lpEntry: TProcessHeapEntry): BOOL; external 'kernel32' name 'HeapWalk';
-function ImageList_GetDragImage(var ppt:POINT; var pptHotspot:POINT):HIMAGELIST; external 'comctl32' name 'ImageList_GetDragImage';
+//function ImageList_GetDragImage(var ppt:POINT; var pptHotspot:POINT):HIMAGELIST; external 'comctl32' name 'ImageList_GetDragImage';
 function InflateRect(var lprc: TRect; dx, dy: Integer): BOOL; external 'user32' name 'InflateRect';
 function InitializeAcl(var pAcl: TACL; nAclLength, dwAclRevision: DWORD): BOOL; external 'advapi32' name 'InitializeAcl';
 {$ifndef NO_SMART_LINK}
@@ -1005,7 +1005,7 @@ function HwndMSWheel(var puiMsh_MsgMouseWheel, puiMsh_Msg3DSupport,puiMsh_MsgScr
   var pf3DSupport: BOOL; var piScrollLines: Integer): HWND;
 function CreateWaitableTimer(lpTimerAttributes :LPSECURITY_ATTRIBUTES; bManualReset:BOOl;lpTimerName:LPCTSTR):THandle;external 'kernel32' name 'CreateWaitableTimerA'; 
 function OpenWaitableTimer(dwDesiredAccess:DWORD;bInheritHandle:BOOL;lpTimerName:LPCTSTR):THandle;external 'kernel32' name 'OpenWaitableTimerA';
-function PropertySheetA(p:TPROPSHEETHEADER):longint; external 'comctl32' name 'PropertySheetA';
+//function PropertySheetA(p:TPROPSHEETHEADER):longint; external 'comctl32' name 'PropertySheetA';
 
 // windows because of Delphi compat.
 

rtl/win/wininc/unidef.inc

@@ -344,16 +344,9 @@ function PropertySheet(lppsph:LPCPROPSHEETHEADER):longint; external 'comctl32' n
 function ImageList_LoadImage(hi:HINST; lpbmp:LPCWSTR; cx:longint; cGrow:longint; crMask:COLORREF;uType:UINT; uFlags:UINT):HIMAGELIST; external 'comctl32' name 'ImageList_LoadImageW';
 function CreateStatusWindow(style:LONG; lpszText:LPCWSTR; hwndParent:HWND; wID:UINT):HWND; external 'comctl32' name 'CreateStatusWindowW';
 procedure DrawStatusText(hDC:HDC; lprc:LPRECT; pszText:LPCWSTR; uFlags:UINT); external 'comctl32' name 'DrawStatusTextW';
+
+
 }
-function GetOpenFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetOpenFileNameW';
-function GetSaveFileName(_para1:LPOPENFILENAME):WINBOOL; external 'comdlg32' name 'GetSaveFileNameW';
-function GetFileTitle(_para1:LPCWSTR; _para2:LPWSTR; _para3:WORD):integer; external 'comdlg32' name 'GetFileTitleW';
-function ChooseColor(_para1:LPCHOOSECOLOR):WINBOOL; external 'comdlg32' name 'ChooseColorW';
-function ReplaceText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'ReplaceTextW';
-function ChooseFont(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'ChooseFontW';
-function FindText(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'FindTextW';
-function PrintDlg(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgW';
-function PageSetupDlg(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgW';
 function CreateProcess(lpApplicationName:LPCWSTR; lpCommandLine:LPWSTR; lpProcessAttributes:LPSECURITY_ATTRIBUTES; lpThreadAttributes:LPSECURITY_ATTRIBUTES; bInheritHandles:WINBOOL;dwCreationFlags:DWORD; lpEnvironment:LPVOID;
   lpCurrentDirectory:LPCWSTR; lpStartupInfo:LPSTARTUPINFO; lpProcessInformation:LPPROCESS_INFORMATION):WINBOOL; external 'kernel32' name 'CreateProcessW';
 procedure GetStartupInfo(lpStartupInfo:LPSTARTUPINFO); external 'kernel32' name 'GetStartupInfoW';

rtl/win/wininc/unifun.inc

@@ -338,6 +338,7 @@ function GetICMProfileW(_para1:HDC; _para2:DWORD; _para3:LPWSTR):WINBOOL; extern
 function SetICMProfileW(_para1:HDC; _para2:LPWSTR):WINBOOL; external 'gdi32' name 'SetICMProfileW';
 function UpdateICMRegKeyW(_para1:DWORD; _para2:DWORD; _para3:LPWSTR; _para4:UINT):WINBOOL; external 'gdi32' name 'UpdateICMRegKeyW';
 function EnumICMProfilesW(_para1:HDC; _para2:ICMENUMPROC; _para3:LPARAM):longint; external 'gdi32' name 'EnumICMProfilesW';
+{
 function CreatePropertySheetPageW(lppsp:LPCPROPSHEETPAGE):HPROPSHEETPAGE; external 'comctl32' name 'CreatePropertySheetPageW';
 function PropertySheetW(lppsph:LPCPROPSHEETHEADER):longint; external 'comctl32' name 'PropertySheetW';
 function ImageList_LoadImageW(hi:HINST; lpbmp:LPCWSTR; cx:longint; cGrow:longint; crMask:COLORREF;uType:UINT; uFlags:UINT):HIMAGELIST; external 'comctl32' name 'ImageList_LoadImageW';
@@ -352,6 +353,8 @@ function ChooseFontW(_para1:LPCHOOSEFONT):WINBOOL; external 'comdlg32' name 'Cho
 function FindTextW(_para1:LPFINDREPLACE):HWND; external 'comdlg32' name 'FindTextW';
 function PrintDlgW(_para1:LPPRINTDLG):WINBOOL; external 'comdlg32' name 'PrintDlgW';
 function PageSetupDlgW(_para1:LPPAGESETUPDLG):WINBOOL; external 'comdlg32' name 'PageSetupDlgW';
+}
+
 function CreateProcessW(lpApplicationName:LPCWSTR; lpCommandLine:LPWSTR; lpProcessAttributes:LPSECURITY_ATTRIBUTES; lpThreadAttributes:LPSECURITY_ATTRIBUTES; bInheritHandles:WINBOOL;dwCreationFlags:DWORD; lpEnvironment:LPVOID;
   lpCurrentDirectory:LPCWSTR; lpStartupInfo:LPSTARTUPINFO; lpProcessInformation:LPPROCESS_INFORMATION):WINBOOL; external 'kernel32' name 'CreateProcessW';
 procedure GetStartupInfoW(lpStartupInfo:LPSTARTUPINFO); external 'kernel32' name 'GetStartupInfoW';