xC.c

@@ -15543,13 +15543,14 @@ static void
 client_process_buffer_log
 	(struct client *c, uint32_t seq, struct buffer *buffer)
 {
-	// XXX: We log failures to the global buffer,
-	//   so the client just receives nothing if there is no log file.
-	struct str log = str_make ();
+	struct relay_event_data_response *e = relay_prepare_response (c->ctx, seq);
+	e->data.command = RELAY_COMMAND_BUFFER_LOG;
+
 	char *path = buffer_get_log_path (buffer);
 	FILE *fp = open_log_path (c->ctx, buffer, path);
 	if (fp)
 	{
+		struct str log = str_make ();
 		char buf[BUFSIZ];
 		size_t len;
 		while ((len = fread (buf, 1, sizeof buf, fp)))
@@ -15557,15 +15558,17 @@ client_process_buffer_log
 		if (ferror (fp))
 			log_global_error (c->ctx, "Failed to read `#l': #l",
 				path, strerror (errno));
+
+		// On overflow, it will later fail serialization.
+		e->data.buffer_log.log_len = MIN (UINT32_MAX, log.len);
+		e->data.buffer_log.log = (uint8_t *) str_steal (&log);
 		fclose (fp);
 	}
-	free (path);
 
-	struct relay_event_data_response *e = relay_prepare_response (c->ctx, seq);
-	e->data.command = RELAY_COMMAND_BUFFER_LOG;
-	// On overflow, it will later fail serialization (frame will be too long).
-	e->data.buffer_log.log_len = MIN (UINT32_MAX, log.len);
-	e->data.buffer_log.log = (uint8_t *) str_steal (&log);
+	// XXX: We log failures to the global buffer,
+	//   so the client just receives nothing if there is no log file.
+
+	free (path);
 	relay_send (c);
 }
 

xW/xW.cpp

@@ -1723,9 +1723,6 @@ window_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			break;
 		}
 		}
-	case DM_GETDEFID:
-	case DM_SETDEFID:
-		break;
 	}
 	return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }

xW/xW.manifest

@@ -8,18 +8,4 @@
 				publicKeyToken="6595b64144ccf1df" language="*" />
 		</dependentAssembly>
 	</dependency>
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<!-- Windows 10 -->
-			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-			<!-- Windows 8.1 -->
-			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
-			<!-- Windows 8 -->
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
-			<!-- Windows 7 -->
-			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
-			<!-- Windows Vista -->
-			<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
-		</application>
-	</compatibility>
 </assembly>