From 0e90cebce0ed901828eedffce2a8397e3ddb8b34 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Tue, 18 Mar 2014 07:53:42 +0400
Subject: [PATCH] msi: 'optional' only applies to VARIANT and VARIANT* types.

---
 dlls/msi/msiserver.idl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl
index f2850052faa..f351ab1bff0 100644
--- a/dlls/msi/msiserver.idl
+++ b/dlls/msi/msiserver.idl
@@ -251,14 +251,14 @@ library WindowsInstaller
         [id(DISPID_INSTALLER_OPENPACKAGE)]
             Session* OpenPackage(
                 [in] VARIANT PackagePath,
-                [in, optional, defaultvalue(0)] long Options);
+                [in, defaultvalue(0)] long Options);
         [id(DISPID_INSTALLER_OPENPRODUCT)]
             Session* OpenProduct(
                 [in] BSTR ProductCode);
         [id(DISPID_INSTALLER_SUMMARYINFORMATION)]
             SummaryInfo* SummaryInformation(
                 [in] BSTR PackagePath,
-                [in, optional, defaultvalue(0)] long UpdateCount);
+                [in, defaultvalue(0)] long UpdateCount);
         [id(DISPID_INSTALLER_OPENDATABASE)]
             Database *OpenDatabase(
                     [in] BSTR DatabasePath,
@@ -270,7 +270,7 @@ library WindowsInstaller
         [id(DISPID_INSTALLER_INSTALLPRODUCT)]
             void InstallProduct(
                 [in] BSTR PackagePath,
-                [in, optional, defaultvalue("0")] BSTR PropertyValues);
+                [in, defaultvalue("0")] BSTR PropertyValues);
         [id(DISPID_INSTALLER_VERSION)]
             BSTR Version();
         [id(DISPID_INSTALLER_LASTERRORRECORD)]
@@ -393,7 +393,7 @@ library WindowsInstaller
         properties:
         methods:
         [id(DISPID_VIEW_EXECUTE)]
-            void Execute([in, optional, defaultvalue(0)] Record *Params);
+            void Execute([in, defaultvalue(0)] Record *Params);
         [id(DISPID_VIEW_FETCH)]
             Record* Fetch();
         [id(DISPID_VIEW_MODIFY)]
@@ -412,7 +412,7 @@ library WindowsInstaller
         [id(DISPID_DATABASE_OPENVIEW)]
             View* OpenView([in] BSTR Sql);
         [id(DISPID_DATABASE_SUMMARYINFORMATION), propget]
-            SummaryInfo *SummaryInformation([in, optional, defaultvalue(0)] long UpdateCount);
+            SummaryInfo *SummaryInformation([in, defaultvalue(0)] long UpdateCount);
     }
 
     typedef enum {