svn update: 55594 (latest:55594)

diff --git a/AUTHORS b/AUTHORS
index 2c8f468..c86d644 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,7 +11,7 @@ Howell Tam <pigeon@pigeond.net>
 Nathan Ingersoll <rbdpngn@users.sourceforge.net>
 Andrew Elcock <andy@elcock.org>
 Kim Woelders <kim@woelders.dk>
-Sebastian Dransfeld <sebastid@tango.flipp.net>
+Sebastian Dransfeld <sd@tango.flipp.net>
 Simon Poole <simon.armlinux@themalago.net>
 Jorge Luis Zapata Muga <jorgeluis.zapata@gmail.com>
 dan sinclair <zero@everburning.com>

diff --git a/src/lib/ecore/ecore_exe_win32.c b/src/lib/ecore/ecore_exe_win32.c
index 30d7d3c..7f4435a 100644 (file)
--- a/src/lib/ecore/ecore_exe_win32.c
+++ b/src/lib/ecore/ecore_exe_win32.c
@@ -621,7 +621,7 @@ ecore_exe_hup(Ecore_Exe *exe)
 static int
 _ecore_exe_win32_pipe_thread_generic_cb(void *data, Ecore_Exe_Flags flags)
 {
-#define BUFSIZE 2
+#define BUFSIZE 2048
    char        buf[BUFSIZE];
    Ecore_Exe  *exe;
    char       *current_buf = NULL;
@@ -653,7 +653,7 @@ _ecore_exe_win32_pipe_thread_generic_cb(void *data, Ecore_Exe_Flags flags)
 
    while (1)
      {
-        if (!PeekNamedPipe(child_pipe, buf, 1, &size, &current_size, NULL))
+       if (!PeekNamedPipe(child_pipe, buf, sizeof(buf), &size, &current_size, NULL))
           continue;
         if (size == 0)
           continue;

diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index d6de0c7..08bedb2 100644 (file)
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -1039,6 +1039,9 @@ _ecore_main_select(double timeout)
    fd_set         rfds, wfds, exfds;
    int            max_fd;
    int            ret;
+#ifndef HAVE_EPOLL
+   Ecore_Fd_Handler *fdh;
+#endif
 
    t = NULL;
    if ((!finite(timeout)) || (timeout == 0.0)) /* finite() tests for NaN, too big, too small, and infinity.  */
@@ -1072,8 +1075,6 @@ _ecore_main_select(double timeout)
    if (fd_handlers_with_prep)
      _ecore_main_prepare_handlers();
 #ifndef HAVE_EPOLL
-   Ecore_Fd_Handler *fdh;
-
    EINA_INLIST_FOREACH(fd_handlers, fdh)
      {
         if (!fdh->delete_me)

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 87453f3..976fef6 100644 (file)
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -373,12 +373,12 @@ error:
      free(svr->path);
 
 #ifndef _WIN32
-   if (svr->fd >= 0)
-     close(svr->fd);
-
    if (svr->fd_handler)
      ecore_main_fd_handler_del(svr->fd_handler);
 
+   if (svr->fd >= 0)
+     close(svr->fd);
+
    if (svr->write_buf)
      free(svr->write_buf);
 
@@ -425,7 +425,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
    Ecore_Con_Server *svr;
    Ecore_Con_Type type;
 
-   if (!name)
+   if ((!name) || (!name[0]))
      return NULL;
    /* local  user   socket: FILE:   ~/.ecore/[name]/[port] */
    /* local  system socket: FILE:   /tmp/.ecore_service|[name]|[port] */
@@ -494,12 +494,12 @@ error:
    if (svr->path)
      free(svr->path);
 
-   if (svr->fd >= 0)
-     close(svr->fd);
-
    if (svr->fd_handler)
      ecore_main_fd_handler_del(svr->fd_handler);
 
+   if (svr->fd >= 0)
+     close(svr->fd);
+
    ecore_con_ssl_server_shutdown(svr);
    free(svr);
    return NULL;
@@ -1184,9 +1184,6 @@ _ecore_con_server_free(Ecore_Con_Server *svr)
      unlink(svr->path);
 
    ecore_con_ssl_server_shutdown(svr);
-   if (svr->fd >= 0)
-     close(svr->fd);
-
    if (svr->name)
      free(svr->name);
 
@@ -1199,6 +1196,9 @@ _ecore_con_server_free(Ecore_Con_Server *svr)
    if (svr->fd_handler)
      ecore_main_fd_handler_del(svr->fd_handler);
 
+   if (svr->fd >= 0)
+     close(svr->fd);
+
    servers = eina_list_remove(servers, svr);
    svr->data = NULL;
    free(svr);
@@ -1209,7 +1209,10 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
 {
    double t_start, t;
 
-   if ((!cl->buf) && cl->delete_me && (!cl->dead) && (cl->event_count < 1))
+   if (cl->event_count > 0)
+     return;
+
+   if (cl->delete_me && (!cl->dead) && (cl->event_count < 1))
      {
         /* this is a catch-all for cases when a client is not properly killed. */
 
@@ -1228,8 +1231,7 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
            return;
      }
 
-   if (cl->event_count > 0)
-     return;
+
    ECORE_MAGIC_SET(cl, ECORE_MAGIC_NONE);
    t_start = ecore_time_get();
    while ((cl->buf) && (!cl->dead))
@@ -1251,12 +1253,12 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
    if (cl->host_server->type & ECORE_CON_SSL)
      ecore_con_ssl_client_shutdown(cl);
 
-   if (cl->fd >= 0)
-     close(cl->fd);
-
    if (cl->fd_handler)
      ecore_main_fd_handler_del(cl->fd_handler);
 
+   if (cl->fd >= 0)
+     close(cl->fd);
+
    if (cl->client_addr)
      free(cl->client_addr);
    cl->client_addr = NULL;
@@ -1608,7 +1610,6 @@ svr_try_connect_plain(Ecore_Con_Server *svr)
    int so_err = 0;
    unsigned int size = sizeof(int);
 
-   errno = 0;
    res = getsockopt(svr->fd, SOL_SOCKET, SO_ERROR, (void *)&so_err, &size);
 #ifdef _WIN32
    if (res == SOCKET_ERROR)
@@ -1769,9 +1770,12 @@ _ecore_con_svr_tcp_handler(void                        *data,
    return ECORE_CALLBACK_RENEW;
 
 error:
-   close(new_fd);
    if (cl && cl->fd_handler)
-     ecore_main_fd_handler_del(cl->fd_handler);
+     {
+        ecore_main_fd_handler_del(cl->fd_handler);
+        close(cl->fd);
+        free(cl);
+     }
    return ECORE_CALLBACK_RENEW;
 }
 
@@ -1796,22 +1800,18 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
 
    if (!(svr->type & ECORE_CON_SSL))
      {
-        errno = 0;
         num = read(svr->fd, buf, sizeof(buf));
-        if ((num > 0) || (errno == EAGAIN))
+        if ((num >= 0) || (errno == EAGAIN))
           lost_server = EINA_FALSE;
      }
    else
      {
        num = ecore_con_ssl_server_read(svr, buf, sizeof(buf));
-         if (num > 0)
+         if (num >= 0)
            lost_server = EINA_FALSE;
      }
 
-   if (lost_server)
-     _ecore_con_server_kill(svr);
-
-   if ((num > 0) && (!svr->delete_me))
+   if ((!svr->delete_me) && (num > 0))
    {
       Ecore_Con_Event_Server_Data *e;
 
@@ -1833,7 +1833,8 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
                       _ecore_con_event_server_data_free, NULL);
    }
 
-
+   if (lost_server)
+     _ecore_con_server_kill(svr);
 }
 
 static Eina_Bool
@@ -1932,31 +1933,28 @@ _ecore_con_cl_udp_handler(void             *data,
         return ECORE_CALLBACK_RENEW;
      }
 
-   errno = 0;
    num = read(svr->fd, buf, READBUFSIZ);
 
-   if ((errno == EIO) || (errno == EBADF) || (errno == EPIPE) || (errno == EINVAL) ||
-       (errno == ENOSPC) || (errno == ECONNREFUSED))
-     _ecore_con_server_kill(svr);
-
-   if ((num < 1) || (svr->delete_me))
-     return ECORE_CALLBACK_RENEW;
+   if ((!svr->delete_me) && (num >= 0))
+     {
+        inbuf = malloc(num);
+        EINA_SAFETY_ON_NULL_RETURN_VAL(inbuf, ECORE_CALLBACK_RENEW);
 
-   inbuf = malloc(num);
-   if (!inbuf)
-     return ECORE_CALLBACK_RENEW;
+        memcpy(inbuf, buf, num);
 
-   memcpy(inbuf, buf, num);
+        e = malloc(sizeof(Ecore_Con_Event_Server_Data));
+        EINA_SAFETY_ON_NULL_RETURN_VAL(e, ECORE_CALLBACK_RENEW);
 
-   e = calloc(1, sizeof(Ecore_Con_Event_Server_Data));
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e, ECORE_CALLBACK_RENEW);
+        svr->event_count++;
+        e->server = svr;
+        e->data = inbuf;
+        e->size = num;
+        ecore_event_add(ECORE_CON_EVENT_SERVER_DATA, e,
+                        _ecore_con_event_server_data_free, NULL);
+     }
 
-   svr->event_count++;
-   e->server = svr;
-   e->data = inbuf;
-   e->size = num;
-   ecore_event_add(ECORE_CON_EVENT_SERVER_DATA, e,
-                   _ecore_con_event_server_data_free, NULL);
+   if (num < 0 && (errno != EAGAIN) && (errno != EINTR))
+     _ecore_con_server_kill(svr);
 
    return ECORE_CALLBACK_RENEW;
 }
