Misc fixes

Author: yungcomputerchair

ffrunner.c

@@ -591,8 +591,8 @@ gen_temp_file(char *outPath)
     HANDLE hFile;
     DWORD fileFlags = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_TEMPORARY;
 
-    if (!GetTempPath2A(MAX_PATH, tempPath)) {
-        logmsg("GetTempPath2A failed: %d\n", GetLastError());
+    if (!GetTempPathA(MAX_PATH, tempPath)) {
+        logmsg("GetTempPathA failed: %d\n", GetLastError());
         return INVALID_HANDLE_VALUE;
     }
 
@@ -617,7 +617,7 @@ gen_temp_file(char *outPath)
     return hFile;
 }
 
-void
+bool
 fetch_icon(char *iconUrl, char *outPath)
 {
     HANDLE iconFile;
@@ -626,27 +626,30 @@ fetch_icon(char *iconUrl, char *outPath)
 
     iconFile = gen_temp_file(outPath);
     if (iconFile == INVALID_HANDLE_VALUE) {
-        return;
+        logmsg("Failed to create temp file for icon: %d\n", GetLastError());
+        return false;
     }
 
+    logmsg("Downloading icon to %s\n", outPath);
     doneSignal = CreateEventA(NULL, TRUE, FALSE, NULL);
     register_temp_request(iconUrl, iconFile, doneSignal);
 
-    waitResult = WaitForSingleObject(doneSignal, 5000);
+    /* 3-second timeout for icon download so we don't hang if something goes wrong */
+    waitResult = WaitForSingleObject(doneSignal, 3000);
     CloseHandle(doneSignal);
-    complete_request();
 
     if (waitResult == WAIT_OBJECT_0) {
         logmsg("Icon downloaded successfully.\n");
         CloseHandle(iconFile);
-        return;
+        return true;
     } else if (waitResult == WAIT_TIMEOUT) {
         logmsg("Failed to download icon within timeout.\n");
     } else {
         logmsg("Error while waiting for icon download: %d\n", GetLastError());
     }
 
     CloseHandle(iconFile);
+    return false;
 }
 
 int
@@ -721,11 +724,14 @@ main(int argc, char **argv)
 
     srcUrl = args.mainPathOrAddress;
     init_network(srcUrl);
+    logmsg("Request pool initialized\n");
 
     char *iconToUse = NULL;
     if (args.windowIcon) {
-        fetch_icon(args.windowIcon, iconFile);
-        iconToUse = iconFile;
+        logmsg("Fetching icon: %s\n", args.windowIcon);
+        if (fetch_icon(args.windowIcon, iconFile)) {
+            iconToUse = iconFile;
+        }
     }
 
     prepare_window(args.windowWidth, args.windowHeight, iconToUse);

graphics.c

@@ -88,7 +88,7 @@ prepare_window(uint32_t width, uint32_t height, const char *iconFile)
     wc.style         = CS_DBLCLKS;
 
     if (iconFile) {
-        hIcon = (HICON)LoadImageA(NULL, iconFile, IMAGE_ICON, 0, 0, LR_LOADFROMFILE | LR_DEFAULTSIZE);
+        hIcon = (HICON)LoadImageA(NULL, iconFile, IMAGE_ICON, 256, 256, LR_LOADFROMFILE);
         if (!hIcon) {
             logmsg("Failed to load icon from %s: %d\n", iconFile, GetLastError());
         }

requests.c

@@ -523,8 +523,8 @@ handle_request(PTP_CALLBACK_INSTANCE inst, void *reqArg, PTP_WORK work)
     }
 }
 
-void
-submit_request(Request *req)
+static void
+submit_request_work(Request *req)
 {
     PTP_WORK work;
 
@@ -535,6 +535,12 @@ submit_request(Request *req)
     assert(work);
 
     SubmitThreadpoolWork(work);
+}
+
+void
+submit_request(Request *req)
+{
+    submit_request_work(req);
     nRequests++;
 }
 
@@ -602,7 +608,7 @@ register_temp_request(const char *url, HANDLE outFile, HANDLE onDone)
     };
     strncpy(req->originalUrl, url, MAX_URL_LENGTH);
 
-    submit_request(req);
+    submit_request_work(req);
 }
 
 void complete_request()