From 8d30b904a77ba4393d48a12de7bc8c081852a525 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 1 Oct 2002 18:59:45 +0000
Subject: [PATCH] Logging should work well now

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1256 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/nsExec/nsexec.c | 369 +++++++++++++++++++++-------------------
 1 file changed, 194 insertions(+), 175 deletions(-)

diff --git a/Contrib/nsExec/nsexec.c b/Contrib/nsExec/nsexec.c
index 4277798a..ec4195f0 100644
--- a/Contrib/nsExec/nsexec.c
+++ b/Contrib/nsExec/nsexec.c
@@ -12,179 +12,198 @@
 #define LOOPTIMEOUT 100
 
 HINSTANCE   g_hInstance;
-HWND        g_hwndParent;
-HWND        g_hwndList;
-HWND        g_hwndDlg;
-char *      g_exec;
-char *      g_szto;
-BOOL        g_foundto;
-int         g_to;
+HWND    g_hwndParent;
+HWND    g_hwndList;
+HWND    g_hwndDlg;
+char *    g_exec;
+char *    g_szto;
+BOOL    g_foundto;
+int     g_to;
 
 
 void ExecScript(BOOL log);
-int LogMessages(const char *pStr);
-int LogMessage(const char *pStr);
+void LogMessages(const char *pStr);
+void LogMessage(const char *pStr);
 char *my_strstr(const char *string, const char *strCharSet);
 int my_atoi(char *s);
 
 void __declspec(dllexport) Exec(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) {
-    g_hwndParent=hwndParent;
-    EXDLL_INIT();
-    {
-        ExecScript(false);
-    }
+  g_hwndParent=hwndParent;
+  EXDLL_INIT();
+  {
+    ExecScript(false);
+  }
 }
 
 void __declspec(dllexport) ExecToLog(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) {
-    g_hwndParent=hwndParent;
-    EXDLL_INIT();
-    {
-        ExecScript(true);
-    }
+  g_hwndParent=hwndParent;
+  EXDLL_INIT();
+  {
+    ExecScript(true);
+  }
 }
 
 BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) {
-    g_hInstance=hInst;
-    return TRUE;
+  g_hInstance=hInst;
+  return TRUE;
 }
 
 void ExecScript(BOOL log) {
-    g_to = TIMEOUT;
-    g_foundto = FALSE;
-    g_hwndDlg = FindWindowEx(g_hwndParent,NULL,"#32770",NULL);
-    g_hwndList = FindWindowEx(g_hwndDlg,NULL,"SysListView32",NULL);
-    g_exec = (char *)GlobalAlloc(GPTR, sizeof(char)*g_stringsize+1);
-    g_szto = (char *)GlobalAlloc(GPTR, sizeof(char)*g_stringsize+1);
-    if (!popstring(g_szto)) {
-        if (my_strstr(g_szto,"/TIMEOUT=")) {
-            g_szto += 9;
-            g_to = my_atoi(g_szto);
-            if (g_to<0) g_to = TIMEOUT;
-            g_foundto = TRUE;
-        }
+  g_to = TIMEOUT;
+  g_foundto = FALSE;
+  g_hwndDlg = FindWindowEx(g_hwndParent,NULL,"#32770",NULL);
+  g_hwndList = FindWindowEx(g_hwndDlg,NULL,"SysListView32",NULL);
+  g_exec = (char *)GlobalAlloc(GPTR, sizeof(char)*g_stringsize+1);
+  g_szto = (char *)GlobalAlloc(GPTR, sizeof(char)*g_stringsize+1);
+  if (!popstring(g_szto)) {
+    if (my_strstr(g_szto,"/TIMEOUT=")) {
+      g_szto += 9;
+      g_to = my_atoi(g_szto);
+      if (g_to<0) g_to = TIMEOUT;
+      g_foundto = TRUE;
     }
-    if (g_foundto) {
-        if (popstring(g_exec)) {
-            pushstring("error");
-            return;
-        }
+  }
+  if (g_foundto) {
+    if (popstring(g_exec)) {
+      pushstring("error");
+      return;
     }
-    else {
-        lstrcpy(g_exec,g_szto);
-    }
-    {
-        STARTUPINFO si={sizeof(si),};
-        SECURITY_ATTRIBUTES sa={sizeof(sa),};
-        SECURITY_DESCRIPTOR sd={0,};
-        PROCESS_INFORMATION pi={0,};
-        OSVERSIONINFO osv={sizeof(osv)};
-        HANDLE newstdout=0,read_stdout=0;
-        DWORD dwRead = 1;
-        DWORD dwExit = !STILL_ACTIVE;
-        static char szBuf[1024];
-        static char szBufTmp[4096];
-        static char szRet[128];
-        szBufTmp[0]=0;
-        GetVersionEx(&osv);
-        if (osv.dwPlatformId == VER_PLATFORM_WIN32_NT) {
-            InitializeSecurityDescriptor(&sd,SECURITY_DESCRIPTOR_REVISION);
-            SetSecurityDescriptorDacl(&sd,true,NULL,false);
-            sa.lpSecurityDescriptor = &sd;
-        }
-        else sa.lpSecurityDescriptor = NULL;
-        sa.bInheritHandle = true;
-        if (!CreatePipe(&read_stdout,&newstdout,&sa,0)) {
-            pushstring("error");
-            return;
-        }
-        GetStartupInfo(&si);
-        si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
-        si.wShowWindow = SW_HIDE;
-        si.hStdOutput = newstdout;
-        si.hStdError = newstdout;
-        if (!CreateProcess(NULL,g_exec,NULL,NULL,TRUE,CREATE_NEW_CONSOLE,NULL,NULL,&si,&pi)) {
-            CloseHandle(newstdout);
-            CloseHandle(read_stdout);
-            pushstring("error");
-        }
-        while (dwExit == STILL_ACTIVE || dwRead) {
-            PeekNamedPipe(read_stdout, 0, 0, 0, &dwRead, NULL);
-            if (dwRead) {
-                ReadFile(read_stdout, szBuf, sizeof(szBuf)-1, &dwRead, NULL);
-                szBuf[dwRead] = 0;
-                if (log) {
-                    lstrcat(szBufTmp,szBuf);
-                    LogMessages(szBufTmp);
-                    *szBuf = 0;
-                }
-            }
-            else Sleep(LOOPTIMEOUT);
-            GetExitCodeProcess(pi.hProcess, &dwExit);
-            if (dwExit != STILL_ACTIVE) {
-                PeekNamedPipe(read_stdout, 0, 0, 0, &dwRead, NULL);
-            }
-        }
-        wsprintf(szRet,"%d",dwExit);
-        pushstring(szRet);
-        CloseHandle(pi.hThread);
-        CloseHandle(pi.hProcess);
-        CloseHandle(newstdout);
-        CloseHandle(read_stdout);
-    }
-}
+  }
+  else {
+    lstrcpy(g_exec,g_szto);
+  }
+  {
+    STARTUPINFO si={sizeof(si),};
+    SECURITY_ATTRIBUTES sa={sizeof(sa),};
+    SECURITY_DESCRIPTOR sd={0,};
+    PROCESS_INFORMATION pi={0,};
+    OSVERSIONINFO osv={sizeof(osv)};
+    HANDLE newstdout=0,read_stdout=0;
+    DWORD dwRead = 1;
+    DWORD dwExit = !STILL_ACTIVE;
+    static char szBuf[1024];
+    static char szRet[128];
 
-int LogMessages(const char *pStr) {
-    if (my_strstr(pStr,"\r\n")) {
-        while (*pStr) {
-            char *i = my_strstr(pStr,"\r\n");
-            if (i==0) {
-                LogMessage(pStr);
-                break;
-            }
-            else {
-                *i=0;
-                LogMessage(pStr);
-				if (i-pStr<0) break;
-				pStr = i+2;
-            }
-        }
+    HGLOBAL hUnusedBuf;
+    static char *szUnusedBuf;
+
+    if (log) {
+      hUnusedBuf = GlobalAlloc(GHND, sizeof(szBuf)*4);
+      if (!hUnusedBuf) {
+        pushstring("error");
+        return;
+      }
+      szUnusedBuf = (char *)GlobalLock(hUnusedBuf);
     }
-    return 1;
+
+    GetVersionEx(&osv);
+    if (osv.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+      InitializeSecurityDescriptor(&sd,SECURITY_DESCRIPTOR_REVISION);
+      SetSecurityDescriptorDacl(&sd,true,NULL,false);
+      sa.lpSecurityDescriptor = &sd;
+    }
+    else sa.lpSecurityDescriptor = NULL;
+    sa.bInheritHandle = true;
+    if (!CreatePipe(&read_stdout,&newstdout,&sa,0)) {
+      pushstring("error");
+      return;
+    }
+    GetStartupInfo(&si);
+    si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
+    si.wShowWindow = SW_HIDE;
+    si.hStdOutput = newstdout;
+    si.hStdError = newstdout;
+    if (!CreateProcess(NULL,g_exec,NULL,NULL,TRUE,CREATE_NEW_CONSOLE,NULL,NULL,&si,&pi)) {
+      CloseHandle(newstdout);
+      CloseHandle(read_stdout);
+      pushstring("error");
+    }
+
+    while (dwExit == STILL_ACTIVE || dwRead) {
+      PeekNamedPipe(read_stdout, 0, 0, 0, &dwRead, NULL);
+      if (dwRead) {
+        ReadFile(read_stdout, szBuf, sizeof(szBuf)-1, &dwRead, NULL);
+        szBuf[dwRead] = 0;
+        if (log) {
+          char *p, *lineBreak;
+          SIZE_T iReqLen = lstrlen(szBuf) + lstrlen(szUnusedBuf);
+          if (GlobalSize(hUnusedBuf) < iReqLen) {
+            GlobalUnlock(hUnusedBuf);
+            hUnusedBuf = GlobalReAlloc(hUnusedBuf, iReqLen+sizeof(szBuf), GHND);
+            if (!hUnusedBuf) {
+              pushstring("error");
+              return;
+            }
+            szUnusedBuf = (char *)GlobalLock(hUnusedBuf);
+          }
+
+          p = szUnusedBuf; // get the old left overs
+          lstrcat(p, szBuf);
+
+          while (lineBreak = my_strstr(p, "\r\n")) {
+            *lineBreak = 0;
+            LogMessage(p);
+            p = lineBreak + 2;
+          }
+
+          // If data was taken out from the unused buffer, move p contents to the start of szUnusedBuf
+          if (p != szUnusedBuf) {
+            char *p2 = szUnusedBuf;
+            while (*p) 
+              *p2++ = *p++;
+            *p2 = 0;
+          }
+        }
+      }
+      else Sleep(LOOPTIMEOUT);
+      GetExitCodeProcess(pi.hProcess, &dwExit);
+      if (dwExit != STILL_ACTIVE) {
+        PeekNamedPipe(read_stdout, 0, 0, 0, &dwRead, NULL);
+      }
+    }
+    if (*szUnusedBuf) LogMessage(szUnusedBuf);
+    wsprintf(szRet,"%d",dwExit);
+    pushstring(szRet);
+    CloseHandle(pi.hThread);
+    CloseHandle(pi.hProcess);
+    CloseHandle(newstdout);
+    CloseHandle(read_stdout);
+    if (log) GlobalUnlock(hUnusedBuf);
+  }
 }
 
 // code I stole (err borrowed) from Tim Kosse
 // all credits/problems are his
-int LogMessage(const char *pStr) {
-    LVITEM item={0};
-    int nItemCount;
-    if (!g_hwndList) return -1;
-    if (lstrlen(pStr)==0) return -1;
-    nItemCount=SendMessage(g_hwndList, LVM_GETITEMCOUNT, 0, 0);
-    item.mask=LVIF_TEXT;
-    item.pszText=(char *)pStr;
-    item.cchTextMax=0;
-    item.iItem=nItemCount;
-    ListView_InsertItem(g_hwndList, &item);
-    ListView_EnsureVisible(g_hwndList, item.iItem, 0);
-    return 0;
+void LogMessage(const char *pStr) {
+  LVITEM item={0};
+  int nItemCount;
+  if (!g_hwndList) return;
+  if (!lstrlen(pStr)) return;
+  nItemCount=SendMessage(g_hwndList, LVM_GETITEMCOUNT, 0, 0);
+  item.mask=LVIF_TEXT;
+  item.pszText=(char *)pStr;
+  item.cchTextMax=0;
+  item.iItem=nItemCount;
+  ListView_InsertItem(g_hwndList, &item);
+  ListView_EnsureVisible(g_hwndList, item.iItem, 0);
 }
 
 
 char *my_strstr(const char *string, const char *strCharSet) {
-    char *s1, *s2;
-    size_t chklen;
-    size_t i;
-    if (lstrlen(string) < lstrlen(strCharSet)) return 0;
-    if (!*strCharSet) return (char*)string;
-    chklen=lstrlen(string)-lstrlen(strCharSet);
-    for (i = 0; i < chklen; i++) {
-        s1=&((char*)string)[i];
-        s2=(char*)strCharSet;
-        while (*s1++ == *s2++)
-            if (!*s2)
-                return &((char*)string)[i];
-    }
-    return 0;
+  char *s1, *s2;
+  size_t chklen;
+  size_t i;
+  if (lstrlen(string) < lstrlen(strCharSet)) return 0;
+  if (!*strCharSet) return (char*)string;
+  chklen=lstrlen(string)-lstrlen(strCharSet);
+  for (i = 0; i <= chklen; i++) {
+    s1=&((char*)string)[i];
+    s2=(char*)strCharSet;
+    while (*s1++ == *s2++)
+      if (!*s2)
+        return &((char*)string)[i];
+  }
+  return 0;
 }
 
 int my_atoi(char *s)
@@ -192,42 +211,42 @@ int my_atoi(char *s)
   unsigned int v=0;
   if (*s == '0' && (s[1] == 'x' || s[1] == 'X'))
   {
-    s+=2;
-    for (;;)
-    {
-      int c=*s++;
-      if (c >= '0' && c <= '9') c-='0';
-      else if (c >= 'a' && c <= 'f') c-='a'-10;
-      else if (c >= 'A' && c <= 'F') c-='A'-10;
-      else break;
-      v<<=4;
-      v+=c;
-    }
+  s+=2;
+  for (;;)
+  {
+    int c=*s++;
+    if (c >= '0' && c <= '9') c-='0';
+    else if (c >= 'a' && c <= 'f') c-='a'-10;
+    else if (c >= 'A' && c <= 'F') c-='A'-10;
+    else break;
+    v<<=4;
+    v+=c;
+  }
   }
   else if (*s == '0' && s[1] <= '7' && s[1] >= '0')
   {
-    s++;
-    for (;;)
-    {
-      int c=*s++;
-      if (c >= '0' && c <= '7') c-='0';
-      else break;
-      v<<=3;
-      v+=c;
-    }
+  s++;
+  for (;;)
+  {
+    int c=*s++;
+    if (c >= '0' && c <= '7') c-='0';
+    else break;
+    v<<=3;
+    v+=c;
+  }
   }
   else
   {
-    int sign=0;
-    if (*s == '-') { s++; sign++; }
-    for (;;)
-    {
-      int c=*s++ - '0';
-      if (c < 0 || c > 9) break;
-      v*=10;
-      v+=c;
-    }
-    if (sign) return -(int) v;
+  int sign=0;
+  if (*s == '-') { s++; sign++; }
+  for (;;)
+  {
+    int c=*s++ - '0';
+    if (c < 0 || c > 9) break;
+    v*=10;
+    v+=c;
+  }
+  if (sign) return -(int) v;
   }
   return (int)v;
 }