X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=installer%2Finstaller.c;h=3e0e95e166aa9f058e53ea1979583cd8d661b2f0;hb=d9b87736710215927a329967c1ebc45bc8d665fa;hp=27691bff9c2e46ed5d1959b82582170246c0cd52;hpb=756e8169c8f2d34aa2023920784c7e3502d8fba7;p=swftools.git diff --git a/installer/installer.c b/installer/installer.c index 27691bf..3e0e95e 100644 --- a/installer/installer.c +++ b/installer/installer.c @@ -20,21 +20,28 @@ #include #include +#include +#include #include #include #include "depack.h" #include "../config.h" //for swftools version +#include "../lib/os.h" //for registry functions extern char*crndata; static char*install_path = "c:\\swftools\\"; +static char pathBuf[1024]; +static int do_abort = 0; static HWND wnd_progress = 0; static HWND wnd_params = 0; -#define USER_SETMESSAGE 0x7fff0001 +static HBITMAP logo; + +#define USER_SETMESSAGE 0x7f01 struct progress_data { int width,height; @@ -54,12 +61,12 @@ struct params_data { int ok; HWND installButton; HWND edit; + HWND explore; }; - LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - printf("%08x, %d %08x %08x\n", hwnd, message, wParam, lParam); + //printf("%08x, %d %08x %08x\n", hwnd, message, wParam, lParam); /* in order for the delegation below to also work for WM_CREATE, we need to assign our window pointers *before* the @@ -84,7 +91,7 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara { case USER_SETMESSAGE: data.text3 = (char*)wParam; - SendMessage(data.wnd_text3, WM_SETTEXT, 0, data.text3); + SendMessage(data.wnd_text3, WM_SETTEXT, 0, (LPARAM)data.text3); return 0; case WM_CREATE: { memset(&data, 0, sizeof(data)); @@ -104,6 +111,7 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara data.bar_posx = (data.width -data.bar_width)/2; data.bar_posy = 56; data.range = 50; + data.hwndButton = CreateWindow ( PROGRESS_CLASS, "Progress", @@ -119,9 +127,9 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara ); data.wnd_text3 = CreateWindow ( - WC_EDIT, + WC_STATIC, "text3", - WS_CHILD | WS_VISIBLE | ES_READONLY | ES_CENTER, + WS_CHILD | WS_VISIBLE, data.bar_posx, 72, (rc.right - rc.left - data.bar_posx*2), @@ -131,9 +139,10 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara cs->hInstance, NULL ); + SendMessage(data.wnd_text3, WM_SETTEXT, 0, (LPARAM)""); + SendMessage(data.hwndButton, PBM_SETRANGE, 0, (LPARAM) MAKELONG(0,data.range)); SendMessage(data.hwndButton, PBM_SETSTEP, (WPARAM) data.step, 0); - //ShowWindow(hwndButton, SW_SHOW); return 0; } case PBM_STEPIT: { @@ -154,16 +163,21 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara ReleaseDC(hwnd, hdc); hdc = BeginPaint (hwnd, &ps); + + /* + // draw logo + HDC memDc=CreateCompatibleDC(hdc); + SelectObject(memDc,logo); + BitBlt(hdc,0,0,406,93,memDc,0,0,SRCCOPY); + DeleteDC(memDc); + // / + */ + + SetBkMode(hdc, TRANSPARENT); rc.top = 8; rc.left= 0; rc.right = data.width; rc.bottom = 24; DrawText(hdc, data.text1, -1, &rc, DT_SINGLELINE | DT_CENTER | DT_VCENTER); - /*if(data.text3) { - rc.top = 112; rc.left= 0; rc.right = data.width; rc.bottom = 128; - InvalidateRect(hwnd,&rc,1); - DrawText(hdc, data.text3, -1, &rc, DT_SINGLELINE | DT_CENTER | DT_VCENTER); - }*/ - char buf[256]; char*text = data.text2; if(tm.tmAveCharWidth * strlen(text) > data.width) { @@ -204,31 +218,43 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara "Select Installation Directory:", WS_CHILD | WS_VISIBLE, 32, - 0, + 16, data.width-32*2, 20, hwnd, /* Parent */ - (HMENU)1, + 0, cs->hInstance, NULL ); - SendMessage(text, WM_SETTEXT, "test1", "test2"); - data.edit = CreateWindow ( WC_EDIT, "EditPath", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL, 32, - 32, - data.width-32*2, + 48, + (data.width-64)-32*2, 20, hwnd, /* Parent */ - (HMENU)1, + (HMENU)0x1234, cs->hInstance, NULL ); - + + data.explore = CreateWindow ( + WC_BUTTON, + "Browse", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + data.width-32-64, + 48, + 64, + 20, + hwnd, /* Parent */ + (HMENU)0x9999, + cs->hInstance, + NULL + ); + data.installButton = CreateWindow ( WC_BUTTON, "Install", @@ -238,19 +264,61 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara 80, 32, hwnd, /* Parent */ - (HMENU)1, + (HMENU)0xabcd, cs->hInstance, NULL ); + + SendMessage(data.edit, WM_SETTEXT, 0, (LPARAM)install_path); return 0; } + case USER_SETMESSAGE: { + //install_path = (char*)lParam; + SendMessage(data.edit, WM_SETTEXT, 0, (LPARAM)install_path); + printf("Setting path to %s\n", install_path); + return 0; + } case WM_PAINT: { return DefWindowProc(hwnd, message, wParam, lParam); } case WM_COMMAND: { - data.ok = 1; - DestroyWindow(wnd_params); - return; + if((wParam&0xffff) == 0x9999) { + BROWSEINFOA browse; + memset(&browse, 0, sizeof(browse)); + browse.ulFlags = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_USENEWUI;// | BIF_RETURNONLYFSDIRS; //BIF_VALIDATE + browse.pszDisplayName = (CHAR*)malloc(MAX_PATH); + memset(browse.pszDisplayName, 0, MAX_PATH); + browse.lpszTitle = "Select installation directory"; + /*browse.pidlRoot = (ITEMIDLIST*)malloc(sizeof(ITEMIDLIST)*200); + memset((void*)browse.pidlRoot, 0, sizeof(ITEMIDLIST)*200);*/ + printf("Start browsing %s\n", browse.pszDisplayName); + //SHGetDesktopFolder + //ParseDisplayName(install_path,0,&browse.pidlRoot,0,0); + //SHParseDisplayName(install_path,0,&browse.pidlRoot,0,0); + //SHBrowseForFolderA(&browse); + browse.pidlRoot = SHBrowseForFolder(&browse); + printf("Browsing returns %s / %08x\n", browse.pszDisplayName, browse.pidlRoot); + if(browse.pszDisplayName) { + if(SHGetPathFromIDList(browse.pidlRoot, browse.pszDisplayName)) { + printf("Path is %s\n", browse.pszDisplayName); + install_path = browse.pszDisplayName; + } + } + SendMessage(data.edit, WM_SETTEXT, 0, (LPARAM)install_path); + return 0; + } else if((wParam&0xffff) == 0xabcd) { + data.ok = 1; + DestroyWindow(wnd_params); + return 0; + } else if((wParam&0xffff) == 0x1234) { + SendMessage(data.edit, WM_GETTEXT, sizeof(pathBuf), (LPARAM)&(pathBuf[0])); + if(pathBuf[0]) { + install_path = pathBuf; + printf("Path edited: now \"%s\"\n", install_path); + } + return 0; + } + return DefWindowProc(hwnd, message, wParam, lParam); } case WM_KEYDOWN: { if(wParam == 0x49) { @@ -259,8 +327,10 @@ LRESULT CALLBACK WindowFunc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara return 0; } case WM_DESTROY: - if(!data.ok) + if(!data.ok) { + do_abort = 1; PostQuitMessage (0); + } wnd_params = 0; return DefWindowProc(hwnd, message, wParam, lParam); default: @@ -296,7 +366,7 @@ void myarchivestatus(int type, char*text) /* while we're here, we might also make ourselves useful */ processMessages(); /* we want the user to see what we're writing, right? */ - Sleep(20); + Sleep(30); } if(type<0) { @@ -313,27 +383,10 @@ void myarchivestatus(int type, char*text) } } -static int regEnter(char*key,char*value) -{ - HKEY hkey; - int ret = 0; - ret = RegCreateKey(HKEY_LOCAL_MACHINE, key, &hkey); - if(ret != ERROR_SUCCESS) { - fprintf(stderr, "registry: CreateKey %s failed\n", key); - return 0; - } - ret = RegSetValue(hkey, NULL, REG_SZ, value, strlen(value)+1); - if(ret != ERROR_SUCCESS) { - fprintf(stderr, "registry: SetValue %s failed\n", key); - return 0; - } - return 1; -} - int addRegistryEntries(char*install_dir) { int ret; - ret = regEnter("Software\\quiss.org\\swftools\\InstallPath", install_dir); + ret = setRegistryEntry("Software\\quiss.org\\swftools\\InstallPath", install_dir); if(!ret) return 0; return 1; } @@ -341,7 +394,6 @@ int addRegistryEntries(char*install_dir) int WINAPI WinMain(HINSTANCE me,HINSTANCE hPrevInst,LPSTR lpszArgs, int nWinMode) { WNDCLASSEX wcl; - char*install_dir = "C:\\swftools\\"; wcl.hInstance = me; wcl.lpszClassName= "SWFTools-Installer"; @@ -354,13 +406,22 @@ int WINAPI WinMain(HINSTANCE me,HINSTANCE hPrevInst,LPSTR lpszArgs, int nWinMode wcl.cbClsExtra = 0; wcl.cbWndExtra = 0; //wcl.hbrBackground= (HBRUSH) GetStockObject(DKGRAY_BRUSH); - wcl.hbrBackground= (HBRUSH) GetStockObject (WHITE_BRUSH); + //wcl.hbrBackground= (HBRUSH) GetStockObject (WHITE_BRUSH); + wcl.hbrBackground= (HBRUSH) GetStockObject(LTGRAY_BRUSH); + //wcl.hbrBackground= (HBRUSH) GetStockObject (GRAY_BRUSH); wcl.cbSize = sizeof(WNDCLASSEX); - if(!RegisterClassEx (&wcl)) { + if(!RegisterClassEx(&wcl)) { return 0; } + + logo = LoadBitmap(me, "SWFTOOLS"); + + install_path = getRegistryEntry("Software\\quiss.org\\swftools\\InstallPath"); + if(!install_path || !install_path[0]) + install_path = "c:\\swftools\\"; + CoInitialize(0); InitCommonControls(); CreateWindow ( @@ -376,6 +437,7 @@ int WINAPI WinMain(HINSTANCE me,HINSTANCE hPrevInst,LPSTR lpszArgs, int nWinMode me, /* This program instance */ (void*)"params" /* Creation parameters */ ); + ShowWindow (wnd_params, nWinMode); UpdateWindow (wnd_params); @@ -386,13 +448,15 @@ int WINAPI WinMain(HINSTANCE me,HINSTANCE hPrevInst,LPSTR lpszArgs, int nWinMode TranslateMessage(&msg); DispatchMessage(&msg); } + + if(do_abort) + return 0; - char buf[1024]; - sprintf(buf, "Do you want me to install SWFTools into the directory %s now?", install_dir); + /*char buf[1024]; + sprintf(buf, "Do you want me to install SWFTools into the directory %s now?", install_path); int ret = MessageBox(0, buf, "SWFTools Install", MB_YESNO|MB_ICONQUESTION); - if(ret == IDNO) - return 0; + return 0;*/ CreateWindow ( wcl.lpszClassName, /* Class name */ @@ -410,21 +474,22 @@ int WINAPI WinMain(HINSTANCE me,HINSTANCE hPrevInst,LPSTR lpszArgs, int nWinMode ShowWindow (wnd_progress, nWinMode); UpdateWindow (wnd_progress); - int success = unpack_archive(crndata, "C:\\swftools\\", myarchivestatus); + int success = unpack_archive(crndata, install_path, myarchivestatus); DestroyWindow(wnd_progress); while(wnd_progress) processMessages(); - if(!addRegistryEntries(install_dir)) { + if(!addRegistryEntries(install_path)) { success = 0; - ret = MessageBox(0, "Couldn't create Registry Entries", "SWFTools Install", MB_OK|MB_ICONERROR); + MessageBox(0, "Couldn't create Registry Entries", "SWFTools Install", MB_OK|MB_ICONERROR); } if(success) { - sprintf(buf, "SWFTools Version %s has been installed into %s successfully", VERSION, install_dir); - ret = MessageBox(0, buf, "SWFTools Install", MB_OK|MB_ICONINFORMATION); + char buf[1024]; + sprintf(buf, "SWFTools Version %s has been installed into %s successfully", VERSION, install_path); + MessageBox(0, buf, "SWFTools Install", MB_OK|MB_ICONINFORMATION); } else { /* error will already have been notified by either myarchivestatus or some other routine */