Add patch for v2.3+

Author: klauspost

README.md

@@ -17,8 +17,7 @@ Confirmed versions:
  * v2.1.0.1424 (2019)
  * v2.1.1.1472 (2020)
  * v2.2.0.1543 (2020)
-
- * 2.3.0.1591 (2020) BROKEN.
+ * v2.3.0.1591 (2020) - non TR confirmed.
 
 Threadripper patch was supplied by [@neoKushan](https://github.com/neoKushan).
 

main.go

@@ -1,3 +1,27 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2020 Klaus Post
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
 package main
 
 import (
@@ -10,6 +34,27 @@ import (
 	"path/filepath"
 )
 
+var patterns = []struct {
+	desc            string
+	search, replace []byte
+}{
+	{
+		desc:    "Ryzen Master v.1.5 -> v2.2",
+		search:  []byte{0x44, 0x39, 0x6D, 0xA8, 0x0F, 0x84, 0xF7},
+		replace: []byte{0x44, 0x39, 0x6D, 0xA8, 0x90, 0xe9, 0xf7},
+	},
+	{
+		desc:    "Ryzen Master v2.3 -> ?",
+		search:  []byte{0x44, 0x39, 0xad, 0xf8, 0, 0, 0, 0x0f, 0x84},
+		replace: []byte{0x44, 0x39, 0xad, 0xf8, 0, 0, 0, 0x90, 0xe9},
+	},
+	{
+		desc:    "Ryzen Master Threadripper",
+		search:  []byte{0x00, 0x39, 0x7D, 0x90, 0x0F, 0x84, 0xE8, 0x00},
+		replace: []byte{0x00, 0x39, 0x7D, 0x90, 0x90, 0xE9, 0xE8, 0x00},
+	},
+}
+
 func init() {
 	flag.Usage = func() {
 		fmt.Println("Usage: ryzen-master-vbs-patch [-p=patched] \"AMD Ryzen Master.exe\"")
@@ -23,100 +68,39 @@ func main() {
 	flag.Parse()
 	args := flag.Args()
 	if len(args) == 0 {
-		flag.Usage()
-		return
+		args = []string{"AMD Ryzen Master.exe"}
 	}
 
 	for _, f := range args {
 		dir, file := filepath.Split(f)
 		err := patch(filepath.Join(dir, file), filepath.Join(dir, *prefix+file))
 		switch err {
 		case nil:
-		case errCannotPatch:
-			fmt.Println(err)
-			err = patchAlt(filepath.Join(dir, file), filepath.Join(dir, *prefix+file))
-			if err == errCannotPatch {
-				fmt.Println(err)
-				fmt.Println("Skipping file...")
-			} else if err != nil {
-				fmt.Println(err)
-				os.Exit(1)
-			}
 		default:
 			fmt.Println(err)
 			os.Exit(1)
 		}
 	}
 }
 
-var errCannotPatch = errors.New("byte sequence not found")
-
-var search = []byte{0x44, 0x39, 0x6D, 0xA8, 0x0F, 0x84, 0xF7}
-var replace = []byte{0x44, 0x39, 0x6D, 0xA8, 0x90, 0xe9, 0xf7}
+var errCannotPatch = errors.New("no byte sequence not found")
 
 func patch(in string, out string) error {
-	fmt.Println("Applying v2 patch on", in)
+	fmt.Printf("Reading %q\n", in)
 	b, err := ioutil.ReadFile(in)
 	if err != nil {
 		return err
 	}
-	c := bytes.Count(b, search)
-	fmt.Println("Matching byte sequences:", c, "(should be 1)")
-	if c != 1 {
-		return errCannotPatch
-	}
-	b = bytes.Replace(b, search, replace, -1)
-	fmt.Println("Writing to", out)
-	err = ioutil.WriteFile(out, b, 0)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-var searchAlt = []byte{0x00, 0x39, 0x7D, 0x90, 0x0F, 0x84, 0xE8, 0x00}
-var replaceAlt = []byte{0x00, 0x39, 0x7D, 0x90, 0x90, 0xE9, 0xE8, 0x00}
-
-func patchAlt(in string, out string) error {
-	fmt.Println("Applying alternative patch on", in)
-	b, err := ioutil.ReadFile(in)
-	if err != nil {
-		return err
-	}
-	c := bytes.Count(b, searchAlt)
-	fmt.Println("Matching byte sequences:", c, "(should be 1)")
-	if c != 1 {
-		return errCannotPatch
-	}
-	b = bytes.Replace(b, searchAlt, replaceAlt, -1)
-	fmt.Println("Writing to", out)
-	err = ioutil.WriteFile(out, b, 0)
-	if err != nil {
-		return err
+	for i, pattern := range patterns {
+		c := bytes.Count(b, pattern.search)
+		fmt.Printf("%d. Checking patch for %q. ", i, pattern.desc)
+		fmt.Println("Matching byte sequences:", c, "(should be 1)")
+		if c != 1 {
+			continue
+		}
+		b = bytes.Replace(b, pattern.search, pattern.replace, -1)
+		fmt.Printf("Writing to %q\n", out)
+		return ioutil.WriteFile(out, b, os.ModePerm)
 	}
-	return nil
+	return errCannotPatch
 }
-
-/*
-The MIT License (MIT)
-
-Copyright (c) 2020 Klaus Post
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/