Changeset 183 for trunk/include/win/shellapi.h

Timestamp:

Jun 24, 1999, 9:27:49 PM (26 years ago)

Author:

phaller

Message:

Add: even more SHELL32 APIs ... and some corrections

File:

• trunk/include/win/shellapi.h (modified) (5 diffs)

trunk/include/win/shellapi.h

@@ -1 @@
-/* $Id: shellapi.h,v 1.1 1999-05-24 20:19:19 ktk Exp $ */
+/* $Id: shellapi.h,v 1.2 1999-06-24 19:27:48 phaller Exp $ */
 
 #ifndef _WINE_SHELLAPI_H
@@ -129 +129 @@
 } SHFILEINFOW;
 
-DECL_WINELIB_TYPE_AW(SHFILEINFO)
-
 DWORD   WINAPI SHGetFileInfoA(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT);
 DWORD   WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT);
-#define  SHGetFileInfo WINELIB_NAME_AW(SHGetFileInfo)
+
 
 /******************************************
@@ -189 +187 @@
 } SHFILEOPSTRUCTW, *LPSHFILEOPSTRUCTW;
 
-#define  SHFILEOPSTRUCT WINELIB_NAME_AW(SHFILEOPSTRUCT)
-#define  LPSHFILEOPSTRUCT WINELIB_NAME_AW(LPSHFILEOPSTRUCT)
-
-DWORD   WINAPI SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);  
-DWORD   WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
-#define  SHFileOperation WINELIB_NAME_AW(SHFileOperation)
-
-DWORD WINAPI SHFileOperationAW(DWORD x);
+DWORD   WIN32API SHFileOperationA (LPSHFILEOPSTRUCTA lpFileOp);  
+DWORD   WIN32API SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp);
+
 
 /******************************************
@@ -208 +201 @@
 #define SE_ERR_NOASSOC          31
 
-HINSTANCE16     WINAPI ShellExecute16(HWND16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT16);
 HINSTANCE       WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
 HINSTANCE       WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
-#define     ShellExecute WINELIB_NAME_AW(ShellExecute)
 
 /******************************************
@@ -296 +287 @@
  */
 
-HICON16 WINAPI ExtractIcon16(HINSTANCE16,LPCSTR,UINT16);
 HICON   WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
 HICON   WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
-#define     ExtractIcon WINELIB_NAME_AW(ExtractIcon)
-
-HICON16     WINAPI ExtractAssociatedIcon16(HINSTANCE16,LPSTR,LPWORD);
+
 HICON     WINAPI ExtractAssociatedIconA(HINSTANCE,LPSTR,LPWORD);
 HICON     WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,LPWORD);
-#define     ExtractAssociatedIcon WINELIB_NAME_AW(ExtractAssociatedIcon)
-
-HICON16 WINAPI ExtractIconEx16 ( LPCSTR, INT16, HICON16 *, HICON16 *, UINT16 );
+
 HICON WINAPI ExtractIconExA( LPCSTR, INT, HICON *, HICON *, UINT );
 HICON WINAPI ExtractIconExW( LPCWSTR, INT, HICON *, HICON *, UINT );
-#define  ExtractIconEx WINELIB_NAME_AW(ExtractIconEx)
 HICON WINAPI ExtractIconExAW(LPCVOID, INT, HICON *, HICON *, UINT );
 
-HINSTANCE16 WINAPI FindExecutable16(LPCSTR,LPCSTR,LPSTR);
 HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
 HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
-#define     FindExecutable WINELIB_NAME_AW(FindExecutable)
-
-BOOL16      WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16);
+
 BOOL      WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
 BOOL      WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
-#define     ShellAbout WINELIB_NAME_AW(ShellAbout)
 
 #pragma pack(4)