Freeing legit product list

UplayR2Unlocker.json

@@ -28,7 +28,8 @@
 		5539,
 		5540,
 		5541,
-		5542
+		5542,
+		5724
 	],
 	"items": [
 		5507,

UplayR2Unlocker/UplayR2Unlocker.rc

@@ -71,7 +71,7 @@ BEGIN
             VALUE "FileDescription", "Legit DLC Unlocker for Ubisoft Connect"
             VALUE "FileVersion", "1.0.0.0"
             VALUE "InternalName", "UplayR2U.dll"
-            VALUE "LegalCopyright", "Fuck the copyright >:D"
+            VALUE "LegalCopyright", "Credit to Mr_Goldberg"
             VALUE "OriginalFilename", "uplay_r264.dll"
             VALUE "ProductName", "Uplay R2 Unlocker"
             VALUE "ProductVersion", "1.0.0.0"

UplayR2Unlocker/UplayR2Unlocker.vcxproj

@@ -74,23 +74,23 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)Build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)Build\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>uplay_r2</TargetName>
+    <TargetName>uplay_r2_loader</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)Build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(ProjectDir)Build\$(Platform)\$(Configuration)\</IntDir>
-    <TargetName>uplay_r2</TargetName>
+    <TargetName>uplay_r2_loader</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>uplay_r264</TargetName>
+    <TargetName>uplay_r2_loader64</TargetName>
     <IntDir>$(ProjectDir)Build\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir)Build\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>uplay_r264</TargetName>
+    <TargetName>uplay_r2_loader64</TargetName>
     <IntDir>$(ProjectDir)Build\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir)Build\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
@@ -147,6 +147,11 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
     </Link>
+    <PostBuildEvent>
+      <Command>powershell Compress-Archive -Update ^
+-Path "$(TargetPath)","$(SolutionDir)UplayR2Unlocker.json" ^
+-DestinationPath "$(SolutionDir)Build\UplayR2Unlocker.zip"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -185,6 +190,11 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
     </Link>
+    <PostBuildEvent>
+      <Command>powershell Compress-Archive -Update ^
+-Path "$(TargetPath)","$(SolutionDir)UplayR2Unlocker.json" ^
+-DestinationPath "$(SolutionDir)Build\UplayR2Unlocker.zip"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Config.h" />

UplayR2Unlocker/upc.cpp

@@ -73,6 +73,23 @@ EXPORT int UPC_Init(unsigned version, int appID)
 	return proxyFunc(version, appID);
 }
 
+EXPORT int UPC_ProductListFree(void* context, ProductList* inProductList)
+{
+	logger->debug(__func__);
+	if(inProductList)
+	{
+		for(unsigned i = 0; i < inProductList->length; ++i)
+		{
+			delete inProductList->data[i];
+		}
+
+		delete[] inProductList->data;
+	}
+
+	delete inProductList;
+	return 0;
+}
+
 void ProductListGetCallback(unsigned long arg1, void* data)
 {
 	logger->debug("{} -> arg1: {}, data: {}", arg1, data);
@@ -105,7 +122,9 @@ void ProductListGetCallback(unsigned long arg1, void* data)
 		logger->warn("\tApp ID: {}, Type: {}", missingProduct->appid, productTypeToString(missingProduct->type));
 	}
 
-	// TODO: delete product list. Tiny memory leak, no big deal.
+	// Free the legit product list
+	GET_PROXY_FUNC(UPC_ProductListFree);
+	proxyFunc(callbackContainer->context, callbackContainer->legitProductList);
 
 	callbackContainer->originalCallback(arg1, callbackContainer->callbackData);
 
@@ -115,7 +134,6 @@ void ProductListGetCallback(unsigned long arg1, void* data)
 EXPORT int UPC_ProductListGet(void* context, char* inOptUserIdUtf8, unsigned int inFilter, ProductList** outProductList, UplayCallback inCallback, void* inCallbackData) //CB: 1 argument, 0 val
 {
 	logger->debug("{}", __func__);
-	logger->debug(L"\tuserID: {}", wstring((LPWCH) inOptUserIdUtf8));
 
 	auto productList = new ProductList();
 	productList->data = new Product * [products.size()];
@@ -128,30 +146,13 @@ EXPORT int UPC_ProductListGet(void* context, char* inOptUserIdUtf8, unsigned int
 	*outProductList = productList;
 
 	auto callbackContainer = new CallbackContainer{
+		context,
 		inCallback,
 		inCallbackData
 	};
 
 	GET_PROXY_FUNC(UPC_ProductListGet);
 	return proxyFunc(context, inOptUserIdUtf8, inFilter, &callbackContainer->legitProductList, ProductListGetCallback, callbackContainer);
-	//return 1 << 4;
-}
-
-EXPORT int UPC_ProductListFree(void* context, ProductList* inProductList)
-{
-	logger->debug(__func__);
-	if(inProductList)
-	{
-		for(unsigned i = 0; i < inProductList->length; ++i)
-		{
-			delete inProductList->data[i];
-		}
-
-		delete[] inProductList->data;
-	}
-
-	delete inProductList;
-	return 0;
 }
 
 EXPORT const char* UPC_InstallLanguageGet(void* context)

UplayR2Unlocker/upc.h

@@ -41,6 +41,7 @@ typedef void (*UplayCallback)(unsigned long, void*);
 
 struct CallbackContainer
 {
+	void* context = NULL;
 	UplayCallback originalCallback = NULL;
 	void* callbackData = NULL;
 	ProductList* legitProductList = NULL;