Changeset 4033 for trunk/include/win/wine/obj_shelllink.h

Timestamp:

Aug 18, 2000, 4:04:23 AM (25 years ago)

Author:

phaller

Message:

Shell32 update to WINE

File:

• trunk/include/win/wine/obj_shelllink.h (modified) (4 diffs)

trunk/include/win/wine/obj_shelllink.h

@@ -1 @@
-/* $Id: obj_shelllink.h,v 1.5 1999-08-22 22:52:10 sandervl Exp $ */
+/* $Id: obj_shelllink.h,v 1.6 2000-08-18 02:04:23 phaller Exp $ */
 /*
  * Defines the COM interfaces and APIs related to IShellLink.
@@ -20 +20 @@
  * Predeclare the interfaces
  */
-DEFINE_SHLGUID(IID_IShellLink,          0x000214EEL, 0, 0);
-typedef struct IShellLink IShellLink,*LPSHELLLINK;
-#define IShellLinkA IShellLink
-
-DEFINE_SHLGUID(IID_IShellLinkW,         0x000214F9L, 0, 0);
+typedef struct IShellLinkA IShellLinkA,*LPSHELLLINK;
 typedef struct IShellLinkW IShellLinkW,*LPSHELLLINKW;
 
@@ -46 +42 @@
  * IShellLink interface
  */
-#define ICOM_INTERFACE IShellLink
-#define IShellLink_METHODS \
+#define ICOM_INTERFACE IShellLinkA
+#define IShellLinkA_METHODS \
     ICOM_METHOD4( HRESULT, GetPath, LPSTR, pszFile, INT, cchMaxPath, WIN32_FIND_DATAA *, pfd, DWORD, fFlags) \
     ICOM_METHOD1( HRESULT, GetIDList, LPITEMIDLIST *, ppidl) \
@@ -66 +62 @@
     ICOM_METHOD2( HRESULT, Resolve, HWND, hwnd, DWORD, fFlags) \
     ICOM_METHOD1( HRESULT, SetPath, LPCSTR, pszFile)
-#define IShellLink_IMETHODS \
+#define IShellLinkA_IMETHODS \
     IUnknown_IMETHODS \
-    IShellLink_METHODS
-ICOM_DEFINE(IShellLink,IUnknown)
+    IShellLinkA_METHODS
+ICOM_DEFINE(IShellLinkA,IUnknown)
 #undef ICOM_INTERFACE
 
 #ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
-#define IShellLink_QueryInterface(p,a,b)        ICOM_CALL2(QueryInterface,p,a,b)
-#define IShellLink_AddRef(p)                    ICOM_CALL (AddRef,p)
-#define IShellLink_Release(p)                   ICOM_CALL (Release,p)
+#define IShellLinkA_QueryInterface(p,a,b)       ICOM_CALL2(QueryInterface,p,a,b)
+#define IShellLinkA_AddRef(p)                   ICOM_CALL (AddRef,p)
+#define IShellLinkA_Release(p)                  ICOM_CALL (Release,p)
 /*** IShellLink methods ***/
-#define IShellLink_GetPath(p,a,b,c,d)           ICOM_CALL4(GetPath,p,a,b,c,d)
-#define IShellLink_GetIDList(p,a)               ICOM_CALL1(GetIDList,p,a)
-#define IShellLink_SetIDList(p,a)               ICOM_CALL1(SetIDList,p,a)
-#define IShellLink_GetDescription(p,a,b)        ICOM_CALL2(GetDescription,p,a,b)
-#define IShellLink_SetDescription(p,a)          ICOM_CALL1(SetDescription,p,a)
-#define IShellLink_GetWorkingDirectory(p,a,b)   ICOM_CALL2(GetWorkingDirectory,p,a,b)
-#define IShellLink_SetWorkingDirectory(p,a)     ICOM_CALL1(SetWorkingDirectory,p,a)
-#define IShellLink_GetArguments(p,a,b)          ICOM_CALL2(GetArguments,p,a,b)
-#define IShellLink_SetArguments(p,a)            ICOM_CALL1(SetArguments,p,a)
-#define IShellLink_GetHotkey(p,a)               ICOM_CALL1(GetHotkey,p,a)
-#define IShellLink_SetHotkey(p,a)               ICOM_CALL1(SetHotkey,p,a)
-#define IShellLink_GetShowCmd(p,a)              ICOM_CALL1(GetShowCmd,p,a)
-#define IShellLink_SetShowCmd(p,a)              ICOM_CALL1(SetShowCmd,p,a)
-#define IShellLink_GetIconLocation(p,a,b,c)     ICOM_CALL3(GetIconLocation,p,a,b,c)
-#define IShellLink_SetIconLocation(p,a,b)       ICOM_CALL2(SetIconLocation,p,a,b)
-#define IShellLink_SetRelativePath(p,a,b)       ICOM_CALL2(SetRelativePath,p,a,b)
-#define IShellLink_Resolve(p,a,b)               ICOM_CALL2(Resolve,p,a,b)
-#define IShellLink_SetPath(p,a)                 ICOM_CALL1(SetPath,p,a)
+#define IShellLinkA_GetPath(p,a,b,c,d)          ICOM_CALL4(GetPath,p,a,b,c,d)
+#define IShellLinkA_GetIDList(p,a)              ICOM_CALL1(GetIDList,p,a)
+#define IShellLinkA_SetIDList(p,a)              ICOM_CALL1(SetIDList,p,a)
+#define IShellLinkA_GetDescription(p,a,b)       ICOM_CALL2(GetDescription,p,a,b)
+#define IShellLinkA_SetDescription(p,a)         ICOM_CALL1(SetDescription,p,a)
+#define IShellLinkA_GetWorkingDirectory(p,a,b)  ICOM_CALL2(GetWorkingDirectory,p,a,b)
+#define IShellLinkA_SetWorkingDirectory(p,a)    ICOM_CALL1(SetWorkingDirectory,p,a)
+#define IShellLinkA_GetArguments(p,a,b)         ICOM_CALL2(GetArguments,p,a,b)
+#define IShellLinkA_SetArguments(p,a)           ICOM_CALL1(SetArguments,p,a)
+#define IShellLinkA_GetHotkey(p,a)              ICOM_CALL1(GetHotkey,p,a)
+#define IShellLinkA_SetHotkey(p,a)              ICOM_CALL1(SetHotkey,p,a)
+#define IShellLinkA_GetShowCmd(p,a)             ICOM_CALL1(GetShowCmd,p,a)
+#define IShellLinkA_SetShowCmd(p,a)             ICOM_CALL1(SetShowCmd,p,a)
+#define IShellLinkA_GetIconLocation(p,a,b,c)    ICOM_CALL3(GetIconLocation,p,a,b,c)
+#define IShellLinkA_SetIconLocation(p,a,b)      ICOM_CALL2(SetIconLocation,p,a,b)
+#define IShellLinkA_SetRelativePath(p,a,b)      ICOM_CALL2(SetRelativePath,p,a,b)
+#define IShellLinkA_Resolve(p,a,b)              ICOM_CALL2(Resolve,p,a,b)
+#define IShellLinkA_SetPath(p,a)                        ICOM_CALL1(SetPath,p,a)
 #endif