Skip to content

[Windows] Remove Fallback Path with Loading Bundles #2540

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
merged 1 commit into from
Jan 14, 2020
Merged

[Windows] Remove Fallback Path with Loading Bundles #2540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 9 deletions CoreFoundation/PlugIn.subproj/CFBundle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,15 +707,6 @@ static CFBundleRef _CFBundleCreate(CFAllocatorRef allocator, CFURLRef bundleURL,
localVersion = _CFBundleGetBundleVersionForURL(newURL);
if (localVersion == 3) {
SInt32 res = _CFGetPathProperties(allocator, (char *)buff, &exists, &mode, NULL, NULL, NULL, NULL);
#if TARGET_OS_WIN32
if (!(res == 0 && exists && ((mode & S_IFMT) == S_IFDIR))) {
// 2nd chance at finding a bundle path - remove the last path component (e.g., mybundle.resources) and try again
CFURLRef shorterPath = CFURLCreateCopyDeletingLastPathComponent(allocator, newURL);
CFRelease(newURL);
newURL = shorterPath;
res = _CFGetFileProperties(allocator, newURL, &exists, &mode, NULL, NULL, NULL, NULL);
}
#endif
if (res == 0) {
if (!exists || ((mode & S_IFMT) != S_IFDIR)) {
CFRelease(newURL);
Expand Down