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

more simple TCHARs fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6047 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-04-12 16:00:17 +00:00
parent a92fad7347
commit 64a0f32e52
38 changed files with 1831 additions and 1961 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Contrib/Makensisw/update.cpp
View file

@ -2,7 +2,6 @@
#include "makensisw.h"
#include "update.h"
#include "noclib.h"
#include "jnetlib/httpget.h"
#include "../ExDLL/nsis_tchar.h"
@ -62,14 +61,14 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
if (getProxyInfo(pbuf))
{
p=my_strstr(pbuf,"http=");
p=strstr(pbuf,"http=");
if (!p) p=pbuf;
else {
p+=5;
}
char *tp=my_strstr(p,";");
char *tp=strstr(p,";");
if (tp) *tp=0;
char *p2=my_strstr(p,"=");
char *p2=strstr(p,"=");
if (p2) p=0; // we found the wrong proxy
}
@ -140,7 +139,7 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
void Update() {
DWORD dwThreadId;
if (my_strstr(g_sdata.brandingv,_T("cvs")))
if (_tcsstr(g_sdata.brandingv,_T("cvs")))
{
MessageBox(g_sdata.hwnd,_T("Cannot check for new version of nightly builds. To update, download a new nightly build."),_T("NSIS Update"),MB_OK|MB_ICONSTOP);
return;