scrrun/tests: Update idl file in tests.

dlls/scrrun/tests/scrrun.idl

@@ -33,23 +33,13 @@ library Scripting
 {
     importlib("stdole2.tlb");
 
-    interface IDictionary;
-    interface IDrive;
-    interface IDriveCollection;
-    interface IFile;
-    interface IFileCollection;
-    interface IFileSystem;
-    interface IFileSystem3;
     interface IFolder;
-    interface IFolderCollection;
-    interface IScriptEncoder;
-    interface ITextStream;
 
     typedef enum CompareMethod
     {
-        BinaryCompare   = 0,
+        BinaryCompare,
-        TextCompare     = 1,
+        TextCompare,
-        DatabaseCompare = 2
+        DatabaseCompare
     } CompareMethod;
 
     typedef enum IOMode
@@ -61,10 +51,10 @@ library Scripting
 
     typedef enum Tristate
     {
-        TristateTrue       = 0xffffffff,
+        TristateTrue       = -1,
-        TristateFalse      = 0,
+        TristateFalse      =  0,
-        TristateUseDefault = 0xfffffffe,
+        TristateUseDefault = -2,
-        TristateMixed      = 0xfffffffe
+        TristateMixed      = -2
     } Tristate;
 
     typedef enum FileAttribute
@@ -82,26 +72,26 @@ library Scripting
 
     typedef enum SpecialFolderConst
     {
-        WindowsFolder = 0,
+        WindowsFolder,
-        SystemFolder = 1,
+        SystemFolder,
-        TemporaryFolder = 2
+        TemporaryFolder
     } SpecialFolderConst;
 
     typedef enum DriveTypeConst
     {
-        UnknownType = 0,
+        UnknownType,
-        Removable = 1,
+        Removable,
-        Fixed = 2,
+        Fixed,
-        Remote = 3,
+        Remote,
-        CDRom = 4,
+        CDRom,
-        RamDisk = 5
+        RamDisk
     } DriveTypeConst;
 
     typedef enum StandardStreamTypes
     {
-        StdIn  = 0,
+        StdIn,
-        StdOut = 1,
+        StdOut,
-        StdErr = 2
+        StdErr
     } StandardStreamTypes;
 
     [
@@ -113,13 +103,13 @@ library Scripting
     ]
     interface IDictionary : IDispatch
     {
-        [id(00000000), propputref]
+        [id(DISPID_VALUE), propputref]
         HRESULT Item([in] VARIANT* Key, [in] VARIANT* pRetItem);
 
-        [id(00000000), propput]
+        [id(DISPID_VALUE), propput]
         HRESULT Item([in] VARIANT* Key, [in] VARIANT* pRetItem);
 
-        [id(00000000), propget]
+        [id(DISPID_VALUE), propget]
         HRESULT Item([in] VARIANT* Key, [out, retval] VARIANT* pRetItem);
 
         [id(0x00000001)]
@@ -159,6 +149,191 @@ library Scripting
         HRESULT HashVal([in] VARIANT* Key, [out, retval] VARIANT* HashVal);
     }
 
+    [
+      odl,
+      uuid(C7C3F5A0-88A3-11D0-ABCB-00A0C90FFFC0),
+      hidden,
+      dual,
+      nonextensible,
+      oleautomation
+    ]
+    interface IDrive : IDispatch
+    {
+        [id(DISPID_VALUE), propget]
+        HRESULT Path([out, retval] BSTR* pbstrPath);
+
+        [id(0x00002710), propget]
+        HRESULT DriveLetter([out, retval] BSTR* pbstrLetter);
+
+        [id(0x00002711), propget]
+        HRESULT ShareName([out, retval] BSTR* pbstrShareName);
+
+        [id(0x00002712), propget]
+        HRESULT DriveType([out, retval] DriveTypeConst* pdt);
+
+        [id(0x00002713), propget]
+        HRESULT RootFolder([out, retval] IFolder** ppfolder);
+
+        [id(0x00002715), propget]
+        HRESULT AvailableSpace([out, retval] VARIANT* pvarAvail);
+
+        [id(0x00002714), propget]
+        HRESULT FreeSpace([out, retval] VARIANT* pvarFree);
+
+        [id(0x00002716), propget]
+        HRESULT TotalSize([out, retval] VARIANT* pvarTotal);
+
+        [id(0x00002717), propget]
+        HRESULT VolumeName([out, retval] BSTR* pbstrName);
+
+        [id(0x00002717), propput]
+        HRESULT VolumeName([in] BSTR pbstrName);
+
+        [id(0x00002718), propget]
+        HRESULT FileSystem([out, retval] BSTR* pbstrFileSystem);
+
+        [id(0x00002719), propget]
+        HRESULT SerialNumber([out, retval] long* pulSerialNumber);
+
+        [id(0x0000271a), propget]
+        HRESULT IsReady([out, retval] VARIANT_BOOL* pfReady);
+    }
+
+    [
+      odl,
+      uuid(C7C3F5A1-88A3-11D0-ABCB-00A0C90FFFC0),
+      hidden,
+      dual,
+      nonextensible,
+      oleautomation
+    ]
+    interface IDriveCollection : IDispatch {
+        [id(DISPID_VALUE), propget]
+        HRESULT Item([in] VARIANT Key, [out, retval] IDrive** ppdrive);
+
+        [id(DISPID_NEWENUM), propget, restricted, hidden]
+        HRESULT _NewEnum([out, retval] IUnknown** ppenum);
+
+        [id(0x00000001), propget]
+        HRESULT Count([out, retval] long* plCount);
+    }
+
+    [
+      odl,
+      uuid(53BAD8C1-E718-11CF-893D-00A0C9054228),
+      hidden,
+      dual,
+      nonextensible,
+      oleautomation
+    ]
+    interface ITextStream : IDispatch
+    {
+        [id(0x00002710), propget]
+        HRESULT Line([out, retval] long* Line);
+
+        [id(0xfffffdef), propget]
+        HRESULT Column([out, retval] long* Column);
+
+        [id(0x00002712), propget]
+        HRESULT AtEndOfStream([out, retval] VARIANT_BOOL* EOS);
+
+        [id(0x00002713), propget]
+        HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL);
+
+        [id(0x00002714)]
+        HRESULT Read([in] long Characters, [out, retval] BSTR* Text);
+
+        [id(0x00002715)]
+        HRESULT ReadLine([out, retval] BSTR* Text);
+
+        [id(0x00002716)]
+        HRESULT ReadAll([out, retval] BSTR* Text);
+
+        [id(0x00002717)]
+        HRESULT Write([in] BSTR Text);
+
+        [id(0x00002718)]
+        HRESULT WriteLine([in, defaultvalue("")] BSTR Text);
+
+        [id(0x00002719)]
+        HRESULT WriteBlankLines([in] long Lines);
+
+        [id(0x0000271a)]
+        HRESULT Skip([in] long Characters);
+
+        [id(0x0000271b)]
+        HRESULT SkipLine();
+
+        [id(0x0000271c)]
+        HRESULT Close();
+    }
+
+    [
+      odl,
+      uuid(C7C3F5A4-88A3-11D0-ABCB-00A0C90FFFC0),
+      hidden,
+      dual,
+      nonextensible,
+      oleautomation
+    ]
+    interface IFile : IDispatch
+    {
+        [id(DISPID_VALUE), propget]
+        HRESULT Path([out, retval] BSTR* pbstrPath);
+
+        [id(0x000003e8), propget]
+        HRESULT Name([out, retval] BSTR* pbstrName);
+
+        [id(0x000003e8), propput]
+        HRESULT Name([in] BSTR pbstrName);
+
+        [id(0x000003ea), propget]
+        HRESULT ShortPath([out, retval] BSTR* pbstrPath);
+
+        [id(0x000003e9), propget]
+        HRESULT ShortName([out, retval] BSTR* pbstrName);
+
+        [id(0x000003ec), propget]
+        HRESULT Drive([out, retval] IDrive** ppdrive);
+
+        [id(0x000003ed), propget]
+        HRESULT ParentFolder([out, retval] IFolder** ppfolder);
+
+        [id(0x000003eb), propget]
+        HRESULT Attributes([out, retval] FileAttribute* pfa);
+
+        [id(0x000003eb), propput]
+        HRESULT Attributes([in] FileAttribute pfa);
+
+        [id(0x000003ee), propget]
+        HRESULT DateCreated([out, retval] DATE* pdate);
+
+        [id(0x000003ef), propget]
+        HRESULT DateLastModified([out, retval] DATE* pdate);
+
+        [id(0x000003f0), propget]
+        HRESULT DateLastAccessed([out, retval] DATE* pdate);
+
+        [id(0x000003f1), propget]
+        HRESULT Size([out, retval] VARIANT* pvarSize);
+
+        [id(0x000003f2), propget]
+        HRESULT Type([out, retval] BSTR* pbstrType);
+
+        [id(0x000004b0)]
+        HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force);
+
+        [id(0x000004b2)]
+        HRESULT Copy([in] BSTR Destination, [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
+
+        [id(0x000004b4)]
+        HRESULT Move([in] BSTR Destination);
+
+        [id(0x0000044c)]
+        HRESULT OpenAsTextStream([in, defaultvalue(1)] IOMode IOMode,
+                        [in, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts);
+    }
+
     [
       odl,
       uuid(0AB5A3D0-E5B6-11D0-ABF5-00A0C90FFFC0),
@@ -218,10 +393,10 @@ library Scripting
         HRESULT GetSpecialFolder([in] SpecialFolderConst SpecialFolder, [out, retval] IFolder** ppfolder);
 
         [id(0x000004b0)]
-        HRESULT DeleteFile([in] BSTR FileSpec, [in, optional, defaultvalue(0)] VARIANT_BOOL Force);
+        HRESULT DeleteFile([in] BSTR FileSpec, [in, defaultvalue(0)] VARIANT_BOOL Force);
 
         [id(0x000004b1)]
-        HRESULT DeleteFolder([in] BSTR FolderSpec, [in, optional, defaultvalue(0)] VARIANT_BOOL Force);
+        HRESULT DeleteFolder([in] BSTR FolderSpec, [in, defaultvalue(0)] VARIANT_BOOL Force);
 
         [id(0x000004b4), helpstring("Move a file"), helpcontext(0x00214bab)]
         HRESULT MoveFile([in] BSTR Source, [in] BSTR Destination);
@@ -231,37 +406,38 @@ library Scripting
 
         [id(0x000004b2)]
         HRESULT CopyFile([in] BSTR Source, [in] BSTR Destination,
-                         [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
+                         [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
 
         [id(0x000004b3)]
         HRESULT CopyFolder([in] BSTR Source, [in] BSTR Destination,
-                           [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
+                           [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
 
         [id(0x00000460)]
         HRESULT CreateFolder([in] BSTR Path, [out, retval] IFolder** ppfolder);
 
         [id(0x0000044d)]
-        HRESULT CreateTextFile([in] BSTR FileName, [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite,
+        HRESULT CreateTextFile([in] BSTR FileName, [in, defaultvalue(-1)] VARIANT_BOOL Overwrite,
-                        [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts);
+                        [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts);
 
         [id(0x0000044c)]
-        HRESULT OpenTextFile([in] BSTR FileName, [in, optional, defaultvalue(1)] IOMode IOMode,
+        HRESULT OpenTextFile([in] BSTR FileName, [in, defaultvalue(1)] IOMode IOMode,
-                        [in, optional, defaultvalue(0)] VARIANT_BOOL Create,
+                        [in, defaultvalue(0)] VARIANT_BOOL Create,
-                        [in, optional, defaultvalue(0)] Tristate Format,
+                        [in, defaultvalue(0)] Tristate Format,
                         [out, retval] ITextStream** ppts);
     }
 
     [
       odl,
-      uuid(C7C3F5A1-88A3-11D0-ABCB-00A0C90FFFC0),
+      uuid(C7C3F5A5-88A3-11D0-ABCB-00A0C90FFFC0),
       hidden,
       dual,
       nonextensible,
       oleautomation
     ]
-    interface IDriveCollection : IDispatch {
+    interface IFileCollection : IDispatch
-        [id(00000000)]
+    {
-        HRESULT Item([in] VARIANT Key, [out, retval] IDrive** ppdrive);
+        [id(DISPID_VALUE), propget]
+        HRESULT Item([in] VARIANT Key, [out, retval] IFile** ppfile);
 
         [id(DISPID_NEWENUM), propget, restricted, hidden]
         HRESULT _NewEnum([out, retval] IUnknown** ppenum);
@@ -272,52 +448,25 @@ library Scripting
 
     [
       odl,
-      uuid(C7C3F5A0-88A3-11D0-ABCB-00A0C90FFFC0),
+      uuid(C7C3F5A3-88A3-11D0-ABCB-00A0C90FFFC0),
       hidden,
       dual,
       nonextensible,
       oleautomation
     ]
-    interface IDrive : IDispatch
+    interface IFolderCollection : IDispatch
     {
-        [id(00000000), propget]
+        [id(0x00000002)]
-        HRESULT Path([out, retval] BSTR* pbstrPath);
+        HRESULT Add([in] BSTR Name, [out, retval] IFolder** ppfolder);
 
-        [id(0x00002710), propget]
+        [id(DISPID_VALUE), propget]
-        HRESULT DriveLetter([out, retval] BSTR* pbstrLetter)
+        HRESULT Item([in] VARIANT Key, [out, retval] IFolder** ppfolder);
-;
-        [id(0x00002711), propget]
-        HRESULT ShareName([out, retval] BSTR* pbstrShareName);
 
-        [id(0x00002712), propget]
+        [id(DISPID_NEWENUM), propget, restricted, hidden]
-        HRESULT DriveType([out, retval] DriveTypeConst* pdt);
+        HRESULT _NewEnum([out, retval] IUnknown** ppenum);
 
-        [id(0x00002713), propget]
+        [id(0x00000001), propget]
-        HRESULT RootFolder([out, retval] IFolder** ppfolder);
+        HRESULT Count([out, retval] long* plCount);
-
-        [id(0x00002715), propget]
-        HRESULT AvailableSpace([out, retval] VARIANT* pvarAvail);
-
-        [id(0x00002714), propget]
-        HRESULT FreeSpace([out, retval] VARIANT* pvarFree);
-
-        [id(0x00002716), propget]
-        HRESULT TotalSize([out, retval] VARIANT* pvarTotal);
-
-        [id(0x00002717), propget]
-        HRESULT VolumeName([out, retval] BSTR* pbstrName);
-
-        [id(0x00002717), propput]
-        HRESULT VolumeName([in] BSTR pbstrName);
-
-        [id(0x00002718), propget]
-        HRESULT FileSystem([out, retval] BSTR* pbstrFileSystem);
-
-        [id(0x00002719), propget]
-        HRESULT SerialNumber([out, retval] long* pulSerialNumber);
-
-        [id(0x0000271a), propget]
-        HRESULT IsReady([out, retval] VARIANT_BOOL* pfReady);
     }
 
     [
@@ -330,7 +479,7 @@ library Scripting
     ]
     interface IFolder : IDispatch
     {
-        [id(00000000), propget]
+        [id(DISPID_VALUE), propget]
         HRESULT Path([out, retval] BSTR* pbstrPath);
 
         [id(0x000003e8), propget]
@@ -370,10 +519,10 @@ library Scripting
         HRESULT Type([out, retval] BSTR* pbstrType);
 
         [id(0x000004b1)]
-        HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force);
+        HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force);
 
         [id(0x000004b3)]
-        HRESULT Copy([in] BSTR Destination, [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
+        HRESULT Copy([in] BSTR Destination, [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
 
         [id(0x000004b5)]
         HRESULT Move([in] BSTR Destination);
@@ -391,167 +540,8 @@ library Scripting
         HRESULT Files([out, retval] IFileCollection** ppfiles);
 
         [id(0x0000044d)]
-        HRESULT CreateTextFile([in] BSTR FileName, [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite,
+        HRESULT CreateTextFile([in] BSTR FileName, [in, defaultvalue(-1)] VARIANT_BOOL Overwrite,
-                        [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts);
+                        [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts);
-    }
-
-    [
-      odl,
-      uuid(C7C3F5A3-88A3-11D0-ABCB-00A0C90FFFC0),
-      hidden,
-      dual,
-      nonextensible,
-      oleautomation
-    ]
-    interface IFolderCollection : IDispatch
-    {
-        [id(0x00000002)]
-        HRESULT Add([in] BSTR Name, [out, retval] IFolder** ppfolder);
-
-        [id(00000000), propget]
-        HRESULT Item([in] VARIANT Key, [out, retval] IFolder** ppfolder);
-
-        [id(DISPID_NEWENUM), propget, restricted, hidden]
-        HRESULT _NewEnum([out, retval] IUnknown** ppenum);
-
-        [id(0x00000001), propget]
-        HRESULT Count([out, retval] long* plCount);
-    }
-
-    [
-      odl,
-      uuid(C7C3F5A5-88A3-11D0-ABCB-00A0C90FFFC0),
-      hidden,
-      dual,
-      nonextensible,
-      oleautomation
-    ]
-    interface IFileCollection : IDispatch
-    {
-        [id(00000000), propget]
-        HRESULT Item([in] VARIANT Key, [out, retval] IFile** ppfile);
-
-        [id(DISPID_NEWENUM), propget, restricted, hidden]
-        HRESULT _NewEnum([out, retval] IUnknown** ppenum);
-
-        [id(0x00000001), propget]
-        HRESULT Count([out, retval] long* plCount);
-    }
-
-    [
-      odl,
-      uuid(C7C3F5A4-88A3-11D0-ABCB-00A0C90FFFC0),
-      hidden,
-      dual,
-      nonextensible,
-      oleautomation
-    ]
-    interface IFile : IDispatch
-    {
-        [id(00000000), propget]
-        HRESULT Path([out, retval] BSTR* pbstrPath);
-
-        [id(0x000003e8), propget]
-        HRESULT Name([out, retval] BSTR* pbstrName);
-
-        [id(0x000003e8), propput]
-        HRESULT Name([in] BSTR pbstrName);
-
-        [id(0x000003ea), propget]
-        HRESULT ShortPath([out, retval] BSTR* pbstrPath);
-
-        [id(0x000003e9), propget]
-        HRESULT ShortName([out, retval] BSTR* pbstrName);
-
-        [id(0x000003ec), propget]
-        HRESULT Drive([out, retval] IDrive** ppdrive);
-
-        [id(0x000003ed), propget]
-        HRESULT ParentFolder([out, retval] IFolder** ppfolder);
-
-        [id(0x000003eb), propget]
-        HRESULT Attributes([out, retval] FileAttribute* pfa);
-
-        [id(0x000003eb), propput]
-        HRESULT Attributes([in] FileAttribute pfa);
-
-        [id(0x000003ee), propget]
-        HRESULT DateCreated([out, retval] DATE* pdate);
-
-        [id(0x000003ef), propget]
-        HRESULT DateLastModified([out, retval] DATE* pdate);
-
-        [id(0x000003f0), propget]
-        HRESULT DateLastAccessed([out, retval] DATE* pdate);
-
-        [id(0x000003f1), propget]
-        HRESULT Size([out, retval] VARIANT* pvarSize);
-
-        [id(0x000003f2), propget]
-        HRESULT Type([out, retval] BSTR* pbstrType);
-
-        [id(0x000004b0)]
-        HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force);
-
-        [id(0x000004b2)]
-        HRESULT Copy([in] BSTR Destination, [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles);
-
-        [id(0x000004b4)]
-        HRESULT Move([in] BSTR Destination);
-
-        [id(0x0000044c)]
-        HRESULT OpenAsTextStream([in, optional, defaultvalue(1)] IOMode IOMode,
-                        [in, optional, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts);
-    }
-
-    [
-      odl,
-      uuid(53BAD8C1-E718-11CF-893D-00A0C9054228),
-      hidden,
-      dual,
-      nonextensible,
-      oleautomation
-    ]
-    interface ITextStream : IDispatch
-    {
-        [id(0x00002710), propget]
-        HRESULT Line([out, retval] long* Line);
-
-        [id(0xfffffdef), propget]
-        HRESULT Column([out, retval] long* Column);
-
-        [id(0x00002712), propget]
-        HRESULT AtEndOfStream([out, retval] VARIANT_BOOL* EOS);
-
-        [id(0x00002713), propget]
-        HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL);
-
-        [id(0x00002714)]
-        HRESULT Read([in] long Characters, [out, retval] BSTR* Text);
-
-        [id(0x00002715)]
-        HRESULT ReadLine([out, retval] BSTR* Text);
-
-        [id(0x00002716)]
-        HRESULT ReadAll([out, retval] BSTR* Text);
-
-        [id(0x00002717)]
-        HRESULT Write([in] BSTR Text);
-
-        [id(0x00002718)]
-        HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text);
-
-        [id(0x00002719)]
-        HRESULT WriteBlankLines([in] long Lines);
-
-        [id(0x0000271a)]
-        HRESULT Skip([in] long Characters);
-
-        [id(0x0000271b)]
-        HRESULT SkipLine();
-
-        [id(0x0000271c)]
-        HRESULT Close();
     }
 
     [
@@ -565,7 +555,7 @@ library Scripting
     {
         [id(0x00004e20)]
         HRESULT GetStandardStream([in] StandardStreamTypes StandardStreamType,
-                        [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts);
+                        [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts);
 
         [id(0x00004e2a)]
         HRESULT GetFileVersion([in] BSTR FileName, [out, retval] BSTR* FileVersion);
@@ -579,7 +569,7 @@ library Scripting
     ]
     interface IScriptEncoder : IDispatch
     {
-        [id(00000000)]
+        [id(DISPID_VALUE)]
         HRESULT EncodeScriptFile([in] BSTR szExt, [in] BSTR bstrStreamIn, [in] long cFlags,
                         [in] BSTR bstrDefaultLang, [out, retval] BSTR* pbstrStreamOut);
     }