Skip to content

Support the format returned by StringFromGUID2 in guid.parse. #1109

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

Merged
kennykerr merged 3 commits into from
Feb 24, 2022
Merged

Support the format returned by StringFromGUID2 in guid.parse. #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df7de51
Support the format returned by StringFromGUID2.
jlaanstra Feb 24, 2022
a818c9c
Fix.
jlaanstra Feb 24, 2022
8948148
Merge branch 'master' into user/jlaans/guid
kennykerr Feb 24, 2022
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
9 changes: 8 additions & 1 deletion strings/base_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,15 @@ WINRT_EXPORT namespace winrt
private:

template <typename TStringView>
static constexpr guid parse(TStringView const value)
static constexpr guid parse(TStringView value)
{
// Handle {} and ()
if (value.size() == 38 && ((value[0] == '{' && value[37] == '}') || (value[0] == '(' && value[37] == ')')))
{
value.remove_prefix(1);
value.remove_suffix(1);
}

if (value.size() != 36 || value[8] != '-' || value[13] != '-' || value[18] != '-' || value[23] != '-')
{
throw std::invalid_argument("value is not a valid GUID string");
Expand Down
3 changes: 2 additions & 1 deletion test/test/guid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ TEST_CASE("guid")

REQUIRE(winrt::guid("00112233-4455-6677-8899-aabbccddeeff") == expected);
REQUIRE(winrt::guid({ "{00112233-4455-6677-8899-aabbccddeeff}" + 1, 36 }) == expected);
REQUIRE(winrt::guid("{00112233-4455-6677-8899-aabbccddeeff}") == expected);
REQUIRE(winrt::guid("(00112233-4455-6677-8899-aabbccddeeff)") == expected);

REQUIRE_THROWS_AS(winrt::guid(""), std::invalid_argument);
REQUIRE_THROWS_AS(winrt::guid("not a guid"), std::invalid_argument);
REQUIRE_THROWS_AS(winrt::guid("same length string that's not a guid"), std::invalid_argument);
REQUIRE_THROWS_AS(winrt::guid("too long string that's also not a guid"), std::invalid_argument);
REQUIRE_THROWS_AS(winrt::guid("00112233-4455-6677-8899-aabbccddeeff with extra"), std::invalid_argument);
REQUIRE_THROWS_AS(winrt::guid("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"), std::invalid_argument);
REQUIRE_THROWS_AS(winrt::guid("{00112233-4455-6677-8899-aabbccddeeff}"), std::invalid_argument);

// Verify that you can constexpr-construct a guid from a GUID.
constexpr winrt::guid from_abi_guid = GUID{ 0x00112233, 0x4455, 0x6677, { 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff } };
Expand Down