forked from enlightenment/efl
ecore_evas: win32 module - fix possibly uninitialized variables
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
parent
15108ecad0
commit
c2abb9a946
|
@ -920,7 +920,7 @@ _ecore_evas_win32_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_ecore_evas_win32_object_cursor_unset(Ecore_Evas *ee)
|
_ecore_evas_win32_object_cursor_unset(Ecore_Evas *ee EINA_UNUSED)
|
||||||
{
|
{
|
||||||
ecore_win32_cursor_show(EINA_TRUE);
|
ecore_win32_cursor_show(EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
@ -1114,7 +1114,7 @@ _ecore_evas_win32_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y, int
|
||||||
{
|
{
|
||||||
Eina_Iterator *iter;
|
Eina_Iterator *iter;
|
||||||
Ecore_Win32_Monitor *ewm;
|
Ecore_Win32_Monitor *ewm;
|
||||||
Ecore_Win32_Monitor *m;
|
Ecore_Win32_Monitor *m = NULL;
|
||||||
unsigned int dist;
|
unsigned int dist;
|
||||||
int lx;
|
int lx;
|
||||||
int ly;
|
int ly;
|
||||||
|
@ -1143,6 +1143,20 @@ _ecore_evas_win32_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y, int
|
||||||
}
|
}
|
||||||
eina_iterator_free(iter);
|
eina_iterator_free(iter);
|
||||||
|
|
||||||
|
if (!m)
|
||||||
|
{
|
||||||
|
HDC dc;
|
||||||
|
|
||||||
|
if (x) *x = 0;
|
||||||
|
if (y) *y = 0;
|
||||||
|
dc = GetDC(NULL);
|
||||||
|
if (w) *w = GetDeviceCaps(dc, HORZRES);
|
||||||
|
if (h) *h = GetDeviceCaps(dc, VERTRES);
|
||||||
|
ReleaseDC(NULL, dc);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (x)
|
if (x)
|
||||||
*x = m->desktop.x;
|
*x = m->desktop.x;
|
||||||
if (y)
|
if (y)
|
||||||
|
@ -1159,7 +1173,7 @@ _ecore_evas_win32_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
|
||||||
Eina_Iterator *iter;
|
Eina_Iterator *iter;
|
||||||
Ecore_Win32_Monitor *ewm;
|
Ecore_Win32_Monitor *ewm;
|
||||||
unsigned int dist;
|
unsigned int dist;
|
||||||
int x_dpi;
|
int x_dpi = -1;
|
||||||
int y_dpi;
|
int y_dpi;
|
||||||
int lx;
|
int lx;
|
||||||
int ly;
|
int ly;
|
||||||
|
@ -1189,6 +1203,16 @@ _ecore_evas_win32_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
|
||||||
}
|
}
|
||||||
eina_iterator_free(iter);
|
eina_iterator_free(iter);
|
||||||
|
|
||||||
|
if (x_dpi == -1)
|
||||||
|
{
|
||||||
|
HDC dc;
|
||||||
|
|
||||||
|
dc = GetDC(NULL);
|
||||||
|
x_dpi = GetDeviceCaps(dc, LOGPIXELSX);
|
||||||
|
y_dpi = GetDeviceCaps(dc, LOGPIXELSY);
|
||||||
|
ReleaseDC(NULL, dc);
|
||||||
|
}
|
||||||
|
|
||||||
if (xdpi)
|
if (xdpi)
|
||||||
*xdpi = x_dpi;
|
*xdpi = x_dpi;
|
||||||
if (ydpi)
|
if (ydpi)
|
||||||
|
|
Loading…
Reference in New Issue