wayland: Fix elementary setting window parents at creation time

Summary:
We need to pass the entire pointer, not just 32-bits of it.

Fixes a crash with enlightenment sandbox gadgets where
ecore_wl2_window_alpha_get() is called with an invalid pointer while
trying to display a pop-up.

Reviewers: zmike, devilhorns

Reviewed By: zmike, devilhorns

Subscribers: devilhorns, cedric, #reviewers, #committers, zmike

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6775

2 files changed, 58 insertions, 3 deletions

diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 004896de90..cce53df4e9 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -4,6 +4,7 @@
 
 #define ECORE_EVAS_INTERNAL
 #define EFL_INPUT_EVENT_PROTECTED
+#define IPA_YLNO_ESU_LANRETNI_MLE
 
 #include <stdlib.h>
 #include <string.h>
@@ -4339,14 +4340,16 @@ ecore_evas_wayland_shm_new(const char *disp_name, unsigned int parent,
                            int x, int y, int w, int h, Eina_Bool frame)
 {
    Ecore_Evas *ee;
-   Ecore_Evas *(*new)(const char *, unsigned int, int, int, int, int, Eina_Bool);
+   Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool);
    Eina_Module *m = _ecore_evas_engine_load("wayland");
    EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
 
    new = eina_module_symbol_get(m, "ecore_evas_wayland_shm_new_internal");
    EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
 
-   ee = new(disp_name, parent, x, y, w, h, frame);
+   if (parent) ERR("Wayland windows with parents not supported through legacy API");
+
+   ee = new(disp_name, 0, x, y, w, h, frame);
    if (!_ecore_evas_cursors_init(ee))
      {
         ecore_evas_free(ee);
@@ -4360,7 +4363,51 @@ ecore_evas_wayland_egl_new(const char *disp_name, unsigned int parent,
                            int x, int y, int w, int h, Eina_Bool frame)
 {
    Ecore_Evas *ee;
-   Ecore_Evas *(*new)(const char *, unsigned int, int, int, int, int, Eina_Bool);
+   Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool);
+   Eina_Module *m = _ecore_evas_engine_load("wayland");
+   EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
+
+   new = eina_module_symbol_get(m, "ecore_evas_wayland_egl_new_internal");
+   EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
+
+   if (parent) ERR("Wayland windows with parents not supported through legacy API");
+
+   ee = new(disp_name, 0, x, y, w, h, frame);
+   if (!_ecore_evas_cursors_init(ee))
+     {
+        ecore_evas_free(ee);
+        return NULL;
+     }
+   return ee;
+}
+
+Ecore_Evas *
+_wayland_shm_new(const char *disp_name, Ecore_Window parent,
+                 int x, int y, int w, int h, Eina_Bool frame)
+{
+   Ecore_Evas *ee;
+   Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool);
+   Eina_Module *m = _ecore_evas_engine_load("wayland");
+   EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
+
+   new = eina_module_symbol_get(m, "ecore_evas_wayland_shm_new_internal");
+   EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
+
+   ee = new(disp_name, parent, x, y, w, h, frame);
+   if (!_ecore_evas_cursors_init(ee))
+     {
+        ecore_evas_free(ee);
+        return NULL;
+     }
+   return ee;
+}
+
+Ecore_Evas *
+_wayland_egl_new(const char *disp_name, Ecore_Window parent,
+                 int x, int y, int w, int h, Eina_Bool frame)
+{
+   Ecore_Evas *ee;
+   Ecore_Evas *(*new)(const char *, Ecore_Window, int, int, int, int, Eina_Bool);
    Eina_Module *m = _ecore_evas_engine_load("wayland");
    EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
 
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index c419699296..c9f158ee9b 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -490,6 +490,14 @@ EAPI Eina_Bool ecore_evas_render(Ecore_Evas *ee);
 EAPI Evas *ecore_evas_evas_new(Ecore_Evas *ee, int w, int h);
 EAPI void ecore_evas_done(Ecore_Evas *ee, Eina_Bool single_window);
 
+#ifdef IPA_YLNO_ESU_LANRETNI_MLE
+EAPI Ecore_Evas *_wayland_shm_new(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame);
+EAPI Ecore_Evas *_wayland_egl_new(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame);
+#else
+#define _wayland_shm_new DONT_USE_INTERNAL_API
+#define _wayland_egl_new DONT_USE_INTERNAL_API
+#endif
+
 static inline Eina_Bool
 ecore_evas_render_prepare(Ecore_Evas *ee)
 {