As per rpcsal.h, deref_opt means input optional but deref_***_opt doe…

…sn't Fixes #805 Fixes #820
microsoft · Mar 14, 2022 · a0546c2 · a0546c2
1 parent 23ffb78
commit a0546c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd
diff --git a/scripts/CommonUtils.ps1 b/scripts/CommonUtils.ps1
@@ -91,7 +91,7 @@ function Install-BuildTools
     & dotnet build "$rootDir\buildtools" -c Release
     ThrowOnNativeProcessError
 
-    Update-VsInstallDir
+    Install-VsDevShell
 }
 
 function Replace-Text
@@ -191,22 +191,8 @@ function Get-VcDirPath
     return $null
 }
 
-function Update-VsInstallDir
-{
-    if (!$env:VSINSTALLDIR)
-    {
-        Install-VsDevShell
-        #$vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
-        #$dir = & $vswhere -latest -property installationPath
-
-        #$env:VSINSTALLDIR = $dir + "\"
-    }
-}
-
 function Install-VsDevShell
 {
-    #$env:VSINSTALLDIR = $null
-
     if (!$env:VSINSTALLDIR)
     {
         $currentDir = Get-Location

diff --git a/sources/ClangSharpSourceToWinmd/MetadataSyntaxTreeCleaner.cs b/sources/ClangSharpSourceToWinmd/MetadataSyntaxTreeCleaner.cs
@@ -779,12 +779,17 @@ private SyntaxNode CreateAttributeListForSal(AttributeListSyntax cppAttrList)
                         else if (salAttr.P1.StartsWith("__RPC__"))
                         {
                             // TODO: Handle ecount, xcount and others that deal with counts
+                            bool deref = false;
 
                             string[] parts = salAttr.P1.Split('_');
                             foreach (var part in parts)
                             {
                                 switch (part)
                                 {
+                                    case "deref":
+                                        deref = true;
+                                        break;
+
                                     case "in":
                                         isIn = true;
                                         break;
@@ -798,6 +803,12 @@ private SyntaxNode CreateAttributeListForSal(AttributeListSyntax cppAttrList)
                                         break;
 
                                     case "opt":
+                                        // As per rpcsal.h, deref_opt means input optional but deref_***_opt doesn't
+                                        if (deref && (isIn || isOut))
+                                        {
+                                            continue;
+                                        }
+
                                         isOpt = true;
                                         break;
                                 }