ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: finish unicode conversion, fix signature inheritance and non wchar external import

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-01-28 13:47:35 +01:00 committed by refractionpcsx2
parent 5917029788
commit 8bfe851446
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSCapture.cpp
View File

@ -197,7 +197,7 @@ GSSource : public CBaseFilter, private CCritSec, public IGSSource
public: public:
GSSource(int w, int h, float fps, IUnknown* pUnk, HRESULT& hr, int colorspace) GSSource(int w, int h, float fps, IUnknown* pUnk, HRESULT& hr, int colorspace)
: CBaseFilter(NAME("GSSource"), pUnk, this, __uuidof(this), &hr) : CBaseFilter("GSSource", pUnk, this, __uuidof(this), &hr)
, m_output(NULL) , m_output(NULL)
, m_size(w, h) , m_size(w, h)
, m_atpf((REFERENCE_TIME)(10000000.0f / fps)) , m_atpf((REFERENCE_TIME)(10000000.0f / fps))

7
plugins/GSdx/Window/GSWndDX.cpp
View File

@ -177,11 +177,14 @@ GSVector4i GSWndDX::GetClientRect()
// Returns FALSE if the window has no title, or if th window title is under the strict // Returns FALSE if the window has no title, or if th window title is under the strict
// management of the emulator. // management of the emulator.
bool GSWndDX::SetWindowText(const wchar_t* title) bool GSWndDX::SetWindowText(const char* title)
{ {
if(!m_managed) return false; if(!m_managed) return false;
::SetWindowText(m_hWnd, title); const size_t tmp_size = strlen(title) + 1;
std::wstring tmp(tmp_size, L'#');
mbstowcs(&tmp[0], title, tmp_size);
::SetWindowText(m_hWnd, tmp.c_str());
return m_frame; return m_frame;
} }

2
plugins/GSdx/Window/GSWndDX.h
View File

@ -43,7 +43,7 @@ public:
void* GetDisplay() {return m_hWnd;} void* GetDisplay() {return m_hWnd;}
void* GetHandle() {return m_hWnd;} void* GetHandle() {return m_hWnd;}
GSVector4i GetClientRect(); GSVector4i GetClientRect();
bool SetWindowText(const wchar_t* title); bool SetWindowText(const char* title);
void Show(); void Show();
void Hide(); void Hide();

7
plugins/GSdx/Window/GSWndWGL.cpp
View File

@ -376,12 +376,15 @@ void GSWndWGL::HideFrame()
// Returns FALSE if the window has no title, or if th window title is under the strict // Returns FALSE if the window has no title, or if th window title is under the strict
// management of the emulator. // management of the emulator.
bool GSWndWGL::SetWindowText(const wchar_t* title) bool GSWndWGL::SetWindowText(const char* title)
{ {
if (!m_managed) return false; if (!m_managed) return false;
const size_t tmp_size = strlen(title) + 1;
std::wstring tmp(tmp_size, L'#');
mbstowcs(&tmp[0], title, tmp_size);
// Used by GSReplay. // Used by GSReplay.
::SetWindowText(m_NativeWindow, title); ::SetWindowText(m_NativeWindow, tmp.c_str());
return true; return true;
} }

2
plugins/GSdx/Window/GSWndWGL.h
View File

@ -54,7 +54,7 @@ public:
void* GetDisplay() {return m_NativeWindow;} void* GetDisplay() {return m_NativeWindow;}
void* GetHandle() {return m_NativeWindow;} void* GetHandle() {return m_NativeWindow;}
GSVector4i GetClientRect(); GSVector4i GetClientRect();
bool SetWindowText(const wchar_t* title); bool SetWindowText(const char* title);
void AttachContext(); void AttachContext();
void DetachContext(); void DetachContext();