Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compensate for _Old_ intrinsic during SAL writableTo/readableTo capture #1016

Merged
merged 1 commit into from Jul 28, 2022

Conversation

riverar
Copy link
Collaborator

@riverar riverar commented Jul 28, 2022

Extends regular expression to correctly capture SAL_readableTo / SAL_writeableTo buffer size information if _Old_ intrinsic is in use (e.g. Name=SAL_readableTo; p1=byteCount(_Old_(cbKeyObject))).

Fixes: #1010

Metadata diff:

Windows.Win32.System.Com.Urlmon.IInternetHostSecurityManager.ProcessUrlAction : pPolicy : [Out] => [Out,NativeArrayInfo(CountParamIndex=2)]
Windows.Win32.Graphics.Dxgi.IDXGIDevice2.ReclaimResources : pDiscarded : [Optional,Out] => [Optional,Out,NativeArrayInfo(CountParamIndex=0)]
Windows.Win32.Graphics.Dxgi.IDXGIDevice4.ReclaimResources1 : pResults : [Out] => [Out,NativeArrayInfo(CountParamIndex=0)]
Windows.Win32.Security.Cryptography.Apis.BCryptGenerateSymmetricKey : pbKeyObject : [Optional,Out] => [Optional,Out,MemorySize(BytesParamIndex=3)]
Windows.Win32.Security.Cryptography.Apis.BCryptImportKey : pbKeyObject : [Optional,Out] => [Optional,Out,MemorySize(BytesParamIndex=5)]
Windows.Win32.Security.Cryptography.Apis.BCryptDuplicateKey : pbKeyObject : [Optional,Out] => [Optional,Out,MemorySize(BytesParamIndex=3)]
Windows.Win32.Security.Cryptography.Apis.BCryptCreateHash : pbHashObject : [Optional,Out] => [Optional,Out,MemorySize(BytesParamIndex=3)]
Windows.Win32.Security.Cryptography.Apis.BCryptFinishHash : pbOutput : [Out] => [Out,MemorySize(BytesParamIndex=2)]
Windows.Win32.Security.Cryptography.Apis.BCryptCreateMultiHash : pbHashObject : [Optional,Out] => [Optional,Out,MemorySize(BytesParamIndex=4)]
Windows.Win32.Security.Cryptography.Apis.BCryptDuplicateHash : pbHashObject : [Optional,Out] => [Optional,Out,MemorySize(BytesParamIndex=3)]
Windows.Win32.Security.Cryptography.Apis.BCryptHash : pbOutput : [Out] => [Out,MemorySize(BytesParamIndex=6)]
Windows.Win32.Security.Cryptography.Apis.CertGetIntendedKeyUsage : pbKeyUsage : [Out] => [Out,MemorySize(BytesParamIndex=3)]
Windows.Win32.UI.Shell.Apis.IStream_Read : pv : [Out] => [Out,MemorySize(BytesParamIndex=2)]
Windows.Win32.Globalization.Apis.ScriptLayout : piVisualToLogical : [Optional,Out] => [Optional,Out,NativeArrayInfo(CountParamIndex=0)]
Windows.Win32.Globalization.Apis.ScriptLayout : piLogicalToVisual : [Optional,Out] => [Optional,Out,NativeArrayInfo(CountParamIndex=0)]
Windows.Win32.Globalization.Apis.ScriptShape : pwLogClust : [Out] => [Out,NativeArrayInfo(CountParamIndex=3)]
Windows.Win32.Globalization.Apis.ScriptPlace : piAdvance : [Out] => [Out,NativeArrayInfo(CountParamIndex=3)]
Windows.Win32.Globalization.Apis.ScriptPlace : pGoffset : [Optional,Out] => [Optional,Out,NativeArrayInfo(CountParamIndex=3)]
Windows.Win32.Globalization.Apis.ScriptJustify : piJustify : [Out] => [Out,NativeArrayInfo(CountParamIndex=2)]
Windows.Win32.Globalization.Apis.ScriptBreak : psla : [Out] => [Out,NativeArrayInfo(CountParamIndex=1)]
Windows.Win32.Globalization.Apis.ScriptApplyLogicalWidth : piJustify : [Out] => [Out,NativeArrayInfo(CountParamIndex=2)]
Windows.Win32.Globalization.Apis.ScriptShapeOpenType : pwLogClust : [Out] => [Out,NativeArrayInfo(CountParamIndex=9)]
Windows.Win32.Globalization.Apis.ScriptShapeOpenType : pCharProps : [Out] => [Out,NativeArrayInfo(CountParamIndex=9)]
Windows.Win32.Globalization.Apis.ScriptPlaceOpenType : piAdvance : [Out] => [Out,NativeArrayInfo(CountParamIndex=14)]
Windows.Win32.Globalization.Apis.ScriptPlaceOpenType : pGoffset : [Out] => [Out,NativeArrayInfo(CountParamIndex=14)]
Windows.Win32.NetworkManagement.P2P.Apis.DrtGetEventData : pEventData : [Out] => [Out,MemorySize(BytesParamIndex=1)]
Windows.Win32.NetworkManagement.P2P.Apis.DrtGetSearchResult : pSearchResult : [Out] => [Out,MemorySize(BytesParamIndex=1)]
Windows.Win32.NetworkManagement.P2P.Apis.DrtGetSearchPath : pSearchPath : [Out] => [Out,MemorySize(BytesParamIndex=1)]
Windows.Win32.NetworkManagement.P2P.Apis.DrtGetInstanceName : pwzDrtInstanceName : [Out] => [Out,MemorySize(BytesParamIndex=1)]
Windows.Win32.UI.Shell.PropertiesSystem.Apis.SHPropStgReadMultiple : rgvar : [Out] => [Out,NativeArrayInfo(CountParamIndex=2)]
Windows.Win32.System.HostComputeNetwork.Apis.HcnEnumerateGuestNetworkPortReservations : PortEntries : [Out] => [Out,MemorySize(BytesParamIndex=0)]

@mikebattista mikebattista merged commit 2dc835d into microsoft:main Jul 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MemorySize attribute missing on BCryptGenerateSymmetricKey
2 participants