Merge branch 'master' into devs/hermet/lottie

doc/ephysics_examples.dox

@@ -297,7 +297,7 @@
  * The purpose of this example is to demonstrate the EPhysics_Camera usage.
  *
  * The EPhysics_Camera facilitates the usage of scenarios bigger than the
- * viewport, thats because the EPhysics handles the position of objects
+ * viewport, that's because the EPhysics handles the position of objects
  * which has control.
  *
  * @image html camera.png
@@ -426,7 +426,7 @@
  * usage.
  *
  * The EPhysics_Camera facilitates the usage of scenarios bigger than the
- * viewport, thats because the EPhysics handles the position of objects
+ * viewport, that's because the EPhysics handles the position of objects
  * which has control.
  *
  * @image html camera_track.png

old/ChangeLog.evas

@@ -296,7 +296,7 @@
 
 2011-05-04  Carsten Haitzler (The Rasterman)
 
-	* Improved table layout for homogenous mode to handle not column
+	* Improved table layout for homogeneous mode to handle not column
         or row multiple sized table better.
 
 2011-05-04  Jiyoun Park

old/NEWS.evas

@@ -240,7 +240,7 @@ Improvements:
     * speed and memory usage of textblock
     * cache handler to also use file size, mode and sub-second timestamp
     * textblock to re-layout only paragraphs that have changed
-    * homogenous table layout alignment and sizing
+    * homogeneous table layout alignment and sizing
     * textblock linebreaking by using liblinebreak
     * image loader to drop out instantly if image file is a directory
     * object allocation to use mempools

src/bin/elementary/test_factory.c

@@ -5,7 +5,7 @@
 
 // 16 ^ 4 = 65k
 #define BLOK 16
-// homogenous layout
+// homogeneous layout
 //#define HOMOG 1
 // aligned to top of box
 #define ZEROALIGN 1

src/lib/edje/edje_embryo.c

