factor: Clean up wrong form of specialized-arrays in using lists.

[factor.git] / basis / windows / shell32 / shell32.factor

diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor
index 52e034ac8550d28f6214e515c50c55be84accce8..864663bd40b6b8fc379c1fe08b45a5c7e9d5dcb9 100644 (file)
--- a/basis/windows/shell32/shell32.factor
+++ b/basis/windows/shell32/shell32.factor
@@ -1,11 +1,8 @@
 ! Copyright (C) 2006, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.data alien.strings
-alien.syntax classes.struct io.backend kernel
-specialized-arrays
-specialized-arrays.instances.alien.c-types.ushort windows
-windows.com windows.com.syntax windows.kernel32 windows.ole32
-windows.types ;
+USING: alien alien.c-types alien.data alien.strings alien.syntax
+classes.struct io.backend kernel windows windows.com
+windows.com.syntax windows.kernel32 windows.ole32 windows.types ;
 IN: windows.shell32
 
 CONSTANT: CSIDL_DESKTOP 0x00
@@ -73,18 +70,23 @@ CONSTANT: CSIDL_FLAG_DONT_VERIFY 0x4000
 CONSTANT: CSIDL_FLAG_CREATE 0x8000
 CONSTANT: CSIDL_FLAG_MASK 0xff00
 
-
-CONSTANT: ERROR_FILE_NOT_FOUND 2
-
 CONSTANT: SHGFP_TYPE_CURRENT 0
 CONSTANT: SHGFP_TYPE_DEFAULT 1
 
 LIBRARY: shell32
 
-FUNCTION: HRESULT SHGetFolderPathW ( HWND hwndOwner, int nFolder, HANDLE hToken, DWORD dwReserved, LPTSTR pszPath ) ;
+FUNCTION: HRESULT SHGetFolderPathW ( HWND hwndOwner,
+                                     int nFolder,
+                                     HANDLE hToken,
+                                     DWORD dwReserved,
+                                     LPTSTR pszPath )
 ALIAS: SHGetFolderPath SHGetFolderPathW
 
-FUNCTION: HINSTANCE ShellExecuteW ( HWND hwnd, LPCTSTR lpOperation, LPCTSTR lpFile, LPCTSTR lpParameters, LPCTSTR lpDirectory, INT nShowCmd ) ;
+FUNCTION: HINSTANCE ShellExecuteW ( HWND hwnd,
+                                    LPCTSTR lpOperation,
+                                    LPCTSTR lpFile,
+                                    LPCTSTR lpParameters,
+                                    LPCTSTR lpDirectory, INT nShowCmd )
 ALIAS: ShellExecute ShellExecuteW
 
 CONSTANT: SHGFI_ICON 0x000000100
@@ -113,13 +115,11 @@ STRUCT: SHFILEINFO
     { szDisplayName TCHAR[MAX_PATH] }
     { szTypeName TCHAR[80] } ;
 
-FUNCTION: DWORD_PTR SHGetFileInfoW (
-    LPCTSTR pszPath,
-    DWORD dwFileAttributes,
-    SHFILEINFO *psfi,
-    UINT cbFileInfo,
-    UINT uFlags
-) ;
+FUNCTION: DWORD_PTR SHGetFileInfoW ( LPCTSTR pszPath,
+                                     DWORD dwFileAttributes,
+                                     SHFILEINFO *psfi,
+                                     UINT cbFileInfo,
+                                     UINT uFlags )
 
 : shell32-file-info ( path -- err struct )
     normalize-path
@@ -172,7 +172,7 @@ INSTANCE: +win32-nt-executable+ windows-executable   ! pe
 
 : program-files-common-x86 ( -- str )
     CSIDL_PROGRAM_FILES_COMMONX86 shell32-directory ;
-    
+
 
 CONSTANT: SHCONTF_FOLDERS 32
 CONSTANT: SHCONTF_NONFOLDERS 64
@@ -228,7 +228,6 @@ STRUCT: DROPFILES
     { fWide BOOL } ;
 TYPEDEF: DROPFILES* LPDROPFILES
 TYPEDEF: DROPFILES* LPCDROPFILES
-TYPEDEF: HANDLE HDROP
 
 STRUCT: SHITEMID
     { cb USHORT }
