dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

applied patch #1346737 - OEM nsExec

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4368 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-11-05 13:22:37 +00:00
parent 0435e051dc
commit 90919b0ea6
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Contrib/nsExec/nsexec.c
View file

@ -35,7 +35,7 @@ HWND g_hwndParent;
HWND g_hwndList; HWND g_hwndList;
void ExecScript(BOOL log); void ExecScript(BOOL log);
void LogMessage(const char *pStr); void LogMessage(const char *pStr, BOOL bOEM);
char *my_strstr(char *a, char *b); char *my_strstr(char *a, char *b);
unsigned int my_atoi(char *s); unsigned int my_atoi(char *s);
@ -91,6 +91,7 @@ void ExecScript(int log) {
char *executor; char *executor;
char *g_exec; char *g_exec;
unsigned int g_to; unsigned int g_to;
BOOL bOEM;
nComSpecSize = GetModuleFileName(g_hInst, meDLLPath, MAX_PATH) + 2; // 2 chars for quotes nComSpecSize = GetModuleFileName(g_hInst, meDLLPath, MAX_PATH) + 2; // 2 chars for quotes
p = meDLLPath + nComSpecSize - 2; // point p at null char of meDLLPath p = meDLLPath + nComSpecSize - 2; // point p at null char of meDLLPath
@ -138,7 +139,8 @@ void ExecScript(int log) {
lstrcat(g_exec, "\""); lstrcat(g_exec, "\"");
g_to = 0; // default is no timeout g_to = 0; // default is no timeout
bOEM = FALSE; // default is no OEM->ANSI conversion
g_hwndList = FindWindowEx(FindWindowEx(g_hwndParent,NULL,"#32770",NULL),NULL,"SysListView32",NULL); g_hwndList = FindWindowEx(FindWindowEx(g_hwndParent,NULL,"#32770",NULL),NULL,"SysListView32",NULL);
@ -146,12 +148,17 @@ void ExecScript(int log) {
pExec = g_exec + lstrlen(g_exec); pExec = g_exec + lstrlen(g_exec);
*pExec = ' '; *pExec = ' ';
pExec++; pExec++;
params:
popstring(pExec); popstring(pExec);
if (my_strstr(pExec, "/TIMEOUT=")) { if (my_strstr(pExec, "/TIMEOUT=")) {
char *szTimeout = pExec + 9; char *szTimeout = pExec + 9;
g_to = my_atoi(szTimeout); g_to = my_atoi(szTimeout);
popstring(pExec); goto params;
}
if (!lstrcmpi(pExec, "/OEM")) {
bOEM = TRUE;
goto params;
} }
if (!g_exec[0]) if (!g_exec[0])
@ -269,7 +276,7 @@ void ExecScript(int log) {
if (*p2 == '\n') { if (*p2 == '\n') {
*p2 = 0; *p2 = 0;
while (!*p && p != p2) p++; while (!*p && p != p2) p++;
LogMessage(p); LogMessage(p, bOEM);
p = ++p2; p = ++p2;
continue; continue;
} }
@ -299,7 +306,7 @@ void ExecScript(int log) {
} }
done: done:
if (log & 2) pushstring(szUnusedBuf); if (log & 2) pushstring(szUnusedBuf);
if (log & 1 && *szUnusedBuf) LogMessage(szUnusedBuf); if (log & 1 && *szUnusedBuf) LogMessage(szUnusedBuf, bOEM);
if ( dwExit == STATUS_ILLEGAL_INSTRUCTION ) if ( dwExit == STATUS_ILLEGAL_INSTRUCTION )
lstrcpy(szRet, "error"); lstrcpy(szRet, "error");
if (!szRet[0]) wsprintf(szRet,"%d",dwExit); if (!szRet[0]) wsprintf(szRet,"%d",dwExit);
@ -321,11 +328,12 @@ done:
} }
// Tim Kosse's LogMessage // Tim Kosse's LogMessage
void LogMessage(const char *pStr) { void LogMessage(const char *pStr, BOOL bOEM) {
LVITEM item={0}; LVITEM item={0};
int nItemCount; int nItemCount;
if (!g_hwndList) return; if (!g_hwndList) return;
//if (!lstrlen(pStr)) return; //if (!lstrlen(pStr)) return;
if (bOEM == TRUE) OemToCharBuff(pStr, (char *)pStr, lstrlen(pStr));
nItemCount=SendMessage(g_hwndList, LVM_GETITEMCOUNT, 0, 0); nItemCount=SendMessage(g_hwndList, LVM_GETITEMCOUNT, 0, 0);
item.mask=LVIF_TEXT; item.mask=LVIF_TEXT;
item.pszText=(char *)pStr; item.pszText=(char *)pStr;