Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_16_wince
Modified Files:
evas_engine.c evas_wince_ddraw_buffer.cpp
evas_wince_fb_buffer.c evas_wince_gapi_buffer.c
Log Message:
Fix engine wrt the latest changes in evas. Add error messages
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16_wince/evas_engine.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_engine.c 25 May 2008 17:37:24 -0000 1.4
+++ evas_engine.c 6 Jun 2008 12:14:01 -0000 1.5
@@ -133,7 +133,7 @@
Soft16_Image *im;
im = (Soft16_Image *)
evas_cache_image_empty(evas_common_soft16_image_cache_get());
- im->flags.have_alpha = 0;
+ im->cache_entry.flags.alpha = 0;
evas_cache_image_surface_alloc(&im->cache_entry, w, h);
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_wince_ddraw_buffer.cpp 25 May 2008 17:37:24 -0000 1.1
+++ evas_wince_ddraw_buffer.cpp 6 Jun 2008 12:14:01 -0000 1.2
@@ -33,19 +33,31 @@
priv->module = LoadLibrary(L"ddraw.dll");
if (!priv->module)
- goto free_priv;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not load
ddraw.dll\n");
+ goto free_priv;
+ }
lib_DirectDrawCreate = (fct_DirectDrawCreate)GetProcAddress(priv->module,
L"DirectDrawCreate");
if (!lib_DirectDrawCreate)
- goto free_lib;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not initialize
DirectDraw\n");
+ goto free_lib;
+ }
res = lib_DirectDrawCreate(NULL, (IUnknown**)&priv->object, NULL);
if (FAILED(res))
- goto free_lib;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not create
DirectDraw object\n");
+ goto free_lib;
+ }
res = priv->object->SetCooperativeLevel(window, DDSCL_FULLSCREEN);
if (FAILED(res))
- goto release_object;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not set window to
fullscreen\n");
+ goto release_object;
+ }
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
@@ -54,13 +66,19 @@
res = priv->object->CreateSurface(&surface_desc, &priv->surface, NULL);
if (FAILED(res))
- goto release_object;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not create
surface\n");
+ goto release_object;
+ }
memset(&surface_desc, 0, sizeof(surface_desc));
surface_desc.dwSize = sizeof(surface_desc);
res = priv->surface->Lock(0, &surface_desc, DDLOCK_WAITNOTBUSY, 0);
if (FAILED(res))
- goto release_surface;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not lock
surface\n");
+ goto release_surface;
+ }
priv->width = surface_desc.dwWidth;
priv->height = surface_desc.dwHeight;
@@ -68,7 +86,10 @@
res = priv->surface->Unlock(NULL);
if (FAILED(res))
- goto release_surface;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE DDraw] Can not unlock
surface\n");
+ goto release_surface;
+ }
return priv;
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_wince_fb_buffer.c 25 May 2008 17:37:24 -0000 1.3
+++ evas_wince_fb_buffer.c 6 Jun 2008 12:14:01 -0000 1.4
@@ -55,6 +55,7 @@
dc = GetDC (window);
if (!dc)
{
+ fprintf (stderr, "[Evas] [Engine] [WinCE FB] Can not get DC\n");
free(priv);
return NULL;
}
@@ -75,6 +76,7 @@
(char *) &gxInfo);
if (result <= 0)
{
+ fprintf (stderr, "[Evas] [Engine] [WinCE FB] [Ipaq] ExtEscape()
failed\n");
ReleaseDC(window, dc);
free(priv);
return NULL;
@@ -93,6 +95,7 @@
(rfbi.wBPP != 16) ||
(rfbi.wFormat != 1))
{
+ fprintf (stderr, "[Evas] [Engine] [WinCE FB] ExtEscape() failed\n");
ReleaseDC(window, dc);
free(priv);
return NULL;
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_wince_gapi_buffer.c 25 May 2008 17:37:24 -0000 1.9
+++ evas_wince_gapi_buffer.c 6 Jun 2008 12:14:01 -0000 1.10
@@ -106,10 +106,11 @@
if (!gapi_lib)
{
gapi_lib = LoadLibrary(L"gx.dll");
- if (!gapi_lib) {
- printf ("error : LoadLibrary\n");
- goto free_priv;
- }
+ if (!gapi_lib)
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] Can not load
gx.dll\n");
+ goto free_priv;
+ }
}
LINK(display_open, display_open, L"?GXOpenDisplay@@YAHPAUHWND__@@[EMAIL
PROTECTED]");
@@ -128,13 +129,13 @@
!suspend ||
!resume)
{
- printf ("error : no valid symbols\n");
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] Can not find valid
symbols\n");
goto free_lib;
}
if (!display_open(window, GX_FULLSCREEN))
{
- printf ("error : GXOpenDisplay\n");
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] Can not open
display\n");
goto free_lib;
}
@@ -143,7 +144,7 @@
// verify pixel format
if(!(prop.ffFormat & kfDirect565) || (prop.cBPP != 16))
{
- printf ("error : GAPI format mismatch\n");
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] display format
mismatch\n");
goto close_display;
}
@@ -151,7 +152,7 @@
if ((GetSystemMetrics(SM_CXSCREEN) != (int)prop.cxWidth) ||
(GetSystemMetrics(SM_CYSCREEN) != (int)prop.cyHeight))
{
- printf ("error : GAPI size mismatch\n");
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] display size
mismatch\n");
goto close_display;
}
@@ -217,13 +218,17 @@
dc = GetDC (window);
if (!dc)
- goto close_display;
+ {
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] Can not get
device\n");
+ goto close_display;
+ }
gxInfo.Version = 100;
result = ExtEscape(dc, GETGXINFO, 0, NULL, sizeof(gxInfo),
(char *) &gxInfo);
if (result <= 0)
{
+ fprintf (stderr, "[Evas] [Engine] [WinCE GAPI] ExtEscape
failed\n");
ReleaseDC(window, dc);
goto close_display;
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
