From d07ea314004300f987aa437e9261f1bf166670e8 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Mon, 23 Jan 2017 21:11:42 +0300
Subject: [PATCH] cellOskDialog fix

---
 rpcs3/Emu/Cell/Modules/cellOskDialog.cpp | 9 ++++-----
 rpcs3/rpcs3.vcxproj                      | 3 ++-
 rpcs3/rpcs3.vcxproj.filters              | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
index 960bdf149b..fa97ca0d09 100644
--- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
@@ -8,14 +8,13 @@
 
 logs::channel cellOskDialog("cellOskDialog", logs::level::notice);
 
-char16_t* osk_text;
+static char16_t s_osk_text[CELL_OSKDIALOG_STRING_SIZE];
 
 s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogParam, vm::ptr<CellOskDialogInputFieldInfo> inputFieldInfo)
 {
 	cellOskDialog.warning("cellOskDialogLoadAsync(container=0x%x, dialogParam=*0x%x, inputFieldInfo=*0x%x)", container, dialogParam, inputFieldInfo);
 
-	osk_text = new char16_t[CELL_OSKDIALOG_STRING_SIZE];
-	std::memset(osk_text, 0, sizeof(osk_text));
+	std::memset(s_osk_text, 0, sizeof(s_osk_text));
 
 	const auto osk = Emu.GetCallbacks().get_msg_dialog();
 	bool result = false;
@@ -33,7 +32,7 @@ s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogPara
 
 	Emu.CallAfter([&]()
 	{
-		osk->CreateOsk("On Screen Keyboard", osk_text);
+		osk->CreateOsk("On Screen Keyboard", s_osk_text);
 	});
 
 	while (!result)
@@ -51,7 +50,7 @@ s32 cellOskDialogUnloadAsync(vm::ptr<CellOskDialogCallbackReturnParam> OutputInf
 	OutputInfo->result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK;
 
 	for (int i = 0; i < OutputInfo->numCharsResultString; i++) {
-		*(OutputInfo->pResultString + i) = (be_t<u16>)*(osk_text + i);
+		*(OutputInfo->pResultString + i) = (be_t<u16>)*(s_osk_text + i);
 	}
 
 	return CELL_OSKDIALOG_OK;
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 287d4ce0cb..bbd2297210 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -133,6 +133,7 @@
     <ClCompile Include="Gui\MemoryStringSearcher.cpp" />
     <ClCompile Include="Gui\MemoryViewer.cpp" />
     <ClCompile Include="Gui\MsgDialog.cpp" />
+    <ClCompile Include="Gui\OskDialog.cpp" />
     <ClCompile Include="Gui\PADManager.cpp" />
     <ClCompile Include="Gui\RegisterEditor.cpp" />
     <ClCompile Include="Gui\RSXDebugger.cpp" />
@@ -208,4 +209,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index 9a9d85a300..49d7681ae8 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -105,6 +105,9 @@
     <ClCompile Include="Gui\InstructionEditor.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
+    <ClCompile Include="Gui\OskDialog.cpp">
+      <Filter>Gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Utilities\MTProgressDialog.h">