From 3e99fcc865e240fb4f34dc2fdb57a88842b51c5c Mon Sep 17 00:00:00 2001
From: Takuro Ashie <ashie@clear-code.com>
Date: Fri, 15 Apr 2022 14:33:57 +0900
Subject: [PATCH] Win32: Cosmetic changes

* Remove a needless local variable
* Shorten long lines
---
 src/win32_window.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/win32_window.c b/src/win32_window.c
index 1c637aa9..7bb6fada 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -546,35 +546,36 @@ static void _win32ChangeCursorPosition(HIMC hIMC, _GLFWwindow* window)
 
 static GLFWbool getImmPreedit(_GLFWwindow* window)
 {
-    HWND hWnd = window->win32.handle;
-    HIMC hIMC = ImmGetContext(hWnd);
+    HIMC hIMC = ImmGetContext(window->win32.handle);
     // get preedit data sizes
-    LONG preeditTextLength = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0);
-    LONG attrLength = ImmGetCompositionStringW(hIMC, GCS_COMPATTR, NULL, 0);
-    LONG clauseLength = ImmGetCompositionStringW(hIMC, GCS_COMPCLAUSE, NULL, 0);
+    LONG preeditBytes = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0);
+    LONG attrBytes = ImmGetCompositionStringW(hIMC, GCS_COMPATTR, NULL, 0);
+    LONG clauseBytes = ImmGetCompositionStringW(hIMC, GCS_COMPCLAUSE, NULL, 0);
 
-    if (preeditTextLength > 0)
+    if (preeditBytes > 0)
     {
         int i;
         int ctext = window->ctext;
         int cblocks = window->cblocks;
         int focusedBlock = 0;
-        int length = preeditTextLength / sizeof(WCHAR);
-        LPWSTR buffer = (LPWSTR) _glfw_calloc(preeditTextLength, 1);
-        LPSTR attributes = (LPSTR) _glfw_calloc(attrLength, 1);
-        DWORD *clauses = (DWORD*) _glfw_calloc(clauseLength, 1);
+        int length = preeditBytes / sizeof(WCHAR);
+        LPWSTR buffer = (LPWSTR) _glfw_calloc(preeditBytes, 1);
+        LPSTR attributes = (LPSTR) _glfw_calloc(attrBytes, 1);
+        DWORD *clauses = (DWORD*) _glfw_calloc(clauseBytes, 1);
 
         // get preedit data
-        ImmGetCompositionStringW(hIMC, GCS_COMPSTR, buffer, preeditTextLength);
-        ImmGetCompositionStringW(hIMC, GCS_COMPATTR, attributes, attrLength);
-        ImmGetCompositionStringW(hIMC, GCS_COMPCLAUSE, clauses, clauseLength);
+        ImmGetCompositionStringW(hIMC, GCS_COMPSTR, buffer, preeditBytes);
+        ImmGetCompositionStringW(hIMC, GCS_COMPATTR, attributes, attrBytes);
+        ImmGetCompositionStringW(hIMC, GCS_COMPCLAUSE, clauses, clauseBytes);
 
         // store preedit text
         while (ctext < length + 1)
             ctext = (ctext == 0) ? 1 : ctext * 2;
         if (ctext != window->ctext)
         {
-            unsigned int* preeditText = _glfw_realloc(window->preeditText, sizeof(unsigned int) * ctext);
+            size_t bufsize = sizeof(unsigned int) * ctext;
+            unsigned int* preeditText = _glfw_realloc(window->preeditText,
+                                                      bufsize);
 
             if (preeditText == NULL)
             {
@@ -592,7 +593,7 @@ static GLFWbool getImmPreedit(_GLFWwindow* window)
             window->preeditText[i] = buffer[i];
 
         // store blocks
-        window->nblocks = clauseLength / sizeof(DWORD) - 1;
+        window->nblocks = clauseBytes / sizeof(DWORD) - 1;
         // last element of clauses is a block count, but
         // text length is convenient.
         clauses[window->nblocks] = length;
@@ -600,7 +601,9 @@ static GLFWbool getImmPreedit(_GLFWwindow* window)
             cblocks = (cblocks == 0) ? 1 : cblocks * 2;
         if (cblocks != window->cblocks)
         {
-            int* blocks = _glfw_realloc(window->preeditAttributeBlocks, sizeof(int) * cblocks);
+            size_t bufsize = sizeof(int) * cblocks;
+            int* blocks = _glfw_realloc(window->preeditAttributeBlocks,
+                                        bufsize);
 
             if (blocks == NULL)
             {
@@ -627,7 +630,7 @@ static GLFWbool getImmPreedit(_GLFWwindow* window)
         _win32ChangeCursorPosition(hIMC, window);
     }
 
-    ImmReleaseContext(hWnd, hIMC);
+    ImmReleaseContext(window->win32.handle, hIMC);
     return GLFW_TRUE;
 }