src/video/win32/SDL_win32video.h
changeset 1901 f1828a500391
parent 1895 c121d94672cb
child 1913 83420da906a5
equal deleted inserted replaced
1900:5c6bdbf3aadf 1901:f1828a500391
    30 #define UNICODE
    30 #define UNICODE
    31 #define WINVER  0x500           /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
    31 #define WINVER  0x500           /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
    32 #include <windows.h>
    32 #include <windows.h>
    33 
    33 
    34 #if SDL_VIDEO_RENDER_D3D
    34 #if SDL_VIDEO_RENDER_D3D
    35 #include <d3d9.h>
    35 //#include <d3d9.h>
       
    36 #define D3D_DEBUG_INFO
       
    37 #include "d3d9.h"
    36 #endif
    38 #endif
    37 
    39 
    38 #include "SDL_win32events.h"
    40 #include "SDL_win32events.h"
    39 #include "SDL_win32gamma.h"
    41 #include "SDL_win32gamma.h"
    40 #include "SDL_win32keyboard.h"
    42 #include "SDL_win32keyboard.h"
    41 #include "SDL_win32modes.h"
    43 #include "SDL_win32modes.h"
    42 #include "SDL_win32mouse.h"
    44 #include "SDL_win32mouse.h"
    43 #include "SDL_win32window.h"
    45 #include "SDL_win32window.h"
    44 
    46 
    45 #ifdef UNICODE
    47 #ifdef UNICODE
    46 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UCS-2", (char *)S, (wcslen(S)+1)*sizeof(WCHAR))
    48 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UCS-2", (char *)S, (SDL_wcslen(S)+1)*sizeof(WCHAR))
    47 #define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
    49 #define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
    48 #else
    50 #else
    49 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (strlen(S)+1))
    51 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (SDL_strlen(S)+1))
    50 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
    52 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
    51 #endif
    53 #endif
    52 
    54 
    53 /* Private display data */
    55 /* Private display data */
    54 
    56