From 0eeddc0119aea43c6b7032307878468dd47aafdf Mon Sep 17 00:00:00 2001 From: acidicoala Date: Mon, 1 Nov 2021 20:44:04 +0200 Subject: [PATCH] Added missing exports --- UplayR1Unlocker/LinkerExports.h | 1 + UplayR1Unlocker/LinkerExports64.h | 1 + UplayR1Unlocker/LoaderLinkerExports.h | 30 +++++-------------------- UplayR1Unlocker/LoaderLinkerExports64.h | 28 ++++------------------- UplayR1Unlocker/UplayR1Unlocker.rc | 8 +++---- UplayR1Unlocker/uplay.cpp | 22 +++++++++--------- 6 files changed, 26 insertions(+), 64 deletions(-) diff --git a/UplayR1Unlocker/LinkerExports.h b/UplayR1Unlocker/LinkerExports.h index c46fd2b..684e1f2 100644 --- a/UplayR1Unlocker/LinkerExports.h +++ b/UplayR1Unlocker/LinkerExports.h @@ -61,6 +61,7 @@ #pragma comment(linker, "/export:UPLAY_OVERLAY_Show=uplay_r1_o.UPLAY_OVERLAY_Show") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowBrowserUrl=uplay_r1_o.UPLAY_OVERLAY_ShowBrowserUrl") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowFacebookAuthentication=uplay_r1_o.UPLAY_OVERLAY_ShowFacebookAuthentication") +#pragma comment(linker, "/export:UPLAY_OVERLAY_ShowMicroApp=uplay_r1_o.UPLAY_OVERLAY_ShowMicroApp") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowNotification=uplay_r1_o.UPLAY_OVERLAY_ShowNotification") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowShopUrl=uplay_r1_o.UPLAY_OVERLAY_ShowShopUrl") #pragma comment(linker, "/export:UPLAY_PARTY_GetFullMemberList=uplay_r1_o.UPLAY_PARTY_GetFullMemberList") diff --git a/UplayR1Unlocker/LinkerExports64.h b/UplayR1Unlocker/LinkerExports64.h index 635d711..d249413 100644 --- a/UplayR1Unlocker/LinkerExports64.h +++ b/UplayR1Unlocker/LinkerExports64.h @@ -61,6 +61,7 @@ #pragma comment(linker, "/export:UPLAY_OVERLAY_Show=uplay_r164_o.UPLAY_OVERLAY_Show") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowBrowserUrl=uplay_r164_o.UPLAY_OVERLAY_ShowBrowserUrl") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowFacebookAuthentication=uplay_r164_o.UPLAY_OVERLAY_ShowFacebookAuthentication") +#pragma comment(linker, "/export:UPLAY_OVERLAY_ShowMicroApp=uplay_r164_o.UPLAY_OVERLAY_ShowMicroApp") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowNotification=uplay_r164_o.UPLAY_OVERLAY_ShowNotification") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowShopUrl=uplay_r164_o.UPLAY_OVERLAY_ShowShopUrl") #pragma comment(linker, "/export:UPLAY_PARTY_GetFullMemberList=uplay_r164_o.UPLAY_PARTY_GetFullMemberList") diff --git a/UplayR1Unlocker/LoaderLinkerExports.h b/UplayR1Unlocker/LoaderLinkerExports.h index 0daae4a..73986f3 100644 --- a/UplayR1Unlocker/LoaderLinkerExports.h +++ b/UplayR1Unlocker/LoaderLinkerExports.h @@ -1,10 +1,5 @@ #pragma once -#pragma comment(linker, "/export:?UPLAY_FRIENDS_DisableFriendMenuItem@@YAHI@Z=uplay_r1_loader_o.?UPLAY_FRIENDS_DisableFriendMenuItem@@YAHI@Z") -#pragma comment(linker, "/export:?UPLAY_FRIENDS_EnableFriendMenuItem@@YAHIIPAI@Z=uplay_r1_loader_o.?UPLAY_FRIENDS_EnableFriendMenuItem@@YAHIIPAI@Z") -#pragma comment(linker, "/export:?UPLAY_PARTY_DisablePartyMemberMenuItem@@YAHXZ=uplay_r1_loader_o.?UPLAY_PARTY_DisablePartyMemberMenuItem@@YAHXZ") -#pragma comment(linker, "/export:?UPLAY_PARTY_EnablePartyMemberMenuItem@@YAHIIPAI@Z=uplay_r1_loader_o.?UPLAY_PARTY_EnablePartyMemberMenuItem@@YAHIIPAI@Z") -#pragma comment(linker, "/export:?UPLAY_PARTY_SetGuest@@YAHPBDPAUUPLAY_Overlapped_t@@@Z=uplay_r1_loader_o.?UPLAY_PARTY_SetGuest@@YAHPBDPAUUPLAY_Overlapped_t@@@Z") #pragma comment(linker, "/export:UPLAY_ACH_EarnAchievement=uplay_r1_loader_o.UPLAY_ACH_EarnAchievement") #pragma comment(linker, "/export:UPLAY_ACH_GetAchievementImage=uplay_r1_loader_o.UPLAY_ACH_GetAchievementImage") #pragma comment(linker, "/export:UPLAY_ACH_GetAchievements=uplay_r1_loader_o.UPLAY_ACH_GetAchievements") @@ -12,17 +7,11 @@ #pragma comment(linker, "/export:UPLAY_ACH_ReleaseAchievementList=uplay_r1_loader_o.UPLAY_ACH_ReleaseAchievementList") #pragma comment(linker, "/export:UPLAY_ACH_Write=uplay_r1_loader_o.UPLAY_ACH_Write") #pragma comment(linker, "/export:UPLAY_AVATAR_Get=uplay_r1_loader_o.UPLAY_AVATAR_Get") -#pragma comment(linker, "/export:UPLAY_AVATAR_GetAvatarIdForCurrentUser=uplay_r1_loader_o.UPLAY_AVATAR_GetAvatarIdForCurrentUser") -#pragma comment(linker, "/export:UPLAY_AVATAR_GetBitmap=uplay_r1_loader_o.UPLAY_AVATAR_GetBitmap") -#pragma comment(linker, "/export:UPLAY_AVATAR_Relea`se=uplay_r1_loader_o.UPLAY_AVATAR_Release") -#pragma comment(linker, "/export:UPLAY_CHAT_GetHistory=uplay_r1_loader_o.UPLAY_CHAT_GetHistory") -#pragma comment(linker, "/export:UPLAY_CHAT_Init=uplay_r1_loader_o.UPLAY_CHAT_Init") -#pragma comment(linker, "/export:UPLAY_CHAT_ReleaseHistoryList=uplay_r1_loader_o.UPLAY_CHAT_ReleaseHistoryList") -#pragma comment(linker, "/export:UPLAY_CHAT_SendMessage=uplay_r1_loader_o.UPLAY_CHAT_SendMessage") -#pragma comment(linker, "/export:UPLAY_CHAT_SetMessagesRead=uplay_r1_loader_o.UPLAY_CHAT_SetMessagesRead") -#pragma comment(linker, "/export:UPLAY_ClearGameSession=uplay_r1_loader_o.UPLAY_ClearGameSession") +#pragma comment(linker, "/export:UPLAY_AVATAR_Release=uplay_r1_loader_o.UPLAY_AVATAR_Release") #pragma comment(linker, "/export:UPLAY_FRIENDS_AddPlayedWith=uplay_r1_loader_o.UPLAY_FRIENDS_AddPlayedWith") #pragma comment(linker, "/export:UPLAY_FRIENDS_AddToBlackList=uplay_r1_loader_o.UPLAY_FRIENDS_AddToBlackList") +#pragma comment(linker, "/export:UPLAY_FRIENDS_DisableFriendMenuItem=uplay_r1_loader_o.UPLAY_FRIENDS_DisableFriendMenuItem") +#pragma comment(linker, "/export:UPLAY_FRIENDS_EnableFriendMenuItem=uplay_r1_loader_o.UPLAY_FRIENDS_EnableFriendMenuItem") #pragma comment(linker, "/export:UPLAY_FRIENDS_GetFriendList=uplay_r1_loader_o.UPLAY_FRIENDS_GetFriendList") #pragma comment(linker, "/export:UPLAY_FRIENDS_Init=uplay_r1_loader_o.UPLAY_FRIENDS_Init") #pragma comment(linker, "/export:UPLAY_FRIENDS_InviteToGame=uplay_r1_loader_o.UPLAY_FRIENDS_InviteToGame") @@ -45,7 +34,6 @@ #pragma comment(linker, "/export:UPLAY_INSTALLER_Init=uplay_r1_loader_o.UPLAY_INSTALLER_Init") #pragma comment(linker, "/export:UPLAY_INSTALLER_ReleaseChunkIdList=uplay_r1_loader_o.UPLAY_INSTALLER_ReleaseChunkIdList") #pragma comment(linker, "/export:UPLAY_INSTALLER_UpdateInstallOrder=uplay_r1_loader_o.UPLAY_INSTALLER_UpdateInstallOrder") -#pragma comment(linker, "/export:UPLAY_Init=uplay_r1_loader_o.UPLAY_Init") #pragma comment(linker, "/export:UPLAY_METADATA_ClearContinuousTag=uplay_r1_loader_o.UPLAY_METADATA_ClearContinuousTag") #pragma comment(linker, "/export:UPLAY_METADATA_SetContinuousTag=uplay_r1_loader_o.UPLAY_METADATA_SetContinuousTag") #pragma comment(linker, "/export:UPLAY_METADATA_SetSingleEventTag=uplay_r1_loader_o.UPLAY_METADATA_SetSingleEventTag") @@ -60,7 +48,6 @@ #pragma comment(linker, "/export:UPLAY_OVERLAY_SetShopUrl=uplay_r1_loader_o.UPLAY_OVERLAY_SetShopUrl") #pragma comment(linker, "/export:UPLAY_OVERLAY_Show=uplay_r1_loader_o.UPLAY_OVERLAY_Show") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowBrowserUrl=uplay_r1_loader_o.UPLAY_OVERLAY_ShowBrowserUrl") -#pragma comment(linker, "/export:UPLAY_OVERLAY_ShowFacebookAuthentication=uplay_r1_loader_o.UPLAY_OVERLAY_ShowFacebookAuthentication") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowNotification=uplay_r1_loader_o.UPLAY_OVERLAY_ShowNotification") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowShopUrl=uplay_r1_loader_o.UPLAY_OVERLAY_ShowShopUrl") #pragma comment(linker, "/export:UPLAY_PARTY_GetFullMemberList=uplay_r1_loader_o.UPLAY_PARTY_GetFullMemberList") @@ -73,6 +60,7 @@ #pragma comment(linker, "/export:UPLAY_PARTY_IsPartyLeader=uplay_r1_loader_o.UPLAY_PARTY_IsPartyLeader") #pragma comment(linker, "/export:UPLAY_PARTY_PromoteToLeader=uplay_r1_loader_o.UPLAY_PARTY_PromoteToLeader") #pragma comment(linker, "/export:UPLAY_PARTY_RespondToGameInvite=uplay_r1_loader_o.UPLAY_PARTY_RespondToGameInvite") +#pragma comment(linker, "/export:UPLAY_PARTY_SetGuest=uplay_r1_loader_o.UPLAY_PARTY_SetGuest") #pragma comment(linker, "/export:UPLAY_PARTY_SetUserData=uplay_r1_loader_o.UPLAY_PARTY_SetUserData") #pragma comment(linker, "/export:UPLAY_PARTY_ShowGameInviteOverlayUI=uplay_r1_loader_o.UPLAY_PARTY_ShowGameInviteOverlayUI") #pragma comment(linker, "/export:UPLAY_PRESENCE_SetPresence=uplay_r1_loader_o.UPLAY_PRESENCE_SetPresence") @@ -81,6 +69,7 @@ #pragma comment(linker, "/export:UPLAY_PeekNextEvent=uplay_r1_loader_o.UPLAY_PeekNextEvent") #pragma comment(linker, "/export:UPLAY_Quit=uplay_r1_loader_o.UPLAY_Quit") #pragma comment(linker, "/export:UPLAY_Release=uplay_r1_loader_o.UPLAY_Release") +#pragma comment(linker, "/export:UPLAY_Startup=uplay_r1_loader_o.UPLAY_Startup") #pragma comment(linker, "/export:UPLAY_SAVE_Close=uplay_r1_loader_o.UPLAY_SAVE_Close") #pragma comment(linker, "/export:UPLAY_SAVE_GetSavegames=uplay_r1_loader_o.UPLAY_SAVE_GetSavegames") #pragma comment(linker, "/export:UPLAY_SAVE_Open=uplay_r1_loader_o.UPLAY_SAVE_Open") @@ -96,30 +85,21 @@ #pragma comment(linker, "/export:UPLAY_STORE_ReleaseProductsList=uplay_r1_loader_o.UPLAY_STORE_ReleaseProductsList") #pragma comment(linker, "/export:UPLAY_STORE_ShowProductDetails=uplay_r1_loader_o.UPLAY_STORE_ShowProductDetails") #pragma comment(linker, "/export:UPLAY_STORE_ShowProducts=uplay_r1_loader_o.UPLAY_STORE_ShowProducts") -#pragma comment(linker, "/export:UPLAY_SetGameSession=uplay_r1_loader_o.UPLAY_SetGameSession") #pragma comment(linker, "/export:UPLAY_SetLanguage=uplay_r1_loader_o.UPLAY_SetLanguage") #pragma comment(linker, "/export:UPLAY_Start=uplay_r1_loader_o.UPLAY_Start") -#pragma comment(linker, "/export:UPLAY_Startup=uplay_r1_loader_o.UPLAY_Startup") #pragma comment(linker, "/export:UPLAY_USER_ClearGameSession=uplay_r1_loader_o.UPLAY_USER_ClearGameSession") #pragma comment(linker, "/export:UPLAY_USER_ConsumeItem=uplay_r1_loader_o.UPLAY_USER_ConsumeItem") -#pragma comment(linker, "/export:UPLAY_USER_GetAccountId=uplay_r1_loader_o.UPLAY_USER_GetAccountId") #pragma comment(linker, "/export:UPLAY_USER_GetAccountIdUtf8=uplay_r1_loader_o.UPLAY_USER_GetAccountIdUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetCPUScore=uplay_r1_loader_o.UPLAY_USER_GetCPUScore") #pragma comment(linker, "/export:UPLAY_USER_GetCdKeyUtf8=uplay_r1_loader_o.UPLAY_USER_GetCdKeyUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetCdKeys=uplay_r1_loader_o.UPLAY_USER_GetCdKeys") #pragma comment(linker, "/export:UPLAY_USER_GetConsumableItems=uplay_r1_loader_o.UPLAY_USER_GetConsumableItems") -#pragma comment(linker, "/export:UPLAY_USER_GetCredentials=uplay_r1_loader_o.UPLAY_USER_GetCredentials") -#pragma comment(linker, "/export:UPLAY_USER_GetEmail=uplay_r1_loader_o.UPLAY_USER_GetEmail") #pragma comment(linker, "/export:UPLAY_USER_GetEmailUtf8=uplay_r1_loader_o.UPLAY_USER_GetEmailUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetGPUScore=uplay_r1_loader_o.UPLAY_USER_GetGPUScore") #pragma comment(linker, "/export:UPLAY_USER_GetGPUScoreConfidenceLevel=uplay_r1_loader_o.UPLAY_USER_GetGPUScoreConfidenceLevel") #pragma comment(linker, "/export:UPLAY_USER_GetNameUtf8=uplay_r1_loader_o.UPLAY_USER_GetNameUtf8") -#pragma comment(linker, "/export:UPLAY_USER_GetPassword=uplay_r1_loader_o.UPLAY_USER_GetPassword") -#pragma comment(linker, "/export:UPLAY_USER_GetPasswordUtf8=uplay_r1_loader_o.UPLAY_USER_GetPasswordUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetProfile=uplay_r1_loader_o.UPLAY_USER_GetProfile") #pragma comment(linker, "/export:UPLAY_USER_GetTicketUtf8=uplay_r1_loader_o.UPLAY_USER_GetTicketUtf8") -#pragma comment(linker, "/export:UPLAY_USER_GetUsername=uplay_r1_loader_o.UPLAY_USER_GetUsername") -#pragma comment(linker, "/export:UPLAY_USER_GetUsernameUtf8=uplay_r1_loader_o.UPLAY_USER_GetUsernameUtf8") #pragma comment(linker, "/export:UPLAY_USER_IsConnected=uplay_r1_loader_o.UPLAY_USER_IsConnected") #pragma comment(linker, "/export:UPLAY_USER_IsInOfflineMode=uplay_r1_loader_o.UPLAY_USER_IsInOfflineMode") // #pragma comment(linker, "/export:UPLAY_USER_IsOwned=uplay_r1_loader_o.UPLAY_USER_IsOwned") diff --git a/UplayR1Unlocker/LoaderLinkerExports64.h b/UplayR1Unlocker/LoaderLinkerExports64.h index 38e3694..fda1494 100644 --- a/UplayR1Unlocker/LoaderLinkerExports64.h +++ b/UplayR1Unlocker/LoaderLinkerExports64.h @@ -1,10 +1,5 @@ #pragma once -#pragma comment(linker, "/export:?UPLAY_FRIENDS_DisableFriendMenuItem@@YAHI@Z=uplay_r1_loader64_o.?UPLAY_FRIENDS_DisableFriendMenuItem@@YAHI@Z") -#pragma comment(linker, "/export:?UPLAY_FRIENDS_EnableFriendMenuItem@@YAHIIPEAI@Z=uplay_r1_loader64_o.?UPLAY_FRIENDS_EnableFriendMenuItem@@YAHIIPEAI@Z") -#pragma comment(linker, "/export:?UPLAY_PARTY_DisablePartyMemberMenuItem@@YAHXZ=uplay_r1_loader64_o.?UPLAY_PARTY_DisablePartyMemberMenuItem@@YAHXZ") -#pragma comment(linker, "/export:?UPLAY_PARTY_EnablePartyMemberMenuItem@@YAHIIPEAI@Z=uplay_r1_loader64_o.?UPLAY_PARTY_EnablePartyMemberMenuItem@@YAHIIPEAI@Z") -#pragma comment(linker, "/export:?UPLAY_PARTY_SetGuest@@YAHPEBDPEAUUPLAY_Overlapped_t@@@Z=uplay_r1_loader64_o.?UPLAY_PARTY_SetGuest@@YAHPEBDPEAUUPLAY_Overlapped_t@@@Z") #pragma comment(linker, "/export:UPLAY_ACH_EarnAchievement=uplay_r1_loader64_o.UPLAY_ACH_EarnAchievement") #pragma comment(linker, "/export:UPLAY_ACH_GetAchievementImage=uplay_r1_loader64_o.UPLAY_ACH_GetAchievementImage") #pragma comment(linker, "/export:UPLAY_ACH_GetAchievements=uplay_r1_loader64_o.UPLAY_ACH_GetAchievements") @@ -12,17 +7,11 @@ #pragma comment(linker, "/export:UPLAY_ACH_ReleaseAchievementList=uplay_r1_loader64_o.UPLAY_ACH_ReleaseAchievementList") #pragma comment(linker, "/export:UPLAY_ACH_Write=uplay_r1_loader64_o.UPLAY_ACH_Write") #pragma comment(linker, "/export:UPLAY_AVATAR_Get=uplay_r1_loader64_o.UPLAY_AVATAR_Get") -#pragma comment(linker, "/export:UPLAY_AVATAR_GetAvatarIdForCurrentUser=uplay_r1_loader64_o.UPLAY_AVATAR_GetAvatarIdForCurrentUser") -#pragma comment(linker, "/export:UPLAY_AVATAR_GetBitmap=uplay_r1_loader64_o.UPLAY_AVATAR_GetBitmap") #pragma comment(linker, "/export:UPLAY_AVATAR_Release=uplay_r1_loader64_o.UPLAY_AVATAR_Release") -#pragma comment(linker, "/export:UPLAY_CHAT_GetHistory=uplay_r1_loader64_o.UPLAY_CHAT_GetHistory") -#pragma comment(linker, "/export:UPLAY_CHAT_Init=uplay_r1_loader64_o.UPLAY_CHAT_Init") -#pragma comment(linker, "/export:UPLAY_CHAT_ReleaseHistoryList=uplay_r1_loader64_o.UPLAY_CHAT_ReleaseHistoryList") -#pragma comment(linker, "/export:UPLAY_CHAT_SendMessage=uplay_r1_loader64_o.UPLAY_CHAT_SendMessage") -#pragma comment(linker, "/export:UPLAY_CHAT_SetMessagesRead=uplay_r1_loader64_o.UPLAY_CHAT_SetMessagesRead") -#pragma comment(linker, "/export:UPLAY_ClearGameSession=uplay_r1_loader64_o.UPLAY_ClearGameSession") #pragma comment(linker, "/export:UPLAY_FRIENDS_AddPlayedWith=uplay_r1_loader64_o.UPLAY_FRIENDS_AddPlayedWith") #pragma comment(linker, "/export:UPLAY_FRIENDS_AddToBlackList=uplay_r1_loader64_o.UPLAY_FRIENDS_AddToBlackList") +#pragma comment(linker, "/export:UPLAY_FRIENDS_DisableFriendMenuItem=uplay_r1_loader64_o.UPLAY_FRIENDS_DisableFriendMenuItem") +#pragma comment(linker, "/export:UPLAY_FRIENDS_EnableFriendMenuItem=uplay_r1_loader64_o.UPLAY_FRIENDS_EnableFriendMenuItem") #pragma comment(linker, "/export:UPLAY_FRIENDS_GetFriendList=uplay_r1_loader64_o.UPLAY_FRIENDS_GetFriendList") #pragma comment(linker, "/export:UPLAY_FRIENDS_Init=uplay_r1_loader64_o.UPLAY_FRIENDS_Init") #pragma comment(linker, "/export:UPLAY_FRIENDS_InviteToGame=uplay_r1_loader64_o.UPLAY_FRIENDS_InviteToGame") @@ -45,7 +34,6 @@ #pragma comment(linker, "/export:UPLAY_INSTALLER_Init=uplay_r1_loader64_o.UPLAY_INSTALLER_Init") #pragma comment(linker, "/export:UPLAY_INSTALLER_ReleaseChunkIdList=uplay_r1_loader64_o.UPLAY_INSTALLER_ReleaseChunkIdList") #pragma comment(linker, "/export:UPLAY_INSTALLER_UpdateInstallOrder=uplay_r1_loader64_o.UPLAY_INSTALLER_UpdateInstallOrder") -#pragma comment(linker, "/export:UPLAY_Init=uplay_r1_loader64_o.UPLAY_Init") #pragma comment(linker, "/export:UPLAY_METADATA_ClearContinuousTag=uplay_r1_loader64_o.UPLAY_METADATA_ClearContinuousTag") #pragma comment(linker, "/export:UPLAY_METADATA_SetContinuousTag=uplay_r1_loader64_o.UPLAY_METADATA_SetContinuousTag") #pragma comment(linker, "/export:UPLAY_METADATA_SetSingleEventTag=uplay_r1_loader64_o.UPLAY_METADATA_SetSingleEventTag") @@ -60,7 +48,6 @@ #pragma comment(linker, "/export:UPLAY_OVERLAY_SetShopUrl=uplay_r1_loader64_o.UPLAY_OVERLAY_SetShopUrl") #pragma comment(linker, "/export:UPLAY_OVERLAY_Show=uplay_r1_loader64_o.UPLAY_OVERLAY_Show") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowBrowserUrl=uplay_r1_loader64_o.UPLAY_OVERLAY_ShowBrowserUrl") -#pragma comment(linker, "/export:UPLAY_OVERLAY_ShowFacebookAuthentication=uplay_r1_loader64_o.UPLAY_OVERLAY_ShowFacebookAuthentication") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowNotification=uplay_r1_loader64_o.UPLAY_OVERLAY_ShowNotification") #pragma comment(linker, "/export:UPLAY_OVERLAY_ShowShopUrl=uplay_r1_loader64_o.UPLAY_OVERLAY_ShowShopUrl") #pragma comment(linker, "/export:UPLAY_PARTY_GetFullMemberList=uplay_r1_loader64_o.UPLAY_PARTY_GetFullMemberList") @@ -73,6 +60,7 @@ #pragma comment(linker, "/export:UPLAY_PARTY_IsPartyLeader=uplay_r1_loader64_o.UPLAY_PARTY_IsPartyLeader") #pragma comment(linker, "/export:UPLAY_PARTY_PromoteToLeader=uplay_r1_loader64_o.UPLAY_PARTY_PromoteToLeader") #pragma comment(linker, "/export:UPLAY_PARTY_RespondToGameInvite=uplay_r1_loader64_o.UPLAY_PARTY_RespondToGameInvite") +#pragma comment(linker, "/export:UPLAY_PARTY_SetGuest=uplay_r1_loader64_o.UPLAY_PARTY_SetGuest") #pragma comment(linker, "/export:UPLAY_PARTY_SetUserData=uplay_r1_loader64_o.UPLAY_PARTY_SetUserData") #pragma comment(linker, "/export:UPLAY_PARTY_ShowGameInviteOverlayUI=uplay_r1_loader64_o.UPLAY_PARTY_ShowGameInviteOverlayUI") #pragma comment(linker, "/export:UPLAY_PRESENCE_SetPresence=uplay_r1_loader64_o.UPLAY_PRESENCE_SetPresence") @@ -81,6 +69,7 @@ #pragma comment(linker, "/export:UPLAY_PeekNextEvent=uplay_r1_loader64_o.UPLAY_PeekNextEvent") #pragma comment(linker, "/export:UPLAY_Quit=uplay_r1_loader64_o.UPLAY_Quit") #pragma comment(linker, "/export:UPLAY_Release=uplay_r1_loader64_o.UPLAY_Release") +#pragma comment(linker, "/export:UPLAY_Startup=uplay_r1_loader64_o.UPLAY_Startup") #pragma comment(linker, "/export:UPLAY_SAVE_Close=uplay_r1_loader64_o.UPLAY_SAVE_Close") #pragma comment(linker, "/export:UPLAY_SAVE_GetSavegames=uplay_r1_loader64_o.UPLAY_SAVE_GetSavegames") #pragma comment(linker, "/export:UPLAY_SAVE_Open=uplay_r1_loader64_o.UPLAY_SAVE_Open") @@ -96,30 +85,21 @@ #pragma comment(linker, "/export:UPLAY_STORE_ReleaseProductsList=uplay_r1_loader64_o.UPLAY_STORE_ReleaseProductsList") #pragma comment(linker, "/export:UPLAY_STORE_ShowProductDetails=uplay_r1_loader64_o.UPLAY_STORE_ShowProductDetails") #pragma comment(linker, "/export:UPLAY_STORE_ShowProducts=uplay_r1_loader64_o.UPLAY_STORE_ShowProducts") -#pragma comment(linker, "/export:UPLAY_SetGameSession=uplay_r1_loader64_o.UPLAY_SetGameSession") #pragma comment(linker, "/export:UPLAY_SetLanguage=uplay_r1_loader64_o.UPLAY_SetLanguage") #pragma comment(linker, "/export:UPLAY_Start=uplay_r1_loader64_o.UPLAY_Start") -#pragma comment(linker, "/export:UPLAY_Startup=uplay_r1_loader64_o.UPLAY_Startup") #pragma comment(linker, "/export:UPLAY_USER_ClearGameSession=uplay_r1_loader64_o.UPLAY_USER_ClearGameSession") #pragma comment(linker, "/export:UPLAY_USER_ConsumeItem=uplay_r1_loader64_o.UPLAY_USER_ConsumeItem") -#pragma comment(linker, "/export:UPLAY_USER_GetAccountId=uplay_r1_loader64_o.UPLAY_USER_GetAccountId") #pragma comment(linker, "/export:UPLAY_USER_GetAccountIdUtf8=uplay_r1_loader64_o.UPLAY_USER_GetAccountIdUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetCPUScore=uplay_r1_loader64_o.UPLAY_USER_GetCPUScore") #pragma comment(linker, "/export:UPLAY_USER_GetCdKeyUtf8=uplay_r1_loader64_o.UPLAY_USER_GetCdKeyUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetCdKeys=uplay_r1_loader64_o.UPLAY_USER_GetCdKeys") #pragma comment(linker, "/export:UPLAY_USER_GetConsumableItems=uplay_r1_loader64_o.UPLAY_USER_GetConsumableItems") -#pragma comment(linker, "/export:UPLAY_USER_GetCredentials=uplay_r1_loader64_o.UPLAY_USER_GetCredentials") -#pragma comment(linker, "/export:UPLAY_USER_GetEmail=uplay_r1_loader64_o.UPLAY_USER_GetEmail") #pragma comment(linker, "/export:UPLAY_USER_GetEmailUtf8=uplay_r1_loader64_o.UPLAY_USER_GetEmailUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetGPUScore=uplay_r1_loader64_o.UPLAY_USER_GetGPUScore") #pragma comment(linker, "/export:UPLAY_USER_GetGPUScoreConfidenceLevel=uplay_r1_loader64_o.UPLAY_USER_GetGPUScoreConfidenceLevel") #pragma comment(linker, "/export:UPLAY_USER_GetNameUtf8=uplay_r1_loader64_o.UPLAY_USER_GetNameUtf8") -#pragma comment(linker, "/export:UPLAY_USER_GetPassword=uplay_r1_loader64_o.UPLAY_USER_GetPassword") -#pragma comment(linker, "/export:UPLAY_USER_GetPasswordUtf8=uplay_r1_loader64_o.UPLAY_USER_GetPasswordUtf8") #pragma comment(linker, "/export:UPLAY_USER_GetProfile=uplay_r1_loader64_o.UPLAY_USER_GetProfile") #pragma comment(linker, "/export:UPLAY_USER_GetTicketUtf8=uplay_r1_loader64_o.UPLAY_USER_GetTicketUtf8") -#pragma comment(linker, "/export:UPLAY_USER_GetUsername=uplay_r1_loader64_o.UPLAY_USER_GetUsername") -#pragma comment(linker, "/export:UPLAY_USER_GetUsernameUtf8=uplay_r1_loader64_o.UPLAY_USER_GetUsernameUtf8") #pragma comment(linker, "/export:UPLAY_USER_IsConnected=uplay_r1_loader64_o.UPLAY_USER_IsConnected") #pragma comment(linker, "/export:UPLAY_USER_IsInOfflineMode=uplay_r1_loader64_o.UPLAY_USER_IsInOfflineMode") // #pragma comment(linker, "/export:UPLAY_USER_IsOwned=uplay_r1_loader64_o.UPLAY_USER_IsOwned") diff --git a/UplayR1Unlocker/UplayR1Unlocker.rc b/UplayR1Unlocker/UplayR1Unlocker.rc index 9ef0be7..1bee9dc 100644 --- a/UplayR1Unlocker/UplayR1Unlocker.rc +++ b/UplayR1Unlocker/UplayR1Unlocker.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "acidicoala" VALUE "FileDescription", "Legit DLC Unlocker for Uplay R1" - VALUE "FileVersion", "1.2.1.0" + VALUE "FileVersion", "1.2.2.0" VALUE "InternalName", "UplayR1Unlocker.dll" VALUE "LegalCopyright", "Fuck the copyright >:D" VALUE "OriginalFilename", "UplayR1Unlocker.dll" VALUE "ProductName", "Uplay R1 Unlocker" - VALUE "ProductVersion", "1.2.1.0" + VALUE "ProductVersion", "1.2.2.0" END END BLOCK "VarFileInfo" diff --git a/UplayR1Unlocker/uplay.cpp b/UplayR1Unlocker/uplay.cpp index 0629dff..eaca74a 100644 --- a/UplayR1Unlocker/uplay.cpp +++ b/UplayR1Unlocker/uplay.cpp @@ -5,14 +5,14 @@ HMODULE originalDLL = nullptr; -void init(HMODULE hModule) +void init(const HMODULE hModule) { Config::init(hModule); Logger::init(hModule); logger->info("Uplay R1 Unlocker v{}", VERSION); - auto originalPath = getDllDir(hModule) / ORIG_DLL; + const auto originalPath = getDllDir(hModule) / ORIG_DLL; originalDLL = LoadLibrary(originalPath.c_str()); if(originalDLL) { @@ -20,9 +20,9 @@ void init(HMODULE hModule) } else { - auto message = fmt::format(L"Failed to load original DLL: {}. Error code: {}", originalPath.c_str(), GetLastError()); + const auto message = fmt::format(L"Failed to load original DLL: {}. Error code: {}", originalPath.c_str(), GetLastError()); logger->error(message); - MessageBox(NULL, message.c_str(), L"Error during initialization", MB_ICONERROR | MB_OK); + MessageBox(nullptr, message.c_str(), L"Error during initialization", MB_ICONERROR | MB_OK); exit(1); } } @@ -36,16 +36,16 @@ void shutdown() // Used as: cmp eax, 1 // Therefore, we must return int rather than a bool -EXPORT int UPLAY_USER_IsOwned(int aUplayId) +EXPORT int UPLAY_USER_IsOwned(const int aUplayId) { - GET_PROXY_FUNC(UPLAY_USER_IsOwned); - auto result = proxyFunc(aUplayId); + GET_PROXY_FUNC(UPLAY_USER_IsOwned) + const auto result = proxyFunc(aUplayId); - auto isOwned = !vectorContains(config->blacklist, aUplayId); + const auto isOwned = !vectorContains(config->blacklist, aUplayId); logger->info( "UPLAY_USER_IsOwned -> aUplayId: {},\tisOwned: {}\t(legitimately owned: {})", - aUplayId, isOwned, (bool) result + aUplayId, isOwned, static_cast(result) ); return isOwned; // implicit type conversion @@ -55,8 +55,8 @@ EXPORT PCSTR UPLAY_INSTALLER_GetLanguageUtf8() { if(config->lang == "default") { - GET_PROXY_FUNC(UPLAY_INSTALLER_GetLanguageUtf8); - auto result = proxyFunc(); + GET_PROXY_FUNC(UPLAY_INSTALLER_GetLanguageUtf8) + const auto result = proxyFunc(); logger->info("UPLAY_INSTALLER_GetLanguageUtf8 -> original lang: {}", result); return result; }