Fix some stylistic issues with the windows unicode code.

SiegeLord · SiegeLord · commit 15e370280d8e · 2019-04-15T04:18:17.000-07:00
diff --git a/src/win/wgl_disp.c b/src/win/wgl_disp.c
@@ -427,8 +427,7 @@ static ALLEGRO_EXTRA_DISPLAY_SETTINGS* read_pixel_format_old(int fmt, HDC dc)
 
    result = DescribePixelFormat(dc, fmt+1, sizeof(pfd), &pfd);
    if (!result) {
-      ALLEGRO_WARN("DescribePixelFormat() failed. %s\n",
-		  _al_win_last_error());
+      ALLEGRO_WARN("DescribePixelFormat() failed. %s\n", _al_win_last_error());
       return NULL;
    }
 
@@ -514,8 +513,7 @@ static ALLEGRO_EXTRA_DISPLAY_SETTINGS* read_pixel_format_ext(int fmt, HDC dc)
    }
 
    if (!ret) {
-      ALLEGRO_ERROR("wglGetPixelFormatAttrib failed! %s\n",
-		  _al_win_last_error());
+      ALLEGRO_ERROR("wglGetPixelFormatAttrib failed! %s\n", _al_win_last_error());
       al_free(value);
       return NULL;
    }
@@ -616,8 +614,7 @@ static bool change_display_mode(ALLEGRO_DISPLAY *d)
    result = ChangeDisplaySettingsEx(dev_name, &dm, NULL, CDS_FULLSCREEN, 0);
 
    if (result != DISP_CHANGE_SUCCESSFUL) {
-      ALLEGRO_ERROR("Unable to set mode. %s\n",
-		  _al_win_last_error());
+      ALLEGRO_ERROR("Unable to set mode. %s\n", _al_win_last_error());
       return false;
    }
 
@@ -859,15 +856,13 @@ static bool select_pixel_format(ALLEGRO_DISPLAY_WGL *d, HDC dc)
          break;
       }
       else {
-         ALLEGRO_WARN("Unable to set pixel format! %s\n",
-			 _al_win_last_error());
+         ALLEGRO_WARN("Unable to set pixel format! %s\n", _al_win_last_error());
          ALLEGRO_WARN("Trying next one.\n");
       }
    }
 
    if (i == eds_count) {
-      ALLEGRO_ERROR("Unable to set any pixel format! %s\n",
-		  _al_win_last_error());
+      ALLEGRO_ERROR("Unable to set any pixel format! %s\n", _al_win_last_error());
       for (i = 0; i < eds_count; i++)
          al_free(eds[i]);
       al_free(eds);
@@ -947,16 +942,14 @@ static bool create_display_internals(ALLEGRO_DISPLAY_WGL *wgl_disp)
    }
 
    if (!wgl_disp->glrc) {
-      ALLEGRO_ERROR("Unable to create a render context! %s\n",
-		  _al_win_last_error());
+      ALLEGRO_ERROR("Unable to create a render context! %s\n", _al_win_last_error());
       destroy_display_internals(wgl_disp);
       return false;
    }
 
    /* make the context the current one */
    if (!wglMakeCurrent(wgl_disp->dc, wgl_disp->glrc)) {
-      ALLEGRO_ERROR("Unable to make the context current! %s\n",
-		  _al_win_last_error());
+      ALLEGRO_ERROR("Unable to make the context current! %s\n", _al_win_last_error());
       destroy_display_internals(wgl_disp);
       return false;
    }
@@ -1161,8 +1154,7 @@ static void wgl_unset_current_display(ALLEGRO_DISPLAY *d)
    (void)d;
 
    if (!wglMakeCurrent(NULL, NULL)) {
-      ALLEGRO_ERROR("Unable unset the current context! %s\n",
-		  _al_win_last_error());
+      ALLEGRO_ERROR("Unable unset the current context! %s\n", _al_win_last_error());
    }
 }
 
