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.

Sign up for GitHub

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

Jump to bottom

Adding export to WinGetUtil.dll to expose Version comparing #652

Merged
merged 2 commits into from
Nov 26, 2020
Merged

Adding export to WinGetUtil.dll to expose Version comparing #652

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df039b
Adding export to WinGetUtil.dll to expose Version comparing
palenshus Nov 24, 2020
db8a201
PR feedback
palenshus Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/WinGetUtil/Exports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,21 @@ extern "C"
return S_OK;
}
CATCH_RETURN()

WINGET_UTIL_API WinGetCompareVersions(
WINGET_STRING versionA,
WINGET_STRING versionB,
INT* comparisonResult) try
{
THROW_HR_IF(E_INVALIDARG, !versionA);
THROW_HR_IF(E_INVALIDARG, !versionB);

Version vA{ ConvertToUTF8(versionA) };
Version vB{ ConvertToUTF8(versionB) };

*comparisonResult = vA < vB ? -1 : vA == vB ? 0 : 1;
palenshus marked this conversation as resolved.
Show resolved Hide resolved

return S_OK;
}
CATCH_RETURN()
}
1 change: 1 addition & 0 deletions src/WinGetUtil/Source.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ EXPORTS
WinGetSQLiteIndexCheckConsistency
WinGetValidateManifest
WinGetDownload
WinGetCompareVersions
6 changes: 6 additions & 0 deletions src/WinGetUtil/WinGetUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,10 @@ extern "C"
WINGET_STRING filePath,
BYTE* sha256Hash,
UINT32 sha256HashLength);

// Compares two version strings, returning -1 if versionA is less than versionB, 0 if they're equal, or 1 if versionA is greater than versionB
WINGET_UTIL_API WinGetCompareVersions(
WINGET_STRING versionA,
WINGET_STRING versionB,
INT* comparisonResult);
}
2 changes: 1 addition & 1 deletion src/WinGetUtil/WinGetUtil.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<ModuleDefinitionFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Source.def</ModuleDefinitionFile>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">version.lib;wininet.lib;shell32.lib;winsqlite3.lib;shlwapi.lib;icuuc.lib;icuin.lib;urlmon.lib;Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
palenshus marked this conversation as resolved.
Show resolved Hide resolved
<DelayLoadDLLs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">winsqlite3.dll;icuuc.dll;icuin.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">winsqlite3.dll;icuuc.dll;icuin.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<DelayLoadDLLs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">winsqlite3.dll;icuuc.dll;icuin.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
Expand Down