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

tabs to spaces

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4410 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-11-12 17:24:14 +00:00
parent 7ddf2ce883
commit 5b276eb9b4
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Contrib/Makensisw/jnetlib/connection.cpp
View file

@ -83,7 +83,7 @@ void JNL_Connection::connect(char *hostname, int port)
else else
{ {
m_state=STATE_RESOLVING; m_state=STATE_RESOLVING;
m_saddr.sin_family=AF_INET; m_saddr.sin_family=AF_INET;
m_saddr.sin_port=htons((unsigned short)port); m_saddr.sin_port=htons((unsigned short)port);
m_saddr.sin_addr.s_addr=inet_addr(hostname); m_saddr.sin_addr.s_addr=inet_addr(hostname);
} }
@ -145,7 +145,7 @@ void JNL_Connection::run(int max_send_bytes, int max_recv_bytes, int *bytes_sent
else { m_state=STATE_CONNECTING; } else { m_state=STATE_CONNECTING; }
break; break;
case STATE_CONNECTING: case STATE_CONNECTING:
{ {
fd_set f[3]; fd_set f[3];
FD_ZERO(&f[0]); FD_ZERO(&f[0]);
FD_ZERO(&f[1]); FD_ZERO(&f[1]);

8
Contrib/Makensisw/makensisw.cpp
View file

@ -194,9 +194,9 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
{ {
if (!g_sdata.thread) { if (!g_sdata.thread) {
DragAcceptFiles(g_sdata.hwnd,FALSE); DragAcceptFiles(g_sdata.hwnd,FALSE);
ImageList_Destroy(g_toolbar.imagelist); ImageList_Destroy(g_toolbar.imagelist);
ImageList_Destroy(g_toolbar.imagelistd); ImageList_Destroy(g_toolbar.imagelistd);
ImageList_Destroy(g_toolbar.imagelisth); ImageList_Destroy(g_toolbar.imagelisth);
DestroyWindow(hwndDlg); DestroyWindow(hwndDlg);
FreeLibrary(hRichEditDLL); FreeLibrary(hRichEditDLL);
} }
@ -1099,7 +1099,7 @@ BOOL CALLBACK CompressorProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
case IDCANCEL: case IDCANCEL:
{ {
EndDialog(hwndDlg, 1); EndDialog(hwndDlg, 1);
LogMessage(g_sdata.hwnd,USAGE); LogMessage(g_sdata.hwnd,USAGE);
break; break;
} }
} }

6
Contrib/Makensisw/update.cpp
View file

@ -27,10 +27,10 @@ void FinalizeUpdate() {
int getProxyInfo(char *out) { int getProxyInfo(char *out) {
DWORD v=0; DWORD v=0;
HKEY hKey; HKEY hKey;
if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",0,KEY_READ,&hKey) == ERROR_SUCCESS) { if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",0,KEY_READ,&hKey) == ERROR_SUCCESS) {
DWORD l = 4; DWORD l = 4;
DWORD t; DWORD t;
if (RegQueryValueEx(hKey,"ProxyEnable",NULL,&t,(unsigned char *)&v,&l) == ERROR_SUCCESS && t == REG_DWORD) { if (RegQueryValueEx(hKey,"ProxyEnable",NULL,&t,(unsigned char *)&v,&l) == ERROR_SUCCESS && t == REG_DWORD) {
l=8192; l=8192;
if (RegQueryValueEx(hKey,"ProxyServer",NULL,&t,(unsigned char *)out,&l ) != ERROR_SUCCESS || t != REG_SZ) { if (RegQueryValueEx(hKey,"ProxyServer",NULL,&t,(unsigned char *)out,&l ) != ERROR_SUCCESS || t != REG_SZ) {