Closed pgaskin closed 9 months ago
Resource extraction:
go run github.com/pgaskin/qrc/cmd/qrc2zip@latest --output nickel.21908.qInitResources_styles.zip --recursive --verbose nickel 1 26762560 26622584 26750920
go run github.com/pgaskin/qrc/cmd/qrc2zip@latest --output nickel.21908.qInitResources_resources.zip --recursive --verbose nickel 1 21737592 101096 21736112
go run github.com/pgaskin/qrc/cmd/qrc2zip@latest --output nickel.21908.qInitResources_certificates.zip --recursive --verbose nickel 1 26923968 26765808 26919792
go run github.com/pgaskin/qrc/cmd/qrc2zip@latest --output nickel.21908.qInitResources_translations.zip --recursive --verbose nickel 1 26622256 21738816 26621512
https://krc.storage.pgaskin.net/nickel.21908.qInitResources_certificates.zip https://krc.storage.pgaskin.net/nickel.21908.qInitResources_resources.zip https://krc.storage.pgaskin.net/nickel.21908.qInitResources_styles.zip https://krc.storage.pgaskin.net/nickel.21908.qInitResources_translations.zip
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/libnickel.so.1.0.0.yaml/geoffr.yaml: My 24 line spacing values: could not apply patch "My 24 line spacing values": line 54: inst 9: ReplaceBytes: could not find specified bytes at offset
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/libnickel.so.1.0.0.yaml/jackie_w.yaml: Dictionary text font-family/font-size/line-height: could not apply patch "Dictionary text font-family/font-size/line-height": line 53: inst 3: FindReplaceString: FindBaseAddressString: FindBaseAddress: could not find bytes
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/nickel.yaml/pgaskin.yaml: Increase size of kepub chapter progress chart: could not apply patch "Increase size of kepub chapter progress chart": line 28: inst 4: ReplaceZlib: not a zlib stream
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/nickel.yaml/pgaskin.yaml: Remove forgot pin button from lock screen: could not apply patch "Remove forgot pin button from lock screen": line 20: inst 4: ReplaceZlib: not a zlib stream
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/libnickel.so.1.0.0.yaml/pgaskin.yaml: Customize ComfortLight settings: could not apply patch "Customize ComfortLight settings": line 529: inst 4: ReplaceInt: could not find specified bytes at offset
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/libnickel.so.1.0.0.yaml/pgaskin.yaml: Hide browser from beta features: could not apply patch "Hide browser from beta features": line 82: inst 3: ReplaceBytes: could not find specified bytes
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/libnickel.so.1.0.0.yaml/pgaskin.yaml: Never show Kobo Plus, wishlist, and points SmartLinks: could not apply patch "Never show Kobo Plus, wishlist, and points SmartLinks": line 288: inst 5: ReplaceBytes: could not find specified bytes at offset
/home/patrick/kp/src/kobopatch-patches/src/versions/4.38.21908/libadobe.so.yaml/pgaskin.yaml: Remove PDF map widget shown during panning: could not apply patch "Remove PDF map widget shown during panning": line 9: inst 4: ReplaceBytes: could not find specified bytes
A lot more than usual, and this one will be a bit more work since I'm going to need to verify all of the SmartLinks again, update and test the libadobe offsets, and at least partially rewrite "My 24 line spacing values". I'll work on this when I have more time, probably tomorrow.
@jackiew1 "Dictionary text font-family/font-size/line-height"
@pgaskin
When you create the MR thread for release of these patches I'll need to add a post to remind users that they'll need to make a fresh copy if they want to customise patch Dictionary text font-family/font-size/line-height
... also, forgot to say no changes required for nickel patches as far as I can tell.
I'll need to add a post
I'll post it around the time of your comment then, with some notice beforehand.
Looks like the 24 line spacing patch fix will be relatively trivial; a nop just made its way into the middle for alignment, so I'll need to recompute all the hardcoded offsets.
20400 | 21908 |
---|---|
```
_ZNK15ReadingSettings17lineHeightScalarsEv: // ReadingSettings::lineHeightScalars() const
008b9ee4 964B ldr r3, =0xb136ea ; dword_8ba140,0xb136ea
008b9ee6 2DE9F043 push.w {r4, r5, r6, r7, r8, sb, lr}
008b9eea A1B0 sub sp, #0x84
008b9eec 954E ldr r6, =0xad1cfe ; dword_8ba144,0xad1cfe
008b9eee 7B44 add r3, pc ; dword_13cd5dc
008b9ef0 00AF add r7, sp, #0x0
008b9ef2 1A68 ldr r2, [r3] ; dword_13cd5dc
008b9ef4 0546 mov r5, r0
008b9ef6 7E44 add r6, pc ; dword_138bbf8
008b9ef8 D207 lsls r2, r2, #0x1f
008b9efa 03D4 bmi loc_8b9f04
008b9efc 1846 mov r0, r3
008b9efe EDF4F6EA blx __cxa_guard_acquire@PLT ; __cxa_guard_acquire
008b9f02 50B9 cbnz r0, loc_8b9f1a
loc_8b9f04:
008b9f04 9049 ldr r1, =0xb136d0 ; dword_8ba148,0xb136d0, CODE XREF=_ZNK15ReadingSettings17lineHeightScalarsEv+22, _ZNK15ReadingSettings17lineHeightScalarsEv+466, _ZNK15ReadingSettings17lineHeightScalarsEv+470, _ZNK15ReadingSettings17lineHeightScalarsEv+494
008b9f06 2846 mov r0, r5
008b9f08 7944 add r1, pc ; dword_13cd5dc
008b9f0a 0431 adds r1, #0x4 ; 0x13cd5e0
008b9f0c D8F4ECEE blx _ZN5QListIdEC1ERKS0_@PLT ; QList |
```
_ZNK15ReadingSettings17lineHeightScalarsEv: // ReadingSettings::lineHeightScalars() const
009ffc90 974B ldr r3, =0xcc5aae ; dword_9ffef0,0xcc5aae
009ffc92 2DE9F043 push.w {r4, r5, r6, r7, r8, sb, lr}
009ffc96 A1B0 sub sp, #0x84
009ffc98 964E ldr r6, =0xc8007a ; dword_9ffef4,0xc8007a
009ffc9a 7B44 add r3, pc ; dword_16c574c
009ffc9c 00AF add r7, sp, #0x0
009ffc9e 1A68 ldr r2, [r3] ; dword_16c574c
009ffca0 0546 mov r5, r0
009ffca2 7E44 add r6, pc ; dword_167fd20
009ffca4 D207 lsls r2, r2, #0x1f
009ffca6 03D4 bmi loc_9ffcb0
009ffca8 1846 mov r0, r3
009ffcaa 89F4A2E9 blx __cxa_guard_acquire@PLT ; __cxa_guard_acquire
009ffcae 50B9 cbnz r0, loc_9ffcc6
loc_9ffcb0:
009ffcb0 9149 ldr r1, =0xcc5a94 ; dword_9ffef8,0xcc5a94, CODE XREF=_ZNK15ReadingSettings17lineHeightScalarsEv+22, _ZNK15ReadingSettings17lineHeightScalarsEv+466, _ZNK15ReadingSettings17lineHeightScalarsEv+470, _ZNK15ReadingSettings17lineHeightScalarsEv+494
009ffcb2 2846 mov r0, r5
009ffcb4 7944 add r1, pc ; dword_16c574c
009ffcb6 0431 adds r1, #0x4 ; 0x16c5750
009ffcb8 72F45AEB blx _ZN5QListIdEC1ERKS0_@PLT ; QList |
Looks like the 24 line spacing patch fix will be relatively trivial; a nop just made its way into the middle for alignment, so I'll need to recompute all the hardcoded offsets.
Tested, seems fine. Sent you a MR PM.
122
Also see #126.