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

- tabs to spaces

Browse source 
- removed obsolete commented code


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3698 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-10-10 14:50:50 +00:00
parent 7cf2ae3160
commit 2d96e61a68
1 changed files with 14 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Contrib/Banner/Banner.c
View file

@ -75,15 +75,15 @@ DWORD WINAPI BannerThread(LPVOID lpParameter)
while (IsWindow(lhwBanner)) while (IsWindow(lhwBanner))
{ {
if (PeekMessage(&msg, lhwBanner, 0, 0, PM_REMOVE)) if (PeekMessage(&msg, lhwBanner, 0, 0, PM_REMOVE))
{ {
DispatchMessage(&msg); DispatchMessage(&msg);
} }
else else
{ {
hwBanner = lhwBanner; hwBanner = lhwBanner;
WaitMessage(); WaitMessage();
} }
} }
hwBanner = NULL; hwBanner = NULL;
@ -97,7 +97,7 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size, char *variable
{ {
DWORD dwThreadId; DWORD dwThreadId;
DWORD dwMainThreadId = GetCurrentThreadId();; DWORD dwMainThreadId = GetCurrentThreadId();
hwBanner = NULL; hwBanner = NULL;
@ -118,9 +118,9 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size, char *variable
if (AttachThreadInput(dwMainThreadId, dwThreadId, TRUE)) if (AttachThreadInput(dwMainThreadId, dwThreadId, TRUE))
{ {
// Activates and displays a window // Activates and displays a window
ShowWindow(hwBanner, SW_SHOW); ShowWindow(hwBanner, SW_SHOW);
AttachThreadInput(dwMainThreadId, dwThreadId, FALSE); AttachThreadInput(dwMainThreadId, dwThreadId, FALSE);
} }
else else
ShowWindow(hwBanner, SW_SHOW); ShowWindow(hwBanner, SW_SHOW);
@ -140,33 +140,6 @@ void __declspec(dllexport) destroy(HWND hwndParent, int string_size, char *varia
PostMessage(hwBanner, WM_CLOSE, 0, 0); PostMessage(hwBanner, WM_CLOSE, 0, 0);
// The code below is not needed I think
/*
if (!hwndParent)
{
// reset the thread that called banner::Show to be the foreground thread.
// if banner was called from .onInit, this will make sure the NSIS dialog
// will still be created on the foreground
HWND hwTemp;
hwTemp = CreateWindowEx(
WS_EX_TOOLWINDOW,
"STATIC",
"",
WS_VISIBLE | WS_POPUP,
-1,
-1,
1,
1,
0,
0,
hInstance,
0
);
SetForegroundWindow(hwTemp);
DestroyWindow(hwTemp);
}
*/
// Wait for the thread to finish // Wait for the thread to finish
while (hwBanner) while (hwBanner)
Sleep(25); Sleep(25);
@ -179,7 +152,7 @@ BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
{ {
destroy(0, 0, 0, 0); destroy(0, 0, 0, 0);
} }
return TRUE; return TRUE;
} }
unsigned int myatoi(char *s) unsigned int myatoi(char *s)