Converted to plugin DLL

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1082 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Splash/splash.c

@@ -1,5 +1,52 @@
 #include <windows.h>
 
+typedef struct _stack_t {
+  struct _stack_t *next;
+  char text[1]; // this should be the length of string_size
+} stack_t;
+
+int popstring(char *str); // 0 on success, 1 on empty stack
+void pushstring(char *str);
+
+enum
+{
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST
+};
+
+char *getuservariable(int varnum);
+
+
+HINSTANCE g_hInstance;
+HWND g_hwndParent;
+int g_stringsize;
+stack_t **g_stacktop;
+char *g_variables;
+
 HBITMAP g_hbm;
 int sleep_val;
 int g_rv;
@@ -51,87 +98,101 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
   return DefWindowProc(hwnd,uMsg,wParam,lParam);
 }
 
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst,LPSTR lpszCmdParam, int nCmdShow)
+BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
 {
-  char fn[MAX_PATH];
+  g_hInstance=hInst;
-  int hwndParent;
+	return TRUE;
-  char *o=fn;
+}
 
-  hInstance=GetModuleHandle(NULL);
+void __declspec(dllexport) show(HWND hwndParent, int string_size, char *variables, stack_t **stacktop)
-  lpszCmdParam=GetCommandLine();
+{
-  if (*lpszCmdParam == '\"')
+  g_hwndParent=hwndParent;
+  g_stringsize=string_size;
+  g_stacktop=stacktop;
+  g_variables=variables;
+
+  // do your stuff here
   {
-    do
+    char fn[MAX_PATH];
+    char temp[64];
+    char *sleep=temp;
+
+    popstring(fn);
+    popstring(sleep);
+
+    sleep_val=0;
+    while (*sleep >= '0' && *sleep <= '9')
     {
-      lpszCmdParam++; 
+      sleep_val*=10;
-    } while (*lpszCmdParam != '\"' && *lpszCmdParam);
+      sleep_val+=*sleep++-'0';
-    if (*lpszCmdParam) lpszCmdParam++;
+    }
-  }
+
-  else 
+    if (fn[0] && sleep_val>0)
-  {
-    do
     {
-      lpszCmdParam++; 
+      MSG msg;
-    } while (*lpszCmdParam != ' ' && *lpszCmdParam);
+      char classname[4]="_sp";
-  }
+      static WNDCLASS wc;
-  while (*lpszCmdParam == ' ') lpszCmdParam++;
+      wc.lpfnWndProc = WndProc;
-  sleep_val=0;
+      wc.hInstance = g_hInstance;
-  while (*lpszCmdParam >= '0' && *lpszCmdParam <= '9')
+      wc.hCursor = LoadCursor(NULL,IDC_ARROW);
-  {
+      wc.lpszClassName = classname;
-    sleep_val*=10;
+      if (RegisterClass(&wc)) 
-    sleep_val += *lpszCmdParam++-'0';
-  }
-
-  while (*lpszCmdParam == ' ') lpszCmdParam++;
-  hwndParent=0;
-  while (*lpszCmdParam >= '0' && *lpszCmdParam <= '9')
-  {
-    hwndParent*=10;
-    hwndParent += *lpszCmdParam++-'0';
-  }
-
-  while (*lpszCmdParam == ' ') lpszCmdParam++;
-  while (*lpszCmdParam)
-  {
-    *o++=*lpszCmdParam++;
-  }
-  *o=0;
-
-  if (fn[0] && sleep_val>0)
-  {
-    MSG msg;
-    char classname[4]="_sp";
-    static WNDCLASS wc;
-	  wc.lpfnWndProc = WndProc;
-	  wc.hInstance = hInstance;
-	  wc.hCursor = LoadCursor(NULL,IDC_ARROW);
-	  wc.lpszClassName = classname;
-    if (RegisterClass(&wc)) 
-    {
-      char fn2[MAX_PATH];
-      lstrcpy(fn2,fn);
-      lstrcat(fn,".bmp");
-      lstrcat(fn2,".wav");
-      g_hbm=LoadImage(NULL,fn,IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION|LR_LOADFROMFILE);
-      if (g_hbm) 
       {
-        BOOL s=0;
+        char fn2[MAX_PATH];
-        HANDLE f=CreateFile(fn2,0,0,NULL,OPEN_EXISTING,0,NULL);
+        lstrcpy(fn2,fn);
-        if (f != INVALID_HANDLE_VALUE) { CloseHandle(f); s=PlaySound(fn2,NULL,SND_ASYNC|SND_FILENAME); }
+        lstrcat(fn,".bmp");
-
+        lstrcat(fn2,".wav");
-        CreateWindowEx(WS_EX_TOOLWINDOW,classname,classname,
+        g_hbm=LoadImage(NULL,fn,IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION|LR_LOADFROMFILE);
-          0,0,0,0,0,(HWND)hwndParent,NULL,hInstance,NULL);
+        if (g_hbm) 
-
-        while (GetMessage(&msg,NULL,0,0))
         {
-          DispatchMessage(&msg);
+          BOOL s=0;
+          HANDLE f=CreateFile(fn2,0,0,NULL,OPEN_EXISTING,0,NULL);
+          if (f != INVALID_HANDLE_VALUE) { CloseHandle(f); s=PlaySound(fn2,NULL,SND_ASYNC|SND_FILENAME); }
+
+          CreateWindowEx(WS_EX_TOOLWINDOW,classname,classname,
+            0,0,0,0,0,(HWND)hwndParent,NULL,g_hInstance,NULL);
+
+          while (GetMessage(&msg,NULL,0,0))
+          {
+            DispatchMessage(&msg);
+          }
+
+          if (s) PlaySound(NULL,0,0);
+
+          DeleteObject(g_hbm);
+
+          wsprintf(temp,"%d",g_rv);
+          pushstring(temp);
         }
-
-        if (s) PlaySound(NULL,0,0);
-
-        DeleteObject(g_hbm);
       }
     }
   }
-  ExitProcess(g_rv);
+}
+
+// utility functions (not required but often useful)
+int popstring(char *str)
+{
+  stack_t *th;
+  if (!g_stacktop || !*g_stacktop) return 1;
+  th=(*g_stacktop);
+  lstrcpy(str,th->text);
+  *g_stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return 0;
+}
+
+void pushstring(char *str)
+{
+  stack_t *th;
+  if (!g_stacktop) return;
+  th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
+  lstrcpyn(th->text,str,g_stringsize);
+  th->next=*g_stacktop;
+  *g_stacktop=th;
+}
+
+char *getuservariable(int varnum)
+{
+  if (varnum < 0 || varnum >= __INST_LAST) return NULL;
+  return g_variables+varnum*g_stringsize;
 }

Contrib/Splash/splash.dsp

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /Og /Os /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /GX /Og /Os /Oy /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
 # SUBTRACT CPP /Ox /Ow /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /entry:"WinMain" /subsystem:windows /machine:I386 /nodefaultlib /out:"../../splash.exe" /opt:nowin98
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /entry:"_DllMainCRTStartup" /subsystem:windows /dll /machine:I386 /nodefaultlib /out:"../../Plugins/splash.dll" /opt:nowin98
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "splash - Win32 Debug"
@@ -68,9 +68,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +81,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF