Change to JackTools::GetUID() on Windows that fixes metadata#991
Open
kinggeek wants to merge 1 commit intojackaudio:developfrom
Open
Change to JackTools::GetUID() on Windows that fixes metadata#991kinggeek wants to merge 1 commit intojackaudio:developfrom
kinggeek wants to merge 1 commit intojackaudio:developfrom
Conversation
creating a new BDB on every API call. JackTools::GetUID() would return the PID of the calling process. (I think this was a stub because there is no Windows equivalent). The linux version appears to return a linux UID. This patch does something similar on Windows so as to create/open the same DB on Windows.
imaami
suggested changes
Dec 25, 2024
Contributor
imaami
left a comment
imaami
left a comment
There was a problem hiding this comment.
A few things should be fixed. For completeness' sake here's my suggestion:
int JackTools::GetUID()
{
#ifdef WIN32
int id = 0;
HANDLE tokenHandle = nullptr;
if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &tokenHandle)) {
TOKEN_STATISTICS tokenStats{};
DWORD len = sizeof tokenStats;
if (GetTokenInformation(tokenHandle, TokenStatistics,
&tokenStats, sizeof tokenStats, &len)) {
id = static_cast<int>(tokenStats.AuthenticationId.LowPart);
}
CloseHandle(tokenHandle);
}
return id;
#else
return geteuid();
#endif
}| } | ||
|
|
||
| TOKEN_STATISTICS tokenStats; | ||
| DWORD returnLength; |
Contributor
There was a problem hiding this comment.
Initialize tokenStats and returnLength:
TOKEN_STATISTICS tokenStats{};
DWORD returnLength = sizeof tokenStats;| TOKEN_STATISTICS tokenStats; | ||
| DWORD returnLength; | ||
| if (!GetTokenInformation(tokenHandle, TokenStatistics, &tokenStats, sizeof(tokenStats), &returnLength)) { | ||
| CloseHandle(tokenHandle); |
Contributor
There was a problem hiding this comment.
You're only closing the handle if GetTokenInformation() succeeds, it should be closed every time.
| return 0; | ||
| } | ||
|
|
||
| return(tokenStats.AuthenticationId.LowPart); |
Contributor
There was a problem hiding this comment.
Nitpick: return is not a function call, don't make it look like one.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change to JackTools::GetUID() on Windows that fixes metadata creating a new BDB on every API call.
JackTools::GetUID() would return the PID of the calling process. (I think this was a stub because there is no Windows equivalent). The linux version appears to return a linux UID. This patch does something similar on Windows so as to create/open the same DB on Windows and metadata now works correctly.