Skip to content
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

Misc fixes #14769

Merged
merged 4 commits into from Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/build-mac.sh
Expand Up @@ -11,7 +11,7 @@ arch -x86_64 /usr/local/bin/brew reinstall -f --build-from-source ffmpeg gnutls
arch -x86_64 /usr/local/bin/brew install llvm@16 glew cmake sdl2 vulkan-headers coreutils
arch -x86_64 /usr/local/bin/brew link -f llvm@16

# moltenvk based on commit for 1.2.5 release
# moltenvk based on commit for 1.2.6 release
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/4ac0cfaca4c2505abe2fcbcc0ce5816572103a6c/Formula/m/molten-vk.rb
arch -x86_64 /usr/local/bin/brew install -f --overwrite ./molten-vk.rb
#export MACOSX_DEPLOYMENT_TARGET=12.0
Expand Down
12 changes: 12 additions & 0 deletions rpcs3/Crypto/unzip.cpp
Expand Up @@ -18,6 +18,10 @@ std::vector<u8> unzip(const void* src, usz size)
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
int res = inflateInit2(&zs, 16 + 15);
if (res != Z_OK)
{
return {};
}
#ifndef _MSC_VER
#pragma GCC diagnostic pop
#endif
Expand Down Expand Up @@ -79,6 +83,10 @@ bool unzip(const void* src, usz size, fs::file& out)
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
int res = inflateInit(&strm);
if (res != Z_OK)
{
return false;
}
#ifndef _MSC_VER
#pragma GCC diagnostic pop
#endif
Expand Down Expand Up @@ -138,6 +146,10 @@ std::vector<u8> zip(const void* src, usz size)
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
int res = deflateInit2(&zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY);
if (res != Z_OK)
{
return {};
}
#ifndef _MSC_VER
#pragma GCC diagnostic pop
#endif
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/VFS.cpp
Expand Up @@ -1054,7 +1054,7 @@ bool vfs::host::unlink(const std::string& path, [[maybe_unused]] const std::stri
#endif
}

bool vfs::host::remove_all(const std::string& path, [[maybe_unused]] const std::string& dev_root, [[maybe_unused]] const lv2_fs_mount_point* mp, bool remove_root, bool lock)
bool vfs::host::remove_all(const std::string& path, [[maybe_unused]] const std::string& dev_root, [[maybe_unused]] const lv2_fs_mount_point* mp, bool remove_root, [[maybe_unused]] bool lock)
{
#ifdef _WIN32
if (remove_root)
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/flow_layout.cpp
Expand Up @@ -164,7 +164,7 @@ QSize flow_layout::sizeHint() const
QSize flow_layout::minimumSize() const
{
QSize size;
for (const QLayoutItem* item : qAsConst(itemList))
for (const QLayoutItem* item : itemList)
{
if (item)
{
Expand Down