diff --git a/src/win/wjoydxnu.cpp b/src/win/wjoydxnu.cpp
@@ -605,7 +605,7 @@ static void fill_joystick_info_using_caps_and_names(ALLEGRO_JOYSTICK_DIRECTX *jo
          N_AXIS++;
       }
 
-      info->stick[N_STICK].name = ADD_STRING(0, default_name_stick);
+      info->stick[N_STICK].name = ADD_STRING(NULL, default_name_stick);
       N_STICK++;
    }
 
@@ -635,15 +635,15 @@ static void fill_joystick_info_using_caps_and_names(ALLEGRO_JOYSTICK_DIRECTX *jo
          N_AXIS++;
       }
 
-      info->stick[N_STICK].name = ADD_STRING(0, default_name_stick);
+      info->stick[N_STICK].name = ADD_STRING(NULL, default_name_stick);
       N_STICK++;
    }
 
    /* sliders are assigned to one stick each */
    for (i = 0; i < can->num_sliders; i++) {
       info->stick[N_STICK].flags = ALLEGRO_JOYFLAG_DIGITAL | ALLEGRO_JOYFLAG_ANALOGUE;
       info->stick[N_STICK].num_axes = 1;
-      info->stick[N_STICK].axis[0].name = ADD_STRING(0, "axis");
+      info->stick[N_STICK].axis[0].name = ADD_STRING(NULL, "axis");
       info->stick[N_STICK].name = ADD_STRING(can->name_slider[i], default_name_slider);
       joy->slider_mapping[i].stick = N_STICK;
       joy->slider_mapping[i].axis  = 0;
@@ -654,8 +654,8 @@ static void fill_joystick_info_using_caps_and_names(ALLEGRO_JOYSTICK_DIRECTX *jo
    for (i = 0; i < can->num_povs; i++) {
       info->stick[N_STICK].flags = ALLEGRO_JOYFLAG_DIGITAL;
       info->stick[N_STICK].num_axes = 2;
-      info->stick[N_STICK].axis[0].name = ADD_STRING(0, "left/right");
-      info->stick[N_STICK].axis[1].name = ADD_STRING(0, "up/down");
+      info->stick[N_STICK].axis[0].name = ADD_STRING(NULL, "left/right");
+      info->stick[N_STICK].axis[1].name = ADD_STRING(NULL, "up/down");
       info->stick[N_STICK].name = ADD_STRING(can->name_pov[i], default_name_hat);
       joy->pov_mapping_stick[i] = N_STICK;
       N_STICK++;
@@ -687,15 +687,15 @@ static void fill_joystick_info_using_caps_and_names(ALLEGRO_JOYSTICK_DIRECTX *jo
       info->stick[2].axis[1].name = info->stick[1].axis[1].name = info->stick[0].axis[1].name;
 
       /* first four button names contained junk; replace with valid strings */
-      info->button[ 0].name = ADD_STRING(0, "Triangle");
-      info->button[ 1].name = ADD_STRING(0, "Circle");
-      info->button[ 2].name = ADD_STRING(0, "X");
-      info->button[ 3].name = ADD_STRING(0, "Square");
+      info->button[ 0].name = ADD_STRING(NULL, "Triangle");
+      info->button[ 1].name = ADD_STRING(NULL, "Circle");
+      info->button[ 2].name = ADD_STRING(NULL, "X");
+      info->button[ 3].name = ADD_STRING(NULL, "Square");
 
       /* while we're at it, give these controls more sensible names, too */
-      info->stick[0].name = ADD_STRING(0, "[L-stick] or D-pad");
-      info->stick[1].name = ADD_STRING(0, "[R-stick]");
-      info->stick[2].name = ADD_STRING(0, "[D-pad]");
+      info->stick[0].name = ADD_STRING(NULL, "[L-stick] or D-pad");
+      info->stick[1].name = ADD_STRING(NULL, "[R-stick]");
+      info->stick[2].name = ADD_STRING(NULL, "[D-pad]");
    }
 
 #undef N_AXIS
diff --git a/src/win/wsystem.c b/src/win/wsystem.c
@@ -926,25 +926,25 @@ void _al_register_system_interfaces()
 }
 
 const char* _al_win_error(DWORD err) {
-	LPTSTR msg = NULL;
-	int len;
-	static char buf[2048];
-
-	len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, err, 0, (LPTSTR)&msg, 0, NULL);
-	if (len == 0) {
-		_al_sane_strncpy(buf, "(Unable to decode the error code)", sizeof(buf));
-	}
-	else {
-		/* Truncate trailing CRLF if it has one */
-		if (len >= 2 && _tcscmp(msg + len - 2, TEXT("\r\n")) == 0) {
-			msg[len - 2] = (TCHAR)0;
-		}
-		_twin_copy_tchar_to_utf8(buf, msg, sizeof(buf));
-		LocalFree(msg);
-	}
-	return buf;
+   LPTSTR msg = NULL;
+   int len;
+   static char buf[2048];
+
+   len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, err, 0, (LPTSTR)&msg, 0, NULL);
+   if (len == 0) {
+      _al_sane_strncpy(buf, "(Unable to decode the error code)", sizeof(buf));
+   }
+   else {
+      /* Truncate trailing CRLF if it has one */
+      if (len >= 2 && _tcscmp(msg + len - 2, TEXT("\r\n")) == 0) {
+         msg[len - 2] = (TCHAR)0;
+      }
+      _twin_copy_tchar_to_utf8(buf, msg, sizeof(buf));
+      LocalFree(msg);
+   }
+   return buf;
 }
 const char* _al_win_last_error() {
-	return _al_win_error(GetLastError());
+   return _al_win_error(GetLastError());
 }
 /* vim: set sts=3 sw=3 et: */
