diff --git a/src/win/d3d_disp.cpp b/src/win/d3d_disp.cpp index dea8a1a..bedc88d 100644 --- a/src/win/d3d_disp.cpp +++ b/src/win/d3d_disp.cpp @@ -14,6 +14,8 @@ * */ +#define UNICODE + #include #include @@ -1389,7 +1391,7 @@ static void *d3d_display_thread_proc(void *arg) refresh_rate = d3d_get_default_refresh_rate(win_display->adapter); } d3d_display->device_name = (TCHAR *)al_malloc(sizeof(TCHAR)*32); - strcpy(d3d_display->device_name, info->dd.DeviceName); + strcpy((char*)d3d_display->device_name, (char*)info->dd.DeviceName); ALLEGRO_DEBUG("going to call _al_win_create_faux_fullscreen_window\n"); info->display = al_display; @@ -1479,56 +1481,54 @@ static void *d3d_display_thread_proc(void *arg) continue; } - hr = d3d_display->device->TestCooperativeLevel(); + if (d3d_display->device_lost) { + hr = d3d_display->device->TestCooperativeLevel(); - if (hr == D3D_OK) { - d3d_display->device_lost = false; - } - else if (hr == D3DERR_DEVICELOST) { - /* device remains lost */ - /* Set device_lost flag immediately. This prevents a crash in - * the DrawPrimitiveUP call in d3d_flush_vertex_cache. - */ - d3d_display->device_lost = true; - if (!lost_event_generated) { - ALLEGRO_DEBUG("D3DERR_DEVICELOST: d3d_display=%p\n", d3d_display); - lost_event_generated = true; - if (d3d_display->suppress_lost_events) { - ALLEGRO_DEBUG("DISPLAY_LOST event suppressed\n"); + if (hr == D3D_OK) { + d3d_display->device_lost = false; + } + else if (hr == D3DERR_DEVICELOST) { + /* device remains lost */ + if (!lost_event_generated) { + ALLEGRO_DEBUG("D3DERR_DEVICELOST: d3d_display=%p\n", d3d_display); + lost_event_generated = true; + if (d3d_display->suppress_lost_events) { + ALLEGRO_DEBUG("DISPLAY_LOST event suppressed\n"); + } + else { + _al_event_source_lock(&al_display->es); + if (_al_event_source_needs_to_generate_event(&al_display->es)) { + ALLEGRO_EVENT event; + memset(&event, 0, sizeof(event)); + event.display.type = ALLEGRO_EVENT_DISPLAY_LOST; + event.display.timestamp = al_get_time(); + _al_event_source_emit_event(&al_display->es, &event); + } + _al_event_source_unlock(&al_display->es); + al_rest(0.5); // give user time to respond + } } - else { + } + else if (hr == D3DERR_DEVICENOTRESET) { + if (_al_d3d_reset_device(d3d_display)) { + d3d_display->device_lost = false; + d3d_reset_state(d3d_display); + _al_d3d_set_ortho_projection(d3d_display, + al_display->w, al_display->h); _al_event_source_lock(&al_display->es); if (_al_event_source_needs_to_generate_event(&al_display->es)) { ALLEGRO_EVENT event; memset(&event, 0, sizeof(event)); - event.display.type = ALLEGRO_EVENT_DISPLAY_LOST; + event.display.type = ALLEGRO_EVENT_DISPLAY_FOUND; event.display.timestamp = al_get_time(); _al_event_source_emit_event(&al_display->es, &event); } _al_event_source_unlock(&al_display->es); - al_rest(0.5); // give user time to respond - } - } - } - else if (hr == D3DERR_DEVICENOTRESET) { - if (_al_d3d_reset_device(d3d_display)) { - d3d_display->device_lost = false; - d3d_reset_state(d3d_display); - _al_d3d_set_ortho_projection(d3d_display, - al_display->w, al_display->h); - _al_event_source_lock(&al_display->es); - if (_al_event_source_needs_to_generate_event(&al_display->es)) { - ALLEGRO_EVENT event; - memset(&event, 0, sizeof(event)); - event.display.type = ALLEGRO_EVENT_DISPLAY_FOUND; - event.display.timestamp = al_get_time(); - _al_event_source_emit_event(&al_display->es, &event); - } - _al_event_source_unlock(&al_display->es); - lost_event_generated = false; - d3d_call_callbacks(&al_display->display_validated_callbacks, al_display); - if (d3d_restore_callback) { - (*d3d_restore_callback)(al_display); + lost_event_generated = false; + d3d_call_callbacks(&al_display->display_validated_callbacks, al_display); + if (d3d_restore_callback) { + (*d3d_restore_callback)(al_display); + } } } } diff --git a/src/win/wgl_disp.c b/src/win/wgl_disp.c index aae741d..8a6166c 100644 --- a/src/win/wgl_disp.c +++ b/src/win/wgl_disp.c @@ -22,6 +22,9 @@ #define WINVER 0x0501 #endif #endif + +#define UNICODE + #include #include "allegro5/allegro.h" @@ -571,7 +574,7 @@ static bool change_display_mode(ALLEGRO_DISPLAY *d) DEVMODE dm; DEVMODE fallback_dm; DISPLAY_DEVICE dd; - char* dev_name = NULL; + TCHAR* dev_name = NULL; int i, modeswitch, result; int fallback_dm_valid = 0; int bpp; diff --git a/src/win/wwindow.c b/src/win/wwindow.c index c81d7d0..5ea7efc 100644 --- a/src/win/wwindow.c +++ b/src/win/wwindow.c @@ -20,6 +20,8 @@ #define WINVER 0x0501 #endif +#define UNICODE + #include #include @@ -36,6 +38,7 @@ #include "allegro5/internal/aintern_bitmap.h" #include "allegro5/internal/aintern_vector.h" #include "allegro5/internal/aintern_display.h" +#include "allegro5/internal/aintern_wunicode.h" #include "allegro5/platform/aintwin.h" @@ -72,7 +75,7 @@ static void display_flags_to_window_styles(int flags, HWND _al_win_create_hidden_window() { HWND window = CreateWindowEx(0, - "ALEX", "hidden", WS_POPUP, + L"ALEX", L"hidden", WS_POPUP, -5000, -5000, 0, 0, NULL,NULL,window_class.hInstance,0); return window; @@ -149,7 +152,7 @@ HWND _al_win_create_window(ALLEGRO_DISPLAY *display, int width, int height, int } my_window = CreateWindowEx(ex_style, - "ALEX", "Allegro", style, + L"ALEX", L"Allegro", style, pos_x, pos_y, width, height, NULL,NULL,window_class.hInstance,0); @@ -210,7 +213,7 @@ HWND _al_win_create_faux_fullscreen_window(LPCTSTR devname, ALLEGRO_DISPLAY *dis ex_style = WS_EX_TOPMOST; my_window = CreateWindowEx(ex_style, - "ALEX", "Allegro", style, + L"ALEX", L"Allegro", style, x1, y1, width, height, NULL,NULL,window_class.hInstance,0); @@ -803,7 +806,7 @@ static LRESULT CALLBACK window_callback(HWND hWnd, UINT message, SetWindowPos(GetForegroundWindow(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); } // Show the taskbar in case we hid it - SetWindowPos(FindWindow("Shell_traywnd", ""), 0, 0, 0, 0, 0, SWP_SHOWWINDOW); + SetWindowPos(FindWindow(L"Shell_traywnd", L""), 0, 0, 0, 0, 0, SWP_SHOWWINDOW); if (d->flags & ALLEGRO_FULLSCREEN) { d->vt->switch_out(d); } @@ -911,15 +914,15 @@ int _al_win_init_window() window_class.hIcon = NULL; window_class.hInstance = GetModuleHandle(NULL); window_class.lpfnWndProc = window_callback; - window_class.lpszClassName = "ALEX"; + window_class.lpszClassName = L"ALEX"; window_class.lpszMenuName = NULL; window_class.style = CS_VREDRAW|CS_HREDRAW|CS_OWNDC; RegisterClass(&window_class); if (_al_win_msg_call_proc == 0 && _al_win_msg_suicide == 0) { - _al_win_msg_call_proc = RegisterWindowMessage("Allegro call proc"); - _al_win_msg_suicide = RegisterWindowMessage("Allegro window suicide"); + _al_win_msg_call_proc = RegisterWindowMessage(L"Allegro call proc"); + _al_win_msg_suicide = RegisterWindowMessage(L"Allegro window suicide"); } return true; @@ -1155,7 +1158,7 @@ bool _al_win_set_display_flag(ALLEGRO_DISPLAY *display, int flag, bool onoff) // Hide the taskbar if fullscreening on primary monitor if (win_display->adapter == 0) { SetWindowPos( - FindWindow("Shell_traywnd", ""), + FindWindow(L"Shell_traywnd", L""), 0, 0, 0, 0, 0, @@ -1173,7 +1176,7 @@ bool _al_win_set_display_flag(ALLEGRO_DISPLAY *display, int flag, bool onoff) // Show the taskbar SetWindowPos( - FindWindow("Shell_traywnd", ""), 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOZORDER | SWP_NOMOVE); + FindWindow(L"Shell_traywnd", L""), 0, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOZORDER | SWP_NOMOVE); // Center the window _al_win_get_window_center(win_display, display->w, display->h, &pos_x, &pos_y); GetWindowInfo(win_display->window, &wi); @@ -1199,7 +1202,9 @@ bool _al_win_set_display_flag(ALLEGRO_DISPLAY *display, int flag, bool onoff) void _al_win_set_window_title(ALLEGRO_DISPLAY *display, const char *title) { ALLEGRO_DISPLAY_WIN *win_display = (ALLEGRO_DISPLAY_WIN *)display; - SetWindowText(win_display->window, title); + wchar_t *utf16 = _al_win_utf16(title); + SetWindowText(win_display->window, utf16); + al_free(utf16); } bool _al_win_set_window_constraints(ALLEGRO_DISPLAY *display,