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

Moved plugins to Plugins\ directory

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@780 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-08-28 18:26:28 +00:00
parent 69182b36aa
commit 0a9305a002
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Contrib/Makensisw/makensisw.cpp
View file

@ -245,9 +245,18 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
} }
return 0; return 0;
} }
DWORD CALLBACK EditStreamCallback(DWORD dwCookie,LPBYTE pbBuff, LONG cb, LONG FAR *pcb) {
DWORD dwNumberOfBytesRead ;
lstrcpy((char *)pbBuff,"tttttt");
//PeekNamedPipe((HANDLE)dwCookie,pbBuff,cb,&dwNumberOfBytesRead,&dwNumberOfBytesRead,NULL);
BOOL bSuccess = ReadFile((HANDLE)dwCookie,pbBuff,cb,&dwNumberOfBytesRead,NULL);
*pcb = dwNumberOfBytesRead;
return 0;
}
DWORD WINAPI MakeNSISProc(LPVOID p) { DWORD WINAPI MakeNSISProc(LPVOID p) {
char buf[1024]; char buf[1024];
EDITSTREAM es;
STARTUPINFO si={sizeof(si),}; STARTUPINFO si={sizeof(si),};
SECURITY_ATTRIBUTES sa={sizeof(sa),}; SECURITY_ATTRIBUTES sa={sizeof(sa),};
SECURITY_DESCRIPTOR sd={0,}; SECURITY_DESCRIPTOR sd={0,};
@ -282,24 +291,15 @@ DWORD WINAPI MakeNSISProc(LPVOID p) {
PostMessage(g_hwnd,WM_MAKENSIS_PROCESSCOMPLETE,0,0); PostMessage(g_hwnd,WM_MAKENSIS_PROCESSCOMPLETE,0,0);
return 1; return 1;
} }
unsigned long exit=0,read,avail; unsigned long exit=0,read,avail;
my_memset(buf,0,sizeof(buf)); my_memset(buf,0,sizeof(buf));
es.dwCookie = (DWORD)read_stdout;
es.dwError = 0;
es.pfnCallback = EditStreamCallback;
//SendDlgItemMessage(g_hwnd,IDC_LOGWIN,EM_STREAMIN,SF_TEXT,(LPARAM)&es);
while(1) { while(1) {
PeekNamedPipe(read_stdout,buf,sizeof(buf)-1,&read,&avail,NULL); //SendDlgItemMessage(g_hwnd,IDC_LOGWIN,EM_STREAMIN,SF_TEXT,(LPARAM)&es);
if (read != 0) {
my_memset(buf,0,sizeof(buf));
if (avail > sizeof(buf)-1) {
while (read >= sizeof(buf)-1) {
ReadFile(read_stdout,buf,sizeof(buf)-1,&read,NULL);
LogMessage(g_hwnd,buf);
my_memset(buf,0,sizeof(buf));
}
}
else {
ReadFile(read_stdout,buf,sizeof(buf),&read,NULL);
LogMessage(g_hwnd,buf);
}
}
GetExitCodeProcess(pi.hProcess,&exit); GetExitCodeProcess(pi.hProcess,&exit);
if (exit != STILL_ACTIVE) break; if (exit != STILL_ACTIVE) break;
Sleep(TIMEOUT); Sleep(TIMEOUT);

BIN
Plugins/InstallOptions.dll Normal file
View file

Binary file not shown.

BIN
Plugins/nsisdl.dll Normal file
View file

Binary file not shown.

2
Source/build.cpp
View file

@ -1841,7 +1841,7 @@ void CEXEBuild::build_plugin_table(void)
char* searchPath = new char [strlen(nsisdir)+6]; char* searchPath = new char [strlen(nsisdir)+6];
if (searchPath) if (searchPath)
{ {
wsprintf(searchPath,"%s\\bin",nsisdir); wsprintf(searchPath,"%s\\plugins",nsisdir);
INFO_MSG("\nProcessing plugin dlls: \"%s\\*.dll\"\n",searchPath); INFO_MSG("\nProcessing plugin dlls: \"%s\\*.dll\"\n",searchPath);
m_plugins.FindCommands(searchPath,display_info?true:false); m_plugins.FindCommands(searchPath,display_info?true:false);
delete[] searchPath; delete[] searchPath;