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

minor changes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1742 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-11-15 19:17:15 +00:00
parent a28a854112
commit 7e7f202432
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/Makensisw/makensisw.cpp
View file

@ -134,7 +134,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
if (num==1) { if (num==1) {
DragQueryFile((HDROP)wParam,0,szTmp,MAX_PATH); DragQueryFile((HDROP)wParam,0,szTmp,MAX_PATH);
if (lstrlen(szTmp)>0) { if (lstrlen(szTmp)>0) {
g_sdata.script_alloced = true; g_sdata.script_alloced = true;
g_sdata.script = (char *)GlobalAlloc(GPTR,sizeof(szTmp)+7); g_sdata.script = (char *)GlobalAlloc(GPTR,sizeof(szTmp)+7);
wsprintf(g_sdata.script,"\"%s\"",szTmp); wsprintf(g_sdata.script,"\"%s\"",szTmp);
ResetObjects(); ResetObjects();
@ -218,7 +218,9 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
case IDM_UPDATE: case IDM_UPDATE:
{ {
DWORD dwThreadId; DWORD dwThreadId;
EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_GRAYED);
CloseHandle(CreateThread(NULL,0,UpdateThread,(LPVOID)NULL,0,&dwThreadId)); CloseHandle(CreateThread(NULL,0,UpdateThread,(LPVOID)NULL,0,&dwThreadId));
EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_ENABLED);
break; break;
} }
case IDM_ABOUT: case IDM_ABOUT:
@ -528,7 +530,6 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
static char pbuf[8192]; static char pbuf[8192];
char *p=NULL; char *p=NULL;
*response = 0; *response = 0;
EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_GRAYED);
if (getProxyInfo(pbuf)) if (getProxyInfo(pbuf))
{ {
p=my_strstr(pbuf,"http="); p=my_strstr(pbuf,"http=");
@ -548,7 +549,7 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
lstrcpy(url,NSIS_UPDATE); lstrcpy(url,NSIS_UPDATE);
lstrcat(url,g_sdata.brandingv); lstrcat(url,g_sdata.brandingv);
lstrcpy(response,""); lstrcpy(response,"");
get->addheader("User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Q312461; .NET CLR 1.0.3705)"); get->addheader("User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 4.0)");
get->addheader("Accept:*/*"); get->addheader("Accept:*/*");
get->connect(url); get->connect(url);
while (1) { while (1) {
@ -595,6 +596,5 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
else MessageBox(g_sdata.hwnd,"There is no update available for NSIS at this time.","NSIS Update",MB_OK|MB_ICONINFORMATION); else MessageBox(g_sdata.hwnd,"There is no update available for NSIS at this time.","NSIS Update",MB_OK|MB_ICONINFORMATION);
GlobalFree(response); GlobalFree(response);
delete get; delete get;
EnableMenuItem(g_sdata.menu,IDM_UPDATE,MF_ENABLED);
return 0; return 0;
} }

2
Contrib/Makensisw/makensisw.h
View file

@ -28,7 +28,7 @@
#include "jnetlib/netinc.h" #include "jnetlib/netinc.h"
#include "jnetlib/httpget.h" #include "jnetlib/httpget.h"
#define _RICHEDIT_VER 0x0200 #define _RICHEDIT_VER 0x0200
#include <RichEdit.h> #include <richedit.h>
#undef _RICHEDIT_VER #undef _RICHEDIT_VER
// Defines // Defines

2
Contrib/Makensisw/utils.cpp
View file

@ -69,7 +69,7 @@ void LogMessage(HWND hwnd,const char *str) {
void ErrorMessage(HWND hwnd,const char *str) { void ErrorMessage(HWND hwnd,const char *str) {
if (!str) return; if (!str) return;
char buf[1028]; char buf[1028];
wsprintf(buf,"Error - %s\r\n",str); wsprintf(buf,"[Error] %s\r\n",str);
LogMessage(hwnd,buf); LogMessage(hwnd,buf);
} }

4
Contrib/Makensisw/version.cpp
View file

@ -23,7 +23,7 @@
#define STR(x) REALSTR(x) #define STR(x) REALSTR(x)
#ifdef RELEASE #ifdef RELEASE
const char *NSISW_VERSION = "MakeNSISW Version " STR(RELEASE); const char *NSISW_VERSION = "MakeNSISW " STR(RELEASE);
#else #else
const char *NSISW_VERSION = "MakeNSISW Build: " __DATE__; const char *NSISW_VERSION = "MakeNSISW " __DATE__;
#endif #endif