@@ -4701,7 +4701,7 @@ _edje_embryo_test_run(Edje *ed, Edje_Program *pr, const char *sig, const char *s
         pdata = embryo_program_data_get(ed->collection->script);
         embryo_program_data_set(ed->collection->script, ed);
         /* 5 million instructions is an arbitrary number. on my p4-2.6 here */
-        /* IF embryo is ONLY running embryo stuff and NO native calls thats */
+        /* IF embryo is ONLY running embryo stuff and NO native calls that's */
         /* about 0.016 seconds, and longer on slower cpu's. if a simple */
         /* embryo script snippet hasn't managed to do its work in 5 MILLION */
         /* embryo virtual machine instructions - something is wrong, or */

src/lib/edje/edje_match.c

@@ -478,7 +478,7 @@ edje_match_programs_exec_check_finals(const unsigned int *signal_finals,
    unsigned int i;
    unsigned int j;
 
-   /* when not enought memory, they could be NULL */
+   /* when not enough memory, they could be NULL */
    if (!signal_finals || !source_finals) return EINA_TRUE;
 
    for (i = 0; i < signal_states->size; ++i)

src/lib/eet/Eet.h

@@ -932,7 +932,7 @@ eet_list(Eet_File *ef,
  * @ingroup Eet_File_Group
  * @brief Returns an iterator that will describe each entry of an Eet_File.
  * @param ef A valid eet file handle.
- * @return An interator of Eet_Entry.
+ * @return An iterator of Eet_Entry.
  *
  * @since 1.8.0
  */

src/lib/efl/interfaces/efl_gfx_path.c

@@ -683,7 +683,7 @@ _efl_gfx_path_append_arc_to(Eo *obj, Efl_Gfx_Path_Data *pd,
    cy += (sy + y) / 2.0;
 
    // step 4 (F6.5.4)
-   // we dont' use arccos (as per w3c doc), see
+   // we don't use arccos (as per w3c doc), see
    // http://www.euclideanspace.com/maths/algebra/vectors/angleBetween/index.htm
    // note: atan2 (0.0, 1.0) == 0.0
    at = atan2(((y1p - cyp) / ry), ((x1p - cxp) / rx));
@@ -1108,18 +1108,16 @@ _efl_gfx_path_append_rect(Eo *obj, Efl_Gfx_Path_Data *pd,
      }
 
    // clamp the rx and ry radius value.
+   rx = 2*rx;
+   ry = 2*ry;
    if (rx > w) rx = w;
    if (ry > h) ry = h;
 
-   _efl_gfx_path_append_move_to(obj, pd, x + rx, y);
-   _efl_gfx_path_append_line_to(obj, pd, x + (w - rx), y);
-   _efl_gfx_path_append_quadratic_to(obj, pd, x + w, y + ry, x + w, y);
-   _efl_gfx_path_append_line_to(obj, pd, x + w, y + (h - ry));
-   _efl_gfx_path_append_quadratic_to(obj, pd, x + (w - rx), y + h, x + w, y + h);
-   _efl_gfx_path_append_line_to(obj, pd, x + rx, y + h);
-   _efl_gfx_path_append_quadratic_to(obj, pd, x , y + (h - ry), x, y + h);
-   _efl_gfx_path_append_line_to(obj, pd, x, y + ry);
-   _efl_gfx_path_append_quadratic_to(obj, pd, x + rx, y, x, y);
+   _efl_gfx_path_append_move_to(obj, pd, x, y + h/2);
+   _efl_gfx_path_append_arc(obj, pd, x, y + h - ry, rx, ry, 180, 90);
+   _efl_gfx_path_append_arc(obj, pd, x + w - rx, y + h - ry, rx, ry, 270, 90);
+   _efl_gfx_path_append_arc(obj, pd, x + w - rx, y, rx, ry, 0, 90);
+   _efl_gfx_path_append_arc(obj, pd, x, y, rx, ry, 90, 90);
    _efl_gfx_path_append_close(obj, pd);
 
    //update convex flag

src/lib/efreet/efreet_menu.c

@@ -65,7 +65,7 @@ struct Efreet_Menu_Internal
     Eina_List *layout;             /**< This menus layout */
     Eina_List *default_layout;     /**< Default layout */
     signed char show_empty;    /**< Whether to show empty menus */
-    signed char in_line;       /**< Whether this meny can be inlined */
+    signed char in_line;       /**< Whether this menu can be inlined */
     signed char inline_limit;  /**< Number of elements which triggers inline */
     signed char inline_header; /**< Whether we should use the header name when this menu is inlined */
     signed char inline_alias;  /**< Whether we should use the menu name when inlining */
@@ -143,7 +143,7 @@ struct Efreet_Menu_Layout
 
     /* The items below are for Menuname Layout elements */
     signed char show_empty;    /**< Whether to show empty menus */
-    signed char in_line;       /**< Whether this meny can be inlined */
+    signed char in_line;       /**< Whether this menu can be inlined */
     signed char inline_limit;  /**< Number of elements which triggers inline */
     signed char inline_header; /**< Whether we should use the header name when this menu is inlined */
     signed char inline_alias;  /**< Whether we should use the menu name when inlining */

src/lib/eina/eina_error.c

@@ -115,7 +115,13 @@ _eina_error_msg_alloc(void)
 /* Windows has strerror_s(), similar to POSIX strerror_r() */
 static inline int strerror_r(int errnum, char *buf, size_t buflen)
 {
-   return strerror_s(buf, buflen, errnum);
+   int ret;
+
+   ret = strerror_s(buf, buflen, errnum);
+   if (strcmp(buf, "Unknown error") == 0)
+     snprintf(buf, buflen, "Unknown error %d", errnum);
+
+   return ret;
 }
 #endif
 

src/lib/eina/eina_file_common.h

@@ -124,6 +124,9 @@ struct _Eina_File_Map
 
    Eina_Bool hugetlb : 1;  /**< Indicates if we are using HugeTLB */
    Eina_Bool faulty : 1;   /**< Indicates if this region was not mapped correctly (i.e. the call to mmap(2) failed). */
+#ifdef _WIN32
+   void *ret;  /**< A pointer to the mapped region */
+#endif
 };
 
 /**

src/lib/eina/eina_file_win32.c

@@ -900,7 +900,7 @@ eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
    if (offset + length > file->length)
      return NULL;
 
-   if (offset == 0 && length == file->length)
+   if (offset == 0UL && length == file->length)
      return eina_file_map_all(file, rule);
 
    if (file->virtual)
@@ -914,40 +914,56 @@ eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
    map = eina_hash_find(file->map, &key);
    if (!map)
      {
+        SYSTEM_INFO si;
         HANDLE fm;
+        __int64 map_size;
+        DWORD view_offset;
+        DWORD view_length;
+        DWORD granularity;
+
         map = malloc(sizeof (Eina_File_Map));
         if (!map)
-          {
-             eina_lock_release(&file->lock);
-             return NULL;
-          }
+          goto on_error;
 
-        /* the length parameter is unsigned long, that is a DWORD */
-        /* so the max size high parameter of CreateFileMapping is 0 */
+        /*
+         * the size of the mapping object is the offset plus the length,
+         * which might be greater than a DWORD
+         */
+        map_size = (__int64)offset + (__int64)length;
         fm = CreateFileMapping(file->handle, NULL, PAGE_READONLY,
-                                     0, (DWORD)length, NULL);
+                               (DWORD)((map_size >> 32) & 0x00000000ffffffffULL),
+                               (DWORD)(map_size & 0x00000000ffffffffULL),
+                               NULL);
         if (!fm)
-          return NULL;
+          goto on_error;
 
+        /*
+         * get the system allocation granularity as the
+         * offset passed to MapViewOfFile() must be a
+         * multiple of this granularity
+         */
+        GetSystemInfo(&si);
+        granularity = si.dwAllocationGranularity;
+
+        /*
+         * view_offset is the greatest multiple of granularity, less or equal
+         * than offset (and can be stored in a DWORD)
+         */
+        view_offset = (offset / granularity) * granularity;
+        view_length = (offset - view_offset) + length;
         map->map = MapViewOfFile(fm, FILE_MAP_READ,
-                             offset & 0xffff0000,
-                             offset & 0x0000ffff,
-                             length);
+                                 0,
+                                 view_offset,
+                                 view_length);
         CloseHandle(fm);
         if (!map->map)
-          map->map = MAP_FAILED;
+          goto on_error;
 
+        map->ret = (unsigned char *)map->map + (offset - view_offset);
         map->offset = offset;
         map->length = length;
         map->refcount = 0;
 
-        if (map->map == MAP_FAILED)
-          {
-             free(map);
-             eina_lock_release(&file->lock);
-             return NULL;
-          }
-
         eina_hash_add(file->map, &key, map);
         eina_hash_direct_add(file->rmap, map->map, map);
      }
