mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove explicit unicode def/undefs

Browse Source
This commit is contained in:
Brad Parker 2016-12-02 12:46:32 -05:00
parent 5bd8c096dc
commit f64fb911b8
9 changed files with 79 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/common/win32_common.cpp
View File

@ -408,7 +408,7 @@ static LRESULT CALLBACK WndProcCommon(bool *quit, HWND hwnd, UINT message,
}
*quit = true;
break;
case WM_COMMAND:
case WM_COMMAND:
{
settings_t *settings = config_get_ptr();
if (settings->ui.menubar_enable)
@ -533,7 +533,7 @@ bool win32_window_create(void *data, unsigned style,
#endif
bool win32_get_metrics(void *data,
enum display_metric_types type, float *value)
enum display_metric_types type, float *value)
{
#ifdef _XBOX
return false;
@ -714,14 +714,14 @@ void win32_set_style(MONITORINFOEXW *current_mon, HMONITOR *hm_to_use,
}
else
{
char dev_name[CCHDEVICENAME] = {0};
char dev_name[CCHDEVICENAME] = {0};
*style = WS_POPUP | WS_VISIBLE;
utf16_to_char_string((const uint16_t*)current_mon->szDevice, dev_name, sizeof(dev_name));
if (!win32_monitor_set_fullscreen(*width, *height,
refresh, dev_name))
{}
{}
/* Display settings might have changed, get new coordinates. */
GetMonitorInfoW(*hm_to_use, (MONITORINFOEXW*)current_mon);

6
gfx/common/win32_common.h
View File

@ -18,12 +18,10 @@
#define WIN32_COMMON_H__
#include <string.h>
#include <encodings/win32.h>
#ifndef _XBOX
#define WIN32_LEAN_AND_MEAN
#define UNICODE
#include <tchar.h>
#include <wchar.h>
#include <windows.h>
#endif
@ -83,7 +81,7 @@ bool win32_window_create(void *data, unsigned style,
bool win32_suppress_screensaver(void *data, bool enable);
bool win32_get_metrics(void *data,
enum display_metric_types type, float *value);
enum display_metric_types type, float *value);
void win32_show_cursor(bool state);

26
gfx/drivers/d3d.cpp
View File

@ -15,13 +15,11 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <encodings/win32.h>
#ifdef _XBOX
#include <xtl.h>
#include <xgraphics.h>
#else
#define UNICODE
#include <tchar.h>
#include <wchar.h>
#endif
#include <formats/image.h>
@ -155,14 +153,14 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
video_info->input_scale * RARCH_SCALE_BASE;
if (!renderchain_init_first(&d3d->renderchain_driver,
&d3d->renderchain_data))
&d3d->renderchain_data))
{
RARCH_ERR("Renderchain could not be initialized.\n");
return false;
RARCH_ERR("Renderchain could not be initialized.\n");
return false;
}
if (!d3d->renderchain_driver || !d3d->renderchain_data)
return false;
return false;
if (
!d3d->renderchain_driver->init(
@ -187,7 +185,7 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
for (i = 1; i < d3d->shader.passes; i++)
{
d3d->renderchain_driver->convert_geometry(d3d->renderchain_data,
&link_info,
&link_info,
&out_width, &out_height,
current_width, current_height, &d3d->final_viewport);
@ -806,7 +804,7 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
video_driver_get_size(&width, &height);
d3d_set_viewport(d3d,
width, height, false, true);
width, height, false, true);
#if defined(_XBOX360)
strlcpy(settings->path.font, "game:\\media\\Arial_12.xpr",
@ -1047,7 +1045,7 @@ static bool d3d_construct(d3d_video_t *d3d,
win_height, info->fullscreen);
win32_set_window(&win_width, &win_height, info->fullscreen,
windowed_full, &rect);
windowed_full, &rect);
#endif
#ifdef HAVE_SHADERS
@ -1337,7 +1335,7 @@ static bool d3d_overlay_load(void *data,
image_data;
if (!d3d)
return false;
return false;
d3d_free_overlays(d3d);
d3d->overlays.resize(num_images);
@ -1603,7 +1601,7 @@ static void d3d_set_menu_texture_frame(void *data,
|| d3d->menu->tex_h != height)
{
if (d3d->menu)
d3d_texture_free(d3d->menu->tex);
d3d_texture_free(d3d->menu->tex);
d3d->menu->tex = d3d_texture_new(d3d->dev, NULL,
width, height, 1,
@ -1739,7 +1737,7 @@ static void d3d_unload_texture(void *data, uintptr_t id)
{
LPDIRECT3DTEXTURE texid;
if (!id)
return;
return;
texid = (LPDIRECT3DTEXTURE)id;
d3d_texture_free(texid);

7
gfx/drivers_context/wgl_ctx.cpp
View File

@ -23,10 +23,7 @@
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif
#define UNICODE
#include <tchar.h>
#include <wchar.h>
#include <encodings/win32.h>
#include <string.h>
#include <math.h>
@ -601,7 +598,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
}
static bool gfx_ctx_wgl_get_metrics(void *data,
enum display_metric_types type, float *value)
enum display_metric_types type, float *value)
{
return win32_get_metrics(data, type, value);
}

5
input/drivers/dinput.c
View File

@ -29,10 +29,7 @@
#define WM_MOUSEWHEEL 0x020A
#endif
#define UNICODE
#include <tchar.h>
#include <wchar.h>
#include <encodings/win32.h>
#include <dinput.h>
#include <stdlib.h>

1
libretro-common/include/compat/msvc.h
View File

@ -53,7 +53,6 @@ extern "C" {
}
#endif
#undef UNICODE /* Do not bother with UNICODE at this time. */
#include <direct.h>
#include <stddef.h>
#include <math.h>

10
libretro-common/include/encodings/win32.h
View File

@ -28,7 +28,17 @@
#define UNICODE
#include <tchar.h>
#include <wchar.h>
#ifdef __cplusplus
extern "C" {
#endif
#include <encodings/utf.h>
#ifdef __cplusplus
}
#endif
#endif
#endif

7
libretro-common/include/retro_miscellaneous.h
View File

@ -45,11 +45,12 @@
#include <time.h>
#endif
#ifdef _WIN32
#include <encodings/win32.h>
#endif
#if defined(_WIN32) && !defined(_XBOX)
#define WIN32_LEAN_AND_MEAN
#define UNICODE
#include <tchar.h>
#include <wchar.h>
#include <windows.h>
#elif defined(_WIN32) && defined(_XBOX)
#include <Xtl.h>

4
libretro-common/streams/file_stream.c
View File

@ -26,9 +26,7 @@
#include <errno.h>
#if defined(_WIN32)
# define UNICODE
# include <tchar.h>
# include <wchar.h>
#include <encodings/win32.h>
# ifdef _MSC_VER
# define setmode _setmode
# endif