cellOskDialog fixes

RPCS3 · Jan 26, 2017 · 33d2618 · 33d2618
1 parent 2bc8723
commit 33d2618
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -131,14 +131,15 @@ s32 cellOskDialogExtInputDeviceUnlock()
 	return CELL_OSKDIALOG_OK;
 }
 
-s32 cellOskDialogExtRegisterKeyboardEventHookCallback()
+s32 cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode, vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback> pCallback)
 {
-	fmt::throw_exception("Unimplemented" HERE);
+	cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
+	return CELL_OK;
 }
 
-s32 cellOskDialogExtAddJapaneseOptionDictionary(vm::cptr<char> filePath)
+s32 cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr<char> filePath)
 {
-	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=*0x%0x)", filePath);
+	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=**0x%0x)", filePath);
 	return CELL_OSKDIALOG_OK;
 }
 
@@ -148,9 +149,9 @@ s32 cellOskDialogExtEnableClipboard()
 	return CELL_OSKDIALOG_OK;
 }
 
-s32 cellOskDialogExtSendFinishMessage(vm::ptr<CellOskDialogFinishReason> finishReason)
+s32 cellOskDialogExtSendFinishMessage(s32 /*CellOskDialogFinishReason*/ finishReason)
 {
-	cellOskDialog.todo("cellOskDialogExtSendFinishMessage(finishReason=*0x%x)", finishReason);
+	cellOskDialog.todo("cellOskDialogExtSendFinishMessage(finishReason=%d)", finishReason);
 	return CELL_OSKDIALOG_OK;
 }
 
@@ -162,7 +163,7 @@ s32 cellOskDialogExtAddOptionDictionary(vm::cptr<CellOskDialogImeDictionaryInfo>
 
 s32 cellOskDialogExtSetInitialScale(f32 initialScale)
 {
-	cellOskDialog.todo("cellOskDialogExtSetInitialScale(initialScale=0x%x)", initialScale);
+	cellOskDialog.todo("cellOskDialogExtSetInitialScale(initialScale=%f)", initialScale);
 	return CELL_OSKDIALOG_OK;
 }
 
@@ -174,24 +175,25 @@ s32 cellOskDialogExtInputDeviceLock()
 
 s32 cellOskDialogExtSetBaseColor(f32 red, f32 blue, f32 green, f32 alpha)
 {
-	cellOskDialog.warning("cellOskDialogExtSetBaseColor(red=0x%x, blue=0x%x, green=0x%x, alpha=0x%x)", red, blue, green, alpha);
+	cellOskDialog.warning("cellOskDialogExtSetBaseColor(red=%f, blue=%f, green=%f, alpha=%f)", red, blue, green, alpha);
 	return CELL_OSKDIALOG_OK;
 }
 
-s32 cellOskDialogExtRegisterConfirmWordFilterCallback()
+s32 cellOskDialogExtRegisterConfirmWordFilterCallback(vm::ptr<cellOskDialogConfirmWordFilterCallback> pCallback)
 {
-	fmt::throw_exception("Unimplemented" HERE);
+	cellOskDialog.todo("cellOskDialogExtRegisterConfirmWordFilterCallback(pCallback=*0x%x)", pCallback);
+	return CELL_OK;
 }
 
 s32 cellOskDialogExtUpdateInputText()
 {
-	cellOskDialog.todo("cellOskDialogExtUpdateInputText");
+	cellOskDialog.todo("cellOskDialogExtUpdateInputText()");
 	return CELL_OSKDIALOG_OK;
 }
 
 s32 cellOskDialogExtDisableHalfByteKana()
 {
-	cellOskDialog.todo("cellOskDialogExtDisableHalfByteKana");
+	cellOskDialog.todo("cellOskDialogExtDisableHalfByteKana()");
 	return CELL_OSKDIALOG_OK;
 }
 
@@ -203,7 +205,7 @@ s32 cellOskDialogExtSetPointerEnable(b8 enable)
 
 s32 cellOskDialogExtUpdatePointerDisplayPos()
 {
-	cellOskDialog.todo("cellOskDialogExtUpdatePointerDisplayPos()");
+	cellOskDialog.todo("cellOskDialogExtUpdatePointerDisplayPos"); // Missing arguments
 	return CELL_OSKDIALOG_OK;
 }
 
@@ -213,9 +215,9 @@ s32 cellOskDialogExtEnableHalfByteKana()
 	return CELL_OSKDIALOG_OK;
 }
 
-s32 cellOskDialogExtRegisterForceFinishCallback()
+s32 cellOskDialogExtRegisterForceFinishCallback(vm::ptr<cellOskDialogForceFinishCallback> pCallback)
 {
-	cellOskDialog.todo("cellOskDialogExtRegisterForceFinishCallback()");
+	cellOskDialog.todo("cellOskDialogExtRegisterForceFinishCallback(pCallback=*0x%x)", pCallback);
 	return CELL_OSKDIALOG_OK;
 }
 

diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.h b/rpcs3/Emu/Cell/Modules/cellOskDialog.h
@@ -157,3 +157,7 @@ struct CellOskDialogImeDictionaryInfo
 	vm::bcptr<char> dictionaryPath;
 };
 
+using cellOskDialogConfirmWordFilterCallback = int(vm::ptr<u16> pConfirmString, s32 wordLength);
+using cellOskDialogHardwareKeyboardEventHookCallback = class b8(
+    vm::ptr<CellOskDialogKeyMessage> keyMessage, vm::ptr<u32> action, vm::ptr<void> pActionInfo);
+using cellOskDialogForceFinishCallback = class b8();
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
@@ -425,6 +425,7 @@
     <ClInclude Include="Crypto\unself.h" />
     <ClInclude Include="Crypto\utils.h" />
     <ClInclude Include="define_new_memleakdetect.h" />
+    <ClInclude Include="Emu\Cell\Modules\cellOskDialog.h" />
     <ClInclude Include="Emu\Cell\PPUAnalyser.h" />
     <ClInclude Include="Emu\Cell\PPUTranslator.h" />
     <ClInclude Include="Emu\CPU\CPUTranslator.h" />
@@ -689,4 +690,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
@@ -1714,5 +1714,8 @@
     <ClInclude Include="..\Utilities\sema.h">
       <Filter>Utilities</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\Cell\Modules\cellOskDialog.h">
+      <Filter>Emu\Cell\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>