From: Enlightenment S. <no-...@en...> - 2008-10-29 08:35:41
|
Log: enable auto import Author: caro Date: 2008-10-29 01:35:36 -0700 (Wed, 29 Oct 2008) New Revision: 37297 Modified: trunk/evas/src/modules/engines/software_16_wince/Makefile.am Modified: trunk/evas/src/modules/engines/software_16_wince/Makefile.am =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/Makefile.am 2008-10-29 08:34:52 UTC (rev 37296) +++ trunk/evas/src/modules/engines/software_16_wince/Makefile.am 2008-10-29 08:35:36 UTC (rev 37297) @@ -29,7 +29,7 @@ module_la_CFLAGS = @WIN32_CFLAGS@ module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la -module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version +module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static module_la_DEPENDENCIES = $(top_builddir)/config.h |
From: Enlightenment S. <no-...@en...> - 2008-11-03 05:26:00
|
Log: Use stdio instead of iostream to output error messages Large parts of the stdc++ library are statically linked into the dll. The size of the generated DLL decrease from ~500KB to ~24KB Author: caro Date: 2008-11-02 21:25:56 -0800 (Sun, 02 Nov 2008) New Revision: 37428 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp 2008-11-03 01:55:38 UTC (rev 37427) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp 2008-11-03 05:25:56 UTC (rev 37428) @@ -1,5 +1,5 @@ -#include <iostream> +#include <cstdio> #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -42,28 +42,28 @@ priv->module = LoadLibrary(L"ddraw.dll"); if (!priv->module) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Can not load ddraw.dll" << std::endl; + 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) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Can not initialize DirectDraw" << std::endl; + 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)) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Can not create DirectDraw object" << std::endl; + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not create DirectDraw object\n"); goto free_lib; } res = priv->object->SetCooperativeLevel(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); if (FAILED(res)) { - std::cerr<< "[Evas] [Engine] [WinCE DDraw] Can not set window to fullscreen" << std::endl; + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not set window to fullscreen\n"); goto release_object; } @@ -75,7 +75,7 @@ res = priv->object->CreateSurface(&surface_desc, &priv->surface, NULL); if (FAILED(res)) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Can not create surface" << std::endl; + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not create surface\n"); goto release_object; } @@ -84,7 +84,7 @@ res = priv->surface->Lock(NULL, &surface_desc, DDLOCK_READONLY, NULL); if (FAILED(res)) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Can not lock surface" << std::endl; + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not lock surface\n"); goto release_surface; } @@ -95,16 +95,16 @@ if ((priv->width != width) || (priv->height != height)) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Size mismatch" << std::endl; - std::cerr << "[Evas] [Engine] [WinCE DDraw] asked: " << width << "x" << height << std::endl; - std::cerr << "[Evas] [Engine] [WinCE DDraw] got : " << priv->width << "x" << priv->height << std::endl; + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Size mismatch\n"); + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] asked : %dx%d\n", width, height); + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] got : %dx%d\n", priv->width, priv->height); goto release_surface; } res = priv->surface->Unlock(NULL); if (FAILED(res)) { - std::cerr << "[Evas] [Engine] [WinCE DDraw] Can not unlock surface" << std::endl; + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not unlock surface\n"); goto release_surface; } |
From: Enlightenment S. <no-...@en...> - 2008-11-19 07:08:21
|
Log: add gdi backend to the win ce engine. Not working yet but some other people can help me now with that code in svn * expedite is working but sometimes crashes. Maybe a big mem leak ? * maybe moving the creation of the bitmap in evas_software_wince_gdi_output_buffer_paste() to evas_software_wince_gdi_output_buffer_new() so that the memcpy is not necessary anymore Author: caro Date: 2008-11-18 23:08:18 -0800 (Tue, 18 Nov 2008) New Revision: 37709 Added: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h trunk/evas/src/modules/engines/software_16_wince/Makefile.am trunk/evas/src/modules/engines/software_16_wince/evas_engine.c trunk/evas/src/modules/engines/software_16_wince/evas_engine.h Modified: trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h 2008-11-19 07:05:51 UTC (rev 37708) +++ trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h 2008-11-19 07:08:18 UTC (rev 37709) @@ -17,7 +17,7 @@ HWND window; int width; int height; - int backend; /* 0: auto, 1: raw, 2: gapi, 3: ddraw */ + int backend; /* 0: auto, 1: raw, 2: gapi, 3: ddraw, 4: gdi */ int rotation; } info; /* engine specific function calls to query stuff about messages */ Modified: trunk/evas/src/modules/engines/software_16_wince/Makefile.am =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/Makefile.am 2008-11-19 07:05:51 UTC (rev 37708) +++ trunk/evas/src/modules/engines/software_16_wince/Makefile.am 2008-11-19 07:08:18 UTC (rev 37709) @@ -22,9 +22,10 @@ module_la_SOURCES = \ evas_engine.h \ evas_engine.c \ +evas_wince_ddraw_buffer.cpp \ evas_wince_fb_buffer.c \ evas_wince_gapi_buffer.c \ -evas_wince_ddraw_buffer.cpp \ +evas_wince_gdi_buffer.c \ evas_wince_gapi.rc module_la_CFLAGS = @WIN32_CFLAGS@ Modified: trunk/evas/src/modules/engines/software_16_wince/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_engine.c 2008-11-19 07:05:51 UTC (rev 37708) +++ trunk/evas/src/modules/engines/software_16_wince/evas_engine.c 2008-11-19 07:08:18 UTC (rev 37709) @@ -9,7 +9,8 @@ { EVAS_ENGINE_WINCE_FB, EVAS_ENGINE_WINCE_GAPI, - EVAS_ENGINE_WINCE_DDRAW + EVAS_ENGINE_WINCE_DDRAW, + EVAS_ENGINE_WINCE_GDI } Evas_Engine_WinCE_Backend; @@ -21,7 +22,7 @@ struct _Render_Engine { - Evas_Engine_WinCE_Backend backend; /* 1: raw, 2: gapi, 3: ddraw */ + Evas_Engine_WinCE_Backend backend; /* 1: raw, 2: gapi, 3: ddraw, 4: GDI */ void *backend_priv; void (*backend_shutdown)(void *priv); FB_Output_Buffer *(*backend_output_buffer_new)(void *priv, @@ -217,6 +218,20 @@ re->backend_output_buffer_paste = evas_software_wince_ddraw_output_buffer_paste; re->backend_surface_resize = evas_software_wince_ddraw_surface_resize; break; + case 4: /* GDI */ + re->backend = EVAS_ENGINE_WINCE_GDI; + re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height); + if (!re->backend_priv) + { + free(re); + return; + } + re->backend_shutdown = evas_software_wince_gdi_shutdown; + re->backend_output_buffer_new = evas_software_wince_gdi_output_buffer_new; + re->backend_output_buffer_free = evas_software_wince_gdi_output_buffer_free; + re->backend_output_buffer_paste = evas_software_wince_gdi_output_buffer_paste; + re->backend_surface_resize = evas_software_wince_gdi_surface_resize; + break; default: free(re); return; @@ -278,6 +293,20 @@ re->backend_output_buffer_paste = evas_software_wince_ddraw_output_buffer_paste; re->backend_surface_resize = evas_software_wince_ddraw_surface_resize; break; + case 4: /* GDI */ + re->backend = EVAS_ENGINE_WINCE_GDI; + re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height); + if (!re->backend_priv) + { + free(re); + return; + } + re->backend_shutdown = evas_software_wince_gdi_shutdown; + re->backend_output_buffer_new = evas_software_wince_gdi_output_buffer_new; + re->backend_output_buffer_free = evas_software_wince_gdi_output_buffer_free; + re->backend_output_buffer_paste = evas_software_wince_gdi_output_buffer_paste; + re->backend_surface_resize = evas_software_wince_gdi_surface_resize; + break; default: free(re); return; Modified: trunk/evas/src/modules/engines/software_16_wince/evas_engine.h =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_engine.h 2008-11-19 07:05:51 UTC (rev 37708) +++ trunk/evas/src/modules/engines/software_16_wince/evas_engine.h 2008-11-19 07:08:18 UTC (rev 37709) @@ -77,4 +77,19 @@ #endif +/* GDI */ + +void *evas_software_wince_gdi_init (HWND window, + int width, + int height); +FB_Output_Buffer *evas_software_wince_gdi_output_buffer_new (void *priv, + int width, + int height); +void evas_software_wince_gdi_shutdown(void *priv); +void evas_software_wince_gdi_output_buffer_free (FB_Output_Buffer *fbob); +void evas_software_wince_gdi_output_buffer_paste (FB_Output_Buffer *fbob); + +void evas_software_wince_gdi_surface_resize(FB_Output_Buffer *fbob); + + #endif /* __EVAS_ENGINE_H__ */ Added: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c |
From: Enlightenment S. <no-...@en...> - 2008-11-19 07:29:38
|
Log: mem leak -- Author: caro Date: 2008-11-18 23:29:27 -0800 (Tue, 18 Nov 2008) New Revision: 37710 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2008-11-19 07:08:18 UTC (rev 37709) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2008-11-19 07:29:27 UTC (rev 37710) @@ -155,6 +155,7 @@ 0, 0, SRCCOPY); DeleteDC(dc); + DeleteObject(bitmap); ReleaseDC(priv->window, dc2); } |
From: Enlightenment S. <no-...@en...> - 2008-11-19 07:52:07
|
Log: create the bitmap only once. Increased speed :) Author: caro Date: 2008-11-18 23:52:05 -0800 (Tue, 18 Nov 2008) New Revision: 37711 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2008-11-19 07:29:27 UTC (rev 37710) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2008-11-19 07:52:05 UTC (rev 37711) @@ -13,9 +13,10 @@ struct Evas_Engine_WinCE_GDI_Priv { - BITMAPINFO_16bpp *bitmap_info; HWND window; HDC dc; + BITMAPINFO_16bpp *bitmap_info; + HBITMAP bitmap; int width; int height; }; @@ -94,21 +95,28 @@ int width, int height) { + Evas_Engine_WinCE_GDI_Priv *priv2; FB_Output_Buffer *fbob; void *buffer; fbob = calloc(1, sizeof(FB_Output_Buffer)); if (!fbob) return NULL; - buffer = malloc (width * height * 2); /* we are sure to have 16bpp */ - if (!buffer) + fbob->priv = priv; + + priv2 = (Evas_Engine_WinCE_GDI_Priv *)fbob->priv; + priv2->bitmap = CreateDIBSection(priv2->dc, + (const BITMAPINFO *)priv2->bitmap_info, + DIB_RGB_COLORS, + (void **)(&buffer), + NULL, + 0); + if (!priv2->bitmap) { free(fbob); return NULL; } - fbob->priv = priv; - fbob->im = (Soft16_Image *) evas_cache_image_data(evas_common_soft16_image_cache_get(), width, height, (DATA32 *)buffer, 0, EVAS_COLORSPACE_RGB565_A5P); if (fbob->im) fbob->im->stride = width; @@ -119,7 +127,10 @@ void evas_software_wince_gdi_output_buffer_free(FB_Output_Buffer *fbob) { - free(fbob->im->pixels); + Evas_Engine_WinCE_GDI_Priv *priv; + + priv = (Evas_Engine_WinCE_GDI_Priv *)fbob->priv; + DeleteObject(priv->bitmap); free(fbob); } @@ -134,20 +145,9 @@ (fbob->im->cache_entry.h == priv->height)) { HDC dc; - HDC dc2; - HBITMAP bitmap; - void *bits; - dc2 = GetDC(priv->window); - bitmap = CreateDIBSection(priv->dc, - (const BITMAPINFO *)priv->bitmap_info, - DIB_RGB_COLORS, - (void **)(&bits), - NULL, - 0); dc = CreateCompatibleDC(priv->dc); - SelectObject(dc, bitmap); - memcpy(bits, fbob->im->pixels, priv->width * priv->height * 2); + SelectObject(dc, priv->bitmap); BitBlt(priv->dc, 0, 0, priv->width, priv->height, @@ -155,8 +155,6 @@ 0, 0, SRCCOPY); DeleteDC(dc); - DeleteObject(bitmap); - ReleaseDC(priv->window, dc2); } } |
From: Enlightenment S. <no-...@en...> - 2008-11-19 08:48:06
|
Log: * formatting * use a negative height for the biHeight member of the bitmap info (topdown bitmap) Author: caro Date: 2008-11-19 00:48:00 -0800 (Wed, 19 Nov 2008) New Revision: 37712 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2008-11-19 07:52:05 UTC (rev 37711) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2008-11-19 08:48:00 UTC (rev 37712) @@ -41,44 +41,44 @@ return NULL; } - priv->width = GetSystemMetrics(SM_CXSCREEN); - priv->height = GetSystemMetrics(SM_CYSCREEN); + priv->width = GetSystemMetrics(SM_CXSCREEN); + priv->height = GetSystemMetrics(SM_CYSCREEN); - if ((priv->width != width) || - (priv->height != height)) - { - fprintf (stderr, "[Evas] [Engine] [WinCE GDI] Size mismatch\n"); - fprintf (stderr, "[Evas] [Engine] [WinCE GDI] asked: %dx%d\n", width, height); - fprintf (stderr, "[Evas] [Engine] [WinCE GDI] got : %dx%d\n", priv->width, priv->height); - ReleaseDC(window, priv->dc); - free(priv); - return NULL; - } + if ((priv->width != width) || + (priv->height != height)) + { + fprintf (stderr, "[Evas] [Engine] [WinCE GDI] Size mismatch\n"); + fprintf (stderr, "[Evas] [Engine] [WinCE GDI] asked: %dx%d\n", width, height); + fprintf (stderr, "[Evas] [Engine] [WinCE GDI] got : %dx%d\n", priv->width, priv->height); + ReleaseDC(window, priv->dc); + free(priv); + return NULL; + } - priv->bitmap_info = (BITMAPINFO_16bpp *)malloc(sizeof(BITMAPINFO_16bpp)); - if (!priv->bitmap_info) - { - ReleaseDC(window, priv->dc); - free(priv); - return NULL; - } + priv->bitmap_info = (BITMAPINFO_16bpp *)malloc(sizeof(BITMAPINFO_16bpp)); + if (!priv->bitmap_info) + { + ReleaseDC(window, priv->dc); + free(priv); + return NULL; + } - priv->bitmap_info->bih.biSize = sizeof(BITMAPINFOHEADER); - priv->bitmap_info->bih.biWidth = priv->width; - priv->bitmap_info->bih.biHeight = priv->height; /* -h for topdown bitmap ? */ - priv->bitmap_info->bih.biPlanes = 1; - priv->bitmap_info->bih.biSizeImage = 2 * priv->width * priv->height; - priv->bitmap_info->bih.biXPelsPerMeter = 0; - priv->bitmap_info->bih.biYPelsPerMeter = 0; - priv->bitmap_info->bih.biClrUsed = 0; - priv->bitmap_info->bih.biClrImportant = 0; - priv->bitmap_info->bih.biBitCount = 16; - priv->bitmap_info->bih.biCompression = BI_BITFIELDS; - priv->bitmap_info->masks[0] = 0x0000f800; - priv->bitmap_info->masks[1] = 0x000007e0; - priv->bitmap_info->masks[2] = 0x0000001f; + priv->bitmap_info->bih.biSize = sizeof(BITMAPINFOHEADER); + priv->bitmap_info->bih.biWidth = priv->width; + priv->bitmap_info->bih.biHeight = -priv->height; + priv->bitmap_info->bih.biPlanes = 1; + priv->bitmap_info->bih.biSizeImage = 2 * priv->width * priv->height; + priv->bitmap_info->bih.biXPelsPerMeter = 0; + priv->bitmap_info->bih.biYPelsPerMeter = 0; + priv->bitmap_info->bih.biClrUsed = 0; + priv->bitmap_info->bih.biClrImportant = 0; + priv->bitmap_info->bih.biBitCount = 16; + priv->bitmap_info->bih.biCompression = BI_BITFIELDS; + priv->bitmap_info->masks[0] = 0x0000f800; + priv->bitmap_info->masks[1] = 0x000007e0; + priv->bitmap_info->masks[2] = 0x0000001f; - return priv; + return priv; } void @@ -92,12 +92,12 @@ FB_Output_Buffer * evas_software_wince_gdi_output_buffer_new(void *priv, - int width, - int height) + int width, + int height) { Evas_Engine_WinCE_GDI_Priv *priv2; - FB_Output_Buffer *fbob; - void *buffer; + FB_Output_Buffer *fbob; + void *buffer; fbob = calloc(1, sizeof(FB_Output_Buffer)); if (!fbob) return NULL; @@ -105,6 +105,7 @@ fbob->priv = priv; priv2 = (Evas_Engine_WinCE_GDI_Priv *)fbob->priv; + priv2->bitmap = CreateDIBSection(priv2->dc, (const BITMAPINFO *)priv2->bitmap_info, DIB_RGB_COLORS, |
From: Enlightenment S. <no-...@en...> - 2009-01-10 17:33:22
|
Log: add windowed and fullscreen support to the gdi backend. Other backend are only fullscreen. Author: caro Date: 2009-01-10 09:33:19 -0800 (Sat, 10 Jan 2009) New Revision: 38539 Modified: trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h trunk/evas/src/modules/engines/software_16_wince/evas_engine.c trunk/evas/src/modules/engines/software_16_wince/evas_engine.h trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h 2009-01-10 17:18:41 UTC (rev 38538) +++ trunk/evas/src/modules/engines/software_16_wince/Evas_Engine_Software_16_WinCE.h 2009-01-10 17:33:19 UTC (rev 38539) @@ -14,11 +14,12 @@ Evas_Engine_Info magic; struct { - HWND window; - int width; - int height; - int backend; /* 0: auto, 1: raw, 2: gapi, 3: ddraw, 4: gdi */ - int rotation; + HWND window; + int width; + int height; + int backend; /* 0: auto, 1: raw, 2: gapi, 3: ddraw, 4: gdi */ + int rotation; + unsigned int fullscreen : 1; } info; /* engine specific function calls to query stuff about messages */ struct { Modified: trunk/evas/src/modules/engines/software_16_wince/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_engine.c 2009-01-10 17:18:41 UTC (rev 38538) +++ trunk/evas/src/modules/engines/software_16_wince/evas_engine.c 2009-01-10 17:33:19 UTC (rev 38539) @@ -220,7 +220,7 @@ break; case 4: /* GDI */ re->backend = EVAS_ENGINE_WINCE_GDI; - re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height); + re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height, info->info.fullscreen); if (!re->backend_priv) { free(re); @@ -295,7 +295,7 @@ break; case 4: /* GDI */ re->backend = EVAS_ENGINE_WINCE_GDI; - re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height); + re->backend_priv = evas_software_wince_gdi_init(info->info.window, info->info.width, info->info.height, info->info.fullscreen); if (!re->backend_priv) { free(re); Modified: trunk/evas/src/modules/engines/software_16_wince/evas_engine.h =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_engine.h 2009-01-10 17:18:41 UTC (rev 38538) +++ trunk/evas/src/modules/engines/software_16_wince/evas_engine.h 2009-01-10 17:33:19 UTC (rev 38539) @@ -81,7 +81,8 @@ void *evas_software_wince_gdi_init (HWND window, int width, - int height); + int height, + int fullscreen); FB_Output_Buffer *evas_software_wince_gdi_output_buffer_new (void *priv, int width, int height); Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2009-01-10 17:18:41 UTC (rev 38538) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2009-01-10 17:33:19 UTC (rev 38539) @@ -24,7 +24,8 @@ void * evas_software_wince_gdi_init(HWND window, int width, - int height) + int height, + int fullscreen) { Evas_Engine_WinCE_GDI_Priv *priv; @@ -41,19 +42,16 @@ return NULL; } - priv->width = GetSystemMetrics(SM_CXSCREEN); - priv->height = GetSystemMetrics(SM_CYSCREEN); - - if ((priv->width != width) || - (priv->height != height)) + if (fullscreen) { - fprintf (stderr, "[Evas] [Engine] [WinCE GDI] Size mismatch\n"); - fprintf (stderr, "[Evas] [Engine] [WinCE GDI] asked: %dx%d\n", width, height); - fprintf (stderr, "[Evas] [Engine] [WinCE GDI] got : %dx%d\n", priv->width, priv->height); - ReleaseDC(window, priv->dc); - free(priv); - return NULL; + priv->width = GetSystemMetrics(SM_CXSCREEN); + priv->height = GetSystemMetrics(SM_CYSCREEN); } + else + { + priv->width = width; + priv->height = height; + } priv->bitmap_info = (BITMAPINFO_16bpp *)malloc(sizeof(BITMAPINFO_16bpp)); if (!priv->bitmap_info) |
From: Enlightenment S. <no-...@en...> - 2009-01-19 17:53:37
|
Log: add error message in the win ce gdi engine Author: caro Date: 2009-01-19 09:53:30 -0800 (Mon, 19 Jan 2009) New Revision: 38646 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2009-01-19 17:51:17 UTC (rev 38645) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2009-01-19 17:53:30 UTC (rev 38646) @@ -56,6 +56,7 @@ priv->bitmap_info = (BITMAPINFO_16bpp *)malloc(sizeof(BITMAPINFO_16bpp)); if (!priv->bitmap_info) { + fprintf (stderr, "[Evas] [Engine] [WinCE GDI] Can not allocate bitmap info\n"); ReleaseDC(window, priv->dc); free(priv); return NULL; |
From: Enlightenment S. <no-...@en...> - 2009-06-27 07:00:41
|
Log: remove useless Windows CE stuff, as it must be done on the executable, and not the library. Author: caro Date: 2009-06-27 00:00:39 -0700 (Sat, 27 Jun 2009) New Revision: 41214 Removed: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi.rc Modified: trunk/evas/src/modules/engines/software_16_wince/Makefile.am Modified: trunk/evas/src/modules/engines/software_16_wince/Makefile.am =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/Makefile.am 2009-06-27 06:57:54 UTC (rev 41213) +++ trunk/evas/src/modules/engines/software_16_wince/Makefile.am 2009-06-27 07:00:39 UTC (rev 41214) @@ -11,9 +11,6 @@ @FREETYPE_CFLAGS@ \ @evas_engine_software_16_wince_cflags@ -.rc.lo: - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) $< -o $@ - if BUILD_ENGINE_SOFTWARE_16_WINCE SOFTWARE_16_WINCE_SOURCE = \ @@ -21,8 +18,7 @@ evas_wince_ddraw_buffer.cpp \ evas_wince_fb_buffer.c \ evas_wince_gapi_buffer.c \ -evas_wince_gdi_buffer.c \ -evas_wince_gapi.rc +evas_wince_gdi_buffer.c SOFTWARE_16_WINCE_LIBADD = @evas_engine_software_16_wince_libs@ Deleted: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi.rc |
From: Enlightenment S. <no-...@en...> - 2009-10-13 17:28:10
|
Log: fix compilation on Windows CE Author: caro Date: 2009-10-13 10:27:49 -0700 (Tue, 13 Oct 2009) New Revision: 43055 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c 2009-10-13 17:14:50 UTC (rev 43054) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_fb_buffer.c 2009-10-13 17:27:49 UTC (rev 43055) @@ -51,7 +51,7 @@ (char *) &gxInfo); if (result <= 0) { - ERROR("[Engine] [WinCE FB] ExtEscape() with GETGXINFO failed"); + fprintf(stderr, "[Engine] [WinCE FB] ExtEscape() with GETGXINFO failed\n"); return 0; } @@ -79,7 +79,7 @@ dc = GetDC (window); if (!dc) { - ERROR("[Engine] [WinCE FB] Can not get DC"); + fprintf(stderr, "[Engine] [WinCE FB] Can not get DC\n"); free(priv); return NULL; } @@ -102,9 +102,9 @@ if ((priv->width != width) || (priv->height != height)) { - ERROR("[Engine] [WinCE FB] Size mismatch"); - ERROR("[Engine] [WinCE FB] asked: %dx%d", width, height); - ERROR("[Engine] [WinCE FB] got : %dx%d", priv->width, priv->height); + fprintf(stderr, "[Engine] [WinCE FB] Size mismatch\n"); + fprintf(stderr, "[Engine] [WinCE FB] asked: %dx%d\n", width, height); + fprintf(stderr, "[Engine] [WinCE FB] got : %dx%d\n", priv->width, priv->height); ReleaseDC(window, dc); free(priv); return NULL; @@ -119,8 +119,8 @@ (rfbi.wBPP != 16) || (rfbi.wFormat != 1)) { - ERRPR("[Engine] [WinCE FB] ExtEscape() with GETRAWFRAMEBUFFER failed"); - ERROR("[Engine] [WinCE FB] trying ExtEscape() with GETGXINFO"); + fprintf(stderr, "[Engine] [WinCE FB] ExtEscape() with GETRAWFRAMEBUFFER failed\n"); + fprintf(stderr, "[Engine] [WinCE FB] trying ExtEscape() with GETGXINFO\n"); if (!_evas_software_wince_gxinfo_init(dc, &priv->width, &priv->height, &priv->buffer)) { ReleaseDC(window, dc); @@ -139,9 +139,9 @@ if ((priv->width != width) || (priv->height != height)) { - ERROR("[Engine] [WinCE FB] Size mismatch"); - ERROR("[Engine] [WinCE FB] asked: %dx%d", width, height); - ERROR("[Engine] [WinCE FB] got : %dx%d", priv->width, priv->height); + fprintf(stderr, "[Engine] [WinCE FB] Size mismatch\n"); + fprintf(stderr, "[Engine] [WinCE FB] asked: %dx%d\n", width, height); + fprintf(stderr, "[Engine] [WinCE FB] got : %dx%d\n", priv->width, priv->height); ReleaseDC(window, dc); free(priv); return NULL; Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c 2009-10-13 17:14:50 UTC (rev 43054) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gapi_buffer.c 2009-10-13 17:27:49 UTC (rev 43055) @@ -110,7 +110,7 @@ gapi_lib = LoadLibrary(L"gx.dll"); if (!gapi_lib) { - ERROR("[Engine] [WinCE GAPI] Can not load gx.dll"); + fprintf(stderr, "[Engine] [WinCE GAPI] Can not load gx.dll\n"); goto free_priv; } } @@ -131,13 +131,13 @@ !suspend || !resume) { - ERROR("[Engine] [WinCE GAPI] Can not find valid symbols"); + fprintf(stderr, "[Engine] [WinCE GAPI] Can not find valid symbols\n"); goto free_lib; } if (!display_open(window, GX_FULLSCREEN)) { - ERROR("[Engine] [WinCE GAPI] Can not open display"); + fprintf(stderr, "[Engine] [WinCE GAPI] Can not open display\n"); goto free_lib; } @@ -146,7 +146,7 @@ // verify pixel format if(!(prop.ffFormat & kfDirect565) || (prop.cBPP != 16)) { - ERROR("[Engine] [WinCE GAPI] display format mismatch"); + fprintf(stderr, "[Engine] [WinCE GAPI] display format mismatch\n"); goto close_display; } @@ -154,7 +154,7 @@ if ((GetSystemMetrics(SM_CXSCREEN) != (int)prop.cxWidth) || (GetSystemMetrics(SM_CYSCREEN) != (int)prop.cyHeight)) { - ERROR("[Engine] [WinCE GAPI] display size mismatch"); + fprintf(stderr, "[Engine] [WinCE GAPI] display size mismatch\n"); goto close_display; } @@ -221,7 +221,7 @@ dc = GetDC (window); if (!dc) { - ERROR("[Engine] [WinCE GAPI] Can not get device"); + fprintf(stderr, "[Engine] [WinCE GAPI] Can not get device\n"); goto close_display; } @@ -230,7 +230,7 @@ (char *) &gxInfo); if (result <= 0) { - ERROR("[Engine] [WinCE GAPI] ExtEscape failed"); + fprintf(stderr, "[Engine] [WinCE GAPI] ExtEscape failed\n"); ReleaseDC(window, dc); goto close_display; } @@ -249,9 +249,9 @@ if ((priv->width != width) || (priv->height != height)) { - WARN("[Engine] [WinCE GAPI] Size mismatch"); - WARN("[Engine] [WinCE GAPI] asked: %dx%d", width, height); - WARN("[Engine] [WinCE GAPI] got : %dx%d", priv->width, priv->height); + fprintf(stderr, "[Engine] [WinCE GAPI] Size mismatch\n"); + fprintf(stderr, "[Engine] [WinCE GAPI] asked: %dx%d\n", width, height); + fprintf(stderr, "[Engine] [WinCE GAPI] got : %dx%d\n", priv->width, priv->height); goto close_display; } |
From: Enlightenment S. <no-...@en...> - 2009-10-13 17:31:30
|
Log: use fprintf for messages Author: caro Date: 2009-10-13 10:31:18 -0700 (Tue, 13 Oct 2009) New Revision: 43056 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp 2009-10-13 17:27:49 UTC (rev 43055) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_ddraw_buffer.cpp 2009-10-13 17:31:18 UTC (rev 43056) @@ -42,28 +42,28 @@ priv->module = LoadLibrary(L"ddraw.dll"); if (!priv->module) { - CRITICAL("[Engine] [WinCE DDraw] Can not load ddraw.dll"); + fprintf(stderr, "[Engine] [WinCE DDraw] Can not load ddraw.dll\n"); goto free_priv; } lib_DirectDrawCreate = (fct_DirectDrawCreate)GetProcAddress(priv->module, L"DirectDrawCreate"); if (!lib_DirectDrawCreate) { - CRITICAL("[Engine] [WinCE DDraw] Can not initialize DirectDraw"); + fprintf(stderr, "[Engine] [WinCE DDraw] Can not initialize DirectDraw\n"); goto free_lib; } res = lib_DirectDrawCreate(NULL, (IUnknown**)&priv->object, NULL); if (FAILED(res)) { - CRITICAL("[Engine] [WinCE DDraw] Can not create DirectDraw object"); + fprintf(stderr, "[Engine] [WinCE DDraw] Can not create DirectDraw object\n"); goto free_lib; } res = priv->object->SetCooperativeLevel(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); if (FAILED(res)) { - CRITICAL("[Engine] [WinCE DDraw] Can not set window to fullscreen"); + fprintf(stderr, "[Engine] [WinCE DDraw] Can not set window to fullscreen\n"); goto release_object; } @@ -75,7 +75,7 @@ res = priv->object->CreateSurface(&surface_desc, &priv->surface, NULL); if (FAILED(res)) { - CRITICAL("[Engine] [WinCE DDraw] Can not create surface"); + fprintf(stderr, "[Engine] [WinCE DDraw] Can not create surface\n"); goto release_object; } @@ -84,7 +84,7 @@ res = priv->surface->Lock(NULL, &surface_desc, DDLOCK_READONLY, NULL); if (FAILED(res)) { - CRITICAL("[Evas] [Engine] [WinCE DDraw] Can not lock surface"); + fprintf(stderr, "[Evas] [Engine] [WinCE DDraw] Can not lock surface\n"); goto release_surface; } @@ -95,16 +95,16 @@ if ((priv->width != width) || (priv->height != height)) { - CRITICAL("[Engine] [WinCE DDraw] Size mismatch"); - CRITICAL("[Engine] [WinCE DDraw] asked : %dx%d", width, height); - CRITICAL("[Engine] [WinCE DDraw] got : %dx%d", priv->width, priv->height); + fprintf(stderr, "[Engine] [WinCE DDraw] Size mismatch\n"); + fprintf(stderr, "[Engine] [WinCE DDraw] asked : %dx%d\n", width, height); + fprintf(stderr, "[Engine] [WinCE DDraw] got : %dx%d\n", priv->width, priv->height); goto release_surface; } res = priv->surface->Unlock(NULL); if (FAILED(res)) { - CRITICAL("[Engine] [WinCE DDraw] Can not unlock surface"); + fprintf(stderr, "[Engine] [WinCE DDraw] Can not unlock surface\n"); goto release_surface; } Modified: trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2009-10-13 17:27:49 UTC (rev 43055) +++ trunk/evas/src/modules/engines/software_16_wince/evas_wince_gdi_buffer.c 2009-10-13 17:31:18 UTC (rev 43056) @@ -37,7 +37,7 @@ priv->dc = GetDC(window); if (!priv->dc) { - WARN("[Engine] [WinCE GDI] Can not get DC"); + fprintf(stderr, "[Engine] [WinCE GDI] Can not get DC\n"); free(priv); return NULL; } @@ -56,7 +56,7 @@ priv->bitmap_info = (BITMAPINFO_16bpp *)malloc(sizeof(BITMAPINFO_16bpp)); if (!priv->bitmap_info) { - WARN("[Engine] [WinCE GDI] Can not allocate bitmap info"); + fprintf(stderr, "[Engine] [WinCE GDI] Can not allocate bitmap info\n"); ReleaseDC(window, priv->dc); free(priv); return NULL; @@ -144,7 +144,7 @@ if ((fbob->im->cache_entry.w == priv->width) && (fbob->im->cache_entry.h == priv->height)) { - HDC dc; + HDC dc; dc = CreateCompatibleDC(priv->dc); SelectObject(dc, priv->bitmap); |
From: Enlightenment S. <no-...@en...> - 2009-12-19 10:36:54
|
Log: fix returned values Author: caro Date: 2009-12-19 02:36:43 -0800 (Sat, 19 Dec 2009) New Revision: 44565 Modified: trunk/evas/src/modules/engines/software_16_wince/evas_engine.c Modified: trunk/evas/src/modules/engines/software_16_wince/evas_engine.c =================================================================== --- trunk/evas/src/modules/engines/software_16_wince/evas_engine.c 2009-12-19 10:33:39 UTC (rev 44564) +++ trunk/evas/src/modules/engines/software_16_wince/evas_engine.c 2009-12-19 10:36:43 UTC (rev 44565) @@ -719,8 +719,8 @@ if(_evas_engine_soft16_wince_log_dom < 0) { - EINA_LOG_ERR("Impossible to create a log domain for the Soft16 Wince engine.\n"); - return NULL; + EINA_LOG_ERR("Impossible to create a log domain for the Soft16 Wince engine."); + return 0; } /* store it for later use */ @@ -750,7 +750,6 @@ module_close(Evas_Module *em) { eina_log_domain_unregister(_evas_engine_soft16_wince_log_dom); - return NULL; } static Evas_Module_Api evas_modapi = |