Changeset 206 in Main

Timestamp:

Oct 2, 2024, 11:33:40 AM (6 weeks ago)

Author:

Nishi

Message:

[release 2.03C] read registry

Location:

trunk

Files:

• Server/install.nsi (modified) (2 diffs)
• Server/main.c (modified) (3 diffs)
• Server/tw_version.h (modified) (1 diff)
• installer.sh (modified) (2 diffs)

trunk/Server/install.nsi

@@ -27 +27 @@
 
 Page license
+Page directory
 Page components
 Page instfiles
@@ -58 +59 @@
 
         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tewi HTTPd" "DisplayName" "Tewi HTTPd"
+        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tewi HTTPd" "InstallDir" '"$INSTDIR"'
         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tewi HTTPd" "UninstallString" '"$INSTDIR\uninstall.exe"'
 

trunk/Server/main.c

@@ -72 +72 @@
 int startup(int argc, char** argv);
 
+#ifdef __MINGW32__
+char* get_registry(const char* main, const char* sub) {
+        DWORD bufsize = 255;
+        char* value = malloc(256);
+        int err = RegGetValue(HKEY_LOCAL_MACHINE, main, sub, RRF_RT_ANY, NULL, (void*)value, &bufsize);
+        if(err == ERROR_SUCCESS) {
+                return value;
+        } else {
+                free(value);
+                return NULL;
+        }
+}
+#endif
+
 #ifdef SERVICE
 SERVICE_STATUS status;
@@ -87 +101 @@
 
 void WINAPI servmain(DWORD argc, LPSTR* argv) {
-        logfile = fopen(PREFIX "/logs/tewi.log", "a");
+        char* path = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");
+        if(path != NULL) {
+                char* lpath = cm_strcat(path, "/logs/tewi.log");
+                logfile = fopen(lpath, "a");
+                free(lpath);
+                free(path);
+        } else {
+                logfile = fopen(PREFIX "/logs/tewi.log", "a");
+        }
         if(logfile == NULL) logfile = stderr;
         status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
@@ -662 +684 @@
 int startup(int argc, char** argv) {
         int i;
+#ifdef __MINGW32__
+        char* confpath = cm_strdup(PREFIX "/etc/tewi.conf");
+        char* regpath = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");
+        if(regpath != NULL) {
+                free(confpath);
+                confpath = cm_strcat(regpath, "/etc/tewi.conf");
+                free(regpath);
+        }
+#else
         const char* confpath = PREFIX "/etc/tewi.conf";
+#endif
         if(argv != NULL) {
                 for(i = 1; i < argc; i++) {

trunk/Server/tw_version.h

@@ -8 +8 @@
 #endif
 
-#define TW_VERSION "2.03B\0"
+#define TW_VERSION "2.03C\0"
 
 const char* tw_get_version(void);

trunk/installer.sh

@@ -23 +23 @@
 
 make clean || fail
-make PLATFORM=$1 -j4 || fail
+make PLATFORM=$1 PREFIX=C:/srv/Tewi -j4 || fail
 cp Server/tewi.exe tewi.exe
 make clean || fail
-make PLATFORM=$1-service -j4 || fail
+make PLATFORM=$1-service -j4 PREFIX=C:/srv/Tewi || fail
 cp Server/tewi.exe tewi-service.exe
 cd Server
-../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
+../Tool/genconf "C:/srv/Tewi" modules dll > ../generated.conf
 ../Tool/itworks > ../itworks.html
 makensis -DVERSION=$VERSION install.nsi
@@ -39 +39 @@
 
 make clean || fail
-make PLATFORM=$1 -j4 || fail
+make PLATFORM=$1 -j4 PREFIX=C:/srv/Tewi|| fail
 cp Server/tewi.exe tewi.exe
 make clean || fail
-make PLATFORM=$1-service -j4 || fail
+make PLATFORM=$1-service -j4 PREFIX=C:/srv/Tewi || fail
 cp Server/tewi.exe tewi-service.exe
 cd Server
-../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
+../Tool/genconf "C:/srv/Tewi" modules dll > ../generated.conf
 ../Tool/itworks > ../itworks.html
 makensis -DVERSION=$VERSION install.nsi