From fde72a13b4212bfb844a5e79842046f11d2b7d84 Mon Sep 17 00:00:00 2001 From: Mike Battista <13860912+mikebattista@users.noreply.github.com> Date: Thu, 9 Mar 2023 13:09:18 -0800 Subject: [PATCH] Fixed #1260. --- scripts/ChangesSinceLastRelease.txt | 12 ++++++++++++ .../MetadataSyntaxTreeCleaner.cs | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt index 1b3e84766..703d10892 100644 --- a/scripts/ChangesSinceLastRelease.txt +++ b/scripts/ChangesSinceLastRelease.txt @@ -4050,3 +4050,15 @@ Windows.Win32.UI.Shell.Apis.SHGetDiskFreeSpaceExW : pulTotalNumberOfFreeBytes... Windows.Win32.UI.Shell.IFileSystemBindData2.GetFileID : pliFileID...LARGE_INTEGER* => Int64* Windows.Win32.UI.Shell.IFileSystemBindData2.SetFileID : liFileID...LARGE_INTEGER => Int64 Windows.Win32.UI.WindowsAndMessaging.DEVICE_EVENT_EXTERNAL_REQUEST.SystemTime...Windows.Win32.Foundation.LARGE_INTEGER => System.Int64 +# Fixed #1260. +Windows.Win32.Devices.Display.Apis.QueryDisplayConfig : currentTopologyId : [Optional,Out] => [In,Optional,Out] +Windows.Win32.Media.Audio.DirectSound.Apis.DirectSoundCaptureCreate : pUnkOuter : [In] => [In,Optional] +Windows.Win32.Media.Audio.DirectSound.Apis.DirectSoundCaptureCreate8 : pUnkOuter : [In] => [In,Optional] +Windows.Win32.Media.Audio.DirectSound.Apis.DirectSoundCreate : pUnkOuter : [Optional] => [In,Optional] +Windows.Win32.Media.Audio.DirectSound.Apis.DirectSoundCreate8 : pUnkOuter : [In] => [In,Optional] +Windows.Win32.Media.Audio.DirectSound.Apis.DirectSoundFullDuplexCreate : pUnkOuter : [In] => [In,Optional] +Windows.Win32.Media.Audio.DirectSound.IDirectSound.CreateSoundBuffer : pUnkOuter : [Optional] => [In,Optional] +Windows.Win32.Media.Audio.DirectSound.IDirectSoundCapture.CreateCaptureBuffer : pUnkOuter : [In] => [In,Optional] +Windows.Win32.UI.HiDpi.Apis.SystemParametersInfoForDpi : pvParam : [In,Optional] => [In,Optional,Out] +Windows.Win32.UI.WindowsAndMessaging.Apis.SystemParametersInfoA : pvParam : [In,Optional] => [In,Optional,Out] +Windows.Win32.UI.WindowsAndMessaging.Apis.SystemParametersInfoW : pvParam : [In,Optional] => [In,Optional,Out] diff --git a/sources/ClangSharpSourceToWinmd/MetadataSyntaxTreeCleaner.cs b/sources/ClangSharpSourceToWinmd/MetadataSyntaxTreeCleaner.cs index 02f5bc758..a3c033b3b 100644 --- a/sources/ClangSharpSourceToWinmd/MetadataSyntaxTreeCleaner.cs +++ b/sources/ClangSharpSourceToWinmd/MetadataSyntaxTreeCleaner.cs @@ -854,12 +854,12 @@ private SyntaxNode CreateAttributeListForSal(AttributeListSyntax cppAttrList) break; } - else if (salAttr.P1 == "_Maybenull_" || salAttr.P1 == "_Pre_maybenull_") + else if (salAttr.P1 == "_Maybenull_" || salAttr.P1 == "_Pre_maybenull_" || salAttr.P1 == "_Pre_null_") { isIn = true; isOpt = true; - break; + continue; } if (salAttr.P1.Contains("_opt"))