From 00a1b4f254664ca30101c843a47b7d947c382d47 Mon Sep 17 00:00:00 2001
From: Patrick Trottier <patrick.arrow206@outlook.com>
Date: Mon, 10 Apr 2017 20:56:51 -0400
Subject: [PATCH] No success code

---
 ports/servo/Cargo.toml   |  7 +++++++
 ports/servo/app.manifest | 24 ++++++++++++++++++++++++
 ports/servo/build.rs     | 13 +++++++++++++
 ports/servo/resource.h   |  1 +
 ports/servo/windows.rc   |  3 +++
 5 files changed, 48 insertions(+)
 create mode 100644 ports/servo/app.manifest
 create mode 100644 ports/servo/resource.h
 create mode 100644 ports/servo/windows.rc

diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
index fb0746a96746..4a5313987b08 100644
--- a/ports/servo/Cargo.toml
+++ b/ports/servo/Cargo.toml
@@ -46,3 +46,10 @@ sig = "0.1"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_injected_glue = {git = "https://github.com/mmatyas/android-rs-injected-glue"}
+
+[build-dependencies]
+winres = "0.1.1"
+
+[package.metadata.winres]
+OriginalFilename = "servo.exe"
+FileDescription = "Servo, the Parallel Browser Engine Project"
\ No newline at end of file
diff --git a/ports/servo/app.manifest b/ports/servo/app.manifest
new file mode 100644
index 000000000000..198d8d517091
--- /dev/null
+++ b/ports/servo/app.manifest
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+          manifestVersion="1.0"
+          xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity type="win32"
+                    name="servo.Servo"
+                    version="0.1.0.0"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <!-- Windows 7 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <!-- Windows 8 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <!-- Windows 8.1 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <!-- Windows 10 -->
+    </application>
+  </compatibility>
+
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware> 
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>
+
diff --git a/ports/servo/build.rs b/ports/servo/build.rs
index 1b7f48a987b1..fb336a24a680 100644
--- a/ports/servo/build.rs
+++ b/ports/servo/build.rs
@@ -7,12 +7,18 @@ use std::path::Path;
 use std::process;
 use std::process::{Command, Stdio};
 
+#[cfg(windows)]
+extern crate winres;
+
 fn main() {
     // build.rs is not platform-specific, so we have to check the target here.
     let target = env::var("TARGET").unwrap();
     if target.contains("android") {
         android_main()
     }
+    if cfg!(target_os = "windows") {
+        windows_main()
+    }
 }
 
 fn android_main() {
@@ -83,3 +89,10 @@ fn android_main() {
     println!("cargo:rustc-link-lib=log");
     println!("cargo:rustc-link-lib=android");
 }
+
+fn windows_main() {
+    let mut res = winres::WindowsResource::new();
+    res.set_resource_file("windows.rc");
+    res.set_manifest_file("app.manifest");
+    res.compile().unwrap();
+}
\ No newline at end of file
diff --git a/ports/servo/resource.h b/ports/servo/resource.h
new file mode 100644
index 000000000000..3c1cf79efae0
--- /dev/null
+++ b/ports/servo/resource.h
@@ -0,0 +1 @@
+#define IDI_ICON    100
diff --git a/ports/servo/windows.rc b/ports/servo/windows.rc
new file mode 100644
index 000000000000..cca484655fbd
--- /dev/null
+++ b/ports/servo/windows.rc
@@ -0,0 +1,3 @@
+#include "resource.h"
+ 
+WINDOWS ICON "../../resources/Servo.ico"
\ No newline at end of file