early-access version 3910

src/core/hle/kernel/k_memory_layout.cpp

@@ -61,7 +61,7 @@ bool KMemoryRegionTree::Insert(u64 address, size_t size, u32 type_id, u32 new_at
         found->Reset(address, inserted_region_last, old_pair, new_attr, type_id);
         this->insert(*found);
     } else {
-        // If we can't re-use, adjust the old region.
+        // If we can't reuse, adjust the old region.
         found->Reset(old_address, address - 1, old_pair, old_attr, old_type);
         this->insert(*found);
 

src/core/hle/service/am/am.cpp

@@ -786,7 +786,9 @@ void ILockAccessor::TryLock(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto return_handle = rp.Pop<bool>();
 
-    LOG_INFO(Service_AM, "called, return_handle={}", return_handle);
+    LOG_WARNING(Service_AM, "(STUBBED) called, return_handle={}", return_handle);
+
+    // TODO: When return_handle is true this function should return the lock handle
 
     is_locked = true;
 
@@ -796,7 +798,7 @@ void ILockAccessor::TryLock(HLERequestContext& ctx) {
 }
 
 void ILockAccessor::Unlock(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "called");
+    LOG_INFO(Service_AM, "called");
 
     is_locked = false;
 
@@ -805,7 +807,7 @@ void ILockAccessor::Unlock(HLERequestContext& ctx) {
 }
 
 void ILockAccessor::GetEvent(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "called");
+    LOG_INFO(Service_AM, "called");
 
     lock_event->Signal();
 
@@ -815,7 +817,7 @@ void ILockAccessor::GetEvent(HLERequestContext& ctx) {
 }
 
 void ILockAccessor::IsLocked(HLERequestContext& ctx) {
-    LOG_WARNING(Service_AM, "called");
+    LOG_INFO(Service_AM, "called");
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);

src/core/hle/service/caps/caps_a.cpp

@@ -40,7 +40,7 @@ IAlbumAccessorService::IAlbumAccessorService(Core::System& system_)
         {0, nullptr, "GetAlbumFileCount"},
         {1, nullptr, "GetAlbumFileList"},
         {2, nullptr, "LoadAlbumFile"},
-        {3,  &IAlbumAccessorService::DeleteAlbumFile, "DeleteAlbumFile"},
+        {3, &IAlbumAccessorService::DeleteAlbumFile, "DeleteAlbumFile"},
         {4, nullptr, "StorageCopyAlbumFile"},
         {5, &IAlbumAccessorService::IsAlbumMounted, "IsAlbumMounted"},
         {6, nullptr, "GetAlbumUsage"},
@@ -282,8 +282,8 @@ Result IAlbumAccessorService::GetAlbumEntry(AlbumEntry& out_entry,
     std::getline(line_stream, date, '_');
     std::getline(line_stream, time, '_');
 
-    std::istringstream line_stream2(date);
-    std::istringstream line_stream3(time);
+    std::istringstream date_stream(date);
+    std::istringstream time_stream(time);
     std::string year;
     std::string month;
     std::string day;
@@ -291,13 +291,13 @@ Result IAlbumAccessorService::GetAlbumEntry(AlbumEntry& out_entry,
     std::string minute;
     std::string second;
 
-    std::getline(line_stream2, year, '-');
-    std::getline(line_stream2, month, '-');
-    std::getline(line_stream2, day, '-');
+    std::getline(date_stream, year, '-');
+    std::getline(date_stream, month, '-');
+    std::getline(date_stream, day, '-');
 
-    std::getline(line_stream3, hour, '-');
-    std::getline(line_stream3, minute, '-');
-    std::getline(line_stream3, second, '-');
+    std::getline(time_stream, hour, '-');
+    std::getline(time_stream, minute, '-');
+    std::getline(time_stream, second, '-');
 
     try {
         out_entry = {

src/core/hle/service/caps/caps_a.h

@@ -39,7 +39,7 @@ private:
     enum class ScreenShotOrientation : u32 {
         None,
         Rotate90,
-        Rotat180,
+        Rotate180,
         Rotate270,
     };
 
@@ -50,6 +50,7 @@ private:
         u32 unknown_2;
         INSERT_PADDING_BYTES(0x30);
     };
+    static_assert(sizeof(ScreenShotAttribute) == 0x40, "ScreenShotAttribute is an invalid size");
 
     struct ScreenShotDecodeOption {
         ScreenShotDecoderFlag flags;