diff --git a/src/win/wtouch_input.c b/src/win/wtouch_input.c
@@ -210,11 +210,11 @@ static bool init_touch_input(void)
       bool r;
       ALLEGRO_DISPLAY_WIN *win_display = *((ALLEGRO_DISPLAY_WIN**)_al_vector_ref(&system->displays, i));
       r = _al_win_register_touch_window(win_display->window, 0);
-	  ALLEGRO_INFO("registering touch window %p: %d\n", win_display, r);
-	  if (!r) {
-		 ALLEGRO_ERROR("RegisterTouchWindow failed: %s\n", _al_win_last_error());
-	     return false;
-	  }
+      ALLEGRO_INFO("registering touch window %p: %d\n", win_display, r);
+      if (!r) {
+         ALLEGRO_ERROR("RegisterTouchWindow failed: %s\n", _al_win_last_error());
+         return false;
+      }
    }
 
    return true;

Original file line number	Diff line number	Diff line change
`@@ -427,8 +427,7 @@ static ALLEGRO_EXTRA_DISPLAY_SETTINGS* read_pixel_format_old(int fmt, HDC dc)`
`427`	`427`
`428`	`428`	`result = DescribePixelFormat(dc, fmt+1, sizeof(pfd), &pfd);`
`429`	`429`	`if (!result) {`
`430`		`- ALLEGRO_WARN("DescribePixelFormat() failed. %s\n",`
`431`		`- _al_win_last_error());`
	`430`	`+ ALLEGRO_WARN("DescribePixelFormat() failed. %s\n", _al_win_last_error());`
`432`	`431`	`return NULL;`
`433`	`432`	`}`
`434`	`433`
`@@ -514,8 +513,7 @@ static ALLEGRO_EXTRA_DISPLAY_SETTINGS* read_pixel_format_ext(int fmt, HDC dc)`
`514`	`513`	`}`
`515`	`514`
`516`	`515`	`if (!ret) {`
`517`		`- ALLEGRO_ERROR("wglGetPixelFormatAttrib failed! %s\n",`
`518`		`- _al_win_last_error());`
	`516`	`+ ALLEGRO_ERROR("wglGetPixelFormatAttrib failed! %s\n", _al_win_last_error());`
