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

Updating works with b1, and MakeNSISw compiles without PSDK

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1974 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-12-18 16:41:59 +00:00
parent 740deb8042
commit ff5553fa65
3 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Contrib/Makensisw/makensisw.cpp
View file

@ -547,6 +547,11 @@ DWORD CALLBACK UpdateThread(LPVOID v) {
JNL_HTTPGet *get = new JNL_HTTPGet(g_dns,8192,(p&&p[0])?p:NULL);; JNL_HTTPGet *get = new JNL_HTTPGet(g_dns,8192,(p&&p[0])?p:NULL);;
lstrcpy(url,NSIS_UPDATE); lstrcpy(url,NSIS_UPDATE);
lstrcat(url,g_sdata.brandingv); lstrcat(url,g_sdata.brandingv);
p=my_strstr(url," (CVS)");
if (p) {
*p=0;
lstrcat(url,"&cvs=1");
}
lstrcpy(response,""); lstrcpy(response,"");
get->addheader("User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 4.0)"); get->addheader("User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 4.0)");
get->addheader("Accept:*/*"); get->addheader("Accept:*/*");

14
Contrib/Makensisw/resource.rc
View file

@ -128,9 +128,10 @@ END
// Dialog // Dialog
// //
DLG_MAIN DIALOGEX DISCARDABLE 0, 0, 361, 228 DLG_MAIN DIALOG DISCARDABLE 0, 0, 361, 228
STYLE DS_SHELLFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | STYLE DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX |
WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
WS_THICKFRAME
CAPTION "MakeNSIS" CAPTION "MakeNSIS"
MENU IDM_MENU MENU IDM_MENU
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -144,10 +145,11 @@ BEGIN
PUSHBUTTON "Test &Installer",IDC_TEST,230,208,60,15,WS_DISABLED PUSHBUTTON "Test &Installer",IDC_TEST,230,208,60,15,WS_DISABLED
END END
DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 233, 126 DLG_ABOUT DIALOGEX 0, 0, 233, 126
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION STYLE DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
WS_CAPTION
CAPTION "About MakeNSISW" CAPTION "About MakeNSISW"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Clo&se",IDOK,180,104,43,15 DEFPUSHBUTTON "Clo&se",IDOK,180,104,43,15
LTEXT "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8 LTEXT "MakeNSISW",IDC_ABOUTVERSION,14,31,219,8

7
Contrib/Makensisw/utils.cpp
View file

@ -89,9 +89,10 @@ void DisableItems(HWND hwnd) {
} }
void EnableItems(HWND hwnd) { void EnableItems(HWND hwnd) {
#define MSG(a) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,0,0) HWND hwLog = GetDlgItem(hwnd, IDC_LOGWIN);
#define MSG1(a,b) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,b,0) #define MSG(a) SendMessage(hwLog,a,0,0)
#define MSG2(a,b,c) SendDlgItemMessage(hwnd,IDC_LOGWIN,a,b,c) #define MSG1(a,b) SendMessage(hwLog,a,b,0)
#define MSG2(a,b,c) SendMessage(hwLog,a,b,c)
if (g_sdata.input_script) { if (g_sdata.input_script) {
GlobalFree(g_sdata.input_script); GlobalFree(g_sdata.input_script);
g_sdata.input_script = 0; g_sdata.input_script = 0;