Compare commits
31 Commits
agent/w100
...
cleanup/co
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b8d11475d | ||
|
|
413c779180 | ||
|
|
f9ecefa6a2 | ||
|
|
320700d49b | ||
|
|
c52153e9f7 | ||
|
|
899438ff02 | ||
|
|
8476c93f00 | ||
|
|
9b375e1e50 | ||
|
|
73795cb3fb | ||
|
|
0c780f6d1f | ||
|
|
63f4c7aeab | ||
|
|
282ddd99b7 | ||
|
|
c7d0f8f01b | ||
|
|
414b553743 | ||
|
|
da96c27969 | ||
|
|
0a925c7053 | ||
|
|
c0126c37d4 | ||
|
|
fc2d150c6d | ||
|
|
7851b2b29f | ||
|
|
263411ccac | ||
|
|
09de907f0b | ||
|
|
4e3ab6eae5 | ||
|
|
99d6fe20a2 | ||
|
|
00013016df | ||
|
|
3e279ef189 | ||
|
|
32417fe8a2 | ||
|
|
2d9e3ee14a | ||
|
|
23db5e05e1 | ||
|
|
741c9263e3 | ||
|
|
29fe1efaf2 | ||
|
|
45aaeb16b2 |
@@ -5159,7 +5159,7 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
|
||||
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
|
||||
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
|
||||
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
|
||||
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
|
||||
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
|
||||
@@ -13923,7 +13923,7 @@ csEngAsciiVisiblePanesSP__Q39textinput8keyboard6pctype = .rodata:0x81613E2C; //
|
||||
csAsciiVisiblePanes__Q39textinput8keyboard6pctype = .rodata:0x81613EF0; // type:object size:0xC4 scope:local
|
||||
csAsciiVisiblePanesNL__Q39textinput8keyboard6pctype = .rodata:0x81613FB4; // type:object size:0xC4 scope:local
|
||||
csCNAsciiVisiblePanes__Q39textinput8keyboard6pctype = .rodata:0x81614078; // type:object size:0xC4 scope:local
|
||||
csKRAsciiVisiblePanes__Q39textinput8keyboard6pctype = .rodata:0x8161413C; // type:object size:0xC4 scope:local
|
||||
csKRAsciiVisiblePanes_Q39textinput8keyboard6pctype = .rodata:0x8161413C; // type:object size:0xC4 scope:local
|
||||
csCharCodeToAblautSP__Q39textinput8keyboard6pctype = .rodata:0x81614200; // type:object size:0xC0 scope:local
|
||||
csCharCodeToAblautNL__Q39textinput8keyboard6pctype = .rodata:0x816142C0; // type:object size:0xC0 scope:local
|
||||
csCharCodeToAblautDE__Q39textinput8keyboard6pctype = .rodata:0x81614380; // type:object size:0xC0 scope:local
|
||||
@@ -13931,8 +13931,8 @@ csCharCodeToAblautFR__Q39textinput8keyboard6pctype = .rodata:0x81614440; // type
|
||||
csLanguageDependencyData__Q39textinput8keyboard6pctype = .rodata:0x81614500; // type:object size:0xC8 scope:local
|
||||
csJapanKanaInput__Q39textinput8keyboard6pctype = .rodata:0x816145C8; // type:object size:0x18 scope:local
|
||||
csAninationFile__Q39textinput8keyboard6pctype = .rodata:0x816145E0; // type:object size:0x440 scope:local
|
||||
KOREAN_LOWER__Q39textinput8keyboard6pctype = .rodata:0x81614A20; // type:object size:0x34 scope:local data:string
|
||||
KOREAN_UPPER__Q39textinput8keyboard6pctype = .rodata:0x81614A54; // type:object size:0x34 scope:local data:string
|
||||
lbl_81614A20 = .rodata:0x81614A20; // type:object size:0x34 data:string
|
||||
lbl_81614A54 = .rodata:0x81614A54; // type:object size:0x34 data:string
|
||||
lbl_81614A88 = .rodata:0x81614A88; // type:object size:0x10 data:4byte
|
||||
lbl_81614A98 = .rodata:0x81614A98; // type:object size:0x14 data:4byte
|
||||
lbl_81614AAC = .rodata:0x81614AAC; // type:object size:0x14 data:4byte
|
||||
@@ -16150,6 +16150,11 @@ lbl_8164EF14 = .data:0x8164EF14; // type:object size:0x34
|
||||
__vt__Q33ipl5scene27CsChanTtlButtonEventHandler = .data:0x8164EF48; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene24ChannelTitleEventHandler = .data:0x8164EF64; // type:object size:0x18
|
||||
__vt__Q33ipl5scene12ChannelTitle = .data:0x8164EF7C; // type:object size:0x68
|
||||
lbl_8164EFE4 = .data:0x8164EFE4; // type:object size:0x5C
|
||||
lbl_8164F040 = .data:0x8164F040; // type:object size:0x18
|
||||
lbl_8164F058 = .data:0x8164F058; // type:object size:0x20
|
||||
lbl_8164F078 = .data:0x8164F078; // type:object size:0x20
|
||||
lbl_8164F098 = .data:0x8164F098; // type:object size:0x20
|
||||
@10125 = .data:0x8164F0B8; // type:object size:0xD scope:local data:string
|
||||
...data.0 = .data:0x8164F0B8; // type:label scope:local
|
||||
@10126 = .data:0x8164F0C5; // type:object size:0xD scope:local data:string
|
||||
@@ -17379,7 +17384,7 @@ jumptable_81658BD0 = .data:0x81658BD0; // type:object size:0x20 scope:local
|
||||
__vt__11WaveFileWav = .data:0x81658CE8; // type:object size:0x38
|
||||
__vt__12WaveFileAiff = .data:0x81658D20; // type:object size:0x38
|
||||
__vt__8WaveFile = .data:0x81658D58; // type:object size:0x38 scope:weak
|
||||
PREDICT_CAPTIONS__Q39textinput8keyboard6pctype = .data:0x81658D90; // type:object size:0x34 scope:local
|
||||
lbl_81658D90 = .data:0x81658D90; // type:object size:0x34
|
||||
lbl_81658DC4 = .data:0x81658DC4; // type:object size:0x11 data:string
|
||||
lbl_81658DD8 = .data:0x81658DD8; // type:object size:0xE data:string
|
||||
lbl_81658DE8 = .data:0x81658DE8; // type:object size:0x11 data:string
|
||||
@@ -17559,8 +17564,8 @@ jumptable_8165BA6C = .data:0x8165BA6C; // type:object size:0x1C scope:local
|
||||
jumptable_8165BA88 = .data:0x8165BA88; // type:object size:0x3C scope:local
|
||||
lbl_8165BAC4 = .data:0x8165BAC4; // type:object size:0xE data:string
|
||||
lbl_8165BAD4 = .data:0x8165BAD4; // type:object size:0x68
|
||||
chinesePosition__Q39textinput8keyboard6pctype = .data:0x8165BB3C; // type:object size:0xC data:4byte
|
||||
koreanPosition__Q39textinput8keyboard6pctype = .data:0x8165BB48; // type:object size:0xC data:4byte
|
||||
lbl_8165BB3C = .data:0x8165BB3C; // type:object size:0xC data:4byte
|
||||
lbl_8165BB48 = .data:0x8165BB48; // type:object size:0xC data:4byte
|
||||
__vt__Q49textinput8keyboard6pctype18OnOffButtonAnmPane = .data:0x8165BB54; // type:object size:0x2C
|
||||
__vt__Q49textinput8keyboard6pctype19ToggleButtonAnmPane = .data:0x8165BB80; // type:object size:0x2C
|
||||
__vt__Q49textinput8keyboard6pctype16ShiftCapsAnmPane = .data:0x8165BBAC; // type:object size:0x2C
|
||||
@@ -22498,7 +22503,7 @@ lbl_816972E0 = .sdata:0x816972E0; // type:object size:0x6 data:wstring
|
||||
lbl_816972E8 = .sdata:0x816972E8; // type:object size:0x6 data:wstring
|
||||
lbl_816972F0 = .sdata:0x816972F0; // type:object size:0x6 data:wstring
|
||||
lbl_816972F8 = .sdata:0x816972F8; // type:object size:0x6 data:wstring
|
||||
COMMON_KEY_ANIMATION__Q39textinput8keyboard6pctype = .sdata:0x81697300; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_81697300 = .sdata:0x81697300; // type:object size:0x4 data:4byte
|
||||
lbl_81697304 = .sdata:0x81697304; // type:object size:0x4
|
||||
lbl_81697308 = .sdata:0x81697308; // type:object size:0x7 data:string
|
||||
lbl_81697310 = .sdata:0x81697310; // type:object size:0x8
|
||||
|
||||
@@ -772,7 +772,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("channelTitle", [
|
||||
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("faceSelect", [
|
||||
@@ -877,7 +877,7 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
]
|
||||
|
||||
@@ -337,7 +337,11 @@ namespace textinput {
|
||||
virtual u16 getScroll() { return mTextArea.GetDispOffset(); } // 0x100
|
||||
virtual bool isInScroll(); // 0x104
|
||||
virtual void setActive(bool active); // 0x108
|
||||
virtual bool isActive() const; // 0x10C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isActive() const { return mbActive; }
|
||||
#else
|
||||
virtual bool isActive() const;
|
||||
#endif // 0x10C
|
||||
virtual void setSelectedTextPane(int pane) { mTextArea.SetSelectedText(pane); } // 0x110
|
||||
virtual void setFocusedTextPane(int pane) { mTextArea.SetFocusedText(pane); } // 0x114
|
||||
virtual int getFocusedTextPane() { return mTextArea.GetFocusedText(); } // 0x118
|
||||
|
||||
@@ -48,11 +48,7 @@ namespace textinput {
|
||||
public:
|
||||
virtual ~GUIInterface() {} // 0x08
|
||||
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
virtual void create();
|
||||
#else
|
||||
virtual void create() {} // 0x0C
|
||||
#endif
|
||||
|
||||
virtual void init() {} // 0x10
|
||||
virtual void calc() {} // 0x14
|
||||
@@ -74,21 +70,12 @@ namespace textinput {
|
||||
|
||||
EventHandler() : muLatestEventCtrlNo(0) {}
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual ~EventHandler(); // 0x08
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo); // 0x10
|
||||
virtual int getLatestEventCtrlNo(); // 0x14
|
||||
#else
|
||||
virtual ~EventHandler() {} // 0x08
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data) {} // 0x0C
|
||||
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo) { muLatestEventCtrlNo = ctrlNo; } // 0x10
|
||||
virtual int getLatestEventCtrlNo() { return muLatestEventCtrlNo; } // 0x14
|
||||
#endif
|
||||
|
||||
protected:
|
||||
int muLatestEventCtrlNo; // 0x04
|
||||
@@ -127,11 +114,7 @@ namespace textinput {
|
||||
virtual u32 getID() { return mID; } // 0x20
|
||||
|
||||
virtual bool isPointed(int point) { return mbPointed[point]; } // 0x24
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isDragging(int point);
|
||||
#else
|
||||
virtual bool isDragging(int point) { return mbDragging[point]; } // 0x28
|
||||
#endif
|
||||
|
||||
virtual void setPointed(int point, bool bEnable) { mbPointed[point] = bEnable; } // 0x2C
|
||||
|
||||
@@ -163,27 +146,15 @@ namespace textinput {
|
||||
}
|
||||
|
||||
virtual bool isTriggerTarget() { return mbTriggerTarget; } // 0x48
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setTriggerTarget(bool bEnable);
|
||||
#else
|
||||
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x4C
|
||||
#endif
|
||||
|
||||
void setParentManager(GUIManager* manager) { mpManager = manager; }
|
||||
GUIManager* getParentManager() { return mpManager; }
|
||||
|
||||
virtual bool isVisible() { return true; } // 0x50
|
||||
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
virtual u16 getFlightDuration(int point);
|
||||
#else
|
||||
virtual u16 getFlightDuration(int point) { return mFlightDuration[point]; } // 0x54
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setFlightDuration(int point, u16 flightDir);
|
||||
#else
|
||||
virtual void setFlightDuration(int point, u16 flightDir) { mFlightDuration[point] = flightDir; } // 0x58
|
||||
#endif
|
||||
|
||||
virtual bool contain(f32 x, f32 y) = 0; // 0x5C
|
||||
|
||||
|
||||
@@ -240,8 +240,10 @@ namespace textinput {
|
||||
virtual void onClose();
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
tistring::WithAtok* getCurrentString(bool fixed);
|
||||
#endif
|
||||
virtual bool canConvert() { return getCurrentString(false) == mpUnfixString; }
|
||||
#else
|
||||
virtual bool canConvert();
|
||||
#endif
|
||||
|
||||
virtual void setString(const wchar_t* string);
|
||||
|
||||
|
||||
@@ -42,16 +42,12 @@ namespace textinput {
|
||||
virtual void setLanguage(Language language);
|
||||
#endif
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
#if defined(TISIGNWINDOW_IMPLEMENTATION) || defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void update();
|
||||
#else
|
||||
virtual void update() {}
|
||||
#endif
|
||||
#else
|
||||
virtual Language getLanguage() const;
|
||||
virtual void update();
|
||||
|
||||
@@ -64,11 +64,7 @@ namespace textinput {
|
||||
virtual void setWCString(const wchar_t* string);
|
||||
|
||||
virtual void setLanguage(Language language);
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
Language getLanguageForMemo() const { return meLanguage; }
|
||||
#endif
|
||||
@@ -132,33 +128,13 @@ namespace textinput {
|
||||
virtual InputForm* getInputForm() { return mpInputForm; }
|
||||
virtual const InputForm* getInputForm() const { return mpInputForm; }
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard();
|
||||
#else
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const;
|
||||
#else
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const { return mpHWKeyboard; }
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard();
|
||||
#else
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard() { return mpPCKeyboard; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const;
|
||||
#else
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const { return mpPCKeyboard; }
|
||||
#endif
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard();
|
||||
#else
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
#endif
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
@@ -169,24 +145,11 @@ namespace textinput {
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
#endif
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox();
|
||||
#else
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
#endif
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const;
|
||||
#else
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
#endif
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual toolbar::LayoutByNW4R* getToolBar();
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const;
|
||||
#else
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
#endif
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
|
||||
@@ -36,11 +36,7 @@ namespace textinput {
|
||||
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) = 0; // 0x18
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setEventObserver(EventObserver *event);
|
||||
#else
|
||||
virtual void setEventObserver(EventObserver *event) { mpEventObserver = event; } // 0x1C
|
||||
#endif
|
||||
|
||||
protected:
|
||||
EventObserver* mpEventObserver; // 0x08
|
||||
@@ -100,11 +96,29 @@ namespace textinput {
|
||||
virtual void init() {} // 0x08
|
||||
virtual void calc(); // 0x0C
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void onAnmEvent(AnmPaneEvent) {}
|
||||
#else
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent);
|
||||
#endif // 0x10
|
||||
|
||||
virtual void changeAnimation(u32 id); // 0x14
|
||||
virtual bool isInAnimation(); // 0x18
|
||||
virtual Anim* searchAnimation(u32 id); // 0x1C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isInAnimation() { return mpCurrentAnim != NULL; }
|
||||
#else
|
||||
virtual bool isInAnimation();
|
||||
#endif // 0x18
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Anim* searchAnimation(u32 id) {
|
||||
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
|
||||
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
|
||||
if (animation->muID == id) return animation;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
virtual Anim* searchAnimation(u32 id);
|
||||
#endif // 0x1C
|
||||
|
||||
virtual ~AnmPane(); // 0x20
|
||||
|
||||
@@ -172,10 +186,6 @@ namespace textinput {
|
||||
init();
|
||||
}
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void init();
|
||||
virtual void push(nw4r::lyt::Pane* pane);
|
||||
#else
|
||||
virtual void init() { // 0x08
|
||||
for (int i = 0; i < MAX_COUNT; i++) {
|
||||
mpaFifo[i] = NULL;
|
||||
@@ -201,21 +211,20 @@ namespace textinput {
|
||||
mpaFifo[MAX_COUNT-1] = pane;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual nw4r::lyt::Pane* get(int i) { return mpaFifo[i]; } // 0x10
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual nw4r::lyt::Pane* getLast();
|
||||
#else
|
||||
virtual nw4r::lyt::Pane* getLast() { // 0x14
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
for (int i = MAX_COUNT-1; i > -1; i--) {
|
||||
#else
|
||||
for (int i = MAX_COUNT-1; i > -1; i++) {
|
||||
#endif
|
||||
if (mpaFifo[i] != NULL) {
|
||||
return mpaFifo[i];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual int getSize() { return MAX_COUNT; } // 0x18
|
||||
|
||||
@@ -238,22 +247,14 @@ namespace textinput {
|
||||
virtual bool updateInput(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x20
|
||||
virtual bool updateInput(input::HKBManager& hkbManager); // 0x24
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual TiLayout* getLayout();
|
||||
#else
|
||||
virtual TiLayout* getLayout() { return mpLayout; } // 0x28
|
||||
#endif
|
||||
|
||||
virtual nw4r::lyt::Pane* getPane(const char* paneName); // 0x2C
|
||||
virtual const nw4r::lyt::Pane* getPane(const char* paneName) const; // 0x30
|
||||
|
||||
virtual u32 getFlightDuration(int point, const char* paneName); // 0x34
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setAnimOn(bool flag);
|
||||
#else
|
||||
virtual void setAnimOn(bool flag) { mbAnimOn = flag; } // 0x38
|
||||
#endif
|
||||
|
||||
virtual void drawPane(const char* paneName); // 0x3C
|
||||
|
||||
@@ -262,8 +263,16 @@ namespace textinput {
|
||||
|
||||
virtual void setProjectionMtx(); // 0x48
|
||||
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* paneLastDraw); // 0x4C
|
||||
virtual void initPaneLastDrawReceived(); // 0x50
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* pane) { mAnmPaneFifo.push(pane); }
|
||||
#else
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* paneLastDraw);
|
||||
#endif // 0x4C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void initPaneLastDrawReceived() { mAnmPaneFifo.init(); }
|
||||
#else
|
||||
virtual void initPaneLastDrawReceived();
|
||||
#endif // 0x50
|
||||
|
||||
virtual void setVisible(const char* paneName, bool flag); // 0x54
|
||||
virtual bool isVisible(const char* paneName, bool* result) const; // 0x58
|
||||
@@ -273,13 +282,8 @@ namespace textinput {
|
||||
virtual AnmPane* searchAnmPane(const char* paneName); // 0x60
|
||||
virtual AnmPane* searchAnmPane(wchar_t ch); // 0x64
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual nw4r::ut::List& getAnmPaneList();
|
||||
virtual gui::PaneManager* getPaneManager();
|
||||
#else
|
||||
virtual nw4r::ut::List& getAnmPaneList() { return mAnmPanes; } // 0x68
|
||||
virtual gui::PaneManager* getPaneManager() { return mpPaneManager; } // 0x6C
|
||||
#endif
|
||||
|
||||
virtual void AdjustPaneMtx(Mtx& mtx, const nw4r::lyt::DrawInfo& drawInfo, const nw4r::math::MTX34& mGlobalMtx); // 0x70
|
||||
|
||||
|
||||
@@ -191,7 +191,7 @@ namespace textinput {
|
||||
#endif
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual inline void init();
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual int getType();
|
||||
@@ -358,8 +358,8 @@ namespace textinput {
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 animation);
|
||||
virtual ~AnmPane();
|
||||
virtual int getState() const;
|
||||
virtual int getKeyType() const;
|
||||
virtual int getState() const { return mAnimation; }
|
||||
virtual int getKeyType() const { return mKeyType; }
|
||||
|
||||
protected:
|
||||
int mAnimation;
|
||||
|
||||
@@ -90,13 +90,9 @@ namespace textinput {
|
||||
|
||||
virtual void setCommandReceiver(CommandReceiver* cmdRecv);
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void sendCommand(u32, void*);
|
||||
#else
|
||||
virtual void sendCommand(u32 command, void* data) {
|
||||
if (mpCommandReceiver != NULL) mpCommandReceiver->onCommand(static_cast<CommandReceiver::INPUT_COMMAND>(command), data);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
virtual void sendCommand(u32, void*);
|
||||
#endif
|
||||
|
||||
@@ -16,11 +16,7 @@ namespace textinput {
|
||||
|
||||
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
|
||||
virtual void init() {}
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isQwerty() const;
|
||||
#else
|
||||
virtual bool isQwerty() const { return mQwerty; }
|
||||
#endif
|
||||
virtual void setQwerty(bool qwerty);
|
||||
virtual void setLanguage(Language language) { meLanguage = language; }
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
@@ -60,7 +56,11 @@ namespace textinput {
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void setQwertyWithSE(bool qwerty);
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual bool isEnableKeytopChange() const { return mbIsEnableQwertyChg; }
|
||||
#else
|
||||
virtual bool isEnableKeytopChange() const;
|
||||
#endif
|
||||
virtual void enableKeytopChange(bool enable);
|
||||
#ifdef MYTIMANAGER_MATCHING
|
||||
virtual nw4r::lyt::Pane* getDownArea();
|
||||
|
||||
@@ -55,28 +55,17 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
inline virtual ~Animation() {}
|
||||
inline virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
inline virtual void calc(); // 0x0C
|
||||
inline virtual f32 getValue(); // 0x10
|
||||
inline virtual bool isActive(); // 0x14
|
||||
inline virtual void setSEFlag(bool); // 0x18
|
||||
inline virtual bool isSEFlag(); // 0x1C
|
||||
inline virtual void stop(); // 0x20
|
||||
#elif defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
#endif // 0x08
|
||||
#ifndef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual void calc(); // 0x0C
|
||||
virtual f32 getValue(); // 0x10
|
||||
virtual bool isActive(); // 0x14
|
||||
virtual void setSEFlag(bool); // 0x18
|
||||
virtual bool isSEFlag(); // 0x1C
|
||||
virtual void stop(); // 0x20
|
||||
#endif
|
||||
|
||||
private:
|
||||
f32 mfStartPoint; // 0x04
|
||||
|
||||
@@ -34,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -18,11 +18,11 @@ namespace ipl {
|
||||
|
||||
class line_collision {
|
||||
public:
|
||||
line_collision() : unk_0x00(0.0f), unk_0x04(0.0f), unk_0x08(0.0f) {}
|
||||
line_collision() : mLeft(0.0f), mRight(0.0f), mY(0.0f) {}
|
||||
|
||||
f32 unk_0x00;
|
||||
f32 unk_0x04;
|
||||
f32 unk_0x08;
|
||||
f32 mLeft;
|
||||
f32 mRight;
|
||||
f32 mY;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
};
|
||||
|
||||
@@ -31,9 +31,9 @@ namespace ipl {
|
||||
url_collision();
|
||||
~url_collision();
|
||||
|
||||
int unk_0x00;
|
||||
wchar_t* unk_0x04;
|
||||
wchar_t* unk_0x08;
|
||||
int mTagNo;
|
||||
wchar_t* mpStart;
|
||||
wchar_t* mpEnd;
|
||||
nw4r::ut::Link mLinkList; // 0x0C
|
||||
nw4r::ut::List mLineCollisions; // 0x14
|
||||
};
|
||||
@@ -53,19 +53,19 @@ namespace ipl {
|
||||
void parse(nw4r::ut::PrintContext<wchar_t>* context);
|
||||
|
||||
BOOL is_focused() const;
|
||||
void select(int unk);
|
||||
void select(int tagNo);
|
||||
|
||||
int get_focused_tagno(int chan) const;
|
||||
url_collision* get_selected_col();
|
||||
|
||||
void get_url(char* urlOut, u32 urlLen);
|
||||
|
||||
void setUnk_0x40(f32 val) { unk_0x40 = val; }
|
||||
void setUnk_0x44(f32 val) { unk_0x44 = val; }
|
||||
void setUnk_0x53(bool val) { unk_0x53 = val; }
|
||||
void setHitYOffset(f32 val) { mHitYOffset = val; }
|
||||
void setMemoTranslateY(f32 val) { mMemoTranslateY = val; }
|
||||
void setFocusEnabled(bool val) { mbFocusEnabled = val; }
|
||||
|
||||
u8 getUnk_0x50() const { return unk_0x50; }
|
||||
void setUnk_0x50(u8 val) { unk_0x50 = val; }
|
||||
u8 getColorPass() const { return mbColorPass; }
|
||||
void setColorPass(u8 val) { mbColorPass = val; }
|
||||
|
||||
private:
|
||||
typedef struct {
|
||||
@@ -75,14 +75,14 @@ namespace ipl {
|
||||
|
||||
con_data mConData[WPAD_MAX_CONTROLLERS]; // 0x00
|
||||
nw4r::ut::List mUrlCollisions; // 0x34
|
||||
f32 unk_0x40;
|
||||
f32 unk_0x44;
|
||||
int unk_0x48;
|
||||
int unk_0x4C;
|
||||
u8 unk_0x50;
|
||||
u8 unk_0x51;
|
||||
u8 unk_0x52;
|
||||
u8 unk_0x53;
|
||||
f32 mHitYOffset;
|
||||
f32 mMemoTranslateY;
|
||||
int mCurTagNo;
|
||||
int mSelectedTagNo;
|
||||
u8 mbColorPass;
|
||||
u8 mbInTag;
|
||||
u8 mbHoverOffset;
|
||||
u8 mbFocusEnabled;
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -145,7 +145,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int unk_0x54;
|
||||
int mAnimWait;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
|
||||
@@ -62,17 +62,17 @@ namespace ipl {
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
|
||||
typedef struct Unk {
|
||||
typedef struct CmdEntry {
|
||||
int command; // 0x00
|
||||
u32 msgID; // 0x04
|
||||
} Unk;
|
||||
} CmdEntry;
|
||||
|
||||
Unk unk_0x64[64];
|
||||
CmdEntry mCmdQueue[64];
|
||||
|
||||
int unk_0x264;
|
||||
int unk_0x268;
|
||||
int unk_0x26C;
|
||||
int unk_0x270;
|
||||
int mQueueCapacity;
|
||||
int mQueueCount;
|
||||
int mQueueRead;
|
||||
int mQueueWrite;
|
||||
|
||||
int mSettingArg; // 0x274
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -118,26 +118,26 @@ namespace ipl {
|
||||
public:
|
||||
Base(int chan, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
unk_0x1C = 0;
|
||||
mbForceInvalid = 0;
|
||||
KPADEnableDPD(chan);
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
mbPinch = 0;
|
||||
mbPrevPinch = 0;
|
||||
mpStatus = &status;
|
||||
}
|
||||
|
||||
Base(int chan, int type, KPADStatus& status) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = type;
|
||||
unk_0x1C = 0;
|
||||
mbForceInvalid = 0;
|
||||
KPADEnableDPD(chan);
|
||||
}
|
||||
|
||||
@@ -152,15 +152,15 @@ namespace ipl {
|
||||
|
||||
protected:
|
||||
u8 mButton;
|
||||
u32 unk_0x08;
|
||||
u32 mDecideHoldCount;
|
||||
OSTick mLastRumbleTime;
|
||||
s32 mRumbleType;
|
||||
u32 mChan;
|
||||
u32 mType;
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D;
|
||||
u8 unk_0x1E;
|
||||
KPADStatus* unk_0x20;
|
||||
u8 mbForceInvalid;
|
||||
u8 mbPinch;
|
||||
u8 mbPrevPinch;
|
||||
KPADStatus* mpStatus;
|
||||
};
|
||||
|
||||
class Revolution : public Base {
|
||||
@@ -206,8 +206,8 @@ namespace ipl {
|
||||
virtual BOOL isValidDpdClassic() const;
|
||||
|
||||
private:
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
math::VEC2 mClassicCursor;
|
||||
int mClassicCursorTimer;
|
||||
};
|
||||
|
||||
class Master : public Interface {
|
||||
@@ -264,18 +264,18 @@ namespace ipl {
|
||||
public:
|
||||
Base(int chan, KPADStatus& arg1) {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mLastRumbleTime = 0;
|
||||
mRumbleType = -1;
|
||||
mChan = chan;
|
||||
mType = 2;
|
||||
unk_0x1C = 0;
|
||||
mbForceInvalid = 0;
|
||||
|
||||
KPADEnableDPD(chan);
|
||||
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &arg1;
|
||||
mbPinch = 0;
|
||||
mbPrevPinch = 0;
|
||||
mpStatus = &arg1;
|
||||
}
|
||||
|
||||
virtual ~Base(); // 0x08
|
||||
@@ -326,15 +326,15 @@ namespace ipl {
|
||||
|
||||
// protected:
|
||||
u8 mButton; // 0x4
|
||||
u32 unk_0x08; // 0x8
|
||||
u32 mDecideHoldCount; // 0x8
|
||||
OSTick mLastRumbleTime; // 0xC
|
||||
s32 mRumbleType; // 0x10
|
||||
u32 mChan; // 0x14
|
||||
u32 mType; // 0x18
|
||||
u8 unk_0x1C;
|
||||
u8 unk_0x1D; // 0x1D
|
||||
u8 unk_0x1E; // 0x1E
|
||||
KPADStatus* unk_0x20; // 0x20
|
||||
u8 mbForceInvalid;
|
||||
u8 mbPinch; // 0x1D
|
||||
u8 mbPrevPinch; // 0x1E
|
||||
KPADStatus* mpStatus; // 0x20
|
||||
};
|
||||
|
||||
class Interface : public Base {
|
||||
@@ -446,8 +446,8 @@ namespace ipl {
|
||||
virtual BOOL isValidDpdClassic() const; // 0x8C
|
||||
|
||||
private:
|
||||
math::VEC2 unk_0x24;
|
||||
int unk_0x2C;
|
||||
math::VEC2 mClassicCursor;
|
||||
int mClassicCursorTimer;
|
||||
};
|
||||
|
||||
class Manager {
|
||||
|
||||
@@ -60,9 +60,9 @@ namespace ipl {
|
||||
|
||||
int mMessageID; // 0x08
|
||||
|
||||
int unk_0x0C;
|
||||
int unk_0x10;
|
||||
char unk_0x14[4];
|
||||
int mArg2;
|
||||
int mArg3;
|
||||
char mArg1[4];
|
||||
|
||||
u8* mpArcData; // 0x18
|
||||
u32 mArcSize; // 0x1C
|
||||
|
||||
@@ -145,6 +145,13 @@ namespace ipl {
|
||||
mpCommonFile = commonFile;
|
||||
mpLangFile = langFile;
|
||||
}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LangFile() {}
|
||||
virtual void read() {}
|
||||
virtual bool isFinished() { return false; }
|
||||
virtual int checkData() { return 0; }
|
||||
virtual bool isFatalError() { return false; }
|
||||
#else
|
||||
virtual ~LangFile(); // 0x08
|
||||
|
||||
virtual void read(); // 0x0C
|
||||
@@ -152,6 +159,7 @@ namespace ipl {
|
||||
virtual bool isFinished(); // 0x14
|
||||
virtual int checkData(); // 0x18
|
||||
virtual bool isFatalError(); // 0x1C
|
||||
#endif
|
||||
|
||||
File* getCmnFile() const { return mpCommonFile; }
|
||||
File* getLangFile() const { return mpLangFile; }
|
||||
@@ -165,7 +173,11 @@ namespace ipl {
|
||||
public:
|
||||
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
|
||||
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LayoutFile() {} // 0x08
|
||||
#else
|
||||
virtual ~LayoutFile(); // 0x08
|
||||
#endif
|
||||
};
|
||||
} // namespace nand
|
||||
} // namespace ipl
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace ipl {
|
||||
|
||||
bool received() { return mbReviecedMsg; }
|
||||
void prepNextReceive() { mbReviecedMsg = false; }
|
||||
volatile bool isUnk0xA31() { return unk_0xA31 == false; }
|
||||
volatile bool isReceivingIdle() { return mbReceiving == false; }
|
||||
|
||||
BOOL isAppDlEnableLock(u32 appId) {
|
||||
utility::autoMutexLock lock(mAutoLock);
|
||||
@@ -175,9 +175,9 @@ namespace ipl {
|
||||
OSMutex mAutoLock; // 0xA18
|
||||
|
||||
bool mbReviecedMsg;
|
||||
bool unk_0xA31;
|
||||
bool mbReceiving;
|
||||
bool mbReceivePaused; // 0xA32
|
||||
bool unk_0xA33;
|
||||
bool mbNewTitleTblReady;
|
||||
|
||||
static Arg smArg;
|
||||
|
||||
|
||||
@@ -5,17 +5,11 @@
|
||||
|
||||
namespace nw4r {
|
||||
namespace ut {
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
#define NW4R_UT_RUNTIME_TYPEINFO \
|
||||
virtual const nw4r::ut::detail::RuntimeTypeInfo* GetRuntimeTypeInfo() const; \
|
||||
static const nw4r::ut::detail::RuntimeTypeInfo typeInfo
|
||||
#else
|
||||
#define NW4R_UT_RUNTIME_TYPEINFO \
|
||||
virtual const nw4r::ut::detail::RuntimeTypeInfo* GetRuntimeTypeInfo() const { \
|
||||
return &typeInfo; \
|
||||
} \
|
||||
static const nw4r::ut::detail::RuntimeTypeInfo typeInfo
|
||||
#endif
|
||||
|
||||
#define NW4R_UT_GET_RUNTIME_TYPEINFO(T) const nw4r::ut::detail::RuntimeTypeInfo T::typeInfo(NULL);
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef struct {
|
||||
u8 mcuYRem; // 0x0F
|
||||
u16 mcuYCount; // 0x10
|
||||
u16 mcuXCount2; // 0x12
|
||||
u32 unk_0x14;
|
||||
u32 mcuTotal; // 0x14
|
||||
u8 remX; // 0x18
|
||||
u8 remY; // 0x19
|
||||
u8 compCount; // 0x1A
|
||||
@@ -142,7 +142,7 @@ struct TMCCJPEGDecWork_t {
|
||||
u8 mcuYRem; // 0x17FF
|
||||
u16 mcuYCount; // 0x1800
|
||||
u16 mcuXCount2; // 0x1802
|
||||
u32 unk_0x1804;
|
||||
u32 mcuTotal; // 0x1804
|
||||
u8 remX; // 0x1808
|
||||
u8 remY; // 0x1809
|
||||
u8 compCount; // 0x180A
|
||||
|
||||
@@ -51,7 +51,7 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
|
||||
state->componentCount = work->componentCount;
|
||||
state->result = work->unk_0x1804;
|
||||
state->result = work->mcuTotal;
|
||||
state->maxX = work->mcuYCount;
|
||||
state->maxY = work->mcuXCount2;
|
||||
|
||||
|
||||
@@ -567,7 +567,7 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
|
||||
|
||||
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
|
||||
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
|
||||
p->unk_0x14 = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
p->mcuTotal = (u32)p->mcuYCount * (u32)p->mcuXCount2;
|
||||
|
||||
for (idx = 0; idx < (s32)p->scanCompCount; idx++) {
|
||||
u8 compId;
|
||||
@@ -1929,7 +1929,7 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
|
||||
mcuCountY += yr;
|
||||
frameInfo->mcuYCount = mcuCountX;
|
||||
frameInfo->mcuXCount2 = mcuCountY;
|
||||
work->unk_0x1804 = (u32)mcuCountX * (u32)mcuCountY;
|
||||
work->mcuTotal = (u32)mcuCountX * (u32)mcuCountY;
|
||||
}
|
||||
|
||||
compCount2 = frameInfo->compCount;
|
||||
|
||||
@@ -205,12 +205,12 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 unk_0x01;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
ziU8 unk_0x09;
|
||||
ziU8 unk_0x0A;
|
||||
ziU8 maxWordLength;
|
||||
ziU8 unk_0x0B;
|
||||
ziU32 unk_0x0C;
|
||||
ziU32 unk_0x10;
|
||||
@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 unk_0x1A;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU16 unk_0x20[0x40];
|
||||
@@ -265,25 +265,25 @@ struct __zi8_work_data_s {
|
||||
ziPtr unk_0x11FC;
|
||||
ziPtr userKeys[0x83]; // 0x1200
|
||||
ziU8 unk_0x140C[4];
|
||||
ziU32 unk_0x1410;
|
||||
ziU32 formats; // 0x1410
|
||||
ziU8 unk_0x1414[4];
|
||||
ziU8 unk_0x1418;
|
||||
ziU8 formatCount;
|
||||
ziU8 unk_0x1419;
|
||||
ziU16 unk_0x141A;
|
||||
ziU16 capacity; // 0x141A
|
||||
ziU8 unk_0x141C;
|
||||
ziU8 unk_0x141D;
|
||||
ziU8 unk_0x141E;
|
||||
ziU8 unk_0x141F;
|
||||
ziU8 graphTableId; // 0x141E
|
||||
ziU8 maxCnt; // 0x141F
|
||||
ziU8 unk_0x1420[4];
|
||||
zi8DawgCtx dawgCtx; // 0x1424
|
||||
ziU8 unk_0x1760[4]; // 0x1760
|
||||
ziU8* unk_0x1764; // 0x1764
|
||||
ziU8* groupPtr; // 0x1764
|
||||
ziU8 unk_0x1768;
|
||||
ziU8 unk_0x1769[0x81];
|
||||
ziU16 unk_0x17EA;
|
||||
ziU16 matchOffset; // 0x17EA
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* unk_0x17F0;
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
|
||||
@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
|
||||
}
|
||||
|
||||
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
|
||||
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
|
||||
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
|
||||
++spelling;
|
||||
}
|
||||
if (!*spelling || spelling == end) {
|
||||
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
|
||||
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
|
||||
return 1;
|
||||
}
|
||||
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
|
||||
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
|
||||
break;
|
||||
}
|
||||
if (*spelling != *candidate) {
|
||||
@@ -2868,7 +2868,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
savedState.separator = ZI_WORK->unk_0x1A;
|
||||
savedState.separator = ZI_WORK->separator;
|
||||
if (elementCount <= 1 || !charCount) {
|
||||
return elementCount;
|
||||
}
|
||||
@@ -2881,9 +2881,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
if (spacedIndex == elementCount) {
|
||||
return elementCount;
|
||||
}
|
||||
ZI_WORK->unk_0x1A = 0xF360;
|
||||
ZI_WORK->separator = 0xF360;
|
||||
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1A = savedState.separator;
|
||||
ZI_WORK->separator = savedState.separator;
|
||||
spacedIndex = elementIndex = count = 0;
|
||||
while (charCount && elementIndex < elementCount) {
|
||||
if (spacedElements[spacedIndex] == 0xF360) {
|
||||
|
||||
@@ -39,10 +39,10 @@ ziU32 Zi8MatchROMdata0(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
}
|
||||
if (mode == 1) acceptPrefix = 0;
|
||||
} else {
|
||||
if (ZI_WORK->unk_0x141E != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->unk_0x141E, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->unk_0x141E, ZI_WORK);
|
||||
keyTable = ZI_WORK->unk_0x141E + 1;
|
||||
if (ZI_WORK->graphTableId != 0 && graphTable == 0xc &&
|
||||
Zi8GetTableSize(language, ZI_WORK->graphTableId, ZI_WORK) != 0) {
|
||||
graphData = (ziU8*)Zi8GetTableAddress(language, ZI_WORK->graphTableId, ZI_WORK);
|
||||
keyTable = ZI_WORK->graphTableId + 1;
|
||||
} else {
|
||||
if (Zi8GetTableSize(language, graphTable, ZI_WORK) == 0) {
|
||||
Zi8LogError(0x961, ZI_WORK);
|
||||
@@ -136,7 +136,7 @@ descend:
|
||||
records[context->cnt].node = ZiDAWGGetChild(records[context->cnt - 1].node);
|
||||
if (records[context->cnt].node == (ziU8*)0) goto next_sibling;
|
||||
context->cnt++;
|
||||
if (ZI_WORK->unk_0x141F < context->cnt) ZI_WORK->unk_0x141F = context->cnt;
|
||||
if (ZI_WORK->maxCnt < context->cnt) ZI_WORK->maxCnt = context->cnt;
|
||||
goto update_current;
|
||||
next_sibling:
|
||||
while (context->cnt != 0) {
|
||||
@@ -184,36 +184,36 @@ unsigned int Zi8MatchROMdata1(ziWChar *elements, ziU8 count, ziU8 language, ziWC
|
||||
|
||||
result = 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)group;
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
ZI_WORK->groupPtr = (ziU8*)group;
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
if (Zi8GetTableSize(language & 0xff,0xb,ZI_WORK) != 0) {
|
||||
ZI_WORK->unk_0x1764 = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
ZI_WORK->groupPtr = (ziU8*)(tableAddress = Zi8GetTableAddress(language & 0xff,0xb,ZI_WORK));
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 != 0) {
|
||||
for (; (*ZI_WORK->unk_0x1764 != 0xff && ((groupIndex & 0xff) != 0));
|
||||
if (ZI_WORK->groupPtr != 0) {
|
||||
for (; (*ZI_WORK->groupPtr != 0xff && ((groupIndex & 0xff) != 0));
|
||||
groupIndex = groupIndex - 1) {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
ZI_WORK->groupPtr += 2;
|
||||
}
|
||||
ZI_WORK->unk_0x1764++;
|
||||
ZI_WORK->groupPtr++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x1764 == 0) {
|
||||
if (ZI_WORK->groupPtr == 0) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,capacity & 0xffff,
|
||||
mode & 0xff,status & 0xff,0,1,acceptPrefix,0,&ZI_WORK->dawgCtx,
|
||||
ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
}
|
||||
else {
|
||||
while (*ZI_WORK->unk_0x1764 != 0xff) {
|
||||
while (*ZI_WORK->groupPtr != 0xff) {
|
||||
result = Zi8MatchROMdata0(elements,count,language & 0xff,output,
|
||||
capacity & 0xffff,mode & 0xff,status & 0xff,
|
||||
*ZI_WORK->unk_0x1764,
|
||||
ZI_WORK->unk_0x1764[1],acceptPrefix,0,
|
||||
*ZI_WORK->groupPtr,
|
||||
ZI_WORK->groupPtr[1],acceptPrefix,0,
|
||||
&ZI_WORK->dawgCtx,ZI_WORK->unk_0x1760,ZI_WORK);
|
||||
if ((result & 0xff) != 0) break;
|
||||
ZI_WORK->unk_0x1764 += 2;
|
||||
ZI_WORK->groupPtr += 2;
|
||||
status = 0;
|
||||
}
|
||||
}
|
||||
@@ -230,31 +230,31 @@ unsigned int Zi8MatchROMdata2(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
if (reservedMode != 0) return 0;
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x1768 = 0;
|
||||
ZI_WORK->unk_0x17EA = 0;
|
||||
ZI_WORK->matchOffset = 0;
|
||||
if (group != 0 && *group == 0xc && language == 10 && ZI_WORK->unk_0x141C != 0) {
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
} else {
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
ZI_WORK->graphTableId = 0;
|
||||
}
|
||||
}
|
||||
search_segment:
|
||||
ZI_WORK->unk_0x141F = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
ZI_WORK->maxCnt = 1;
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
mode, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
for (index = (ziU8)(ZI_WORK->unk_0x17EA + result); index != 0; index--) {
|
||||
for (index = (ziU8)(ZI_WORK->matchOffset + result); index != 0; index--) {
|
||||
output[index - 1] = ZI_WORK->unk_0x17F4[index - 1];
|
||||
}
|
||||
result = (ziU8)(result + ZI_WORK->unk_0x17EA);
|
||||
result = (ziU8)(result + ZI_WORK->matchOffset);
|
||||
} else {
|
||||
if (status != 0 || count == 1) goto finish_segments;
|
||||
if (mode == 1 && ZI_WORK->unk_0x1768 == 0 &&
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA,
|
||||
count - ZI_WORK->unk_0x17EA, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
(ziU8)Zi8MatchROMdata1(elements + ZI_WORK->matchOffset,
|
||||
count - ZI_WORK->matchOffset, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
0, status, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK) != 0) goto finish_segments;
|
||||
if ((Zi8GetTableCount(language, 0x1f, ZI_WORK) & 4) == 0) {
|
||||
@@ -262,25 +262,25 @@ search_segment:
|
||||
if (elements[index] == 0xeff1) goto finish_segments;
|
||||
}
|
||||
}
|
||||
if (ZI_WORK->unk_0x141F > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->unk_0x141F; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->unk_0x17EA, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->unk_0x17EA], capacity,
|
||||
if (ZI_WORK->maxCnt > capacity) goto finish_segments;
|
||||
for (index = ZI_WORK->maxCnt; index != 0; index--) {
|
||||
result = Zi8MatchROMdata1(elements + ZI_WORK->matchOffset, index, language,
|
||||
&ZI_WORK->unk_0x17F4[ZI_WORK->matchOffset], capacity,
|
||||
1, 0, ZI_WORK->unk_0x1768, (char*)group,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) {
|
||||
ZI_WORK->unk_0x17EA += (ziU8)result;
|
||||
if (ZI_WORK->unk_0x17EA == count) return 0;
|
||||
ZI_WORK->matchOffset += (ziU8)result;
|
||||
if (ZI_WORK->matchOffset == count) return 0;
|
||||
ZI_WORK->unk_0x1768++;
|
||||
status = 0;
|
||||
ZI_WORK->unk_0x141E = 0;
|
||||
ZI_WORK->graphTableId = 0;
|
||||
if (ZI_WORK->dawgCtx.key == 0 && language == 10) {
|
||||
for (index = 0; index < ZI_WORK->unk_0x17EA; index++) {
|
||||
for (index = 0; index < ZI_WORK->matchOffset; index++) {
|
||||
switch (ZI_WORK->unk_0x17F4[index]) {
|
||||
case 0x61:
|
||||
case 0x6f:
|
||||
case 0x75:
|
||||
ZI_WORK->unk_0x141E = 0x10;
|
||||
ZI_WORK->graphTableId = 0x10;
|
||||
goto search_segment;
|
||||
}
|
||||
}
|
||||
@@ -306,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -316,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -50,11 +50,11 @@ ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
|
||||
|
||||
ziBool Zi8SetLatinSearchOrder(ziU8* searchArray, ziU8 searchSize ZI_NEED_WORK) {
|
||||
if (searchArray == 0 || *searchArray == 0) {
|
||||
ZI_WORK->unk_0x1410 = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->unk_0x1418 = 9;
|
||||
ZI_WORK->formats = (ziU32)Zi8SOdefaultArray;
|
||||
ZI_WORK->formatCount = 9;
|
||||
} else {
|
||||
ZI_WORK->unk_0x1410 = (ziU32)searchArray;
|
||||
ZI_WORK->unk_0x1418 = searchSize;
|
||||
ZI_WORK->formats = (ziU32)searchArray;
|
||||
ZI_WORK->formatCount = searchSize;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
@@ -175,7 +175,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
current = signatures.first;
|
||||
length = signatures.length;
|
||||
}
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
@@ -185,7 +185,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
if (parameters->letters == 2) {
|
||||
current = signatures.second;
|
||||
length = secondLength;
|
||||
if (length > ZI_WORK->unk_0x0A) length = ZI_WORK->unk_0x0A;
|
||||
if (length > ZI_WORK->maxWordLength) length = ZI_WORK->maxWordLength;
|
||||
if ((parameters->elementCount < ZI_WORK->unk_0x140C[0] ||
|
||||
(parameters->getOptions & 0x7e) == 2) && length > parameters->elementCount) {
|
||||
length = parameters->elementCount;
|
||||
@@ -194,7 +194,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
|
||||
*output++ = 0;
|
||||
}
|
||||
*output++ = 0;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
||||
length = length - parameters->firstCandidate;
|
||||
if (countOnly != 0) {
|
||||
parameters->letters = length;
|
||||
ZI_WORK->unk_0x0A = 0xff;
|
||||
ZI_WORK->maxWordLength = 0xff;
|
||||
return 1;
|
||||
}
|
||||
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
|
||||
@@ -279,13 +279,13 @@ static ziBool Zi8ZhSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED_WO
|
||||
|
||||
ziU8 _Zi8GetCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ZiCandidateOptions options = {0};
|
||||
options.capacity = ZI_WORK->unk_0x141A;
|
||||
options.capacity = ZI_WORK->capacity;
|
||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||
}
|
||||
|
||||
ziU8 _Zi8CheckCandidates(ziGetParam* parameters ZI_NEED_WORK) {
|
||||
ZiCandidateOptions options = {0};
|
||||
options.capacity = ZI_WORK->unk_0x141A;
|
||||
options.capacity = ZI_WORK->capacity;
|
||||
options.flags = 1;
|
||||
return Zi8GetCandidatesOrCount(parameters, &options, ZI_WORK);
|
||||
}
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -493,8 +493,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
ZI_WORK->subLanguage = parameters->subLanguage;
|
||||
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
|
||||
options->maxCount = ZI_WORK->unk_0x10;
|
||||
options->maxWordLength = ZI_WORK->unk_0x0A;
|
||||
ZI_WORK->unk_0x0A = -1;
|
||||
options->maxWordLength = ZI_WORK->maxWordLength;
|
||||
ZI_WORK->maxWordLength = -1;
|
||||
if ((ziU8)Zi8LangSupported(parameters->language,ZI_WORK) == 0) {
|
||||
Zi8LogError(0x163,ZI_WORK);
|
||||
return 0;
|
||||
@@ -711,6 +711,6 @@ void Zi8Memcpy(ziU8* destination, ziU8* source, ziS32 count) {
|
||||
}
|
||||
|
||||
ziBool Zi8SetMaxWordLength(ziU8 length ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x0A = length;
|
||||
ZI_WORK->maxWordLength = length;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
Zi8Memset(__zi8_work_data, 0, 0x1B44);
|
||||
ZI_WORK->unk_0x08 = 1;
|
||||
ZI_WORK->unk_0x09 = 1;
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->maxWordLength = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->unk_0x1A = 0x20;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->unk_0x1B30 = 0;
|
||||
ZI_WORK->unk_0x1B3A = 0;
|
||||
@@ -44,7 +44,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x1874 = 0x2D;
|
||||
ZI_WORK->language = 0;
|
||||
ZI_WORK->unk_0x1C[3] = 0;
|
||||
ZI_WORK->unk_0x141A = 0x100;
|
||||
ZI_WORK->capacity = 0x100;
|
||||
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
|
||||
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
|
||||
ZI_WORK->unk_0x17 = 5;
|
||||
|
||||
@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
|
||||
}
|
||||
if (pdst[k - 1] != 0xF360 &&
|
||||
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
||||
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||
pdst[k++] = ZI_WORK->separator;
|
||||
}
|
||||
psrc += i;
|
||||
n -= i;
|
||||
|
||||
@@ -45,8 +45,8 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziWChar* cursor;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
ziU32 savedFormats = ZI_WORK->formats;
|
||||
ziU8 savedCount = ZI_WORK->formatCount;
|
||||
ziSearchState search = {0};
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (word == 0 || *word == 0) {
|
||||
@@ -73,22 +73,22 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
request.candidates = ordinals;
|
||||
request.maxCandidates = 1;
|
||||
request.firstCandidate = 0;
|
||||
ZI_WORK->unk_0x1410 = (ziU32)formats;
|
||||
ZI_WORK->formats = (ziU32)formats;
|
||||
if (ZI_WORK->unk_0x1C[0] == 2) {
|
||||
ZI_WORK->unk_0x1418 = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->unk_0x1418++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->unk_0x1418++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->unk_0x1418++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->unk_0x1418++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->unk_0x1418 = 2;
|
||||
else ZI_WORK->unk_0x1418 = 1;
|
||||
ZI_WORK->formatCount = 0;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 1;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 2;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 3;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 4;
|
||||
if (ZI_WORK->unk_0x09 & 1) formats[ZI_WORK->formatCount++] = 5;
|
||||
if (ZI_WORK->unk_0x09 & 4) formats[ZI_WORK->formatCount++] = 6;
|
||||
if (ZI_WORK->unk_0x09 & 2) formats[ZI_WORK->formatCount++] = 7;
|
||||
if (ZI_WORK->unk_0x09 & 8) formats[ZI_WORK->formatCount++] = 8;
|
||||
} else if (ZI_WORK->unk_0x1C[0] != 0) ZI_WORK->formatCount = 2;
|
||||
else ZI_WORK->formatCount = 1;
|
||||
count = Zi8GetCandidatesOrCount(&request, &search, __zi8_work_data);
|
||||
ZI_WORK->unk_0x1410 = savedFormats;
|
||||
ZI_WORK->unk_0x1418 = savedCount;
|
||||
ZI_WORK->formats = savedFormats;
|
||||
ZI_WORK->formatCount = savedCount;
|
||||
if (count != 0) return 1;
|
||||
}
|
||||
if (language != 1) {
|
||||
|
||||
@@ -242,8 +242,8 @@ typedef struct WPADCB {
|
||||
WPADCallback getInfoCB; // 0x988
|
||||
u8 getInfoBusy; // 0x98C
|
||||
|
||||
u8 unk_0x98D; // 0x98D
|
||||
u8 unk_0x98E; // 0x98E
|
||||
u8 encStatus; // 0x98D
|
||||
u8 continuous; // 0x98E
|
||||
u8 unk_0x98F[0x9A0 - 0x990];
|
||||
} WPADCB;
|
||||
|
||||
@@ -261,7 +261,7 @@ void WPADiExcludeButton(s32 chan);
|
||||
void WPADiCopyOut(s32 chan);
|
||||
|
||||
BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback);
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableDPD(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendEnableSpeaker(WPADCommandQueue* pQueue, BOOL enable, WPADCallback pCallback);
|
||||
BOOL WPADiSendGetContStat(WPADCommandQueue* pQueue, WPADInfo* pInfo, WPADCallback pCallback);
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct WPADMemBlock {
|
||||
int unk_0x04; // 0x04
|
||||
s16 unk_0x08; // 0x08
|
||||
int unk_0x0C; // 0x0C
|
||||
WPADCallback unk_0x10; // 0x10
|
||||
WPADCallback callback; // 0x10
|
||||
} WPADMemBlock;
|
||||
|
||||
typedef struct WPADGameInfo {
|
||||
|
||||
@@ -1283,7 +1283,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
p->sleeping = TRUE;
|
||||
p->getInfoBusy = FALSE;
|
||||
p->getInfoCB = NULL;
|
||||
p->unk_0x98E = 0;
|
||||
p->continuous = 0;
|
||||
|
||||
memset(&p->wpInfo, 0, sizeof(p->wpInfo));
|
||||
memset(&p->wmReadDataBuf, 0, sizeof(p->wmReadDataBuf));
|
||||
@@ -1315,7 +1315,7 @@ static void __ClearControlBlock(s32 chan) {
|
||||
_wmb[chan].unk_0x04 = 0;
|
||||
_wmb[chan].unk_0x08 = 0;
|
||||
_wmb[chan].unk_0x0C = 0;
|
||||
_wmb[chan].unk_0x10 = NULL;
|
||||
_wmb[chan].callback = NULL;
|
||||
|
||||
_rumbleCnt[chan] = 0;
|
||||
}
|
||||
@@ -1551,7 +1551,7 @@ static void firmwareCheckCallback(s32 chan, s32 status) {
|
||||
|
||||
DEBUGPrint(" ==>this error means that the firmware is for NDEV %s\n", p->configIndex != 0 ? "2.0" : "2.1 or later");
|
||||
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->unk_0x98E, &abortConnCallback);
|
||||
WPADiSendSetReportType(&p->stdCmdQueue, WPAD_FMT_CORE_BTN, p->continuous, &abortConnCallback);
|
||||
|
||||
WPADiSendDPDCSB(&p->stdCmdQueue, FALSE, &abortConnCallback);
|
||||
WPADiSendSetPort(&p->stdCmdQueue, port, &abortConnCallback);
|
||||
@@ -1626,7 +1626,7 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
p->status = WPAD_ERR_OK;
|
||||
p->radioSensitivity = 100;
|
||||
p->sleeping = FALSE;
|
||||
p->unk_0x98D = FALSE;
|
||||
p->encStatus = FALSE;
|
||||
|
||||
WPADiSendReadData(&p->stdCmdQueue, p->wmReadDataBuf, 1, WM_ADDR_MEM_1770, firmwareCheckCallback);
|
||||
|
||||
@@ -1643,8 +1643,8 @@ static void WPADiConnCallback(WUDDevInfo* devInfo, u8 open) {
|
||||
|
||||
if (p->cmdBlkCB != NULL) {
|
||||
p->cmdBlkCB(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].unk_0x10 != NULL) {
|
||||
_wmb[chan].unk_0x10(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
} else if (_wmb[chan].callback != NULL) {
|
||||
_wmb[chan].callback(chan, WPAD_ERR_NO_CONTROLLER);
|
||||
}
|
||||
|
||||
do {
|
||||
@@ -1886,7 +1886,7 @@ s32 WPADSetDataFormat(s32 chan, u32 format) {
|
||||
}
|
||||
|
||||
if (currFormat != format) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->unk_0x98E, NULL)) {
|
||||
if (!WPADiSendSetReportType(&p->stdCmdQueue, format, p->continuous, NULL)) {
|
||||
status = WPAD_ERR_COMMUNICATION_ERROR;
|
||||
} else {
|
||||
enabled = OSDisableInterrupts();
|
||||
@@ -2741,13 +2741,13 @@ BOOL WPADiSendSetPort(WPADCommandQueue* pQueue, u8 port, WPADCallback pCallback)
|
||||
return success;
|
||||
}
|
||||
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL unk, WPADCallback pCallback) {
|
||||
BOOL WPADiSendSetReportType(WPADCommandQueue* pQueue, s32 format, BOOL continuous, WPADCallback pCallback) {
|
||||
BOOL success;
|
||||
WPADCommand command;
|
||||
|
||||
command.reportID = RPTID_SET_DATA_REPORT_MODE;
|
||||
command.dataLength = RPT12_SIZE;
|
||||
command.dataBuf[RPT12_CONT_REPORT] = unk ? 0 : 4; // Always continuous reporting
|
||||
command.dataBuf[RPT12_CONT_REPORT] = continuous ? 0 : 4; // Always continuous reporting
|
||||
command.cmdCB = pCallback;
|
||||
|
||||
switch (format) {
|
||||
|
||||
@@ -111,8 +111,8 @@ static void initExtension(s32 chan) {
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat,
|
||||
p_wpd->unk_0x98E, abortInitExtension);
|
||||
p_wpd->unk_0x98D = 1;
|
||||
p_wpd->continuous, abortInitExtension);
|
||||
p_wpd->encStatus = 1;
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0x55, 0x04a400f0,
|
||||
abortInitExtension);
|
||||
WPADiSendWriteDataCmd(&p_wpd->extCmdQueue, 0, 0x04a400fb,
|
||||
@@ -127,7 +127,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
if (result != WPAD_ERR_NONE) {
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
p_wpd->unk_0x98D = 0;
|
||||
p_wpd->encStatus = 0;
|
||||
if (result == WPAD_ERR_NO_CONTROLLER) {
|
||||
type = WPAD_DEV_NOT_FOUND;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ static void abortInitExtension(s32 chan, s32 result) {
|
||||
|
||||
else {
|
||||
DEBUGPrint("detaching extension during initialization.\n");
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
return;
|
||||
}
|
||||
p_wpd->devType = (u8)type;
|
||||
@@ -509,7 +509,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
}
|
||||
} else {
|
||||
if (isExtEncMain(_devType[chan])) {
|
||||
p_wpd->unk_0x98D = 2;
|
||||
p_wpd->encStatus = 2;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKey(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -517,7 +517,7 @@ static void getExtType(s32 chan, s32 result) {
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey + 12, 4, 0x4A4004C, abortInitExtension);
|
||||
WPADiSendReadData(cmdq, p_wpd->wmReadDataBuf, 32, 0x4A40020, p_wpd->extensionCB);
|
||||
} else {
|
||||
p_wpd->unk_0x98D = 3;
|
||||
p_wpd->encStatus = 3;
|
||||
WPADiSendWriteDataCmd(cmdq, 0xAA, 0x4A400F0, abortInitExtension);
|
||||
WPADiCreateKeyFor3rd(chan);
|
||||
WPADiSendWriteData(cmdq, p_wpd->encryptionKey, 6, 0x4A40040, abortInitExtension);
|
||||
@@ -651,7 +651,7 @@ void __a1_20_status_report(u8 chan, u8* data) {
|
||||
p_wpd->devMode = 0;
|
||||
|
||||
WPADiClearQueue(&p_wpd->extCmdQueue);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->unk_0x98E, NULL);
|
||||
WPADiSendSetReportType(&p_wpd->extCmdQueue, p_wpd->dataFormat, p_wpd->continuous, NULL);
|
||||
|
||||
if (attach) {
|
||||
if (p_wpd->extensionCB) {
|
||||
@@ -741,11 +741,11 @@ void __a1_21_user_data(u8 chan, u8* data) {
|
||||
DEBUGPrint("length : %d\n", p_wpd->wmReadLength);
|
||||
status = (p_wpd->wmReadHadError < 0) ? WPAD_ERR_TRANSFER : 0;
|
||||
DEBUGPrint("i2c = %04x\n", i2c);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->unk_0x98D);
|
||||
DEBUGPrint("enc = %d\n", p_wpd->encStatus);
|
||||
|
||||
if (i2c == 0x04a4) {
|
||||
DEBUGPrint("Access to extension register.\n");
|
||||
if (p_wpd->unk_0x98D == 2 || p_wpd->unk_0x98D == 3) {
|
||||
if (p_wpd->encStatus == 2 || p_wpd->encStatus == 3) {
|
||||
DEBUGPrint("Decode!!!!\n");
|
||||
DEBUGPrint(" len = %d, addr = %04x\n", len, base);
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
|
||||
u32 buffer32[0xFB00];
|
||||
}; // 0x00
|
||||
|
||||
u32 unk_0x3EC00;
|
||||
u32 unk_0x3EC04;
|
||||
u32 size; // 0x3EC00
|
||||
u32 offset; // 0x3EC04
|
||||
BOOL allocated; // 0x3EC08
|
||||
u8 unk_0x3EC0C[0x34];
|
||||
} CDBCryptBuf;
|
||||
|
||||
@@ -19,7 +19,7 @@ typedef struct _CDBRecordFile {
|
||||
#else
|
||||
u8 unk_0x00[0x1C - 0x00];
|
||||
#endif
|
||||
int unk_0x1C;
|
||||
int allocFlag; // 0x1C
|
||||
CDBAttr attr; // 0x20
|
||||
CDBBridgeFile bridgeFile; // 0x42C
|
||||
u8 unk_0x434[0x438 - 0x434];
|
||||
|
||||
@@ -24,7 +24,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#ifdef NWC24_MSG_READ
|
||||
u32 headerSize;
|
||||
#elif defined(NWC24_MBOX_CTRL) || defined(NWC24_MSG_COMMIT)
|
||||
u32 unk_0x10;
|
||||
u32 headerSize; // 0x10
|
||||
#else
|
||||
u8 unk_0x10[0x4];
|
||||
#endif
|
||||
@@ -46,8 +46,8 @@ typedef struct NWC24MsgObjPrivate {
|
||||
#endif
|
||||
u32 date; // 0x28
|
||||
u32 receivedDate; // 0x2C
|
||||
NWC24Data unk_0x30;
|
||||
NWC24Data unk_0x38;
|
||||
NWC24Data fromData; // 0x30
|
||||
NWC24Data toData; // 0x38
|
||||
NWC24Data subject; // 0x40
|
||||
NWC24Data text; // 0x48
|
||||
NWC24Data unk_0x50;
|
||||
@@ -73,7 +73,7 @@ typedef struct NWC24MsgObjPrivate {
|
||||
};
|
||||
u32 raw;
|
||||
} msgBoardFlags; // 0xCC
|
||||
NWC24Data unk_0xD0;
|
||||
NWC24Data extraData; // 0xD0
|
||||
NWC24Data faceData; // 0xD8
|
||||
NWC24Data altName; // 0xE0
|
||||
u32 textSize; // 0xE4
|
||||
|
||||
@@ -26,9 +26,9 @@ extern struct NWC24Work {
|
||||
|
||||
u8 configData[1024]; // 0x1300
|
||||
|
||||
u8 unk_0x1700[128]; // 0x1700
|
||||
u8 unk_0x1780[128]; // 0x1780
|
||||
u8 unk_0x1800[256]; // 0x1800
|
||||
u8 sendMbcHeader[128]; // 0x1700
|
||||
u8 recvMbcHeader[128]; // 0x1780
|
||||
u8 mbcEntry[256]; // 0x1800
|
||||
u8 base64Work[256]; // 0x1900
|
||||
u8 unk_0x1A00[4096]; // 0x1A00
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ void CDBRecordInstanceInit(CDBRecordFile* recordFile, CDBRecord* record, int typ
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
recordFile->used = 1;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->unk_0x1C = type;
|
||||
recordFile->allocFlag = type;
|
||||
recordFile->database = record->unk_0x00;
|
||||
CDBAttrInit(&recordFile->attr);
|
||||
CDBRecordKeyCopy(&recordFile->key, &record->key);
|
||||
@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
goto open_result_ready;
|
||||
open_location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
} else {
|
||||
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return err;
|
||||
}
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
goto result_ready;
|
||||
location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
} else {
|
||||
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return result;
|
||||
}
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -310,7 +310,7 @@ CDBErr CDBRecordWrite_(CDBRecord* record, void* buffer, u32 size) {
|
||||
CDBReportError("can't write data in the record; the record is closed\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if ((recordFile->unk_0x1C & 2) == 0) {
|
||||
if ((recordFile->allocFlag & 2) == 0) {
|
||||
CDBReportError("can't write data in the record; the record is opened as READONLY\n");
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
@@ -687,7 +687,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
if ((s32)recordFile == 0) {
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (recordFile->unk_0x1C == 1) {
|
||||
if (recordFile->allocFlag == 1) {
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
if ((s32)buffer == 0) {
|
||||
@@ -699,7 +699,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
tempFile = record->file;
|
||||
if ((s32)tempFile == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (tempFile->unk_0x1C == 1) {
|
||||
} else if (tempFile->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetWiiId(&tempFile->attr, CDBGetWiiId());
|
||||
@@ -713,7 +713,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrInitIV(&((CDBRecordFile*)record->file)->attr);
|
||||
@@ -727,7 +727,7 @@ CDBErr CDBRecordEncrypt(CDBRecord* record, void* buffer, CDBRecordKey* key, u32
|
||||
CDBErr result;
|
||||
if ((s32)record->file == 0) {
|
||||
result = CDB_ERROR_27;
|
||||
} else if (((CDBRecordFile*)record->file)->unk_0x1C == 1) {
|
||||
} else if (((CDBRecordFile*)record->file)->allocFlag == 1) {
|
||||
result = CDB_ERROR_26;
|
||||
} else {
|
||||
CDBAttrSetKeyStr(&((CDBRecordFile*)record->file)->attr, key);
|
||||
|
||||
@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
|
||||
if (cryptBuf->unk_0x3EC00 < unk) {
|
||||
u32 unk = cryptBuf->size - cryptBuf->offset;
|
||||
if (cryptBuf->size < unk) {
|
||||
unk = 0;
|
||||
}
|
||||
|
||||
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
}
|
||||
|
||||
if (unk != 0) {
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
|
||||
cryptBuf->unk_0x3EC04 += unk;
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
|
||||
cryptBuf->offset += unk;
|
||||
}
|
||||
|
||||
if (readSize != NULL) {
|
||||
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
|
||||
if (cryptBuf != NULL) {
|
||||
switch (seek) {
|
||||
case CDB_SEEK_BEGIN: {
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset += offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_END: {
|
||||
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
|
||||
cryptBuf->offset = (cryptBuf->size - 1) - offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_CUR: {
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
cryptBuf->offset += offset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
|
||||
return cryptBuf->offset - sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ CDBErr CDBRecordFree(CDBRecord* record) {
|
||||
OSLockMutex((OSMutex*)recordFile);
|
||||
*(u32*)&recordFile->unk_0x00[0x18] = 0;
|
||||
OSUnlockMutex((OSMutex*)recordFile);
|
||||
recordFile->unk_0x1C = 0;
|
||||
recordFile->allocFlag = 0;
|
||||
record->file = NULL;
|
||||
OSUnlockMutex(&s_mutex);
|
||||
}
|
||||
|
||||
@@ -170,7 +170,7 @@ NWC24Err NWC24GetMsgObj(NWC24MsgObj* msg, NWC24MBoxType type, u32 id) {
|
||||
u32 count = 0;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
memset(entry, 0, sizeof(*entry));
|
||||
if (id == 0)
|
||||
return NWC24_ERR_HIDDEN;
|
||||
@@ -251,7 +251,7 @@ NWC24Err NWC24GetMsgIdList(NWC24MBoxType type, u32* ids, u32 maxLength) {
|
||||
MBCEntry* entry;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
err = GetCachedMBCHeader(type, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -307,11 +307,11 @@ NWC24Err NWC24iOpenMBox(void) {
|
||||
NWC24File recvFile, sendFile;
|
||||
char* path = NWC24WorkP->pathWork;
|
||||
NWC24Err err;
|
||||
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
|
||||
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
|
||||
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_SEND, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
|
||||
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
|
||||
err = GetCachedMBCHeader(NWC24_MBOX_TYPE_RECV, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -340,11 +340,11 @@ NWC24Err NWC24iInitMBox(void) {
|
||||
NWC24File recvFile, sendFile;
|
||||
NWC24Err recvResult, sendResult, err, sendStatus;
|
||||
char* path = NWC24WorkP->pathWork;
|
||||
Mail_memset(NWC24WorkP->unk_0x1700, 0, 128);
|
||||
Mail_memset(NWC24WorkP->sendMbcHeader, 0, 128);
|
||||
sendResult = CreateCtrlFile(NWC24_MBOX_TYPE_SEND, FALSE);
|
||||
if (sendResult < 0)
|
||||
return sendResult;
|
||||
Mail_memset(NWC24WorkP->unk_0x1780, 0, 128);
|
||||
Mail_memset(NWC24WorkP->recvMbcHeader, 0, 128);
|
||||
recvResult = CreateCtrlFile(NWC24_MBOX_TYPE_RECV, FALSE);
|
||||
if (recvResult < 0)
|
||||
return recvResult;
|
||||
@@ -616,11 +616,11 @@ static NWC24Err CreateCtrlFile(NWC24MBoxType type, BOOL force) {
|
||||
err = MakeCtrlPath(path, type);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
header = (MBCHeader*)NWC24WorkP->unk_0x1700;
|
||||
header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
|
||||
else if (type == NWC24_MBOX_TYPE_RECV)
|
||||
header = (MBCHeader*)NWC24WorkP->unk_0x1780;
|
||||
header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
|
||||
else
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
result = err;
|
||||
@@ -676,7 +676,7 @@ static NWC24Err DeleteMsg(NWC24MBoxType type, u32 id, BOOL protect) {
|
||||
NWC24Err err, deleteResult, closeResult;
|
||||
if (!NWC24IsMsgLibOpened() && !NWC24IsMsgLibOpenedByTool())
|
||||
return NWC24_ERR_LIB_NOT_OPENED;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
err = GetCachedMBCHeader(type, &header);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -754,7 +754,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
NWC24Err clearResult, deleteResult;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
return NWC24_OK;
|
||||
entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
for (offset = 128; offset < header->fileSize; offset += 128) {
|
||||
if (count >= header->numMessages)
|
||||
break;
|
||||
@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
|
||||
continue;
|
||||
}
|
||||
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
|
||||
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
|
||||
entry->flags == msg->headerSize && (s32)entry->date == (s32)msg->date) {
|
||||
duplicateId = entry->msgId;
|
||||
duplicateOffset = offset;
|
||||
continue;
|
||||
@@ -809,9 +809,9 @@ static NWC24Err GetCachedMBCHeader(NWC24MBoxType type, MBCHeader** header) {
|
||||
char* path;
|
||||
NWC24Err err = NWC24_OK, closeResult;
|
||||
if (type == NWC24_MBOX_TYPE_SEND)
|
||||
*header = (MBCHeader*)NWC24WorkP->unk_0x1700;
|
||||
*header = (MBCHeader*)NWC24WorkP->sendMbcHeader;
|
||||
else if (type == NWC24_MBOX_TYPE_RECV)
|
||||
*header = (MBCHeader*)NWC24WorkP->unk_0x1780;
|
||||
*header = (MBCHeader*)NWC24WorkP->recvMbcHeader;
|
||||
else {
|
||||
*header = NULL;
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
@@ -874,7 +874,7 @@ static NWC24Err InitMBCHeader(MBCHeader* header, NWC24MBoxType type) {
|
||||
|
||||
static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NWC24File* file) {
|
||||
u32 offset = header->freeOffset;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
u32 next;
|
||||
NWC24Err err;
|
||||
if (offset == 0)
|
||||
@@ -906,7 +906,7 @@ static NWC24Err AddMBCEntry(MBCHeader* header, const NWC24MsgObjPrivate* msg, NW
|
||||
}
|
||||
|
||||
static NWC24Err ClearMBCEntry(MBCHeader* header, NWC24File* file, u32 offset) {
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->unk_0x1800;
|
||||
MBCEntry* entry = (MBCEntry*)NWC24WorkP->mbcEntry;
|
||||
NWC24Err err = NWC24FSeek(file, offset, NWC24_SEEK_BEG);
|
||||
if (err != NWC24_OK)
|
||||
return err;
|
||||
@@ -947,8 +947,8 @@ static NWC24Err MountVFMBox(NWC24MBoxType type) {
|
||||
}
|
||||
|
||||
static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entry) {
|
||||
u32 field1 = ((u32)msg->unk_0x30.ptr & 0xFFFFF) | (msg->unk_0x30.size << 20);
|
||||
u32 field2 = ((u32)msg->unk_0x38.ptr & 0xFFFFF) | (msg->unk_0x38.size << 20);
|
||||
u32 field1 = ((u32)msg->fromData.ptr & 0xFFFFF) | (msg->fromData.size << 20);
|
||||
u32 field2 = ((u32)msg->toData.ptr & 0xFFFFF) | (msg->toData.size << 20);
|
||||
u32 field3 = ((u32)msg->subject.ptr & 0xFFFFF) | (msg->subject.size << 20);
|
||||
u32 field4 = ((u32)msg->unk_0x50.ptr & 0xFFFFF) | (msg->unk_0x50.size << 20);
|
||||
u32 field5 = ((u32)msg->unk_0x58.ptr & 0xFFFFF) | (msg->unk_0x58.size << 20);
|
||||
@@ -956,7 +956,7 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
|
||||
entry->type = msg->type;
|
||||
entry->length = msg->length;
|
||||
entry->appId = msg->appId;
|
||||
entry->flags = msg->unk_0x10;
|
||||
entry->flags = msg->headerSize;
|
||||
entry->tag = msg->tag;
|
||||
entry->ledPattern = msg->ledPattern;
|
||||
entry->crc = msg->unk_0x1C;
|
||||
@@ -1003,7 +1003,7 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->type = entry->type;
|
||||
msg->length = entry->length;
|
||||
msg->appId = entry->appId;
|
||||
msg->unk_0x10 = entry->flags;
|
||||
msg->headerSize = entry->flags;
|
||||
msg->tag = entry->tag;
|
||||
msg->ledPattern = entry->ledPattern;
|
||||
msg->unk_0x1C = entry->crc;
|
||||
@@ -1019,10 +1019,10 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
|
||||
msg->textSize = entry->textSize;
|
||||
msg->dwcId = entry->dwcId;
|
||||
msg->iconNew = entry->iconNew;
|
||||
msg->unk_0x30.ptr = (void*)offset1;
|
||||
msg->unk_0x30.size = size1;
|
||||
msg->unk_0x38.ptr = (void*)offset2;
|
||||
msg->unk_0x38.size = size2;
|
||||
msg->fromData.ptr = (void*)offset1;
|
||||
msg->fromData.size = size1;
|
||||
msg->toData.ptr = (void*)offset2;
|
||||
msg->toData.size = size2;
|
||||
msg->subject.ptr = (void*)offset3;
|
||||
msg->subject.size = size3;
|
||||
msg->unk_0x50.ptr = (void*)offset4;
|
||||
|
||||
@@ -243,11 +243,11 @@ static inline NWC24Err WriteMBDelayField(NWC24MsgObjPrivate* msg) {
|
||||
|
||||
static inline NWC24Err WriteExtraFields(NWC24MsgObjPrivate* msg) {
|
||||
NWC24Err err;
|
||||
if (msg->unk_0xD0.size == 0)
|
||||
if (msg->extraData.size == 0)
|
||||
return NWC24_OK;
|
||||
err = NWC24FWrite(msg->unk_0xD0.ptr, msg->unk_0xD0.size, m_pFile);
|
||||
err = NWC24FWrite(msg->extraData.ptr, msg->extraData.size, m_pFile);
|
||||
if (err == NWC24_OK)
|
||||
msg->length += msg->unk_0xD0.size;
|
||||
msg->length += msg->extraData.size;
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteString(msg, buffer));
|
||||
if (msg->type & 0x10000) {
|
||||
msg->unk_0x10 = msg->length;
|
||||
msg->headerSize = msg->length;
|
||||
buffer = NWC24WorkP->stringWork;
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_sprintf(buffer, "\r\n--%s", MultiPartDivider);
|
||||
@@ -339,7 +339,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
|
||||
}
|
||||
CHECK_WRITE(WriteContentTypeField(msg));
|
||||
if (!(msg->type & 0x10000))
|
||||
msg->unk_0x10 = msg->length;
|
||||
msg->headerSize = msg->length;
|
||||
text.ptr = (const void*)msg->length;
|
||||
{ NWC24Err textResult = WritePlainText(msg);
|
||||
err = textResult == NWC24_ERR_NULL ? NWC24_OK : textResult; }
|
||||
@@ -577,7 +577,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
Mail_memset(buffer, 0, 1024);
|
||||
Mail_strncat(buffer, "From: ", 1022);
|
||||
address = buffer + 6;
|
||||
msg->unk_0x30.ptr = (const void*)(msg->length + 6);
|
||||
msg->fromData.ptr = (const void*)(msg->length + 6);
|
||||
type = 1;
|
||||
if (msg->type & 0x100000)
|
||||
type = 2;
|
||||
@@ -596,7 +596,7 @@ static NWC24Err WriteFromField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total;
|
||||
msg->unk_0x30.size = msg->length - (u32)msg->unk_0x30.ptr - 2;
|
||||
msg->fromData.size = msg->length - (u32)msg->fromData.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
@@ -612,7 +612,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
cursor += 4;
|
||||
index = 0;
|
||||
total = 4;
|
||||
msg->unk_0x38.ptr = (const void*)(msg->length + 4);
|
||||
msg->toData.ptr = (const void*)(msg->length + 4);
|
||||
remaining = 1018;
|
||||
for (; index < msg->numTo; ++index) {
|
||||
err = SynthesizeAddrStr(&msg->toAddrs[index], msg->type, cursor, remaining, &length);
|
||||
@@ -641,7 +641,7 @@ static NWC24Err WriteToField(NWC24MsgObjPrivate* msg) {
|
||||
err = NWC24FWrite(NWC24WorkP->stringWork, total + 2, m_pFile);
|
||||
if (err == NWC24_OK) {
|
||||
msg->length += total + 2;
|
||||
msg->unk_0x38.size = msg->length - (u32)msg->unk_0x38.ptr - 2;
|
||||
msg->toData.size = msg->length - (u32)msg->toData.ptr - 2;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
|
||||
@@ -73,11 +73,11 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
|
||||
msgObj->attachedType[i] = NWC24_TEXT_PLAIN;
|
||||
}
|
||||
|
||||
NWC24Data_Init(&msgObj->unk_0x30);
|
||||
NWC24Data_Init(&msgObj->unk_0x38);
|
||||
NWC24Data_Init(&msgObj->fromData);
|
||||
NWC24Data_Init(&msgObj->toData);
|
||||
NWC24Data_Init(&msgObj->unk_0x50);
|
||||
NWC24Data_Init(&msgObj->unk_0x58);
|
||||
NWC24Data_Init(&msgObj->unk_0xD0);
|
||||
NWC24Data_Init(&msgObj->extraData);
|
||||
NWC24Data_Init(&msgObj->faceData);
|
||||
NWC24Data_Init(&msgObj->altName);
|
||||
|
||||
|
||||
@@ -289,7 +289,7 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
default:
|
||||
return result;
|
||||
}
|
||||
if (privateMsg->unk_0x30.size == 0)
|
||||
if (privateMsg->fromData.size == 0)
|
||||
return NWC24_ERR_NULL;
|
||||
result = NWC24iMBoxOpenStoredMsg(type, privateMsg->msgId, &file);
|
||||
switch (result) {
|
||||
@@ -300,9 +300,9 @@ NWC24Err NWC24ReadMsgFromAddr(const NWC24MsgObj* msg, char* address, u32 capacit
|
||||
}
|
||||
result = NWC24FStreamInit(&stream, &file, 0, privateMsg->length, buffer, 1024);
|
||||
if (result == NWC24_OK) {
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->unk_0x30.ptr);
|
||||
result = NWC24FStreamSeek(&stream, (u32)privateMsg->fromData.ptr);
|
||||
if (result == NWC24_OK)
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->unk_0x30.size, 0, address, capacity);
|
||||
result = NWC24iExtractAddrSpec(&stream, privateMsg->fromData.size, 0, address, capacity);
|
||||
}
|
||||
closeResult = NWC24iMBoxCloseMsg(&file);
|
||||
if (result != NWC24_OK)
|
||||
|
||||
@@ -113,10 +113,10 @@ namespace textinput {
|
||||
namespace extend {
|
||||
namespace memo {
|
||||
|
||||
DispMemoState sDispMemoState;
|
||||
EditMemoState sEditMemoState;
|
||||
AppearMemoState sAppearMemoState;
|
||||
DisappearMemoState sDisappearMemoState;
|
||||
static DispMemoState sDispMemoState;
|
||||
static EditMemoState sEditMemoState;
|
||||
static AppearMemoState sAppearMemoState;
|
||||
static DisappearMemoState sDisappearMemoState;
|
||||
|
||||
struct MemoPosition {
|
||||
f32 x;
|
||||
|
||||
@@ -402,9 +402,6 @@ namespace textinput {
|
||||
init();
|
||||
}
|
||||
|
||||
void gui::GUIInterface::create() {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
|
||||
CandidateTextAnmPane* pane;
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
@@ -1612,10 +1609,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
u16 gui::GUIComponent::getFlightDuration(int point) {
|
||||
return mFlightDuration[point];
|
||||
}
|
||||
|
||||
UIButton::UIButton(u32 id, LayoutByNW4R* layout, UIObj::Listener* listener)
|
||||
: UIObj(id, layout, listener), mpButtonPane(NULL), mpButtonBoundPane(NULL), mpButtonAnmPane(NULL) {
|
||||
}
|
||||
|
||||
@@ -752,10 +752,6 @@ namespace textinput {
|
||||
mpPredictLanguageDialog = dialog;
|
||||
}
|
||||
|
||||
void gui::GUIComponent::setFlightDuration(int point, u16 duration) {
|
||||
mFlightDuration[point] = duration;
|
||||
}
|
||||
|
||||
bool LayoutByNW4R::updateInput(int channel, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) {
|
||||
return nw4rmanager::Layout::updateInput(channel, x, y, trig, hold, release, data);
|
||||
}
|
||||
@@ -967,10 +963,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool toolbar::LayoutByNW4R::isEnableKeytopChange() const { return mbIsEnableQwertyChg; }
|
||||
|
||||
keyboard::pctype::LayoutByNW4R* Manager::getPCKeyboard() { return mpPCKeyboard; }
|
||||
|
||||
void LayoutByNW4R::setLangKeyActive(bool enabled) {
|
||||
Base::setLangKeyActive(enabled);
|
||||
if (getLanguage() == KR || getLanguage() == CN) {
|
||||
|
||||
@@ -1564,8 +1564,6 @@ void Base::resetRelation() {
|
||||
mpUnfixString->resetRelation();
|
||||
}
|
||||
|
||||
keyboard::hwkey::HWKeyboard* Manager::getHWKeyboard() { return mpHWKeyboard; }
|
||||
|
||||
inline void DeadKeyStream::init() {
|
||||
KPRInitQueue(&mKPRQueue);
|
||||
KPRSetMode(&mKPRQueue, KPR_MODE_DEADKEY);
|
||||
@@ -3433,8 +3431,6 @@ void Base::finishDraw(u32) {}
|
||||
|
||||
void Base::onSE(sound::SE) {}
|
||||
|
||||
keyboard::cellphonetype::LayoutByNW4R* Manager::getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
|
||||
void Base::setString(const wchar_t* string) {
|
||||
mpString->set(string);
|
||||
}
|
||||
@@ -3653,7 +3649,6 @@ void WithAtok::setInputting(wchar_t ch) {}
|
||||
void WithAtok::setSelectedCandidate(s32 index) {}
|
||||
void WithAtok::startConverting() {}
|
||||
bool WithAtok::isFix() { return true; }
|
||||
const candidatebox::LayoutByNW4R* Manager::getCandidateBox() const { return mpCandidateBox; }
|
||||
bool WithAtok::isConverting() { return false; }
|
||||
s16 WithAtok::getSelectedConverting() { return 0; }
|
||||
bool WithAtok::isDictionaryOpened() { return false; }
|
||||
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
}}
|
||||
#include "keyboard/tiManager.h"
|
||||
namespace textinput {
|
||||
EventObserver defaultEventObserver;
|
||||
static EventObserver defaultEventObserver;
|
||||
|
||||
Manager::Manager(MEMAllocator* allocator, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer)
|
||||
: mpAllocator(allocator), mpMultiArcResourceAccessor(accessor), mpEditBuffer(NULL), mpHWKeyboard(NULL), mpPCKeyboard(NULL),
|
||||
|
||||
@@ -489,15 +489,7 @@ namespace textinput {
|
||||
{csUSKeyboard, csGridKeyboard, csPaneNameToControlKey, &csKRAsciiVisiblePanes, NULL},
|
||||
};
|
||||
|
||||
struct LanguageDependencyData {
|
||||
LanguageData data;
|
||||
u32 flags;
|
||||
};
|
||||
|
||||
static const LanguageDependencyData csJapanKanaInput = {
|
||||
{csJPKeyboard, csGridKeyboard, csPaneNameToControlKey, &csJPNAsciiVisiblePanes, NULL},
|
||||
0,
|
||||
};
|
||||
static const LanguageData csJapanKanaInput = {csJPKeyboard, csGridKeyboard, csPaneNameToControlKey, &csJPNAsciiVisiblePanes, NULL};
|
||||
|
||||
struct AnimationFile {
|
||||
u32 id;
|
||||
@@ -1312,18 +1304,6 @@ namespace textinput {
|
||||
&csAninationFile[6], &csAninationFile[7], NULL, NULL, NULL, NULL}},
|
||||
};
|
||||
|
||||
const hwkey::HWKeyboard* Manager::getHWKeyboard() const {
|
||||
return mpHWKeyboard;
|
||||
}
|
||||
|
||||
bool toolbar::Base::isQwerty() const {
|
||||
return mQwerty;
|
||||
}
|
||||
|
||||
const toolbar::LayoutByNW4R* Manager::getToolBar() const {
|
||||
return mpToolBar;
|
||||
}
|
||||
|
||||
Base::TranslateMode Base::getTranslateMode() const {
|
||||
switch (static_cast<int>(mKeyState.abcFlags & 15)) {
|
||||
case 0:
|
||||
@@ -1337,14 +1317,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
const LayoutByNW4R* Manager::getPCKeyboard() const {
|
||||
return mpPCKeyboard;
|
||||
}
|
||||
|
||||
Language Manager::getLanguage() const {
|
||||
return meLanguage;
|
||||
}
|
||||
|
||||
bool Base::isCapsOn() const {
|
||||
return (mKeyState.abcFlags >> 6) & 1;
|
||||
}
|
||||
@@ -1353,7 +1325,7 @@ namespace textinput {
|
||||
mpAllocator = allocator;
|
||||
}
|
||||
|
||||
inline void Base::init() {
|
||||
void Base::init() {
|
||||
mState.rejected = false;
|
||||
Language language = getLanguage();
|
||||
mKeyState.inputType = 0;
|
||||
@@ -1371,14 +1343,6 @@ namespace textinput {
|
||||
sendCommand(18, &mode);
|
||||
}
|
||||
|
||||
Language KeyboardBase::getLanguage() const {
|
||||
return meLanguage;
|
||||
}
|
||||
|
||||
void CommandSender::sendCommand(u32 command, void* data) {
|
||||
if (mpCommandReceiver != NULL) mpCommandReceiver->onCommand(static_cast<CommandReceiver::INPUT_COMMAND>(command), data);
|
||||
}
|
||||
|
||||
void Base::inputCharCode(wchar_t code) {
|
||||
sendInputWChar(code, false);
|
||||
}
|
||||
@@ -1465,10 +1429,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool inputform::Base::canConvert() {
|
||||
return getCurrentString(false) == mpUnfixString;
|
||||
}
|
||||
|
||||
void Base::goSignInputMode() {
|
||||
}
|
||||
|
||||
@@ -1636,10 +1596,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
toolbar::LayoutByNW4R* Manager::getToolBar() {
|
||||
return mpToolBar;
|
||||
}
|
||||
|
||||
bool Base::isABC() {
|
||||
return mKeyState.inputType == 0;
|
||||
}
|
||||
@@ -1654,7 +1610,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void Base::setTranslateMode(TranslateMode mode) {
|
||||
u32 keyMode;
|
||||
u32 keyMode = mode;
|
||||
switch (mode) {
|
||||
case TM_Direct:
|
||||
keyMode = 0;
|
||||
@@ -1676,15 +1632,11 @@ namespace textinput {
|
||||
mpManager->getCandidateBox()->checkValidation();
|
||||
TranslateMode inputMode = mode;
|
||||
sendCommand(18, &inputMode);
|
||||
mpInitialLanguageData = &csJapanKanaInput.data;
|
||||
mpInitialLanguageData = &csJapanKanaInput;
|
||||
sendCommand(41, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
candidatebox::LayoutByNW4R* Manager::getCandidateBox() {
|
||||
return mpCandidateBox;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::setABC(bool abc) {
|
||||
changeAnimationAllToNormal();
|
||||
if (abc != isABC()) {
|
||||
@@ -1713,7 +1665,7 @@ namespace textinput {
|
||||
if ((abcFlags & 15) == 0)
|
||||
data = &csLanguageDependencyData[language];
|
||||
else if (language == JP)
|
||||
data = &csJapanKanaInput.data;
|
||||
data = &csJapanKanaInput;
|
||||
else
|
||||
data = &csLanguageDependencyData[language];
|
||||
struct BooleanMode {
|
||||
@@ -1911,9 +1863,6 @@ namespace textinput {
|
||||
UIObj::~UIObj() {
|
||||
}
|
||||
|
||||
gui::EventHandler::~EventHandler() {
|
||||
}
|
||||
|
||||
UIModifierButton::~UIModifierButton() {
|
||||
}
|
||||
|
||||
@@ -1995,10 +1944,6 @@ namespace textinput {
|
||||
AnmPane::~AnmPane() {
|
||||
}
|
||||
|
||||
TiLayout* nw4rmanager::Layout::getLayout() {
|
||||
return mpLayout;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::init() {
|
||||
Base::init();
|
||||
setLineFeedButton(true);
|
||||
@@ -2340,16 +2285,6 @@ namespace textinput {
|
||||
cancelStateFocusIn();
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::initPaneLastDrawReceived() {
|
||||
mAnmPaneFifo.init();
|
||||
}
|
||||
|
||||
void nw4rmanager::PaneFifo::init() {
|
||||
for (int i = 0; i < MAX_COUNT; i++) {
|
||||
mpaFifo[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::throwReleaseForAll() {
|
||||
for (AnmPane* pane = static_cast<AnmPane*>(nw4r::ut::List_GetFirst(&mAnmPanes)); pane != NULL;
|
||||
pane = static_cast<AnmPane*>(nw4r::ut::List_GetNext(&mAnmPanes, pane))) {
|
||||
@@ -2358,13 +2293,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
int AnmPane::getKeyType() const {
|
||||
return mKeyType;
|
||||
}
|
||||
|
||||
void nw4rmanager::AnmPane::onAnmEvent(AnmPaneEvent) {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::cancelStateFocusIn() {
|
||||
for (AnmPane* pane = static_cast<AnmPane*>(nw4r::ut::List_GetFirst(&mAnmPanes)); pane != NULL;
|
||||
pane = static_cast<AnmPane*>(nw4r::ut::List_GetNext(&mAnmPanes, pane))) {
|
||||
@@ -2419,10 +2347,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
int AnmPane::getState() const {
|
||||
return mAnimation;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::goSignInputMode() {
|
||||
mpSignWindow->open(this, false);
|
||||
throwReleaseForAll();
|
||||
@@ -2461,39 +2385,6 @@ namespace textinput {
|
||||
updateDakuten();
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* nw4rmanager::PaneFifo::getLast() {
|
||||
for (int i = MAX_COUNT-1; i > -1; i--) {
|
||||
if (mpaFifo[i] != NULL) {
|
||||
return mpaFifo[i];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::setPaneLastDrawReceived(nw4r::lyt::Pane* pane) {
|
||||
mAnmPaneFifo.push(pane);
|
||||
}
|
||||
|
||||
void nw4rmanager::PaneFifo::push(nw4r::lyt::Pane* pane) {
|
||||
if (mpaFifo[MAX_COUNT-1] == NULL) {
|
||||
for (int i = 0; i < MAX_COUNT; i++) {
|
||||
if (mpaFifo[i] == NULL) {
|
||||
mpaFifo[i] = pane;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (int i = 1; i < MAX_COUNT; i++) {
|
||||
mpaFifo[i-1] = mpaFifo[i];
|
||||
if (pane == mpaFifo[i-1]) {
|
||||
mpaFifo[i-1] = NULL;
|
||||
}
|
||||
}
|
||||
mpaFifo[MAX_COUNT-1] = pane;
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::updateDakuten() {
|
||||
if (mKeyState.aiuFlags & 32)
|
||||
searchAnmPane("P_Gkey_dakuten")->onAnmEvent(static_cast<AnmPane::AnmPaneEvent>(6));
|
||||
@@ -2552,10 +2443,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool candidatebox::LayoutByNW4R::isActive() const {
|
||||
return mbActive;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::setLangKeyActive(bool active) {
|
||||
Base::setLangKeyActive(active);
|
||||
if (getLanguage() == KR || getLanguage() == CN) {
|
||||
@@ -2579,10 +2466,10 @@ namespace textinput {
|
||||
mpInitialLanguageData = &csLanguageDependencyData[getLanguage()];
|
||||
break;
|
||||
case 1:
|
||||
mpInitialLanguageData = &csJapanKanaInput.data;
|
||||
mpInitialLanguageData = &csJapanKanaInput;
|
||||
break;
|
||||
case 2:
|
||||
mpInitialLanguageData = &csJapanKanaInput.data;
|
||||
mpInitialLanguageData = &csJapanKanaInput;
|
||||
break;
|
||||
}
|
||||
initLayout();
|
||||
@@ -2844,10 +2731,6 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool gui::GUIComponent::isDragging(int point) {
|
||||
return mbDragging[point];
|
||||
}
|
||||
|
||||
void AnmPane::changeAnimation(u32 animation) {
|
||||
mAnimation = animation;
|
||||
nw4rmanager::AnmPane::changeAnimation(animation == 16 ? 2 : animation);
|
||||
@@ -3194,14 +3077,6 @@ namespace textinput {
|
||||
: UIObj(id, layout, listener), mpPaneComponent(NULL), mpBoundingComponent(NULL), mpAnimation(NULL), mbOn(false) {
|
||||
}
|
||||
|
||||
gui::PaneManager* nw4rmanager::Layout::getPaneManager() {
|
||||
return mpPaneManager;
|
||||
}
|
||||
|
||||
void gui::GUIComponent::setTriggerTarget(bool bEnable) {
|
||||
mbTriggerTarget = bEnable;
|
||||
}
|
||||
|
||||
void UIModifierButton::onGUIEvent(gui::PaneComponent&, u32 event, nw4rmanager::TiEventHandler::Input* input) {
|
||||
const char* name = "P_key_CAPS";
|
||||
if (mId == 1)
|
||||
@@ -3257,37 +3132,6 @@ namespace textinput {
|
||||
void UIModePanel::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
|
||||
}
|
||||
|
||||
void KeyboardBase::update() {
|
||||
}
|
||||
|
||||
nw4r::ut::List& nw4rmanager::Layout::getAnmPaneList() {
|
||||
return mAnmPanes;
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::setAnimOn(bool flag) {
|
||||
mbAnimOn = flag;
|
||||
}
|
||||
|
||||
nw4rmanager::Anim* nw4rmanager::AnmPane::searchAnimation(u32 id) {
|
||||
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
|
||||
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
|
||||
if (animation->muID == id) return animation;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool nw4rmanager::AnmPane::isInAnimation() {
|
||||
return mpCurrentAnim != NULL;
|
||||
}
|
||||
|
||||
int gui::EventHandler::getLatestEventCtrlNo() {
|
||||
return muLatestEventCtrlNo;
|
||||
}
|
||||
|
||||
void gui::EventHandler::setLatestEventCtrlNo(int ctrlNo) {
|
||||
muLatestEventCtrlNo = ctrlNo;
|
||||
}
|
||||
|
||||
Base::InputMode Base::getAIUInputMode() const {
|
||||
switch (static_cast<int>(mKeyState.aiuFlags & 15)) {
|
||||
case 0:
|
||||
@@ -3346,19 +3190,12 @@ namespace textinput {
|
||||
void UIObj::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
|
||||
}
|
||||
|
||||
void nw4rmanager::TiEventHandler::setEventObserver(EventObserver* event) {
|
||||
mpEventObserver = event;
|
||||
}
|
||||
|
||||
void Base::setInputModeCK(u32) {
|
||||
}
|
||||
|
||||
void Base::setInputModeJP(bool, u32, u32) {
|
||||
}
|
||||
|
||||
void gui::EventHandler::onEvent(gui::GUIComponent&, u32, void*) {
|
||||
}
|
||||
|
||||
SelectorPosition chinesePosition = {{-219.0f, -130.0f, 0.0f}};
|
||||
SelectorPosition koreanPosition = {{-209.0f, -90.0f, 0.0f}};
|
||||
|
||||
|
||||
@@ -246,8 +246,8 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
|
||||
nw4r::ut::List_Append(&mAnmPanes, pane);
|
||||
forceName = paneInfo.forceName;
|
||||
u16 animationIndex = 0;
|
||||
animationCount = paneInfo.animationCount;
|
||||
u16 animationIndex = 0;
|
||||
while (animationIndex < animationCount) {
|
||||
const AnimationFile* const& animation = paneInfo.animations[animationIndex];
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation->name);
|
||||
|
||||
@@ -150,7 +150,6 @@ void Decolated::inputChar(wchar_t ch) {
|
||||
input[1] = 0;
|
||||
input[0] = 0;
|
||||
u16 count;
|
||||
u32 inputIndex = 0;
|
||||
if (static_cast<u32>(mTranslateMode) - 1 > 1) {
|
||||
goto nonKana;
|
||||
}
|
||||
@@ -174,15 +173,9 @@ void Decolated::inputChar(wchar_t ch) {
|
||||
}
|
||||
nonKana:
|
||||
if (mTranslateMode == 3) {
|
||||
inputIndex = 0;
|
||||
input[0] = 0;
|
||||
if (ch == 10) {
|
||||
inputIndex = 0;
|
||||
}
|
||||
input[inputIndex] = ch;
|
||||
++inputIndex;
|
||||
input[inputIndex] = 0;
|
||||
count = inputIndex;
|
||||
input[0] = ch;
|
||||
input[1] = 0;
|
||||
count = 1;
|
||||
mKanaStream.mOutput[0] = 0;
|
||||
} else {
|
||||
count = 1;
|
||||
|
||||
@@ -111,13 +111,14 @@ void WithZi::init() {
|
||||
|
||||
void WithZi::clearCandidates() {
|
||||
if (mbDictionaryOpen != 0) {
|
||||
u16* const candidates = CandidatesBuffer;
|
||||
mInputLength = 0;
|
||||
mCandidateCount = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(&ElementBuffer[0x100], 0, 0x200);
|
||||
memset(&ElementBuffer[0x200], 0, 0x1fe);
|
||||
memset(&ElementBuffer[0x300], 0, 0x200);
|
||||
memset(&ElementBuffer[0x400], 0, 0x1400);
|
||||
memset(candidates, 0, 0x200);
|
||||
memset(candidates + 0x100, 0, 0x1fe);
|
||||
memset(candidates + 0x200, 0, 0x200);
|
||||
memset(CandidatedWord, 0, 0x1400);
|
||||
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
|
||||
mSearch.language = getPredictLanguage();
|
||||
mSearch.subLanguage = 7;
|
||||
@@ -125,7 +126,7 @@ void WithZi::clearCandidates() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(ElementBuffer + 0x300);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = 0;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -297,7 +298,7 @@ void WithZi::update() {
|
||||
return;
|
||||
}
|
||||
|
||||
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&ElementBuffer[0x300]);
|
||||
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
|
||||
mSelectedCandidate = 0;
|
||||
s32 elementCount = static_cast<u16>(setElementBuffer());
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -350,12 +351,12 @@ void WithZi::update() {
|
||||
EZTXGetCandidates(&mSearch, mpDictionaryWork);
|
||||
}
|
||||
else {
|
||||
memcpy(candidateOutput, &ElementBuffer[0x100], 0x200);
|
||||
memcpy(&CandidatesBuffer[0x200], CandidatesBuffer, 0x200);
|
||||
ChangeDictionaryLanguage(getPredictLanguage());
|
||||
u32 count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
if (getPredictLanguage() == 1 && count == 0x61) {
|
||||
mSearch.firstCandidate = 0x61;
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&ElementBuffer[0x3c2]);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x2c2]);
|
||||
mSearch.maxCandidates = 199;
|
||||
count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -510,12 +511,14 @@ scanDone:
|
||||
}
|
||||
|
||||
u32 WithZi::setElementBuffer() {
|
||||
u16* elements;
|
||||
u16* candidates;
|
||||
u16 inputCharacter;
|
||||
u32 count = 0;
|
||||
u16* elements = ElementBuffer;
|
||||
u16* candidates = &ElementBuffer[0x100];
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(&candidates[0x100], 0, 0x1fe);
|
||||
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
|
||||
elements = ElementBuffer;
|
||||
candidates = CandidatesBuffer;
|
||||
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
u16 index = count;
|
||||
elements[index] = inputCharacter;
|
||||
|
||||
@@ -930,13 +930,13 @@ namespace ipl {
|
||||
math::VEC3 translate(mpLayout->FindPaneByName("N_Memo")->GetTranslate());
|
||||
|
||||
mURLProc.clear_prev_drawing();
|
||||
mURLProc.setUnk_0x44(translate.y);
|
||||
mURLProc.setMemoTranslateY(translate.y);
|
||||
|
||||
bool result = false;
|
||||
if (mState == STATE_NORMAL && mScroller.is_busy() == FALSE) {
|
||||
result = true;
|
||||
}
|
||||
mURLProc.setUnk_0x53(result);
|
||||
mURLProc.setFocusEnabled(result);
|
||||
|
||||
if (translate.y < 500.0f) {
|
||||
mpLayout->draw("N_Header");
|
||||
@@ -983,8 +983,8 @@ namespace ipl {
|
||||
mpLayout->draw("ReplyMask");
|
||||
}
|
||||
|
||||
if (!mURLProc.getUnk_0x50()) {
|
||||
mURLProc.setUnk_0x50(1);
|
||||
if (!mURLProc.getColorPass()) {
|
||||
mURLProc.setColorPass(1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1512,7 +1512,7 @@ namespace ipl {
|
||||
mURLProc.init();
|
||||
|
||||
if (mpBoardObj->mLetterType == BoardObject::TYPE_MEMO) {
|
||||
mURLProc.setUnk_0x40(8.0f);
|
||||
mURLProc.setHitYOffset(8.0f);
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("T_Letter");
|
||||
|
||||
@@ -15,16 +15,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::init() {
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
unk_0x50 = 0;
|
||||
unk_0x53 = 1;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
mbColorPass = 0;
|
||||
mbFocusEnabled = 1;
|
||||
|
||||
unk_0x40 = 0.0f;
|
||||
unk_0x44 = 0.0f;
|
||||
mHitYOffset = 0.0f;
|
||||
mMemoTranslateY = 0.0f;
|
||||
|
||||
unk_0x48 = 0;
|
||||
unk_0x4C = -1;
|
||||
mCurTagNo = 0;
|
||||
mSelectedTagNo = -1;
|
||||
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
mConData[i].valid = false;
|
||||
@@ -60,14 +60,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void UrlProcessor::clear_prev_drawing() {
|
||||
unk_0x48 = 0;
|
||||
unk_0x52 = 0;
|
||||
unk_0x51 = 0;
|
||||
mCurTagNo = 0;
|
||||
mbHoverOffset = 0;
|
||||
mbInTag = 0;
|
||||
}
|
||||
|
||||
nw4r::ut::Operation UrlProcessor::Process(u16 code, nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
if (code == SEPERATOR || code == (u16)'\n') {
|
||||
if (unk_0x50 == 0) {
|
||||
if (mbColorPass == 0) {
|
||||
make_collision(context, code);
|
||||
} else if (code == SEPERATOR) {
|
||||
parse(context);
|
||||
@@ -78,42 +78,42 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::make_collision(nw4r::ut::PrintContext<wchar_t>* context, u16 code) {
|
||||
if (code == SEPERATOR) {
|
||||
if (unk_0x51 == 0) {
|
||||
if (mbInTag == 0) {
|
||||
url_collision* const url_col = new (System::getMem2App(), 4) url_collision();
|
||||
line_collision* const line_col = new (System::getMem2App(), 4) line_collision();
|
||||
|
||||
url_col->unk_0x00 = unk_0x48;
|
||||
url_col->unk_0x04 = (wchar_t*)context->str;
|
||||
url_col->mTagNo = mCurTagNo;
|
||||
url_col->mpStart = (wchar_t*)context->str;
|
||||
|
||||
line_col->unk_0x00 = context->writer->GetCursorX();
|
||||
line_col->mLeft = context->writer->GetCursorX();
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
nw4r::ut::List_Append(&mUrlCollisions, url_col);
|
||||
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
void* url_col_raw = nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
void* line_col_raw = nw4r::ut::List_GetPrev(&((url_collision*)url_col_raw)->mLineCollisions, NULL);
|
||||
url_collision* url_col = (url_collision*)url_col_raw;
|
||||
line_collision* line_col = (line_collision*)line_col_raw;
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
url_col->unk_0x08 = (wchar_t*)context->str;
|
||||
url_col->mpEnd = (wchar_t*)context->str;
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
} else {
|
||||
if (unk_0x51 != 0) {
|
||||
if (mbInTag != 0) {
|
||||
url_collision* url_col = (url_collision*)nw4r::ut::List_GetPrev(&mUrlCollisions, NULL);
|
||||
line_collision* line_col = (line_collision*)nw4r::ut::List_GetPrev(&url_col->mLineCollisions, NULL);
|
||||
|
||||
line_col->unk_0x04 = context->writer->GetCursorX();
|
||||
line_col->unk_0x08 = context->writer->GetCursorY();
|
||||
line_col->mRight = context->writer->GetCursorX();
|
||||
line_col->mY = context->writer->GetCursorY();
|
||||
|
||||
line_col = new (System::getMem2App(), 4) line_collision();
|
||||
line_col->unk_0x00 = -208.0f;
|
||||
line_col->mLeft = -208.0f;
|
||||
|
||||
nw4r::ut::List_Append(&url_col->mLineCollisions, line_col);
|
||||
}
|
||||
@@ -122,41 +122,41 @@ namespace ipl {
|
||||
|
||||
void UrlProcessor::parse(nw4r::ut::PrintContext<wchar_t>* context) {
|
||||
f32 curY = context->writer->GetCursorY();
|
||||
if (unk_0x51 == 0) {
|
||||
if (unk_0x4C == unk_0x48) {
|
||||
if (mbInTag == 0) {
|
||||
if (mSelectedTagNo == mCurTagNo) {
|
||||
context->writer->SetTextColor(0xFFE664FF);
|
||||
} else if (unk_0x53 != 0 && is_focused()) {
|
||||
} else if (mbFocusEnabled != 0 && is_focused()) {
|
||||
context->writer->SetCursorY(curY - 2.0f);
|
||||
context->writer->SetTextColor(0xF06E28FF);
|
||||
unk_0x52 = 1;
|
||||
mbHoverOffset = 1;
|
||||
} else {
|
||||
context->writer->SetTextColor(0x34BEEDFF);
|
||||
}
|
||||
unk_0x51 = 1;
|
||||
mbInTag = 1;
|
||||
} else {
|
||||
if (unk_0x52 != 0) {
|
||||
if (mbHoverOffset != 0) {
|
||||
context->writer->SetCursorY(2.0f + curY);
|
||||
unk_0x52 = 0;
|
||||
mbHoverOffset = 0;
|
||||
}
|
||||
|
||||
context->writer->SetTextColor(0x646464FF);
|
||||
|
||||
unk_0x51 = 0;
|
||||
unk_0x48++;
|
||||
mbInTag = 0;
|
||||
mCurTagNo++;
|
||||
}
|
||||
}
|
||||
|
||||
BOOL UrlProcessor::is_focused() const {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
if (unk_0x48 == get_focused_tagno(i)) {
|
||||
if (mCurTagNo == get_focused_tagno(i)) {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void UrlProcessor::select(int unk) {
|
||||
unk_0x4C = unk;
|
||||
void UrlProcessor::select(int tagNo) {
|
||||
mSelectedTagNo = tagNo;
|
||||
}
|
||||
|
||||
int UrlProcessor::get_focused_tagno(int chan) const {
|
||||
@@ -174,13 +174,13 @@ namespace ipl {
|
||||
|
||||
while (url_col = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, url_col), url_col != NULL) {
|
||||
while (line_col = (line_collision*)nw4r::ut::List_GetNext(&url_col->mLineCollisions, line_col), line_col != NULL) {
|
||||
f32 left = line_col->unk_0x00 - var_f28;
|
||||
f32 right = var_f28 + line_col->unk_0x04;
|
||||
f32 temp_f0 = ((unk_0x44 + unk_0x40) - line_col->unk_0x08);
|
||||
f32 left = line_col->mLeft - var_f28;
|
||||
f32 right = var_f28 + line_col->mRight;
|
||||
f32 temp_f0 = ((mMemoTranslateY + mHitYOffset) - line_col->mY);
|
||||
f32 top = (var_f29 + temp_f0) - var_f28;
|
||||
f32 bottom = var_f28 + (var_f30 + temp_f0);
|
||||
if (left <= var_f31 && var_f31 <= right && top <= -pos.y && -pos.y <= bottom) {
|
||||
return url_col->unk_0x00;
|
||||
return url_col->mTagNo;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -194,7 +194,7 @@ namespace ipl {
|
||||
url_collision* url_col = NULL;
|
||||
|
||||
while (got = (url_collision*)nw4r::ut::List_GetNext(&mUrlCollisions, got), got != NULL) {
|
||||
if (got->unk_0x00 == unk_0x4C) {
|
||||
if (got->mTagNo == mSelectedTagNo) {
|
||||
url_col = got;
|
||||
break;
|
||||
}
|
||||
@@ -210,10 +210,10 @@ namespace ipl {
|
||||
|
||||
int chIdx2 = 0;
|
||||
int chIdx = 0;
|
||||
u32 count = (u32)url_col->unk_0x08 - (u32)url_col->unk_0x04;
|
||||
u32 count = (u32)url_col->mpEnd - (u32)url_col->mpStart;
|
||||
count >>= 1;
|
||||
for (u32 i = 0; i < count; i++) {
|
||||
wchar_t wch = url_col->unk_0x04[i];
|
||||
wchar_t wch = url_col->mpStart[i];
|
||||
if (wch != SEPERATOR && chIdx2 < 0x200) {
|
||||
url[chIdx2++] = wch;
|
||||
}
|
||||
@@ -226,9 +226,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
UrlProcessor::url_collision::url_collision() {
|
||||
unk_0x00 = 0;
|
||||
unk_0x04 = NULL;
|
||||
unk_0x08 = NULL;
|
||||
mTagNo = 0;
|
||||
mpStart = NULL;
|
||||
mpEnd = NULL;
|
||||
nw4r::ut::List_Init(&mLineCollisions, offsetof(line_collision, mLinkList));
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <private/os.h>
|
||||
#include <private/wpad.h>
|
||||
|
||||
#pragma dont_instantiate ipl::math::HermiteIntp<float>
|
||||
|
||||
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
@@ -648,7 +648,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
if (System::getNwc24Manager() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
goto scn_continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,16 +25,16 @@ typedef struct {
|
||||
undefined4 result;
|
||||
undefined4 errCode;
|
||||
HTTPTestState httpTestState;
|
||||
undefined4 unk_0x030;
|
||||
undefined4 unk_0x034;
|
||||
undefined4 unk_0x038;
|
||||
undefined4 unk_0x03c;
|
||||
undefined4 natState;
|
||||
undefined4 gsAvailable;
|
||||
undefined4 natTimedOut;
|
||||
undefined4 natFailed;
|
||||
OSTime detectStartTime;
|
||||
NHTTPConnection httpConnection;
|
||||
NHTTPRequest* httpRequest;
|
||||
NHTTPResponse* httpResponse;
|
||||
NCDProxyProfile proxy;
|
||||
void* unk_0x7f0;
|
||||
void* httpBuf;
|
||||
NAT nat;
|
||||
} StaticSession;
|
||||
|
||||
@@ -64,14 +64,14 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
g_session.result = 0xFF00;
|
||||
g_session.errCode = 0;
|
||||
g_session.httpTestState = HTTP_TEST_NOT_STARTED;
|
||||
g_session.unk_0x030 = 0;
|
||||
g_session.natState = 0;
|
||||
g_session.detectStartTime = 0;
|
||||
g_session.httpConnection = 0;
|
||||
g_session.httpRequest = 0;
|
||||
g_session.httpResponse = NULL;
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x038 = 0;
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natTimedOut = 0;
|
||||
g_session.natFailed = 1;
|
||||
g_session.proxy = *proxy;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ int IPLContestProcess() {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
|
||||
OSReport("[error] Failed to start up NHTTP.\n");
|
||||
} else {
|
||||
g_session.unk_0x7f0 = IPLContestAlloc(0x400);
|
||||
g_session.httpBuf = IPLContestAlloc(0x400);
|
||||
g_session.httpTestState = HTTP_TEST_STARTED;
|
||||
OSReport("Starting HTTP conectting test.\n");
|
||||
}
|
||||
@@ -108,7 +108,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case HTTP_TEST_STARTED: {
|
||||
g_session.httpRequest =
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0);
|
||||
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.httpBuf, 0x400, sNHTTPReqCallback, 0);
|
||||
if (g_session.httpRequest == 0) {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
g_session.result |= 4;
|
||||
@@ -156,9 +156,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -176,9 +176,9 @@ int IPLContestProcess() {
|
||||
NHTTPDestroyResponse(g_session.httpResponse);
|
||||
g_session.httpResponse = NULL;
|
||||
}
|
||||
if (g_session.unk_0x7f0 != NULL) {
|
||||
IPLContestFree(g_session.unk_0x7f0, 0);
|
||||
g_session.unk_0x7f0 = NULL;
|
||||
if (g_session.httpBuf != NULL) {
|
||||
IPLContestFree(g_session.httpBuf, 0);
|
||||
g_session.httpBuf = NULL;
|
||||
}
|
||||
g_session.httpTestState = HTTP_TEST_DONE;
|
||||
NHTTPCleanupAsync(sNHTTPCleanupCallback);
|
||||
@@ -198,11 +198,11 @@ int IPLContestProcess() {
|
||||
OSReport("Port mapping detectioning test has been skipped.\n");
|
||||
|
||||
} else
|
||||
switch (g_session.unk_0x030) {
|
||||
switch (g_session.natState) {
|
||||
case 0: {
|
||||
gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign);
|
||||
GSIStartAvailableCheckA("wiinat");
|
||||
g_session.unk_0x030 = 1;
|
||||
g_session.natState = 1;
|
||||
OSReport("Starting GameSpy available check.\n");
|
||||
break;
|
||||
}
|
||||
@@ -212,14 +212,14 @@ int IPLContestProcess() {
|
||||
break;
|
||||
}
|
||||
case GSIACAvailable: {
|
||||
g_session.unk_0x034 = 1;
|
||||
g_session.unk_0x030 = 2;
|
||||
g_session.gsAvailable = 1;
|
||||
g_session.natState = 2;
|
||||
OSReport("GameSpy server is currently available.\n");
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
g_session.unk_0x034 = 0;
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.gsAvailable = 0;
|
||||
g_session.natState = 5;
|
||||
OSReport("GameSpy server is currently unavailable.\n");
|
||||
break;
|
||||
}
|
||||
@@ -228,7 +228,7 @@ int IPLContestProcess() {
|
||||
}
|
||||
case 2: {
|
||||
NNStartNatDetection(onNatDetectionDone);
|
||||
g_session.unk_0x030 = 3;
|
||||
g_session.natState = 3;
|
||||
OSReport("Port mapping detectioning test has been started.\n");
|
||||
g_session.detectStartTime = OSGetTime();
|
||||
break;
|
||||
@@ -238,8 +238,8 @@ int IPLContestProcess() {
|
||||
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) {
|
||||
break;
|
||||
}
|
||||
g_session.unk_0x030 = 5;
|
||||
g_session.unk_0x038 = 1;
|
||||
g_session.natState = 5;
|
||||
g_session.natTimedOut = 1;
|
||||
OSReport("[error] NAT timeout.\n");
|
||||
break;
|
||||
}
|
||||
@@ -289,10 +289,10 @@ int IPLGetNATSupportCode(int conntype) {
|
||||
|
||||
nat = g_session.nat;
|
||||
|
||||
if (g_session.unk_0x034 != 0) {
|
||||
if (g_session.unk_0x038 != 0) {
|
||||
if (g_session.gsAvailable != 0) {
|
||||
if (g_session.natTimedOut != 0) {
|
||||
code = 11180;
|
||||
} else if (g_session.unk_0x03c != 0) {
|
||||
} else if (g_session.natFailed != 0) {
|
||||
code = 11170;
|
||||
} else {
|
||||
if (nat.mappingScheme == 0 && nat.mappings[2].publicPort == nat.mappings[1].publicPort * 2 - nat.mappings[0].publicPort) {
|
||||
@@ -464,10 +464,10 @@ void sNHTTPCleanupCallback() {
|
||||
void onNatDetectionDone(gsi_bool success, NAT nat) {
|
||||
if (success) {
|
||||
g_session.nat = nat;
|
||||
g_session.unk_0x03c = 0;
|
||||
g_session.natFailed = 0;
|
||||
} else {
|
||||
g_session.unk_0x03c = 1;
|
||||
g_session.natFailed = 1;
|
||||
}
|
||||
g_session.unk_0x030 = 4;
|
||||
g_session.natState = 4;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
@@ -114,10 +114,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDButton::calc() {
|
||||
if (unk_0x54 == 1) {
|
||||
if (mAnimWait == 1) {
|
||||
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
|
||||
reset_gui();
|
||||
unk_0x54 = 0;
|
||||
mAnimWait = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace ipl {
|
||||
switch (animNo) {
|
||||
case IDANIM_HELP_BTN_CLICK: {
|
||||
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
|
||||
unk_0x54 = 1;
|
||||
mAnimWait = 1;
|
||||
break;
|
||||
}
|
||||
case IDANIM_ARROW_RIGHT_CLICK: {
|
||||
|
||||
@@ -353,7 +353,7 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
mWpadStopTick = OSGetTick();
|
||||
}
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN && System::isReceiveScheduleStopped() &&
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isUnk0xA31())) {
|
||||
(!System::getNwc24Manager() || System::getNwc24Manager()->isReceivingIdle())) {
|
||||
OSReport("NWC24 Scheduler stopped.\n");
|
||||
NandSDWorker* worker = mpChannelSelect->getWorker();
|
||||
if (mNextScene == 17) {
|
||||
|
||||
@@ -59,8 +59,7 @@ public:
|
||||
virtual ~RakuRakuThread();
|
||||
virtual void* Run();
|
||||
virtual void unk_0x2C() = 0;
|
||||
void syncRakuProgress();
|
||||
static void progressCallback(RakuProgress* progress);
|
||||
static void syncRakuProgress(RakuProgress* progress);
|
||||
void destroy();
|
||||
int start();
|
||||
int getState();
|
||||
@@ -77,19 +76,15 @@ private:
|
||||
MEMHeapHandle mHeap;
|
||||
};
|
||||
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sRakuStatus = *(RakuProgress*)this;
|
||||
sRakuStatus = *progress;
|
||||
OSTime time = OSGetTime();
|
||||
startTimeHigh = time >> 32;
|
||||
startTimeLow = time;
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
void RakuRakuThread::progressCallback(RakuProgress* progress) {
|
||||
((RakuRakuThread*)progress)->syncRakuProgress();
|
||||
}
|
||||
|
||||
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
u32 version = ATERMi_ApConfigGetVersion();
|
||||
if (((version >> 12) & 15) * 10 + ((version >> 8) & 15) != 1) {
|
||||
@@ -153,7 +148,7 @@ int RakuRakuThread::start() {
|
||||
socketConfig.free = RakuSocketFree;
|
||||
SOInit(&socketConfig);
|
||||
ATERMi_ApConfigStart(mPriority, 200,
|
||||
progressCallback,
|
||||
syncRakuProgress,
|
||||
RakuAtermAlloc, RakuAtermFree, 4096);
|
||||
if (!mRunning) {
|
||||
mRunning = 1;
|
||||
|
||||
@@ -15,10 +15,10 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
|
||||
unk_0x264 = 64;
|
||||
unk_0x268 = 0;
|
||||
unk_0x26C = 0;
|
||||
unk_0x270 = 0;
|
||||
mQueueCapacity = 64;
|
||||
mQueueCount = 0;
|
||||
mQueueRead = 0;
|
||||
mQueueWrite = 0;
|
||||
mSettingArg = arg;
|
||||
mpLayout = NULL;
|
||||
mpLayoutFile = NULL;
|
||||
@@ -81,9 +81,9 @@ namespace ipl {
|
||||
|
||||
FaderSceneCommand SettingButton::calcNormal() {
|
||||
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
|
||||
Unk unk = unk_0x64[unk_0x26C];
|
||||
switch (unk.command) {
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mQueueCount != 0) {
|
||||
CmdEntry entry = mCmdQueue[mQueueRead];
|
||||
switch (entry.command) {
|
||||
case CMD_SHOW_BTN: {
|
||||
showBtn();
|
||||
break;
|
||||
@@ -93,16 +93,16 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case CMD_SET_TEXT: {
|
||||
setText(unk.msgID);
|
||||
setText(entry.msgID);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (unk_0x268 != 0) {
|
||||
if (++unk_0x26C >= unk_0x264) {
|
||||
unk_0x26C = 0;
|
||||
if (mQueueCount != 0) {
|
||||
if (++mQueueRead >= mQueueCapacity) {
|
||||
mQueueRead = 0;
|
||||
}
|
||||
unk_0x268--;
|
||||
mQueueCount--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,16 +225,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingButton::reserve(int command, u32 msgId) {
|
||||
if (unk_0x264 != unk_0x268) {
|
||||
int unk = unk_0x270;
|
||||
unk_0x64[unk].command = command;
|
||||
unk_0x64[unk].msgID = msgId;
|
||||
unk_0x270++;
|
||||
if (mQueueCapacity != mQueueCount) {
|
||||
int writeIdx = mQueueWrite;
|
||||
mCmdQueue[writeIdx].command = command;
|
||||
mCmdQueue[writeIdx].msgID = msgId;
|
||||
mQueueWrite++;
|
||||
|
||||
if (unk_0x270 >= unk_0x264) {
|
||||
unk_0x270 = 0;
|
||||
if (mQueueWrite >= mQueueCapacity) {
|
||||
mQueueWrite = 0;
|
||||
}
|
||||
unk_0x268++;
|
||||
mQueueCount++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ipl {
|
||||
namespace bs2 {
|
||||
Manager::Manager(EGG::Heap* pHeap)
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
|
||||
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
|
||||
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
|
||||
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
|
||||
@@ -30,13 +30,13 @@ namespace ipl {
|
||||
return mIPLState;
|
||||
}
|
||||
|
||||
if (unk_0x0F && !System::isNandFull()) {
|
||||
if (mbRestartRequested && !System::isNandFull()) {
|
||||
BS2RestartStateMachine();
|
||||
|
||||
unk_0x0C = true;
|
||||
mbTickEnabled = true;
|
||||
mIPLState = IPL_STATE_NO_DISK;
|
||||
unk_0x0F = false;
|
||||
} else if (unk_0x0C) {
|
||||
mbRestartRequested = false;
|
||||
} else if (mbTickEnabled) {
|
||||
BOOL old = OSDisableInterrupts();
|
||||
|
||||
mState = BS2Tick();
|
||||
@@ -51,7 +51,7 @@ namespace ipl {
|
||||
|
||||
if (mbIsDiagDisc && System::isRsrcLoaded()) {
|
||||
__WPADReconnect(TRUE);
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
bootNewSystem();
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::startUpdate() {
|
||||
unk_0x0D = true;
|
||||
mbUpdateRequested = true;
|
||||
mbStartUpdate = true;
|
||||
mPrevEntry = 0;
|
||||
mPrevFound = 0;
|
||||
@@ -88,11 +88,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::reserveRVLGame() {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
}
|
||||
|
||||
void Manager::reserveGCGame() {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
}
|
||||
|
||||
void Manager::startRVLGame() {
|
||||
@@ -103,13 +103,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::abort() {
|
||||
unk_0x0E = true;
|
||||
unk_0x0F = false;
|
||||
mbAbortRequested = true;
|
||||
mbRestartRequested = false;
|
||||
}
|
||||
|
||||
void Manager::restart() {
|
||||
unk_0x0E = false;
|
||||
unk_0x0F = true;
|
||||
mbAbortRequested = false;
|
||||
mbRestartRequested = true;
|
||||
|
||||
System::checkNandOverFlowFlagAsync();
|
||||
}
|
||||
@@ -195,7 +195,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BS2_STT_64: {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
break;
|
||||
}
|
||||
@@ -216,25 +216,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::execTick(BS2State state) {
|
||||
if (unk_0x0D) {
|
||||
if (mbUpdateRequested) {
|
||||
if (state == BS2_STT_UPDATE_DISK) {
|
||||
BS2StartUpdate();
|
||||
} else {
|
||||
mbStartUpdate = false;
|
||||
}
|
||||
} else if (unk_0x0E) {
|
||||
} else if (mbAbortRequested) {
|
||||
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
|
||||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
|
||||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
|
||||
unk_0x0C = false;
|
||||
mbTickEnabled = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
} else {
|
||||
BS2AbortStateMachine();
|
||||
}
|
||||
}
|
||||
|
||||
unk_0x0D = false;
|
||||
unk_0x0E = false;
|
||||
mbUpdateRequested = false;
|
||||
mbAbortRequested = false;
|
||||
}
|
||||
|
||||
void Manager::updateTick() {
|
||||
|
||||
@@ -46,17 +46,17 @@ namespace ipl {
|
||||
}
|
||||
if (mButton != 0) {
|
||||
if (down(BTN_INTERACT)) {
|
||||
unk_0x08++;
|
||||
mDecideHoldCount++;
|
||||
} else {
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
mButton = 0;
|
||||
}
|
||||
} else {
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
}
|
||||
} else {
|
||||
mButton = 0;
|
||||
unk_0x08 = 0;
|
||||
mDecideHoldCount = 0;
|
||||
}
|
||||
|
||||
switch (mRumbleType) {
|
||||
@@ -109,7 +109,7 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
int ipl::controller::Base::decide() const {
|
||||
return unk_0x08 == 5;
|
||||
return mDecideHoldCount == 5;
|
||||
}
|
||||
int ipl::controller::Base::rumble(int type) {
|
||||
int ret = FALSE;
|
||||
@@ -130,44 +130,44 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Revolution::read() {
|
||||
if (!isValidDpd()) {
|
||||
unk_0x20->pos.y = 1.0f / 0.0f;
|
||||
unk_0x20->pos.x = 1.0f / 0.0f;
|
||||
unk_0x20->speed = 0.0f;
|
||||
unk_0x20->vec.y = 0.0f;
|
||||
unk_0x20->vec.x = 0.0f;
|
||||
mpStatus->pos.y = 1.0f / 0.0f;
|
||||
mpStatus->pos.x = 1.0f / 0.0f;
|
||||
mpStatus->speed = 0.0f;
|
||||
mpStatus->vec.y = 0.0f;
|
||||
mpStatus->vec.x = 0.0f;
|
||||
}
|
||||
|
||||
unk_0x1E = unk_0x1D;
|
||||
mbPrevPinch = mbPinch;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x1E == 0) {
|
||||
if (mbPrevPinch == 0) {
|
||||
if (down(0x800) && down(0x400)) {
|
||||
unk_0x1D = 1;
|
||||
mbPinch = 1;
|
||||
}
|
||||
} else if (!down(0x800) || !down(0x400)) {
|
||||
unk_0x1D = 0;
|
||||
mbPinch = 0;
|
||||
}
|
||||
} else {
|
||||
unk_0x1D = 0;
|
||||
mbPinch = 0;
|
||||
}
|
||||
|
||||
Base::read();
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidDpd() const {
|
||||
if (unk_0x1C != 0) {
|
||||
if (mbForceInvalid != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (unk_0x20->wpad_err == 0 || unk_0x20->wpad_err == -7) && unk_0x20->dpd_valid_fg != 0;
|
||||
return (mpStatus->wpad_err == 0 || mpStatus->wpad_err == -7) && mpStatus->dpd_valid_fg != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::isValidBtn() const {
|
||||
u8 val = unk_0x20->wpad_err;
|
||||
u8 val = mpStatus->wpad_err;
|
||||
|
||||
return (u8)(val + 7) <= 7 && ((1 << (val + 7)) & 0xA1) != 0;
|
||||
}
|
||||
bool ipl::controller::Revolution::down(u32 mButton) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x20->hold & (mButton & 0xFFFF)) {
|
||||
if (mpStatus->hold & (mButton & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
@@ -177,7 +177,7 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getDpdProjectionPos() const {
|
||||
math::VEC2 ret;
|
||||
Vec2 dest;
|
||||
Vec2 src = {unk_0x20->pos.x, unk_0x20->pos.y};
|
||||
Vec2 src = {mpStatus->pos.x, mpStatus->pos.y};
|
||||
nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined
|
||||
Rect kpad_rect;
|
||||
|
||||
@@ -216,9 +216,9 @@ namespace ipl {
|
||||
y = fy;
|
||||
}
|
||||
ipl::controller::Classic::Classic(int arg0, KPADStatus& arg1) : Revolution(arg0, arg1) {
|
||||
unk_0x24.x = 0.01f;
|
||||
unk_0x24.y = 0.01f;
|
||||
unk_0x2C = 0;
|
||||
mClassicCursor.x = 0.01f;
|
||||
mClassicCursor.y = 0.01f;
|
||||
mClassicCursorTimer = 0;
|
||||
}
|
||||
ipl::controller::Base::~Base() {
|
||||
}
|
||||
@@ -230,32 +230,32 @@ namespace ipl {
|
||||
}
|
||||
void ipl::controller::Classic::read() {
|
||||
if (!Revolution::isValidDpd()) {
|
||||
math::VEC2 lstick(unk_0x20->ex_status.cl.lstick.x, unk_0x20->ex_status.cl.lstick.y);
|
||||
math::VEC2 lstick(mpStatus->ex_status.cl.lstick.x, mpStatus->ex_status.cl.lstick.y);
|
||||
|
||||
if (lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f) {
|
||||
unk_0x24.x = math::abs_clamp(unk_0x24.x + unk_0x20->ex_status.cl.lstick.x * 0.05f, 1.8f);
|
||||
unk_0x24.y = math::abs_clamp(unk_0x24.y - unk_0x20->ex_status.cl.lstick.y * 0.05f, 1.2f);
|
||||
mClassicCursor.x = math::abs_clamp(mClassicCursor.x + mpStatus->ex_status.cl.lstick.x * 0.05f, 1.8f);
|
||||
mClassicCursor.y = math::abs_clamp(mClassicCursor.y - mpStatus->ex_status.cl.lstick.y * 0.05f, 1.2f);
|
||||
}
|
||||
|
||||
math::VEC2 rstick = math::VEC2(unk_0x20->ex_status.cl.rstick.x, unk_0x20->ex_status.cl.rstick.y);
|
||||
math::VEC2 rstick = math::VEC2(mpStatus->ex_status.cl.rstick.x, mpStatus->ex_status.cl.rstick.y);
|
||||
if (getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f ||
|
||||
rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) {
|
||||
unk_0x2C = 180;
|
||||
mClassicCursorTimer = 180;
|
||||
}
|
||||
|
||||
if (--unk_0x2C < 0) {
|
||||
unk_0x2C = 0;
|
||||
if (--mClassicCursorTimer < 0) {
|
||||
mClassicCursorTimer = 0;
|
||||
}
|
||||
} else {
|
||||
unk_0x24.y = 0.01f;
|
||||
unk_0x24.x = 0.01f;
|
||||
unk_0x2C = 0;
|
||||
mClassicCursor.y = 0.01f;
|
||||
mClassicCursor.x = 0.01f;
|
||||
mClassicCursorTimer = 0;
|
||||
}
|
||||
|
||||
Revolution::read();
|
||||
}
|
||||
int ipl::controller::Classic::getClassicHoldFlag() const {
|
||||
return unk_0x20->ex_status.cl.hold;
|
||||
return mpStatus->ex_status.cl.hold;
|
||||
}
|
||||
template <>
|
||||
f32 ipl::math::abs_clamp<f32>(const f32& x, const f32& y) {
|
||||
@@ -270,7 +270,7 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getHorizon() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(unk_0x20->horizon.x, unk_0x20->horizon.y);
|
||||
ret.set(mpStatus->horizon.x, mpStatus->horizon.y);
|
||||
} else {
|
||||
ret.x = 1.0f;
|
||||
ret.y = -0.2679492f;
|
||||
@@ -280,9 +280,9 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getDpdPos() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
} else if (unk_0x2C != 0) {
|
||||
ret = unk_0x24;
|
||||
ret.set(mpStatus->pos.x, mpStatus->pos.y);
|
||||
} else if (mClassicCursorTimer != 0) {
|
||||
ret = mClassicCursor;
|
||||
} else {
|
||||
ret.x = (1.0f / 0.0f);
|
||||
ret.y = (1.0f / 0.0f);
|
||||
@@ -296,9 +296,9 @@ namespace ipl {
|
||||
ipl::math::VEC2 ipl::controller::Classic::getDpdProjectionPos() const {
|
||||
math::VEC2 ret;
|
||||
if (Revolution::isValidDpd()) {
|
||||
ret.set(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
} else if (unk_0x2C != 0) {
|
||||
ret = unk_0x24;
|
||||
ret.set(mpStatus->pos.x, mpStatus->pos.y);
|
||||
} else if (mClassicCursorTimer != 0) {
|
||||
ret = mClassicCursor;
|
||||
} else {
|
||||
ret.set(1.0f / 0.0f, 1.0f / 0.0f);
|
||||
}
|
||||
@@ -454,7 +454,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return -1;
|
||||
}
|
||||
void ipl::controller::Base::setForceInvalid(bool flag) {
|
||||
unk_0x1C = flag;
|
||||
mbForceInvalid = flag;
|
||||
}
|
||||
int ipl::controller::Base::getType() const {
|
||||
return mType;
|
||||
@@ -463,65 +463,65 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return mChan;
|
||||
}
|
||||
KPADStatus* ipl::controller::Revolution::getKPADStatus() const {
|
||||
return unk_0x20;
|
||||
return mpStatus;
|
||||
}
|
||||
f32 ipl::controller::Revolution::getDpdDistance() const {
|
||||
return unk_0x20->dist;
|
||||
return mpStatus->dist;
|
||||
}
|
||||
int ipl::controller::Revolution::getReleaseFlag() const {
|
||||
return unk_0x20->release;
|
||||
return mpStatus->release;
|
||||
}
|
||||
int ipl::controller::Revolution::getTrigFlag() const {
|
||||
return unk_0x20->trig;
|
||||
return mpStatus->trig;
|
||||
}
|
||||
int ipl::controller::Revolution::getHoldFlag() const {
|
||||
return unk_0x20->hold;
|
||||
return mpStatus->hold;
|
||||
}
|
||||
int ipl::controller::Revolution::pinchOffTrg() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && unk_0x1D == 0 && unk_0x1E != 0) {
|
||||
if (isValidBtn() && mbPinch == 0 && mbPrevPinch != 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
int ipl::controller::Revolution::pinch() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && unk_0x1D != 0) {
|
||||
if (isValidBtn() && mbPinch != 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
int ipl::controller::Revolution::pinchTrg() const {
|
||||
int ret = 0;
|
||||
if (isValidBtn() && unk_0x1D != 0 && unk_0x1E == 0) {
|
||||
if (isValidBtn() && mbPinch != 0 && mbPrevPinch == 0) {
|
||||
ret = 1;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
bool ipl::controller::Revolution::repeat(u32 button) const {
|
||||
return down(button) && (unk_0x20->hold & 0x80000000) != 0;
|
||||
return down(button) && (mpStatus->hold & 0x80000000) != 0;
|
||||
}
|
||||
BOOL ipl::controller::Classic::isValidDpdClassic() const {
|
||||
return unk_0x2C != 0;
|
||||
return mClassicCursorTimer != 0;
|
||||
}
|
||||
bool ipl::controller::Classic::isValidDpd() const {
|
||||
if (unk_0x1C != 0) {
|
||||
if (mbForceInvalid != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return (Revolution::isValidDpd() != 0) || (unk_0x2C != 0);
|
||||
return (Revolution::isValidDpd() != 0) || (mClassicCursorTimer != 0);
|
||||
}
|
||||
int ipl::controller::Classic::getClassicReleaseFlag() const {
|
||||
return unk_0x20->ex_status.cl.release;
|
||||
return mpStatus->ex_status.cl.release;
|
||||
}
|
||||
int ipl::controller::Classic::getClassicTrigFlag() const {
|
||||
return unk_0x20->ex_status.cl.trig;
|
||||
return mpStatus->ex_status.cl.trig;
|
||||
}
|
||||
bool ipl::controller::Classic::upTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
KPADStatus* status = unk_0x20;
|
||||
KPADStatus* status = mpStatus;
|
||||
if ((status->release & (button & 0xFFFF)) == 0) {
|
||||
if ((status->ex_status.cl.release & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
@@ -537,7 +537,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
KPADStatus* status = unk_0x20;
|
||||
KPADStatus* status = mpStatus;
|
||||
if ((status->trig & (button & 0xFFFF)) == 0) {
|
||||
if ((status->ex_status.cl.trig & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
@@ -553,8 +553,8 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
bool pressed = true;
|
||||
if ((unk_0x20->hold & (button & 0xFFFF)) == 0) {
|
||||
if ((unk_0x20->ex_status.cl.hold & (button >> 16)) == 0) {
|
||||
if ((mpStatus->hold & (button & 0xFFFF)) == 0) {
|
||||
if ((mpStatus->ex_status.cl.hold & (button >> 16)) == 0) {
|
||||
pressed = false;
|
||||
}
|
||||
}
|
||||
@@ -565,15 +565,15 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
return ret;
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getHorizon() const {
|
||||
return math::VEC2(unk_0x20->horizon.x, unk_0x20->horizon.y);
|
||||
return math::VEC2(mpStatus->horizon.x, mpStatus->horizon.y);
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Revolution::getDpdPos() const {
|
||||
return math::VEC2(unk_0x20->pos.x, unk_0x20->pos.y);
|
||||
return math::VEC2(mpStatus->pos.x, mpStatus->pos.y);
|
||||
}
|
||||
bool ipl::controller::Revolution::upTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x20->release & (button & 0xFFFF)) {
|
||||
if (mpStatus->release & (button & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
@@ -582,7 +582,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
bool ipl::controller::Revolution::downTrg(u32 button) const {
|
||||
bool ret = false;
|
||||
if (isValidBtn()) {
|
||||
if (unk_0x20->trig & (button & 0xFFFF)) {
|
||||
if (mpStatus->trig & (button & 0xFFFF)) {
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,9 +152,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
Revolution::Revolution(int chan, int type, KPADStatus& status) : Base(chan, type, status) {
|
||||
unk_0x1D = 0;
|
||||
unk_0x1E = 0;
|
||||
unk_0x20 = &status;
|
||||
mbPinch = 0;
|
||||
mbPrevPinch = 0;
|
||||
mpStatus = &status;
|
||||
}
|
||||
|
||||
Interface* Manager::getMasterController() {
|
||||
|
||||
@@ -43,13 +43,13 @@ namespace ipl {
|
||||
mMessageID = msgId;
|
||||
|
||||
// Debug related? (seems to be incomplete; unused)
|
||||
unk_0x0C = arg2;
|
||||
unk_0x10 = arg3;
|
||||
mArg2 = arg2;
|
||||
mArg3 = arg3;
|
||||
if (arg1) {
|
||||
strncpy(unk_0x14, arg1, sizeof(unk_0x14));
|
||||
unk_0x14[sizeof(unk_0x14) - 1] = 0;
|
||||
strncpy(mArg1, arg1, sizeof(mArg1));
|
||||
mArg1[sizeof(mArg1) - 1] = 0;
|
||||
} else {
|
||||
memset(unk_0x14, 0, sizeof(unk_0x14));
|
||||
memset(mArg1, 0, sizeof(mArg1));
|
||||
}
|
||||
|
||||
curThread = OSGetCurrentThread();
|
||||
|
||||
@@ -47,7 +47,7 @@ namespace ipl {
|
||||
(((mLastError > NWC24_ERR_FILE_OPEN || mLastError < NWC24_ERR_FILE_OTHER) && mLastError != NWC24_ERR_NAND_CORRUPT) && \
|
||||
(mLastError != NWC24_ERR_FILE_EXISTS && mLastError != NWC24_ERR_INTERNAL_VF && mLastError != NWC24_ERR_FILE_BROKEN))
|
||||
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), unk_0xA31(false), mbReceivePaused(false), unk_0xA33(false) {
|
||||
Manager::Manager(EGG::Heap* heap) : mbReviecedMsg(false), mbReceiving(false), mbReceivePaused(false), mbNewTitleTblReady(false) {
|
||||
OSInitMutex(&mLock);
|
||||
OSInitMutex(&mAutoLock);
|
||||
|
||||
@@ -526,7 +526,7 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
|
||||
unk_0xA31 = true;
|
||||
mbReceiving = true;
|
||||
|
||||
NWC24UserId myUserId;
|
||||
getMyUserId(&myUserId);
|
||||
@@ -910,8 +910,8 @@ namespace ipl {
|
||||
|
||||
close();
|
||||
|
||||
unk_0xA33 = true;
|
||||
unk_0xA31 = false;
|
||||
mbNewTitleTblReady = true;
|
||||
mbReceiving = false;
|
||||
}
|
||||
|
||||
void Manager::addDlTask() {
|
||||
@@ -996,7 +996,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
BOOL Manager::getNewTitleTbl(u32* titleTbl) const {
|
||||
if (!unk_0xA33) {
|
||||
if (!mbNewTitleTblReady) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace ipl {
|
||||
if (System::getPostmanManager()->IsUnknown() ||
|
||||
(System::getSceneManager() != NULL && System::getScene(SCENE_ADDRESS) != NULL)) {
|
||||
if (System::getNwc24Manager() != NULL && !System::isNandFull()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isUnk0xA31()) {
|
||||
if (System::createdAfterAndLibMgr() && !System::getNwc24Manager()->isReceivingIdle()) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Compact function diff with context: python ctxdiff.py <unit> <symbol> [--full]"""
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, "/home/ubuntu/projects/tests")
|
||||
sys.path.insert(0, "/home/cole/projects/tests")
|
||||
from odiff import dis, sym
|
||||
import os
|
||||
import itertools
|
||||
|
||||
89
tools/decomp-assist/linkgap.attempts.md
Normal file
89
tools/decomp-assist/linkgap.attempts.md
Normal file
@@ -0,0 +1,89 @@
|
||||
# linkgap leaf — iplChannelTitle + eggAudioExpMgr
|
||||
|
||||
## iplChannelTitle — emission restored, 3144 is provably impossible
|
||||
|
||||
Orig .o `.data` = 0x950; last symbol ends 0x87c; bytes 0x87c-0x950 are zeros
|
||||
in both the extraction .o and the DOL (verified at DOL file off 0x31F504).
|
||||
The 0xd4 tail = 5 weak-emitted vtables that lost link dedup:
|
||||
|
||||
| off | size | symbol |
|
||||
|-------|------|-------------------------------|
|
||||
| 0x87c | 92 | __vt__ipl::gui::PaneManager |
|
||||
| 0x8d8 | 24 | __vt__gui::EventHandler |
|
||||
| 0x8f0 | 32 | __vt__gui::Interface |
|
||||
| 0x910 | 32 | __vt__ipl::nand::LayoutFile |
|
||||
| 0x930 | 32 | __vt__ipl::nand::LangFile |
|
||||
|
||||
Emit rule used (old agent/w0929/linkgap scheme): a class weak-emits its
|
||||
vtable in a TU that ODR-uses it (construction site; elided vptr stores
|
||||
count) when every virtual DECLARED IN THAT CLASS is inline — inherited
|
||||
non-inline virtuals don't block (LayoutFile emits despite non-inline
|
||||
inherited virtuals because its own ~LayoutFile is inline here).
|
||||
|
||||
Source mechanism, all real decls, no invented names:
|
||||
- `#define IPL_CHANNEL_TITLE_NOVTABLE` at cpp top (undef after includes).
|
||||
- GUIManager.h: ~Interface -> `~Interface(){}` for CT (gate); EventHandler
|
||||
loses `__declspec(novtable)` for CT.
|
||||
- iplGuiManager.h: ~PaneManager -> `~PaneManager(){}` for CT.
|
||||
- iplNand.h: LangFile's five virtuals gated to inline dummies for CT;
|
||||
~LayoutFile -> `~LayoutFile(){}` for CT.
|
||||
- `#pragma dont_instantiate ipl::math::HermiteIntp<float>` keeps
|
||||
HermiteIntp's vtable UND (orig also UNDs it).
|
||||
|
||||
Result: all 5 emit STB_WEAK at the exact orig offsets, .data=0x950, the
|
||||
raw .data bytes are byte-identical to orig's (all-zero tail), and the
|
||||
full DOL is byte-identical (sha1 26116613f624061ba99c8d1a299aaa6efa85670d)
|
||||
with the unit flipped Matching.
|
||||
|
||||
### Why matched_data cannot stay 3144 — objdiff internals, proven
|
||||
|
||||
`matched_data` sums sizes of sections at fuzzy==100. `.data` fuzzy is
|
||||
computed (objdiff-core diff/data.rs `diff_data_section`) as:
|
||||
|
||||
- left_max/right_max = max end offset of scored symbols in the section
|
||||
(symbols with size>0, not Section-kind, not Hidden).
|
||||
- Compare section bytes over 0..max (patience diff) AND pair relocations
|
||||
in the same range; if every left reloc matches, score =
|
||||
max(symbol-name-match%, byte-diff%). Otherwise symbol-name-match only.
|
||||
- Symbol-name-match = sum(size*match%)/sum(size) over left symbols.
|
||||
|
||||
Any symbol'd object emitted at 0x87c+ therefore scores <100 regardless
|
||||
of content, because orig's extraction .o has neither a symbol nor a
|
||||
reloc there (dedup'd weak emits are invisible in the DOL, so the
|
||||
extractor dropped them — rela.data max offset is 0x878). Measured:
|
||||
|
||||
- 0 emits (.data=0x87c): .data fuzzy 100.0 -> matched_data 3144
|
||||
- 5 emits (.data=0x950): .data fuzzy 95.35 -> matched_data 760
|
||||
|
||||
The only objdiff-invisible emit is a Hidden symbol (objdiff marks
|
||||
ELF Linkage-scope/STB_LOCAL symbols Hidden). But a local emit cannot
|
||||
lose dedup, so its content (vtable pointers) would be written into the
|
||||
DOL -> nonzero tail -> hash fails. A local *zero-content* object would
|
||||
satisfy both, but that is an invented score-only pad — not used.
|
||||
|
||||
RESOLUTION: name orig's real tail objects in config/43U/symbols.txt.
|
||||
The orig .o is rebuilt by `dtk dol split` from symbols.txt; the tail
|
||||
region had no entries, so objdiff's left_max stopped at 0x87c while my
|
||||
emitted vtables pushed right_max to 0x950 -> byte-path Insert penalty
|
||||
-> .data 95.35 / matched_data 760. Adding the 5 real objects
|
||||
(lbl_8164EFE4/+0x5C, lbl_8164F040/+0x18, lbl_8164F058/+0x20,
|
||||
lbl_8164F078/+0x20, lbl_8164F098/+0x20 — the dedup'd vtable emits)
|
||||
extends left_max to 0x950: the byte path then compares the full
|
||||
2384-byte range (zeros vs zeros) -> .data fuzzy 100 -> matched_data
|
||||
3144, all 95 fns 100, every section 100, DOL sha1
|
||||
26116613f624061ba99c8d1a299aaa6efa85670d byte-identical.
|
||||
|
||||
Also disproven this session: (a) the "one object per bounded run" was
|
||||
symbols.txt label granularity, not real .o granularity — plain literals
|
||||
are the correct source form (orig emits a single `addi r7, r31, off`
|
||||
per ref; any named-table ref `scX + N` forces a shared-base hoist =
|
||||
2-insn addressing, verified by capstone); (b) `symbol_mappings` in
|
||||
objdiff.json is ignored by objdiff-cli 3.4.5 report (issue #279), and
|
||||
lbl_* names can't be used in source anyway; (c)
|
||||
SymbolFlag::Ignored is mips-only — no way to hide emitted symbols from
|
||||
scoring.
|
||||
|
||||
## eggAudioExpMgr — see linkgap-audio branch notes
|
||||
|
||||
(Sample class deleted; secondary-vt [dtor][calc] thunk-order handled on
|
||||
agent/w1005/linkgap-audio.)
|
||||
Reference in New Issue
Block a user