`519`	`517`	`al_free(value);`
`520`	`518`	`return NULL;`
`521`	`519`	`}`
`@@ -616,8 +614,7 @@ static bool change_display_mode(ALLEGRO_DISPLAY *d)`
`616`	`614`	`result = ChangeDisplaySettingsEx(dev_name, &dm, NULL, CDS_FULLSCREEN, 0);`
`617`	`615`
`618`	`616`	`if (result != DISP_CHANGE_SUCCESSFUL) {`
`619`		`- ALLEGRO_ERROR("Unable to set mode. %s\n",`
`620`		`- _al_win_last_error());`
	`617`	`+ ALLEGRO_ERROR("Unable to set mode. %s\n", _al_win_last_error());`
`621`	`618`	`return false;`
`622`	`619`	`}`
`623`	`620`
`@@ -859,15 +856,13 @@ static bool select_pixel_format(ALLEGRO_DISPLAY_WGL *d, HDC dc)`
`859`	`856`	`break;`
`860`	`857`	`}`
`861`	`858`	`else {`
`862`		`- ALLEGRO_WARN("Unable to set pixel format! %s\n",`
`863`		`- _al_win_last_error());`
	`859`	`+ ALLEGRO_WARN("Unable to set pixel format! %s\n", _al_win_last_error());`
`864`	`860`	`ALLEGRO_WARN("Trying next one.\n");`
`865`	`861`	`}`
`866`	`862`	`}`
`867`	`863`
`868`	`864`	`if (i == eds_count) {`
`869`		`- ALLEGRO_ERROR("Unable to set any pixel format! %s\n",`
`870`		`- _al_win_last_error());`
	`865`	`+ ALLEGRO_ERROR("Unable to set any pixel format! %s\n", _al_win_last_error());`
`871`	`866`	`for (i = 0; i < eds_count; i++)`
`872`	`867`	`al_free(eds[i]);`
`873`	`868`	`al_free(eds);`
`@@ -947,16 +942,14 @@ static bool create_display_internals(ALLEGRO_DISPLAY_WGL *wgl_disp)`
`947`	`942`	`}`
`948`	`943`
`949`	`944`	`if (!wgl_disp->glrc) {`
`950`		`- ALLEGRO_ERROR("Unable to create a render context! %s\n",`
`951`		`- _al_win_last_error());`
	`945`	`+ ALLEGRO_ERROR("Unable to create a render context! %s\n", _al_win_last_error());`
`952`	`946`	`destroy_display_internals(wgl_disp);`
`953`	`947`	`return false;`
`954`	`948`	`}`
`955`	`949`
`956`	`950`	`/* make the context the current one */`
`957`	`951`	`if (!wglMakeCurrent(wgl_disp->dc, wgl_disp->glrc)) {`
`958`		`- ALLEGRO_ERROR("Unable to make the context current! %s\n",`
`959`		`- _al_win_last_error());`
	`952`	`+ ALLEGRO_ERROR("Unable to make the context current! %s\n", _al_win_last_error());`
`960`	`953`	`destroy_display_internals(wgl_disp);`
`961`	`954`	`return false;`
`962`	`955`	`}`
`@@ -1161,8 +1154,7 @@ static void wgl_unset_current_display(ALLEGRO_DISPLAY *d)`
`1161`	`1154`	`(void)d;`
`1162`	`1155`
`1163`	`1156`	`if (!wglMakeCurrent(NULL, NULL)) {`
`1164`		`- ALLEGRO_ERROR("Unable unset the current context! %s\n",`
`1165`		`- _al_win_last_error());`
	`1157`	`+ ALLEGRO_ERROR("Unable unset the current context! %s\n", _al_win_last_error());`
`1166`	`1158`	`}`
`1167`	`1159`	`}`
`1168`	`1160`