diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp index 9f53823905..ca4dfd0555 100644 --- a/Common/Net/Resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -303,4 +303,7 @@ int inet_pton(int af, const char* src, void* dst) return 1; } +// Structs for implementing DNS are available here: +// Based on https://web.archive.org/web/20201204080751/https://www.binarytides.com/dns-query-code-in-c-with-winsock/ + } // namespace net diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index dd9644a494..4245e7714e 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -1396,8 +1396,8 @@ int SavedataParam::GetFilesList(SceUtilitySavedataParam *param, u32 requestAddr) INFO_LOG(Log::sceUtility, "%s: mode %08x, ctime: %s, atime: %s, mtime: %s", info.name, info.st_mode, FmtPspTime(info.st_ctime).c_str(), FmtPspTime(info.st_atime).c_str(), FmtPspTime(info.st_mtime).c_str()); } - } else { - WARN_LOG(Log::sceUtility, "Invalid normalEntries pointer"); + } else if (fileList->resultNumNormalEntries > 0) { + WARN_LOG(Log::sceUtility, "Invalid normalEntries pointer (%d entries)", fileList->resultNumNormalEntries); } // TODO: Log system and secure entries? } diff --git a/Core/HLE/NetInetConstants.h b/Core/HLE/NetInetConstants.h index 073a5336a9..8ecc1c0783 100644 --- a/Core/HLE/NetInetConstants.h +++ b/Core/HLE/NetInetConstants.h @@ -229,7 +229,7 @@ enum { #define ERROR_INET_EINTR 4 // Interrupted system call #define ERROR_INET_EBADF 9 //0x09 // Or was it 0x80010009 (SCE_ERROR_ERRNO_EBADF/SCE_KERNEL_ERROR_ERRNO_INVALID_FILE_DESCRIPTOR) ? #define ERROR_INET_EAGAIN 11 //0x0B // Or was it 0x8001000B (SCE_ERROR_ERRNO_EAGAIN) ? -#define ERROR_INET_EWOULDBLOCK EAGAIN // Operation would block +#define ERROR_INET_EWOULDBLOCK ERROR_INET_EAGAIN // Operation would block #define ERROR_INET_EACCES 13 // Permission denied #define ERROR_INET_EFAULT 14 // Bad address #define ERROR_INET_EINVAL 22 // Invalid argument diff --git a/Core/HLE/sceNetInet.h b/Core/HLE/sceNetInet.h index 25496e4a35..655bd0ccce 100644 --- a/Core/HLE/sceNetInet.h +++ b/Core/HLE/sceNetInet.h @@ -117,53 +117,6 @@ typedef struct InetSocket { #pragma pack(pop) #endif -// ----------------- DNS Header ----------------------------- -// Based on https://web.archive.org/web/20201204080751/https://www.binarytides.com/dns-query-code-in-c-with-winsock/ -typedef struct -{ - unsigned short id; // identification number - unsigned char rd : 1; // recursion desired - unsigned char tc : 1; // truncated message - unsigned char aa : 1; // authoritive answer - unsigned char opcode : 4; // purpose of message - unsigned char qr : 1; // query/response flag - unsigned char rcode : 4; // response code - unsigned char cd : 1; // checking disabled - unsigned char ad : 1; // authenticated data - unsigned char z : 1; // its z! reserved - unsigned char ra : 1; // recursion available - unsigned short q_count; // number of question entries - unsigned short ans_count; // number of answer entries - unsigned short auth_count; // number of authority entries - unsigned short add_count; // number of resource entries -} DNS_HEADER; - -typedef struct -{ - unsigned short qtype; - unsigned short qclass; -} QUESTION; - -typedef struct -{ - unsigned short type; - unsigned short _class; - unsigned int ttl; - unsigned short data_len; -} R_DATA; - -typedef struct -{ - unsigned char* name; - R_DATA* resource; - unsigned char* rdata; -} RES_RECORD; - -typedef struct -{ - unsigned char* name; - QUESTION* ques; -} QUERY; // --------------------------------------------------------- class PointerWrap; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 33ebd3e1e7..58c82a74e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip android.useAndroidX=true android.enableJetifier=true