@@ -263,20 +262,59 @@ COM-INTERFACE: IEnumIDList IUnknown {000214F2-0000-0000-C000-000000000046}
     HRESULT Clone ( IEnumIDList** ppenum ) ;
 
 COM-INTERFACE: IShellFolder IUnknown {000214E6-0000-0000-C000-000000000046}
-    HRESULT ParseDisplayName ( HWND hwndOwner, void* pbcReserved, LPOLESTR lpszDisplayName, ULONG* pchEaten, LPITEMIDLIST* ppidl, ULONG* pdwAttributes )
-    HRESULT EnumObjects ( HWND hwndOwner, SHCONTF grfFlags, IEnumIDList** ppenumIDList )
-    HRESULT BindToObject ( LPCITEMIDLIST pidl, void* pbcReserved, REFGUID riid, void** ppvOut )
-    HRESULT BindToStorage ( LPCITEMIDLIST pidl, void* pbcReserved, REFGUID riid, void** ppvObj )
-    HRESULT CompareIDs ( LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 )
-    HRESULT CreateViewObject ( HWND hwndOwner, REFGUID riid, void** ppvOut )
-    HRESULT GetAttributesOf ( UINT cidl, LPCITEMIDLIST* apidl, SFGAOF* rgfInOut )
-    HRESULT GetUIObjectOf ( HWND hwndOwner, UINT cidl, LPCITEMIDLIST* apidl, REFGUID riid, UINT* prgfInOut, void** ppvOut )
-    HRESULT GetDisplayNameOf ( LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET* lpName )
-    HRESULT SetNameOf ( HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR lpszName, SHGDNF uFlags, LPITEMIDLIST* ppidlOut ) ;
-
-FUNCTION: HRESULT SHGetDesktopFolder ( IShellFolder** ppshf ) ;
-
-FUNCTION: UINT DragQueryFileW ( HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch ) ;
+    HRESULT ParseDisplayName ( HWND hwndOwner,
+                               void* pbcReserved,
+                               LPOLESTR lpszDisplayName,
+                               ULONG* pchEaten,
+                               LPITEMIDLIST* ppidl,
+                               ULONG* pdwAttributes )
+    HRESULT EnumObjects ( HWND hwndOwner,
+                          SHCONTF grfFlags,
+                          IEnumIDList** ppenumIDList )
+    HRESULT BindToObject ( LPCITEMIDLIST pidl,
+                           void* pbcReserved,
+                           REFGUID riid,
+                           void** ppvOut )
+    HRESULT BindToStorage ( LPCITEMIDLIST pidl,
+                            void* pbcReserved,
+                            REFGUID riid,
+                            void** ppvObj )
+    HRESULT CompareIDs ( LPARAM lParam,
+                         LPCITEMIDLIST pidl1,
+                         LPCITEMIDLIST pidl2 )
+    HRESULT CreateViewObject ( HWND hwndOwner,
+                               REFGUID riid,
+                               void** ppvOut )
+    HRESULT GetAttributesOf ( UINT cidl,
+                              LPCITEMIDLIST* apidl,
+                              SFGAOF* rgfInOut )
+    HRESULT GetUIObjectOf ( HWND hwndOwner,
+                            UINT cidl,
+                            LPCITEMIDLIST* apidl,
+                            REFGUID riid,
+                            UINT* prgfInOut,
+                            void** ppvOut )
+    HRESULT GetDisplayNameOf ( LPCITEMIDLIST pidl,
+                               SHGDNF uFlags,
+                               STRRET* lpName )
+    HRESULT SetNameOf ( HWND hwnd,
+                        LPCITEMIDLIST pidl,
+                        LPCOLESTR lpszName,
+                        SHGDNF uFlags,
+                        LPITEMIDLIST* ppidlOut ) ;
+
+FUNCTION: HRESULT SHGetDesktopFolder ( IShellFolder** ppshf )
+
+FUNCTION: void DragAcceptFiles ( HWND hWnd, BOOL fAccept )
+
+FUNCTION: UINT DragQueryFileW ( HDROP hDrop,
+                                UINT iFile,
+                                LPWSTR lpszFile,
+                                UINT cch )
 ALIAS: DragQueryFile DragQueryFileW
 
-FUNCTION: BOOL IsUserAnAdmin ( ) ;
+FUNCTION: BOOL DragQueryPoint ( HDROP hDrop, POINT* lppt )
+
+FUNCTION: void DragFinish ( HDROP hDrop )
+
+FUNCTION: BOOL IsUserAnAdmin ( )