ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "kernel32: Exit from initial thread with ExitThread not by ExitProcess." 

This reverts commit 5a1fd50db3.
I committed the wrong file.
This commit is contained in:
Alexandre Julliard 2006-10-24 20:48:17 +02:00
parent 0bcc941f96
commit af9574cead
1 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dlls/winex11.drv/xinerama.c
View File

@ -106,10 +106,9 @@ static int query_screens(void)
nb_monitors = count; nb_monitors = count;
for (i = 0; i < nb_monitors; i++) for (i = 0; i < nb_monitors; i++)
{ {
#if 1
/* FIXME: for now, force primary to be the screen that starts at (0,0) origin */ /* FIXME: for now, force primary to be the screen that starts at (0,0) origin */
if (!screens[i].x_org && !screens[i].y_org) primary_monitor = i; if (!screens[i].x_org && !screens[i].y_org) primary_monitor = i;
#endif
monitors[i].cbSize = sizeof( monitors[i] ); monitors[i].cbSize = sizeof( monitors[i] );
monitors[i].rcMonitor.left = screens[i].x_org; monitors[i].rcMonitor.left = screens[i].x_org;
monitors[i].rcMonitor.top = screens[i].y_org; monitors[i].rcMonitor.top = screens[i].y_org;
@ -122,6 +121,11 @@ static int query_screens(void)
} }
get_primary()->dwFlags |= MONITORINFOF_PRIMARY; get_primary()->dwFlags |= MONITORINFOF_PRIMARY;
for (i = 0; i < nb_monitors; i++)
TRACE( "monitor %p: %s%s\n",
index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor),
(monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" );
} }
else count = 0; else count = 0;
@ -141,36 +145,11 @@ static inline int query_screens(void)
void xinerama_init(void) void xinerama_init(void)
{ {
MONITORINFOEXW *primary; MONITORINFOEXW *primary;
int i;
wine_tsx11_lock(); wine_tsx11_lock();
SetRect( &virtual_screen_rect, 0, 0, screen_width, screen_height ); SetRect( &virtual_screen_rect, 0, 0, screen_width, screen_height );
#if 0
if (root_window != DefaultRootWindow( gdi_display ))
{
static const WCHAR monitorW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','u',0};
nb_monitors = 4;
if ((monitors = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(*monitors) )))
{
for (i = 0; i < nb_monitors; i++)
{
monitors[i].cbSize = sizeof( monitors[i] );
monitors[i].rcMonitor.left = (i & 1) ? screen_width / 2 : 0;
monitors[i].rcMonitor.top = (i & 2) ? screen_height / 2 : 0;
monitors[i].rcMonitor.right = monitors[i].rcMonitor.left + screen_width / 2;
monitors[i].rcMonitor.bottom = monitors[i].rcMonitor.top + screen_height / 2;
monitors[i].rcWork = monitors[i].rcMonitor;
monitors[i].dwFlags = 0;
wsprintfW( monitors[i].szDevice, monitorW, i );
}
primary_monitor = 3;
get_primary()->dwFlags |= MONITORINFOF_PRIMARY;
}
}
else
#endif
if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) if (root_window != DefaultRootWindow( gdi_display ) || !query_screens())
{ {
default_monitor.rcWork = default_monitor.rcMonitor = virtual_screen_rect; default_monitor.rcWork = default_monitor.rcMonitor = virtual_screen_rect;
@ -179,21 +158,11 @@ void xinerama_init(void)
} }
primary = get_primary(); primary = get_primary();
/* coordinates (0,0) have to point to the primary monitor origin */ /* coordinates (0,0) have to point to the primary monitor origin */
OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top );
for (i = 0; i < nb_monitors; i++)
{
OffsetRect( &monitors[i].rcMonitor, virtual_screen_rect.left, virtual_screen_rect.top );
OffsetRect( &monitors[i].rcWork, virtual_screen_rect.left, virtual_screen_rect.top );
ERR( "monitor %p: %s%s\n",
index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor),
(monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" );
}
screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_width = primary->rcMonitor.right - primary->rcMonitor.left;
screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top;
ERR( "virtual size: %s primary size: %dx%d\n", TRACE( "virtual size: %s primary size: %dx%d\n",
wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height );
wine_tsx11_unlock(); wine_tsx11_unlock();