@@ -956,7 +972,13 @@ eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
 
    eina_lock_release(&file->lock);
 
-   return map->map;
+   return map->ret;
+
+ on_error:
+   free(map);
+   eina_lock_release(&file->lock);
+
+   return NULL;
 }
 
 EAPI void

src/lib/eina/eina_inline_array.x

@@ -44,16 +44,13 @@ EAPI Eina_Bool eina_array_grow(Eina_Array *array);
 static inline Eina_Bool
 eina_array_push(Eina_Array *array, const void *data)
 {
-   if (data)
-     {
-        if (EINA_UNLIKELY((array->count + 1) > array->total)) goto do_grow;
+   if (EINA_UNLIKELY(data == NULL)) return EINA_FALSE;
+   if (EINA_UNLIKELY((array->count + 1) > array->total)) goto do_grow;
 do_grow_back:
 
-        array->data[array->count++] = (void*) data;
+   array->data[array->count++] = (void*) data;
 
-        return EINA_TRUE;
-     }
-   return EINA_FALSE;
+   return EINA_TRUE;
 do_grow:
    if (!eina_array_grow(array)) return EINA_FALSE;
    goto do_grow_back;

src/lib/eio/eio_file.c

@@ -769,7 +769,7 @@ eio_file_associate_add(Eio_File *ls,
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(key, EINA_FALSE);
-   /* FIXME: Check if we are in the right worker thred */
+   /* FIXME: Check if we are in the right worker thread */
    if (!ls->worker.associated)
      ls->worker.associated = eina_hash_string_small_new(eio_associate_free);
 
@@ -785,7 +785,7 @@ eio_file_associate_direct_add(Eio_File *ls,
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(key, EINA_FALSE);
-   /* FIXME: Check if we are in the right worker thred */
+   /* FIXME: Check if we are in the right worker thread */
    if (!ls->worker.associated)
      ls->worker.associated = eina_hash_string_small_new(eio_associate_free);
 

src/lib/eio/eio_private.h

@@ -53,7 +53,7 @@ typedef struct stat _eio_stat_t;
 # include <pwd.h>
 #endif
 
-/* Keeping 8 Eio_File_Progress alive should be enought */
+/* Keeping 8 Eio_File_Progress alive should be enough */
 #define EIO_PROGRESS_LIMIT 8
 
 /* Huge TLB == 16M on most system */

src/lib/eldbus/Eldbus.h

@@ -21,7 +21,7 @@
  *
  * <ul>
  * <li> @ref Eldbus_Core
- * <li> @ref Eldbus_Conneciton
+ * <li> @ref Eldbus_Connection
  * <li> @ref Eldbus_Object_Mapper
  * <li> @ref Eldbus_Proxy
  * <li> @ref Eldbus_Message

src/lib/eldbus/eldbus_connection.h

@@ -2,7 +2,7 @@
 #define ELDBUS_CONNECTION_H 1
 
 /**
- * @defgroup Eldbus_Conneciton Connection
+ * @defgroup Eldbus_Connection Connection
  * @ingroup Eldbus
  *
  * @{

src/lib/eldbus/eldbus_message.h

@@ -384,7 +384,7 @@ EAPI Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, in
  * Eldbus_Message_Iter will be need.
  *
  * @param iter iterator
- * @param signature of the complete data types on interator
+ * @param signature of the complete data types on iterator
  * @param ... pointers of where data will be stored
  *
  * @return EINA_FALSE if signature different from signature in iterator
@@ -397,7 +397,7 @@ EAPI Eina_Bool               eldbus_message_iter_arguments_get(Eldbus_Message_It
  * Eldbus_Message_Iter will be need.
  *
  * @param iter iterator
- * @param signature of the complete data types on interator
+ * @param signature of the complete data types on iterator
  * @param ap va_list of the pointers of where data will be stored
  *
  * @return EINA_FALSE if signature different from signature in iterator

src/lib/elementary/efl_ui_widget.c

@@ -1728,7 +1728,7 @@ _tree_unfocusable_counter_get(Eo *widget)
  *
  * The basic idea here is:
  * - The numeric number beeing bigger than 0, means that the property is true
- * - The differnce between the number of the parent, and the number of the object, represents the boolean flag
+ * - The difference between the number of the parent, and the number of the object, represents the boolean flag
  *   (0 means that the flag is equal to the one of the parent, 1 means that if the parent is false, this child is true).
  */
 static int
@@ -2815,7 +2815,7 @@ _efl_ui_widget_efl_object_dbg_info_get(Eo *eo_obj, Elm_Widget_Smart_Data *_pd EI
 
      }
 
-   //if thats a focus manager, give useful information like the border elements
+   //if that's a focus manager, give useful information like the border elements
    if (efl_isa(eo_obj, EFL_UI_FOCUS_MANAGER_INTERFACE))
      {
         Efl_Dbg_Info *border;

src/lib/elementary/elm_config.h

@@ -596,14 +596,14 @@ EAPI Eina_Bool    elm_config_scroll_animation_disabled_get(void);
  * This option disables timed animations during scrolling and forces scroll actions
  * to be performed immediately.
  *
- * @param enable The state of this option
+ * @param disable The state of this option
  *
  * @see elm_config_scroll_animation_disabled_get()
  *
  * @since 1.18
  * @ingroup Elm_Scrolling
  */
-EAPI void         elm_config_scroll_animation_disabled_set(Eina_Bool enable);
+EAPI void         elm_config_scroll_animation_disabled_set(Eina_Bool disable);
 
 /**
  * Get the value of this option

src/lib/elementary/elm_factory.c

@@ -117,7 +117,7 @@ _eval(Evas_Object *obj)
    evas_output_viewport_get(evas_object_evas_get(obj),
                             &cvx, &cvy, &cvw, &cvh);
    if ((cvw < 1) || (cvh < 1)) return;
-   // need some fuzz value thats beyond the current viewport
+   // need some fuzz value that's beyond the current viewport
    // for now just make it the viewport * 3 in size (so 1 vp in each direction)
    /*
    cvx -= cvw;

src/lib/elementary/elm_gengrid.c

@@ -3993,7 +3993,7 @@ _item_select(Elm_Gen_Item *it)
           efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_TYPE_SELECTED, EINA_TRUE);
      }
 
-   efl_ref(eo_it);
+   efl_unref(eo_it);
    sd->walking--;
    if ((sd->clear_me) && (!sd->walking))
      _internal_elm_gengrid_clear(WIDGET(it), EINA_TRUE);
@@ -4049,7 +4049,7 @@ _elm_gengrid_item_new(Elm_Gengrid_Data *sd,
    GG_IT(it) = ELM_NEW(Elm_Gen_Item_Type);
    GG_IT(it)->wsd = sd;
 
-   /* for non homogenous items */
+   /* for non homogeneous items */
    it->item->w = sd->item_width;
    it->item->h = sd->item_height;
 
@@ -4167,7 +4167,7 @@ _elm_gengrid_efl_canvas_group_group_add(Eo *obj, Elm_Gengrid_Data *priv)
 
    elm_interface_scrollable_extern_pan_set(obj, priv->pan_obj);
 
-   /* for non homogenous mode */
+   /* for non homogeneous mode */
    priv->custom_size_mode = EINA_FALSE;
    priv->custom_size_sum = NULL;
    priv->custom_tot_sum = NULL;

src/lib/elementary/elm_gesture_layer.c

@@ -3187,7 +3187,7 @@ _zoom_compute(Zoom_Type *st,
  * @internal
  *
  * This function handles zoom with mouse wheel.
- * thats a combination of wheel + CTRL key.
+ * that's a combination of wheel + CTRL key.
  * @param obj The gesture-layer object.
  * @param event_info Original input event pointer.
  * @param event_type Type of original input event.

src/lib/elementary/elm_photocam.h

@@ -69,7 +69,7 @@ struct _Elm_Photocam_Progress
 };
 
 /**
- * Structre associated with smart callback 'download,error'
+ * Structure associated with smart callback 'download,error'
  * @since 1.8
  */
 typedef struct _Elm_Photocam_Error Elm_Photocam_Error;

src/lib/elementary/elm_table_eo.h

@@ -22,7 +22,7 @@ typedef Eo Elm_Table;
 EWAPI const Efl_Class *elm_table_class_get(void);
 
 /**
- * @brief Control the homogenous state in a table.
+ * @brief Control the homogeneous state in a table.
  *
  * @param[in] obj The object.
  * @param[in] homogeneous A boolean to set if the layout is homogeneous in the
@@ -33,7 +33,7 @@ EWAPI const Efl_Class *elm_table_class_get(void);
 EOAPI void elm_obj_table_homogeneous_set(Eo *obj, Eina_Bool homogeneous);
 
 /**
- * @brief Control the homogenous state in a table.
+ * @brief Control the homogeneous state in a table.
  *
  * @param[in] obj The object.
  *

src/lib/elementary/elm_table_eo.legacy.h

@@ -15,7 +15,7 @@ typedef Eo Elm_Table;
 #endif
 
 /**
- * @brief Control the homogenous state in a table.
+ * @brief Control the homogeneous state in a table.
  *
  * @param[in] obj The object.
  * @param[in] homogeneous A boolean to set if the layout is homogeneous in the
@@ -26,7 +26,7 @@ typedef Eo Elm_Table;
 EAPI void elm_table_homogeneous_set(Elm_Table *obj, Eina_Bool homogeneous);
 
 /**
- * @brief Control the homogenous state in a table.
+ * @brief Control the homogeneous state in a table.
  *
  * @param[in] obj The object.
  *

src/lib/elementary/elm_widget_gengrid.h

@@ -174,7 +174,7 @@ struct Elm_Gen_Item_Type
                                               * this item only once */
    Eina_Bool               nocache : 1; /* do not use cache for this item */
 
-   /* for non homogenous items */
+   /* for non homogeneous items */
    Evas_Coord              w, h, sw, sh;
 };
 

src/lib/elementary/elm_widget_item_eo.h

@@ -677,7 +677,7 @@ EOAPI void elm_wdg_item_domain_part_text_translatable_set(Eo *obj, const char *p
  * items may/may not have the internal object so this api may return @c NULL if
  * the widget item doesn't have it. Additionally, the widget item is
  * managed/controlled by the widget, the widget item could be changed(moved,
- * resized even deleted) anytime by it's own widget's decision. So please dont'
+ * resized even deleted) anytime by it's own widget's decision. So please don't
  * change the track object as well as don't keep the track object in your side
  * as possible but get the track object at the moment you need to refer.
  * Otherwise, you need to add some callbacks to the track object to track it's

src/lib/elementary/elm_widget_item_eo.legacy.h

@@ -625,7 +625,7 @@ EAPI void elm_object_item_domain_part_text_translatable_set(Elm_Widget_Item *obj
  * items may/may not have the internal object so this api may return @c NULL if
  * the widget item doesn't have it. Additionally, the widget item is
  * managed/controlled by the widget, the widget item could be changed(moved,
- * resized even deleted) anytime by it's own widget's decision. So please dont'
+ * resized even deleted) anytime by it's own widget's decision. So please don't
  * change the track object as well as don't keep the track object in your side
  * as possible but get the track object at the moment you need to refer.
  * Otherwise, you need to add some callbacks to the track object to track it's

src/lib/eo/eo_ptr_indirection.c

@@ -138,7 +138,7 @@ _eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file,
      {
         eina_lock_take(&(_eo_table_data_shared_data->obj_lock));
         if (obj_id == tdata->cache.id)
-        // yes we return keeping the lock locked. thats why
+        // yes we return keeping the lock locked. that's why
         // you must call _eo_obj_pointer_done() wrapped
         // by EO_OBJ_DONE() to release
           return tdata->cache.object;
@@ -169,7 +169,7 @@ _eo_obj_pointer_get(const Eo_Id obj_id, const char *func_name, const char *file,
                        // Cache the result of that lookup
                        tdata->cache.object = entry->ptr;
                        tdata->cache.id = obj_id;
-                       // yes we return keeping the lock locked. thats why
+                       // yes we return keeping the lock locked. that's why
                        // you must call _eo_obj_pointer_done() wrapped
                        // by EO_OBJ_DONE() to release
                        return entry->ptr;

src/lib/eolian/Eolian.h

@@ -339,7 +339,7 @@ typedef enum
 #ifdef EFL_BETA_API_SUPPORT
    EOLIAN_TYPE_BUILTIN_LIST,
 #else
-   // Placeholder when using release API only. Done to prevent offseting the value below.
+   // Placeholder when using release API only. Done to prevent offsetting the value below.
    EOLIAN_TYPE_BUILTIN_BETA_PLACEHOLDER1,
 #endif
 
@@ -906,7 +906,7 @@ EAPI Eina_Bool eolian_state_all_eot_files_parse(Eolian_State *state);
 /*
  * @brief Perform additional checks on the state.
  *
- * This funciton performs additional checks that aren't crucial for the
+ * This function performs additional checks that aren't crucial for the
  * database integrity (that's checked as a part of the regular parse process,
  * so the database is guaranteed to be valid), but are important for proper
  * correctness. It is recommended that all available .eot and .eo files are
@@ -1553,7 +1553,7 @@ EAPI const Eolian_Class *eolian_class_parent_get(const Eolian_Class *klass);
 /*
  * @brief Returns an iterator to the required classes of this mixin
  *
- * For none mixins this will return an empty iterator, for mixins this retuns a iterator that
+ * For none mixins this will return an empty iterator, for mixins this returns a iterator that
  * carries all the classes that are required by this passed mixin.
  *
  * @param[in] klass the class

src/lib/evas/canvas/evas_clip.c

@@ -58,7 +58,7 @@ evas_object_recalc_clippees(Evas_Object_Protected_Data *obj)
  * or any change in clipper of an object or any change in smart object
  * membership needs to walk the obj tree both up and down from the changed
  * object and probably walk entire object trees to find these and mark them.
- * thats silly-expensive and i was about to fix it that way but it has since
+ * that's silly-expensive and i was about to fix it that way but it has since
  * dawned on me that that is just going to kill performance in some critical
  * areas like during object setup and manipulation, as well as teardown.
  *

src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c

@@ -2714,6 +2714,11 @@ _wl_selection_receive(void *data, int type EINA_UNUSED, void *event)
    Ecore_Wl2_Event_Offer_Data_Ready *ready = event;
    Ecore_Evas_Selection_Buffer selection = ECORE_EVAS_SELECTION_BUFFER_LAST;
 
+   if ((!ready->data) || (ready->len < 1))
+     {
+        ERR("no se;lection data");
+        return ECORE_CALLBACK_PASS_ON;
+     }
    for (int i = 0; i < ECORE_EVAS_SELECTION_BUFFER_LAST; ++i)
      {
         if (wdata->selection_data[i].offer == ready->offer)

src/modules/evas/vg_loaders/svg/evas_vg_load_svg.c

@@ -773,7 +773,7 @@ _attr_parse_svg_node(void *data, const char *key, const char *value)
    Svg_Doc_Node *doc = &(node->node.doc);
    Svg_Length_Type type;
 
-   // @TODO handle lenght unit.
+   // @TODO handle length unit.
    if (!strcmp(key, "width"))
      {
         doc->width = parse_length(value, &type);

src/tests/efl_mono/EinaTestData.cs

@@ -99,7 +99,7 @@ public static class BaseData
         [ CallerMemberName ] string member = null) {
         Contract.Requires(a != null, nameof(a));
         Contract.Requires(b != null, nameof(b));
-        Test.Assert(a.Length == b.Length, "Different lenght", line, file, member);
+        Test.Assert(a.Length == b.Length, "Different length", line, file, member);
         for (int i = 0; i < a.Length; ++i)
         {
             int av = a[i].Number;

src/tests/eina/eina_test_file.c

@@ -490,7 +490,29 @@ static void *
 _eina_test_file_thread(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
 {
 #ifdef _WIN32
-   const char *filename = "cmd.exe";
+   char filename[MAX_PATH];
+   size_t len;
+   const char test_file[] = "cmd.exe";
+
+   fail_if(!GetSystemDirectoryA(filename, MAX_PATH));
+
+   len = strlen(filename);
+
+   /*
+    * Check the buffer size.
+    * The system path length + path separator + length of the test_file + null terminator
+    * Must fit in MAX_PATH.
+    */
+   fail_if(MAX_PATH < len + 1 + sizeof(test_file));
+
+   // append trailing directory separator if there isn't one
+   if (filename[len - 1] != '\\' && filename[len - 1] != '/')
+     {
+         filename[len] = '\\';
+         filename[len + 1] = '\0';
+     }
+
+   strncat(filename, test_file, MAX_PATH - len - 2);
 #else
    const char *filename = "/bin/sh";
 #endif