cleaning up the test code a bit. not part of the build system yet.

xpinstall/wizard/windows/test/testxpi.c

@@ -26,6 +26,8 @@
 
 //#define SSU_DEBUG
 
+HANDLE hXPIStubInst;
+
 /* Function to show the usage for this application */
 void ShowUsage(char *name)
 {
@@ -54,6 +56,7 @@ void PrintError(LPSTR szMsg, DWORD dwErrorCodeSH, int iExitCode)
 
   printf("%s\n", szErrorString);
   printf("exit code: %d\n", iExitCode);
+  DeInitializeXPIStub();
   exit(iExitCode);
 }
 
@@ -357,7 +360,6 @@ LPSTR GetArgV(LPSTR lpszCommandLine, int iIndex, LPSTR lpszDest, int iDestSize)
   return(lpszDest);
 }
 
-//int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow)
 int main(void)
 {
   HRESULT           hrResult;

xpinstall/wizard/windows/test/xpi.c

@@ -31,16 +31,8 @@ typedef void    (_cdecl *XpiExit)(void);
 static XpiInit          pfnXpiInit;
 static XpiInstall       pfnXpiInstall;
 static XpiExit          pfnXpiExit;
-static HANDLE           hXPIStubInst;
 
-struct ExtractFilesDlgInfo
-{
-	HWND	hWndDlg;
-	int		nMaxFileBars;	    // maximum number of bars that can be displayed
-	int		nMaxArchiveBars;	// maximum number of bars that can be displayed
-	int		nFileBars;		    // current number of bars to display
-	int		nArchiveBars;		  // current number of bars to display
-} dlgInfo;
+extern HANDLE           hXPIStubInst;
 
 HRESULT InitializeXPIStub()
 {
@@ -110,6 +102,8 @@ HRESULT SmartUpdateJars(LPSTR szAppName, LPSTR szAppPath, LPSTR listArchive[])
   char      szBuf[MAX_BUF];
   HRESULT   hrResult;
 
+  hXPIStubInst = NULL;
+
   if((hrResult = InitializeXPIStub()) == TEST_OK)
   {
     RemoveBackSlash(szAppPath);