@@ -1986,7 +1984,6 @@ _ecore_con_svr_udp_handler(void             *data,
    if (!ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
      return ECORE_CALLBACK_RENEW;
 
-   errno = 0;
 #ifdef _WIN32
    num = fcntl(svr->fd, F_SETFL, O_NONBLOCK);
    if (num >= 0)
@@ -2000,12 +1997,11 @@ _ecore_con_svr_udp_handler(void             *data,
               &client_addr_len);
 #endif
 
-   if ((errno == EIO) || (errno == EBADF) || (errno == EPIPE) ||
-       (errno == EINVAL) || (errno == ENOSPC) || (errno == ECONNREFUSED))
+   if (num < 0 && (errno != EAGAIN) && (errno != EINTR))
      {
         if (!svr->delete_me)
           {
-/* we lost our client! */
+              /* we lost our client! */
               Ecore_Con_Event_Client_Del *e;
 
               e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
@@ -2045,7 +2041,7 @@ _ecore_con_svr_udp_handler(void             *data,
    { /* indent to keep it all nicely separated */
       Ecore_Con_Event_Client_Add *add;
 
-      add = calloc(1, sizeof(Ecore_Con_Event_Client_Add));
+      add = malloc(sizeof(Ecore_Con_Event_Client_Add));
       EINA_SAFETY_ON_NULL_RETURN_VAL(add, ECORE_CALLBACK_RENEW);
 
       /*cl->event_count++;*/
@@ -2058,7 +2054,7 @@ _ecore_con_svr_udp_handler(void             *data,
 
    {
       Ecore_Con_Event_Client_Data *e;
-      e = calloc(1, sizeof(Ecore_Con_Event_Client_Data));
+      e = malloc(sizeof(Ecore_Con_Event_Client_Data));
       EINA_SAFETY_ON_NULL_RETURN_VAL(e, ECORE_CALLBACK_RENEW);
 
       svr->event_count++;
@@ -2102,18 +2098,40 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *cl)
 
    if (!(cl->host_server->type & ECORE_CON_SSL))
      {
-        errno = 0;
         num = read(cl->fd, buf, sizeof(buf));
-        if ((num > 0) || (errno == EAGAIN))
+        if ((num >= 0) || (errno == EAGAIN) || (errno == EINTR))
           lost_client = EINA_FALSE;
      }
    else
      {
         num = ecore_con_ssl_client_read(cl, buf, sizeof(buf));
-        if (num > 0)
+        if (num >= 0)
           lost_client = EINA_FALSE;
      }
 
+   if ((!cl->delete_me) && (num > 0))
+     {
+        Ecore_Con_Event_Client_Data *e;
+
+        e = malloc(sizeof(Ecore_Con_Event_Client_Data));
+        EINA_SAFETY_ON_NULL_RETURN(e);
+
+        cl->event_count++;
+        _ecore_con_cl_timer_update(cl);
+        e->client = cl;
+        e->data = malloc(num);
+        if (!e->data)
+          {
+             ERR("alloc!");
+             free(e);
+             return;
+          }
+        memcpy(e->data, buf, num);
+        e->size = num;
+        ecore_event_add(ECORE_CON_EVENT_CLIENT_DATA, e,
+                        _ecore_con_event_client_data_free, NULL);
+     }
+
    if (lost_client)
      {
         if (!cl->delete_me)
@@ -2138,31 +2156,6 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *cl)
         cl->fd_handler = NULL;
         return;
      }
-
-   if ((num > 0) && (!cl->delete_me))
-     {
-        Ecore_Con_Event_Client_Data *e;
-
-        e = malloc(sizeof(Ecore_Con_Event_Client_Data));
-        EINA_SAFETY_ON_NULL_RETURN(e);
-
-        cl->event_count++;
-        _ecore_con_cl_timer_update(cl);
-        e->client = cl;
-        e->data = malloc(num);
-        if (!e->data)
-          {
-             ERR("alloc!");
-             free(e);
-             return;
-          }
-        memcpy(e->data, buf, num);
-        e->size = num;
-        ecore_event_add(ECORE_CON_EVENT_CLIENT_DATA, e,
-                        _ecore_con_event_client_data_free, NULL);
-     }
-
-
 }
 
 static Eina_Bool
@@ -2229,14 +2222,16 @@ _ecore_con_server_flush(Ecore_Con_Server *svr)
    if (!svr->write_buf)
      return;
 
+   num = svr->write_buf_size - svr->write_buf_offset;
+
    /* check whether we need to write anything at all.
     * we must not write zero bytes with SSL_write() since it
     * causes undefined behaviour
     */
-   if (svr->write_buf_size == svr->write_buf_offset)
-     return;
-
-   num = svr->write_buf_size - svr->write_buf_offset;
+   /* we thank Tommy[D] for needing to check negative buffer sizes
+    * here because his system is amazing.
+    */
+   if (num <= 0) return;
 
    if (svr->handshaking)
      {
@@ -2253,8 +2248,8 @@ _ecore_con_server_flush(Ecore_Con_Server *svr)
 
    if (count < 0)
      {
-        /* we lost our server! */
-         _ecore_con_server_kill(svr);
+         if ((errno != EAGAIN) && (errno != EINTR))
+           _ecore_con_server_kill(svr);
          return;
      }
 
@@ -2291,6 +2286,7 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
    if (!count)
      {
         num = cl->buf_size - cl->buf_offset;
+        if (num <= 0) return;
         if (!(cl->host_server->type & ECORE_CON_SSL))
           count = write(cl->fd, cl->buf + cl->buf_offset, num);
         else
@@ -2299,29 +2295,27 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
 
    if (count < 0)
      {
-        if ((errno == EIO) || (errno == EBADF) || (errno == EPIPE) ||
-            (errno == EINVAL) || (errno == ENOSPC) || (errno == ECONNREFUSED))
-          if (!cl->delete_me)
-            {
-               /* we lost our client! */
-                Ecore_Con_Event_Client_Del *e;
+        if ((errno != EAGAIN) && (errno != EINTR) && (!cl->delete_me))
+          {
+             /* we lost our client! */
+              Ecore_Con_Event_Client_Del *e;
 
-                e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
-                EINA_SAFETY_ON_NULL_RETURN(e);
+              e = calloc(1, sizeof(Ecore_Con_Event_Client_Del));
+              EINA_SAFETY_ON_NULL_RETURN(e);
 
-                cl->event_count++;
-                _ecore_con_cl_timer_update(cl);
-                e->client = cl;
-                ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e,
-                                _ecore_con_event_client_del_free, NULL);
+              cl->event_count++;
+              _ecore_con_cl_timer_update(cl);
+              e->client = cl;
+              ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e,
+                              _ecore_con_event_client_del_free, NULL);
 
-                cl->dead = EINA_TRUE;
-                INF("Lost client %s", (cl->ip) ? cl->ip : "");
-                if (cl->fd_handler)
-                  ecore_main_fd_handler_del(cl->fd_handler);
+              cl->dead = EINA_TRUE;
+              INF("Lost client %s", (cl->ip) ? cl->ip : "");
+              if (cl->fd_handler)
+                ecore_main_fd_handler_del(cl->fd_handler);
 
-                cl->fd_handler = NULL;
-            }
+              cl->fd_handler = NULL;
+          }
 
         return;
      }
@@ -2336,7 +2330,7 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
         if (cl->fd_handler)
           ecore_main_fd_handler_active_set(cl->fd_handler, ECORE_FD_READ);
      }
-   else if (count < num)
+   else if ((count < num) && cl->fd_handler)
      ecore_main_fd_handler_active_set(cl->fd_handler, ECORE_FD_WRITE);
 }
 
@@ -2362,6 +2356,8 @@ _ecore_con_event_client_del_free(void *data __UNUSED__,
    Ecore_Con_Event_Client_Del *e;
 
    e = ev;
+   if (!e->client) return ;
+
    e->client->event_count--;
    if ((e->client->event_count <= 0) && (e->client->delete_me))
      ecore_con_client_del(e->client);

diff --git a/src/lib/ecore_con/ecore_con_ares.c b/src/lib/ecore_con/ecore_con_ares.c
index 64d0aac..ea1a765 100644 (file)
--- a/src/lib/ecore_con/ecore_con_ares.c
+++ b/src/lib/ecore_con/ecore_con_ares.c
@@ -552,6 +552,7 @@ _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg,
       case ARES_ENOMEM: /* not enough memory */
       case ARES_EDESTRUCTION: /* request canceled, shuting down */
       case ARES_ENODATA: /* no data returned */
+      case ARES_ECONNREFUSED: /* connection refused */
         goto on_error;
 
       default:

diff --git a/src/lib/ecore_con/ecore_con_info.c b/src/lib/ecore_con/ecore_con_info.c
index 3585cd4..1d45712 100644 (file)
--- a/src/lib/ecore_con/ecore_con_info.c
+++ b/src/lib/ecore_con/ecore_con_info.c
@@ -366,8 +366,8 @@ _ecore_con_info_slave_free(CB_Data *cbdata)
    info_slaves = (CB_Data *)eina_inlist_remove(EINA_INLIST_GET(info_slaves),
                                                EINA_INLIST_GET(cbdata));
    ecore_main_fd_handler_del(cbdata->fdh);
-   close(ecore_main_fd_handler_fd_get(cbdata->fdh));
    ecore_event_handler_del(cbdata->handler);
+   close(ecore_main_fd_handler_fd_get(cbdata->fdh));
    free(cbdata);
 }
 

diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c
index cf90ec4..c411312 100644 (file)
--- a/src/lib/ecore_con/ecore_con_ssl.c
+++ b/src/lib/ecore_con/ecore_con_ssl.c
@@ -741,7 +741,7 @@ _ecore_con_ssl_server_read_gnutls(Ecore_Con_Server *svr,
         if (!_ecore_con_ssl_server_init_gnutls(svr))
           return 0;
      }
-   else if (!gnutls_error_is_fatal(num))
+   else if ((!gnutls_error_is_fatal(num)) && (num != GNUTLS_E_SUCCESS))
      return 0;
 
    return -1;
@@ -963,7 +963,7 @@ _ecore_con_ssl_client_read_gnutls(Ecore_Con_Client *cl,
         WRN("Rehandshake request ignored");
         return 0;
      }
-   else if (!gnutls_error_is_fatal(num))
+   else if ((!gnutls_error_is_fatal(num)) && (num != GNUTLS_E_SUCCESS))
      return 0;
 
    return -1;

diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index ee19c0a..0e01ee5 100644 (file)
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -37,7 +37,7 @@
  *   ecore_con_url_url_set(url_con, "ftp://ftp.example.com");
  *   ecore_con_url_ftp_upload(url_con, "/tmp/file", "user", "pass","dir");
  *
- * FIXME: Support more CURL features: Authentication, Progress callbacks and more...
+ * FIXME: Support more CURL features: Progress callbacks and more...
  */
 
 #ifdef HAVE_CONFIG_H
@@ -738,6 +738,7 @@ ecore_con_url_response_headers_get(Ecore_Con_Url *url_con)
 
 /**
  * Sets url_con to use http auth, with given username and password, "safely" or not.
+ * ATTENTION: requires libcurl >= 7.19.1 to work, otherwise will always return 0.
  *
  * @param url_con Connection object to perform a request on, previously created
  *    with ecore_con_url_new() or ecore_con_url_custom_new().
@@ -859,6 +860,8 @@ ecore_con_url_send(Ecore_Con_Url *url_con,
         curl_easy_setopt(url_con->curl_easy, CURLOPT_POSTFIELDS, data);
         curl_easy_setopt(url_con->curl_easy, CURLOPT_POSTFIELDSIZE, length);
      }
+   else
+      curl_easy_setopt(url_con->curl_easy, CURLOPT_POSTFIELDSIZE, 0);
 
    switch (url_con->time_condition)
      {

diff --git a/src/lib/ecore_fb/ecore_fb_vt.c b/src/lib/ecore_fb/ecore_fb_vt.c
index 65f2013..ab94f83 100644 (file)
--- a/src/lib/ecore_fb/ecore_fb_vt.c
+++ b/src/lib/ecore_fb/ecore_fb_vt.c
@@ -7,8 +7,8 @@
 
 static int _ecore_fb_vt_do_switch = 0;
 
-static int _ecore_fb_vt_tty0_fd = 0;
-static int _ecore_fb_vt_tty_fd = 0;
+static int _ecore_fb_vt_tty0_fd = -1;
+static int _ecore_fb_vt_tty_fd = -1;
 static int _ecore_fb_vt_current_vt = 0;
 static int _ecore_fb_vt_prev_vt = 0;
 
@@ -95,7 +95,7 @@ _ecore_fb_vt_setup(void)
              return 0;
           }
         close(_ecore_fb_vt_tty0_fd);
-        _ecore_fb_vt_tty0_fd = 0;
+        _ecore_fb_vt_tty0_fd = -1;
         /* FIXME detach the process from current tty ? */
      }
    else
@@ -109,6 +109,7 @@ _ecore_fb_vt_setup(void)
      {
         perror("[ecore_fb:vt_setup] can't set the mode to KD_GRAPHICS");
         close(_ecore_fb_vt_tty_fd);
+        _ecore_fb_vt_tty_fd = -1;
         return 0;
      }
    ioctl(_ecore_fb_vt_tty_fd, KDGKBMODE, &_ecore_fb_tty_prev_mode);
@@ -122,6 +123,7 @@ _ecore_fb_vt_setup(void)
      {
         perror("[ecore_fb:vt_setup] can't set the tty mode");
         close(_ecore_fb_vt_tty_fd);
+        _ecore_fb_vt_tty_fd = -1;
         return 0;
      }
    /* register signal handlers when alloc/detach of vt */
@@ -136,12 +138,14 @@ _ecore_fb_vt_setup(void)
      {
         perror("[ecore_fb:vt_setup] error on VT_ACTIVATE");
         close(_ecore_fb_vt_tty_fd);
+        _ecore_fb_vt_tty_fd = -1;
         return 0;
      }
    if(ioctl(_ecore_fb_vt_tty_fd, VT_WAITACTIVE, _ecore_fb_vt_current_vt) < 0)
      {
         perror("[ecore_fb:vt_setup] error on VT_WAITACTIVE");
         close(_ecore_fb_vt_tty_fd);
+        _ecore_fb_vt_tty_fd = -1;
         return 0;
      }
    /* FIXME assign the fb to the tty in case isn't setup */
@@ -200,7 +204,7 @@ void
 ecore_fb_vt_shutdown(void)
 {
    /* restore the previous mode */
-   if (_ecore_fb_vt_tty_fd != 0)
+   if (_ecore_fb_vt_tty_fd != -1)
      {
         tcsetattr(_ecore_fb_vt_tty_fd, TCSAFLUSH, &_ecore_fb_tty_prev_tio_mode);
         ioctl(_ecore_fb_vt_tty_fd, KDSETMODE, _ecore_fb_tty_prev_kd_mode);
@@ -208,7 +212,7 @@ ecore_fb_vt_shutdown(void)
         ioctl(_ecore_fb_vt_tty_fd, VT_SETMODE, &_ecore_fb_vt_prev_mode);
         /* go back to previous vt */
         close(_ecore_fb_vt_tty_fd);
-        _ecore_fb_vt_tty_fd = 0;
+        _ecore_fb_vt_tty_fd = -1;
      }
    
    if (_ecore_fb_user_handler) ecore_event_handler_del(_ecore_fb_user_handler);

diff --git a/src/lib/ecore_win32/Ecore_Win32.h b/src/lib/ecore_win32/Ecore_Win32.h
index 63e2d87..9141335 100644 (file)
--- a/src/lib/ecore_win32/Ecore_Win32.h
+++ b/src/lib/ecore_win32/Ecore_Win32.h
@@ -7,8 +7,13 @@
  */
 
 #ifndef ECORE_WIN32_WIP_POZEFLKSD
-# warning "You are using a work in progress API. This API is not stable"
-# warning "and is subject to change. You use this at your own risk."
+# ifdef _MSC_VER
+#  pragma message ("You are using a work in progress API. This API is not stable")
+#  pragma message ("and is subject to change. You use this at your own risk.")
+# else
+#  warning "You are using a work in progress API. This API is not stable"
+#  warning "and is subject to change. You use this at your own risk."
+# endif
 #endif
 
 #include <Eina.h>

diff --git a/src/lib/ecore_win32/ecore_win32.c b/src/lib/ecore_win32/ecore_win32.c
index 7734f48..a44a52b 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32.c
+++ b/src/lib/ecore_win32/ecore_win32.c
@@ -3,7 +3,6 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>   /* for printf */
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -66,37 +65,48 @@ _ecore_win32_window_procedure(HWND   window,
      {
        /* Keyboard input notifications */
      case WM_KEYDOWN:
+       INF("keydown message");
        _ecore_win32_event_handle_key_press(data, 1);
        return 0;
      case WM_CHAR:
+       INF("char message");
        _ecore_win32_event_handle_key_press(data, 0);
        return 0;
      case WM_KEYUP:
+       INF("keyup message");
        _ecore_win32_event_handle_key_release(data, 1);
        return 0;
      case WM_SETFOCUS:
+       INF("setfocus message");
        _ecore_win32_event_handle_focus_in(data);
        return 0;
      case WM_KILLFOCUS:
+       INF("kill focus message");
        _ecore_win32_event_handle_focus_out(data);
        return 0;
        /* Mouse input notifications */
      case WM_LBUTTONDOWN:
+       INF("left button down message");
        _ecore_win32_event_handle_button_press(data, 1);
        return 0;
      case WM_MBUTTONDOWN:
+       INF("middle button down message");
        _ecore_win32_event_handle_button_press(data, 2);
        return 0;
      case WM_RBUTTONDOWN:
+       INF("right button down message");
        _ecore_win32_event_handle_button_press(data, 3);
        return 0;
      case WM_LBUTTONUP:
+       INF("left button up message");
        _ecore_win32_event_handle_button_release(data, 1);
        return 0;
      case WM_MBUTTONUP:
+       INF("middle button up message");
        _ecore_win32_event_handle_button_release(data, 2);
        return 0;
      case WM_RBUTTONUP:
+       INF("right button up message");
        _ecore_win32_event_handle_button_release(data, 3);
        return 0;
      case WM_MOUSEMOVE:
@@ -104,7 +114,9 @@ _ecore_win32_window_procedure(HWND   window,
           RECT                        rect;
           struct _Ecore_Win32_Window *w = NULL;
 
-          w = (struct _Ecore_Win32_Window *)GetWindowLong(window, GWL_USERDATA);
+          INF("moue move message");
+
+          w = (struct _Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
 
           if (GetClientRect(window, &rect))
             {
@@ -140,16 +152,20 @@ _ecore_win32_window_procedure(HWND   window,
           return 0;
        }
      case WM_MOUSEWHEEL:
+       INF("mouse wheel message");
        _ecore_win32_event_handle_button_press(data, 4);
        return 0;
        /* Window notifications */
      case WM_CREATE:
+       INF("create window message");
        _ecore_win32_event_handle_create_notify(data);
        return 0;
      case WM_DESTROY:
+       INF("destroy window message");
        _ecore_win32_event_handle_destroy_notify(data);
        return 0;
      case WM_SHOWWINDOW:
+       INF("show window message");
        if ((data->data_param == SW_OTHERUNZOOM) ||
            (data->data_param == SW_OTHERZOOM))
          return 0;
@@ -161,21 +177,26 @@ _ecore_win32_window_procedure(HWND   window,
 
        return 0;
      case WM_CLOSE:
+       INF("close window message");
        _ecore_win32_event_handle_delete_request(data);
        return 0;
+     case WM_GETMINMAXINFO:
+       INF("get min max info window message");
+       return TRUE;
      case WM_MOVING:
-       printf (" * ecore message : moving\n");
+       INF("moving window message");
+       _ecore_win32_event_handle_configure_notify(data);
        return TRUE;
      case WM_MOVE:
-       printf (" * ecore message : moved\n");
+       INF("move window message");
        return 0;
      case WM_SIZING:
-       printf (" * ecore message : sizing\n");
+       INF("sizing window message");
        _ecore_win32_event_handle_resize(data);
        _ecore_win32_event_handle_configure_notify(data);
        return TRUE;
      case WM_SIZE:
-       printf (" * ecore message : sized\n");
+       INF("size window message");
        return 0;
 /*      case WM_WINDOWPOSCHANGING: */
 /*        { */
@@ -187,19 +208,171 @@ _ecore_win32_window_procedure(HWND   window,
 /*        _ecore_win32_event_handle_configure_notify(data); */
 /*        return 0; */
      case WM_WINDOWPOSCHANGED:
+       INF("position changed window message");
        _ecore_win32_event_handle_configure_notify(data);
        return 0;
-     case WM_ENTERSIZEMOVE :
-       printf (" * ecore message : WM_ENTERSIZEMOVE \n");
+     case WM_ENTERSIZEMOVE:
+       INF("enter size move window message");
        return 0;
      case WM_EXITSIZEMOVE:
-       printf (" * ecore message : WM_EXITSIZEMOVE\n");
+       INF("exit size move window message");
        return 0;
+     case WM_NCLBUTTONDOWN:
+       INF("non client left button down window message");
+       if (((DWORD)window_param == HTCAPTION) ||
+           ((DWORD)window_param == HTBOTTOM) ||
+           ((DWORD)window_param == HTBOTTOMLEFT) ||
+           ((DWORD)window_param == HTBOTTOMRIGHT) ||
+           ((DWORD)window_param == HTLEFT) ||
+           ((DWORD)window_param == HTRIGHT) ||
+           ((DWORD)window_param == HTTOP) ||
+           ((DWORD)window_param == HTTOPLEFT) ||
+           ((DWORD)window_param == HTTOPRIGHT))
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           ecore_win32_window_geometry_get(w,
+                                           &w->drag.x, &w->drag.y,
+                                           &w->drag.w, &w->drag.h);
+           w->drag.px = GET_X_LPARAM(data_param);
+           w->drag.py = GET_Y_LPARAM(data_param);
+           w->drag.dragging = 1;
+           return 0;
+         }
+       return DefWindowProc(window, message, window_param, data_param);
+     case WM_SYSCOMMAND:
+       INF("sys command window message", (int)window_param);
+       if ((((DWORD)window_param & 0xfff0) == SC_MOVE) ||
+           (((DWORD)window_param & 0xfff0) == SC_SIZE))
+         {
+           Ecore_Win32_Window *w;
+
+           INF("sys command MOVE or SIZE window message : %dx%d", GET_X_LPARAM(data_param), GET_Y_LPARAM(data_param));
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           w->drag.dragging = 1;
+           return 0;
+         }
+       return DefWindowProc(window, message, window_param, data_param);
+     case WM_NCMOUSEMOVE:
+       INF("non client mouse move window message");
+       if ((DWORD)window_param == HTCAPTION)
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           if (w->drag.dragging)
+             {
+               int dx;
+               int dy;
+
+               dx = GET_X_LPARAM(data_param) - w->drag.px;
+               dy = GET_Y_LPARAM(data_param) - w->drag.py;
+               ecore_win32_window_move(w, w->drag.x + dx, w->drag.y + dy);
+               w->drag.x += dx;
+               w->drag.y += dy;
+               w->drag.px = GET_X_LPARAM(data_param);
+               w->drag.py = GET_Y_LPARAM(data_param);
+               return 0;
+             }
+         }
+       if ((DWORD)window_param == HTLEFT)
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           if (w->drag.dragging)
+             {
+               int dw;
+               dw = GET_X_LPARAM(data_param) - w->drag.px;
+               ecore_win32_window_move_resize(w, w->drag.x + dw, w->drag.y, w->drag.w - dw, w->drag.h);
+               w->drag.x += dw;
+               w->drag.w -= dw;
+               w->drag.px = GET_X_LPARAM(data_param);
+               w->drag.py = GET_Y_LPARAM(data_param);
+               return 0;
+             }
+         }
+       if ((DWORD)window_param == HTRIGHT)
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           if (w->drag.dragging)
+             {
+               int dw;
+               dw = GET_X_LPARAM(data_param) - w->drag.px;
+               ecore_win32_window_resize(w, w->drag.w + dw, w->drag.h);
+               w->drag.w += dw;
+               w->drag.px = GET_X_LPARAM(data_param);
+               w->drag.py = GET_Y_LPARAM(data_param);
+               return 0;
+             }
+         }
+       if ((DWORD)window_param == HTTOP)
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           if (w->drag.dragging)
+             {
+               int dh;
+               dh = GET_Y_LPARAM(data_param) - w->drag.py;
+               ecore_win32_window_move_resize(w, w->drag.x, w->drag.y + dh, w->drag.w, w->drag.h - dh);
+               w->drag.y += dh;
+               w->drag.h -= dh;
+               w->drag.px = GET_X_LPARAM(data_param);
+               w->drag.py = GET_Y_LPARAM(data_param);
+               return 0;
+             }
+         }
+       if ((DWORD)window_param == HTBOTTOM)
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           if (w->drag.dragging)
+             {
+               int dh;
+               dh = GET_Y_LPARAM(data_param) - w->drag.py;
+               ecore_win32_window_resize(w, w->drag.w, w->drag.h + dh);
+               w->drag.h += dh;
+               w->drag.px = GET_X_LPARAM(data_param);
+               w->drag.py = GET_Y_LPARAM(data_param);
+               return 0;
+             }
+         }
+       return DefWindowProc(window, message, window_param, data_param);
+     case WM_NCLBUTTONUP:
+       INF("non client left button up window message");
+       if (((DWORD)window_param == HTCAPTION) ||
+           ((DWORD)window_param == HTBOTTOM) ||
+           ((DWORD)window_param == HTBOTTOMLEFT) ||
+           ((DWORD)window_param == HTBOTTOMRIGHT) ||
+           ((DWORD)window_param == HTLEFT) ||
+           ((DWORD)window_param == HTRIGHT) ||
+           ((DWORD)window_param == HTTOP) ||
+           ((DWORD)window_param == HTTOPLEFT) ||
+           ((DWORD)window_param == HTTOPRIGHT))
+         {
+           Ecore_Win32_Window *w;
+
+           w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+           if (w->drag.dragging)
+             {
+               w->drag.dragging = 0;
+               return 0;
+             }
+         }
+       return DefWindowProc(window, message, window_param, data_param);
        /* GDI notifications */
      case WM_PAINT:
        {
          RECT rect;
 
+         INF("paint message");
+
          if (GetUpdateRect(window, &rect, FALSE))
            {
               PAINTSTRUCT ps;
@@ -213,10 +386,10 @@ _ecore_win32_window_procedure(HWND   window,
          return 0;
        }
      case WM_SETREDRAW:
-       printf (" * ecore message : WM_SETREDRAW\n");
+       INF("set redraw message");
        return 0;
      case WM_SYNCPAINT:
-       printf (" * ecore message : WM_SYNCPAINT\n");
+       INF("sync paint message");
        return 0;
      default:
        return DefWindowProc(window, message, window_param, data_param);

diff --git a/src/lib/ecore_win32/ecore_win32_event.c b/src/lib/ecore_win32/ecore_win32_event.c
index b6e2472..3bca213 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_event.c
+++ b/src/lib/ecore_win32/ecore_win32_event.c
@@ -85,7 +85,7 @@ _ecore_win32_event_handle_key_press(Ecore_Win32_Callback_Data *msg,
      }
 
  store_key:
-   e->window = (Ecore_Window)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA);
    if (!e->window)
      {
         free(e);
@@ -136,7 +136,7 @@ _ecore_win32_event_handle_key_release(Ecore_Win32_Callback_Data *msg,
      }
 
  store_key:
-   e->window = (Ecore_Window)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA);
    if (!e->window)
      {
         free(e);
@@ -158,7 +158,7 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
 
    INF("mouse button pressed");
 
-   window = (Ecore_Win32_Window *)GetWindowLong(msg->window, GWL_USERDATA);
+   window = (Ecore_Win32_Window *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    if (button > 3)
      {
@@ -222,11 +222,11 @@ _ecore_win32_event_handle_button_press(Ecore_Win32_Callback_Data *msg,
           e->y = GET_Y_LPARAM(msg->data_param);
           e->timestamp = msg->time;
 
-          if (((e->timestamp - _ecore_win32_mouse_down_last_time) <= (long)(1000 * _ecore_win32_double_click_time)) &&
+          if (((e->timestamp - _ecore_win32_mouse_down_last_time) <= (unsigned long)(1000 * _ecore_win32_double_click_time)) &&
               (e->window == (Ecore_Window)_ecore_win32_mouse_down_last_window))
             e->double_click = 1;
 
-          if (((e->timestamp - _ecore_win32_mouse_down_last_last_time) <= (long)(2 * 1000 * _ecore_win32_double_click_time)) &&
+          if (((e->timestamp - _ecore_win32_mouse_down_last_last_time) <= (unsigned long)(2 * 1000 * _ecore_win32_double_click_time)) &&
               (e->window == (Ecore_Window)_ecore_win32_mouse_down_last_window) &&
               (e->window == (Ecore_Window)_ecore_win32_mouse_down_last_last_window))
             {
@@ -263,7 +263,7 @@ _ecore_win32_event_handle_button_release(Ecore_Win32_Callback_Data *msg,
 
    INF("mouse button released");
 
-   window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    {
       Ecore_Event_Mouse_Move *e;
@@ -299,12 +299,12 @@ _ecore_win32_event_handle_button_release(Ecore_Win32_Callback_Data *msg,
       _ecore_win32_mouse_up_count++;
 
       if ((_ecore_win32_mouse_up_count >= 2) &&
-          ((e->timestamp - _ecore_win32_mouse_down_last_time) <= (long)(1000 * _ecore_win32_double_click_time)) &&
+          ((e->timestamp - _ecore_win32_mouse_down_last_time) <= (unsigned long)(1000 * _ecore_win32_double_click_time)) &&
           (e->window == (Ecore_Window)_ecore_win32_mouse_down_last_window))
         e->double_click = 1;
 
       if ((_ecore_win32_mouse_up_count >= 3) &&
-          ((e->timestamp - _ecore_win32_mouse_down_last_last_time) <= (long)(2 * 1000 * _ecore_win32_double_click_time)) &&
+          ((e->timestamp - _ecore_win32_mouse_down_last_last_time) <= (unsigned long)(2 * 1000 * _ecore_win32_double_click_time)) &&
           (e->window == (Ecore_Window)_ecore_win32_mouse_down_last_window) &&
           (e->window == (Ecore_Window)_ecore_win32_mouse_down_last_last_window))
         e->triple_click = 1;
@@ -326,7 +326,7 @@ _ecore_win32_event_handle_motion_notify(Ecore_Win32_Callback_Data *msg)
    e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
    if (!e) return;
 
-   e->window = (Ecore_Window)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA);
    e->event_window = e->window;
    e->x = GET_X_LPARAM(msg->data_param);
    e->y = GET_Y_LPARAM(msg->data_param);
@@ -346,7 +346,7 @@ _ecore_win32_event_handle_enter_notify(Ecore_Win32_Callback_Data *msg)
      e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
      if (!e) return;
 
-     e->window = (Ecore_Window)GetWindowLong(msg->window, GWL_USERDATA);
+     e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA);
      e->event_window = e->window;
      e->x = msg->x;
      e->y = msg->y;
@@ -364,7 +364,7 @@ _ecore_win32_event_handle_enter_notify(Ecore_Win32_Callback_Data *msg)
      e = (Ecore_Win32_Event_Mouse_In *)calloc(1, sizeof(Ecore_Win32_Event_Mouse_In));
      if (!e) return;
 
-     e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+     e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
      e->x = msg->x;
      e->y = msg->y;
      e->time = msg->time ;
@@ -386,7 +386,7 @@ _ecore_win32_event_handle_leave_notify(Ecore_Win32_Callback_Data *msg)
      e = (Ecore_Event_Mouse_Move *)calloc(1, sizeof(Ecore_Event_Mouse_Move));
      if (!e) return;
 
-     e->window = (Ecore_Window)GetWindowLong(msg->window, GWL_USERDATA);
+     e->window = (Ecore_Window)GetWindowLongPtr(msg->window, GWL_USERDATA);
      e->event_window = e->window;
      e->x = msg->x;
      e->y = msg->y;
@@ -404,7 +404,7 @@ _ecore_win32_event_handle_leave_notify(Ecore_Win32_Callback_Data *msg)
      e = (Ecore_Win32_Event_Mouse_Out *)calloc(1, sizeof(Ecore_Win32_Event_Mouse_Out));
      if (!e) return;
 
-     e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+     e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
      e->x = msg->x;
      e->y = msg->y;
      e->time = msg->time;
@@ -425,7 +425,7 @@ _ecore_win32_event_handle_focus_in(Ecore_Win32_Callback_Data *msg)
    e = (Ecore_Win32_Event_Window_Focus_In *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_In));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->time = _ecore_win32_event_last_time;
    _ecore_win32_event_last_time = e->time;
@@ -443,7 +443,7 @@ _ecore_win32_event_handle_focus_out(Ecore_Win32_Callback_Data *msg)
    e = (Ecore_Win32_Event_Window_Focus_Out *)calloc(1, sizeof(Ecore_Win32_Event_Window_Focus_Out));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->time = _ecore_win32_event_last_time;
    _ecore_win32_event_last_time = e->time;
@@ -461,7 +461,7 @@ _ecore_win32_event_handle_expose(Ecore_Win32_Callback_Data *msg)
    e = (Ecore_Win32_Event_Window_Damage *)calloc(1, sizeof(Ecore_Win32_Event_Window_Damage));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->x = msg->update.left;
    e->y = msg->update.top;
@@ -483,7 +483,7 @@ _ecore_win32_event_handle_create_notify(Ecore_Win32_Callback_Data *msg)
    e = calloc(1, sizeof(Ecore_Win32_Event_Window_Create));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->time = _ecore_win32_event_last_time;
 
@@ -500,7 +500,7 @@ _ecore_win32_event_handle_destroy_notify(Ecore_Win32_Callback_Data *msg)
    e = calloc(1, sizeof(Ecore_Win32_Event_Window_Destroy));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->time = _ecore_win32_event_last_time;
    if (e->window == _ecore_win32_event_last_window) _ecore_win32_event_last_window = NULL;
@@ -518,7 +518,7 @@ _ecore_win32_event_handle_map_notify(Ecore_Win32_Callback_Data *msg)
    e = calloc(1, sizeof(Ecore_Win32_Event_Window_Show));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->time = _ecore_win32_event_last_time;
 
@@ -535,7 +535,7 @@ _ecore_win32_event_handle_unmap_notify(Ecore_Win32_Callback_Data *msg)
    e = calloc(1, sizeof(Ecore_Win32_Event_Window_Hide));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
 
    e->time = _ecore_win32_event_last_time;
 
@@ -562,8 +562,8 @@ _ecore_win32_event_handle_configure_notify(Ecore_Win32_Callback_Data *msg)
         return;
      }
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
-   e->abovewin = (void *)GetWindowLong(window_pos->hwndInsertAfter, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
+   e->abovewin = (void *)GetWindowLongPtr(window_pos->hwndInsertAfter, GWL_USERDATA);
    e->x = wi.rcClient.left;
    e->y = wi.rcClient.top;
    e->width = wi.rcClient.right - wi.rcClient.left;
@@ -587,7 +587,7 @@ _ecore_win32_event_handle_resize(Ecore_Win32_Callback_Data *msg)
    e = calloc(1, sizeof(Ecore_Win32_Event_Window_Resize));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
    e->width = rect.right - rect.left;
    e->height = rect.bottom - rect.top;
    e->time = _ecore_win32_event_last_time;
@@ -605,7 +605,7 @@ _ecore_win32_event_handle_delete_request(Ecore_Win32_Callback_Data *msg)
    e = calloc(1, sizeof(Ecore_Win32_Event_Window_Delete_Request));
    if (!e) return;
 
-   e->window = (void *)GetWindowLong(msg->window, GWL_USERDATA);
+   e->window = (void *)GetWindowLongPtr(msg->window, GWL_USERDATA);
    e->time = _ecore_win32_event_last_time;
 
    ecore_event_add(ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST, e, NULL, NULL);

diff --git a/src/lib/ecore_win32/ecore_win32_private.h b/src/lib/ecore_win32/ecore_win32_private.h
index 4154c12..41b07ca 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_private.h
+++ b/src/lib/ecore_win32/ecore_win32_private.h
@@ -99,6 +99,16 @@ struct _Ecore_Win32_Window
       unsigned int   layered : 1;
    } shape;
 
+   struct {
+     unsigned int x;
+     unsigned int y;
+     unsigned int w;
+     unsigned int h;
+     unsigned int px;
+     unsigned int py;
+     unsigned int dragging : 1;
+   } drag;
+
    void *dnd_drop_target;
 };
 

diff --git a/src/lib/ecore_win32/ecore_win32_window.c b/src/lib/ecore_win32/ecore_win32_window.c
index 7ca6748..6a655fa 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_window.c
+++ b/src/lib/ecore_win32/ecore_win32_window.c
@@ -94,7 +94,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
      }
 
    SetLastError(0);
-   if (!SetWindowLongPtr(w->window, GWL_USERDATA, (LONG)w) && (GetLastError() != 0))
+   if (!SetWindowLongPtr(w->window, GWL_USERDATA, (LONG_PTR)w) && (GetLastError() != 0))
      {
         ERR("SetWindowLongPtr() failed");
         DestroyWindow(w->window);
@@ -1276,8 +1276,8 @@ ecore_win32_window_cursor_set(Ecore_Win32_Window *window,
    if (!window || !cursor)
      return;
 
-   if (!SetClassLong(((struct _Ecore_Win32_Window *)window)->window,
-                     GCL_HCURSOR, (LONG)cursor))
+   if (!SetClassLongPtr(((struct _Ecore_Win32_Window *)window)->window,
+                     GCL_HCURSOR, (LONG_PTR)cursor))
      {
         ERR("SetClassLong() failed");
      }

diff --git a/win32/MANIFEST.txt b/win32/MANIFEST.txt
new file mode 100644 (file)
index 0000000..8663237
--- /dev/null
+++ b/win32/MANIFEST.txt
@@ -0,0 +1,18 @@
+\r
+ This folder content:\r
+\r
+   common                       - common sources necessary to build efl with MSVC\r
+     config.h                     - configuration file\r
+\r
+   vs9                          - Visual Studio 9 project files\r
+     ecore.sln                    - Evil MSVC solution\r
+     libecore.vcproj              - libecore project\r
+     libecore_evas.vcproj         - libecore project\r
+     libecore_file.vcproj         - libecore project\r
+     libecore_input.vcproj        - libecore project\r
+     libecore_input_evas.vcproj   - libecore project\r
+     libecore_win32.vcproj        - libecore project\r
+\r
+   start.bat                    - batch script to start work with the solution\r
+   MANIFEST.txt                 - this file\r
+   README.txt                   - about this folder\r

diff --git a/win32/README.txt b/win32/README.txt
new file mode 100644 (file)
index 0000000..27b3994
--- /dev/null
+++ b/win32/README.txt
@@ -0,0 +1,56 @@
+ This folder contains Microsoft Visual Studio projects and some sources for\r
+ building Evil.\r
+\r
+Important:\r
+\r
+ Do not launch manually any solutions or projects in the folder, to start\r
+ a solution run the start.bat script, it will setup environment for\r
+ projects and will check system requirements. start.bat will detect\r
+ automatically the version of Visual Studio which is installed. It\r
+ currently supports Visual Studio 2008, Visual Studio 2010 should convert\r
+ the files.\r
+\r
+ Before start make sure that the EXT_DIR variable points to proper\r
+ extern directory. Extern directory layout and content (may be different, but\r
+ this is guaranteed to be enough):\r
+\r
+  extern\r
+    bin\r
+      freetype6.dll\r
+      iconv.dll\r
+      jpeg62.dll\r
+      libpng14.dll\r
+      libtiff3.dll\r
+      libungif4.dll\r
+      zlib1.dll\r
+\r
+    include\r
+      freetype\r
+        ... (freetype includes)\r
+      sys\r
+        param.h\r
+\r
+      ft2build.h\r
+      gif_lib.h\r
+      iconv.h\r
+      jconfig.h\r
+      jerror.h\r
+      jmorecfg.h\r
+      jpeglib.h\r
+      png.h\r
+      pngconf.h\r
+      tiff.h\r
+      tiffconf.h\r
+      tiffio.h\r
+      tiffvers.h\r
+      zconf.h\r
+      zlib.h\r
+\r
+    lib\r
+      freetype.lib\r
+      iconv.lib\r
+      jpeg.lib\r
+      libpng.lib\r
+      libtiff.lib\r
+      libungif.lib\r
+      zlib.lib\r

diff --git a/win32/common/config.h b/win32/common/config.h
new file mode 100644 (file)
index 0000000..2bc604f
--- /dev/null
+++ b/win32/common/config.h
@@ -0,0 +1,417 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Build Ecore_Cocoa Module */
+/* #undef BUILD_ECORE_COCOA */
+
+/* Build Ecore_Con Module */
+/* #undef BUILD_ECORE_CON */
+
+/* Build Ecore_DirectFB Module */
+/* #undef BUILD_ECORE_DIRECTFB */
+
+/* Build Ecore_Evas Module */
+#define BUILD_ECORE_EVAS 1
+
+/* Support for Cocoa Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_COCOA */
+
+/* Support for Direct3d Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_DIRECT3D */
+
+/* Support for DirectFB Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_DIRECTFB */
+
+/* Support for Linux Framebuffer Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_FB */
+
+/* Support for Glew OpenGL Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_OPENGL_GLEW */
+
+/* Support for OpenGL SDL Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_OPENGL_SDL */
+
+/* Support for OpenGL Xlib Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_OPENGL_X11 */
+
+/* Support for SVN SDL */
+/* #undef BUILD_ECORE_EVAS_SDL_130 */
+
+/* Support for 16 bpp Software DirectDraw Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_16_DDRAW */
+
+/* Support for 16 bpp Software Windows CE Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE */
+
+/* Support for Software Xlib 16 bits Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
+
+/* Support for Software 8bit X11 Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_8_X11 */
+
+/* Support for Software Buffer Engine in Ecore_Evas */
+#define BUILD_ECORE_EVAS_SOFTWARE_BUFFER 1
+
+/* Support for Software DirectDraw Engine in Ecore_Evas */
+#define BUILD_ECORE_EVAS_SOFTWARE_DDRAW 1
+
+/* Support for Software GDI Engine in Ecore_Evas */
+#define BUILD_ECORE_EVAS_SOFTWARE_GDI 1
+
+/* Support for Software SDL Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_SDL */
+
+/* Support for Software X11 Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_X11 */
+
+/* Evas Software XCB Engine Support */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_XCB */
+
+/* Evas Software Xlib Engine Support */
+/* #undef BUILD_ECORE_EVAS_SOFTWARE_XLIB */
+
+/* Support for Win32 Engine in Ecore_Evas */
+#define BUILD_ECORE_EVAS_WIN32 1
+
+/* Support for X Window Engines in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_X11 */
+
+/* Support for XRender Xlib Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_XRENDER_X11 */
+
+/* Support for XRender XCB Engine in Ecore_Evas */
+/* #undef BUILD_ECORE_EVAS_XRENDER_XCB */
+
+/* Build Ecore_FB Module */
+/* #undef BUILD_ECORE_FB */
+
+/* Build Ecore_File Module */
+#define BUILD_ECORE_FILE 1
+
+/* Build Ecore_Imf Module */
+#define BUILD_ECORE_IMF 1
+
+/* Build Ecore_Imf_Evas Module */
+#define BUILD_ECORE_IMF_EVAS 1
+
+/* Build Ecore_Input Module */
+#define BUILD_ECORE_INPUT 1
+
+/* Build Ecore_Input_Evas Module */
+#define BUILD_ECORE_INPUT_EVAS 1
+
+/* Build Ecore_Ipc Module */
+/* #undef BUILD_ECORE_IPC */
+
+/* Build Ecore_Sdl Module */
+/* #undef BUILD_ECORE_SDL */
+
+/* Build Ecore_Win32 Module */
+#define BUILD_ECORE_WIN32 1
+
+/* Build Ecore_WinCE Module */
+/* #undef BUILD_ECORE_WINCE */
+
+/* Build Ecore_X Module */
+/* #undef BUILD_ECORE_X */
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Build support for XCB composite */
+/* #undef ECORE_XCB_COMPOSITE */
+
+/* Build support for XCB damage */
+/* #undef ECORE_XCB_DAMAGE */
+
+/* Build support for XCB dpms */
+/* #undef ECORE_XCB_DPMS */
+
+/* Build support for XCB xfixes */
+/* #undef ECORE_XCB_FIXES */
+
+/* Build support for XCB randr */
+/* #undef ECORE_XCB_RANDR */
+
+/* Build support for XCB render */
+/* #undef ECORE_XCB_RENDER */
+
+/* Build support for XCB screensaver */
+/* #undef ECORE_XCB_SCREENSAVER */
+
+/* Build support for XCB shape */
+/* #undef ECORE_XCB_SHAPE */
+
+/* Build support for XCB sync */
+/* #undef ECORE_XCB_SYNC */
+
+/* Build support for XCB xinerama */
+/* #undef ECORE_XCB_XINERAMA */
+
+/* Build support for XCB xprint */
+/* #undef ECORE_XCB_XPRINT */
+
+/* Build support for XCB xtest */
+/* #undef ECORE_XCB_XTEST */
+
+/* Build support for Xcomposite */
+/* #undef ECORE_XCOMPOSITE */
+
+/* Build support for Xcursor */
+/* #undef ECORE_XCURSOR */
+
+/* Build support for Xdamage */
+/* #undef ECORE_XDAMAGE */
+
+/* Build support for Xdpms */
+/* #undef ECORE_XDPMS */
+
+/* Build support for Xfixes */
+/* #undef ECORE_XFIXES */
+
+/* Build support for Xi2 */
+/* #undef ECORE_XI2 */
+
+/* Build support for Xinerama */
+/* #undef ECORE_XINERAMA */
+
+/* Build support for Xkb */
+/* #undef ECORE_XKB */
+
+/* Build support for Xprint */
+/* #undef ECORE_XPRINT */
+
+/* Build support for Xrandr */
+/* #undef ECORE_XRANDR */
+
+/* Build support for Xrender */
+/* #undef ECORE_XRENDER */
+
+/* Build support for Xss */
+/* #undef ECORE_XSS */
+
+/* Build support for Xtest */
+/* #undef ECORE_XTEST */
+
+/* Define to mention that POSIX threads are supported */
+/* #define EFL_HAVE_PTHREAD 1 */
+
+/* Define to mention that POSIX threads spinlocks are supported */
+/* #undef EFL_HAVE_PTHREAD_SPINLOCK */
+
+/* if set, logging is limited to this amount. */
+/* #undef EINA_LOG_LEVEL_MAXIMUM */
+
+/* Enable X Input Method */
+#define ENABLE_XIM 1
+
+/* Always integrate glib if support compiled */
+/* #undef GLIB_INTEGRATION_ALWAYS */
+
+/* Have abstract sockets namespace */
+#define HAVE_ABSTRACT_SOCKETS 1
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+/* #undef HAVE_ARPA_INET_H */
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+/* #undef HAVE_ARPA_NAMESER_H */
+
+/* mkdirat exists */
+/* #undef HAVE_ATFILE_SOURCE */
+
+/* Build Ecore_Con_Info with c-ares support */
+/* #undef HAVE_CARES */
+
+/* Downloading with CURL */
+/* #undef HAVE_CURL */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Defined to 1 if XCB is enabled. */
+/* #undef HAVE_ECORE_X_XCB */
+
+/* Defined to 1 if Xlib is enabled. */
+/* #undef HAVE_ECORE_X_XLIB */
+
+/* Set to 1 if Evil library is installed */
+#define HAVE_EVIL 1
+
+/* Define to 1 if you have the <features.h> header file. */
+/* #undef HAVE_FEATURES_H */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Have GLib */
+/* #undef HAVE_GLIB */
+
+/* File monitoring with Inotify */
+/* #undef HAVE_INOTIFY */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+/* #undef HAVE_LANGINFO_H */
+
+/* Define to 1 if you have the <locale.h> header file. */
+/* #undef HAVE_LOCALE_H */
+
+/* Gather memory statistic */
+/* #undef HAVE_MALLINFO */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdirat' function. */
+/* #undef HAVE_MKDIRAT */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+/* #undef HAVE_NETDB_H */
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+/* #undef HAVE_NETINET_IN_H */
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+/* #undef HAVE_NETINET_TCP_H */
+
+/* File monitoring with Windows notification */
+#define HAVE_NOTIFY_WIN32 1
+
+/* File monitoring with polling */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+/* #undef HAVE_SIGNAL_H */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+/* #undef HAVE_STRLCPY */
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef HAVE_SYS_EPOLL_H */
+
+/* File monitoring with Inotify - sys/inotify.h */
+/* #undef HAVE_SYS_INOTIFY */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+/* #undef HAVE_SYS_RESOURCE_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+/* #undef HAVE_SYS_SOCKET_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+/* #undef HAVE_SYS_UN_H */
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
+
+/* Build Ecore_FB Touchscreen Code */
+/* #undef HAVE_TSLIB */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+#define HAVE_WS2TCPIP_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "ecore"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "enlightenment-devel@lists.sourceforge.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "ecore"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "ecore 1.0.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "ecore"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.0.0"
+
+/* default value since PATH_MAX is not defined */
+/* #undef PATH_MAX */
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+       STACK_DIRECTION > 0 => grows toward higher addresses
+       STACK_DIRECTION < 0 => grows toward lower addresses
+       STACK_DIRECTION = 0 => direction of growth unknown */
+/* #undef STACK_DIRECTION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+
+/* Version number of package */
+#define VERSION "1.0.0"
+
+/* Major version */
+#define VERS_MAJ 1
+
+/* Micro version */
+#define VERS_MIC 0
+
+/* Minor version */
+#define VERS_MIN 0
+
+/* Revison */
+#define VERS_REV 0

diff --git a/win32/start.bat b/win32/start.bat
new file mode 100644 (file)
index 0000000..478c4a9
--- /dev/null
+++ b/win32/start.bat
@@ -0,0 +1,106 @@
+@echo off\r
+\r
+rem Set external libraries directory.\r
+set EXT_DIR=%cd%\..\..\..\extern\r
+\r
+if not exist %EXT_DIR% (\r
+       set EXT_DIR=\r
+       echo ERROR: External libs dir is not set.\r
+       pause\r
+       goto END\r
+)\r
+\r
+if "%DXSDK_DIR%" == "" (\r
+       echo ERROR: Microsoft DirectX SDK is not installed.\r
+       pause\r
+       goto END\r
+)\r
+\r
+rem Check for basic requirements for Visual Studio 2008\r
+if "%VS90COMNTOOLS%" == "" (\r
+       echo ERROR: Microsoft Visual Studio 2008 is not installed.\r
+       echo ERROR: Try to launch Microsoft Visual Studio 2005.\r
+       pause\r
+       goto NOVS9\r
+)\r
+\r
+set PROJECT_TYPE=vs9\r
+set VSCOMMONTOOLS=%VS90COMNTOOLS%vsvars32.bat\r
+\r
+goto STARTVS\r
+\r
+:NOVS9\r
+\r
+rem Check for basic requirements for Visual Studio 2005\r
+if "%VS80COMNTOOLS%" == "" (\r
+       echo ERROR: Microsoft Visual Studio 2005 is not installed.\r
+       pause\r
+       goto END\r
+)\r
+\r
+set PROJECT_TYPE=vs8\r
+set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat\r
+\r
+rem Patching Eina\r
+patch.exe --binary -p1 < %cd%\patch\eina.diff\r
+echo INFO: Eina patched.\r
+\r
+pause\r
+\r
+:STARTVS\r
+\r
+rem Setup common Win32 environment variables\r
+\r
+rem Add DirectX includes and libraries dirs.\r
+set INCLUDE=%DXSDK_DIR%Include;%INCLUDE%\r
+set LIB=%DXSDK_DIR%Lib\x86;%LIB%\r
+\r
+rem Add Evil lib path\r
+set EvilInclude=%cd%\..\..\evil\src\lib\r
+set EvilCommon=%cd%\..\..\evil\win32\common\r
+set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE%\r
+set LIB=%EvilOut%;%LIB%\r
+\r
+rem Add Eina lib path\r
+set EinaInclude=%cd%\..\..\eina\src\include\r
+set EinaCommon=%cd%\..\..\eina\win32\common\r
+set EinaOut=%cd%\..\..\eina\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EinaInclude%;%EinaCommon%;%INCLUDE%\r
+set LIB=%EinaOut%;%LIB%\r
+\r
+rem Add Eet lib path\r
+set EetInclude=%cd%\..\..\eet\src\lib\r
+set EetOut=%cd%\..\..\eet\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EetInclude%;%INCLUDE%\r
+set LIB=%EetOut%;%LIB%\r
+\r
+rem Add Evas lib path\r
+set EvasInclude=%cd%\..\..\evas\src\lib;%cd%\..\..\evas\src\modules\engines\buffer;%cd%\..\..\evas\src\modules\engines\software_gdi;%cd%\..\..\evas\src\modules\engines\software_ddraw\r
+set EvasOut=%cd%\..\..\evas\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EvasInclude%;%INCLUDE%\r
+set LIB=%EvasOut%;%LIB%\r
+\r
+rem Add installation directory pathes.\r
+set INCLUDE=%EXT_DIR%\include;%INCLUDE%\r
+set LIB=%EXT_DIR%\lib;%LIB%\r
+\r
+set INCLUDE=%cd%\common;%cd%\..\src\lib\ecore;%cd%\..\src\lib\ecore_input;%cd%\..\src\lib\ecore_input_evas;%cd%\..\src\lib\ecore_win32;%INCLUDE%\r
+\r
+set SolutionDirectory=%cd%\%PROJECT_TYPE%\r
+set DebugOutputDirectory=%SolutionDirectory%\out\r
+set ReleaseOutputDirectory=%SolutionDirectory%\out\r
+set DebugLibraryDirectory=%SolutionDirectory%\out\r
+set ReleaseLibraryDirectory=%SolutionDirectory%\out\r
+set TemporaryDirectory=%SolutionDirectory%\temp\r
+\r
+rem Setting environment for using Microsoft Visual Studio x86 tools.\r
+call "%VSCOMMONTOOLS%"\r
+\r
+%PROJECT_TYPE%\ecore.sln\r
+\r
+:END\r

diff --git a/win32/vs9/ecore.sln b/win32/vs9/ecore.sln
new file mode 100644 (file)
index 0000000..bf713fe
--- /dev/null
+++ b/win32/vs9/ecore.sln
@@ -0,0 +1,68 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual Studio 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libecore", "libecore.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libecore_win32", "libecore_win32.vcproj", "{3266A791-E050-48C1-A114-798B98CAB12C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
+               {1EA2B2BF-E021-4611-AEEC-5EED621347B6} = {1EA2B2BF-E021-4611-AEEC-5EED621347B6}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libecore_evas", "libecore_evas.vcproj", "{DE0016EC-1096-42FF-A2BA-BDCFD3A95E50}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
+               {3F8D2B53-364C-40A4-9F0E-18C134010223} = {3F8D2B53-364C-40A4-9F0E-18C134010223}\r
+               {3266A791-E050-48C1-A114-798B98CAB12C} = {3266A791-E050-48C1-A114-798B98CAB12C}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libecore_file", "libecore_file.vcproj", "{EAD9796F-A372-4505-8BF6-520AA6686F27}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libecore_input", "libecore_input.vcproj", "{1EA2B2BF-E021-4611-AEEC-5EED621347B6}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libecore_input_evas", "libecore_input_evas.vcproj", "{3F8D2B53-364C-40A4-9F0E-18C134010223}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {1EA2B2BF-E021-4611-AEEC-5EED621347B6} = {1EA2B2BF-E021-4611-AEEC-5EED621347B6}\r
+       EndProjectSection\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32\r
+               {3266A791-E050-48C1-A114-798B98CAB12C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {3266A791-E050-48C1-A114-798B98CAB12C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {3266A791-E050-48C1-A114-798B98CAB12C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {3266A791-E050-48C1-A114-798B98CAB12C}.Release|Win32.Build.0 = Release|Win32\r
+               {DE0016EC-1096-42FF-A2BA-BDCFD3A95E50}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {DE0016EC-1096-42FF-A2BA-BDCFD3A95E50}.Debug|Win32.Build.0 = Debug|Win32\r
+               {DE0016EC-1096-42FF-A2BA-BDCFD3A95E50}.Release|Win32.ActiveCfg = Release|Win32\r
+               {DE0016EC-1096-42FF-A2BA-BDCFD3A95E50}.Release|Win32.Build.0 = Release|Win32\r
+               {EAD9796F-A372-4505-8BF6-520AA6686F27}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {EAD9796F-A372-4505-8BF6-520AA6686F27}.Debug|Win32.Build.0 = Debug|Win32\r
+               {EAD9796F-A372-4505-8BF6-520AA6686F27}.Release|Win32.ActiveCfg = Release|Win32\r
+               {EAD9796F-A372-4505-8BF6-520AA6686F27}.Release|Win32.Build.0 = Release|Win32\r
+               {1EA2B2BF-E021-4611-AEEC-5EED621347B6}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {1EA2B2BF-E021-4611-AEEC-5EED621347B6}.Debug|Win32.Build.0 = Debug|Win32\r
+               {1EA2B2BF-E021-4611-AEEC-5EED621347B6}.Release|Win32.ActiveCfg = Release|Win32\r
+               {1EA2B2BF-E021-4611-AEEC-5EED621347B6}.Release|Win32.Build.0 = Release|Win32\r
+               {3F8D2B53-364C-40A4-9F0E-18C134010223}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {3F8D2B53-364C-40A4-9F0E-18C134010223}.Debug|Win32.Build.0 = Debug|Win32\r
+               {3F8D2B53-364C-40A4-9F0E-18C134010223}.Release|Win32.ActiveCfg = Release|Win32\r
+               {3F8D2B53-364C-40A4-9F0E-18C134010223}.Release|Win32.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/win32/vs9/libecore.vcproj b/win32/vs9/libecore.vcproj
new file mode 100644 (file)
index 0000000..33f1aeb
--- /dev/null
+++ b/win32/vs9/libecore.vcproj
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libecore"\r
+       ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
+       RootNamespace="libecore"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_ECORE_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=_stricmp;finite=_finite;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__=;_CRT_SECURE_NO_WARNINGS;HAVE_GETTIMEOFDAY;EFL_HAVE_THREADS;EFL_HAVE_WIN32_THREADS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libeina.lib libevil.lib ws2_32.lib"\r
+                               OutputFile="$(OutDir)\libecore.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_ECORE_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=_stricmp;finite=_finite;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__=;_CRT_SECURE_NO_WARNINGS;HAVE_GETTIMEOFDAY;EFL_HAVE_THREADS;EFL_HAVE_WIN32_THREADS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libeina.lib libevil.lib ws2_32.lib"\r
+                               OutputFile="$(OutDir)\libecore.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\Ecore.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\Ecore_Getopt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_anim.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_app.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_events.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_exe_win32.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_getopt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_glib.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_idle_enterer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_idle_exiter.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_idler.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_job.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_main.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_pipe.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_poll.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_thread.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_time.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore\ecore_timer.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/win32/vs9/libecore_evas.vcproj b/win32/vs9/libecore_evas.vcproj
new file mode 100644 (file)
index 0000000..692b8ce
--- /dev/null
+++ b/win32/vs9/libecore_evas.vcproj
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libecore_evas"\r
+       ProjectGUID="{DE0016EC-1096-42FF-A2BA-BDCFD3A95E50}"\r
+       RootNamespace="libecore_evas"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_ECORE_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;BUILD_ECORE_WIN32;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libevil.lib"\r
+                               OutputFile="$(OutDir)\libecore_evas.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_ECORE_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;BUILD_ECORE_WIN32;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libevil.lib"\r
+                               OutputFile="$(OutDir)\libecore_evas.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_evas\Ecore_Evas.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_evas\ecore_evas_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_evas\ecore_evas.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_evas\ecore_evas_buffer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_evas\ecore_evas_win32.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/win32/vs9/libecore_file.vcproj b/win32/vs9/libecore_file.vcproj
new file mode 100644 (file)
index 0000000..66ec7d4
--- /dev/null
+++ b/win32/vs9/libecore_file.vcproj
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libecore_file"\r
+       ProjectGUID="{EAD9796F-A372-4505-8BF6-520AA6686F27}"\r
+       RootNamespace="libecore_file"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_ECORE_FILE_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__="\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libecore.lib libeina.lib libevil.lib"\r
+                               OutputFile="$(OutDir)\libecore_file.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_ECORE_FILE_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__="\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libecore.lib libeina.lib libevil.lib"\r
+                               OutputFile="$(OutDir)\libecore_file.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\Ecore_File.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file_download.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file_monitor.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file_monitor_poll.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file_monitor_win32.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_file\ecore_file_path.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/win32/vs9/libecore_input.vcproj b/win32/vs9/libecore_input.vcproj
new file mode 100644 (file)
index 0000000..de42faa
--- /dev/null
+++ b/win32/vs9/libecore_input.vcproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libecore_input"\r
+       ProjectGUID="{1EA2B2BF-E021-4611-AEEC-5EED621347B6}"\r
+       RootNamespace="libecore_input"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_ECORE_INPUT_BUILD;DLL_EXPORT;inline=__inline;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__="\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libecore.lib libeina.lib"\r
+                               OutputFile="$(OutDir)\libecore_input.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_ECORE_INPUT_BUILD;DLL_EXPORT;inline=__inline;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__="\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libecore.lib libeina.lib"\r
+                               OutputFile="$(OutDir)\libecore_input.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Fichiers sources"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_input\ecore_input.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Fichiers d&apos;en-tête"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_input\Ecore_Input.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_input\ecore_input_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Fichiers de ressources"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/win32/vs9/libecore_input_evas.vcproj b/win32/vs9/libecore_input_evas.vcproj
new file mode 100644 (file)
index 0000000..3fa8c41
--- /dev/null
+++ b/win32/vs9/libecore_input_evas.vcproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libecore_input_evas"\r
+       ProjectGUID="{3F8D2B53-364C-40A4-9F0E-18C134010223}"\r
+       RootNamespace="libecore_input_evas"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="196613"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_ECORE_INPUT_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libecore.lib libecore_input.lib libevas.lib libeina.lib"\r
+                               OutputFile="$(OutDir)\libecore_input_evas.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_ECORE_INPUT_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libecore.lib libecore_input.lib libevas.lib libeina.lib"\r
+                               OutputFile="$(OutDir)\libecore_input_evas.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Fichiers sources"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_input_evas\ecore_input_evas.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Fichiers d&apos;en-tête"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_input_evas\Ecore_Input_Evas.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_input_evas\ecore_input_evas_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Fichiers de ressources"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/win32/vs9/libecore_win32.vcproj b/win32/vs9/libecore_win32.vcproj
new file mode 100644 (file)
index 0000000..9900ea7
--- /dev/null
+++ b/win32/vs9/libecore_win32.vcproj
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libecore_win32"\r
+       ProjectGUID="{3266A791-E050-48C1-A114-798B98CAB12C}"\r
+       RootNamespace="libecore_win32"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_ECORE_WIN32_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libeina.lib"\r
+                               OutputFile="$(OutDir)\libecore_win32.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="0"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="$(INCLUDE)"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_ECORE_WIN32_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;snprintf=_snprintf_c;strcasecmp=stricmp;HAVE_CONFIG_H;HAVE_EVIL;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               UseLibraryDependencyInputs="false"\r
+                               AdditionalDependencies="libeina.lib"\r
+                               OutputFile="$(OutDir)\libecore_win32.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               AddModuleNamesToAssembly=""\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\Ecore_Win32.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_data_object.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_drop_source.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_drop_target.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_enumformatetc.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_cursor.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_data_object.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_drop_source.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_drop_target.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_dnd_enumformatetc.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_event.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\ecore_win32\ecore_win32_window.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r