diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2016-03-30 15:07:35 +0100 |
|---|---|---|
| committer | iCatButler <i.am.catbutler@gmail.com> | 2016-03-30 15:07:35 +0100 |
| commit | 8b4350fee747708ffd376744ef5dc1e239a87ba6 (patch) | |
| tree | a9ab6e2f25e06edc7c668353f8000856704f7fa3 /macosx/Pcsxr-QL | |
| parent | e3df273095a5800e3dcdcb63bd66e269c0c2d3a8 (diff) | |
| download | pcsxr-8b4350fee747708ffd376744ef5dc1e239a87ba6.tar.gz | |
Bring up to date with PCSX-R master (97809)
Diffstat (limited to 'macosx/Pcsxr-QL')
| -rw-r--r-- | macosx/Pcsxr-QL/GeneratePreviewForURL.m | 4 | ||||
| -rw-r--r-- | macosx/Pcsxr-QL/PSXMemEnumerator.m | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/macosx/Pcsxr-QL/GeneratePreviewForURL.m b/macosx/Pcsxr-QL/GeneratePreviewForURL.m index 7076b380..d755ca95 100644 --- a/macosx/Pcsxr-QL/GeneratePreviewForURL.m +++ b/macosx/Pcsxr-QL/GeneratePreviewForURL.m @@ -118,7 +118,7 @@ static OSStatus GeneratePreviewForMemCard(void *thisInterface, QLPreviewRequestR NSDictionary *imgProps = @{(NSString *)kQLPreviewPropertyAttachmentDataKey: pngData, (NSString *)kQLPreviewPropertyMIMETypeKey: @"image/png"}; NSString *imgName = [[@(i++) stringValue] stringByAppendingPathExtension:@"png"]; - [htmlStr appendFormat:@"\t\t\t<tr><td><img src=\"cid:%@\"></td> <td>%@</td> <td>%i</td></tr>\n", imgName, obj.name, obj.blockSize]; + [htmlStr appendFormat:@"\t\t\t<tr><td><img src=\"cid:%@\"></td> <td>%@</td> <td>%i</td></tr>\n", imgName, obj.title, obj.blockSize]; htmlDict[imgName] = imgProps; continue; } @@ -135,7 +135,7 @@ static OSStatus GeneratePreviewForMemCard(void *thisInterface, QLPreviewRequestR NSDictionary *imgProps = @{(NSString *)kQLPreviewPropertyAttachmentDataKey: gifData, (NSString *)kQLPreviewPropertyMIMETypeKey: @"image/gif"}; NSString *imgName = [[@(i++) stringValue] stringByAppendingPathExtension:@"gif"]; - [htmlStr appendFormat:@"\t\t\t<tr><td><img src=\"cid:%@\"></td> <td>%@</td> <td>%i</td></tr>\n", imgName, obj.name, obj.blockSize]; + [htmlStr appendFormat:@"\t\t\t<tr><td><img src=\"cid:%@\"></td> <td>%@</td> <td>%i</td></tr>\n", imgName, obj.title, obj.blockSize]; htmlDict[imgName] = imgProps; } diff --git a/macosx/Pcsxr-QL/PSXMemEnumerator.m b/macosx/Pcsxr-QL/PSXMemEnumerator.m index 4cba0ef7..62ab396f 100644 --- a/macosx/Pcsxr-QL/PSXMemEnumerator.m +++ b/macosx/Pcsxr-QL/PSXMemEnumerator.m @@ -98,31 +98,31 @@ static void GetSoloBlockInfo(unsigned char *data, int block, McdBlock *Info) Info->Flags = *ptr; ptr += 0xa; - strlcpy(Info->ID, ptr, 12); + strlcpy(Info->ID, ptr, 13); ptr += 12; - strlcpy(Info->Name, ptr, 16); + strlcpy(Info->Name, ptr, 17); } static inline PCSXRMemFlag MemBlockFlag(unsigned char blockFlags) { if ((blockFlags & 0xF0) == 0xA0) { if ((blockFlags & 0xF) >= 1 && (blockFlags & 0xF) <= 3) - return memFlagDeleted; + return PCSXRMemFlagDeleted; else - return memFlagFree; + return PCSXRMemFlagFree; } else if ((blockFlags & 0xF0) == 0x50) { if ((blockFlags & 0xF) == 0x1) - return memFlagUsed; + return PCSXRMemFlagUsed; else if ((blockFlags & 0xF) == 0x2) - return memFlagLink; + return PCSXRMemFlagLink; else if ((blockFlags & 0xF) == 0x3) - return memFlagEndLink; + return PCSXRMemFlagEndLink; } else - return memFlagFree; + return PCSXRMemFlagFree; //Xcode complains unless we do this... //NSLog(@"Unknown flag %x", blockFlags); - return memFlagFree; + return PCSXRMemFlagFree; } @@ -151,7 +151,7 @@ NSArray *CreateArrayByEnumeratingMemoryCardAtURL(NSURL *location) McdBlock memBlock; GetSoloBlockInfo((unsigned char *)memPtr, i + 1, &memBlock); - if (MemBlockFlag(memBlock.Flags) == memFlagFree) { + if (MemBlockFlag(memBlock.Flags) == PCSXRMemFlagFree) { //Free space: ignore i++; continue; @@ -170,7 +170,7 @@ NSArray *CreateArrayByEnumeratingMemoryCardAtURL(NSURL *location) }; PcsxrMemoryObject *obj = [[PcsxrMemoryObject alloc] initWithMcdBlock:&memBlock startingIndex:i size:x]; i += x; - if (MemBlockFlag(memBlock.Flags) == memFlagDeleted) { + if (MemBlockFlag(memBlock.Flags) == PCSXRMemFlagDeleted) { continue; } [memArray addObject:obj]; |