From c0c9764afea4a14440835dd123e491454f0422f8 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 25 Dec 2017 07:36:49 +0100
Subject: [PATCH] Update

---
 gfx/common/x11_common.c              | 22 +++++++++++-----------
 gfx/display_servers/dispserv_win32.c | 13 ++++++++-----
 gfx/display_servers/dispserv_x11.c   | 11 +++++++----
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 75095a5c2a..d3f4d72eb1 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -109,7 +109,7 @@ void x11_show_mouse(Display *dpy, Window win, bool state)
 
 void x11_windowed_fullscreen(Display *dpy, Window win)
 {
-   XEvent xev = {0};
+   XEvent xev                 = {0};
 
    XA_NET_WM_STATE            = XInternAtom(dpy, "_NET_WM_STATE", False);
    XA_NET_WM_STATE_FULLSCREEN = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
@@ -132,7 +132,7 @@ void x11_windowed_fullscreen(Display *dpy, Window win)
 void x11_move_window(Display *dpy, Window win, int x, int y,
       unsigned width, unsigned height)
 {
-   XEvent xev = {0};
+   XEvent xev               = {0};
 
    XA_NET_MOVERESIZE_WINDOW = XInternAtom(dpy, "_NET_MOVERESIZE_WINDOW", False);
 
@@ -162,9 +162,9 @@ static void x11_set_window_class(Display *dpy, Window win)
 
 static void x11_set_window_pid(Display *dpy, Window win)
 {
-    long scret;
-    char *hostname;
-    pid_t pid = getpid();
+    long scret     = 0;
+    char *hostname = NULL;
+    pid_t pid      = getpid();
 
     XChangeProperty(dpy, win, XInternAtom(dpy, "_NET_WM_PID", False),
         XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&pid, 1);
@@ -238,9 +238,9 @@ static bool get_video_mode(video_frame_info_t *video_info,
       Display *dpy, unsigned width, unsigned height,
       XF86VidModeModeInfo *mode, XF86VidModeModeInfo *desktop_mode)
 {
-   float refresh_mod;
    int i, num_modes            = 0;
    bool ret                    = false;
+   float refresh_mod           = 0.0f;
    float minimum_fps_diff      = 0.0f;
    XF86VidModeModeInfo **modes = NULL;
 
@@ -386,15 +386,15 @@ bool x11_get_metrics(void *data,
 static void x11_handle_key_event(XEvent *event, XIC ic, bool filter)
 {
    int i;
-   unsigned key;
    uint32_t chars[32];
+   unsigned key   = 0;
    uint16_t mod   = 0;
    unsigned state = event->xkey.state;
-   bool down     = event->type == KeyPress;
-   int num       = 0;
-   KeySym keysym = 0;
+   bool down      = event->type == KeyPress;
+   int num        = 0;
+   KeySym keysym  = 0;
 
-   chars[0] = '\0';
+   chars[0]       = '\0';
 
    if (!filter)
    {
diff --git a/gfx/display_servers/dispserv_win32.c b/gfx/display_servers/dispserv_win32.c
index 8165d9e3bf..82272a9e6a 100644
--- a/gfx/display_servers/dispserv_win32.c
+++ b/gfx/display_servers/dispserv_win32.c
@@ -28,6 +28,9 @@ static void* win32_display_server_init(void)
 {
    dispserv_win32_t *dispserv = (dispserv_win32_t*)calloc(1, sizeof(*dispserv));
 
+   if (!dispserv)
+      return NULL;
+
    return dispserv;
 }
 
@@ -38,17 +41,17 @@ static void win32_display_server_destroy(void)
 
 static bool win32_set_window_opacity(void *data, unsigned opacity)
 {
-   HWND hwnd = win32_get_window();
+   HWND              hwnd = win32_get_window();
    dispserv_win32_t *serv = (dispserv_win32_t*)data;
 
-   serv->opacity = opacity;
+   serv->opacity          = opacity;
 
 #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500
    /* Set window transparency on Windows 2000 and above */
-   return SetLayeredWindowAttributes(hwnd, 0, (255 * opacity) / 100, LWA_ALPHA);
-#else
-   return false;
+   if (SetLayeredWindowAttributes(hwnd, 0, (255 * opacity) / 100, LWA_ALPHA))
+      return true;
 #endif
+   return false;
 }
 
 const video_display_server_t dispserv_win32 = {
diff --git a/gfx/display_servers/dispserv_x11.c b/gfx/display_servers/dispserv_x11.c
index 1d53ca9052..8fa795537a 100644
--- a/gfx/display_servers/dispserv_x11.c
+++ b/gfx/display_servers/dispserv_x11.c
@@ -28,6 +28,9 @@ static void* x11_display_server_init(void)
 {
    dispserv_x11_t *dispserv = (dispserv_x11_t*)calloc(1, sizeof(*dispserv));
 
+   if (!dispserv)
+      return NULL;
+
    return dispserv;
 }
 
@@ -39,13 +42,13 @@ static void x11_display_server_destroy(void)
 static bool x11_set_window_opacity(void *data, unsigned opacity)
 {
    dispserv_x11_t *serv = (dispserv_x11_t*)data;
-   Atom net_wm_opacity = XInternAtom(g_x11_dpy, "_NET_WM_WINDOW_OPACITY", False);
-   Atom cardinal = XInternAtom(g_x11_dpy, "CARDINAL", False);
+   Atom net_wm_opacity  = XInternAtom(g_x11_dpy, "_NET_WM_WINDOW_OPACITY", False);
+   Atom cardinal        = XInternAtom(g_x11_dpy, "CARDINAL", False);
    settings_t *settings = config_get_ptr();
 
-   serv->opacity = opacity;
+   serv->opacity        = opacity;
 
-   opacity = opacity * ((unsigned)-1 / 100.0);
+   opacity              = opacity * ((unsigned)-1 / 100.0);
 
    if (opacity == (unsigned)-1)
       XDeleteProperty(g_x11_dpy, g_x11_win, net_wm_opacity);