From 0a9305a002e4aef1b2151135f42833c8714a0601 Mon Sep 17 00:00:00 2001 From: rainwater Date: Wed, 28 Aug 2002 18:26:28 +0000 Subject: [PATCH] Moved plugins to Plugins\ directory git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@780 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Makensisw/makensisw.cpp | 30 +++++++++++++++--------------- Plugins/InstallOptions.dll | Bin 0 -> 12288 bytes Plugins/nsisdl.dll | Bin 0 -> 12800 bytes Source/build.cpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 Plugins/InstallOptions.dll create mode 100644 Plugins/nsisdl.dll diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index dced4635..e753d273 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -245,9 +245,18 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { } 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) { char buf[1024]; + EDITSTREAM es; STARTUPINFO si={sizeof(si),}; SECURITY_ATTRIBUTES sa={sizeof(sa),}; SECURITY_DESCRIPTOR sd={0,}; @@ -282,24 +291,15 @@ DWORD WINAPI MakeNSISProc(LPVOID p) { PostMessage(g_hwnd,WM_MAKENSIS_PROCESSCOMPLETE,0,0); return 1; } + unsigned long exit=0,read,avail; 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) { - PeekNamedPipe(read_stdout,buf,sizeof(buf)-1,&read,&avail,NULL); - 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); - } - } + //SendDlgItemMessage(g_hwnd,IDC_LOGWIN,EM_STREAMIN,SF_TEXT,(LPARAM)&es); GetExitCodeProcess(pi.hProcess,&exit); if (exit != STILL_ACTIVE) break; Sleep(TIMEOUT); diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll new file mode 100644 index 0000000000000000000000000000000000000000..f2f565cd19e8b1ee010825ae3a347fc6a6a18d58 GIT binary patch literal 12288 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 literal 0 HcmV?d00001 diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll new file mode 100644 index 0000000000000000000000000000000000000000..c3d9281892e3a1fff86905072eedf0e198951656 GIT binary patch literal 12800 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 literal 0 HcmV?d00001 diff --git a/Source/build.cpp b/Source/build.cpp index d01b863a..46ac12f7 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -1841,7 +1841,7 @@ void CEXEBuild::build_plugin_table(void) char* searchPath = new char [strlen(nsisdir)+6]; if (searchPath) { - wsprintf(searchPath,"%s\\bin",nsisdir); + wsprintf(searchPath,"%s\\plugins",nsisdir); INFO_MSG("\nProcessing plugin dlls: \"%s\\*.dll\"\n",searchPath); m_plugins.FindCommands(searchPath,display_info?true:false); delete[] searchPath;