Changeset 208 in Main for trunk

Timestamp:

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

Author:

Nishi

Message:

do this instead

Location:

trunk

Files:

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

trunk/Server/install.nsi

@@ -23 +23 @@
 LangString WAIT_STOP ${LANG_JAPANESE} "サービスが止まるのを待っています"
 
+!include "x64.nsh"
 !include "LogicLib.nsh"
 !include "Sections.nsh"
@@ -58 +59 @@
         CreateShortcut "$SMPROGRAMS\Tewi HTTPd\Uninstall Tewi HTTPd.lnk" "$INSTDIR\uninstall.exe" ""
 
+        ${If} ${RunningX64}
+                SetRegView 64
+        ${Else}
+                SetRegView 32
+        ${EndIf}
         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" "InstallDir" "$INSTDIR"
         WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tewi HTTPd" "UninstallString" '"$INSTDIR\uninstall.exe"'
 
@@ -126 +132 @@
         RMDir /r "$SMPROGRAMS\Tewi HTTPd"
 
+        ${If} ${RunningX64}
+                SetRegView 64
+        ${Else}
+                SetRegView 32
+        ${EndIf}
         DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tewi HTTPd"
 SectionEnd

trunk/Server/main.c

@@ -74 +74 @@
 #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);
+        DWORD bufsize = 512;
+        HKEY handle;
+        char* value = malloc(513);
+        int err = RegOpenKeyEx(HKEY_LOCAL_MACHINE, main, 0, KEY_QUERY_VALUE, &handle);
         if(err == ERROR_SUCCESS) {
+                err = RegQueryValueEx(handle, sub, NULL, NULL, value, &bufsize);
+                if(err != ERROR_SUCCESS) {
+                        free(value);
+                        RegCloseKey(handle);
+                        return NULL;
+                }
+                RegCloseKey(handle);
                 return value;
         } else {
@@ -503 +511 @@
 
 int main(int argc, char** argv) {
+        printf("%s\n", get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir"));
         logfile = stderr;
 #ifdef SERVICE

trunk/installer.sh

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