Commit f47bcc22 authored by Alexandre Julliard's avatar Alexandre Julliard

winetest: Refuse to run if we cannot create a window.

parent 482fbe91
......@@ -473,7 +473,7 @@ DlgThreadProc (LPVOID param)
NULL, DlgProc);
switch (ret) {
case 0:
report (R_WARNING, "Invalid parent handle");
report (R_FATAL, "Cannot display dialog");
break;
case 1:
report (R_WARNING, "DialogBox failed: %d",
......
......@@ -145,6 +145,18 @@ static int check_mount_mgr(void)
return TRUE;
}
static int check_display_driver(void)
{
if (running_under_wine())
{
HWND hwnd = CreateWindowA( "STATIC", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
0, 0, GetModuleHandleA(0), 0 );
if (!hwnd) return FALSE;
DestroyWindow( hwnd );
}
return TRUE;
}
static int running_on_visible_desktop (void)
{
HWND desktop;
......@@ -1052,7 +1064,10 @@ int main( int argc, char *argv[] )
report (R_FATAL, "Tests must be run on a visible desktop");
if (!check_mount_mgr())
report (R_FATAL, "Mount manager not running, most likely your WINEPREFIX wasn't created correctly");
report (R_FATAL, "Mount manager not running, most likely your WINEPREFIX wasn't created correctly.");
if (!check_display_driver())
report (R_FATAL, "Unable to create a window, the display driver is not working.");
SetConsoleCtrlHandler(ctrl_handler, TRUE);
......
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