-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Fix: Removed GPL code from FilesLauncher #11509
Conversation
Isn't there any regression to this change? |
Oppps. Sorry for being irresponsible. We have to discuss this part. This was the problem code that reference to the GPL code and I commented out. I pretty sure that they can be removed safely... src/Files.OpenDialog/FilesLauncher/OpenInFolder.cpp
HRESULT OpenInFolder::NotifyShellOfNavigation(PCIDLIST_ABSOLUTE pidl)
{
...
RETURN_IF_FAILED(m_shellWindows->RegisterPending(GetCurrentThreadId(), &pidlVariant, &empty,
SWC_BROWSER, &m_shellWindowCookie));
auto document = winrt::make_self<DocumentServiceProvider>();
auto shellView = winrt::make_self<ShellView>(this, pidl);
document->RegisterService(IID_IFolderView, shellView.get());
auto browserApp = winrt::make_self<WebBrowserApp>(m_hwnd, document.get());
long registeredCookie;
#pragma warning(push)
#pragma warning( \
disable : 4311 4302) // 'reinterpret_cast': pointer truncation from 'HWND' to 'long',
// 'reinterpret_cast': truncation from 'HWND' to 'long'
RETURN_IF_FAILED(m_shellWindows->Register(browserApp.get(), reinterpret_cast<long>(m_hwnd),
SWC_BROWSER, ®isteredCookie));
#pragma warning(pop)
...
return S_OK;
} |
I have tested it. It seems to work well except highlighting a file as noted here. |
Can you fix the merge conflict? |
Done here. requesting a new review. |
@onein528 Could you merge the main branch and build FilesLauncher again? The file FilesLauncher.exe.sha256 should be generated. |
I'll be able to work on that the next week |
@hishitetsu What did you say before on Discord? I remember a bit you were talking about unneeded codes. |
About this. |
How can I fix this conflict Btw, Ready for review. |
FilesystemOperationDialog.xaml is modified in #11557, so you can import the one in the main branch. |
If you say about FilesLauncher.exe, you can import the one in your branch, merge the upstream, then build FilesLauncher again. |
@hishitetsu Thank you:) FYI Finally! @yaira2 Ready for review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Description
I found the codes licensed under the GPL v3, though this whole project is licensed MIT license.
Motivation and Context
GPL code cannot be existed in Files.
NOTE CONTRIBUTORS: Even if you want to revert changes, you definitely should not. Please find another way.
Tasks
Validation