Shaved off 208 bytes of code

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1056 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
eccles 2002-09-19 21:53:24 +00:00
parent 9ba0e9cdbd
commit 24977f45d0
4 changed files with 374 additions and 361 deletions

View file

@ -680,8 +680,8 @@ static DWORD dwRead;
DWORD CALLBACK StreamLicense(DWORD dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb) DWORD CALLBACK StreamLicense(DWORD dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
{ {
lstrcpyn(pbBuff,(char*)dwCookie+dwRead,cb); lstrcpyn(pbBuff,(char*)dwCookie+dwRead,cb);
dwRead+=lstrlen(pbBuff); dwRead+=mystrlen(pbBuff);
*pcb=lstrlen(pbBuff); *pcb=mystrlen(pbBuff);
return 0; return 0;
} }
@ -951,7 +951,7 @@ static DWORD WINAPI newTreeWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
hItem.hItem = ht.hItem; hItem.hItem = ht.hItem;
hItem.mask = TVIF_PARAM; hItem.mask = TVIF_PARAM;
TreeView_GetItem(hwnd, &hItem); TreeView_GetItem(hwnd, &hItem);
lParam = hItem.lParam; lParam = hItem.lParam;
@ -967,7 +967,7 @@ static DWORD WINAPI newTreeWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
myitoa(g_usrvars[0], last_item); myitoa(g_usrvars[0], last_item);
ExecuteCodeSegment(g_inst_entry,g_inst_header->code_onMouseOverSection,NULL); ExecuteCodeSegment(g_inst_entry,g_inst_header->code_onMouseOverSection,NULL);
mystrcpy(g_usrvars[0], g_tmp); mystrcpy(g_usrvars[0], g_tmp);
} }
} }
@ -1443,7 +1443,7 @@ static BOOL CALLBACK InstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
} }
if (uMsg == WM_NOTIFY_INSTPROC_DONE) if (uMsg == WM_NOTIFY_INSTPROC_DONE)
{ {
if (g_quit_flag) if (g_quit_flag)
EndDialog(g_hwnd,1); EndDialog(g_hwnd,1);
else if (!wParam) else if (!wParam)
{ {

File diff suppressed because it is too large Load diff

View file

@ -442,13 +442,6 @@ int NSISCALL mystrlen(const char *in)
return lstrlen(in); return lstrlen(in);
} }
int NSISCALL process_string_fromtab_toint(int offs)
{
process_string(ps_tmpbuf,GetStringFromStringTab(offs));
return myatoi(ps_tmpbuf);
}
// Dave Laundon's simplified process_string // Dave Laundon's simplified process_string
void NSISCALL process_string(char *out, const char *in) void NSISCALL process_string(char *out, const char *in)
{ {

View file

@ -8,7 +8,6 @@ void NSISCALL process_string(char *out, const char *in);
void NSISCALL process_string_fromtab(char *out, int offs); void NSISCALL process_string_fromtab(char *out, int offs);
void NSISCALL process_string_from_lang(char *out, langid_t id); void NSISCALL process_string_from_lang(char *out, langid_t id);
int NSISCALL GetLangString(langid_t id); int NSISCALL GetLangString(langid_t id);
int NSISCALL process_string_fromtab_toint(int offs);
void NSISCALL myRegGetStr(HKEY root, const char *sub, const char *name, char *out); void NSISCALL myRegGetStr(HKEY root, const char *sub, const char *name, char *out);
int NSISCALL myatoi(char *s); int NSISCALL myatoi(char *s);
void NSISCALL myitoa(char *s, int d); void NSISCALL myitoa(char *s, int d);