Commit cb4a3e42 authored by Jason Rumney's avatar Jason Rumney

(x_display_pixel_height, x_display_pixel_width):

Release DC when finished.  Use NULL window to refer to desktop.
(w32_term_init): Use NULL window to refer to desktop. (Bug#460)
parent 7fed8996
2009-02-12 Jason Rumney <jasonr@gnu.org>
* w32term.c (x_display_pixel_height, x_display_pixel_width):
Release DC when finished. Use NULL window to refer to desktop.
(w32_term_init): Use NULL window to refer to desktop. (Bug#460)
* w32font.c (add_font_entity_to_list): Fix check for substituted
raster fonts. (Bug#2219)
......
......@@ -464,14 +464,20 @@ int
x_display_pixel_height (dpyinfo)
struct w32_display_info *dpyinfo;
{
return GetDeviceCaps (GetDC (GetDesktopWindow ()), VERTRES);
HDC dc = GetDC (NULL);
int pixels = GetDeviceCaps (dc, VERTRES);
ReleaseDC (NULL, dc);
return pixels;
}
int
x_display_pixel_width (dpyinfo)
struct w32_display_info *dpyinfo;
{
return GetDeviceCaps (GetDC (GetDesktopWindow ()), HORZRES);
HDC dc = GetDC (NULL);
int pixels = GetDeviceCaps (dc, HORZRES);
ReleaseDC (NULL, dc);
return pixels;
}
......@@ -6216,7 +6222,7 @@ w32_term_init (display_name, xrm_option, resource_name)
dpyinfo->next = x_display_list;
x_display_list = dpyinfo;
hdc = GetDC (GetDesktopWindow ());
hdc = GetDC (NULL);
dpyinfo->root_window = GetDesktopWindow ();
dpyinfo->n_planes = GetDeviceCaps (hdc, PLANES);
......@@ -6224,7 +6230,7 @@ w32_term_init (display_name, xrm_option, resource_name)
dpyinfo->resx = GetDeviceCaps (hdc, LOGPIXELSX);
dpyinfo->resy = GetDeviceCaps (hdc, LOGPIXELSY);
dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE;
ReleaseDC (GetDesktopWindow (), hdc);
ReleaseDC (NULL, hdc);
/* initialise palette with white and black */
{
......
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