mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2024-12-28 02:26:07 +00:00
use ComPtr in gui_context_menus.h (#719)
Some checks are pending
Build and Release / reuse (push) Waiting to run
Build and Release / clang-format (push) Waiting to run
Build and Release / get-info (push) Waiting to run
Build and Release / windows-sdl (push) Blocked by required conditions
Build and Release / windows-qt (push) Blocked by required conditions
Build and Release / macos-sdl (push) Blocked by required conditions
Build and Release / macos-qt (push) Blocked by required conditions
Build and Release / linux-sdl (push) Blocked by required conditions
Build and Release / linux-qt (push) Blocked by required conditions
Build and Release / pre-release (push) Blocked by required conditions
Some checks are pending
Build and Release / reuse (push) Waiting to run
Build and Release / clang-format (push) Waiting to run
Build and Release / get-info (push) Waiting to run
Build and Release / windows-sdl (push) Blocked by required conditions
Build and Release / windows-qt (push) Blocked by required conditions
Build and Release / macos-sdl (push) Blocked by required conditions
Build and Release / macos-qt (push) Blocked by required conditions
Build and Release / linux-sdl (push) Blocked by required conditions
Build and Release / linux-qt (push) Blocked by required conditions
Build and Release / pre-release (push) Blocked by required conditions
* use ComPtr in gui_context_menus.h * fix pragma diagnostic * fix compiler warnings
This commit is contained in:
parent
45e206e248
commit
5a4d5b9f31
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -387,6 +387,8 @@ FodyWeavers.xsd
|
|||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
*.code-workspace
|
||||
/CMakeUserPresets.json
|
||||
/compile_commands.json
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
|
|
@ -679,7 +679,7 @@ void CheatsPatches::downloadPatches(const QString repository, const bool showMes
|
|||
request.setRawHeader("Accept", "application/vnd.github.v3+json");
|
||||
QNetworkReply* reply = manager->get(request);
|
||||
|
||||
connect(reply, &QNetworkReply::finished, [=]() {
|
||||
connect(reply, &QNetworkReply::finished, [=, this]() {
|
||||
if (reply->error() == QNetworkReply::NoError) {
|
||||
QByteArray jsonData = reply->readAll();
|
||||
reply->deleteLater();
|
||||
|
@ -712,7 +712,7 @@ void CheatsPatches::downloadPatches(const QString repository, const bool showMes
|
|||
QNetworkRequest fileRequest(downloadUrl);
|
||||
QNetworkReply* fileReply = manager->get(fileRequest);
|
||||
|
||||
connect(fileReply, &QNetworkReply::finished, [=]() {
|
||||
connect(fileReply, &QNetworkReply::finished, [=, this]() {
|
||||
if (fileReply->error() == QNetworkReply::NoError) {
|
||||
QByteArray fileData = fileReply->readAll();
|
||||
QFile localFile(dir.filePath(fileName));
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include <objbase.h>
|
||||
#include <shlguid.h>
|
||||
#include <shobjidl.h>
|
||||
#include <wrl/client.h>
|
||||
#endif
|
||||
#include "common/path_util.h"
|
||||
|
||||
|
@ -342,9 +343,9 @@ private:
|
|||
CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
|
||||
|
||||
// Create the ShellLink object
|
||||
IShellLink* pShellLink = nullptr;
|
||||
Microsoft::WRL::ComPtr<IShellLink> pShellLink;
|
||||
HRESULT hres = CoCreateInstance(CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER,
|
||||
IID_IShellLink, (LPVOID*)&pShellLink);
|
||||
IID_PPV_ARGS(&pShellLink));
|
||||
if (SUCCEEDED(hres)) {
|
||||
// Defines the path to the program executable
|
||||
pShellLink->SetPath((LPCWSTR)exePath.utf16());
|
||||
|
@ -360,13 +361,11 @@ private:
|
|||
pShellLink->SetIconLocation((LPCWSTR)iconPath.utf16(), 0);
|
||||
|
||||
// Save the shortcut
|
||||
IPersistFile* pPersistFile = nullptr;
|
||||
hres = pShellLink->QueryInterface(IID_IPersistFile, (LPVOID*)&pPersistFile);
|
||||
Microsoft::WRL::ComPtr<IPersistFile> pPersistFile;
|
||||
hres = pShellLink.As(&pPersistFile);
|
||||
if (SUCCEEDED(hres)) {
|
||||
hres = pPersistFile->Save((LPCWSTR)linkPath.utf16(), TRUE);
|
||||
pPersistFile->Release();
|
||||
}
|
||||
pShellLink->Release();
|
||||
}
|
||||
|
||||
CoUninitialize();
|
||||
|
|
|
@ -9,10 +9,7 @@
|
|||
#include "video_core/renderer_vulkan/vk_platform.h"
|
||||
#include "video_core/renderer_vulkan/vk_scheduler.h"
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnullability-completeness"
|
||||
#include <vk_mem_alloc.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace VideoCore {
|
||||
|
||||
|
|
|
@ -12,10 +12,7 @@
|
|||
#include "video_core/renderer_vulkan/vk_rasterizer.h"
|
||||
#include "video_core/texture_cache/image.h"
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnullability-completeness"
|
||||
#include <vk_mem_alloc.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace Vulkan {
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
// Implement vma functions
|
||||
#define VMA_IMPLEMENTATION
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnullability-completeness"
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wnullability-completeness"
|
||||
#include <vk_mem_alloc.h>
|
||||
#pragma GCC diagnostic pop
|
||||
#pragma clang diagnostic pop
|
||||
|
||||
// Store the dispatch loader here
|
||||
VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
|
||||
|
|
|
@ -14,10 +14,7 @@
|
|||
#include "video_core/renderer_vulkan/vk_instance.h"
|
||||
#include "video_core/renderer_vulkan/vk_platform.h"
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnullability-completeness"
|
||||
#include <vk_mem_alloc.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace Vulkan {
|
||||
|
||||
|
|
|
@ -8,10 +8,7 @@
|
|||
#include "video_core/renderer_vulkan/vk_scheduler.h"
|
||||
#include "video_core/texture_cache/image.h"
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnullability-completeness"
|
||||
#include <vk_mem_alloc.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace VideoCore {
|
||||
|
||||
|
|
|
@ -15,10 +15,7 @@
|
|||
|
||||
#include <boost/container/static_vector.hpp>
|
||||
#include <magic_enum.hpp>
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wnullability-completeness"
|
||||
#include <vk_mem_alloc.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace VideoCore {
|
||||
|
||||
|
|
Loading…
Reference in a new issue