X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=installer%2Finstaller.c;h=b545a1a81c64e1f5c3ca34d69dc81eddb4329349;hb=5cca4318ce6497260a721ae17d78af28ddd7b40d;hp=ee1b3d0672cc9a18726bf96391c2942498108682;hpb=7ac0b22b1a33ea2c9644905301311cc92d21d628;p=swftools.git

diff --git a/installer/installer.c b/installer/installer.c
index ee1b3d0..b545a1a 100644
--- a/installer/installer.c
+++ b/installer/installer.c
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include "installer.h"
 
-#include "depack.h"
-
 #include "../config.h" //for swftools version
 
 static int config_forAllUsers = 0;
@@ -41,10 +39,12 @@ static char path_desktop[MAX_PATH] = "\0";
 static char path_programfiles[MAX_PATH] = "\0";
 
 extern char*crndata;
+extern int crndata_len;
+
 extern char*license_text;
 
 static char*install_path = "c:\\swftools\\";
-static char pathBuf[1024];
+static char pathBuf[MAX_PATH];
 static int do_abort = 0;
 
 static char* pdf2swf_path;
@@ -117,6 +117,71 @@ static char* concatPaths(const char*base, const char*add)
     return n;
 }
 
+static void handleTemplateFile(const char*filename)
+{
+    FILE*fi = fopen(filename, "rb");
+    fseek(fi, SEEK_END, 0);
+    int len = ftell(fi);
+    fseek(fi, SEEK_SET, 0);
+    char*file = malloc(len);
+    fread(file, len, 1, fi);
+    fclose(fi);
+    int l = strlen(install_path);
+    fi = fopen(filename, "wb");
+    char*pos = file;
+    char*lastpos = file;
+    while(1) {
+        pos = strstr(pos, "%%PATH%%");
+        if(!pos) {
+            pos = &file[len];
+            break;
+        }
+        if(pos!=lastpos)
+            fwrite(lastpos, pos-lastpos, 1, fi);
+        fwrite(install_path, l, 1, fi);
+        pos+=8; // length of "%%PATH%%"
+        lastpos = pos;
+    }
+    fwrite(lastpos, pos-lastpos, 1, fi);
+    fclose(fi);
+    free(file);
+}
+
+static char* getRegistryEntry(char*path)
+{
+    int res = 0;
+    HKEY key;
+    long rc;
+    long size = 0;
+    DWORD type;
+    char*buf;
+    rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, path, 0, KEY_ALL_ACCESS/* KEY_READ*/, &key);
+    if (rc != ERROR_SUCCESS) {
+	fprintf(stderr, "RegOpenKeyEx failed\n");
+	return 0;
+    }
+    rc = RegQueryValueEx(key, NULL, 0, 0, 0, (LPDWORD)&size) ;
+    if(rc != ERROR_SUCCESS) {
+	fprintf(stderr, "RegQueryValueEx(1) failed: %d\n", rc);
+	return 0;
+    }
+    buf = (char*)malloc(size+1);
+    rc = RegQueryValueEx(key, NULL, 0, &type, (BYTE*)buf, (LPDWORD)&size);
+    if(rc != ERROR_SUCCESS) {
+	fprintf(stderr, "RegQueryValueEx(2) failed: %d\n", rc);
+	return 0;
+    }
+    if(type == REG_SZ || type == REG_EXPAND_SZ) {
+	while(size && buf[size-1] == '\0')
+          --size;
+	buf[size] = 0;
+	/* TODO: convert */
+	return buf;
+    } else if(type == REG_BINARY) {
+	return buf;
+    }
+}
+
 static int setRegistryEntry(char*key,char*value)
 {
     HKEY hkey1;
@@ -240,6 +305,18 @@ int CreateShortcut(char*path, char*description, char*filename, char*arguments, i
     return 1;
 }
 
+static int CreateURL(const char*url, const char*path)
+{
+    FILE*fi = fopen(path, "wb");
+    if(!fi)
+        return 0;
+    fprintf(fi, "[InternetShortcut]\r\n");
+    fprintf(fi, "URL=http://localhost:8081/\r\n");
+    fclose(fi);
+    return 1;
+}
+
+
 BOOL CALLBACK PropertySheetFuncCommon(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, int buttons)
 {
     LPNMHDR lpnm;
@@ -294,6 +371,10 @@ BOOL CALLBACK PropertySheetFunc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 		if(SHGetPathFromIDList(browse.pidlRoot, browse.pszDisplayName)) {
 		    printf("Path is %s\n", browse.pszDisplayName);
 		    install_path = browse.pszDisplayName;
+                    int l = strlen(install_path);
+                    while(l && install_path[l-1]=='\\') {
+                        install_path[--l]=0;
+                    }   
 		}
 	    }
 	    SendDlgItemMessage(hwnd, IDC_INSTALL_PATH, WM_SETTEXT, 0, (LPARAM)install_path);
@@ -314,6 +395,10 @@ BOOL CALLBACK PropertySheetFunc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 	    SendDlgItemMessage(hwnd, IDC_INSTALL_PATH, WM_GETTEXT, sizeof(pathBuf), (LPARAM)&(pathBuf[0]));
 	    if(pathBuf[0]) {
 		install_path = pathBuf;
+                int l = strlen(install_path);
+                while(l && install_path[l-1]=='\\') {
+                    install_path[--l]=0;
+                }   
 	    }
 	    return 0;
 	}
@@ -327,9 +412,9 @@ void PropertyArchiveStatus(int type, char*text)
     if(text && text[0]=='[') return;
     SetDlgItemText(statuswnd, IDC_INFO, strdup(text));
     int t;
-    /* There are usually 6 messages, and a range of 54 to fill, so 
+    /* There are usually 4 messages, and a range of 40 to fill, so 
        step 9 times */
-    for(t=0;t<9;t++) {
+    for(t=0;t<10;t++) {
 	SendDlgItemMessage(statuswnd, IDC_PROGRESS, PBM_SETPOS, ++progress_pos, 0);
 	processMessages();
 	Sleep(30);
@@ -352,10 +437,10 @@ BOOL CALLBACK PropertySheetFunc3(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 	SendMessage(dialog, PSM_CANCELTOCLOSE, 0, 0); //makes wine display a warning
 	SetDlgItemText(hwnd, IDC_TITLE, "Installing files...");
 	statuswnd = hwnd;
-	SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, (LPARAM)MAKELONG(0,54));
+	SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, (LPARAM)MAKELONG(0,40));
 	progress_pos = 0;
 	SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, progress_pos, 0);
-	int success = unpack_archive(crndata, install_path, PropertyArchiveStatus);
+	int success = unpack_archive(crndata, crndata_len, install_path, PropertyArchiveStatus);
 	return 0;
     }
     return PropertySheetFuncCommon(hwnd, message, wParam, lParam, PSWIZB_BACK|PSWIZB_NEXT);