Commit d07ee3de authored by cutealien's avatar cutealien

Fix compiling with _IRR_WCHAR_FILESYSTEM and UNICODE. Thanks @Foaly for report and bugfix.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5045 dfc29bdd-3216-0410-991c-e03cc46cb475
parent d352d8cf
...@@ -415,7 +415,7 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC ...@@ -415,7 +415,7 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC
/* find the size for the OEM name text */ /* find the size for the OEM name text */
regsize = sizeof(regvalue); regsize = sizeof(regvalue);
regresult = RegQueryValueExA(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, regresult = RegQueryValueEx(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0,
NULL, &regsize); NULL, &regsize);
if (regresult == ERROR_SUCCESS) if (regresult == ERROR_SUCCESS)
{ {
...@@ -425,7 +425,7 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC ...@@ -425,7 +425,7 @@ irr::core::stringc SJoystickWin32Control::findJoystickName(int index, const JOYC
if (name) if (name)
{ {
/* ... and read it from the registry */ /* ... and read it from the registry */
regresult = RegQueryValueExA(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, regresult = RegQueryValueEx(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0,
(LPBYTE)name, &regsize ); (LPBYTE)name, &regsize );
result = name; result = name;
} }
......
...@@ -2429,7 +2429,7 @@ IVideoDriver* createBurningVideoDriver(const irr::SIrrlichtCreationParameters& p ...@@ -2429,7 +2429,7 @@ IVideoDriver* createBurningVideoDriver(const irr::SIrrlichtCreationParameters& p
{ {
#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_ #ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
b.sync = CreateEvent ( 0, 0, 0, "burnevent0" ); b.sync = CreateEventA ( 0, 0, 0, "burnevent0" );
b.params = &params; b.params = &params;
b.io = io; b.io = io;
b.presenter = presenter; b.presenter = presenter;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment